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

Side by Side Diff: chrome/browser/managed_mode/managed_user_shared_settings_service_unittest.cc

Issue 316863002: Rename "managed (mode|user)" to "supervised user" (part 1) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 6 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 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 "base/bind.h" 5 #include "base/bind.h"
6 #include "base/json/json_writer.h" 6 #include "base/json/json_writer.h"
7 #include "base/prefs/pref_service.h" 7 #include "base/prefs/pref_service.h"
8 #include "chrome/browser/managed_mode/managed_user_shared_settings_service.h" 8 #include "chrome/browser/managed_mode/managed_user_shared_settings_service.h"
9 #include "chrome/common/pref_names.h" 9 #include "chrome/common/pref_names.h"
10 #include "chrome/test/base/testing_profile.h" 10 #include "chrome/test/base/testing_profile.h"
11 #include "sync/api/fake_sync_change_processor.h" 11 #include "sync/api/fake_sync_change_processor.h"
12 #include "sync/api/sync_change.h" 12 #include "sync/api/sync_change.h"
13 #include "sync/api/sync_change_processor_wrapper_for_test.h" 13 #include "sync/api/sync_change_processor_wrapper_for_test.h"
14 #include "sync/api/sync_error_factory_mock.h" 14 #include "sync/api/sync_error_factory_mock.h"
15 #include "sync/protocol/sync.pb.h" 15 #include "sync/protocol/sync.pb.h"
16 #include "testing/gtest/include/gtest/gtest.h" 16 #include "testing/gtest/include/gtest/gtest.h"
17 17
18 using base::DictionaryValue; 18 using base::DictionaryValue;
19 using base::FundamentalValue; 19 using base::FundamentalValue;
20 using base::StringValue; 20 using base::StringValue;
21 using base::Value; 21 using base::Value;
22 using sync_pb::ManagedUserSharedSettingSpecifics; 22 using sync_pb::ManagedUserSharedSettingSpecifics;
23 using syncer::MANAGED_USER_SHARED_SETTINGS; 23 using syncer::SUPERVISED_USER_SHARED_SETTINGS;
24 using syncer::SyncChange; 24 using syncer::SyncChange;
25 using syncer::SyncChangeList; 25 using syncer::SyncChangeList;
26 using syncer::SyncChangeProcessor; 26 using syncer::SyncChangeProcessor;
27 using syncer::SyncChangeProcessorWrapperForTest; 27 using syncer::SyncChangeProcessorWrapperForTest;
28 using syncer::SyncData; 28 using syncer::SyncData;
29 using syncer::SyncDataList; 29 using syncer::SyncDataList;
30 using syncer::SyncError; 30 using syncer::SyncError;
31 using syncer::SyncErrorFactory; 31 using syncer::SyncErrorFactory;
32 using syncer::SyncMergeResult; 32 using syncer::SyncMergeResult;
33 33
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 typedef base::CallbackList<void(const std::string&, const std::string&)> 77 typedef base::CallbackList<void(const std::string&, const std::string&)>
78 CallbackList; 78 CallbackList;
79 79
80 ManagedUserSharedSettingsServiceTest() 80 ManagedUserSharedSettingsServiceTest()
81 : settings_service_(profile_.GetPrefs()) {} 81 : settings_service_(profile_.GetPrefs()) {}
82 virtual ~ManagedUserSharedSettingsServiceTest() {} 82 virtual ~ManagedUserSharedSettingsServiceTest() {}
83 83
84 void StartSyncing(const syncer::SyncDataList& initial_sync_data) { 84 void StartSyncing(const syncer::SyncDataList& initial_sync_data) {
85 sync_processor_.reset(new syncer::FakeSyncChangeProcessor); 85 sync_processor_.reset(new syncer::FakeSyncChangeProcessor);
86 scoped_ptr<syncer::SyncErrorFactory> error_handler( 86 scoped_ptr<syncer::SyncErrorFactory> error_handler(
87 new MockSyncErrorFactory(MANAGED_USER_SHARED_SETTINGS)); 87 new MockSyncErrorFactory(SUPERVISED_USER_SHARED_SETTINGS));
88 SyncMergeResult result = settings_service_.MergeDataAndStartSyncing( 88 SyncMergeResult result = settings_service_.MergeDataAndStartSyncing(
89 MANAGED_USER_SHARED_SETTINGS, 89 SUPERVISED_USER_SHARED_SETTINGS,
90 initial_sync_data, 90 initial_sync_data,
91 scoped_ptr<SyncChangeProcessor>( 91 scoped_ptr<SyncChangeProcessor>(
92 new SyncChangeProcessorWrapperForTest(sync_processor_.get())), 92 new SyncChangeProcessorWrapperForTest(sync_processor_.get())),
93 error_handler.Pass()); 93 error_handler.Pass());
94 EXPECT_FALSE(result.error().IsSet()); 94 EXPECT_FALSE(result.error().IsSet());
95 } 95 }
96 96
97 const base::DictionaryValue* GetAllSettings() { 97 const base::DictionaryValue* GetAllSettings() {
98 return profile_.GetPrefs()->GetDictionary( 98 return profile_.GetPrefs()->GetDictionary(
99 prefs::kManagedUserSharedSettings); 99 prefs::kSupervisedUserSharedSettings);
100 } 100 }
101 101
102 void VerifySyncChangesAndClear() { 102 void VerifySyncChangesAndClear() {
103 SyncChangeList& changes = sync_processor_->changes(); 103 SyncChangeList& changes = sync_processor_->changes();
104 for (SyncChangeList::const_iterator it = changes.begin(); 104 for (SyncChangeList::const_iterator it = changes.begin();
105 it != changes.end(); 105 it != changes.end();
106 ++it) { 106 ++it) {
107 const sync_pb::ManagedUserSharedSettingSpecifics& setting = 107 const sync_pb::ManagedUserSharedSettingSpecifics& setting =
108 it->sync_data().GetSpecifics().managed_user_shared_setting(); 108 it->sync_data().GetSpecifics().managed_user_shared_setting();
109 EXPECT_EQ( 109 EXPECT_EQ(
(...skipping 28 matching lines...) Expand all
138 138
139 scoped_ptr<syncer::FakeSyncChangeProcessor> sync_processor_; 139 scoped_ptr<syncer::FakeSyncChangeProcessor> sync_processor_;
140 }; 140 };
141 141
142 TEST_F(ManagedUserSharedSettingsServiceTest, Empty) { 142 TEST_F(ManagedUserSharedSettingsServiceTest, Empty) {
143 StartSyncing(SyncDataList()); 143 StartSyncing(SyncDataList());
144 EXPECT_EQ(0u, sync_processor_->changes().size()); 144 EXPECT_EQ(0u, sync_processor_->changes().size());
145 EXPECT_EQ(0u, changed_settings_.size()); 145 EXPECT_EQ(0u, changed_settings_.size());
146 EXPECT_EQ( 146 EXPECT_EQ(
147 0u, 147 0u,
148 settings_service_.GetAllSyncData(MANAGED_USER_SHARED_SETTINGS).size()); 148 settings_service_.GetAllSyncData(SUPERVISED_USER_SHARED_SETTINGS).size());
149 EXPECT_EQ(0u, GetAllSettings()->size()); 149 EXPECT_EQ(0u, GetAllSettings()->size());
150 } 150 }
151 151
152 TEST_F(ManagedUserSharedSettingsServiceTest, SetAndGet) { 152 TEST_F(ManagedUserSharedSettingsServiceTest, SetAndGet) {
153 StartSyncing(SyncDataList()); 153 StartSyncing(SyncDataList());
154 154
155 const char kIdA[] = "aaaaaa"; 155 const char kIdA[] = "aaaaaa";
156 const char kIdB[] = "bbbbbb"; 156 const char kIdB[] = "bbbbbb";
157 const char kIdC[] = "cccccc"; 157 const char kIdC[] = "cccccc";
158 158
159 StringValue name("Jack"); 159 StringValue name("Jack");
160 FundamentalValue age(8); 160 FundamentalValue age(8);
161 StringValue bar("bar"); 161 StringValue bar("bar");
162 settings_service_.SetValue(kIdA, "name", name); 162 settings_service_.SetValue(kIdA, "name", name);
163 ASSERT_EQ(1u, sync_processor_->changes().size()); 163 ASSERT_EQ(1u, sync_processor_->changes().size());
164 VerifySyncChangesAndClear(); 164 VerifySyncChangesAndClear();
165 settings_service_.SetValue(kIdA, "age", FundamentalValue(6)); 165 settings_service_.SetValue(kIdA, "age", FundamentalValue(6));
166 ASSERT_EQ(1u, sync_processor_->changes().size()); 166 ASSERT_EQ(1u, sync_processor_->changes().size());
167 VerifySyncChangesAndClear(); 167 VerifySyncChangesAndClear();
168 settings_service_.SetValue(kIdA, "age", age); 168 settings_service_.SetValue(kIdA, "age", age);
169 ASSERT_EQ(1u, sync_processor_->changes().size()); 169 ASSERT_EQ(1u, sync_processor_->changes().size());
170 VerifySyncChangesAndClear(); 170 VerifySyncChangesAndClear();
171 settings_service_.SetValue(kIdB, "foo", bar); 171 settings_service_.SetValue(kIdB, "foo", bar);
172 ASSERT_EQ(1u, sync_processor_->changes().size()); 172 ASSERT_EQ(1u, sync_processor_->changes().size());
173 VerifySyncChangesAndClear(); 173 VerifySyncChangesAndClear();
174 174
175 EXPECT_EQ( 175 EXPECT_EQ(
176 3u, 176 3u,
177 settings_service_.GetAllSyncData(MANAGED_USER_SHARED_SETTINGS).size()); 177 settings_service_.GetAllSyncData(SUPERVISED_USER_SHARED_SETTINGS).size());
178 178
179 EXPECT_EQ(ToJson(&name), ToJson(settings_service_.GetValue(kIdA, "name"))); 179 EXPECT_EQ(ToJson(&name), ToJson(settings_service_.GetValue(kIdA, "name")));
180 EXPECT_EQ(ToJson(&age), ToJson(settings_service_.GetValue(kIdA, "age"))); 180 EXPECT_EQ(ToJson(&age), ToJson(settings_service_.GetValue(kIdA, "age")));
181 EXPECT_EQ(ToJson(&bar), ToJson(settings_service_.GetValue(kIdB, "foo"))); 181 EXPECT_EQ(ToJson(&bar), ToJson(settings_service_.GetValue(kIdB, "foo")));
182 EXPECT_FALSE(settings_service_.GetValue(kIdA, "foo")); 182 EXPECT_FALSE(settings_service_.GetValue(kIdA, "foo"));
183 EXPECT_FALSE(settings_service_.GetValue(kIdB, "name")); 183 EXPECT_FALSE(settings_service_.GetValue(kIdB, "name"));
184 EXPECT_FALSE(settings_service_.GetValue(kIdC, "name")); 184 EXPECT_FALSE(settings_service_.GetValue(kIdC, "name"));
185 } 185 }
186 186
187 TEST_F(ManagedUserSharedSettingsServiceTest, Merge) { 187 TEST_F(ManagedUserSharedSettingsServiceTest, Merge) {
188 // Set initial values, then stop syncing so we can restart. 188 // Set initial values, then stop syncing so we can restart.
189 StartSyncing(SyncDataList()); 189 StartSyncing(SyncDataList());
190 190
191 const char kIdA[] = "aaaaaa"; 191 const char kIdA[] = "aaaaaa";
192 const char kIdB[] = "bbbbbb"; 192 const char kIdB[] = "bbbbbb";
193 const char kIdC[] = "cccccc"; 193 const char kIdC[] = "cccccc";
194 194
195 FundamentalValue age(8); 195 FundamentalValue age(8);
196 StringValue bar("bar"); 196 StringValue bar("bar");
197 settings_service_.SetValue(kIdA, "name", StringValue("Jack")); 197 settings_service_.SetValue(kIdA, "name", StringValue("Jack"));
198 settings_service_.SetValue(kIdA, "age", age); 198 settings_service_.SetValue(kIdA, "age", age);
199 settings_service_.SetValue(kIdB, "foo", bar); 199 settings_service_.SetValue(kIdB, "foo", bar);
200 200
201 settings_service_.StopSyncing(MANAGED_USER_SHARED_SETTINGS); 201 settings_service_.StopSyncing(SUPERVISED_USER_SHARED_SETTINGS);
202 202
203 StringValue name("Jill"); 203 StringValue name("Jill");
204 StringValue blurp("blurp"); 204 StringValue blurp("blurp");
205 SyncDataList sync_data; 205 SyncDataList sync_data;
206 sync_data.push_back( 206 sync_data.push_back(
207 ManagedUserSharedSettingsService::CreateSyncDataForSetting( 207 ManagedUserSharedSettingsService::CreateSyncDataForSetting(
208 kIdA, "name", name, true)); 208 kIdA, "name", name, true));
209 sync_data.push_back( 209 sync_data.push_back(
210 ManagedUserSharedSettingsService::CreateSyncDataForSetting( 210 ManagedUserSharedSettingsService::CreateSyncDataForSetting(
211 kIdC, "baz", blurp, true)); 211 kIdC, "baz", blurp, true));
212 212
213 StartSyncing(sync_data); 213 StartSyncing(sync_data);
214 EXPECT_EQ(2u, sync_processor_->changes().size()); 214 EXPECT_EQ(2u, sync_processor_->changes().size());
215 VerifySyncChangesAndClear(); 215 VerifySyncChangesAndClear();
216 EXPECT_EQ(2u, changed_settings_.size()); 216 EXPECT_EQ(2u, changed_settings_.size());
217 217
218 EXPECT_EQ( 218 EXPECT_EQ(
219 4u, 219 4u,
220 settings_service_.GetAllSyncData(MANAGED_USER_SHARED_SETTINGS).size()); 220 settings_service_.GetAllSyncData(SUPERVISED_USER_SHARED_SETTINGS).size());
221 EXPECT_EQ(ToJson(&name), 221 EXPECT_EQ(ToJson(&name),
222 ToJson(settings_service_.GetValue(kIdA, "name"))); 222 ToJson(settings_service_.GetValue(kIdA, "name")));
223 EXPECT_EQ(ToJson(&age), ToJson(settings_service_.GetValue(kIdA, "age"))); 223 EXPECT_EQ(ToJson(&age), ToJson(settings_service_.GetValue(kIdA, "age")));
224 EXPECT_EQ(ToJson(&bar), ToJson(settings_service_.GetValue(kIdB, "foo"))); 224 EXPECT_EQ(ToJson(&bar), ToJson(settings_service_.GetValue(kIdB, "foo")));
225 EXPECT_EQ(ToJson(&blurp), ToJson(settings_service_.GetValue(kIdC, "baz"))); 225 EXPECT_EQ(ToJson(&blurp), ToJson(settings_service_.GetValue(kIdC, "baz")));
226 EXPECT_FALSE(settings_service_.GetValue(kIdA, "foo")); 226 EXPECT_FALSE(settings_service_.GetValue(kIdA, "foo"));
227 EXPECT_FALSE(settings_service_.GetValue(kIdB, "name")); 227 EXPECT_FALSE(settings_service_.GetValue(kIdB, "name"));
228 EXPECT_FALSE(settings_service_.GetValue(kIdC, "name")); 228 EXPECT_FALSE(settings_service_.GetValue(kIdC, "name"));
229 } 229 }
230 230
(...skipping 22 matching lines...) Expand all
253 SyncChange(FROM_HERE, 253 SyncChange(FROM_HERE,
254 SyncChange::ACTION_ADD, 254 SyncChange::ACTION_ADD,
255 ManagedUserSharedSettingsService::CreateSyncDataForSetting( 255 ManagedUserSharedSettingsService::CreateSyncDataForSetting(
256 kIdC, "baz", blurp, true))); 256 kIdC, "baz", blurp, true)));
257 SyncError error = settings_service_.ProcessSyncChanges(FROM_HERE, changes); 257 SyncError error = settings_service_.ProcessSyncChanges(FROM_HERE, changes);
258 EXPECT_FALSE(error.IsSet()) << error.ToString(); 258 EXPECT_FALSE(error.IsSet()) << error.ToString();
259 EXPECT_EQ(2u, changed_settings_.size()); 259 EXPECT_EQ(2u, changed_settings_.size());
260 260
261 EXPECT_EQ( 261 EXPECT_EQ(
262 4u, 262 4u,
263 settings_service_.GetAllSyncData(MANAGED_USER_SHARED_SETTINGS).size()); 263 settings_service_.GetAllSyncData(SUPERVISED_USER_SHARED_SETTINGS).size());
264 EXPECT_EQ(ToJson(&name), 264 EXPECT_EQ(ToJson(&name),
265 ToJson(settings_service_.GetValue(kIdA, "name"))); 265 ToJson(settings_service_.GetValue(kIdA, "name")));
266 EXPECT_EQ(ToJson(&age), ToJson(settings_service_.GetValue(kIdA, "age"))); 266 EXPECT_EQ(ToJson(&age), ToJson(settings_service_.GetValue(kIdA, "age")));
267 EXPECT_EQ(ToJson(&bar), ToJson(settings_service_.GetValue(kIdB, "foo"))); 267 EXPECT_EQ(ToJson(&bar), ToJson(settings_service_.GetValue(kIdB, "foo")));
268 EXPECT_EQ(ToJson(&blurp), ToJson(settings_service_.GetValue(kIdC, "baz"))); 268 EXPECT_EQ(ToJson(&blurp), ToJson(settings_service_.GetValue(kIdC, "baz")));
269 EXPECT_FALSE(settings_service_.GetValue(kIdA, "foo")); 269 EXPECT_FALSE(settings_service_.GetValue(kIdA, "foo"));
270 EXPECT_FALSE(settings_service_.GetValue(kIdB, "name")); 270 EXPECT_FALSE(settings_service_.GetValue(kIdB, "name"));
271 EXPECT_FALSE(settings_service_.GetValue(kIdC, "name")); 271 EXPECT_FALSE(settings_service_.GetValue(kIdC, "name"));
272 } 272 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698