Skip to content

Commit

Permalink
Migrate usb_internals_test.js to TypeScript.
Browse files Browse the repository at this point in the history
This also creates c/t/d/w/usb_internals and adds a build target.

Bug: None
Change-Id: I2eaf1fb35c01909db109ff5a919d19d2940c7fb4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4338278
Reviewed-by: Demetrios Papadopoulos <dpapad@chromium.org>
Commit-Queue: Cole Horvitz <colehorvitz@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1118368}
  • Loading branch information
Cole Horvitz authored and Chromium LUCI CQ committed Mar 16, 2023
1 parent 5a921c7 commit a676ef8
Show file tree
Hide file tree
Showing 8 changed files with 691 additions and 538 deletions.
1 change: 1 addition & 0 deletions chrome/browser/resources/usb_internals/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ build_webui("build") {
"$root_gen_dir/services/device/public/mojom/usb_manager_client.mojom-webui.ts",
"$root_gen_dir/services/device/public/mojom/usb_manager_test.mojom-webui.ts",
]
ts_composite = true
ts_deps = [
"//ui/webui/resources/cr_elements:build_ts",
"//ui/webui/resources/js:build_ts",
Expand Down
10 changes: 9 additions & 1 deletion chrome/browser/resources/usb_internals/app.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
*/

import 'chrome://resources/cr_elements/cr_tab_box/cr_tab_box.js';
import 'chrome://resources/cr_elements/cr_tree/cr_tree.js';

import {assert} from 'chrome://resources/js/assert_ts.js';

Expand All @@ -24,7 +25,7 @@ export function setSetupFn(newSetupFn: () => Promise<void>) {
setupFn = newSetupFn;
}

class UsbInternalsAppElement extends HTMLElement {
export class UsbInternalsAppElement extends HTMLElement {
private usbManagerTest_: UsbDeviceManagerTestRemote|null = null;

static get template() {
Expand Down Expand Up @@ -123,4 +124,11 @@ class UsbInternalsAppElement extends HTMLElement {
response.success ? 'action-success' : 'action-failure';
}
}

declare global {
interface HTMLElementTagNameMap {
'usb-internals-app': UsbInternalsAppElement;
}
}

customElements.define('usb-internals-app', UsbInternalsAppElement);
5 changes: 3 additions & 2 deletions chrome/test/data/webui/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ if (include_js_tests) {
"side_panel/customize_chrome/side_panel_customize_chrome_browsertest.js",
"side_panel/side_panel_browsertest.js",
"tab_search/tab_search_browsertest.js",
"usb_internals_browsertest.js",
"usb_internals/usb_internals_browsertest.js",
]
if (is_chromeos_ash) {
sources += [
Expand Down Expand Up @@ -404,7 +404,6 @@ ts_library("build_ts") {
# from tsconfig_base.json.
"mocha_adapter.js",
"mojo_webui_test_support.js",
"usb_internals_test.js",
]

if (is_chromeos_ash) {
Expand Down Expand Up @@ -465,6 +464,7 @@ generate_grd("build_grd") {
"side_panel/customize_chrome:build_grdp",
"support_tool:build_grdp",
"tab_search:build_grdp",
"usb_internals:build_grdp",
"whats_new:build_grdp",
]

Expand Down Expand Up @@ -493,6 +493,7 @@ generate_grd("build_grd") {
"$target_gen_dir/support_tool/resources.grdp",
"$target_gen_dir/tab_search/resources.grdp",
"$target_gen_dir/web_ui_test_mojo_resources.grdp",
"$target_gen_dir/usb_internals/resources.grdp",
"$target_gen_dir/whats_new/resources.grdp",
]

Expand Down
24 changes: 24 additions & 0 deletions chrome/test/data/webui/usb_internals/BUILD.gn
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# Copyright 2023 The Chromium Authors
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

import("../build_webui_tests.gni")

build_webui_tests("build") {
resource_path_prefix = "usb_internals"

files = [ "usb_internals_test.ts" ]

ts_path_mappings =
[ "chrome://usb-internals/*|" +
rebase_path(
"$root_gen_dir/chrome/browser/resources/usb_internals/tsc/*",
target_gen_dir) ]

ts_deps = [
"//chrome/browser/resources/usb_internals:build_ts",
"//ui/webui/resources/cr_elements:build_ts",
"//ui/webui/resources/js:build_ts",
"//ui/webui/resources/mojo:build_ts",
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ TEST_F('UsbInternalsTest', 'WebUIValueRenderTest', async function() {
mocha.run();
};
script.src =
module.getTrustedScriptURL`chrome://webui-test/usb_internals_test.js`;
module
.getTrustedScriptURL`chrome://webui-test/usb_internals/usb_internals_test.js`;
document.body.appendChild(script);
});

0 comments on commit a676ef8

Please sign in to comment.