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

Side by Side Diff: sync/internal_api/js_sync_manager_observer_unittest.cc

Issue 10795018: [Sync] Remove unneeded 'using syncer::' lines and 'syncer::' scopings (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fiix indent Created 8 years, 5 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 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 "sync/internal_api/js_sync_manager_observer.h" 5 #include "sync/internal_api/js_sync_manager_observer.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/location.h" 8 #include "base/location.h"
9 #include "base/message_loop.h" 9 #include "base/message_loop.h"
10 #include "base/values.h" 10 #include "base/values.h"
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 HasDetails(JsEventDetails()))); 58 HasDetails(JsEventDetails())));
59 59
60 js_sync_manager_observer_.OnInitializationComplete(WeakHandle<JsBackend>(), 60 js_sync_manager_observer_.OnInitializationComplete(WeakHandle<JsBackend>(),
61 true); 61 true);
62 js_sync_manager_observer_.OnStopSyncingPermanently(); 62 js_sync_manager_observer_.OnStopSyncingPermanently();
63 js_sync_manager_observer_.OnEncryptionComplete(); 63 js_sync_manager_observer_.OnEncryptionComplete();
64 PumpLoop(); 64 PumpLoop();
65 } 65 }
66 66
67 TEST_F(JsSyncManagerObserverTest, OnSyncCycleCompleted) { 67 TEST_F(JsSyncManagerObserverTest, OnSyncCycleCompleted) {
68 syncer::ModelTypePayloadMap download_progress_markers; 68 ModelTypePayloadMap download_progress_markers;
69 sessions::SyncSessionSnapshot snapshot(sessions::ModelNeutralState(), 69 sessions::SyncSessionSnapshot snapshot(sessions::ModelNeutralState(),
70 false, 70 false,
71 syncer::ModelTypeSet(), 71 ModelTypeSet(),
72 download_progress_markers, 72 download_progress_markers,
73 false, 73 false,
74 true, 74 true,
75 8, 75 8,
76 5, 76 5,
77 2, 77 2,
78 7, 78 7,
79 sessions::SyncSourceInfo(), 79 sessions::SyncSourceInfo(),
80 false, 80 false,
81 0, 81 0,
82 base::Time::Now(), 82 base::Time::Now(),
83 false); 83 false);
84 DictionaryValue expected_details; 84 DictionaryValue expected_details;
85 expected_details.Set("snapshot", snapshot.ToValue()); 85 expected_details.Set("snapshot", snapshot.ToValue());
86 86
87 EXPECT_CALL(mock_js_event_handler_, 87 EXPECT_CALL(mock_js_event_handler_,
88 HandleJsEvent("onSyncCycleCompleted", 88 HandleJsEvent("onSyncCycleCompleted",
89 HasDetailsAsDictionary(expected_details))); 89 HasDetailsAsDictionary(expected_details)));
90 90
91 js_sync_manager_observer_.OnSyncCycleCompleted(snapshot); 91 js_sync_manager_observer_.OnSyncCycleCompleted(snapshot);
92 PumpLoop(); 92 PumpLoop();
93 } 93 }
94 94
95 TEST_F(JsSyncManagerObserverTest, OnActionableError) { 95 TEST_F(JsSyncManagerObserverTest, OnActionableError) {
96 syncer::SyncProtocolError sync_error; 96 SyncProtocolError sync_error;
97 sync_error.action = syncer::CLEAR_USER_DATA_AND_RESYNC; 97 sync_error.action = CLEAR_USER_DATA_AND_RESYNC;
98 sync_error.error_type = syncer::TRANSIENT_ERROR; 98 sync_error.error_type = TRANSIENT_ERROR;
99 DictionaryValue expected_details; 99 DictionaryValue expected_details;
100 expected_details.Set("syncError", sync_error.ToValue()); 100 expected_details.Set("syncError", sync_error.ToValue());
101 101
102 EXPECT_CALL(mock_js_event_handler_, 102 EXPECT_CALL(mock_js_event_handler_,
103 HandleJsEvent("onActionableError", 103 HandleJsEvent("onActionableError",
104 HasDetailsAsDictionary(expected_details))); 104 HasDetailsAsDictionary(expected_details)));
105 105
106 js_sync_manager_observer_.OnActionableError(sync_error); 106 js_sync_manager_observer_.OnActionableError(sync_error);
107 PumpLoop(); 107 PumpLoop();
108 } 108 }
109 109
110 110
111 TEST_F(JsSyncManagerObserverTest, OnConnectionStatusChange) { 111 TEST_F(JsSyncManagerObserverTest, OnConnectionStatusChange) {
112 const syncer::ConnectionStatus kStatus = 112 const ConnectionStatus kStatus = CONNECTION_AUTH_ERROR;
113 syncer::CONNECTION_AUTH_ERROR;
114 DictionaryValue expected_details; 113 DictionaryValue expected_details;
115 expected_details.SetString("status", 114 expected_details.SetString("status",
116 syncer::ConnectionStatusToString(kStatus)); 115 ConnectionStatusToString(kStatus));
117 116
118 EXPECT_CALL(mock_js_event_handler_, 117 EXPECT_CALL(mock_js_event_handler_,
119 HandleJsEvent("onConnectionStatusChange", 118 HandleJsEvent("onConnectionStatusChange",
120 HasDetailsAsDictionary(expected_details))); 119 HasDetailsAsDictionary(expected_details)));
121 120
122 js_sync_manager_observer_.OnConnectionStatusChange(kStatus); 121 js_sync_manager_observer_.OnConnectionStatusChange(kStatus);
123 PumpLoop(); 122 PumpLoop();
124 } 123 }
125 124
126 TEST_F(JsSyncManagerObserverTest, OnPassphraseRequired) { 125 TEST_F(JsSyncManagerObserverTest, OnPassphraseRequired) {
127 InSequence dummy; 126 InSequence dummy;
128 127
129 DictionaryValue reason_passphrase_not_required_details; 128 DictionaryValue reason_passphrase_not_required_details;
130 DictionaryValue reason_encryption_details; 129 DictionaryValue reason_encryption_details;
131 DictionaryValue reason_decryption_details; 130 DictionaryValue reason_decryption_details;
132 131
133 reason_passphrase_not_required_details.SetString( 132 reason_passphrase_not_required_details.SetString(
134 "reason", 133 "reason",
135 syncer::PassphraseRequiredReasonToString( 134 PassphraseRequiredReasonToString(REASON_PASSPHRASE_NOT_REQUIRED));
136 syncer::REASON_PASSPHRASE_NOT_REQUIRED));
137 reason_encryption_details.SetString( 135 reason_encryption_details.SetString(
138 "reason", 136 "reason",
139 syncer::PassphraseRequiredReasonToString(syncer::REASON_ENCRYPTION)); 137 PassphraseRequiredReasonToString(REASON_ENCRYPTION));
140 reason_decryption_details.SetString( 138 reason_decryption_details.SetString(
141 "reason", 139 "reason",
142 syncer::PassphraseRequiredReasonToString(syncer::REASON_DECRYPTION)); 140 PassphraseRequiredReasonToString(REASON_DECRYPTION));
143 141
144 EXPECT_CALL(mock_js_event_handler_, 142 EXPECT_CALL(mock_js_event_handler_,
145 HandleJsEvent("onPassphraseRequired", 143 HandleJsEvent("onPassphraseRequired",
146 HasDetailsAsDictionary( 144 HasDetailsAsDictionary(
147 reason_passphrase_not_required_details))); 145 reason_passphrase_not_required_details)));
148 EXPECT_CALL(mock_js_event_handler_, 146 EXPECT_CALL(mock_js_event_handler_,
149 HandleJsEvent("onPassphraseRequired", 147 HandleJsEvent("onPassphraseRequired",
150 HasDetailsAsDictionary(reason_encryption_details))); 148 HasDetailsAsDictionary(reason_encryption_details)));
151 EXPECT_CALL(mock_js_event_handler_, 149 EXPECT_CALL(mock_js_event_handler_,
152 HandleJsEvent("onPassphraseRequired", 150 HandleJsEvent("onPassphraseRequired",
153 HasDetailsAsDictionary(reason_decryption_details))); 151 HasDetailsAsDictionary(reason_decryption_details)));
154 152
155 js_sync_manager_observer_.OnPassphraseRequired( 153 js_sync_manager_observer_.OnPassphraseRequired(
156 syncer::REASON_PASSPHRASE_NOT_REQUIRED, 154 REASON_PASSPHRASE_NOT_REQUIRED,
157 sync_pb::EncryptedData()); 155 sync_pb::EncryptedData());
158 js_sync_manager_observer_.OnPassphraseRequired(syncer::REASON_ENCRYPTION, 156 js_sync_manager_observer_.OnPassphraseRequired(REASON_ENCRYPTION,
159 sync_pb::EncryptedData()); 157 sync_pb::EncryptedData());
160 js_sync_manager_observer_.OnPassphraseRequired(syncer::REASON_DECRYPTION, 158 js_sync_manager_observer_.OnPassphraseRequired(REASON_DECRYPTION,
161 sync_pb::EncryptedData()); 159 sync_pb::EncryptedData());
162 PumpLoop(); 160 PumpLoop();
163 } 161 }
164 162
165 TEST_F(JsSyncManagerObserverTest, SensitiveNotifiations) { 163 TEST_F(JsSyncManagerObserverTest, SensitiveNotifiations) {
166 DictionaryValue redacted_token_details; 164 DictionaryValue redacted_token_details;
167 redacted_token_details.SetString("token", "<redacted>"); 165 redacted_token_details.SetString("token", "<redacted>");
168 DictionaryValue redacted_bootstrap_token_details; 166 DictionaryValue redacted_bootstrap_token_details;
169 redacted_bootstrap_token_details.SetString("bootstrapToken", "<redacted>"); 167 redacted_bootstrap_token_details.SetString("bootstrapToken", "<redacted>");
170 168
171 EXPECT_CALL(mock_js_event_handler_, 169 EXPECT_CALL(mock_js_event_handler_,
172 HandleJsEvent("onUpdatedToken", 170 HandleJsEvent("onUpdatedToken",
173 HasDetailsAsDictionary(redacted_token_details))); 171 HasDetailsAsDictionary(redacted_token_details)));
174 EXPECT_CALL(mock_js_event_handler_, 172 EXPECT_CALL(mock_js_event_handler_,
175 HandleJsEvent( 173 HandleJsEvent(
176 "OnBootstrapTokenUpdated", 174 "OnBootstrapTokenUpdated",
177 HasDetailsAsDictionary(redacted_bootstrap_token_details))); 175 HasDetailsAsDictionary(redacted_bootstrap_token_details)));
178 176
179 js_sync_manager_observer_.OnUpdatedToken("sensitive_token"); 177 js_sync_manager_observer_.OnUpdatedToken("sensitive_token");
180 js_sync_manager_observer_.OnBootstrapTokenUpdated("sensitive_token"); 178 js_sync_manager_observer_.OnBootstrapTokenUpdated("sensitive_token");
181 PumpLoop(); 179 PumpLoop();
182 } 180 }
183 181
184 TEST_F(JsSyncManagerObserverTest, OnEncryptedTypesChanged) { 182 TEST_F(JsSyncManagerObserverTest, OnEncryptedTypesChanged) {
185 DictionaryValue expected_details; 183 DictionaryValue expected_details;
186 ListValue* encrypted_type_values = new ListValue(); 184 ListValue* encrypted_type_values = new ListValue();
187 const bool encrypt_everything = false; 185 const bool encrypt_everything = false;
188 expected_details.Set("encryptedTypes", encrypted_type_values); 186 expected_details.Set("encryptedTypes", encrypted_type_values);
189 expected_details.SetBoolean("encryptEverything", encrypt_everything); 187 expected_details.SetBoolean("encryptEverything", encrypt_everything);
190 syncer::ModelTypeSet encrypted_types; 188 ModelTypeSet encrypted_types;
191 189
192 for (int i = syncer::FIRST_REAL_MODEL_TYPE; 190 for (int i = FIRST_REAL_MODEL_TYPE; i < MODEL_TYPE_COUNT; ++i) {
193 i < syncer::MODEL_TYPE_COUNT; ++i) { 191 ModelType type = ModelTypeFromInt(i);
194 syncer::ModelType type = syncer::ModelTypeFromInt(i);
195 encrypted_types.Put(type); 192 encrypted_types.Put(type);
196 encrypted_type_values->Append(Value::CreateStringValue( 193 encrypted_type_values->Append(Value::CreateStringValue(
197 syncer::ModelTypeToString(type))); 194 ModelTypeToString(type)));
198 } 195 }
199 196
200 EXPECT_CALL(mock_js_event_handler_, 197 EXPECT_CALL(mock_js_event_handler_,
201 HandleJsEvent("onEncryptedTypesChanged", 198 HandleJsEvent("onEncryptedTypesChanged",
202 HasDetailsAsDictionary(expected_details))); 199 HasDetailsAsDictionary(expected_details)));
203 200
204 js_sync_manager_observer_.OnEncryptedTypesChanged( 201 js_sync_manager_observer_.OnEncryptedTypesChanged(
205 encrypted_types, encrypt_everything); 202 encrypted_types, encrypt_everything);
206 PumpLoop(); 203 PumpLoop();
207 } 204 }
208 205
209 } // namespace 206 } // namespace
210 } // namespace syncer 207 } // namespace syncer
OLDNEW
« no previous file with comments | « sync/internal_api/js_sync_manager_observer.cc ('k') | sync/internal_api/public/base/model_type.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698