Commit 0c7f224c authored by dpapad's avatar dpapad Committed by Commit Bot

PDF Viewer: Reduce test deps to various Polymer/MockInteractions helpers.

Specifically:
 - Replace MockInteractions.tap() with a click() call.
 - Replace Polymer.Base.create() with document.createElement().

This is in preparation of migrating to Polymer3, where every dependency needs to
be imported as a module.

Bug: 1005029
Change-Id: I87b07d59b69df69258b2d7a1492cea014e053768
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1819678Reviewed-by: default avatarRebekah Potter <rbpotter@chromium.org>
Commit-Queue: Demetrios Papadopoulos <dpapad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#699063}
parent 359ca5eb
......@@ -67,7 +67,7 @@ var tests = [
// Clicking on the plugin should close the bookmarks menu.
chrome.test.assertFalse(dropdown.dropdownOpen);
MockInteractions.tap(dropdown.$.button);
dropdown.$.button.click();
chrome.test.assertTrue(dropdown.dropdownOpen);
// Generate pointer event manually, as MockInteractions doesn't include
// this.
......@@ -75,7 +75,7 @@ var tests = [
chrome.test.assertFalse(dropdown.dropdownOpen,
"Clicking plugin closes dropdown");
MockInteractions.tap(dropdown.$.button);
dropdown.$.button.click();
chrome.test.assertTrue(dropdown.dropdownOpen);
MockInteractions.pressAndReleaseKeyOn(document, ESC_KEY);
chrome.test.assertFalse(dropdown.dropdownOpen,
......
......@@ -60,7 +60,7 @@ var tests = [
var rootBookmarks =
bookmarkContent.shadowRoot.querySelectorAll('viewer-bookmark');
chrome.test.assertEq(3, rootBookmarks.length, "three root bookmarks");
MockInteractions.tap(rootBookmarks[0].$.expand);
rootBookmarks[0].$.expand.click();
Polymer.dom.flush();
......@@ -96,7 +96,7 @@ var tests = [
lastXChange = undefined;
lastYChange = undefined;
lastUriNavigation = undefined;
MockInteractions.tap(tapTarget);
tapTarget.click();
chrome.test.assertEq(expectedEvent.page, lastPageChange);
chrome.test.assertEq(expectedEvent.x, lastXChange);
chrome.test.assertEq(expectedEvent.y, lastYChange);
......
......@@ -35,8 +35,8 @@ var tests = [
* past document bounds.
*/
function testPageSelectorChange() {
var selector =
Polymer.Base.create('viewer-page-selector', {docLength: 1234});
var selector = document.createElement('viewer-page-selector');
selector.docLength = 1234;
document.body.appendChild(selector);
var input = selector.pageSelector;
......@@ -75,8 +75,8 @@ var tests = [
* Test that viewer-page-selector changes in response to setting docLength.
*/
function testPageSelectorDocLength() {
var selector =
Polymer.Base.create('viewer-page-selector', {docLength: 1234});
var selector = document.createElement('viewer-page-selector');
selector.docLength = 1234;
document.body.appendChild(selector);
chrome.test.assertEq('1234', selector.$.pagelength.textContent);
chrome.test.assertEq(
......@@ -88,23 +88,22 @@ var tests = [
* Test that clicking the dropdown icon opens/closes the dropdown.
*/
function testToolbarDropdownShowHide() {
var dropdown = Polymer.Base.create('viewer-toolbar-dropdown', {
header: 'Test Menu',
closedIcon: 'closedIcon',
openIcon: 'openIcon'
});
var dropdown = document.createElement('viewer-toolbar-dropdown');
dropdown.header = 'Test Menu';
dropdown.closedIcon = 'closedIcon';
dropdown.openIcon = 'openIcon';
document.body.appendChild(dropdown);
const button = dropdown.$.button;
chrome.test.assertFalse(dropdown.dropdownOpen);
chrome.test.assertEq('closedIcon,cr:arrow-drop-down', button.ironIcon);
MockInteractions.tap(button);
button.click();
chrome.test.assertTrue(dropdown.dropdownOpen);
chrome.test.assertEq('openIcon,cr:arrow-drop-down', button.ironIcon);
MockInteractions.tap(button);
button.click();
chrome.test.assertFalse(dropdown.dropdownOpen);
......@@ -134,7 +133,7 @@ var tests = [
bookmarkContent.shadowRoot.querySelectorAll('viewer-bookmark');
chrome.test.assertEq(1, rootBookmarks.length, "one root bookmark");
var rootBookmark = rootBookmarks[0];
MockInteractions.tap(rootBookmark.$.expand);
rootBookmark.$.expand.click();
Polymer.dom.flush();
......@@ -149,10 +148,10 @@ var tests = [
lastPageChange = e.detail.page;
});
MockInteractions.tap(rootBookmark.$.item);
rootBookmark.$.item.click();
chrome.test.assertEq(1, lastPageChange);
MockInteractions.tap(subBookmarks[1].$.item);
subBookmarks[1].$.item.click();
chrome.test.assertEq(3, lastPageChange);
chrome.test.succeed();
......@@ -180,17 +179,17 @@ var tests = [
chrome.test.assertTrue(button.ironIcon.endsWith(fitPageIcon));
// Tap 1: Fire fit-to-changed(FIT_TO_PAGE), show fit-to-width.
MockInteractions.tap(button);
button.click();
fitToEventChecker.assertEvent(FittingType.FIT_TO_PAGE, true);
chrome.test.assertTrue(button.ironIcon.endsWith(fitWidthIcon));
// Tap 2: Fire fit-to-changed(FIT_TO_WIDTH), show fit-to-page.
MockInteractions.tap(button);
button.click();
fitToEventChecker.assertEvent(FittingType.FIT_TO_WIDTH, true);
chrome.test.assertTrue(button.ironIcon.endsWith(fitPageIcon));
// Tap 3: Fire fit-to-changed(FIT_TO_PAGE) again.
MockInteractions.tap(button);
button.click();
fitToEventChecker.assertEvent(FittingType.FIT_TO_PAGE, true);
chrome.test.assertTrue(button.ironIcon.endsWith(fitWidthIcon));
......@@ -206,7 +205,7 @@ var tests = [
chrome.test.assertTrue(button.ironIcon.endsWith(fitPageIcon));
// Tap 4: Fire fit-to-changed(FIT_TO_PAGE) again.
MockInteractions.tap(button);
button.click();
fitToEventChecker.assertEvent(FittingType.FIT_TO_PAGE, true);
chrome.test.assertTrue(button.ironIcon.endsWith(fitWidthIcon));
......@@ -233,7 +232,7 @@ var tests = [
chrome.test.assertTrue(button.ironIcon.endsWith(fitWidthIcon));
// Tap 1: Fire fit-to-changed(FIT_TO_WIDTH).
MockInteractions.tap(button);
button.click();
fitToEventChecker.assertEvent(FittingType.FIT_TO_WIDTH, true);
chrome.test.assertTrue(button.ironIcon.endsWith(fitPageIcon));
......@@ -248,7 +247,7 @@ var tests = [
chrome.test.assertTrue(button.ironIcon.endsWith(fitWidthIcon));
// Tap 2: Fire fit-to-changed(FIT_TO_WIDTH).
MockInteractions.tap(button);
button.click();
fitToEventChecker.assertEvent(FittingType.FIT_TO_WIDTH, true);
chrome.test.assertTrue(button.ironIcon.endsWith(fitPageIcon));
......@@ -275,12 +274,12 @@ var tests = [
chrome.test.assertTrue(button.ironIcon.endsWith(fitPageIcon));
// Tap 1: Fire fit-to-changed(FIT_TO_PAGE).
MockInteractions.tap(button);
button.click();
fitToEventChecker.assertEvent(FittingType.FIT_TO_PAGE, true);
chrome.test.assertTrue(button.ironIcon.endsWith(fitWidthIcon));
// Tap 2: Fire fit-to-changed(FIT_TO_WIDTH).
MockInteractions.tap(button);
button.click();
fitToEventChecker.assertEvent(FittingType.FIT_TO_WIDTH, true);
chrome.test.assertTrue(button.ironIcon.endsWith(fitPageIcon));
......@@ -290,7 +289,7 @@ var tests = [
chrome.test.assertTrue(button.ironIcon.endsWith(fitPageIcon));
// Tap 3: Fire fit-to-changed(FIT_TO_PAGE).
MockInteractions.tap(button);
button.click();
fitToEventChecker.assertEvent(FittingType.FIT_TO_PAGE, true);
chrome.test.assertTrue(button.ironIcon.endsWith(fitWidthIcon));
......
......@@ -123,8 +123,8 @@ var tests = [
*/
function testToolbarKeyboardNavigation() {
var mockWindow = new MockWindow(1920, 1080);
var toolbar =
Polymer.Base.create('viewer-pdf-toolbar', {loadProgress: 100});
var toolbar = document.createElement('viewer-pdf-toolbar');
toolbar.loadProgress = 100;
document.body.appendChild(toolbar);
var zoomToolbar = document.createElement('viewer-zoom-toolbar');
document.body.appendChild(zoomToolbar);
......@@ -218,8 +218,8 @@ var tests = [
*/
function testToolbarTouchInteraction() {
var mockWindow = new MockWindow(1920, 1080);
var toolbar =
Polymer.Base.create('viewer-pdf-toolbar', {loadProgress: 100});
var toolbar = document.createElement('viewer-pdf-toolbar');
toolbar.loadProgress = 100;
document.body.appendChild(toolbar);
var zoomToolbar = document.createElement('viewer-zoom-toolbar');
document.body.appendChild(zoomToolbar);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment