Changed DB to store node positions as Ordinals.

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/compiler_specific.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/location.h"
@@ skipping 17 matching lines @@
 #include "sync/syncable/syncable_proto_util.h"
 #include "sync/syncable/syncable_util.h"
 #include "sync/syncable/write_transaction.h"
 #include "sync/test/engine/test_id_factory.h"
 #include "sync/test/engine/test_syncable_utils.h"
 #include "sync/test/fake_encryptor.h"
 #include "sync/test/null_directory_change_delegate.h"
 #include "sync/test/null_transaction_observer.h"
 #include "sync/util/test_unrecoverable_error_handler.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "sync/internal_api/public/base/ordinal.h"

[rlarocque, 2012/10/01 21:45:55]

Fix include ordering.

[vishwath, 2012/10/02 01:06:33]

Done.

+#include "sync/internal_api/public/base/node_ordinal.h"
 
 namespace syncer {
 namespace syncable {
 
 using base::ExpectDictBooleanValue;
 using base::ExpectDictStringValue;
 
 class SyncableKernelTest : public testing::Test {};
 
 // TODO(akalin): Add unit tests for EntryKernel::ContainsString().
@@ skipping 1311 matching lines @@
     EXPECT_TRUE(server_knows.good());
 
     Entry not_is_del(&trans, GET_BY_ID, not_is_del_id);
     EXPECT_TRUE(not_is_del.good());
 
     Entry zombie(&trans, GET_BY_ID, zombie_id);
     EXPECT_FALSE(zombie.good());
   }
 }
 
+TEST_F(SyncableDirectoryTest, OrdinalHandlesNullValues) {
+  TestIdFactory id_factory;
+  Id null_child_id;
+  int64 null_ord = NodeOrdinalToInt64(
+      NodeOrdinal("Thisshould\0workfine"));

[rlarocque, 2012/10/01 21:45:55]

IIRC, only the first 8 bytes will be maintained after the NodeOrdinalToInt64()
conversion.  

So, after the conversion, "Thisshould\0workfine" == "Thisshou".  That means the
'\0' handling might not be well tested.  

Other than this value, though, the test looks great.

[vishwath, 2012/10/02 01:06:33]

Done.

+
+  {
+    WriteTransaction trans(FROM_HERE, UNITTEST, dir_.get());
+
+    MutableEntry parent(&trans, CREATE, id_factory.root(), "parent");
+    parent.Put(IS_DIR, true);
+    parent.Put(IS_UNSYNCED, true);
+
+    MutableEntry child(&trans, CREATE, parent.Get(ID), "child");
+    child.Put(IS_UNSYNCED, true);
+    child.Put(SERVER_POSITION_IN_PARENT, null_ord);
+
+    null_child_id = child.Get(ID);
+  }
+
+  EXPECT_EQ(OPENED, SimulateSaveAndReloadDir());
+
+  {
+    ReadTransaction trans(FROM_HERE, dir_.get());
+
+    Entry null_ordinal_child(&trans, GET_BY_ID, null_child_id);
+    EXPECT_EQ(null_ord,
+              null_ordinal_child.Get(SERVER_POSITION_IN_PARENT));
+  }
+
+}
+
 // An OnDirectoryBackingStore that can be set to always fail SaveChanges.
 class TestBackingStore : public OnDiskDirectoryBackingStore {
  public:
   TestBackingStore(const std::string& dir_name,
                    const FilePath& backing_filepath);
 
   virtual ~TestBackingStore();
 
   virtual bool SaveChanges(const Directory::SaveChangesSnapshot& snapshot)
       OVERRIDE;
@@ skipping 711 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