| 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::FundamentalValue; | |
| 26 using base::StringValue; | 25 using base::StringValue; |
| 27 using base::Value; | 26 using base::Value; |
| 28 using sync_pb::ManagedUserSharedSettingSpecifics; | 27 using sync_pb::ManagedUserSharedSettingSpecifics; |
| 29 using syncer::SUPERVISED_USER_SHARED_SETTINGS; | 28 using syncer::SUPERVISED_USER_SHARED_SETTINGS; |
| 30 using syncer::SyncChange; | 29 using syncer::SyncChange; |
| 31 using syncer::SyncChangeList; | 30 using syncer::SyncChangeList; |
| 32 using syncer::SyncChangeProcessor; | 31 using syncer::SyncChangeProcessor; |
| 33 using syncer::SyncChangeProcessorWrapperForTest; | 32 using syncer::SyncChangeProcessorWrapperForTest; |
| 34 using syncer::SyncData; | 33 using syncer::SyncData; |
| 35 using syncer::SyncDataList; | 34 using syncer::SyncDataList; |
| (...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 155 } | 154 } |
| 156 | 155 |
| 157 TEST_F(SupervisedUserSharedSettingsServiceTest, SetAndGet) { | 156 TEST_F(SupervisedUserSharedSettingsServiceTest, SetAndGet) { |
| 158 StartSyncing(SyncDataList()); | 157 StartSyncing(SyncDataList()); |
| 159 | 158 |
| 160 const char kIdA[] = "aaaaaa"; | 159 const char kIdA[] = "aaaaaa"; |
| 161 const char kIdB[] = "bbbbbb"; | 160 const char kIdB[] = "bbbbbb"; |
| 162 const char kIdC[] = "cccccc"; | 161 const char kIdC[] = "cccccc"; |
| 163 | 162 |
| 164 StringValue name("Jack"); | 163 StringValue name("Jack"); |
| 165 FundamentalValue age(8); | 164 Value age(8); |
| 166 StringValue bar("bar"); | 165 StringValue bar("bar"); |
| 167 settings_service_.SetValue(kIdA, "name", name); | 166 settings_service_.SetValue(kIdA, "name", name); |
| 168 ASSERT_EQ(1u, sync_processor_->changes().size()); | 167 ASSERT_EQ(1u, sync_processor_->changes().size()); |
| 169 VerifySyncChangesAndClear(); | 168 VerifySyncChangesAndClear(); |
| 170 settings_service_.SetValue(kIdA, "age", FundamentalValue(6)); | 169 settings_service_.SetValue(kIdA, "age", Value(6)); |
| 171 ASSERT_EQ(1u, sync_processor_->changes().size()); | 170 ASSERT_EQ(1u, sync_processor_->changes().size()); |
| 172 VerifySyncChangesAndClear(); | 171 VerifySyncChangesAndClear(); |
| 173 settings_service_.SetValue(kIdA, "age", age); | 172 settings_service_.SetValue(kIdA, "age", age); |
| 174 ASSERT_EQ(1u, sync_processor_->changes().size()); | 173 ASSERT_EQ(1u, sync_processor_->changes().size()); |
| 175 VerifySyncChangesAndClear(); | 174 VerifySyncChangesAndClear(); |
| 176 settings_service_.SetValue(kIdB, "foo", bar); | 175 settings_service_.SetValue(kIdB, "foo", bar); |
| 177 ASSERT_EQ(1u, sync_processor_->changes().size()); | 176 ASSERT_EQ(1u, sync_processor_->changes().size()); |
| 178 VerifySyncChangesAndClear(); | 177 VerifySyncChangesAndClear(); |
| 179 | 178 |
| 180 EXPECT_EQ( | 179 EXPECT_EQ( |
| (...skipping 14 matching lines...) Expand all Loading... |
| 195 EXPECT_EQ(0, result.num_items_added()); | 194 EXPECT_EQ(0, result.num_items_added()); |
| 196 EXPECT_EQ(0, result.num_items_deleted()); | 195 EXPECT_EQ(0, result.num_items_deleted()); |
| 197 EXPECT_EQ(0, result.num_items_modified()); | 196 EXPECT_EQ(0, result.num_items_modified()); |
| 198 EXPECT_EQ(0, result.num_items_before_association()); | 197 EXPECT_EQ(0, result.num_items_before_association()); |
| 199 EXPECT_EQ(0, result.num_items_after_association()); | 198 EXPECT_EQ(0, result.num_items_after_association()); |
| 200 | 199 |
| 201 const char kIdA[] = "aaaaaa"; | 200 const char kIdA[] = "aaaaaa"; |
| 202 const char kIdB[] = "bbbbbb"; | 201 const char kIdB[] = "bbbbbb"; |
| 203 const char kIdC[] = "cccccc"; | 202 const char kIdC[] = "cccccc"; |
| 204 | 203 |
| 205 FundamentalValue age(8); | 204 Value age(8); |
| 206 StringValue bar("bar"); | 205 StringValue bar("bar"); |
| 207 settings_service_.SetValue(kIdA, "name", StringValue("Jack")); | 206 settings_service_.SetValue(kIdA, "name", StringValue("Jack")); |
| 208 settings_service_.SetValue(kIdA, "age", age); | 207 settings_service_.SetValue(kIdA, "age", age); |
| 209 settings_service_.SetValue(kIdB, "foo", bar); | 208 settings_service_.SetValue(kIdB, "foo", bar); |
| 210 | 209 |
| 211 settings_service_.StopSyncing(SUPERVISED_USER_SHARED_SETTINGS); | 210 settings_service_.StopSyncing(SUPERVISED_USER_SHARED_SETTINGS); |
| 212 | 211 |
| 213 StringValue name("Jill"); | 212 StringValue name("Jill"); |
| 214 StringValue blurp("blurp"); | 213 StringValue blurp("blurp"); |
| 215 SyncDataList sync_data; | 214 SyncDataList sync_data; |
| (...skipping 29 matching lines...) Expand all Loading... |
| 245 EXPECT_FALSE(settings_service_.GetValue(kIdC, "name")); | 244 EXPECT_FALSE(settings_service_.GetValue(kIdC, "name")); |
| 246 } | 245 } |
| 247 | 246 |
| 248 TEST_F(SupervisedUserSharedSettingsServiceTest, ProcessChanges) { | 247 TEST_F(SupervisedUserSharedSettingsServiceTest, ProcessChanges) { |
| 249 StartSyncing(SyncDataList()); | 248 StartSyncing(SyncDataList()); |
| 250 | 249 |
| 251 const char kIdA[] = "aaaaaa"; | 250 const char kIdA[] = "aaaaaa"; |
| 252 const char kIdB[] = "bbbbbb"; | 251 const char kIdB[] = "bbbbbb"; |
| 253 const char kIdC[] = "cccccc"; | 252 const char kIdC[] = "cccccc"; |
| 254 | 253 |
| 255 FundamentalValue age(8); | 254 Value age(8); |
| 256 StringValue bar("bar"); | 255 StringValue bar("bar"); |
| 257 settings_service_.SetValue(kIdA, "name", StringValue("Jack")); | 256 settings_service_.SetValue(kIdA, "name", StringValue("Jack")); |
| 258 settings_service_.SetValue(kIdA, "age", age); | 257 settings_service_.SetValue(kIdA, "age", age); |
| 259 settings_service_.SetValue(kIdB, "foo", bar); | 258 settings_service_.SetValue(kIdB, "foo", bar); |
| 260 | 259 |
| 261 StringValue name("Jill"); | 260 StringValue name("Jill"); |
| 262 StringValue blurp("blurp"); | 261 StringValue blurp("blurp"); |
| 263 SyncChangeList changes; | 262 SyncChangeList changes; |
| 264 changes.push_back( | 263 changes.push_back( |
| 265 SyncChange(FROM_HERE, | 264 SyncChange(FROM_HERE, |
| (...skipping 14 matching lines...) Expand all Loading... |
| 280 settings_service_.GetAllSyncData(SUPERVISED_USER_SHARED_SETTINGS).size()); | 279 settings_service_.GetAllSyncData(SUPERVISED_USER_SHARED_SETTINGS).size()); |
| 281 EXPECT_EQ(ToJson(&name), | 280 EXPECT_EQ(ToJson(&name), |
| 282 ToJson(settings_service_.GetValue(kIdA, "name"))); | 281 ToJson(settings_service_.GetValue(kIdA, "name"))); |
| 283 EXPECT_EQ(ToJson(&age), ToJson(settings_service_.GetValue(kIdA, "age"))); | 282 EXPECT_EQ(ToJson(&age), ToJson(settings_service_.GetValue(kIdA, "age"))); |
| 284 EXPECT_EQ(ToJson(&bar), ToJson(settings_service_.GetValue(kIdB, "foo"))); | 283 EXPECT_EQ(ToJson(&bar), ToJson(settings_service_.GetValue(kIdB, "foo"))); |
| 285 EXPECT_EQ(ToJson(&blurp), ToJson(settings_service_.GetValue(kIdC, "baz"))); | 284 EXPECT_EQ(ToJson(&blurp), ToJson(settings_service_.GetValue(kIdC, "baz"))); |
| 286 EXPECT_FALSE(settings_service_.GetValue(kIdA, "foo")); | 285 EXPECT_FALSE(settings_service_.GetValue(kIdA, "foo")); |
| 287 EXPECT_FALSE(settings_service_.GetValue(kIdB, "name")); | 286 EXPECT_FALSE(settings_service_.GetValue(kIdB, "name")); |
| 288 EXPECT_FALSE(settings_service_.GetValue(kIdC, "name")); | 287 EXPECT_FALSE(settings_service_.GetValue(kIdC, "name")); |
| 289 } | 288 } |
| OLD | NEW |