cr_components/chromeos: Split up tests into module subdirs.

Bug: none
Test: browser_tests
Change-Id: I392453663d7abe558c65a4f75e3e3c4080ce39f8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2359391
Commit-Queue: Kyle Horimoto <khorimoto@chromium.org>
Auto-Submit: James Hawkins <jhawkins@chromium.org>
Reviewed-by: Kyle Horimoto <khorimoto@chromium.org>
Cr-Commit-Position: refs/heads/master@{#798804}

chrome/test/data/webui/BUILD.gn

@@ -241,11 +241,11 @@ if (include_js_tests) {
     ]
     if (is_chromeos) {
       data += [
-        "$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/base_page_test.m.js",
-        "$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/cr_policy_network_behavior_mojo_tests.m.js",
-        "$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/cr_policy_network_indicator_mojo_tests.m.js",
-        "$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/network_config_element_behavior_test.m.js",
-        "$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/network_password_input_test.m.js",
+        "$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/cellular_setup/base_page_test.m.js",
+        "$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/network/cr_policy_network_behavior_mojo_tests.m.js",
+        "$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/network/cr_policy_network_indicator_mojo_tests.m.js",
+        "$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/network/network_config_element_behavior_test.m.js",
+        "$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/network/network_password_input_test.m.js",
         "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_searchable_drop_down_tests.m.js",
         "$root_gen_dir/chrome/test/data/webui/settings/chromeos/ambient_mode_page_test.m.js",
         "$root_gen_dir/chrome/test/data/webui/settings/chromeos/bluetooth_page_tests.m.js",

chrome/test/data/webui/cr_components/chromeos/BUILD.gn

@@ -4,12 +4,10 @@
 
 import("//ui/webui/resources/tools/js_modulizer.gni")
 
-js_modulizer("modulize") {
-  input_files = [
-    "base_page_test.js",
-    "cr_policy_network_behavior_mojo_tests.js",
-    "cr_policy_network_indicator_mojo_tests.js",
-    "network_config_element_behavior_test.js",
-    "network_password_input_test.js",
+
+group("modulize") {
+  deps = [
+    "./cellular_setup:modulize",
+    "./network:modulize",
   ]
 }

chrome/test/data/webui/cr_components/chromeos/cellular_setup/BUILD.gn

+# Copyright 2020 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//ui/webui/resources/tools/js_modulizer.gni")
+
+js_modulizer("modulize") {
+  input_files = [
+    "base_page_test.js",
+  ]
+}

chrome/test/data/webui/cr_components/chromeos/base_page_test.js → chrome/test/data/webui/cr_components/chromeos/cellular_setup/base_page_test.js

@@ -6,7 +6,6 @@
 // #import 'chrome://resources/cr_components/chromeos/cellular_setup/base_page.m.js';
 
 // #import {flush, Polymer} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
-// #import {assertFalse, assertTrue} from '../../chai_assert.js';
 // clang-format on
 
 suite('CrComponentsBasePageTest', function() {

chrome/test/data/webui/cr_components/chromeos/cr_components_chromeos_browsertest.js

@@ -23,13 +23,13 @@ GEN('#endif');
 // ]
 // clang-format off
 [
-  ['CrPolicyNetworkBehaviorMojo', 'cr_policy_network_behavior_mojo_tests.js',
+  ['CrPolicyNetworkBehaviorMojo', 'network/cr_policy_network_behavior_mojo_tests.js',
     ['../../cr_elements/cr_policy_strings.js']
   ],
-  ['CrPolicyNetworkIndicatorMojo', 'cr_policy_network_indicator_mojo_tests.js',
+  ['CrPolicyNetworkIndicatorMojo', 'network/cr_policy_network_indicator_mojo_tests.js',
     [ '../../cr_elements/cr_policy_strings.js' ]
   ],
-  ['NetworkConfig', 'network_config_test.js',
+  ['NetworkConfig', 'network/network_config_test.js',
     [
       '//ui/webui/resources/js/assert.js',
       '//ui/webui/resources/js/promise_resolver.js',
@@ -38,16 +38,16 @@ GEN('#endif');
       '../../chromeos/fake_network_config_mojom.js',
     ]
   ],
-  ['NetworkConfigElementBehavior', 'network_config_element_behavior_test.js',
+  ['NetworkConfigElementBehavior', 'network/network_config_element_behavior_test.js',
     []
   ],
-  ['NetworkPasswordInput', 'network_password_input_test.js',
+  ['NetworkPasswordInput', 'network/network_password_input_test.js',
     []
   ],
 ].forEach(test => registerTest('Network', 'internet-config-dialog', ...test));
 
 [
-  ['BasePage', 'base_page_test.js',
+  ['BasePage', 'cellular_setup/base_page_test.js',
     []
   ],
 ].forEach(test => registerTest('CellularSetup', 'cellular-setup', ...test));

chrome/test/data/webui/cr_components/chromeos/cr_components_chromeos_v3_browsertest.js

@@ -10,12 +10,14 @@ GEN('#include "content/public/test/browser_test.h"');
 GEN('#include "chromeos/constants/chromeos_features.h"');
 
 // clang-format off
-[['BasePage', 'base_page_test.m.js'],
- ['CrPolicyNetworkBehaviorMojo', 'cr_policy_network_behavior_mojo_tests.m.js'],
- ['CrPolicyNetworkIndicatorMojo', 'cr_policy_network_indicator_mojo_tests.m.js'],
- ['NetworkConfigElementBehavior', 'network_config_element_behavior_test.m.js'],
- ['NetworkPasswordInput', 'network_password_input_test.m.js'],
+[['CrPolicyNetworkBehaviorMojo', 'network/cr_policy_network_behavior_mojo_tests.m.js'],
+ ['CrPolicyNetworkIndicatorMojo', 'network/cr_policy_network_indicator_mojo_tests.m.js'],
+ ['NetworkConfigElementBehavior', 'network/network_config_element_behavior_test.m.js'],
+ ['NetworkPasswordInput', 'network/network_password_input_test.m.js'],
 ].forEach(test => registerTest('Network', ...test));
+
+[['BasePage', 'cellular_setup/base_page_test.m.js']
+].forEach(test => registerTest('CellularSetup', ...test));
 // clang-format on
 
 function registerTest(componentName, testName, module, caseName) {

chrome/test/data/webui/cr_components/chromeos/network/BUILD.gn

+# Copyright 2020 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//ui/webui/resources/tools/js_modulizer.gni")
+
+js_modulizer("modulize") {
+  input_files = [
+    "cr_policy_network_behavior_mojo_tests.js",
+    "cr_policy_network_indicator_mojo_tests.js",
+    "network_config_element_behavior_test.js",
+    "network_password_input_test.js",
+  ]
+}

chrome/test/data/webui/cr_components/chromeos/cr_policy_network_indicator_mojo_tests.js → chrome/test/data/webui/cr_components/chromeos/network/cr_policy_network_indicator_mojo_tests.js

@@ -6,7 +6,7 @@
 
 // clang-format off
 // #import 'chrome://resources/cr_components/chromeos/network/cr_policy_network_indicator_mojo.m.js';
-// #import '../../cr_elements/cr_policy_strings.js';
+// #import 'chrome://test/cr_elements/cr_policy_strings.js';
 
 // #import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 // clang-format on

chrome/test/data/webui/cr_components/chromeos/network_config_element_behavior_test.js → chrome/test/data/webui/cr_components/chromeos/network/network_config_element_behavior_test.js

@@ -8,10 +8,10 @@
 // #import 'chrome://resources/mojo/chromeos/services/network_config/public/mojom/network_types.mojom-lite.js';
 // #import 'chrome://resources/mojo/mojo/public/mojom/base/time.mojom-lite.js';
 // #import 'chrome://resources/mojo/chromeos/services/network_config/public/mojom/cros_network_config.mojom-lite.js';
+
 // #import {NetworkConfigElementBehavior} from 'chrome://resources/cr_components/chromeos/network/network_config_element_behavior.m.js';
 // #import {OncMojo} from 'chrome://resources/cr_components/chromeos/network/onc_mojo.m.js';
 // #import {flush, Polymer} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
-// #import {assertFalse, assertTrue} from '../../chai_assert.js';
 // clang-format on
 
 suite('CrComponentsNetworkConfigElementBehaviorTest', function() {