Index: chrome/service/cloud_print/connector_settings_unittest.cc |
diff --git a/chrome/service/cloud_print/connector_settings_unittest.cc b/chrome/service/cloud_print/connector_settings_unittest.cc |
index 6aaa6c486eaf2a73ed58b55df525732255a09852..801d9848f300a1fa3b2cf038a8664ee92a790031 100644 |
--- a/chrome/service/cloud_print/connector_settings_unittest.cc |
+++ b/chrome/service/cloud_print/connector_settings_unittest.cc |
@@ -28,6 +28,8 @@ const char kServiceStateContent[] = |
" 'service_url': 'http://cp.google.com'," |
" 'xmpp_auth_token': 'xmp token'," |
" 'connect_new_printers': false," |
+ " 'xmpp_ping_enabled': true," |
+ " 'xmpp_ping_timeout_sec': 256," |
" 'printer_blacklist': [" |
" 'prn1'," |
" 'prn2'" |
@@ -83,6 +85,7 @@ TEST_F(ConnectorSettingsTest, InitFromEmpty) { |
EXPECT_FALSE(settings.delete_on_enum_fail()); |
EXPECT_EQ(NULL, settings.print_system_settings()); |
EXPECT_TRUE(settings.connect_new_printers()); |
+ EXPECT_FALSE(settings.xmpp_ping_enabled()); |
EXPECT_FALSE(settings.IsPrinterBlacklisted("prn1")); |
} |
} |
@@ -97,6 +100,8 @@ TEST_F(ConnectorSettingsTest, InitFromFile) { |
EXPECT_TRUE(settings.delete_on_enum_fail()); |
EXPECT_TRUE(settings.print_system_settings()); |
EXPECT_FALSE(settings.connect_new_printers()); |
+ EXPECT_TRUE(settings.xmpp_ping_enabled()); |
+ EXPECT_EQ(settings.xmpp_ping_timeout_sec(), 256); |
EXPECT_FALSE(settings.IsPrinterBlacklisted("prn0")); |
EXPECT_TRUE(settings.IsPrinterBlacklisted("prn1")); |
} |
@@ -115,6 +120,9 @@ TEST_F(ConnectorSettingsTest, CopyFrom) { |
EXPECT_EQ(settings1.print_system_settings()->size(), |
settings2.print_system_settings()->size()); |
EXPECT_EQ(settings1.connect_new_printers(), settings2.connect_new_printers()); |
+ EXPECT_EQ(settings1.xmpp_ping_enabled(), settings2.xmpp_ping_enabled()); |
+ EXPECT_EQ(settings1.xmpp_ping_timeout_sec(), |
+ settings2.xmpp_ping_timeout_sec()); |
EXPECT_TRUE(settings2.IsPrinterBlacklisted("prn1")); |
Vitaly Buka (NO REVIEWS)
2012/10/22 22:34:05
Would be nice to have setter test for valid/invali
gene
2012/10/22 23:36:22
Done.
|
} |