Populate versions on individual nodes in sync model and native bookmark model.

sync/syncable/syncable_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
@@ skipping 1658 matching lines @@
   {
     WriteTransaction trans(FROM_HERE, UNITTEST, dir_.get());
     MutableEntry create(&trans, CREATE, trans.root_id(), create_name);
     MutableEntry update(&trans, CREATE_NEW_UPDATE_ITEM, update_id);
     create.Put(IS_UNSYNCED, true);
     update.Put(IS_UNAPPLIED_UPDATE, true);
     sync_pb::EntitySpecifics specifics;
     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 specifics on |create| but not on
|update|?

On 2012/11/07 00:20:31, Nicolas Zea wrote:

[Nicolas Zea, 2012/11/08 19:05:08]

Woops, sorry, I misread this to be a duplicate of the line above. Disregard.

     create_pre_save = create.GetKernelCopy();
     update_pre_save = update.GetKernelCopy();
     create_id = create.Get(ID);
   }
 
   dir_->SaveChanges();
   dir_.reset(new Directory(new OnDiskDirectoryBackingStore(kName, file_path_),
                            &handler_,
                            NULL,
                            NULL,
                            NULL));
 
   ASSERT_TRUE(dir_.get());
   ASSERT_EQ(OPENED, dir_->Open(kName, &delegate_, NullTransactionObserver()));
   ASSERT_TRUE(dir_->good());
 
   {
     ReadTransaction trans(FROM_HERE, dir_.get());
     Entry create(&trans, GET_BY_ID, create_id);
     EXPECT_EQ(1, CountEntriesWithName(&trans, trans.root_id(), create_name));
     Entry update(&trans, GET_BY_ID, update_id);
     create_post_save = create.GetKernelCopy();
     update_post_save = update.GetKernelCopy();
   }
   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 post entry has bigger version.

On 2012/11/07 00:20:31, Nicolas Zea wrote:

[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";
   }
   for ( ; i < TIME_FIELDS_END ; ++i) {
     EXPECT_EQ(create_pre_save.ref((TimeField)i),
               create_post_save.ref((TimeField)i))
               << "time field #" << i << " changed during save/load";
     EXPECT_EQ(update_pre_save.ref((TimeField)i),
               update_post_save.ref((TimeField)i))
               << "time field #" << i << " changed during save/load";
@@ skipping 414 matching lines @@
   EXPECT_TRUE(CreateWithDefaultTag(factory_.NewServerId(), true));
   EXPECT_FALSE(CreateWithDefaultTag(factory_.NewServerId(), true));
   EXPECT_FALSE(CreateWithDefaultTag(factory_.NewServerId(), false));
   EXPECT_FALSE(CreateWithDefaultTag(factory_.NewLocalId(), false));
   EXPECT_FALSE(CreateWithDefaultTag(factory_.NewLocalId(), true));
 }
 
 }  // namespace
 }  // namespace syncable
 }  // namespace syncer