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

Unified Diff: components/cloud_devices/common/printer_description_unittest.cc

Issue 325313003: Add vendor id and custom display name to media selection (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
Index: components/cloud_devices/common/printer_description_unittest.cc
diff --git a/components/cloud_devices/common/printer_description_unittest.cc b/components/cloud_devices/common/printer_description_unittest.cc
index 519409e6ea3c9b6bdfe507dda5c8e9e711a858c9..8603b6a85a4bd8067fff11e58e443cf6bec86775 100644
--- a/components/cloud_devices/common/printer_description_unittest.cc
+++ b/components/cloud_devices/common/printer_description_unittest.cc
@@ -136,9 +136,11 @@ const char kCdd[] =
" 'width_microns': 6666,"
" 'height_microns': 7777"
" }, {"
+ " 'name': 'CUSTOM',"
" 'width_microns': 1111,"
" 'is_continuous_feed': true,"
- " 'custom_display_name': 'FEED'"
+ " 'custom_display_name': 'Feed',"
+ " 'vendor_id': 'FEED'"
" } ]"
" },"
" 'collate': {"
@@ -364,7 +366,7 @@ TEST(PrinterDescriptionTest, CddSetAll) {
media.AddDefaultOption(Media(NA_LETTER, 2222, 3333), true);
media.AddOption(Media(ISO_A6, 4444, 5555));
media.AddOption(Media(JPN_YOU4, 6666, 7777));
- media.AddOption(Media("FEED", 1111, 0));
+ media.AddOption(Media("Feed", "FEED", 1111, 0));
collate.set_default_value(false);
reverse.set_default_value(true);
@@ -463,7 +465,7 @@ TEST(PrinterDescriptionTest, CddGetAll) {
EXPECT_TRUE(media.Contains(Media(NA_LETTER, 2222, 3333)));
EXPECT_TRUE(media.Contains(Media(ISO_A6, 4444, 5555)));
EXPECT_TRUE(media.Contains(Media(JPN_YOU4, 6666, 7777)));
- EXPECT_TRUE(media.Contains(Media("FEED", 1111, 0)));
+ EXPECT_TRUE(media.Contains(Media("Feed", "FEED", 1111, 0)));
EXPECT_EQ(Media(NA_LETTER, 2222, 3333), media.GetDefault());
EXPECT_FALSE(collate.default_value());

Powered by Google App Engine
This is Rietveld 408576698