WebUI: Migrate test_util to TS and fork for ChromeOS closure

Bug: 1316438 Change-Id: I8c43a9591f4b7b3e3b7d72c3cc35423b451b67c0 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4021970 Reviewed-by: Demetrios Papadopoulos <dpapad@chromium.org> Commit-Queue: Rebekah Potter <rbpotter@chromium.org> Cr-Commit-Position: refs/heads/main@{#1070612}
chromium · Nov 12, 2022 · 4d1bd97 · 4d1bd97
1 parent 8495460
commit 4d1bd97
Show file tree

Hide file tree

Showing 65 changed files with 196 additions and 111 deletions.
diff --git a/chrome/test/data/webui/BUILD.gn b/chrome/test/data/webui/BUILD.gn
@@ -314,14 +314,9 @@ js_type_check("closure_compile_local") {
   deps = [
     ":chai_assert",
     ":test_browser_proxy",
-    ":test_util",
   ]
 }
 
-js_library("test_util") {
-  deps = [ "//ui/webui/resources/js/cr:event_target" ]
-}
-
 js_library("chai_assert") {
   externs_list = [ "//third_party/chaijs/externs/chai-3.5.js" ]
 }
@@ -391,11 +386,7 @@ copy("copy_checked_in_dts_files") {
   outputs = [ "$target_gen_dir/tsc/{{source_target_relative}}" ]
 }
 
-generate_definitions_js_files = [
-  "mojo_webui_test_support.js",
-  "test_util.js",
-]
-
+generate_definitions_js_files = [ "mojo_webui_test_support.js" ]
 if (is_chromeos_ash) {
   generate_definitions_js_files += [ "chromeos/test_store.js" ]
 }
@@ -437,6 +428,7 @@ ts_library("build_ts") {
     "text_defaults_test.ts",
     "test_plural_string_proxy.ts",
     "test_store_ts.ts",
+    "test_util.ts",
   ]
 
   if (is_chromeos_ash) {
@@ -481,7 +473,6 @@ generate_grd("build_grd") {
     "mocha_adapter.js",
     "mojo_webui_test_support.js",
     "test_browser_proxy.js",
-    "test_util.js",
     "usb_internals_test.js",
 
     "invalidations/invalidations_test.js",

diff --git a/chrome/test/data/webui/chromeos/BUILD.gn b/chrome/test/data/webui/chromeos/BUILD.gn
@@ -17,6 +17,7 @@ js_type_check("closure_compile_local") {
   deps = [
     ":fake_network_config_mojom",
     ":mock_controller.m",
+    ":test_util",
   ]
 }
 
@@ -31,6 +32,10 @@ js_library("fake_network_config_mojom") {
 js_library("mock_controller.m") {
 }
 
+js_library("test_util") {
+  deps = [ "//ui/webui/resources/js/cr:event_target" ]
+}
+
 group("closure_compile") {
   public_deps = [
     ":closure_compile_local",

diff --git a/chrome/test/data/webui/chromeos/ash_common/BUILD.gn b/chrome/test/data/webui/chromeos/ash_common/BUILD.gn
@@ -105,8 +105,8 @@ js_library("navigation_view_panel_test") {
 
 js_library("page_toolbar_test") {
   deps = [
+    "..:test_util",
     "../..:chai_assert",
-    "../..:test_util",
     "//ash/webui/common/resources:page_toolbar",
   ]
 }
diff --git a/chrome/test/data/webui/chromeos/ash_common/navigation_selector_test.js b/chrome/test/data/webui/chromeos/ash_common/navigation_selector_test.js
@@ -6,7 +6,7 @@ import {NavigationSelectorElement, SelectorItem} from 'chrome://resources/ash/co
 import {waitAfterNextRender} from 'chrome://webui-test/polymer_test_util.js';
 
 import {assertEquals, assertFalse, assertTrue} from '../../chai_assert.js';
-import {isVisible} from '../../test_util.js';
+import {isVisible} from 'chrome://webui-test/test_util.js';
 
 export function navigationSelectorTestSuite() {
   /** @type {?NavigationSelectorElement} */

diff --git a/chrome/test/data/webui/chromeos/ash_common/navigation_view_panel_test.js b/chrome/test/data/webui/chromeos/ash_common/navigation_view_panel_test.js
@@ -8,7 +8,7 @@ import {assert} from 'chrome://resources/js/assert.js';
 import {flushTasks} from 'chrome://webui-test/polymer_test_util.js';
 
 import {assertEquals, assertFalse, assertThrows, assertTrue} from '../../chai_assert.js';
-import {eventToPromise} from '../../test_util.js';
+import {eventToPromise} from 'chrome://webui-test/test_util.js';
 
 export function navigationViewPanelTestSuite() {
   /** @type {?NavigationViewPanelElement} */

diff --git a/chrome/test/data/webui/chromeos/ash_common/page_toolbar_test.js b/chrome/test/data/webui/chromeos/ash_common/page_toolbar_test.js
@@ -6,7 +6,7 @@ import {PageToolbarElement} from 'chrome://resources/ash/common/page_toolbar.js'
 import {flushTasks} from 'chrome://webui-test/polymer_test_util.js';
 
 import {assertEquals, assertFalse, assertTrue} from '../../chai_assert.js';
-import {isVisible} from '../../test_util.js';
+import {isVisible} from '../test_util.js';
 
 export function pageToolbarTestSuite() {
   /** @type {?PageToolbarElement} */

diff --git a/chrome/test/data/webui/chromeos/cloud_upload/BUILD.gn b/chrome/test/data/webui/chromeos/cloud_upload/BUILD.gn
@@ -19,7 +19,10 @@ ts_library("build_ts") {
                     target_gen_dir),
   ]
   composite = true
-  deps = [ "//chrome/browser/resources/chromeos/cloud_upload:build_ts" ]
+  deps = [
+    "../..:build_ts",
+    "//chrome/browser/resources/chromeos/cloud_upload:build_ts",
+  ]
 }
 
 generate_grd("build_grdp") {