Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7777)

Unified Diff: chrome/test/data/webui/print_preview.js

Issue 318293002: Revert of Revert of Generalize printer color model handling, get rid of CUPS specific case. Enable supported paper szes… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/common/cloud_print/cloud_print_cdd_conversion.cc ('k') | printing/backend/print_backend.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/data/webui/print_preview.js
diff --git a/chrome/test/data/webui/print_preview.js b/chrome/test/data/webui/print_preview.js
index a7d8bdfad1bfcb0c11a5d3e76bba722c24941c47..b0b7221b719e9b61792583ea1ace978417ee0df1 100644
--- a/chrome/test/data/webui/print_preview.js
+++ b/chrome/test/data/webui/print_preview.js
@@ -85,6 +85,18 @@
return print_preview.PreviewArea.PluginType_.NONE;
};
}.bind(this));
+ },
+
+ setUpPreview: function() {
+ var initialSettingsSetEvent =
+ new Event(print_preview.NativeLayer.EventType.INITIAL_SETTINGS_SET);
+ initialSettingsSetEvent.initialSettings = this.initialSettings_;
+ this.nativeLayer_.dispatchEvent(initialSettingsSetEvent);
+
+ var localDestsSetEvent =
+ new Event(print_preview.NativeLayer.EventType.LOCAL_DESTINATIONS_SET);
+ localDestsSetEvent.destinationInfos = this.localDestinationInfos_;
+ this.nativeLayer_.dispatchEvent(localDestsSetEvent);
},
/**
@@ -584,43 +596,11 @@
true);
});
-// Test that the color settings are set according to the printer capabilities.
-TEST_F('PrintPreviewWebUITest', 'TestColorSettingsTrue', function() {
- var initialSettingsSetEvent =
- new Event(print_preview.NativeLayer.EventType.INITIAL_SETTINGS_SET);
- initialSettingsSetEvent.initialSettings = this.initialSettings_;
- this.nativeLayer_.dispatchEvent(initialSettingsSetEvent);
-
- var localDestsSetEvent =
- new Event(print_preview.NativeLayer.EventType.LOCAL_DESTINATIONS_SET);
- localDestsSetEvent.destinationInfos = this.localDestinationInfos_;
- this.nativeLayer_.dispatchEvent(localDestsSetEvent);
-
- var capsSetEvent =
- new Event(print_preview.NativeLayer.EventType.CAPABILITIES_SET);
- capsSetEvent.settingsInfo = getCddTemplate("FooDevice");
- this.nativeLayer_.dispatchEvent(capsSetEvent);
-
- checkSectionVisible($('color-settings'), true);
-
- var colorOption = $('color-settings').querySelector('.color-option');
- var bwOption = $('color-settings').querySelector('.bw-option');
- expectTrue(colorOption.checked);
- expectFalse(bwOption.checked);
-});
-
-//Test that the color settings are set according to the printer capabilities.
-TEST_F('PrintPreviewWebUITest', 'TestColorSettingsFalse', function() {
- var initialSettingsSetEvent =
- new Event(print_preview.NativeLayer.EventType.INITIAL_SETTINGS_SET);
- initialSettingsSetEvent.initialSettings = this.initialSettings_;
- this.nativeLayer_.dispatchEvent(initialSettingsSetEvent);
-
- var localDestsSetEvent =
- new Event(print_preview.NativeLayer.EventType.LOCAL_DESTINATIONS_SET);
- localDestsSetEvent.destinationInfos = this.localDestinationInfos_;
- this.nativeLayer_.dispatchEvent(localDestsSetEvent);
-
+// Test that the color settings, one option, standard monochrome.
+TEST_F('PrintPreviewWebUITest', 'TestColorSettingsMonochrome', function() {
+ this.setUpPreview();
+
+ // Only one option, standard monochrome.
var capsSetEvent =
new Event(print_preview.NativeLayer.EventType.CAPABILITIES_SET);
capsSetEvent.settingsInfo = getCddTemplate("FooDevice");
@@ -632,11 +612,123 @@
this.nativeLayer_.dispatchEvent(capsSetEvent);
checkSectionVisible($('color-settings'), false);
-
- var colorOption = $('color-settings').querySelector('.color-option');
- var bwOption = $('color-settings').querySelector('.bw-option');
- expectFalse(colorOption.checked);
- expectTrue(bwOption.checked);
+});
+
+// Test that the color settings, one option, custom monochrome.
+TEST_F('PrintPreviewWebUITest', 'TestColorSettingsCustomMonochrome',
+ function() {
+ this.setUpPreview();
+
+ // Only one option, standard monochrome.
+ var capsSetEvent =
+ new Event(print_preview.NativeLayer.EventType.CAPABILITIES_SET);
+ capsSetEvent.settingsInfo = getCddTemplate("FooDevice");
+ capsSetEvent.settingsInfo.capabilities.printer.color = {
+ "option": [
+ {"is_default": true, "type": "CUSTOM_MONOCHROME", "vendor_id": "42"}
+ ]
+ };
+ this.nativeLayer_.dispatchEvent(capsSetEvent);
+
+ checkSectionVisible($('color-settings'), false);
+});
+
+// Test that the color settings, one option, standard color.
+TEST_F('PrintPreviewWebUITest', 'TestColorSettingsColor', function() {
+ this.setUpPreview();
+
+ var capsSetEvent =
+ new Event(print_preview.NativeLayer.EventType.CAPABILITIES_SET);
+ capsSetEvent.settingsInfo = getCddTemplate("FooDevice");
+ capsSetEvent.settingsInfo.capabilities.printer.color = {
+ "option": [
+ {"is_default": true, "type": "STANDARD_COLOR"}
+ ]
+ };
+ this.nativeLayer_.dispatchEvent(capsSetEvent);
+
+ checkSectionVisible($('color-settings'), false);
+});
+
+// Test that the color settings, one option, custom color.
+TEST_F('PrintPreviewWebUITest', 'TestColorSettingsCustomColor', function() {
+ this.setUpPreview();
+
+ var capsSetEvent =
+ new Event(print_preview.NativeLayer.EventType.CAPABILITIES_SET);
+ capsSetEvent.settingsInfo = getCddTemplate("FooDevice");
+ capsSetEvent.settingsInfo.capabilities.printer.color = {
+ "option": [
+ {"is_default": true, "type": "CUSTOM_COLOR", "vendor_id": "42"}
+ ]
+ };
+ this.nativeLayer_.dispatchEvent(capsSetEvent);
+
+ checkSectionVisible($('color-settings'), false);
+});
+
+// Test that the color settings, two options, both standard, defaults to color.
+TEST_F('PrintPreviewWebUITest', 'TestColorSettingsBothStandardDefaultColor',
+ function() {
+ this.setUpPreview();
+
+ var capsSetEvent =
+ new Event(print_preview.NativeLayer.EventType.CAPABILITIES_SET);
+ capsSetEvent.settingsInfo = getCddTemplate("FooDevice");
+ capsSetEvent.settingsInfo.capabilities.printer.color = {
+ "option": [
+ {"type": "STANDARD_MONOCHROME"},
+ {"is_default": true, "type": "STANDARD_COLOR"}
+ ]
+ };
+ this.nativeLayer_.dispatchEvent(capsSetEvent);
+
+ checkSectionVisible($('color-settings'), true);
+ expectTrue($('color-settings').querySelector('.color-option').checked);
+ expectFalse($('color-settings').querySelector('.bw-option').checked);
+});
+
+// Test that the color settings, two options, both standard, defaults to
+// monochrome.
+TEST_F('PrintPreviewWebUITest',
+ 'TestColorSettingsBothStandardDefaultMonochrome', function() {
+ this.setUpPreview();
+
+ var capsSetEvent =
+ new Event(print_preview.NativeLayer.EventType.CAPABILITIES_SET);
+ capsSetEvent.settingsInfo = getCddTemplate("FooDevice");
+ capsSetEvent.settingsInfo.capabilities.printer.color = {
+ "option": [
+ {"is_default": true, "type": "STANDARD_MONOCHROME"},
+ {"type": "STANDARD_COLOR"}
+ ]
+ };
+ this.nativeLayer_.dispatchEvent(capsSetEvent);
+
+ checkSectionVisible($('color-settings'), true);
+ expectFalse($('color-settings').querySelector('.color-option').checked);
+ expectTrue($('color-settings').querySelector('.bw-option').checked);
+});
+
+// Test that the color settings, two options, both custom, defaults to color.
+TEST_F('PrintPreviewWebUITest',
+ 'TestColorSettingsBothCustomDefaultColor', function() {
+ this.setUpPreview();
+
+ var capsSetEvent =
+ new Event(print_preview.NativeLayer.EventType.CAPABILITIES_SET);
+ capsSetEvent.settingsInfo = getCddTemplate("FooDevice");
+ capsSetEvent.settingsInfo.capabilities.printer.color = {
+ "option": [
+ {"type": "CUSTOM_MONOCHROME", "vendor_id": "42"},
+ {"is_default": true, "type": "CUSTOM_COLOR", "vendor_id": "43"}
+ ]
+ };
+ this.nativeLayer_.dispatchEvent(capsSetEvent);
+
+ checkSectionVisible($('color-settings'), true);
+ expectTrue($('color-settings').querySelector('.color-option').checked);
+ expectFalse($('color-settings').querySelector('.bw-option').checked);
});
// Test to verify that duplex settings are set according to the printer
@@ -666,8 +758,8 @@
expectFalse(duplexCheckbox.checked);
});
-//Test to verify that duplex settings are set according to the printer
-//capabilities.
+// Test to verify that duplex settings are set according to the printer
+// capabilities.
TEST_F('PrintPreviewWebUITest', 'TestDuplexSettingsFalse', function() {
var initialSettingsSetEvent =
new Event(print_preview.NativeLayer.EventType.INITIAL_SETTINGS_SET);
« no previous file with comments | « chrome/common/cloud_print/cloud_print_cdd_conversion.cc ('k') | printing/backend/print_backend.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698