Refactor overall test suite, use replaceApp in HistoryListTest

chrome/test/data/webui/md_history/md_history_browsertest.js

Index: chrome/test/data/webui/md_history/md_history_browsertest.js
diff --git a/chrome/test/data/webui/md_history/md_history_browsertest.js b/chrome/test/data/webui/md_history/md_history_browsertest.js
index 2582e1d22f533f8125770e9fe3f046d0b9ec1994..2b9ed5b1fd10bc0607300216b8d5b3c7082720ee 100644
--- a/chrome/test/data/webui/md_history/md_history_browsertest.js
+++ b/chrome/test/data/webui/md_history/md_history_browsertest.js
@@ -28,17 +28,6 @@ MaterialHistoryBrowserTest.prototype = {
 
   extraLibraries: PolymerTest.getLibraries(ROOT_PATH).concat([
     'test_util.js',
-    'browser_service_test.js',
-    'history_drawer_test.js',
-    'history_grouped_list_test.js',
-    'history_item_test.js',
-    'history_list_test.js',
-    'history_metrics_test.js',
-    'history_overflow_menu_test.js',
-    'history_routing_test.js',
-    'history_supervised_user_test.js',
-    'history_synced_tabs_test.js',
-    'history_toolbar_test.js',
   ]),
 
   /** @override */
@@ -66,84 +55,130 @@ MaterialHistoryBrowserTest.prototype = {
   },
 };
 
-TEST_F('MaterialHistoryBrowserTest', 'BrowserServiceTest', function() {
+function MaterialHistoryBrowserServiceTest() {}
+
+MaterialHistoryBrowserServiceTest.prototype = {
+  __proto__: MaterialHistoryBrowserTest.prototype,
+
+  extraLibraries: MaterialHistoryBrowserTest.prototype.extraLibraries.concat([
+    'browser_service_test.js',
+  ]),
+};
+
+TEST_F('MaterialHistoryBrowserServiceTest', 'All', function() {
   md_history.browser_service_test.registerTests();
   mocha.run();
 });
 
-TEST_F('MaterialHistoryBrowserTest', 'DrawerTest', function() {
+function MaterialHistoryDrawerTest() {}
+
+MaterialHistoryDrawerTest.prototype = {
+  __proto__: MaterialHistoryBrowserTest.prototype,
+
+  extraLibraries: MaterialHistoryBrowserTest.prototype.extraLibraries.concat([
+    'history_drawer_test.js',
+  ]),
+};
+
+TEST_F('MaterialHistoryDrawerTest', 'All', function() {
   md_history.history_drawer_test.registerTests();
   mocha.run();
 });
 
-TEST_F('MaterialHistoryBrowserTest', 'HistoryGroupedListTest', function() {
+function MaterialHistoryGroupedListTest() {}
+
+MaterialHistoryGroupedListTest.prototype = {
+  __proto__: MaterialHistoryBrowserTest.prototype,
+
+  extraLibraries: MaterialHistoryBrowserTest.prototype.extraLibraries.concat([
+    'history_grouped_list_test.js',
+  ]),
+};
+
+TEST_F('MaterialHistoryGroupedListTest', 'All', function() {
   md_history.history_grouped_list_test.registerTests();
   mocha.run();
 });
 
-TEST_F('MaterialHistoryBrowserTest', 'HistoryItemTest', function() {
+function MaterialHistoryItemTest() {}
+
+MaterialHistoryItemTest.prototype = {
+  __proto__: MaterialHistoryBrowserTest.prototype,
+
+  extraLibraries: MaterialHistoryBrowserTest.prototype.extraLibraries.concat([
+    'history_item_test.js',
+  ]),
+};
+
+TEST_F('MaterialHistoryItemTest', 'All', function() {
   md_history.history_item_test.registerTests();
   mocha.run();
 });
 
-TEST_F('MaterialHistoryBrowserTest', 'HistoryListTest', function() {
+function MaterialHistoryListTest() {}
+
+MaterialHistoryListTest.prototype = {
+  __proto__: MaterialHistoryBrowserTest.prototype,
+
+  extraLibraries: MaterialHistoryBrowserTest.prototype.extraLibraries.concat([
+    'history_list_test.js',
+  ]),
+};
+
+TEST_F('MaterialHistoryListTest', 'All', function() {
   md_history.history_list_test.registerTests();
   mocha.run();
 });
 
-TEST_F('MaterialHistoryBrowserTest', 'Metrics', function() {
-  md_history.history_metrics_test.registerTests();
-  mocha.run();
-});
+function MaterialHistoryMetricsTest() {}
 
-TEST_F('MaterialHistoryBrowserTest', 'HistoryToolbarTest', function() {
-  md_history.history_toolbar_test.registerTests();
-  mocha.run();
-});
+MaterialHistoryMetricsTest.prototype = {
+  __proto__: MaterialHistoryBrowserTest.prototype,
 
-TEST_F('MaterialHistoryBrowserTest', 'HistoryToolbarFocusTest', function() {
-  md_history.history_toolbar_focus_test.registerTests();
-  mocha.run();
-});
+  extraLibraries: MaterialHistoryBrowserTest.prototype.extraLibraries.concat([
+    'history_metrics_test.js',
+  ]),
+};
 
-TEST_F('MaterialHistoryBrowserTest', 'HistoryOverflowMenuTest', function() {
-  md_history.history_overflow_menu_test.registerTests();
+TEST_F('MaterialHistoryMetricsTest', 'All', function() {
+  md_history.history_metrics_test.registerTests();
   mocha.run();
 });
 
-TEST_F('MaterialHistoryBrowserTest', 'RoutingTest', function() {
-  md_history.history_routing_test.registerTests();
-  mocha.run();
-});
+function MaterialHistoryOverflowMenuTest() {}
 
-// Fails on Mac, http://crbug.com/640862
-TEST_F('MaterialHistoryBrowserTest', 'DISABLED_SyncedTabsTest', function() {
-  md_history.history_synced_tabs_test.registerTests();
+MaterialHistoryOverflowMenuTest.prototype = {
+  __proto__: MaterialHistoryBrowserTest.prototype,
+
+  extraLibraries: MaterialHistoryBrowserTest.prototype.extraLibraries.concat([
+    'history_overflow_menu_test.js',
+  ]),
+};
+
+TEST_F('MaterialHistoryOverflowMenuTest', 'All', function() {
+  md_history.history_overflow_menu_test.registerTests();
   mocha.run();
 });
 
-function MaterialHistoryDeletionDisabledTest() {}
+function MaterialHistoryRoutingTest() {}
 
-MaterialHistoryDeletionDisabledTest.prototype = {
+MaterialHistoryRoutingTest.prototype = {
   __proto__: MaterialHistoryBrowserTest.prototype,
 
-  typedefCppFixture: 'HistoryUIBrowserTest',
-
-  testGenPreamble: function() {
-    GEN('  SetDeleteAllowed(false);');
-  }
+  extraLibraries: MaterialHistoryBrowserTest.prototype.extraLibraries.concat([
+    'history_routing_test.js',
+  ]),
 };
 
-TEST_F('MaterialHistoryDeletionDisabledTest', 'HistorySupervisedUserTest',
-    function() {
-  md_history.history_supervised_user_test.registerTests();
+TEST_F('MaterialHistoryRoutingTest', 'All', function() {
+  md_history.history_routing_test.registerTests();
   mocha.run();
 });
 
-function MaterialHistoryWithQueryParamTest() {}
+function MaterialHistoryRoutingWithQueryParamTest() {}
 
-MaterialHistoryWithQueryParamTest.prototype = {
-  __proto__: MaterialHistoryBrowserTest.prototype,
+MaterialHistoryRoutingWithQueryParamTest.prototype = {
+  __proto__: MaterialHistoryRoutingTest.prototype,
 
   browsePreload: 'chrome://history?q=query',
 
@@ -168,8 +203,64 @@ MaterialHistoryWithQueryParamTest.prototype = {
   },
 };
 
-TEST_F('MaterialHistoryWithQueryParamTest', 'RoutingTestWithQueryParam',
-  function() {
+TEST_F('MaterialHistoryRoutingWithQueryParamTest', 'All', function() {
     md_history.history_routing_test_with_query_param.registerTests();
     mocha.run();
 });
+
+function MaterialHistorySyncedTabsTest() {}
+
+MaterialHistorySyncedTabsTest.prototype = {
+  __proto__: MaterialHistoryBrowserTest.prototype,
+
+  extraLibraries: MaterialHistoryBrowserTest.prototype.extraLibraries.concat([
+    'history_synced_tabs_test.js',
+  ]),
+};
+
+// Fails on Mac, http://crbug.com/640862
+TEST_F('MaterialHistorySyncedTabsTest', 'DISABLED_All', function() {
+  md_history.history_synced_tabs_test.registerTests();

[Dan Beam, 2016/11/03 18:07:51]

i think a good next step might be to auto-register tests (i.e. just unwrap them
from a registerTests() method) and drop these lines and just have "mocha.run()"

[tsergeant, 2016/11/03 22:34:32]

Yup! I originally did this to HistoryListTest in this CL, but punted it to a
follow-up.

+  mocha.run();
+});
+
+function MaterialHistorySupervisedUserTest() {}
+
+MaterialHistorySupervisedUserTest.prototype = {
+  __proto__: MaterialHistoryBrowserTest.prototype,
+
+  typedefCppFixture: 'HistoryUIBrowserTest',
+
+  testGenPreamble: function() {
+    GEN('  SetDeleteAllowed(false);');
+  },
+
+  extraLibraries: MaterialHistoryBrowserTest.prototype.extraLibraries.concat([
+    'history_supervised_user_test.js',
+  ]),
+};
+
+TEST_F('MaterialHistorySupervisedUserTest', 'All', function() {
+  md_history.history_supervised_user_test.registerTests();
+  mocha.run();
+});
+
+function MaterialHistoryToolbarTest() {}
+
+MaterialHistoryToolbarTest.prototype = {
+  __proto__: MaterialHistoryBrowserTest.prototype,
+
+  extraLibraries: MaterialHistoryBrowserTest.prototype.extraLibraries.concat([
+    'history_toolbar_test.js',
+  ]),
+};
+
+TEST_F('MaterialHistoryToolbarTest', 'Basic', function() {
+  md_history.history_toolbar_test.registerTests();
+  mocha.run();
+});
+
+TEST_F('MaterialHistoryToolbarTest', 'Focus', function() {
+  md_history.history_toolbar_focus_test.registerTests();
+  mocha.run();
+});