sync/syncable/syncable_unittest.cc - Issue 11341048: Populate versions on individual nodes in sync model and native bookmark model.

Unified Diff: sync/syncable/syncable_unittest.cc

Issue 11341048: Populate versions on individual nodes in sync model and native bookmark model. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: tests Created 8 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 side-by-side diff with in-line comments

Download patch

« chrome/browser/sync/profile_sync_service_bookmark_unittest.cc ('K') | « sync/syncable/syncable_enum_conversions.cc ('k') | sync/syncable/write_transaction.h » ('j') | sync/test/null_directory_change_delegate.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: sync/syncable/syncable_unittest.cc

diff --git a/sync/syncable/syncable_unittest.cc b/sync/syncable/syncable_unittest.cc

index 65cedc3ac9b6e2f18420484f53dfab92cdbac516..8a49ba44968faa5b1751384da12ea7892826cf9f 100644

--- a/sync/syncable/syncable_unittest.cc

+++ b/sync/syncable/syncable_unittest.cc

@@ -1676,6 +1676,7 @@ TEST_F(OnDiskSyncableDirectoryTest,

specifics.mutable_bookmark()->set_favicon("PNG");

specifics.mutable_bookmark()->set_url("http://nowhere");

create.Put(SPECIFICS, specifics);

+ update.Put(SPECIFICS, specifics);

Nicolas Zea 2012/11/07 00:20:31 remove?

haitaol1 2012/11/07 22:20:25 So |update| is left empty on purpose? Why set spec

Nicolas Zea 2012/11/08 19:05:08 Woops, sorry, I misread this to be a duplicate of

create_pre_save = create.GetKernelCopy();

update_pre_save = update.GetKernelCopy();

create_id = create.Get(ID);

@@ -1702,10 +1703,12 @@ TEST_F(OnDiskSyncableDirectoryTest,

}

int i = BEGIN_FIELDS;

for ( ; i < INT64_FIELDS_END ; ++i) {

- EXPECT_EQ(create_pre_save.ref((Int64Field)i),

+ EXPECT_EQ(create_pre_save.ref((Int64Field)i) +

+ (i == TRANSACTION_VERSION ? 1 : 0),

Nicolas Zea 2012/11/07 00:20:31 hmm, what is this for?

haitaol1 2012/11/07 22:20:25 Because version is automatically incremented, so p

Nicolas Zea 2012/11/08 19:05:08 Ah, I see.

create_post_save.ref((Int64Field)i))

<< "int64 field #" << i << " changed during save/load";

- EXPECT_EQ(update_pre_save.ref((Int64Field)i),

+ EXPECT_EQ(update_pre_save.ref((Int64Field)i) +

+ (i == TRANSACTION_VERSION ? 1 : 0),

update_post_save.ref((Int64Field)i))

<< "int64 field #" << i << " changed during save/load";

}