[MD settings] split up site settings tests

chrome/test/data/webui/settings/cr_settings_browsertest.js

Index: chrome/test/data/webui/settings/cr_settings_browsertest.js
diff --git a/chrome/test/data/webui/settings/cr_settings_browsertest.js b/chrome/test/data/webui/settings/cr_settings_browsertest.js
index 376938e9c2bbe8b5f2d31ed5ae9ce9c0b7437368..2eaebe794be79f7b42905456b602370ac8bd98fa 100644
--- a/chrome/test/data/webui/settings/cr_settings_browsertest.js
+++ b/chrome/test/data/webui/settings/cr_settings_browsertest.js
@@ -776,13 +776,12 @@ TEST_F('CrSettingsPrivacyPageTest', 'PrivacyPage', function() {
 });
 
 /**
- * Test fixture for chrome/browser/resources/settings/site_settings/.
  * @constructor
  * @extends {CrSettingsBrowserTest}
  */
-function CrSettingsSiteSettingsTest() {}
+function CrSettingsSiteDataDetailsTest() {}
 
-CrSettingsSiteSettingsTest.prototype = {
+CrSettingsSiteDataDetailsTest.prototype = {
   __proto__: CrSettingsBrowserTest.prototype,
 
   /** @override */
@@ -795,29 +794,199 @@ CrSettingsSiteSettingsTest.prototype = {
 
   /** @override */
   extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([
-    // TODO(dbeam): split these up.
+    'test_browser_proxy.js',
+    'test_site_settings_prefs_browser_proxy.js',
+    'site_data_details_subpage_tests.js',
+  ]),
+};
+
+TEST_F('CrSettingsSiteDataDetailsTest', 'SiteSettings', function() {

[Dan Beam, 2017/05/04 19:27:17]

is there a purpose to any of the second names?  they just seem to be duplicative
of the former names

[dschuyler, 2017/05/04 22:31:47]

Afaik they are a sub-label for the test: they can be any string but cannot be
duplicated. I could change them to something like
TEST_F('CrSettingsSiteDataDetailsTest', 'apple',
TEST_F('CrSettingsSiteDataDetailsTest', 'banana',
TEST_F('CrSettingsSiteDataDetailsTest', 'carrot',

But this won't work
TEST_F('CrSettingsSiteDataDetailsTest', 'same',
TEST_F('CrSettingsSiteDataDetailsTest', 'same',
TEST_F('CrSettingsSiteDataDetailsTest', 'same',

Using a partial version of the first label seemed common, so I was trying to
keep with that. Sometimes 'All' is used. I don't have a strong opinion about
what second label is used.

+  mocha.run();
+});
+
+/**
+ * @constructor
+ * @extends {CrSettingsBrowserTest}
+ */
+function CrSettingsCategoryDefaultSettingTest() {}
+
+CrSettingsCategoryDefaultSettingTest.prototype = {
+  __proto__: CrSettingsBrowserTest.prototype,
+
+  /** @override */
+  browsePreload: 'chrome://md-settings/privacy_page/privacy_page.html',
+
+  /** @override */
+  extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([
+    'test_browser_proxy.js',
+    'test_site_settings_prefs_browser_proxy.js',
     'category_default_setting_tests.js',
+  ]),
+};
+
+TEST_F(
+    'CrSettingsCategoryDefaultSettingTest', 'CategoryDefaultSetting',
+    function() {
+      mocha.run();
+    });
+
+/**
+ * @constructor
+ * @extends {CrSettingsBrowserTest}
+ */
+function CrSettingsCategorySettingExceptionsTest() {}
+
+CrSettingsCategorySettingExceptionsTest.prototype = {
+  __proto__: CrSettingsBrowserTest.prototype,
+
+  /** @override */
+  browsePreload: 'chrome://md-settings/privacy_page/privacy_page.html',
+
+  /** @override */
+  extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([
+    'test_browser_proxy.js',
+    'test_site_settings_prefs_browser_proxy.js',
     'category_setting_exceptions_tests.js',
+  ]),
+};
+
+TEST_F(
+    'CrSettingsCategorySettingExceptionsTest', 'CategorySettingExceptions',
+    function() {
+      mocha.run();
+    });
+
+/**
+ * @constructor
+ * @extends {CrSettingsBrowserTest}
+ */
+function CrSettingsSiteDetailsTest() {}
+
+CrSettingsSiteDetailsTest.prototype = {
+  __proto__: CrSettingsBrowserTest.prototype,
+
+  /** @override */
+  browsePreload: 'chrome://md-settings/privacy_page/privacy_page.html',
+
+  /** @override */
+  extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([
+    'test_browser_proxy.js',
+    'test_site_settings_prefs_browser_proxy.js',
     'site_details_tests.js',
+  ]),
+};
+
+TEST_F('CrSettingsSiteDetailsTest', 'SiteDetails', function() {
+  mocha.run();
+});
+
+/**
+ * @constructor
+ * @extends {CrSettingsBrowserTest}
+ */
+function CrSettingsSiteDetailsPermissionTest() {}
+
+CrSettingsSiteDetailsPermissionTest.prototype = {
+  __proto__: CrSettingsBrowserTest.prototype,
+
+  /** @override */
+  browsePreload: 'chrome://md-settings/privacy_page/privacy_page.html',
+
+  /** @override */
+  extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([
+    'test_browser_proxy.js',
+    'test_site_settings_prefs_browser_proxy.js',
     'site_details_permission_tests.js',
+  ]),
+};
+
+TEST_F(
+    'CrSettingsSiteDetailsPermissionTest', 'SiteDetailsPermission', function() {
+      mocha.run();
+    });
+
+/**
+ * @constructor
+ * @extends {CrSettingsBrowserTest}
+ */
+function CrSettingsSiteListTest() {}
+
+CrSettingsSiteListTest.prototype = {
+  __proto__: CrSettingsBrowserTest.prototype,
+
+  /** @override */
+  browsePreload: 'chrome://md-settings/privacy_page/privacy_page.html',
+
+  /** @override */
+  commandLineSwitches: [{
+    switchName: 'enable-site-settings',
+  }],
+
+  /** @override */
+  extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([
+    'test_browser_proxy.js',
+    'test_site_settings_prefs_browser_proxy.js',
     'site_list_tests.js',
+  ]),
+};
+
+TEST_F('CrSettingsSiteListTest', 'SiteList', function() {
+  mocha.run();
+});
+
+TEST_F('CrSettingsSiteListTest', 'EditExceptionDialog', function() {
+  mocha.run();
+});
+
+TEST_F('CrSettingsSiteListTest', 'AddExceptionDialog', function() {
+  mocha.run();
+});

[Dan Beam, 2017/05/04 19:27:17]

uhhhhh, wait, what?  i think this just running the same tests 3 times...

[dschuyler, 2017/05/04 22:31:47]

Yep thanks! forgot to change that.

Done.

+
+/**
+ * @constructor
+ * @extends {CrSettingsBrowserTest}
+ */
+function CrSettingsZoomLevelsTest() {}
+
+CrSettingsZoomLevelsTest.prototype = {
+  __proto__: CrSettingsBrowserTest.prototype,
+
+  /** @override */
+  browsePreload: 'chrome://md-settings/privacy_page/privacy_page.html',
+
+  /** @override */
+  extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([
     'test_browser_proxy.js',
     'test_site_settings_prefs_browser_proxy.js',
     'zoom_levels_tests.js',
-    'usb_devices_tests.js',
-    'site_data_details_subpage_tests.js',
   ]),
 };
 
-TEST_F('CrSettingsSiteSettingsTest', 'SiteSettings', function() {
-  category_default_setting.registerTests();
-  category_setting_exceptions.registerTests();
-  site_details.registerTests();
-  site_details_permission.registerTests();
-  site_list.registerTests();
-  zoom_levels.registerTests();
-  usb_devices.registerTests();
+TEST_F('CrSettingsZoomLevelsTest', 'UsbDevices', function() {
+  mocha.run();
+});
+
+/**
+ * @constructor
+ * @extends {CrSettingsBrowserTest}
+ */
+function CrSettingsUsbDevicesTest() {}
+
+CrSettingsUsbDevicesTest.prototype = {
+  __proto__: CrSettingsBrowserTest.prototype,
+
+  /** @override */
+  browsePreload: 'chrome://md-settings/privacy_page/privacy_page.html',
+
+  /** @override */
+  extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([
+    'test_browser_proxy.js',
+    'test_site_settings_prefs_browser_proxy.js',
+    'usb_devices_tests.js',
+  ]),
+};
 
+TEST_F('CrSettingsUsbDevicesTest', 'UsbDevices', function() {
   mocha.run();
 });