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

Side by Side Diff: components/sync/device_info/device_info_service_unittest.cc

Issue 2310683002: Remove most ScopedVector usage from c/b/extensions. (Closed)
Patch Set: remove scoped_vector includes Created 4 years, 3 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
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "components/sync/device_info/device_info_service.h" 5 #include "components/sync/device_info/device_info_service.h"
6 6
7 #include <map> 7 #include <map>
8 #include <memory> 8 #include <memory>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 using syncer_v2::ModelTypeStore; 45 using syncer_v2::ModelTypeStore;
46 using syncer_v2::ModelTypeStoreTestUtil; 46 using syncer_v2::ModelTypeStoreTestUtil;
47 using syncer_v2::KeyAndData; 47 using syncer_v2::KeyAndData;
48 using sync_driver::DeviceInfo; 48 using sync_driver::DeviceInfo;
49 using sync_driver::DeviceInfoTracker; 49 using sync_driver::DeviceInfoTracker;
50 using sync_driver::LocalDeviceInfoProviderMock; 50 using sync_driver::LocalDeviceInfoProviderMock;
51 using sync_pb::DataTypeState; 51 using sync_pb::DataTypeState;
52 using sync_pb::DeviceInfoSpecifics; 52 using sync_pb::DeviceInfoSpecifics;
53 using sync_pb::EntitySpecifics; 53 using sync_pb::EntitySpecifics;
54 54
55 using DeviceInfoList = std::vector<std::unique_ptr<DeviceInfo>>;
55 using StorageKeyList = ModelTypeService::StorageKeyList; 56 using StorageKeyList = ModelTypeService::StorageKeyList;
56 using RecordList = ModelTypeStore::RecordList; 57 using RecordList = ModelTypeStore::RecordList;
57 using Result = ModelTypeStore::Result; 58 using Result = ModelTypeStore::Result;
58 using StartCallback = ModelTypeChangeProcessor::StartCallback; 59 using StartCallback = ModelTypeChangeProcessor::StartCallback;
59 using WriteBatch = ModelTypeStore::WriteBatch; 60 using WriteBatch = ModelTypeStore::WriteBatch;
60 61
61 namespace { 62 namespace {
62 63
63 std::unique_ptr<DeviceInfo> CreateDeviceInfo() { 64 std::unique_ptr<DeviceInfo> CreateDeviceInfo() {
64 return base::MakeUnique<DeviceInfo>( 65 return base::MakeUnique<DeviceInfo>(
(...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after
336 // that is slightly different from eachother. 337 // that is slightly different from eachother.
337 int generated_count_ = 0; 338 int generated_count_ = 0;
338 }; 339 };
339 340
340 namespace { 341 namespace {
341 342
342 TEST_F(DeviceInfoServiceTest, EmptyDataReconciliation) { 343 TEST_F(DeviceInfoServiceTest, EmptyDataReconciliation) {
343 InitializeAndPump(); 344 InitializeAndPump();
344 ASSERT_EQ(0u, service()->GetAllDeviceInfo().size()); 345 ASSERT_EQ(0u, service()->GetAllDeviceInfo().size());
345 OnSyncStarting(); 346 OnSyncStarting();
346 ScopedVector<DeviceInfo> all_device_info(service()->GetAllDeviceInfo()); 347 DeviceInfoList all_device_info(service()->GetAllDeviceInfo());
347 ASSERT_EQ(1u, all_device_info.size()); 348 ASSERT_EQ(1u, all_device_info.size());
348 ASSERT_TRUE( 349 ASSERT_TRUE(
349 local_device()->GetLocalDeviceInfo()->Equals(*all_device_info[0])); 350 local_device()->GetLocalDeviceInfo()->Equals(*all_device_info[0]));
350 } 351 }
351 352
352 TEST_F(DeviceInfoServiceTest, EmptyDataReconciliationSlowLoad) { 353 TEST_F(DeviceInfoServiceTest, EmptyDataReconciliationSlowLoad) {
353 InitializeService(); 354 InitializeService();
354 OnSyncStarting(); 355 OnSyncStarting();
355 ASSERT_EQ(0u, service()->GetAllDeviceInfo().size()); 356 ASSERT_EQ(0u, service()->GetAllDeviceInfo().size());
356 base::RunLoop().RunUntilIdle(); 357 base::RunLoop().RunUntilIdle();
357 ScopedVector<DeviceInfo> all_device_info(service()->GetAllDeviceInfo()); 358 DeviceInfoList all_device_info(service()->GetAllDeviceInfo());
358 ASSERT_EQ(1u, all_device_info.size()); 359 ASSERT_EQ(1u, all_device_info.size());
359 ASSERT_TRUE( 360 ASSERT_TRUE(
360 local_device()->GetLocalDeviceInfo()->Equals(*all_device_info[0])); 361 local_device()->GetLocalDeviceInfo()->Equals(*all_device_info[0]));
361 } 362 }
362 363
363 TEST_F(DeviceInfoServiceTest, LocalProviderSubscription) { 364 TEST_F(DeviceInfoServiceTest, LocalProviderSubscription) {
364 set_local_device(base::MakeUnique<LocalDeviceInfoProviderMock>()); 365 set_local_device(base::MakeUnique<LocalDeviceInfoProviderMock>());
365 InitializeAndPumpAndStart(); 366 InitializeAndPumpAndStart();
366 367
367 ASSERT_EQ(0u, service()->GetAllDeviceInfo().size()); 368 ASSERT_EQ(0u, service()->GetAllDeviceInfo().size());
368 local_device()->Initialize(CreateDeviceInfo()); 369 local_device()->Initialize(CreateDeviceInfo());
369 base::RunLoop().RunUntilIdle(); 370 base::RunLoop().RunUntilIdle();
370 371
371 ScopedVector<DeviceInfo> all_device_info(service()->GetAllDeviceInfo()); 372 DeviceInfoList all_device_info(service()->GetAllDeviceInfo());
372 ASSERT_EQ(1u, all_device_info.size()); 373 ASSERT_EQ(1u, all_device_info.size());
373 ASSERT_TRUE( 374 ASSERT_TRUE(
374 local_device()->GetLocalDeviceInfo()->Equals(*all_device_info[0])); 375 local_device()->GetLocalDeviceInfo()->Equals(*all_device_info[0]));
375 } 376 }
376 377
377 // Metadata shouldn't be loaded before the provider is initialized. 378 // Metadata shouldn't be loaded before the provider is initialized.
378 TEST_F(DeviceInfoServiceTest, LocalProviderInitRace) { 379 TEST_F(DeviceInfoServiceTest, LocalProviderInitRace) {
379 set_local_device(base::WrapUnique(new LocalDeviceInfoProviderMock())); 380 set_local_device(base::WrapUnique(new LocalDeviceInfoProviderMock()));
380 InitializeAndPump(); 381 InitializeAndPump();
381 OnSyncStarting(); 382 OnSyncStarting();
382 EXPECT_FALSE(processor()->metadata()); 383 EXPECT_FALSE(processor()->metadata());
383 384
384 ASSERT_EQ(0u, service()->GetAllDeviceInfo().size()); 385 ASSERT_EQ(0u, service()->GetAllDeviceInfo().size());
385 local_device()->Initialize(CreateDeviceInfo()); 386 local_device()->Initialize(CreateDeviceInfo());
386 base::RunLoop().RunUntilIdle(); 387 base::RunLoop().RunUntilIdle();
387 388
388 ScopedVector<DeviceInfo> all_device_info(service()->GetAllDeviceInfo()); 389 DeviceInfoList all_device_info(service()->GetAllDeviceInfo());
389 ASSERT_EQ(1u, all_device_info.size()); 390 ASSERT_EQ(1u, all_device_info.size());
390 ASSERT_TRUE( 391 ASSERT_TRUE(
391 local_device()->GetLocalDeviceInfo()->Equals(*all_device_info[0])); 392 local_device()->GetLocalDeviceInfo()->Equals(*all_device_info[0]));
392 393
393 EXPECT_TRUE(processor()->metadata()); 394 EXPECT_TRUE(processor()->metadata());
394 } 395 }
395 396
396 TEST_F(DeviceInfoServiceTest, GetClientTagNormal) { 397 TEST_F(DeviceInfoServiceTest, GetClientTagNormal) {
397 InitializeService(); 398 InitializeService();
398 const std::string guid = "abc"; 399 const std::string guid = "abc";
(...skipping 16 matching lines...) Expand all
415 TEST_F(DeviceInfoServiceTest, TestWithLocalData) { 416 TEST_F(DeviceInfoServiceTest, TestWithLocalData) {
416 std::unique_ptr<WriteBatch> batch = store()->CreateWriteBatch(); 417 std::unique_ptr<WriteBatch> batch = store()->CreateWriteBatch();
417 DeviceInfoSpecifics specifics(GenerateTestSpecifics()); 418 DeviceInfoSpecifics specifics(GenerateTestSpecifics());
418 store()->WriteData(batch.get(), specifics.cache_guid(), 419 store()->WriteData(batch.get(), specifics.cache_guid(),
419 specifics.SerializeAsString()); 420 specifics.SerializeAsString());
420 store()->CommitWriteBatch(std::move(batch), 421 store()->CommitWriteBatch(std::move(batch),
421 base::Bind(&AssertResultIsSuccess)); 422 base::Bind(&AssertResultIsSuccess));
422 423
423 InitializeAndPump(); 424 InitializeAndPump();
424 425
425 ScopedVector<DeviceInfo> all_device_info(service()->GetAllDeviceInfo()); 426 DeviceInfoList all_device_info(service()->GetAllDeviceInfo());
426 ASSERT_EQ(1u, all_device_info.size()); 427 ASSERT_EQ(1u, all_device_info.size());
427 AssertEqual(specifics, *all_device_info[0]); 428 AssertEqual(specifics, *all_device_info[0]);
428 AssertEqual(specifics, 429 AssertEqual(specifics,
429 *service()->GetDeviceInfo(specifics.cache_guid()).get()); 430 *service()->GetDeviceInfo(specifics.cache_guid()).get());
430 } 431 }
431 432
432 TEST_F(DeviceInfoServiceTest, TestWithLocalMetadata) { 433 TEST_F(DeviceInfoServiceTest, TestWithLocalMetadata) {
433 std::unique_ptr<WriteBatch> batch = store()->CreateWriteBatch(); 434 std::unique_ptr<WriteBatch> batch = store()->CreateWriteBatch();
434 DataTypeState state; 435 DataTypeState state;
435 state.set_encryption_key_name("ekn"); 436 state.set_encryption_key_name("ekn");
436 store()->WriteGlobalMetadata(batch.get(), state.SerializeAsString()); 437 store()->WriteGlobalMetadata(batch.get(), state.SerializeAsString());
437 store()->CommitWriteBatch(std::move(batch), 438 store()->CommitWriteBatch(std::move(batch),
438 base::Bind(&AssertResultIsSuccess)); 439 base::Bind(&AssertResultIsSuccess));
439 InitializeAndPump(); 440 InitializeAndPump();
440 ScopedVector<DeviceInfo> all_device_info(service()->GetAllDeviceInfo()); 441 DeviceInfoList all_device_info(service()->GetAllDeviceInfo());
441 ASSERT_EQ(1u, all_device_info.size()); 442 ASSERT_EQ(1u, all_device_info.size());
442 ASSERT_TRUE( 443 ASSERT_TRUE(
443 local_device()->GetLocalDeviceInfo()->Equals(*all_device_info[0])); 444 local_device()->GetLocalDeviceInfo()->Equals(*all_device_info[0]));
444 EXPECT_EQ(1u, processor()->put_map().size()); 445 EXPECT_EQ(1u, processor()->put_map().size());
445 } 446 }
446 447
447 TEST_F(DeviceInfoServiceTest, TestWithLocalDataAndMetadata) { 448 TEST_F(DeviceInfoServiceTest, TestWithLocalDataAndMetadata) {
448 std::unique_ptr<WriteBatch> batch = store()->CreateWriteBatch(); 449 std::unique_ptr<WriteBatch> batch = store()->CreateWriteBatch();
449 DeviceInfoSpecifics specifics(GenerateTestSpecifics()); 450 DeviceInfoSpecifics specifics(GenerateTestSpecifics());
450 store()->WriteData(batch.get(), specifics.cache_guid(), 451 store()->WriteData(batch.get(), specifics.cache_guid(),
451 specifics.SerializeAsString()); 452 specifics.SerializeAsString());
452 DataTypeState state; 453 DataTypeState state;
453 state.set_encryption_key_name("ekn"); 454 state.set_encryption_key_name("ekn");
454 store()->WriteGlobalMetadata(batch.get(), state.SerializeAsString()); 455 store()->WriteGlobalMetadata(batch.get(), state.SerializeAsString());
455 store()->CommitWriteBatch(std::move(batch), 456 store()->CommitWriteBatch(std::move(batch),
456 base::Bind(&AssertResultIsSuccess)); 457 base::Bind(&AssertResultIsSuccess));
457 458
458 InitializeAndPump(); 459 InitializeAndPump();
459 460
460 ScopedVector<DeviceInfo> all_device_info(service()->GetAllDeviceInfo()); 461 DeviceInfoList all_device_info(service()->GetAllDeviceInfo());
461 ASSERT_EQ(2u, all_device_info.size()); 462 ASSERT_EQ(2u, all_device_info.size());
462 AssertEqual(specifics, 463 AssertEqual(specifics,
463 *service()->GetDeviceInfo(specifics.cache_guid()).get()); 464 *service()->GetDeviceInfo(specifics.cache_guid()).get());
464 ASSERT_TRUE(processor()->metadata()); 465 ASSERT_TRUE(processor()->metadata());
465 ASSERT_EQ(state.encryption_key_name(), 466 ASSERT_EQ(state.encryption_key_name(),
466 processor()->metadata()->GetDataTypeState().encryption_key_name()); 467 processor()->metadata()->GetDataTypeState().encryption_key_name());
467 } 468 }
468 469
469 TEST_F(DeviceInfoServiceTest, GetData) { 470 TEST_F(DeviceInfoServiceTest, GetData) {
470 std::unique_ptr<WriteBatch> batch = store()->CreateWriteBatch(); 471 std::unique_ptr<WriteBatch> batch = store()->CreateWriteBatch();
(...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after
769 specifics.set_cache_guid("non-local"); 770 specifics.set_cache_guid("non-local");
770 PushBackEntityChangeAdd(specifics, &change_list); 771 PushBackEntityChangeAdd(specifics, &change_list);
771 service()->ApplySyncChanges(service()->CreateMetadataChangeList(), 772 service()->ApplySyncChanges(service()->CreateMetadataChangeList(),
772 change_list); 773 change_list);
773 EXPECT_EQ(1, service()->CountActiveDevices()); 774 EXPECT_EQ(1, service()->CountActiveDevices());
774 } 775 }
775 776
776 } // namespace 777 } // namespace
777 778
778 } // namespace sync_driver_v2 779 } // namespace sync_driver_v2
OLDNEW
« no previous file with comments | « components/sync/device_info/device_info_service.cc ('k') | components/sync/device_info/device_info_sync_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698