Print Preview: Closure compile more tests

Closure compile:
-advanced_item_test
-button_strip_test
-button_strip_interactive_test

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

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

@@ -15,10 +15,9 @@ js_type_check("closure_compile") {
   # TODO(crbug.com/1000989): Add JS type checking for all commented out targets.
   deps = [
     ":advanced_dialog_test",
-
-    #":advanced_item_test",
-    #":button_strip_interactive_test",
-    #":button_strip_test",
+    ":advanced_item_test",
+    ":button_strip_interactive_test",
+    ":button_strip_test",
     ":cloud_print_interface_stub",
 
     #":color_settings_test",
@@ -90,6 +89,37 @@ js_library("advanced_dialog_test") {
   externs_list = [ "$externs_path/mocha-2.5.js" ]
 }
 
+js_library("advanced_item_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" ]
+}
+
+js_library("button_strip_test") {
+  deps = [
+    "..: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" ]
+}
+
+js_library("button_strip_interactive_test") {
+  deps = [
+    "..: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" ]
+}
+
 js_library("print_preview_test_utils") {
   deps = [
     "..:test_util.m",

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

@@ -6,10 +6,14 @@ import 'chrome://print/print_preview.js';
 
 import {assert} from 'chrome://resources/js/assert.m.js';
 import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
-import {getCddTemplateWithAdvancedSettings} from 'chrome://test/print_preview/print_preview_test_utils.js';
-import {fakeDataBind} from 'chrome://test/test_util.m.js';
+
+import {assertEquals, assertFalse, assertTrue} from '../chai_assert.js';
+import {fakeDataBind} from '../test_util.m.js';
+
+import {getCddTemplateWithAdvancedSettings} from './print_preview_test_utils.js';
 
 window.advanced_item_test = {};
+const advanced_item_test = window.advanced_item_test;
 advanced_item_test.suiteName = 'AdvancedItemTest';
 /** @enum {string} */
 advanced_item_test.TestNames = {
@@ -24,16 +28,18 @@ advanced_item_test.TestNames = {
 };
 
 suite(advanced_item_test.suiteName, function() {
-  /** @type {?PrintPreviewAdvancedSettingsItemElement} */
-  let item = null;
+  /** @type {!PrintPreviewAdvancedSettingsItemElement} */
+  let item;
 
   /** @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);
 
-    item = document.createElement('print-preview-advanced-settings-item');
+    item = /** @type {!PrintPreviewAdvancedSettingsItemElement} */ (
+        document.createElement('print-preview-advanced-settings-item'));
 
     // Create capability.
     item.capability = getCddTemplateWithAdvancedSettings(2, 'FooDevice')

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

@@ -4,9 +4,11 @@
 
 import {Destination, DestinationConnectionStatus, DestinationOrigin, DestinationType, State} from 'chrome://print/print_preview.js';
 import {assert} from 'chrome://resources/js/assert.m.js';
-import {eventToPromise} from 'chrome://test/test_util.m.js';
+import {assertTrue} from '../chai_assert.js';
+import {eventToPromise} from '../test_util.m.js';
 
 window.button_strip_interactive_test = {};
+const button_strip_interactive_test = window.button_strip_interactive_test;
 button_strip_interactive_test.suiteName = 'ButtonStripInteractiveTest';
 /** @enum {string} */
 button_strip_interactive_test.TestNames = {
@@ -14,14 +16,14 @@ button_strip_interactive_test.TestNames = {
 };
 
 suite(button_strip_interactive_test.suiteName, function() {
-  /** @type {?PrintPreviewButtonStripElement} */
-  let buttonStrip = null;
+  /** @type {!PrintPreviewButtonStripElement} */
+  let buttonStrip;
 
   /** @override */
   setup(function() {
-    PolymerTest.clearBody();
-
-    buttonStrip = document.createElement('print-preview-button-strip');
+    document.body.innerHTML = '';
+    buttonStrip = /** @type {!PrintPreviewButtonStripElement} */ (
+        document.createElement('print-preview-button-strip'));
     buttonStrip.destination = new Destination(
         'FooDevice', DestinationType.GOOGLE, DestinationOrigin.COOKIES,
         'FooName', DestinationConnectionStatus.ONLINE);
@@ -35,8 +37,7 @@ suite(button_strip_interactive_test.suiteName, function() {
   test(
       assert(button_strip_interactive_test.TestNames.FocusPrintOnReady),
       function() {
-        const printButton = buttonStrip.$$('.action-button');
-        assertTrue(!!printButton);
+        const printButton = assert(buttonStrip.$$('.action-button'));
         const whenFocusDone = eventToPromise('focus', printButton);
 
         // Simulate initialization finishing.

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

@@ -5,9 +5,12 @@
 import {Destination, DestinationConnectionStatus, DestinationOrigin, DestinationType, State} from 'chrome://print/print_preview.js';
 import {assert} from 'chrome://resources/js/assert.m.js';
 import {isWindows} from 'chrome://resources/js/cr.m.js';
-import {eventToPromise} from 'chrome://test/test_util.m.js';
+
+import {assertEquals, assertFalse, assertTrue} from '../chai_assert.js';
+import {eventToPromise} from '../test_util.m.js';
 
 window.button_strip_test = {};
+const button_strip_test = window.button_strip_test;
 button_strip_test.suiteName = 'ButtonStripTest';
 /** @enum {string} */
 button_strip_test.TestNames = {
@@ -17,13 +20,14 @@ button_strip_test.TestNames = {
 };
 
 suite(button_strip_test.suiteName, function() {
-  /** @type {?PrintPreviewButtonStripElement} */
-  let buttonStrip = null;
+  /** @type {!PrintPreviewButtonStripElement} */
+  let buttonStrip;
 
   /** @override */
   setup(function() {
-    PolymerTest.clearBody();
-    buttonStrip = document.createElement('print-preview-button-strip');
+    document.body.innerHTML = '';
+    buttonStrip = /** @type {!PrintPreviewButtonStripElement} */ (
+        document.createElement('print-preview-button-strip'));
 
     buttonStrip.destination = new Destination(
         'FooDevice', DestinationType.GOOGLE, DestinationOrigin.COOKIES,