Next phase for chrome.networkingPrivate interface.

chrome/browser/chromeos/extensions/networking_private_apitest.cc

Index: chrome/browser/chromeos/extensions/networking_private_apitest.cc
diff --git a/chrome/browser/chromeos/extensions/networking_private_apitest.cc b/chrome/browser/chromeos/extensions/networking_private_apitest.cc
index 25dcd400f62b9911c0b2b7ccf63f4530ebebe62e..00af2df3aa44a6cad435311873b5ddb6e99b85cd 100644
--- a/chrome/browser/chromeos/extensions/networking_private_apitest.cc
+++ b/chrome/browser/chromeos/extensions/networking_private_apitest.cc
@@ -19,10 +19,35 @@ class ExtensionNetworkingPrivateApiTest : public ExtensionApiTest {
     command_line->AppendSwitchASCII(
         switches::kWhitelistedExtensionID, "epcifkihnkjgphfkloaaleeakhpmgdmn");
  }
+
+  void RunNetworkingSubtest(const std::string& subtest) {
+    // Make the first character lowercase so we can match naming conventions.
+    std::string js_named_subtest = subtest;
+    js_named_subtest[0] = ::tolower(subtest[0]);
+    EXPECT_TRUE(RunExtensionSubtest(
+        "networking", "main.html#" + js_named_subtest,
+        kFlagEnableFileAccess | kFlagLoadAsComponent)) << message_;
+  }
 };
 
-IN_PROC_BROWSER_TEST_F(ExtensionNetworkingPrivateApiTest, BasicFunctions) {
-  ASSERT_TRUE(RunComponentExtensionTest("networking")) << message_;
-}
+
+// Place each subtest into a separate browser test so that the stub networking
+// library state is reset for each subtest run. This way they won't affect each
+// other.
+#define DO_NETWORKING_SUBTEST(name)                                   \
+  IN_PROC_BROWSER_TEST_F(ExtensionNetworkingPrivateApiTest, name) {   \
+    RunNetworkingSubtest(#name);                                      \
+  }
+
+DO_NETWORKING_SUBTEST(StartConnect);
+DO_NETWORKING_SUBTEST(StartDisconnect);
+DO_NETWORKING_SUBTEST(StartConnectNonexistent);
+DO_NETWORKING_SUBTEST(GetVisibleNetworks);
+DO_NETWORKING_SUBTEST(GetVisibleNetworksWifi);
+DO_NETWORKING_SUBTEST(GetProperties);
+DO_NETWORKING_SUBTEST(OnNetworksChangedEvent);
+DO_NETWORKING_SUBTEST(OnNetworkListChangedEvent);

[not at google - send to devlin, 2013/02/12 22:07:25]

Another problem with macros is that this makes the tests harder to disable.
Making these DISABLED_StartConnect (for example) would work but that'd mess up
the subtest name thing.

It also makes test names harder to grep for. I think this point is sometimes
undervalued...

It's also just unprecedented from what I've seen.

Being explicit doesn't need to be that more verbose, what's so wrong with

bool RunSubtest(const std::string& subtest) {
  return RunExtensionSubtest(...)
}

IN_PROC_BROWSER_TEST_F(ExtensionNetworkingPrivateApiTest, StartConnect) {
  RunSubtest("startConnect");
}
// copypaste

??

[Greg Spencer (Chromium), 2013/02/12 23:11:02]

OK, seems consensus is against me here, and the point about disabling the test
is a good one. Expanded these out and removed the macro.

+
+#undef DO_NETWORKING_SUBTEST

[not at google - send to devlin, 2013/02/12 22:07:25]

kind of unnecessary since the #define is only per-file.

 
 }  // namespace chromeos