commit a5b2fc2b85b24edcc9ee89c5dcfcfe060d56f940
author Satoru Takabayashi <satorux@chromium.org> Tue Aug 09 16:58:27 2011
committer Satoru Takabayashi <satorux@chromium.org> Tue Aug 09 19:22:08 2011
tree 51d25d189fce7f33892df5c8bef63230484f9727
parent 3588d30858640ad1dda43b0d99067cf5ec90a86f

Make libcros_service_tester more flexible.

Add the following command line options:
--service_name to specify the service name
--object_path to specify the object path
--interface_name to specify the interface name
--urls to specify the URLs to resolve (comma separated).

Along the way, add www.gmail.com to the preset URLs.

BUG=chromium-os:18904
TEST=USE=install_tests start_devserver; sudo gmerge libcros; /opt/google/chrome/chromeos/libcros_service_tester

Change-Id: I37c529b4c88b1df88e82c9f0e2fca64177bbfa2c
Reviewed-on: http://gerrit.chromium.org/gerrit/5563
Tested-by: Satoru Takabayashi <satorux@chromium.org>
Reviewed-by: Kuan Tan <kuan@chromium.org>

libcros_service_tester.cc

diff --git a/libcros_service_tester.cc b/libcros_service_tester.cc
index 6098b39..9ffc917 100644
--- a/libcros_service_tester.cc
+++ b/libcros_service_tester.cc
@@ -5,6 +5,8 @@
 #include <iostream>
 
 #include <base/basictypes.h>
+#include <base/command_line.h>
+#include <base/string_split.h>
 #include <base/string_util.h>
 #include <chromeos/dbus/dbus.h>
 #include <dbus/dbus-glib-lowlevel.h>
@@ -138,10 +140,33 @@
   ::g_type_init();
   GMainLoop* loop = ::g_main_loop_new(NULL, true);
 
+  CommandLine::Init(argc, argv);
+  CommandLine *command_line = CommandLine::ForCurrentProcess();
+
+  const char* kDefaultServiceName = "org.chromium.LibCrosService";
+  const char* kDefaultObjectPath = "/org/chromium/LibCrosService";
+  const char* kDefaultInterfaceName = "org.chromium.LibCrosServiceInterface";
+
+  // Use the custom service name if specified by --service_name.
+  std::string service_name = command_line->GetSwitchValueASCII("service_name");
+  if (service_name.empty())
+    service_name = kDefaultServiceName;
+
+  // Use the custom object path if specified by --object_path.
+  std::string object_path = command_line->GetSwitchValueASCII("object_path");
+  if (object_path.empty())
+    object_path = kDefaultObjectPath;
+
+  // Use the custom interface name if specified by --interface_name.
+  std::string interface_name =
+      command_line->GetSwitchValueASCII("interface_name");
+  if (interface_name.empty())
+    interface_name = kDefaultInterfaceName;
+
   chromeos::dbus::Proxy request_proxy(chromeos::dbus::GetSystemBusConnection(),
-                                      "org.chromium.LibCrosService",
-                                      "/org/chromium/LibCrosService",
-                                      "org.chromium.LibCrosServiceInterface");
+                                      service_name.c_str(),
+                                      object_path.c_str(),
+                                      interface_name.c_str());
   if (!request_proxy) {
     std::cout << "Can't create proxy for LibCrosService" << std::endl;
     return -1;
@@ -151,9 +176,20 @@
   if (!test.Initialize())
     return -1;
 
-  test.ResolveNetworkProxy("http://maps.google.com");
-  test.ResolveNetworkProxy("http://www.youtube.com");
-  test.ResolveNetworkProxy("http://127.0.0.1");
+  std::string comma_separated_urls = command_line->GetSwitchValueASCII("urls");
+  if (!comma_separated_urls.empty()) {
+    // Resolve the custom URLs if specified by --urls.
+    std::vector<std::string> urls;
+    base::SplitString(comma_separated_urls, ',', &urls);
+    for (size_t i = 0; i < urls.size(); ++i)
+      test.ResolveNetworkProxy(urls[i].c_str());
+  } else {
+    // Otherwise, just resolve the preset URLs.
+    test.ResolveNetworkProxy("http://maps.google.com");
+    test.ResolveNetworkProxy("http://www.youtube.com");
+    test.ResolveNetworkProxy("http://www.gmail.com");
+    test.ResolveNetworkProxy("http://127.0.0.1");
+  }
 
   // Run glib loop if there're signal(s) to wait for.
   test.RunLoopIfNecessary();