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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: components/sync/device_info/device_info_sync_service_unittest.cc

Issue 2388163002: [Sync] Move //components/sync to the syncer namespace, take 2. (Closed)
Patch Set: Rebase. Created 4 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/sync/device_info/device_info_sync_service.cc ('k') | components/sync/device_info/device_info_tracker.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/sync/device_info/device_info_sync_service_unittest.cc
diff --git a/components/sync/device_info/device_info_sync_service_unittest.cc b/components/sync/device_info/device_info_sync_service_unittest.cc
index 4dfaed552bf848f07ac09fde6bf4b9d423b29a15..d2cab8eb28296dbe2b932fee8ed73178ad5b735b 100644
--- a/components/sync/device_info/device_info_sync_service_unittest.cc
+++ b/components/sync/device_info/device_info_sync_service_unittest.cc
@@ -22,22 +22,9 @@
using base::Time;
using base::TimeDelta;
-using syncer::AttachmentIdList;
-using syncer::AttachmentServiceProxyForTest;
-using syncer::ModelType;
-using syncer::SyncChange;
-using syncer::SyncChangeList;
-using syncer::SyncChangeProcessor;
-using syncer::SyncChangeProcessorWrapperForTest;
-using syncer::SyncData;
-using syncer::SyncDataList;
-using syncer::SyncError;
-using syncer::SyncErrorFactory;
-using syncer::SyncErrorFactoryMock;
-using syncer::SyncMergeResult;
using sync_pb::EntitySpecifics;
-namespace sync_driver {
+namespace syncer {
namespace {
@@ -136,7 +123,7 @@ class DeviceInfoSyncServiceTest : public testing::Test,
sync_pb::EntitySpecifics entity(
CreateEntitySpecifics(client_id, client_name));
entity.mutable_device_info()->set_last_updated_timestamp(
- syncer::TimeToProtoTime(last_updated_timestamp));
+ TimeToProtoTime(last_updated_timestamp));
return SyncData::CreateRemoteData(1, entity, Time(), AttachmentIdList(),
AttachmentServiceProxyForTest::Create());
}
@@ -159,14 +146,13 @@ class DeviceInfoSyncServiceTest : public testing::Test,
protected:
// Private method wrappers through friend class.
- Time GetLastUpdateTime(const syncer::SyncData& data) {
+ Time GetLastUpdateTime(const SyncData& data) {
return sync_service_->GetLastUpdateTime(data);
}
int CountActiveDevices(const Time now) {
return sync_service_->CountActiveDevices(now);
}
- void StoreSyncData(const std::string& client_id,
- const syncer::SyncData& sync_data) {
+ void StoreSyncData(const std::string& client_id, const SyncData& sync_data) {
sync_service_->StoreSyncData(client_id, sync_data);
}
bool IsPulseTimerRunning() { return sync_service_->pulse_timer_.IsRunning(); }
@@ -187,7 +173,7 @@ TEST_F(DeviceInfoSyncServiceTest, StartSyncEmptyInitialData) {
EXPECT_FALSE(sync_service_->IsSyncing());
SyncMergeResult merge_result = sync_service_->MergeDataAndStartSyncing(
- syncer::DEVICE_INFO, SyncDataList(), PassProcessor(),
+ DEVICE_INFO, SyncDataList(), PassProcessor(),
CreateAndPassSyncErrorFactory());
EXPECT_TRUE(sync_service_->IsSyncing());
@@ -202,7 +188,7 @@ TEST_F(DeviceInfoSyncServiceTest, StartSyncEmptyInitialData) {
EXPECT_EQ("guid_1", sync_processor_->cache_guid_at(0));
// Should have one device info corresponding to local device info.
- EXPECT_EQ(1U, sync_service_->GetAllSyncData(syncer::DEVICE_INFO).size());
+ EXPECT_EQ(1U, sync_service_->GetAllSyncData(DEVICE_INFO).size());
EXPECT_EQ(1U, sync_service_->GetAllDeviceInfo().size());
EXPECT_TRUE(sync_service_->GetDeviceInfo("guid_1"));
EXPECT_FALSE(sync_service_->GetDeviceInfo("guid_0"));
@@ -210,12 +196,12 @@ TEST_F(DeviceInfoSyncServiceTest, StartSyncEmptyInitialData) {
TEST_F(DeviceInfoSyncServiceTest, StopSyncing) {
SyncMergeResult merge_result = sync_service_->MergeDataAndStartSyncing(
- syncer::DEVICE_INFO, SyncDataList(), PassProcessor(),
+ DEVICE_INFO, SyncDataList(), PassProcessor(),
CreateAndPassSyncErrorFactory());
EXPECT_TRUE(sync_service_->IsSyncing());
EXPECT_EQ(1, num_device_info_changed_callbacks_);
EXPECT_TRUE(IsPulseTimerRunning());
- sync_service_->StopSyncing(syncer::DEVICE_INFO);
+ sync_service_->StopSyncing(DEVICE_INFO);
EXPECT_FALSE(sync_service_->IsSyncing());
EXPECT_EQ(2, num_device_info_changed_callbacks_);
EXPECT_FALSE(IsPulseTimerRunning());
@@ -227,8 +213,7 @@ TEST_F(DeviceInfoSyncServiceTest, StartSyncMatchingInitialData) {
AddInitialData(&sync_data, "guid_1", "client_1");
SyncMergeResult merge_result = sync_service_->MergeDataAndStartSyncing(
- syncer::DEVICE_INFO, sync_data, PassProcessor(),
- CreateAndPassSyncErrorFactory());
+ DEVICE_INFO, sync_data, PassProcessor(), CreateAndPassSyncErrorFactory());
EXPECT_EQ(0, merge_result.num_items_added());
EXPECT_EQ(0, merge_result.num_items_modified());
EXPECT_EQ(0, merge_result.num_items_deleted());
@@ -238,7 +223,7 @@ TEST_F(DeviceInfoSyncServiceTest, StartSyncMatchingInitialData) {
// No changes expected because the device info matches.
EXPECT_EQ(0U, sync_processor_->change_list_size());
- EXPECT_EQ(1U, sync_service_->GetAllSyncData(syncer::DEVICE_INFO).size());
+ EXPECT_EQ(1U, sync_service_->GetAllSyncData(DEVICE_INFO).size());
EXPECT_EQ(1U, sync_service_->GetAllDeviceInfo().size());
EXPECT_TRUE(sync_service_->GetDeviceInfo("guid_1"));
EXPECT_FALSE(sync_service_->GetDeviceInfo("guid_0"));
@@ -253,8 +238,7 @@ TEST_F(DeviceInfoSyncServiceTest, StartSync) {
AddInitialData(&sync_data, "guid_1", "baz");
SyncMergeResult merge_result = sync_service_->MergeDataAndStartSyncing(
- syncer::DEVICE_INFO, sync_data, PassProcessor(),
- CreateAndPassSyncErrorFactory());
+ DEVICE_INFO, sync_data, PassProcessor(), CreateAndPassSyncErrorFactory());
EXPECT_EQ(2, merge_result.num_items_added());
EXPECT_EQ(1, merge_result.num_items_modified());
@@ -266,7 +250,7 @@ TEST_F(DeviceInfoSyncServiceTest, StartSync) {
EXPECT_EQ(SyncChange::ACTION_UPDATE, sync_processor_->change_type_at(0));
EXPECT_EQ("client_1", sync_processor_->client_name_at(0));
- EXPECT_EQ(3U, sync_service_->GetAllSyncData(syncer::DEVICE_INFO).size());
+ EXPECT_EQ(3U, sync_service_->GetAllSyncData(DEVICE_INFO).size());
EXPECT_EQ(3U, sync_service_->GetAllDeviceInfo().size());
EXPECT_TRUE(sync_service_->GetDeviceInfo("guid_1"));
EXPECT_TRUE(sync_service_->GetDeviceInfo("guid_2"));
@@ -281,7 +265,7 @@ TEST_F(DeviceInfoSyncServiceTest, ProcessAddChange) {
// Start with an empty initial data.
SyncMergeResult merge_result = sync_service_->MergeDataAndStartSyncing(
- syncer::DEVICE_INFO, SyncDataList(), PassProcessor(),
+ DEVICE_INFO, SyncDataList(), PassProcessor(),
CreateAndPassSyncErrorFactory());
// There should be only one item corresponding to the local device
EXPECT_EQ(1, merge_result.num_items_after_association());
@@ -310,8 +294,7 @@ TEST_F(DeviceInfoSyncServiceTest, ProcessMultipleChanges) {
AddInitialData(&sync_data, "guid_3", "bar");
SyncMergeResult merge_result = sync_service_->MergeDataAndStartSyncing(
- syncer::DEVICE_INFO, sync_data, PassProcessor(),
- CreateAndPassSyncErrorFactory());
+ DEVICE_INFO, sync_data, PassProcessor(), CreateAndPassSyncErrorFactory());
EXPECT_EQ(3, merge_result.num_items_after_association());
// reset callbacks counter
num_device_info_changed_callbacks_ = 0;
@@ -342,7 +325,7 @@ TEST_F(DeviceInfoSyncServiceTest, ProcessMultipleChanges) {
// Process update to the local device info and verify that it is ignored.
TEST_F(DeviceInfoSyncServiceTest, ProcessUpdateChangeMatchingLocalDevice) {
SyncMergeResult merge_result = sync_service_->MergeDataAndStartSyncing(
- syncer::DEVICE_INFO, SyncDataList(), PassProcessor(),
+ DEVICE_INFO, SyncDataList(), PassProcessor(),
CreateAndPassSyncErrorFactory());
EXPECT_EQ(1, merge_result.num_items_after_association());
// reset callbacks counter
@@ -367,8 +350,7 @@ TEST_F(DeviceInfoSyncServiceTest, ProcessDeleteChange) {
AddInitialData(&sync_data, "guid_3", "bar");
SyncMergeResult merge_result = sync_service_->MergeDataAndStartSyncing(
- syncer::DEVICE_INFO, sync_data, PassProcessor(),
- CreateAndPassSyncErrorFactory());
+ DEVICE_INFO, sync_data, PassProcessor(), CreateAndPassSyncErrorFactory());
EXPECT_EQ(3, merge_result.num_items_after_association());
// reset callbacks counter
num_device_info_changed_callbacks_ = 0;
@@ -387,7 +369,7 @@ TEST_F(DeviceInfoSyncServiceTest, ProcessDeleteChange) {
// Process sync change with unexpected action.
TEST_F(DeviceInfoSyncServiceTest, ProcessInvalidChange) {
SyncMergeResult merge_result = sync_service_->MergeDataAndStartSyncing(
- syncer::DEVICE_INFO, SyncDataList(), PassProcessor(),
+ DEVICE_INFO, SyncDataList(), PassProcessor(),
CreateAndPassSyncErrorFactory());
EXPECT_EQ(1, merge_result.num_items_after_association());
// reset callbacks counter
@@ -407,7 +389,7 @@ TEST_F(DeviceInfoSyncServiceTest, ProcessInvalidChange) {
// Process sync change after unsubscribing from notifications.
TEST_F(DeviceInfoSyncServiceTest, ProcessChangesAfterUnsubscribing) {
SyncMergeResult merge_result = sync_service_->MergeDataAndStartSyncing(
- syncer::DEVICE_INFO, SyncDataList(), PassProcessor(),
+ DEVICE_INFO, SyncDataList(), PassProcessor(),
CreateAndPassSyncErrorFactory());
EXPECT_EQ(1, merge_result.num_items_after_association());
// reset callbacks counter
@@ -432,8 +414,7 @@ TEST_F(DeviceInfoSyncServiceTest, StartSyncMatchingButStale) {
SyncDataList sync_data;
sync_data.push_back(CreateRemoteData("guid_1", "foo_1", Time()));
SyncMergeResult merge_result = sync_service_->MergeDataAndStartSyncing(
- syncer::DEVICE_INFO, sync_data, PassProcessor(),
- CreateAndPassSyncErrorFactory());
+ DEVICE_INFO, sync_data, PassProcessor(), CreateAndPassSyncErrorFactory());
EXPECT_EQ(1U, sync_processor_->change_list_size());
EXPECT_EQ(SyncChange::ACTION_UPDATE, sync_processor_->change_type_at(0));
@@ -450,7 +431,7 @@ TEST_F(DeviceInfoSyncServiceTest, GetLastUpdateTime) {
EntitySpecifics entityB(CreateEntitySpecifics("b", "b"));
entityB.mutable_device_info()->set_last_updated_timestamp(
- syncer::TimeToProtoTime(time1));
+ TimeToProtoTime(time1));
SyncData localB(SyncData::CreateLocalData("b", "b", entityB));
SyncData remoteC(SyncData::CreateRemoteData(
@@ -459,7 +440,7 @@ TEST_F(DeviceInfoSyncServiceTest, GetLastUpdateTime) {
EntitySpecifics entityD(CreateEntitySpecifics("d", "d"));
entityD.mutable_device_info()->set_last_updated_timestamp(
- syncer::TimeToProtoTime(time1));
+ TimeToProtoTime(time1));
SyncData remoteD(
SyncData::CreateRemoteData(1, entityD, time2, AttachmentIdList(),
AttachmentServiceProxyForTest::Create()));
@@ -578,4 +559,4 @@ TEST_F(DeviceInfoSyncServiceTest, CountActiveDevicesLocalStale) {
} // namespace
-} // namespace sync_driver
+} // namespace syncer
« no previous file with comments | « components/sync/device_info/device_info_sync_service.cc ('k') | components/sync/device_info/device_info_tracker.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698