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

Unified Diff: sync/api/sync_data_unittest.cc

Issue 217063005: Separate SyncData methods into three groups, local, remote, and common. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@syncapi
Patch Set: Remove AsLocal and AsRemote methods from SyncData. Created 6 years, 9 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
« sync/api/sync_change.cc ('K') | « sync/api/sync_data.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/api/sync_data_unittest.cc
diff --git a/sync/api/sync_data_unittest.cc b/sync/api/sync_data_unittest.cc
index bf964c8d19f5f4291342f02a1248f2a02e2c0ee5..7ca39bf2218942f4c1b6d0d2f9e43e2e6d5f3534 100644
--- a/sync/api/sync_data_unittest.cc
+++ b/sync/api/sync_data_unittest.cc
@@ -53,7 +53,7 @@ TEST_F(SyncDataTest, CreateLocalDelete) {
SyncData data = SyncData::CreateLocalDelete(kSyncTag, kDatatype);
EXPECT_TRUE(data.IsValid());
EXPECT_TRUE(data.IsLocal());
- EXPECT_EQ(kSyncTag, data.GetTag());
+ EXPECT_EQ(kSyncTag, SyncDataLocal(data).GetTag());
EXPECT_EQ(kDatatype, data.GetDataType());
}
@@ -63,7 +63,7 @@ TEST_F(SyncDataTest, CreateLocalData) {
SyncData::CreateLocalData(kSyncTag, kNonUniqueTitle, specifics);
EXPECT_TRUE(data.IsValid());
EXPECT_TRUE(data.IsLocal());
- EXPECT_EQ(kSyncTag, data.GetTag());
+ EXPECT_EQ(kSyncTag, SyncDataLocal(data).GetTag());
EXPECT_EQ(kDatatype, data.GetDataType());
EXPECT_EQ(kNonUniqueTitle, data.GetTitle());
EXPECT_TRUE(data.GetSpecifics().has_preference());
@@ -81,13 +81,13 @@ TEST_F(SyncDataTest, CreateLocalDataWithAttachments) {
kSyncTag, kNonUniqueTitle, specifics, attachments);
EXPECT_TRUE(data.IsValid());
EXPECT_TRUE(data.IsLocal());
- EXPECT_EQ(kSyncTag, data.GetTag());
+ EXPECT_EQ(kSyncTag, SyncDataLocal(data).GetTag());
EXPECT_EQ(kDatatype, data.GetDataType());
EXPECT_EQ(kNonUniqueTitle, data.GetTitle());
EXPECT_TRUE(data.GetSpecifics().has_preference());
AttachmentIdList attachment_ids = data.GetAttachmentIds();
EXPECT_EQ(3U, attachment_ids.size());
- EXPECT_EQ(3U, data.GetLocalAttachmentsForUpload().size());
+ EXPECT_EQ(3U, SyncDataLocal(data).GetLocalAttachmentsForUpload().size());
}
TEST_F(SyncDataTest, CreateLocalDataWithAttachments_EmptyListOfAttachments) {
@@ -97,12 +97,12 @@ TEST_F(SyncDataTest, CreateLocalDataWithAttachments_EmptyListOfAttachments) {
kSyncTag, kNonUniqueTitle, specifics, attachments);
EXPECT_TRUE(data.IsValid());
EXPECT_TRUE(data.IsLocal());
- EXPECT_EQ(kSyncTag, data.GetTag());
+ EXPECT_EQ(kSyncTag, SyncDataLocal(data).GetTag());
EXPECT_EQ(kDatatype, data.GetDataType());
EXPECT_EQ(kNonUniqueTitle, data.GetTitle());
EXPECT_TRUE(data.GetSpecifics().has_preference());
EXPECT_TRUE(data.GetAttachmentIds().empty());
- EXPECT_TRUE(data.GetLocalAttachmentsForUpload().empty());
+ EXPECT_TRUE(SyncDataLocal(data).GetLocalAttachmentsForUpload().empty());
}
TEST_F(SyncDataTest, CreateRemoteData) {
@@ -114,8 +114,8 @@ TEST_F(SyncDataTest, CreateRemoteData) {
attachment_service_proxy);
EXPECT_TRUE(data.IsValid());
EXPECT_FALSE(data.IsLocal());
- EXPECT_EQ(kId, data.GetRemoteId());
- EXPECT_EQ(kLastModifiedTime, data.GetRemoteModifiedTime());
+ EXPECT_EQ(kId, SyncDataRemote(data).GetId());
+ EXPECT_EQ(kLastModifiedTime, SyncDataRemote(data).GetModifiedTime());
EXPECT_TRUE(data.GetSpecifics().has_preference());
EXPECT_TRUE(data.GetAttachmentIds().empty());
}
@@ -125,8 +125,8 @@ TEST_F(SyncDataTest, CreateRemoteData_WithoutAttachmentService) {
SyncData data = SyncData::CreateRemoteData(kId, specifics, kLastModifiedTime);
EXPECT_TRUE(data.IsValid());
EXPECT_FALSE(data.IsLocal());
- EXPECT_EQ(kId, data.GetRemoteId());
- EXPECT_EQ(kLastModifiedTime, data.GetRemoteModifiedTime());
+ EXPECT_EQ(kId, SyncDataRemote(data).GetId());
+ EXPECT_EQ(kLastModifiedTime, SyncDataRemote(data).GetModifiedTime());
EXPECT_TRUE(data.GetSpecifics().has_preference());
}
« sync/api/sync_change.cc ('K') | « sync/api/sync_data.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698