WIP: The Bookmark Position Megapatch

sync/test/engine/mock_connection_manager.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.
 //
 // Mock ServerConnectionManager class for use in client regression tests.
 
 #include "sync/test/engine/mock_connection_manager.h"
 
 #include <map>
 
@@ skipping 14 matching lines @@
 using sync_pb::CommitResponse;
 using sync_pb::GetUpdatesMessage;
 using sync_pb::SyncEnums;
 
 namespace syncer {
 
 using syncable::WriteTransaction;
 
 static char kValidAuthToken[] = "AuthToken";
 
+static char kCacheGuid[] = "tuiWdG8hV+8y4RT9N5Aikg==";
+
 MockConnectionManager::MockConnectionManager(syncable::Directory* directory)
     : ServerConnectionManager("unused", 0, false),
       server_reachable_(true),
       conflict_all_commits_(false),
       conflict_n_commits_(0),
       next_new_id_(10000),
       store_birthday_("Store BDay!"),
       store_birthday_sent_(false),
       client_stuck_(false),
       commit_time_rename_prepended_string_(""),
       countdown_to_postbuffer_fail_(0),
       directory_(directory),
       mid_commit_observer_(NULL),
       throttling_(false),
       fail_with_auth_invalid_(false),
       fail_non_periodic_get_updates_(false),
       gu_client_command_(NULL),
       commit_client_command_(NULL),
       next_position_in_parent_(2),
       use_legacy_bookmarks_protocol_(false),
-      num_get_updates_requests_(0) {
+      num_get_updates_requests_(0),
+      originator_item_id_(-100000) {
   SetNewTimestamp(0);
   set_auth_token(kValidAuthToken);
 }
 
 MockConnectionManager::~MockConnectionManager() {
   EXPECT_TRUE(update_queue_.empty()) << "Unfetched updates.";
 }
 
 void MockConnectionManager::SetCommitTimeRename(string prepend) {
   commit_time_rename_prepended_string_ = prepend;
@@ skipping 171 matching lines @@
   sync_pb::SyncEntity* ent = AddUpdateMeta(
       TestIdFactory::FromNumber(id).GetServerId(),
       TestIdFactory::FromNumber(parent_id).GetServerId(),
       name, version, sync_ts);
   ent->set_position_in_parent(position);
   ent->mutable_specifics()->CopyFrom(specifics);
   ent->set_folder(is_dir);
   return ent;
 }
 
+sync_pb::SyncEntity* MockConnectionManager::AddBookmarkUpdateSpecifics(
+    int id, int parent_id, string name, int64 version, int64 sync_ts,
+    bool is_dir, int64 position, const sync_pb::EntitySpecifics& specifics) {
+  sync_pb::SyncEntity* ent = AddUpdateSpecifics(
+      id, parent_id, name, version, sync_ts, is_dir, position, specifics);
+  ent->set_originator_cache_guid(kCacheGuid);
+  // Not entirely right, but it sure looks like a client ID.
+  syncable::Id client_id =
+      syncable::Id::CreateFromClientString(base::IntToString(id * -1));
+  ent->set_originator_client_item_id(client_id.value());
+  return ent;
+}
+
+sync_pb::SyncEntity* MockConnectionManager::AddBookmarkUpdateSpecifics(
+    int id, int parent_id, string name, int64 version, int64 sync_ts,
+    bool is_dir, const syncer::UniquePosition& position,
+    const sync_pb::EntitySpecifics& specifics) {
+  sync_pb::SyncEntity* ent = AddUpdateMeta(
+      TestIdFactory::FromNumber(id).GetServerId(),
+      TestIdFactory::FromNumber(parent_id).GetServerId(),
+      name, version, sync_ts);
+  ent->set_position_in_parent(position.ToInt64());
+  ent->set_unique_position(position.ToInternalValue());
+  ent->mutable_specifics()->CopyFrom(specifics);
+  ent->set_folder(is_dir);
+
+  ent->set_originator_cache_guid(kCacheGuid);
+  // Not entirely right, but it sure looks like a client ID.
+  syncable::Id client_id =
+      syncable::Id::CreateFromClientString(
+          base::Int64ToString(id * -1));
+  ent->set_originator_client_item_id(client_id.value());
+
+  return ent;
+}
+
 sync_pb::SyncEntity* MockConnectionManager::SetNigori(
     int id, int64 version,int64 sync_ts,
     const sync_pb::EntitySpecifics& specifics) {
   sync_pb::SyncEntity* ent = GetUpdateResponse()->add_entries();
   ent->set_id_string(TestIdFactory::FromNumber(id).GetServerId());
   ent->set_parent_id_string(TestIdFactory::FromNumber(0).GetServerId());
   ent->set_server_defined_unique_tag(ModelTypeToRootTag(NIGORI));
   ent->set_name("Nigori");
   ent->set_non_unique_name("Nigori");
   ent->set_version(version);
   ent->set_sync_timestamp(sync_ts);
   ent->set_mtime(sync_ts);
   ent->set_ctime(1);
   ent->set_position_in_parent(0);
   ent->set_folder(false);
   ent->mutable_specifics()->CopyFrom(specifics);
   return ent;
 }
 
 sync_pb::SyncEntity* MockConnectionManager::AddUpdateFull(
     string id, string parent_id,
     string name, int64 version,
     int64 sync_ts, bool is_dir) {
   sync_pb::SyncEntity* ent =
       AddUpdateMeta(id, parent_id, name, version, sync_ts);
   AddDefaultBookmarkData(ent, is_dir);
+  SetUpdateOriginatorFields(ent);
   return ent;
 }
 
 sync_pb::SyncEntity* MockConnectionManager::AddUpdateMeta(
     string id, string parent_id,
     string name, int64 version,
     int64 sync_ts) {
   sync_pb::SyncEntity* ent = GetUpdateResponse()->add_entries();
   ent->set_id_string(id);
   ent->set_parent_id_string(parent_id);
@@ skipping 37 matching lines @@
     sync_pb::SyncEntity* ent = GetUpdateResponse()->add_entries();
     ent->CopyFrom(last_sent_commit().entries(0));
     ent->clear_insert_after_item_id();
     ent->clear_old_parent_id();
     ent->set_position_in_parent(
         last_commit_response().entryresponse(0).position_in_parent());
     ent->set_version(
         last_commit_response().entryresponse(0).version());
     ent->set_id_string(
         last_commit_response().entryresponse(0).id_string());
+    SetUpdateOriginatorFields(ent);
+
     // Tests don't currently care about the following:
-    // originator_cache_guid, originator_client_item_id, parent_id_string,
-    // name, non_unique_name.
+    // parent_id_string, name, non_unique_name.
   }
   return GetMutableLastUpdate();
 }
 
 void MockConnectionManager::AddUpdateTombstone(const syncable::Id& id) {
   // Tombstones have only the ID set and dummy values for the required fields.
   sync_pb::SyncEntity* ent = GetUpdateResponse()->add_entries();
   ent->set_id_string(id.GetServerId());
   ent->set_version(0);
   ent->set_name("");
@@ skipping 268 matching lines @@
 }
 
 void MockConnectionManager::UpdateConnectionStatus() {
   if (!server_reachable_) {
     server_status_ = HttpResponse::CONNECTION_UNAVAILABLE;
   } else {
     server_status_ = HttpResponse::SERVER_CONNECTION_OK;
   }
 }
 
+void MockConnectionManager::SetUpdateOriginatorFields(
+    sync_pb::SyncEntity* entity) {
+  if (GetModelType(*entity) == BOOKMARKS) {
+    entity->set_originator_cache_guid(kCacheGuid);
+    syncable::Id client_id =
+        syncable::Id::CreateFromClientString(
+            base::Int64ToString(originator_item_id_--));
+    entity->set_originator_client_item_id(client_id.value());
+  }
+}
+
+
 }  // namespace syncer