OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/browser/supervised_user/legacy/supervised_user_shared_settings_
service.h" | 5 #include "chrome/browser/supervised_user/legacy/supervised_user_shared_settings_
service.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
11 #include "base/json/json_writer.h" | 11 #include "base/json/json_writer.h" |
12 #include "base/macros.h" | 12 #include "base/macros.h" |
13 #include "chrome/common/pref_names.h" | 13 #include "chrome/common/pref_names.h" |
14 #include "chrome/test/base/testing_profile.h" | 14 #include "chrome/test/base/testing_profile.h" |
15 #include "components/prefs/pref_service.h" | 15 #include "components/prefs/pref_service.h" |
16 #include "components/sync/model/fake_sync_change_processor.h" | 16 #include "components/sync/model/fake_sync_change_processor.h" |
17 #include "components/sync/model/sync_change.h" | 17 #include "components/sync/model/sync_change.h" |
18 #include "components/sync/model/sync_change_processor_wrapper_for_test.h" | 18 #include "components/sync/model/sync_change_processor_wrapper_for_test.h" |
19 #include "components/sync/model/sync_error_factory_mock.h" | 19 #include "components/sync/model/sync_error_factory_mock.h" |
20 #include "components/sync/protocol/sync.pb.h" | 20 #include "components/sync/protocol/sync.pb.h" |
21 #include "content/public/test/test_browser_thread_bundle.h" | 21 #include "content/public/test/test_browser_thread_bundle.h" |
22 #include "testing/gtest/include/gtest/gtest.h" | 22 #include "testing/gtest/include/gtest/gtest.h" |
23 | 23 |
24 using base::DictionaryValue; | 24 using base::DictionaryValue; |
25 using base::StringValue; | |
26 using base::Value; | 25 using base::Value; |
27 using sync_pb::ManagedUserSharedSettingSpecifics; | 26 using sync_pb::ManagedUserSharedSettingSpecifics; |
28 using syncer::SUPERVISED_USER_SHARED_SETTINGS; | 27 using syncer::SUPERVISED_USER_SHARED_SETTINGS; |
29 using syncer::SyncChange; | 28 using syncer::SyncChange; |
30 using syncer::SyncChangeList; | 29 using syncer::SyncChangeList; |
31 using syncer::SyncChangeProcessor; | 30 using syncer::SyncChangeProcessor; |
32 using syncer::SyncChangeProcessorWrapperForTest; | 31 using syncer::SyncChangeProcessorWrapperForTest; |
33 using syncer::SyncData; | 32 using syncer::SyncData; |
34 using syncer::SyncDataList; | 33 using syncer::SyncDataList; |
35 using syncer::SyncError; | 34 using syncer::SyncError; |
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
153 EXPECT_EQ(0u, GetAllSettings()->size()); | 152 EXPECT_EQ(0u, GetAllSettings()->size()); |
154 } | 153 } |
155 | 154 |
156 TEST_F(SupervisedUserSharedSettingsServiceTest, SetAndGet) { | 155 TEST_F(SupervisedUserSharedSettingsServiceTest, SetAndGet) { |
157 StartSyncing(SyncDataList()); | 156 StartSyncing(SyncDataList()); |
158 | 157 |
159 const char kIdA[] = "aaaaaa"; | 158 const char kIdA[] = "aaaaaa"; |
160 const char kIdB[] = "bbbbbb"; | 159 const char kIdB[] = "bbbbbb"; |
161 const char kIdC[] = "cccccc"; | 160 const char kIdC[] = "cccccc"; |
162 | 161 |
163 StringValue name("Jack"); | 162 Value name("Jack"); |
164 Value age(8); | 163 Value age(8); |
165 StringValue bar("bar"); | 164 Value bar("bar"); |
166 settings_service_.SetValue(kIdA, "name", name); | 165 settings_service_.SetValue(kIdA, "name", name); |
167 ASSERT_EQ(1u, sync_processor_->changes().size()); | 166 ASSERT_EQ(1u, sync_processor_->changes().size()); |
168 VerifySyncChangesAndClear(); | 167 VerifySyncChangesAndClear(); |
169 settings_service_.SetValue(kIdA, "age", Value(6)); | 168 settings_service_.SetValue(kIdA, "age", Value(6)); |
170 ASSERT_EQ(1u, sync_processor_->changes().size()); | 169 ASSERT_EQ(1u, sync_processor_->changes().size()); |
171 VerifySyncChangesAndClear(); | 170 VerifySyncChangesAndClear(); |
172 settings_service_.SetValue(kIdA, "age", age); | 171 settings_service_.SetValue(kIdA, "age", age); |
173 ASSERT_EQ(1u, sync_processor_->changes().size()); | 172 ASSERT_EQ(1u, sync_processor_->changes().size()); |
174 VerifySyncChangesAndClear(); | 173 VerifySyncChangesAndClear(); |
175 settings_service_.SetValue(kIdB, "foo", bar); | 174 settings_service_.SetValue(kIdB, "foo", bar); |
(...skipping 19 matching lines...) Expand all Loading... |
195 EXPECT_EQ(0, result.num_items_deleted()); | 194 EXPECT_EQ(0, result.num_items_deleted()); |
196 EXPECT_EQ(0, result.num_items_modified()); | 195 EXPECT_EQ(0, result.num_items_modified()); |
197 EXPECT_EQ(0, result.num_items_before_association()); | 196 EXPECT_EQ(0, result.num_items_before_association()); |
198 EXPECT_EQ(0, result.num_items_after_association()); | 197 EXPECT_EQ(0, result.num_items_after_association()); |
199 | 198 |
200 const char kIdA[] = "aaaaaa"; | 199 const char kIdA[] = "aaaaaa"; |
201 const char kIdB[] = "bbbbbb"; | 200 const char kIdB[] = "bbbbbb"; |
202 const char kIdC[] = "cccccc"; | 201 const char kIdC[] = "cccccc"; |
203 | 202 |
204 Value age(8); | 203 Value age(8); |
205 StringValue bar("bar"); | 204 Value bar("bar"); |
206 settings_service_.SetValue(kIdA, "name", StringValue("Jack")); | 205 settings_service_.SetValue(kIdA, "name", Value("Jack")); |
207 settings_service_.SetValue(kIdA, "age", age); | 206 settings_service_.SetValue(kIdA, "age", age); |
208 settings_service_.SetValue(kIdB, "foo", bar); | 207 settings_service_.SetValue(kIdB, "foo", bar); |
209 | 208 |
210 settings_service_.StopSyncing(SUPERVISED_USER_SHARED_SETTINGS); | 209 settings_service_.StopSyncing(SUPERVISED_USER_SHARED_SETTINGS); |
211 | 210 |
212 StringValue name("Jill"); | 211 Value name("Jill"); |
213 StringValue blurp("blurp"); | 212 Value blurp("blurp"); |
214 SyncDataList sync_data; | 213 SyncDataList sync_data; |
215 sync_data.push_back( | 214 sync_data.push_back( |
216 SupervisedUserSharedSettingsService::CreateSyncDataForSetting( | 215 SupervisedUserSharedSettingsService::CreateSyncDataForSetting( |
217 kIdA, "name", name, true)); | 216 kIdA, "name", name, true)); |
218 sync_data.push_back( | 217 sync_data.push_back( |
219 SupervisedUserSharedSettingsService::CreateSyncDataForSetting( | 218 SupervisedUserSharedSettingsService::CreateSyncDataForSetting( |
220 kIdC, "baz", blurp, true)); | 219 kIdC, "baz", blurp, true)); |
221 | 220 |
222 result = StartSyncing(sync_data); | 221 result = StartSyncing(sync_data); |
223 | 222 |
(...skipping 21 matching lines...) Expand all Loading... |
245 } | 244 } |
246 | 245 |
247 TEST_F(SupervisedUserSharedSettingsServiceTest, ProcessChanges) { | 246 TEST_F(SupervisedUserSharedSettingsServiceTest, ProcessChanges) { |
248 StartSyncing(SyncDataList()); | 247 StartSyncing(SyncDataList()); |
249 | 248 |
250 const char kIdA[] = "aaaaaa"; | 249 const char kIdA[] = "aaaaaa"; |
251 const char kIdB[] = "bbbbbb"; | 250 const char kIdB[] = "bbbbbb"; |
252 const char kIdC[] = "cccccc"; | 251 const char kIdC[] = "cccccc"; |
253 | 252 |
254 Value age(8); | 253 Value age(8); |
255 StringValue bar("bar"); | 254 Value bar("bar"); |
256 settings_service_.SetValue(kIdA, "name", StringValue("Jack")); | 255 settings_service_.SetValue(kIdA, "name", Value("Jack")); |
257 settings_service_.SetValue(kIdA, "age", age); | 256 settings_service_.SetValue(kIdA, "age", age); |
258 settings_service_.SetValue(kIdB, "foo", bar); | 257 settings_service_.SetValue(kIdB, "foo", bar); |
259 | 258 |
260 StringValue name("Jill"); | 259 Value name("Jill"); |
261 StringValue blurp("blurp"); | 260 Value blurp("blurp"); |
262 SyncChangeList changes; | 261 SyncChangeList changes; |
263 changes.push_back( | 262 changes.push_back( |
264 SyncChange(FROM_HERE, | 263 SyncChange(FROM_HERE, |
265 SyncChange::ACTION_UPDATE, | 264 SyncChange::ACTION_UPDATE, |
266 SupervisedUserSharedSettingsService::CreateSyncDataForSetting( | 265 SupervisedUserSharedSettingsService::CreateSyncDataForSetting( |
267 kIdA, "name", name, true))); | 266 kIdA, "name", name, true))); |
268 changes.push_back( | 267 changes.push_back( |
269 SyncChange(FROM_HERE, | 268 SyncChange(FROM_HERE, |
270 SyncChange::ACTION_ADD, | 269 SyncChange::ACTION_ADD, |
271 SupervisedUserSharedSettingsService::CreateSyncDataForSetting( | 270 SupervisedUserSharedSettingsService::CreateSyncDataForSetting( |
272 kIdC, "baz", blurp, true))); | 271 kIdC, "baz", blurp, true))); |
273 SyncError error = settings_service_.ProcessSyncChanges(FROM_HERE, changes); | 272 SyncError error = settings_service_.ProcessSyncChanges(FROM_HERE, changes); |
274 EXPECT_FALSE(error.IsSet()) << error.ToString(); | 273 EXPECT_FALSE(error.IsSet()) << error.ToString(); |
275 EXPECT_EQ(2u, changed_settings_.size()); | 274 EXPECT_EQ(2u, changed_settings_.size()); |
276 | 275 |
277 EXPECT_EQ( | 276 EXPECT_EQ( |
278 4u, | 277 4u, |
279 settings_service_.GetAllSyncData(SUPERVISED_USER_SHARED_SETTINGS).size()); | 278 settings_service_.GetAllSyncData(SUPERVISED_USER_SHARED_SETTINGS).size()); |
280 EXPECT_EQ(ToJson(&name), | 279 EXPECT_EQ(ToJson(&name), |
281 ToJson(settings_service_.GetValue(kIdA, "name"))); | 280 ToJson(settings_service_.GetValue(kIdA, "name"))); |
282 EXPECT_EQ(ToJson(&age), ToJson(settings_service_.GetValue(kIdA, "age"))); | 281 EXPECT_EQ(ToJson(&age), ToJson(settings_service_.GetValue(kIdA, "age"))); |
283 EXPECT_EQ(ToJson(&bar), ToJson(settings_service_.GetValue(kIdB, "foo"))); | 282 EXPECT_EQ(ToJson(&bar), ToJson(settings_service_.GetValue(kIdB, "foo"))); |
284 EXPECT_EQ(ToJson(&blurp), ToJson(settings_service_.GetValue(kIdC, "baz"))); | 283 EXPECT_EQ(ToJson(&blurp), ToJson(settings_service_.GetValue(kIdC, "baz"))); |
285 EXPECT_FALSE(settings_service_.GetValue(kIdA, "foo")); | 284 EXPECT_FALSE(settings_service_.GetValue(kIdA, "foo")); |
286 EXPECT_FALSE(settings_service_.GetValue(kIdB, "name")); | 285 EXPECT_FALSE(settings_service_.GetValue(kIdB, "name")); |
287 EXPECT_FALSE(settings_service_.GetValue(kIdC, "name")); | 286 EXPECT_FALSE(settings_service_.GetValue(kIdC, "name")); |
288 } | 287 } |
OLD | NEW |