Skip to content

GitLab

T
tangled
Commit c072c278 authored by Jimmy Gong's avatar Jimmy Gong Committed by Commit Bot
Browse files
Options

Move CUPS printers test functions to test utils 

- Moving these test util functions allows shared access to
  the functions.

Bug: 1015628
Test: browser test
Change-Id: I3332b6e477222eba590725165569beb2715942ec
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1998819
Commit-Queue: jimmy gong <jimmyxgong@chromium.org>
Reviewed-by: default avatarKyle Horimoto <khorimoto@chromium.org>
Reviewed-by: default avatarBailey Berro <baileyberro@chromium.org>
Cr-Commit-Position: refs/heads/master@{#731725}
parent d0d6fc4e
Show whitespace changes
Inline Side-by-side
Showing with 353 additions and 252 deletions
chrome/test/data/webui/settings/chromeos/cups_printer_landing_page_tests.js
View file @ c072c278
...@@ -53,19 +53,6 @@ function clickSaveButton(dialog) { ...@@ -53,19 +53,6 @@ function clickSaveButton(dialog) {
Polymer.dom.flush(); Polymer.dom.flush();
} }
/**
* Helper method to pull an array of CupsPrinterEntry out of a
* |printersElement|.
* @param {!HTMLElement} printersElement
* @return {!Array<!HTMLElement>}
* @private
*/
function getPrinterEntries(printersElement) {
const entryList = printersElement.$$('#printerEntryList');
return entryList.querySelectorAll(
'settings-cups-printers-entry:not([hidden])');
}
/** /**
* @param {!HTMLElement} page * @param {!HTMLElement} page
* @return {!HTMLElement} * @return {!HTMLElement}
...@@ -194,7 +181,8 @@ function verifySearchQueryResults( ...@@ -194,7 +181,8 @@ function verifySearchQueryResults(
*/ */
function removePrinter(cupsPrintersBrowserProxy, savedPrintersElement, index) { function removePrinter(cupsPrintersBrowserProxy, savedPrintersElement, index) {
const printerList = cupsPrintersBrowserProxy.printerList.printerList; const printerList = cupsPrintersBrowserProxy.printerList.printerList;
const savedPrinterEntries = getPrinterEntries(savedPrintersElement); const savedPrinterEntries =
cups_printer_test_util.getPrinterEntries(savedPrintersElement);
clickThreeDotMenu(savedPrinterEntries[index]); clickThreeDotMenu(savedPrinterEntries[index]);
savedPrintersElement.$$('#removeButton').click(); savedPrintersElement.$$('#removeButton').click();
...@@ -219,7 +207,8 @@ function removePrinter(cupsPrintersBrowserProxy, savedPrintersElement, index) { ...@@ -219,7 +207,8 @@ function removePrinter(cupsPrintersBrowserProxy, savedPrintersElement, index) {
*/ */
function removeAllPrinters(cupsPrintersBrowserProxy, savedPrintersElement) { function removeAllPrinters(cupsPrintersBrowserProxy, savedPrintersElement) {
const printerList = cupsPrintersBrowserProxy.printerList.printerList; const printerList = cupsPrintersBrowserProxy.printerList.printerList;
const savedPrinterEntries = getPrinterEntries(savedPrintersElement); const savedPrinterEntries =
cups_printer_test_util.getPrinterEntries(savedPrintersElement);
if (!printerList.length) { if (!printerList.length) {
return Promise.resolve(); return Promise.resolve();
...@@ -232,73 +221,6 @@ function removeAllPrinters(cupsPrintersBrowserProxy, savedPrintersElement) { ...@@ -232,73 +221,6 @@ function removeAllPrinters(cupsPrintersBrowserProxy, savedPrintersElement) {
this, cupsPrintersBrowserProxy, savedPrintersElement)); this, cupsPrintersBrowserProxy, savedPrintersElement));
} }
/**
* @param {string} printerName
* @param {string} printerAddress
* @param {string} printerId
* @return {!CupsPrinterInfo}
* @private
*/
function createCupsPrinterInfo(printerName, printerAddress, printerId) {
const printer = {
ppdManufacturer: 'make',
ppdModel: 'model',
printerAddress: printerAddress,
printerDescription: '',
printerId: printerId,
printerManufacturer: 'make',
printerModel: 'model',
printerMakeAndModel: '',
printerName: printerName,
printerPPDPath: '',
printerPpdReference: {
userSuppliedPpdUrl: '',
effectiveMakeAndModel: '',
autoconf: false,
},
printerProtocol: 'ipp',
printerQueue: 'moreinfohere',
printerStatus: '',
};
return printer;
}
/**
* Helper function that creates a new PrinterListEntry.
* @param {string} printerName
* @param {string} printerAddress
* @param {string} printerId
* @param {string} printerType
* @return {!PrinterListEntry}
*/
function createPrinterListEntry(
printerName, printerAddress, printerId, printerType) {
const entry = {
printerInfo: {
ppdManufacturer: '',
ppdModel: '',
printerAddress: printerAddress,
printerDescription: '',
printerId: printerId,
printerManufacturer: '',
printerModel: '',
printerMakeAndModel: '',
printerName: printerName,
printerPPDPath: '',
printerPpdReference: {
userSuppliedPpdUrl: '',
effectiveMakeAndModel: '',
autoconf: false,
},
printerProtocol: 'ipp',
printerQueue: 'moreinfohere',
printerStatus: '',
},
printerType: printerType,
};
return entry;
}
suite('CupsSavedPrintersTests', function() { suite('CupsSavedPrintersTests', function() {
let page = null; let page = null;
let savedPrintersElement = null; let savedPrintersElement = null;
...@@ -380,9 +302,9 @@ suite('CupsSavedPrintersTests', function() { ...@@ -380,9 +302,9 @@ suite('CupsSavedPrintersTests', function() {
test('SavedPrintersSuccessfullyPopulates', function() { test('SavedPrintersSuccessfullyPopulates', function() {
createCupsPrinterPage([ createCupsPrinterPage([
createCupsPrinterInfo('google', '4', 'id4'), cups_printer_test_util.createCupsPrinterInfo('google', '4', 'id4'),
createCupsPrinterInfo('test1', '1', 'id1'), cups_printer_test_util.createCupsPrinterInfo('test1', '1', 'id1'),
createCupsPrinterInfo('test2', '2', 'id2'), cups_printer_test_util.createCupsPrinterInfo('test2', '2', 'id2'),
]); ]);
return cupsPrintersBrowserProxy.whenCalled('getCupsPrintersList') return cupsPrintersBrowserProxy.whenCalled('getCupsPrintersList')
.then(() => { .then(() => {
...@@ -396,7 +318,8 @@ suite('CupsSavedPrintersTests', function() { ...@@ -396,7 +318,8 @@ suite('CupsSavedPrintersTests', function() {
const savedPrintersList = const savedPrintersList =
savedPrintersElement.$$('settings-cups-printers-entry-list'); savedPrintersElement.$$('settings-cups-printers-entry-list');
const printerListEntries = getPrinterEntries(savedPrintersElement); const printerListEntries =
cups_printer_test_util.getPrinterEntries(savedPrintersElement);
verifyPrintersList(printerListEntries, printerList); verifyPrintersList(printerListEntries, printerList);
}); });
...@@ -406,9 +329,9 @@ suite('CupsSavedPrintersTests', function() { ...@@ -406,9 +329,9 @@ suite('CupsSavedPrintersTests', function() {
const savedPrinterEntries = []; const savedPrinterEntries = [];
createCupsPrinterPage([ createCupsPrinterPage([
createCupsPrinterInfo('google', '4', 'id4'), cups_printer_test_util.createCupsPrinterInfo('google', '4', 'id4'),
createCupsPrinterInfo('test1', '1', 'id1'), cups_printer_test_util.createCupsPrinterInfo('test1', '1', 'id1'),
createCupsPrinterInfo('test2', '2', 'id2'), cups_printer_test_util.createCupsPrinterInfo('test2', '2', 'id2'),
]); ]);
return cupsPrintersBrowserProxy.whenCalled('getCupsPrintersList') return cupsPrintersBrowserProxy.whenCalled('getCupsPrintersList')
.then(() => { .then(() => {
...@@ -422,7 +345,8 @@ suite('CupsSavedPrintersTests', function() { ...@@ -422,7 +345,8 @@ suite('CupsSavedPrintersTests', function() {
cupsPrintersBrowserProxy, savedPrintersElement); cupsPrintersBrowserProxy, savedPrintersElement);
}) })
.then(() => { .then(() => {
const entryList = getPrinterEntries(savedPrintersElement); const entryList =
cups_printer_test_util.getPrinterEntries(savedPrintersElement);
verifyPrintersList(entryList, printerList); verifyPrintersList(entryList, printerList);
}); });
}); });
...@@ -433,9 +357,9 @@ suite('CupsSavedPrintersTests', function() { ...@@ -433,9 +357,9 @@ suite('CupsSavedPrintersTests', function() {
let savedPrinterEntries = []; let savedPrinterEntries = [];
createCupsPrinterPage([ createCupsPrinterPage([
createCupsPrinterInfo('google', '4', 'id4'), cups_printer_test_util.createCupsPrinterInfo('google', '4', 'id4'),
createCupsPrinterInfo('test1', '1', 'id1'), cups_printer_test_util.createCupsPrinterInfo('test1', '1', 'id1'),
createCupsPrinterInfo('test2', '2', 'id2'), cups_printer_test_util.createCupsPrinterInfo('test2', '2', 'id2'),
]); ]);
return cupsPrintersBrowserProxy.whenCalled('getCupsPrintersList') return cupsPrintersBrowserProxy.whenCalled('getCupsPrintersList')
.then(() => { .then(() => {
...@@ -447,7 +371,8 @@ suite('CupsSavedPrintersTests', function() { ...@@ -447,7 +371,8 @@ suite('CupsSavedPrintersTests', function() {
savedPrintersList = savedPrintersList =
savedPrintersElement.$$('settings-cups-printers-entry-list'); savedPrintersElement.$$('settings-cups-printers-entry-list');
savedPrinterEntries = getPrinterEntries(savedPrintersElement); savedPrinterEntries =
cups_printer_test_util.getPrinterEntries(savedPrintersElement);
verifyPrintersList(savedPrinterEntries, printerList); verifyPrintersList(savedPrinterEntries, printerList);
...@@ -468,9 +393,9 @@ suite('CupsSavedPrintersTests', function() { ...@@ -468,9 +393,9 @@ suite('CupsSavedPrintersTests', function() {
let savedPrinterEntries = null; let savedPrinterEntries = null;
createCupsPrinterPage([ createCupsPrinterPage([
createCupsPrinterInfo('google', '4', 'id4'), cups_printer_test_util.createCupsPrinterInfo('google', '4', 'id4'),
createCupsPrinterInfo('test1', '1', 'id1'), cups_printer_test_util.createCupsPrinterInfo('test1', '1', 'id1'),
createCupsPrinterInfo('test2', '2', 'id2'), cups_printer_test_util.createCupsPrinterInfo('test2', '2', 'id2'),
]); ]);
return cupsPrintersBrowserProxy.whenCalled('getCupsPrintersList') return cupsPrintersBrowserProxy.whenCalled('getCupsPrintersList')
.then(() => { .then(() => {
...@@ -480,7 +405,8 @@ suite('CupsSavedPrintersTests', function() { ...@@ -480,7 +405,8 @@ suite('CupsSavedPrintersTests', function() {
savedPrintersElement = page.$$('settings-cups-saved-printers'); savedPrintersElement = page.$$('settings-cups-saved-printers');
assertTrue(!!savedPrintersElement); assertTrue(!!savedPrintersElement);
savedPrinterEntries = getPrinterEntries(savedPrintersElement); savedPrinterEntries =
cups_printer_test_util.getPrinterEntries(savedPrintersElement);
// Update the printer name of the first entry. // Update the printer name of the first entry.
clickThreeDotMenu(savedPrinterEntries[0]); clickThreeDotMenu(savedPrinterEntries[0]);
...@@ -520,9 +446,9 @@ suite('CupsSavedPrintersTests', function() { ...@@ -520,9 +446,9 @@ suite('CupsSavedPrintersTests', function() {
let editDialog = null; let editDialog = null;
createCupsPrinterPage([ createCupsPrinterPage([
createCupsPrinterInfo('google', '4', 'id4'), cups_printer_test_util.createCupsPrinterInfo('google', '4', 'id4'),
createCupsPrinterInfo('test1', '1', 'id1'), cups_printer_test_util.createCupsPrinterInfo('test1', '1', 'id1'),
createCupsPrinterInfo('test2', '2', 'id2'), cups_printer_test_util.createCupsPrinterInfo('test2', '2', 'id2'),
]); ]);
return cupsPrintersBrowserProxy.whenCalled('getCupsPrintersList') return cupsPrintersBrowserProxy.whenCalled('getCupsPrintersList')
.then(() => { .then(() => {
...@@ -532,7 +458,8 @@ suite('CupsSavedPrintersTests', function() { ...@@ -532,7 +458,8 @@ suite('CupsSavedPrintersTests', function() {
savedPrintersElement = page.$$('settings-cups-saved-printers'); savedPrintersElement = page.$$('settings-cups-saved-printers');
assertTrue(!!savedPrintersElement); assertTrue(!!savedPrintersElement);
savedPrinterEntries = getPrinterEntries(savedPrintersElement); savedPrinterEntries =
cups_printer_test_util.getPrinterEntries(savedPrintersElement);
// Edit the first entry. // Edit the first entry.
clickThreeDotMenu(savedPrinterEntries[0]); clickThreeDotMenu(savedPrinterEntries[0]);
...@@ -573,9 +500,9 @@ suite('CupsSavedPrintersTests', function() { ...@@ -573,9 +500,9 @@ suite('CupsSavedPrintersTests', function() {
test('SavedPrintersSearchTermFiltersCorrectPrinters', function() { test('SavedPrintersSearchTermFiltersCorrectPrinters', function() {
createCupsPrinterPage([ createCupsPrinterPage([
createCupsPrinterInfo('google', '4', 'id4'), cups_printer_test_util.createCupsPrinterInfo('google', '4', 'id4'),
createCupsPrinterInfo('test1', '1', 'id1'), cups_printer_test_util.createCupsPrinterInfo('test1', '1', 'id1'),
createCupsPrinterInfo('test2', '2', 'id2'), cups_printer_test_util.createCupsPrinterInfo('test2', '2', 'id2'),
]); ]);
return cupsPrintersBrowserProxy.whenCalled('getCupsPrintersList') return cupsPrintersBrowserProxy.whenCalled('getCupsPrintersList')
.then(() => { .then(() => {
...@@ -585,7 +512,8 @@ suite('CupsSavedPrintersTests', function() { ...@@ -585,7 +512,8 @@ suite('CupsSavedPrintersTests', function() {
savedPrintersElement = page.$$('settings-cups-saved-printers'); savedPrintersElement = page.$$('settings-cups-saved-printers');
assertTrue(!!savedPrintersElement); assertTrue(!!savedPrintersElement);
const printerListEntries = getPrinterEntries(savedPrintersElement); const printerListEntries =
cups_printer_test_util.getPrinterEntries(savedPrintersElement);
verifyPrintersList(printerListEntries, printerList); verifyPrintersList(printerListEntries, printerList);
searchTerm = 'google'; searchTerm = 'google';
...@@ -596,7 +524,8 @@ suite('CupsSavedPrintersTests', function() { ...@@ -596,7 +524,8 @@ suite('CupsSavedPrintersTests', function() {
// hidden entries. // hidden entries.
verifySearchQueryResults( verifySearchQueryResults(
savedPrintersElement, savedPrintersElement,
[createPrinterListEntry('google', '4', 'id4', PrinterType.SAVED)], [cups_printer_test_util.createPrinterListEntry(
'google', '4', 'id4', PrinterType.SAVED)],
searchTerm); searchTerm);
// Change the search term and assert that entries are filtered // Change the search term and assert that entries are filtered
...@@ -609,22 +538,29 @@ suite('CupsSavedPrintersTests', function() { ...@@ -609,22 +538,29 @@ suite('CupsSavedPrintersTests', function() {
verifySearchQueryResults( verifySearchQueryResults(
savedPrintersElement, savedPrintersElement,
[ [
createPrinterListEntry('test1', '1', 'id1', PrinterType.SAVED), cups_printer_test_util.createPrinterListEntry(
createPrinterListEntry('test2', '2', 'id2', PrinterType.SAVED), 'test1', '1', 'id1', PrinterType.SAVED),
cups_printer_test_util.createPrinterListEntry(
'test2', '2', 'id2', PrinterType.SAVED),
], ],
searchTerm); searchTerm);
// Add more printers and assert that they are correctly filtered. // Add more printers and assert that they are correctly filtered.
addNewSavedPrinter(createCupsPrinterInfo('test3', '3', 'id3')); addNewSavedPrinter(cups_printer_test_util.createCupsPrinterInfo(
addNewSavedPrinter(createCupsPrinterInfo('google2', '6', 'id6')); 'test3', '3', 'id3'));
addNewSavedPrinter(cups_printer_test_util.createCupsPrinterInfo(
'google2', '6', 'id6'));
Polymer.dom.flush(); Polymer.dom.flush();
verifySearchQueryResults( verifySearchQueryResults(
savedPrintersElement, savedPrintersElement,
[ [
createPrinterListEntry('test3', '3', 'id3', PrinterType.SAVED), cups_printer_test_util.createPrinterListEntry(
createPrinterListEntry('test1', '1', 'id1', PrinterType.SAVED), 'test3', '3', 'id3', PrinterType.SAVED),
createPrinterListEntry('test2', '2', 'id2', PrinterType.SAVED) cups_printer_test_util.createPrinterListEntry(
'test1', '1', 'id1', PrinterType.SAVED),
cups_printer_test_util.createPrinterListEntry(
'test2', '2', 'id2', PrinterType.SAVED)
], ],
searchTerm); searchTerm);
}); });
...@@ -632,9 +568,9 @@ suite('CupsSavedPrintersTests', function() { ...@@ -632,9 +568,9 @@ suite('CupsSavedPrintersTests', function() {
test('SavedPrintersNoSearchFound', function() { test('SavedPrintersNoSearchFound', function() {
createCupsPrinterPage([ createCupsPrinterPage([
createCupsPrinterInfo('google', '4', 'id4'), cups_printer_test_util.createCupsPrinterInfo('google', '4', 'id4'),
createCupsPrinterInfo('test1', '1', 'id1'), cups_printer_test_util.createCupsPrinterInfo('test1', '1', 'id1'),
createCupsPrinterInfo('test2', '2', 'id2'), cups_printer_test_util.createCupsPrinterInfo('test2', '2', 'id2'),
]); ]);
return cupsPrintersBrowserProxy.whenCalled('getCupsPrintersList') return cupsPrintersBrowserProxy.whenCalled('getCupsPrintersList')
.then(() => { .then(() => {
...@@ -644,7 +580,8 @@ suite('CupsSavedPrintersTests', function() { ...@@ -644,7 +580,8 @@ suite('CupsSavedPrintersTests', function() {
savedPrintersElement = page.$$('settings-cups-saved-printers'); savedPrintersElement = page.$$('settings-cups-saved-printers');
assertTrue(!!savedPrintersElement); assertTrue(!!savedPrintersElement);
const printerListEntries = getPrinterEntries(savedPrintersElement); const printerListEntries =
cups_printer_test_util.getPrinterEntries(savedPrintersElement);
verifyPrintersList(printerListEntries, printerList); verifyPrintersList(printerListEntries, printerList);
searchTerm = 'google'; searchTerm = 'google';
...@@ -655,7 +592,8 @@ suite('CupsSavedPrintersTests', function() { ...@@ -655,7 +592,8 @@ suite('CupsSavedPrintersTests', function() {
// hidden entries. // hidden entries.
verifySearchQueryResults( verifySearchQueryResults(
savedPrintersElement, savedPrintersElement,
[createPrinterListEntry('google', '4', 'id4', PrinterType.SAVED)], [cups_printer_test_util.createPrinterListEntry(
'google', '4', 'id4', PrinterType.SAVED)],
searchTerm); searchTerm);
// Change search term to something that has no matches. // Change search term to something that has no matches.
...@@ -673,16 +611,17 @@ suite('CupsSavedPrintersTests', function() { ...@@ -673,16 +611,17 @@ suite('CupsSavedPrintersTests', function() {
verifySearchQueryResults( verifySearchQueryResults(
savedPrintersElement, savedPrintersElement,
[createPrinterListEntry('google', '4', 'id4', PrinterType.SAVED)], [cups_printer_test_util.createPrinterListEntry(
'google', '4', 'id4', PrinterType.SAVED)],
searchTerm); searchTerm);
}); });
}); });
test('ShowMoreButtonIsInitiallyHiddenAndANewPrinterIsAdded', function() { test('ShowMoreButtonIsInitiallyHiddenAndANewPrinterIsAdded', function() {
createCupsPrinterPage([ createCupsPrinterPage([
createCupsPrinterInfo('google', '4', 'id4'), cups_printer_test_util.createCupsPrinterInfo('google', '4', 'id4'),
createCupsPrinterInfo('test1', '1', 'id1'), cups_printer_test_util.createCupsPrinterInfo('test1', '1', 'id1'),
createCupsPrinterInfo('test2', '2', 'id2'), cups_printer_test_util.createCupsPrinterInfo('test2', '2', 'id2'),
]); ]);
return cupsPrintersBrowserProxy.whenCalled('getCupsPrintersList') return cupsPrintersBrowserProxy.whenCalled('getCupsPrintersList')
.then(() => { .then(() => {
...@@ -696,9 +635,12 @@ suite('CupsSavedPrintersTests', function() { ...@@ -696,9 +635,12 @@ suite('CupsSavedPrintersTests', function() {
savedPrintersElement.$$('#printerEntryList'); savedPrintersElement.$$('#printerEntryList');
verifyVisiblePrinters(printerEntryListTestElement, [ verifyVisiblePrinters(printerEntryListTestElement, [
createPrinterListEntry('google', '4', 'id4', PrinterType.SAVED), cups_printer_test_util.createPrinterListEntry(
createPrinterListEntry('test1', '1', 'id1', PrinterType.SAVED), 'google', '4', 'id4', PrinterType.SAVED),
createPrinterListEntry('test2', '2', 'id2', PrinterType.SAVED) cups_printer_test_util.createPrinterListEntry(
'test1', '1', 'id1', PrinterType.SAVED),
cups_printer_test_util.createPrinterListEntry(
'test2', '2', 'id2', PrinterType.SAVED)
]); ]);
// Assert that the Show more button is hidden because printer list // Assert that the Show more button is hidden because printer list
// length is <= 3. // length is <= 3.
...@@ -706,12 +648,17 @@ suite('CupsSavedPrintersTests', function() { ...@@ -706,12 +648,17 @@ suite('CupsSavedPrintersTests', function() {
// Newly added printers will always be visible and inserted to the // Newly added printers will always be visible and inserted to the
// top of the list. // top of the list.
addNewSavedPrinter(createCupsPrinterInfo('test3', '3', 'id3')); addNewSavedPrinter(cups_printer_test_util.createCupsPrinterInfo(
'test3', '3', 'id3'));
expectedVisiblePrinters = [ expectedVisiblePrinters = [
createPrinterListEntry('test3', '3', 'id3', PrinterType.SAVED), cups_printer_test_util.createPrinterListEntry(
createPrinterListEntry('google', '4', 'id4', PrinterType.SAVED), 'test3', '3', 'id3', PrinterType.SAVED),
createPrinterListEntry('test1', '1', 'id1', PrinterType.SAVED), cups_printer_test_util.createPrinterListEntry(
createPrinterListEntry('test2', '2', 'id2', PrinterType.SAVED) 'google', '4', 'id4', PrinterType.SAVED),
cups_printer_test_util.createPrinterListEntry(
'test1', '1', 'id1', PrinterType.SAVED),
cups_printer_test_util.createPrinterListEntry(
'test2', '2', 'id2', PrinterType.SAVED)
]; ];
verifyVisiblePrinters( verifyVisiblePrinters(
printerEntryListTestElement, expectedVisiblePrinters); printerEntryListTestElement, expectedVisiblePrinters);
...@@ -723,10 +670,10 @@ suite('CupsSavedPrintersTests', function() { ...@@ -723,10 +670,10 @@ suite('CupsSavedPrintersTests', function() {
test('PressShowMoreButton', function() { test('PressShowMoreButton', function() {
createCupsPrinterPage([ createCupsPrinterPage([
createCupsPrinterInfo('google', '4', 'id4'), cups_printer_test_util.createCupsPrinterInfo('google', '4', 'id4'),
createCupsPrinterInfo('test1', '1', 'id1'), cups_printer_test_util.createCupsPrinterInfo('test1', '1', 'id1'),
createCupsPrinterInfo('test2', '2', 'id2'), cups_printer_test_util.createCupsPrinterInfo('test2', '2', 'id2'),
createCupsPrinterInfo('test3', '3', 'id3'), cups_printer_test_util.createCupsPrinterInfo('test3', '3', 'id3'),
]); ]);
return cupsPrintersBrowserProxy.whenCalled('getCupsPrintersList') return cupsPrintersBrowserProxy.whenCalled('getCupsPrintersList')
.then(() => { .then(() => {
...@@ -742,9 +689,12 @@ suite('CupsSavedPrintersTests', function() { ...@@ -742,9 +689,12 @@ suite('CupsSavedPrintersTests', function() {
// There are 4 total printers but only 3 printers are visible and 1 is // There are 4 total printers but only 3 printers are visible and 1 is
// hidden underneath the Show more section. // hidden underneath the Show more section.
verifyVisiblePrinters(printerEntryListTestElement, [ verifyVisiblePrinters(printerEntryListTestElement, [
createPrinterListEntry('google', '4', 'id4', PrinterType.SAVED), cups_printer_test_util.createPrinterListEntry(
createPrinterListEntry('test1', '1', 'id1', PrinterType.SAVED), 'google', '4', 'id4', PrinterType.SAVED),
createPrinterListEntry('test2', '2', 'id2', PrinterType.SAVED), cups_printer_test_util.createPrinterListEntry(
'test1', '1', 'id1', PrinterType.SAVED),
cups_printer_test_util.createPrinterListEntry(
'test2', '2', 'id2', PrinterType.SAVED),
]); ]);
// Assert that the Show more button is shown since printer list length // Assert that the Show more button is shown since printer list length
// is > 3. // is > 3.
...@@ -756,20 +706,24 @@ suite('CupsSavedPrintersTests', function() { ...@@ -756,20 +706,24 @@ suite('CupsSavedPrintersTests', function() {
assertFalse(!!savedPrintersElement.$$('#show-more-container')); assertFalse(!!savedPrintersElement.$$('#show-more-container'));
// Clicking on the Show more button reveals all hidden printers. // Clicking on the Show more button reveals all hidden printers.
verifyVisiblePrinters(printerEntryListTestElement, [ verifyVisiblePrinters(printerEntryListTestElement, [
createPrinterListEntry('google', '4', 'id4', PrinterType.SAVED), cups_printer_test_util.createPrinterListEntry(
createPrinterListEntry('test1', '1', 'id1', PrinterType.SAVED), 'google', '4', 'id4', PrinterType.SAVED),
createPrinterListEntry('test2', '2', 'id2', PrinterType.SAVED), cups_printer_test_util.createPrinterListEntry(
createPrinterListEntry('test3', '3', 'id3', PrinterType.SAVED) 'test1', '1', 'id1', PrinterType.SAVED),
cups_printer_test_util.createPrinterListEntry(
'test2', '2', 'id2', PrinterType.SAVED),
cups_printer_test_util.createPrinterListEntry(
'test3', '3', 'id3', PrinterType.SAVED)
]); ]);
}); });
}); });
test('ShowMoreButtonIsInitiallyShownAndWithANewPrinterAdded', function() { test('ShowMoreButtonIsInitiallyShownAndWithANewPrinterAdded', function() {
createCupsPrinterPage([ createCupsPrinterPage([
createCupsPrinterInfo('google', '4', 'id4'), cups_printer_test_util.createCupsPrinterInfo('google', '4', 'id4'),
createCupsPrinterInfo('test1', '1', 'id1'), cups_printer_test_util.createCupsPrinterInfo('test1', '1', 'id1'),
createCupsPrinterInfo('test2', '2', 'id2'), cups_printer_test_util.createCupsPrinterInfo('test2', '2', 'id2'),
createCupsPrinterInfo('test3', '3', 'id3'), cups_printer_test_util.createCupsPrinterInfo('test3', '3', 'id3'),
]); ]);
return cupsPrintersBrowserProxy.whenCalled('getCupsPrintersList') return cupsPrintersBrowserProxy.whenCalled('getCupsPrintersList')
.then(() => { .then(() => {
...@@ -785,21 +739,29 @@ suite('CupsSavedPrintersTests', function() { ...@@ -785,21 +739,29 @@ suite('CupsSavedPrintersTests', function() {
// There are 4 total printers but only 3 printers are visible and 1 is // There are 4 total printers but only 3 printers are visible and 1 is
// hidden underneath the Show more section. // hidden underneath the Show more section.
verifyVisiblePrinters(printerEntryListTestElement, [ verifyVisiblePrinters(printerEntryListTestElement, [
createPrinterListEntry('google', '4', 'id4', PrinterType.SAVED), cups_printer_test_util.createPrinterListEntry(
createPrinterListEntry('test1', '1', 'id1', PrinterType.SAVED), 'google', '4', 'id4', PrinterType.SAVED),
createPrinterListEntry('test2', '2', 'id2', PrinterType.SAVED), cups_printer_test_util.createPrinterListEntry(
'test1', '1', 'id1', PrinterType.SAVED),
cups_printer_test_util.createPrinterListEntry(
'test2', '2', 'id2', PrinterType.SAVED),
]); ]);
// Assert that the Show more button is shown since printer list length // Assert that the Show more button is shown since printer list length
// is > 3. // is > 3.
assertTrue(!!savedPrintersElement.$$('#show-more-container')); assertTrue(!!savedPrintersElement.$$('#show-more-container'));
// Newly added printers will always be visible. // Newly added printers will always be visible.
addNewSavedPrinter(createCupsPrinterInfo('test5', '5', 'id5')); addNewSavedPrinter(cups_printer_test_util.createCupsPrinterInfo(
'test5', '5', 'id5'));
verifyVisiblePrinters(printerEntryListTestElement, [ verifyVisiblePrinters(printerEntryListTestElement, [
createPrinterListEntry('test5', '5', 'id5', PrinterType.SAVED), cups_printer_test_util.createPrinterListEntry(
createPrinterListEntry('google', '4', 'id4', PrinterType.SAVED), 'test5', '5', 'id5', PrinterType.SAVED),
createPrinterListEntry('test1', '1', 'id1', PrinterType.SAVED), cups_printer_test_util.createPrinterListEntry(
createPrinterListEntry('test2', '2', 'id2', PrinterType.SAVED) 'google', '4', 'id4', PrinterType.SAVED),
cups_printer_test_util.createPrinterListEntry(
'test1', '1', 'id1', PrinterType.SAVED),
cups_printer_test_util.createPrinterListEntry(
'test2', '2', 'id2', PrinterType.SAVED)
]); ]);
// Assert that the Show more button is still shown. // Assert that the Show more button is still shown.
assertTrue(!!savedPrintersElement.$$('#show-more-container')); assertTrue(!!savedPrintersElement.$$('#show-more-container'));
...@@ -808,11 +770,11 @@ suite('CupsSavedPrintersTests', function() { ...@@ -808,11 +770,11 @@ suite('CupsSavedPrintersTests', function() {
test('ShowMoreButtonIsShownAndRemovePrinters', function() { test('ShowMoreButtonIsShownAndRemovePrinters', function() {
createCupsPrinterPage([ createCupsPrinterPage([
createCupsPrinterInfo('google', '3', 'id3'), cups_printer_test_util.createCupsPrinterInfo('google', '3', 'id3'),
createCupsPrinterInfo('google2', '4', 'id4'), cups_printer_test_util.createCupsPrinterInfo('google2', '4', 'id4'),
createCupsPrinterInfo('google3', '5', 'id5'), cups_printer_test_util.createCupsPrinterInfo('google3', '5', 'id5'),
createCupsPrinterInfo('test1', '1', 'id1'), cups_printer_test_util.createCupsPrinterInfo('test1', '1', 'id1'),
createCupsPrinterInfo('test2', '2', 'id2'), cups_printer_test_util.createCupsPrinterInfo('test2', '2', 'id2'),
]); ]);
return cupsPrintersBrowserProxy.whenCalled('getCupsPrintersList') return cupsPrintersBrowserProxy.whenCalled('getCupsPrintersList')
.then(() => { .then(() => {
...@@ -828,9 +790,12 @@ suite('CupsSavedPrintersTests', function() { ...@@ -828,9 +790,12 @@ suite('CupsSavedPrintersTests', function() {
// There are 5 total printers but only 3 printers are visible and 2 // There are 5 total printers but only 3 printers are visible and 2
// are hidden underneath the Show more section. // are hidden underneath the Show more section.
verifyVisiblePrinters(printerEntryListTestElement, [ verifyVisiblePrinters(printerEntryListTestElement, [
createPrinterListEntry('google', '3', 'id3', PrinterType.SAVED), cups_printer_test_util.createPrinterListEntry(
createPrinterListEntry('google2', '4', 'id4', PrinterType.SAVED), 'google', '3', 'id3', PrinterType.SAVED),
createPrinterListEntry('google3', '5', 'id5', PrinterType.SAVED) cups_printer_test_util.createPrinterListEntry(
'google2', '4', 'id4', PrinterType.SAVED),
cups_printer_test_util.createPrinterListEntry(
'google3', '5', 'id5', PrinterType.SAVED)
]); ]);
// Assert that the Show more button is shown since printer list length // Assert that the Show more button is shown since printer list length
// is > 3. // is > 3.
...@@ -843,9 +808,12 @@ suite('CupsSavedPrintersTests', function() { ...@@ -843,9 +808,12 @@ suite('CupsSavedPrintersTests', function() {
// Since printers were initially alphabetically sorted, we should // Since printers were initially alphabetically sorted, we should
// expect 'test1' to be the next visible printer. // expect 'test1' to be the next visible printer.
verifyVisiblePrinters(printerEntryListTestElement, [ verifyVisiblePrinters(printerEntryListTestElement, [
createPrinterListEntry('google2', '4', 'id4', PrinterType.SAVED), cups_printer_test_util.createPrinterListEntry(
createPrinterListEntry('google3', '5', 'id5', PrinterType.SAVED), 'google2', '4', 'id4', PrinterType.SAVED),
createPrinterListEntry('test1', '1', 'id1', PrinterType.SAVED) cups_printer_test_util.createPrinterListEntry(
'google3', '5', 'id5', PrinterType.SAVED),
cups_printer_test_util.createPrinterListEntry(
'test1', '1', 'id1', PrinterType.SAVED)
]); ]);
assertTrue(!!savedPrintersElement.$$('#show-more-container')); assertTrue(!!savedPrintersElement.$$('#show-more-container'));
...@@ -854,9 +822,12 @@ suite('CupsSavedPrintersTests', function() { ...@@ -854,9 +822,12 @@ suite('CupsSavedPrintersTests', function() {
// Printer list has 3 elements now, the Show more button should be // Printer list has 3 elements now, the Show more button should be
// hidden. // hidden.
verifyVisiblePrinters(printerEntryListTestElement, [ verifyVisiblePrinters(printerEntryListTestElement, [
createPrinterListEntry('google3', '5', 'id5', PrinterType.SAVED), cups_printer_test_util.createPrinterListEntry(
createPrinterListEntry('test1', '1', 'id1', PrinterType.SAVED), 'google3', '5', 'id5', PrinterType.SAVED),
createPrinterListEntry('test2', '2', 'id2', PrinterType.SAVED) cups_printer_test_util.createPrinterListEntry(
'test1', '1', 'id1', PrinterType.SAVED),
cups_printer_test_util.createPrinterListEntry(
'test2', '2', 'id2', PrinterType.SAVED)
]); ]);
assertFalse(!!savedPrintersElement.$$('#show-more-container')); assertFalse(!!savedPrintersElement.$$('#show-more-container'));
}); });
...@@ -864,12 +835,12 @@ suite('CupsSavedPrintersTests', function() { ...@@ -864,12 +835,12 @@ suite('CupsSavedPrintersTests', function() {
test('ShowMoreButtonIsShownAndSearchQueryFiltersCorrectly', function() { test('ShowMoreButtonIsShownAndSearchQueryFiltersCorrectly', function() {
createCupsPrinterPage([ createCupsPrinterPage([
createCupsPrinterInfo('google', '3', 'id3'), cups_printer_test_util.createCupsPrinterInfo('google', '3', 'id3'),
createCupsPrinterInfo('google2', '4', 'id4'), cups_printer_test_util.createCupsPrinterInfo('google2', '4', 'id4'),
createCupsPrinterInfo('google3', '5', 'id5'), cups_printer_test_util.createCupsPrinterInfo('google3', '5', 'id5'),
createCupsPrinterInfo('google4', '6', 'id6'), cups_printer_test_util.createCupsPrinterInfo('google4', '6', 'id6'),
createCupsPrinterInfo('test1', '1', 'id1'), cups_printer_test_util.createCupsPrinterInfo('test1', '1', 'id1'),
createCupsPrinterInfo('test2', '2', 'id2'), cups_printer_test_util.createCupsPrinterInfo('test2', '2', 'id2'),
]); ]);
return cupsPrintersBrowserProxy.whenCalled('getCupsPrintersList') return cupsPrintersBrowserProxy.whenCalled('getCupsPrintersList')
.then(() => { .then(() => {
...@@ -885,9 +856,12 @@ suite('CupsSavedPrintersTests', function() { ...@@ -885,9 +856,12 @@ suite('CupsSavedPrintersTests', function() {
// There are 6 total printers but only 3 printers are visible and 3 // There are 6 total printers but only 3 printers are visible and 3
// are hidden underneath the Show more section. // are hidden underneath the Show more section.
verifyVisiblePrinters(printerEntryListTestElement, [ verifyVisiblePrinters(printerEntryListTestElement, [
createPrinterListEntry('google', '3', 'id3', PrinterType.SAVED), cups_printer_test_util.createPrinterListEntry(
createPrinterListEntry('google2', '4', 'id4', PrinterType.SAVED), 'google', '3', 'id3', PrinterType.SAVED),
createPrinterListEntry('google3', '5', 'id5', PrinterType.SAVED) cups_printer_test_util.createPrinterListEntry(
'google2', '4', 'id4', PrinterType.SAVED),
cups_printer_test_util.createPrinterListEntry(
'google3', '5', 'id5', PrinterType.SAVED)
]); ]);
// Assert that the Show more button is shown since printer list length // Assert that the Show more button is shown since printer list length
// is > 3. // is > 3.
...@@ -900,12 +874,14 @@ suite('CupsSavedPrintersTests', function() { ...@@ -900,12 +874,14 @@ suite('CupsSavedPrintersTests', function() {
verifySearchQueryResults( verifySearchQueryResults(
savedPrintersElement, savedPrintersElement,
[ [
createPrinterListEntry('google', '3', 'id3', PrinterType.SAVED), cups_printer_test_util.createPrinterListEntry(
createPrinterListEntry( 'google', '3', 'id3', PrinterType.SAVED),
cups_printer_test_util.createPrinterListEntry(
'google2', '4', 'id4', PrinterType.SAVED), 'google2', '4', 'id4', PrinterType.SAVED),
createPrinterListEntry( cups_printer_test_util.createPrinterListEntry(
'google3', '5', 'id5', PrinterType.SAVED), 'google3', '5', 'id5', PrinterType.SAVED),
createPrinterListEntry('google4', '6', 'id6', PrinterType.SAVED) cups_printer_test_util.createPrinterListEntry(
'google4', '6', 'id6', PrinterType.SAVED)
], ],
searchTerm); searchTerm);
// Having a search term should hide the Show more button. // Having a search term should hide the Show more button.
...@@ -927,8 +903,10 @@ suite('CupsSavedPrintersTests', function() { ...@@ -927,8 +903,10 @@ suite('CupsSavedPrintersTests', function() {
verifySearchQueryResults( verifySearchQueryResults(
savedPrintersElement, savedPrintersElement,
[ [
createPrinterListEntry('test1', '1', 'id1', PrinterType.SAVED), cups_printer_test_util.createPrinterListEntry(
createPrinterListEntry('test2', '2', 'id2', PrinterType.SAVED) 'test1', '1', 'id1', PrinterType.SAVED),
cups_printer_test_util.createPrinterListEntry(
'test2', '2', 'id2', PrinterType.SAVED)
], ],
searchTerm); searchTerm);
assertFalse(!!savedPrintersElement.$$('#show-more-container')); assertFalse(!!savedPrintersElement.$$('#show-more-container'));
...@@ -939,9 +917,12 @@ suite('CupsSavedPrintersTests', function() { ...@@ -939,9 +917,12 @@ suite('CupsSavedPrintersTests', function() {
savedPrintersElement.searchTerm = searchTerm; savedPrintersElement.searchTerm = searchTerm;
Polymer.dom.flush(); Polymer.dom.flush();
const expectedVisiblePrinters = [ const expectedVisiblePrinters = [
createPrinterListEntry('google', '3', 'id3', PrinterType.SAVED), cups_printer_test_util.createPrinterListEntry(
createPrinterListEntry('google2', '4', 'id4', PrinterType.SAVED), 'google', '3', 'id3', PrinterType.SAVED),
createPrinterListEntry('google3', '5', 'id5', PrinterType.SAVED) cups_printer_test_util.createPrinterListEntry(
'google2', '4', 'id4', PrinterType.SAVED),
cups_printer_test_util.createPrinterListEntry(
'google3', '5', 'id5', PrinterType.SAVED)
]; ];
verifySearchQueryResults( verifySearchQueryResults(
savedPrintersElement, expectedVisiblePrinters, searchTerm); savedPrintersElement, expectedVisiblePrinters, searchTerm);
...@@ -953,10 +934,10 @@ suite('CupsSavedPrintersTests', function() { ...@@ -953,10 +934,10 @@ suite('CupsSavedPrintersTests', function() {
test('ShowMoreButtonAddAndRemovePrinters', function() { test('ShowMoreButtonAddAndRemovePrinters', function() {
createCupsPrinterPage([ createCupsPrinterPage([
createCupsPrinterInfo('google', '3', 'id3'), cups_printer_test_util.createCupsPrinterInfo('google', '3', 'id3'),
createCupsPrinterInfo('google2', '4', 'id4'), cups_printer_test_util.createCupsPrinterInfo('google2', '4', 'id4'),
createCupsPrinterInfo('test1', '1', 'id1'), cups_printer_test_util.createCupsPrinterInfo('test1', '1', 'id1'),
createCupsPrinterInfo('test2', '2', 'id2'), cups_printer_test_util.createCupsPrinterInfo('test2', '2', 'id2'),
]); ]);
return cupsPrintersBrowserProxy.whenCalled('getCupsPrintersList') return cupsPrintersBrowserProxy.whenCalled('getCupsPrintersList')
.then(() => { .then(() => {
...@@ -972,21 +953,29 @@ suite('CupsSavedPrintersTests', function() { ...@@ -972,21 +953,29 @@ suite('CupsSavedPrintersTests', function() {
// There are 4 total printers but only 3 printers are visible and 1 is // There are 4 total printers but only 3 printers are visible and 1 is
// hidden underneath the Show more section. // hidden underneath the Show more section.
verifyVisiblePrinters(printerEntryListTestElement, [ verifyVisiblePrinters(printerEntryListTestElement, [
createPrinterListEntry('google', '3', 'id3', PrinterType.SAVED), cups_printer_test_util.createPrinterListEntry(
createPrinterListEntry('google2', '4', 'id4', PrinterType.SAVED), 'google', '3', 'id3', PrinterType.SAVED),
createPrinterListEntry('test1', '1', 'id1', PrinterType.SAVED) cups_printer_test_util.createPrinterListEntry(
'google2', '4', 'id4', PrinterType.SAVED),
cups_printer_test_util.createPrinterListEntry(
'test1', '1', 'id1', PrinterType.SAVED)
]); ]);
// Assert that the Show more button is shown since printer list length // Assert that the Show more button is shown since printer list length
// is > 3. // is > 3.
assertTrue(!!savedPrintersElement.$$('#show-more-container')); assertTrue(!!savedPrintersElement.$$('#show-more-container'));
// Add a new printer and expect it to be at the top of the list. // Add a new printer and expect it to be at the top of the list.
addNewSavedPrinter(createCupsPrinterInfo('newPrinter', '5', 'id5')); addNewSavedPrinter(cups_printer_test_util.createCupsPrinterInfo(
'newPrinter', '5', 'id5'));
verifyVisiblePrinters(printerEntryListTestElement, [ verifyVisiblePrinters(printerEntryListTestElement, [
createPrinterListEntry('newPrinter', '5', 'id5', PrinterType.SAVED), cups_printer_test_util.createPrinterListEntry(
createPrinterListEntry('google', '3', 'id3', PrinterType.SAVED), 'newPrinter', '5', 'id5', PrinterType.SAVED),
createPrinterListEntry('google2', '4', 'id4', PrinterType.SAVED), cups_printer_test_util.createPrinterListEntry(
createPrinterListEntry('test1', '1', 'id1', PrinterType.SAVED) 'google', '3', 'id3', PrinterType.SAVED),
cups_printer_test_util.createPrinterListEntry(
'google2', '4', 'id4', PrinterType.SAVED),
cups_printer_test_util.createPrinterListEntry(
'test1', '1', 'id1', PrinterType.SAVED)
]); ]);
assertTrue(!!savedPrintersElement.$$('#show-more-container')); assertTrue(!!savedPrintersElement.$$('#show-more-container'));
...@@ -997,9 +986,12 @@ suite('CupsSavedPrintersTests', function() { ...@@ -997,9 +986,12 @@ suite('CupsSavedPrintersTests', function() {
// visible printers. In this case, we remove 'test1' and now only // visible printers. In this case, we remove 'test1' and now only
// have 3 visible printers and 1 hidden printer: 'test2'. // have 3 visible printers and 1 hidden printer: 'test2'.
verifyVisiblePrinters(printerEntryListTestElement, [ verifyVisiblePrinters(printerEntryListTestElement, [
createPrinterListEntry('newPrinter', '5', 'id5', PrinterType.SAVED), cups_printer_test_util.createPrinterListEntry(
createPrinterListEntry('google', '3', 'id3', PrinterType.SAVED), 'newPrinter', '5', 'id5', PrinterType.SAVED),
createPrinterListEntry('google2', '4', 'id4', PrinterType.SAVED) cups_printer_test_util.createPrinterListEntry(
'google', '3', 'id3', PrinterType.SAVED),
cups_printer_test_util.createPrinterListEntry(
'google2', '4', 'id4', PrinterType.SAVED)
]); ]);
assertTrue(!!savedPrintersElement.$$('#show-more-container')); assertTrue(!!savedPrintersElement.$$('#show-more-container'));
...@@ -1007,9 +999,12 @@ suite('CupsSavedPrintersTests', function() { ...@@ -1007,9 +999,12 @@ suite('CupsSavedPrintersTests', function() {
// printers but now 'test2' is our third visible printer. // printers but now 'test2' is our third visible printer.
removeSavedPrinter('id4'); removeSavedPrinter('id4');
verifyVisiblePrinters(printerEntryListTestElement, [ verifyVisiblePrinters(printerEntryListTestElement, [
createPrinterListEntry('newPrinter', '5', 'id5', PrinterType.SAVED), cups_printer_test_util.createPrinterListEntry(
createPrinterListEntry('google', '3', 'id3', PrinterType.SAVED), 'newPrinter', '5', 'id5', PrinterType.SAVED),
createPrinterListEntry('test2', '2', 'id2', PrinterType.SAVED) cups_printer_test_util.createPrinterListEntry(
'google', '3', 'id3', PrinterType.SAVED),
cups_printer_test_util.createPrinterListEntry(
'test2', '2', 'id2', PrinterType.SAVED)
]); ]);
// Printer list length is <= 3, Show more button should be hidden. // Printer list length is <= 3, Show more button should be hidden.
assertFalse(!!savedPrintersElement.$$('#show-more-container')); assertFalse(!!savedPrintersElement.$$('#show-more-container'));
...@@ -1069,12 +1064,12 @@ suite('CupsNearbyPrintersTests', function() { ...@@ -1069,12 +1064,12 @@ suite('CupsNearbyPrintersTests', function() {
test('nearbyPrintersSuccessfullyPopulates', function() { test('nearbyPrintersSuccessfullyPopulates', function() {
const automaticPrinterList = [ const automaticPrinterList = [
createCupsPrinterInfo('test1', '1', 'id1'), cups_printer_test_util.createCupsPrinterInfo('test1', '1', 'id1'),
createCupsPrinterInfo('test2', '2', 'id2'), cups_printer_test_util.createCupsPrinterInfo('test2', '2', 'id2'),
]; ];
const discoveredPrinterList = [ const discoveredPrinterList = [
createCupsPrinterInfo('test3', '3', 'id3'), cups_printer_test_util.createCupsPrinterInfo('test3', '3', 'id3'),
createCupsPrinterInfo('test4', '4', 'id4'), cups_printer_test_util.createCupsPrinterInfo('test4', '4', 'id4'),
]; ];
return test_util.flushTasks().then(() => { return test_util.flushTasks().then(() => {
...@@ -1082,7 +1077,8 @@ suite('CupsNearbyPrintersTests', function() { ...@@ -1082,7 +1077,8 @@ suite('CupsNearbyPrintersTests', function() {
assertTrue(!!nearbyPrintersElement); assertTrue(!!nearbyPrintersElement);
// Assert that no printers have been detected. // Assert that no printers have been detected.
let nearbyPrinterEntries = getPrinterEntries(nearbyPrintersElement); let nearbyPrinterEntries =
cups_printer_test_util.getPrinterEntries(nearbyPrintersElement);
assertEquals(0, nearbyPrinterEntries.length); assertEquals(0, nearbyPrinterEntries.length);
// Simuluate finding nearby printers. // Simuluate finding nearby printers.
...@@ -1092,7 +1088,8 @@ suite('CupsNearbyPrintersTests', function() { ...@@ -1092,7 +1088,8 @@ suite('CupsNearbyPrintersTests', function() {
Polymer.dom.flush(); Polymer.dom.flush();
nearbyPrinterEntries = getPrinterEntries(nearbyPrintersElement); nearbyPrinterEntries =
cups_printer_test_util.getPrinterEntries(nearbyPrintersElement);
const expectedPrinterList = const expectedPrinterList =
automaticPrinterList.concat(discoveredPrinterList); automaticPrinterList.concat(discoveredPrinterList);
...@@ -1101,18 +1098,18 @@ suite('CupsNearbyPrintersTests', function() { ...@@ -1101,18 +1098,18 @@ suite('CupsNearbyPrintersTests', function() {
}); });
test('nearbyPrintersSortOrderAutoFirstThenDiscovered', function() { test('nearbyPrintersSortOrderAutoFirstThenDiscovered', function() {
const discoveredPrinterA = const discoveredPrinterA = cups_printer_test_util.createCupsPrinterInfo(
createCupsPrinterInfo('printerNameA', 'printerAddress1', 'printerId1'); 'printerNameA', 'printerAddress1', 'printerId1');
const discoveredPrinterB = const discoveredPrinterB = cups_printer_test_util.createCupsPrinterInfo(
createCupsPrinterInfo('printerNameB', 'printerAddress2', 'printerId2'); 'printerNameB', 'printerAddress2', 'printerId2');
const discoveredPrinterC = const discoveredPrinterC = cups_printer_test_util.createCupsPrinterInfo(
createCupsPrinterInfo('printerNameC', 'printerAddress3', 'printerId3'); 'printerNameC', 'printerAddress3', 'printerId3');
const autoPrinterD = const autoPrinterD = cups_printer_test_util.createCupsPrinterInfo(
createCupsPrinterInfo('printerNameD', 'printerAddress4', 'printerId4'); 'printerNameD', 'printerAddress4', 'printerId4');
const autoPrinterE = const autoPrinterE = cups_printer_test_util.createCupsPrinterInfo(
createCupsPrinterInfo('printerNameE', 'printerAddress5', 'printerId5'); 'printerNameE', 'printerAddress5', 'printerId5');
const autoPrinterF = const autoPrinterF = cups_printer_test_util.createCupsPrinterInfo(
createCupsPrinterInfo('printerNameF', 'printerAddress6', 'printerId6'); 'printerNameF', 'printerAddress6', 'printerId6');
// Add printers in a non-alphabetical order to test sorting. // Add printers in a non-alphabetical order to test sorting.
const automaticPrinterList = [autoPrinterF, autoPrinterD, autoPrinterE]; const automaticPrinterList = [autoPrinterF, autoPrinterD, autoPrinterE];
...@@ -1137,14 +1134,16 @@ suite('CupsNearbyPrintersTests', function() { ...@@ -1137,14 +1134,16 @@ suite('CupsNearbyPrintersTests', function() {
Polymer.dom.flush(); Polymer.dom.flush();
nearbyPrinterEntries = getPrinterEntries(nearbyPrintersElement); nearbyPrinterEntries =
cups_printer_test_util.getPrinterEntries(nearbyPrintersElement);
verifyPrintersList(nearbyPrinterEntries, expectedPrinterList); verifyPrintersList(nearbyPrinterEntries, expectedPrinterList);
}); });
}); });
test('addingAutomaticPrinterIsSuccessful', function() { test('addingAutomaticPrinterIsSuccessful', function() {
const automaticPrinterList = [createCupsPrinterInfo('test1', '1', 'id1')]; const automaticPrinterList =
[cups_printer_test_util.createCupsPrinterInfo('test1', '1', 'id1')];
const discoveredPrinterList = []; const discoveredPrinterList = [];
return test_util.flushTasks() return test_util.flushTasks()
...@@ -1161,7 +1160,8 @@ suite('CupsNearbyPrintersTests', function() { ...@@ -1161,7 +1160,8 @@ suite('CupsNearbyPrintersTests', function() {
// Requery and assert that the newly detected printer automatic // Requery and assert that the newly detected printer automatic
// printer has the correct button. // printer has the correct button.
nearbyPrinterEntries = getPrinterEntries(nearbyPrintersElement); nearbyPrinterEntries =
cups_printer_test_util.getPrinterEntries(nearbyPrintersElement);
assertEquals(1, nearbyPrinterEntries.length); assertEquals(1, nearbyPrinterEntries.length);
assertTrue(!!nearbyPrinterEntries[0].$$('#savePrinterButton')); assertTrue(!!nearbyPrinterEntries[0].$$('#savePrinterButton'));
...@@ -1182,7 +1182,8 @@ suite('CupsNearbyPrintersTests', function() { ...@@ -1182,7 +1182,8 @@ suite('CupsNearbyPrintersTests', function() {
test('addingDiscoveredPrinterIsSuccessful', function() { test('addingDiscoveredPrinterIsSuccessful', function() {
const automaticPrinterList = []; const automaticPrinterList = [];
const discoveredPrinterList = [createCupsPrinterInfo('test3', '3', 'id3')]; const discoveredPrinterList =
[cups_printer_test_util.createCupsPrinterInfo('test3', '3', 'id3')];
let manufacturerDialog = null; let manufacturerDialog = null;
...@@ -1200,7 +1201,8 @@ suite('CupsNearbyPrintersTests', function() { ...@@ -1200,7 +1201,8 @@ suite('CupsNearbyPrintersTests', function() {
// Requery and assert that a newly detected discovered printer has // Requery and assert that a newly detected discovered printer has
// the correct icon button. // the correct icon button.
nearbyPrinterEntries = getPrinterEntries(nearbyPrintersElement); nearbyPrinterEntries =
cups_printer_test_util.getPrinterEntries(nearbyPrintersElement);
assertEquals(1, nearbyPrinterEntries.length); assertEquals(1, nearbyPrinterEntries.length);
assertTrue(!!nearbyPrinterEntries[0].$$('#setupPrinterButton')); assertTrue(!!nearbyPrinterEntries[0].$$('#setupPrinterButton'));
...@@ -1286,12 +1288,12 @@ suite('CupsNearbyPrintersTests', function() { ...@@ -1286,12 +1288,12 @@ suite('CupsNearbyPrintersTests', function() {
}) })
.then(() => { .then(() => {
const automaticPrinterList = [ const automaticPrinterList = [
createCupsPrinterInfo('test1', '1', 'id1'), cups_printer_test_util.createCupsPrinterInfo('test1', '1', 'id1'),
createCupsPrinterInfo('test2', '2', 'id2'), cups_printer_test_util.createCupsPrinterInfo('test2', '2', 'id2'),
]; ];
const discoveredPrinterList = [ const discoveredPrinterList = [
createCupsPrinterInfo('test3', '3', 'id3'), cups_printer_test_util.createCupsPrinterInfo('test3', '3', 'id3'),
createCupsPrinterInfo('test4', '4', 'id4'), cups_printer_test_util.createCupsPrinterInfo('test4', '4', 'id4'),
]; ];
// Simuluate finding nearby printers. // Simuluate finding nearby printers.
...@@ -1308,7 +1310,8 @@ suite('CupsNearbyPrintersTests', function() { ...@@ -1308,7 +1310,8 @@ suite('CupsNearbyPrintersTests', function() {
nearbyPrintersElement.$$('#printerEntryList'); nearbyPrintersElement.$$('#printerEntryList');
assertTrue(!!printerEntryListTestElement); assertTrue(!!printerEntryListTestElement);
nearbyPrinterEntries = getPrinterEntries(nearbyPrintersElement); nearbyPrinterEntries =
cups_printer_test_util.getPrinterEntries(nearbyPrintersElement);
const expectedPrinterList = const expectedPrinterList =
automaticPrinterList.concat(discoveredPrinterList); automaticPrinterList.concat(discoveredPrinterList);
...@@ -1318,9 +1321,12 @@ suite('CupsNearbyPrintersTests', function() { ...@@ -1318,9 +1321,12 @@ suite('CupsNearbyPrintersTests', function() {
test('NearbyPrintersSearchTermFiltersCorrectPrinters', function() { test('NearbyPrintersSearchTermFiltersCorrectPrinters', function() {
const discoveredPrinterList = [ const discoveredPrinterList = [
createCupsPrinterInfo('test1', 'printerAddress1', 'printerId1'), cups_printer_test_util.createCupsPrinterInfo(
createCupsPrinterInfo('test2', 'printerAddress2', 'printerId2'), 'test1', 'printerAddress1', 'printerId1'),
createCupsPrinterInfo('google', 'printerAddress3', 'printerId3'), cups_printer_test_util.createCupsPrinterInfo(
'test2', 'printerAddress2', 'printerId2'),
cups_printer_test_util.createCupsPrinterInfo(
'google', 'printerAddress3', 'printerId3'),
]; ];
return test_util.flushTasks().then(() => { return test_util.flushTasks().then(() => {
...@@ -1338,11 +1344,11 @@ suite('CupsNearbyPrintersTests', function() { ...@@ -1338,11 +1344,11 @@ suite('CupsNearbyPrintersTests', function() {
Polymer.dom.flush(); Polymer.dom.flush();
verifyVisiblePrinters(printerEntryListTestElement, [ verifyVisiblePrinters(printerEntryListTestElement, [
createPrinterListEntry( cups_printer_test_util.createPrinterListEntry(
'google', 'printerAddress3', 'printerId3', PrinterType.DISCOVERD), 'google', 'printerAddress3', 'printerId3', PrinterType.DISCOVERD),
createPrinterListEntry( cups_printer_test_util.createPrinterListEntry(
'test1', 'printerAddress1', 'printerId1', PrinterType.DISCOVERD), 'test1', 'printerAddress1', 'printerId1', PrinterType.DISCOVERD),
createPrinterListEntry( cups_printer_test_util.createPrinterListEntry(
'test2', 'printerAddress2', 'printerId2', PrinterType.DISCOVERD) 'test2', 'printerAddress2', 'printerId2', PrinterType.DISCOVERD)
]); ]);
...@@ -1353,7 +1359,7 @@ suite('CupsNearbyPrintersTests', function() { ...@@ -1353,7 +1359,7 @@ suite('CupsNearbyPrintersTests', function() {
// Filtering "google" should result in one visible entry and two hidden // Filtering "google" should result in one visible entry and two hidden
// entries. // entries.
verifySearchQueryResults( verifySearchQueryResults(
nearbyPrintersElement, [createPrinterListEntry( nearbyPrintersElement, [cups_printer_test_util.createPrinterListEntry(
'google', 'printerAddress3', 'printerId3', 'google', 'printerAddress3', 'printerId3',
PrinterType.DISCOVERD)], PrinterType.DISCOVERD)],
searchTerm); searchTerm);
...@@ -1367,19 +1373,19 @@ suite('CupsNearbyPrintersTests', function() { ...@@ -1367,19 +1373,19 @@ suite('CupsNearbyPrintersTests', function() {
verifySearchQueryResults( verifySearchQueryResults(
nearbyPrintersElement, nearbyPrintersElement,
[ [
createPrinterListEntry( cups_printer_test_util.createPrinterListEntry(
'test1', 'printerAddress1', 'printerId1', 'test1', 'printerAddress1', 'printerId1',
PrinterType.DISCOVERD), PrinterType.DISCOVERD),
createPrinterListEntry( cups_printer_test_util.createPrinterListEntry(
'test2', 'printerAddress2', 'printerId2', PrinterType.DISCOVERD) 'test2', 'printerAddress2', 'printerId2', PrinterType.DISCOVERD)
], ],
searchTerm); searchTerm);
// Add more printers and assert that they are correctly filtered. // Add more printers and assert that they are correctly filtered.
discoveredPrinterList.push( discoveredPrinterList.push(cups_printer_test_util.createCupsPrinterInfo(
createCupsPrinterInfo('test3', 'printerAddress4', 'printerId4')); 'test3', 'printerAddress4', 'printerId4'));
discoveredPrinterList.push( discoveredPrinterList.push(cups_printer_test_util.createCupsPrinterInfo(
createCupsPrinterInfo('google2', 'printerAddress5', 'printerId5')); 'google2', 'printerAddress5', 'printerId5'));
// Simuluate finding nearby printers. // Simuluate finding nearby printers.
cr.webUIListenerCallback( cr.webUIListenerCallback(
...@@ -1390,13 +1396,13 @@ suite('CupsNearbyPrintersTests', function() { ...@@ -1390,13 +1396,13 @@ suite('CupsNearbyPrintersTests', function() {
verifySearchQueryResults( verifySearchQueryResults(
nearbyPrintersElement, nearbyPrintersElement,
[ [
createPrinterListEntry( cups_printer_test_util.createPrinterListEntry(
'test1', 'printerAddress1', 'printerId1', 'test1', 'printerAddress1', 'printerId1',
PrinterType.DISCOVERD), PrinterType.DISCOVERD),
createPrinterListEntry( cups_printer_test_util.createPrinterListEntry(
'test2', 'printerAddress2', 'printerId2', 'test2', 'printerAddress2', 'printerId2',
PrinterType.DISCOVERD), PrinterType.DISCOVERD),
createPrinterListEntry( cups_printer_test_util.createPrinterListEntry(
'test3', 'printerAddress4', 'printerId4', PrinterType.DISCOVERD) 'test3', 'printerAddress4', 'printerId4', PrinterType.DISCOVERD)
], ],
searchTerm); searchTerm);
...@@ -1405,8 +1411,10 @@ suite('CupsNearbyPrintersTests', function() { ...@@ -1405,8 +1411,10 @@ suite('CupsNearbyPrintersTests', function() {
test('NearbyPrintersNoSearchFound', function() { test('NearbyPrintersNoSearchFound', function() {
const discoveredPrinterList = [ const discoveredPrinterList = [
createCupsPrinterInfo('test1', 'printerAddress1', 'printerId1'), cups_printer_test_util.createCupsPrinterInfo(
createCupsPrinterInfo('google', 'printerAddress2', 'printerId2') 'test1', 'printerAddress1', 'printerId1'),
cups_printer_test_util.createCupsPrinterInfo(
'google', 'printerAddress2', 'printerId2')
]; ];
return test_util.flushTasks().then(() => { return test_util.flushTasks().then(() => {
...@@ -1430,7 +1438,7 @@ suite('CupsNearbyPrintersTests', function() { ...@@ -1430,7 +1438,7 @@ suite('CupsNearbyPrintersTests', function() {
// Set the search term and filter out the printers. Filtering "google" // Set the search term and filter out the printers. Filtering "google"
// should result in one visible entry and one hidden entries. // should result in one visible entry and one hidden entries.
verifySearchQueryResults( verifySearchQueryResults(
nearbyPrintersElement, [createPrinterListEntry( nearbyPrintersElement, [cups_printer_test_util.createPrinterListEntry(
'google', 'printerAddress2', 'printerId2', 'google', 'printerAddress2', 'printerId2',
PrinterType.DISCOVERED)], PrinterType.DISCOVERED)],
searchTerm); searchTerm);
...@@ -1449,7 +1457,7 @@ suite('CupsNearbyPrintersTests', function() { ...@@ -1449,7 +1457,7 @@ suite('CupsNearbyPrintersTests', function() {
Polymer.dom.flush(); Polymer.dom.flush();
verifySearchQueryResults( verifySearchQueryResults(
nearbyPrintersElement, [createPrinterListEntry( nearbyPrintersElement, [cups_printer_test_util.createPrinterListEntry(
'google', 'printerAddress2', 'printerId2', 'google', 'printerAddress2', 'printerId2',
PrinterType.DISCOVERD)], PrinterType.DISCOVERD)],
searchTerm); searchTerm);
......
chrome/test/data/webui/settings/chromeos/cups_printer_test_utils.js 0 → 100644
View file @ c072c278
// Copyright 2020 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
cr.define('cups_printer_test_util', function() {
/**
* @param {string} printerName
* @param {string} printerAddress
* @param {string} printerId
* @return {!CupsPrinterInfo}
* @private
*/
function createCupsPrinterInfo(printerName, printerAddress, printerId) {
const printer = {
ppdManufacturer: '',
ppdModel: '',
printerAddress: printerAddress,
printerDescription: '',
printerId: printerId,
printerManufacturer: '',
printerModel: '',
printerMakeAndModel: '',
printerName: printerName,
printerPPDPath: '',
printerPpdReference: {
userSuppliedPpdUrl: '',
effectiveMakeAndModel: '',
autoconf: false,
},
printerProtocol: 'ipp',
printerQueue: 'moreinfohere',
printerStatus: '',
};
return printer;
}
/**
* Helper function that creates a new PrinterListEntry.
* @param {string} printerName
* @param {string} printerAddress
* @param {string} printerId
* @param {string} printerType
* @return {!PrinterListEntry}
*/
function createPrinterListEntry(
printerName, printerAddress, printerId, printerType) {
const entry = {
printerInfo: {
ppdManufacturer: '',
ppdModel: '',
printerAddress: printerAddress,
printerDescription: '',
printerId: printerId,
printerManufacturer: '',
printerModel: '',
printerMakeAndModel: '',
printerName: printerName,
printerPPDPath: '',
printerPpdReference: {
userSuppliedPpdUrl: '',
effectiveMakeAndModel: '',
autoconf: false,
},
printerProtocol: 'ipp',
printerQueue: 'moreinfohere',
printerStatus: '',
},
printerType: printerType,
};
return entry;
}
/**
* Helper method to pull an array of CupsPrinterEntry out of a
* |printersElement|.
* @param {!HTMLElement} printersElement
* @return {!Array<!HTMLElement>}
* @private
*/
function getPrinterEntries(printersElement) {
const entryList = printersElement.$$('#printerEntryList');
return entryList.querySelectorAll(
'settings-cups-printers-entry:not([hidden])');
}
return {
createCupsPrinterInfo: createCupsPrinterInfo,
getPrinterEntries: getPrinterEntries,
createPrinterListEntry: createPrinterListEntry,
};
});
chrome/test/data/webui/settings/chromeos/os_settings_browsertest.js
View file @ c072c278
...@@ -1010,6 +1010,7 @@ var OSSettingsPrinterLandingPageTest = class extends OSSettingsBrowserTest { ...@@ -1010,6 +1010,7 @@ var OSSettingsPrinterLandingPageTest = class extends OSSettingsBrowserTest {
BROWSER_SETTINGS_PATH + '../test_browser_proxy.js', BROWSER_SETTINGS_PATH + '../test_browser_proxy.js',
BROWSER_SETTINGS_PATH + '../fake_chrome_event.js', BROWSER_SETTINGS_PATH + '../fake_chrome_event.js',
BROWSER_SETTINGS_PATH + '../chromeos/fake_network_config_mojom.js', BROWSER_SETTINGS_PATH + '../chromeos/fake_network_config_mojom.js',
'cups_printer_test_utils.js',
'test_cups_printers_browser_proxy.js', 'test_cups_printers_browser_proxy.js',
'cups_printer_landing_page_tests.js', 'cups_printer_landing_page_tests.js',
]); ]);
...@@ -1035,6 +1036,7 @@ var OSSettingsPrintingPageTest = class extends OSSettingsBrowserTest { ...@@ -1035,6 +1036,7 @@ var OSSettingsPrintingPageTest = class extends OSSettingsBrowserTest {
BROWSER_SETTINGS_PATH + '../test_util.js', BROWSER_SETTINGS_PATH + '../test_util.js',
BROWSER_SETTINGS_PATH + '../test_browser_proxy.js', BROWSER_SETTINGS_PATH + '../test_browser_proxy.js',
'test_cups_printers_browser_proxy.js', 'test_cups_printers_browser_proxy.js',
'cups_printer_test_utils.js',
'cups_printer_page_tests.js', 'cups_printer_page_tests.js',
]); ]);
} }
......
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