[Sync] Add support for associating a new Synced Bookmarks node.

net/tools/testserver/chromiumsync_test.py

 #!/usr/bin/env python
 # Copyright (c) 2011 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.
 
 """Tests exercising chromiumsync and SyncDataModel."""
 
 import pickle
 import unittest
 
@@ skipping 54 matching lines @@
     self.assertTrue(self.model._ItemExists(proto.id_string))
     self.assertEqual(2, self.model._entries[proto.id_string].version)
 
   def testCreatePermanentItems(self):
     self.model._CreatePermanentItems(chromiumsync.ALL_TYPES)
     self.assertEqual(len(chromiumsync.ALL_TYPES) + 2,
                      len(self.model._entries))
 
   def ExpectedPermanentItemCount(self, sync_type):
     if sync_type == chromiumsync.BOOKMARK:
-      return 4
+      if self.model._ItemExists(

[ncarter (slow), 2012/03/07 22:05:03]

It seems circular to query the model from the test expectation. This will mask
bugs where the folder is created when it shouldn't be, or bugs where the folder
isn't created when it should be.

Instead, you might add a boolean property to SyncDataModelTest called
syncedBookmarksFolderShouldExist, and set it to True whenever the folder is
explicitly created.

[Nicolas Zea, 2012/03/15 21:22:50]

Done.

+          self.model._MakeCurrentId(chromiumsync.BOOKMARK,
+                                    '<server tag>synced_bookmarks')):
+        return 5
+      else:
+        return 4
     elif sync_type == chromiumsync.TOP_LEVEL:
       return 1
     else:
       return 2
 
   def testGetChangesFromTimestampZeroForEachType(self):
     all_types = chromiumsync.ALL_TYPES[1:]
     for sync_type in all_types:
       self.model = chromiumsync.SyncDataModel()
       request_types = [sync_type]
@@ skipping 467 matching lines @@
     msg = sync_pb2.GetUpdatesMessage()
     marker = msg.from_progress_marker.add()
     marker.data_type_id = autofill.number
     marker.token = pickle.dumps((15412, 5))
     marker = msg.from_progress_marker.add()
     marker.data_type_id = theme.number
     marker.token = pickle.dumps((15413, 4))
     sieve = chromiumsync.UpdateSieve(msg, migrator)
     sieve.CheckMigrationState()
 
+  def testCreateSyncedBookmaks(self):
+    version1, changes, remaining = (
+        self.GetChangesFromTimestamp([chromiumsync.BOOKMARK], 0))
+    id_string = self.model._MakeCurrentId(chromiumsync.BOOKMARK,
+                                          '<server tag>synced_bookmarks')
+    self.assertFalse(self.model._ItemExists(id_string))
+    self.model.TriggerCreateSyncedBookmarks()
+    self.assertTrue(self.model._ItemExists(id_string))
+    version2, changes, remaining = (
+        self.GetChangesFromTimestamp([chromiumsync.BOOKMARK], version1))
+    self.assertEqual(len(changes), 1)
+    self.assertEqual(changes[0].id_string, id_string)
+    self.assertNotEqual(version1, version2)
+
 
 if __name__ == '__main__':
   unittest.main()