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

Side by Side Diff: chrome/browser/supervised_user/legacy/supervised_user_shared_settings_service_unittest.cc

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

Powered by Google App Engine
This is Rietveld 408576698