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

Side by Side Diff: chrome/service/cloud_print/connector_settings_unittest.cc

Issue 11232048: Adding XMPP ping functionality to CLoudPrint. XMPP ping and timeout is controlled thorugh Service S… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: moved some variabled to connector settings Created 8 years, 1 month 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/service/cloud_print/connector_settings.h" 5 #include "chrome/service/cloud_print/connector_settings.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/file_util.h" 9 #include "base/file_util.h"
10 #include "base/message_loop.h" 10 #include "base/message_loop.h"
(...skipping 10 matching lines...) Expand all
21 " 'cloud_print': {" 21 " 'cloud_print': {"
22 " 'auth_token': 'token'," 22 " 'auth_token': 'token',"
23 " 'email': 'user@gmail.com'," 23 " 'email': 'user@gmail.com',"
24 " 'enabled': true," 24 " 'enabled': true,"
25 " 'proxy_id': 'PROXY'," 25 " 'proxy_id': 'PROXY',"
26 " 'robot_email': '123@cloudprint.googleusercontent.com'," 26 " 'robot_email': '123@cloudprint.googleusercontent.com',"
27 " 'robot_refresh_token': '123'," 27 " 'robot_refresh_token': '123',"
28 " 'service_url': 'http://cp.google.com'," 28 " 'service_url': 'http://cp.google.com',"
29 " 'xmpp_auth_token': 'xmp token'," 29 " 'xmpp_auth_token': 'xmp token',"
30 " 'connect_new_printers': false," 30 " 'connect_new_printers': false,"
31 " 'xmpp_ping_enabled': true,"
32 " 'xmpp_ping_timeout_sec': 256,"
31 " 'printer_blacklist': [" 33 " 'printer_blacklist': ["
32 " 'prn1'," 34 " 'prn1',"
33 " 'prn2'" 35 " 'prn2'"
34 " ]," 36 " ],"
35 " 'print_system_settings': {" 37 " 'print_system_settings': {"
36 " 'delete_on_enum_fail' : true" 38 " 'delete_on_enum_fail' : true"
37 " }" 39 " }"
38 " }" 40 " }"
39 "}"; 41 "}";
40 42
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 scoped_ptr<ServiceProcessPrefs> prefs(CreateTestFile(kEmptyJSons[i])); 78 scoped_ptr<ServiceProcessPrefs> prefs(CreateTestFile(kEmptyJSons[i]));
77 ConnectorSettings settings; 79 ConnectorSettings settings;
78 settings.InitFrom(prefs.get()); 80 settings.InitFrom(prefs.get());
79 81
80 EXPECT_EQ("https://www.google.com/cloudprint", 82 EXPECT_EQ("https://www.google.com/cloudprint",
81 settings.server_url().spec()); 83 settings.server_url().spec());
82 EXPECT_FALSE(settings.proxy_id().empty()); 84 EXPECT_FALSE(settings.proxy_id().empty());
83 EXPECT_FALSE(settings.delete_on_enum_fail()); 85 EXPECT_FALSE(settings.delete_on_enum_fail());
84 EXPECT_EQ(NULL, settings.print_system_settings()); 86 EXPECT_EQ(NULL, settings.print_system_settings());
85 EXPECT_TRUE(settings.connect_new_printers()); 87 EXPECT_TRUE(settings.connect_new_printers());
88 EXPECT_FALSE(settings.xmpp_ping_enabled());
86 EXPECT_FALSE(settings.IsPrinterBlacklisted("prn1")); 89 EXPECT_FALSE(settings.IsPrinterBlacklisted("prn1"));
87 } 90 }
88 } 91 }
89 92
90 TEST_F(ConnectorSettingsTest, InitFromFile) { 93 TEST_F(ConnectorSettingsTest, InitFromFile) {
91 scoped_ptr<ServiceProcessPrefs> prefs(CreateTestFile(kServiceStateContent)); 94 scoped_ptr<ServiceProcessPrefs> prefs(CreateTestFile(kServiceStateContent));
92 ConnectorSettings settings; 95 ConnectorSettings settings;
93 settings.InitFrom(prefs.get()); 96 settings.InitFrom(prefs.get());
94 EXPECT_EQ("http://cp.google.com/", settings.server_url().spec()); 97 EXPECT_EQ("http://cp.google.com/", settings.server_url().spec());
95 EXPECT_EQ("PROXY", settings.proxy_id()); 98 EXPECT_EQ("PROXY", settings.proxy_id());
96 EXPECT_FALSE(settings.proxy_id().empty()); 99 EXPECT_FALSE(settings.proxy_id().empty());
97 EXPECT_TRUE(settings.delete_on_enum_fail()); 100 EXPECT_TRUE(settings.delete_on_enum_fail());
98 EXPECT_TRUE(settings.print_system_settings()); 101 EXPECT_TRUE(settings.print_system_settings());
99 EXPECT_FALSE(settings.connect_new_printers()); 102 EXPECT_FALSE(settings.connect_new_printers());
103 EXPECT_TRUE(settings.xmpp_ping_enabled());
104 EXPECT_EQ(settings.xmpp_ping_timeout_sec(), 256);
100 EXPECT_FALSE(settings.IsPrinterBlacklisted("prn0")); 105 EXPECT_FALSE(settings.IsPrinterBlacklisted("prn0"));
101 EXPECT_TRUE(settings.IsPrinterBlacklisted("prn1")); 106 EXPECT_TRUE(settings.IsPrinterBlacklisted("prn1"));
102 } 107 }
103 108
104 TEST_F(ConnectorSettingsTest, CopyFrom) { 109 TEST_F(ConnectorSettingsTest, CopyFrom) {
105 scoped_ptr<ServiceProcessPrefs> prefs(CreateTestFile(kServiceStateContent)); 110 scoped_ptr<ServiceProcessPrefs> prefs(CreateTestFile(kServiceStateContent));
106 ConnectorSettings settings1; 111 ConnectorSettings settings1;
107 settings1.InitFrom(prefs.get()); 112 settings1.InitFrom(prefs.get());
108 113
109 ConnectorSettings settings2; 114 ConnectorSettings settings2;
110 settings2.CopyFrom(settings1); 115 settings2.CopyFrom(settings1);
111 116
112 EXPECT_EQ(settings1.server_url(), settings2.server_url()); 117 EXPECT_EQ(settings1.server_url(), settings2.server_url());
113 EXPECT_EQ(settings1.proxy_id(), settings2.proxy_id()); 118 EXPECT_EQ(settings1.proxy_id(), settings2.proxy_id());
114 EXPECT_EQ(settings1.delete_on_enum_fail(), settings2.delete_on_enum_fail()); 119 EXPECT_EQ(settings1.delete_on_enum_fail(), settings2.delete_on_enum_fail());
115 EXPECT_EQ(settings1.print_system_settings()->size(), 120 EXPECT_EQ(settings1.print_system_settings()->size(),
116 settings2.print_system_settings()->size()); 121 settings2.print_system_settings()->size());
117 EXPECT_EQ(settings1.connect_new_printers(), settings2.connect_new_printers()); 122 EXPECT_EQ(settings1.connect_new_printers(), settings2.connect_new_printers());
123 EXPECT_EQ(settings1.xmpp_ping_enabled(), settings2.xmpp_ping_enabled());
124 EXPECT_EQ(settings1.xmpp_ping_timeout_sec(),
125 settings2.xmpp_ping_timeout_sec());
118 EXPECT_TRUE(settings2.IsPrinterBlacklisted("prn1")); 126 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.
119 } 127 }
120 128
OLDNEW
« no previous file with comments | « chrome/service/cloud_print/connector_settings.cc ('k') | chrome/service/service_process_prefs.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698