Print Preview: Closure compile key_event and layout_settings tests

Bug: 1000989
Change-Id: I8bf967219ae6fb20446bb2d096be49f4a3765be2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2360697Reviewed-by: dpapad <dpapad@chromium.org>
Commit-Queue: Rebekah Potter <rbpotter@chromium.org>
Cr-Commit-Position: refs/heads/master@{#799414}

chrome/test/data/webui/print_preview/BUILD.gn

@@ -32,9 +32,9 @@ js_type_check("closure_compile") {
     ":duplex_settings_test",
     ":header_test",
     ":invalid_settings_browsertest",
+    ":key_event_test",
+    ":layout_settings_test",
 
-    #":key_event_test",
-    #":layout_settings_test",
     #":link_container_test",
     #":margins_settings_test",
     #":media_size_settings_test",
@@ -376,3 +376,28 @@ js_library("invalid_settings_browsertest") {
   ]
   externs_list = [ "$externs_path/mocha-2.5.js" ]
 }
+
+js_library("key_event_test") {
+  deps = [
+    ":native_layer_stub",
+    ":print_preview_test_utils",
+    ":test_plugin_proxy",
+    "..:chai_assert",
+    "..:test_util.m",
+    "//chrome/browser/resources/print_preview:print_preview",
+    "//ui/webui/resources/js:assert.m",
+    "//ui/webui/resources/js:cr.m",
+  ]
+  externs_list = [ "$externs_path/mocha-2.5.js" ]
+}
+
+js_library("layout_settings_test") {
+  deps = [
+    ":print_preview_test_utils",
+    "..:chai_assert",
+    "..:test_util.m",
+    "//chrome/browser/resources/print_preview:print_preview",
+    "//ui/webui/resources/js:assert.m",
+  ]
+  externs_list = [ "$externs_path/mocha-2.5.js" ]
+}

chrome/test/data/webui/print_preview/key_event_test.js

@@ -7,12 +7,16 @@ import {assert} from 'chrome://resources/js/assert.m.js';
 import {isChromeOS, isMac, isWindows} from 'chrome://resources/js/cr.m.js';
 import {keyEventOn} from 'chrome://resources/polymer/v3_0/iron-test-helpers/mock-interactions.js';
 import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
-import {NativeLayerStub} from 'chrome://test/print_preview/native_layer_stub.js';
-import {getCddTemplateWithAdvancedSettings, getDefaultInitialSettings} from 'chrome://test/print_preview/print_preview_test_utils.js';
-import {TestPluginProxy} from 'chrome://test/print_preview/test_plugin_proxy.js';
-import {eventToPromise, flushTasks} from 'chrome://test/test_util.m.js';
+
+import {assertEquals, assertTrue} from '../chai_assert.js';
+import {eventToPromise, flushTasks} from '../test_util.m.js';
+
+import {NativeLayerStub} from './native_layer_stub.js';
+import {getCddTemplateWithAdvancedSettings, getDefaultInitialSettings} from './print_preview_test_utils.js';
+import {TestPluginProxy} from './test_plugin_proxy.js';
 
 window.key_event_test = {};
+const key_event_test = window.key_event_test;
 key_event_test.suiteName = 'KeyEventTest';
 /** @enum {string} */
 key_event_test.TestNames = {
@@ -28,11 +32,11 @@ key_event_test.TestNames = {
 };
 
 suite(key_event_test.suiteName, function() {
-  /** @type {?PrintPreviewAppElement} */
-  let page = null;
+  /** @type {!PrintPreviewAppElement} */
+  let page;
 
-  /** @type {?NativeLayer} */
-  let nativeLayer = null;
+  /** @type {!NativeLayerStub} */
+  let nativeLayer;
 
   /** @override */
   setup(function() {
@@ -48,9 +52,11 @@ suite(key_event_test.suiteName, function() {
     PluginProxyImpl.instance_ = pluginProxy;
 
     document.body.innerHTML = '';
-    page = document.createElement('print-preview-app');
+    page = /** @type {!PrintPreviewAppElement} */ (
+        document.createElement('print-preview-app'));
     document.body.appendChild(page);
-    const previewArea = page.$.previewArea;
+    const previewArea = /** @type {!PrintPreviewPreviewAreaElement} */ (
+        page.$$('#previewArea'));
 
     // Wait for initialization to complete.
     return Promise

chrome/test/data/webui/print_preview/layout_settings_test.js

@@ -5,19 +5,25 @@
 import 'chrome://print/print_preview.js';
 
 import {assert} from 'chrome://resources/js/assert.m.js';
-import {selectOption} from 'chrome://test/print_preview/print_preview_test_utils.js';
-import {eventToPromise, fakeDataBind} from 'chrome://test/test_util.m.js';
+
+import {assertEquals, assertFalse, assertTrue} from '../chai_assert.js';
+import {eventToPromise, fakeDataBind} from '../test_util.m.js';
+
+import {selectOption} from './print_preview_test_utils.js';
 
 suite('LayoutSettingsTest', function() {
-  let layoutSection = null;
+  /** @type {!PrintPreviewLayoutSettingsElement} */
+  let layoutSection;
 
   /** @override */
   setup(function() {
-    PolymerTest.clearBody();
-    const model = document.createElement('print-preview-model');
+    document.body.innerHTML = '';
+    const model = /** @type {!PrintPreviewModelElement} */ (
+        document.createElement('print-preview-model'));
     document.body.appendChild(model);
 
-    layoutSection = document.createElement('print-preview-layout-settings');
+    layoutSection = /** @type {!PrintPreviewLayoutSettingsElement} */ (
+        document.createElement('print-preview-layout-settings'));
     layoutSection.settings = model.settings;
     layoutSection.disabled = false;
     fakeDataBind(model, layoutSection, 'settings');
@@ -39,13 +45,15 @@ suite('LayoutSettingsTest', function() {
     // Verify that the selected option and names are as expected.
     const select = layoutSection.$$('select');
     assertEquals('portrait', select.value);
-    assertFalse(layoutSection.getSettingValue('layout'));
+    assertFalse(
+        /** @type {boolean} */ (layoutSection.getSettingValue('layout')));
     assertFalse(layoutSection.getSetting('layout').setFromUi);
     assertEquals(2, select.options.length);
 
     // Verify that selecting an new option in the dropdown sets the setting.
     await selectOption(layoutSection, 'landscape');
-    assertTrue(layoutSection.getSettingValue('layout'));
+    assertTrue(
+        /** @type {boolean} */ (layoutSection.getSettingValue('layout')));
     assertTrue(layoutSection.getSetting('layout').setFromUi);
   });
 });