Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / sync / engine / get_updates_processor_unittest.cc

diff --git a/src/sync/engine/get_updates_processor_unittest.cc b/src/sync/engine/get_updates_processor_unittest.cc
index 7c87fed..c146c56 100644 (file)
--- a/src/sync/engine/get_updates_processor_unittest.cc
+++ b/src/sync/engine/get_updates_processor_unittest.cc
@@ -15,11 +15,22 @@
 #include "sync/sessions/status_controller.h"
 #include "sync/test/engine/fake_model_worker.h"
 #include "sync/test/engine/mock_update_handler.h"
+#include "sync/test/mock_invalidation.h"
 #include "sync/test/sessions/mock_debug_info_getter.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace syncer {
 
+namespace {
+
+scoped_ptr<InvalidationInterface> BuildInvalidation(
+    int64 version,
+    const std::string& payload) {
+  return MockInvalidation::Build(version, payload);
+}
+
+}  // namespace
+
 using sessions::MockDebugInfoGetter;
 
 // A test fixture for tests exercising download updates functions.
@@ -133,11 +144,11 @@ TEST_F(GetUpdatesProcessorTest, BookmarkNudge) {
 TEST_F(GetUpdatesProcessorTest, NotifyMany) {
   sessions::NudgeTracker nudge_tracker;
   nudge_tracker.RecordRemoteInvalidation(
-      BuildInvalidationMap(AUTOFILL, 1, "autofill_payload"));
+      AUTOFILL, BuildInvalidation(1, "autofill_payload"));
   nudge_tracker.RecordRemoteInvalidation(
-      BuildInvalidationMap(BOOKMARKS, 1, "bookmark_payload"));
+      BOOKMARKS, BuildInvalidation(1, "bookmark_payload"));
   nudge_tracker.RecordRemoteInvalidation(
-      BuildInvalidationMap(PREFERENCES, 1, "preferences_payload"));
+      PREFERENCES, BuildInvalidation(1, "preferences_payload"));
   ModelTypeSet notified_types;
   notified_types.Put(AUTOFILL);
   notified_types.Put(BOOKMARKS);
@@ -175,6 +186,44 @@ TEST_F(GetUpdatesProcessorTest, NotifyMany) {
   }
 }
 
+// Basic test to ensure initial sync requests are expressed in the request.
+TEST_F(GetUpdatesProcessorTest, InitialSyncRequest) {
+  sessions::NudgeTracker nudge_tracker;
+  nudge_tracker.RecordInitialSyncRequired(AUTOFILL);
+  nudge_tracker.RecordInitialSyncRequired(PREFERENCES);
+
+  ModelTypeSet initial_sync_types = ModelTypeSet(AUTOFILL, PREFERENCES);
+
+  sync_pb::ClientToServerMessage message;
+  NormalGetUpdatesDelegate normal_delegate(nudge_tracker);
+  scoped_ptr<GetUpdatesProcessor> processor(
+      BuildGetUpdatesProcessor(normal_delegate));
+  processor->PrepareGetUpdates(enabled_types(), &message);
+
+  const sync_pb::GetUpdatesMessage& gu_msg = message.get_updates();
+  EXPECT_EQ(sync_pb::GetUpdatesCallerInfo::DATATYPE_REFRESH,
+            gu_msg.caller_info().source());
+  EXPECT_EQ(sync_pb::SyncEnums::GU_TRIGGER, gu_msg.get_updates_origin());
+  for (int i = 0; i < gu_msg.from_progress_marker_size(); ++i) {
+    syncer::ModelType type = GetModelTypeFromSpecificsFieldNumber(
+        gu_msg.from_progress_marker(i).data_type_id());
+
+    const sync_pb::DataTypeProgressMarker& progress_marker =
+        gu_msg.from_progress_marker(i);
+    const sync_pb::GetUpdateTriggers& gu_trigger =
+        progress_marker.get_update_triggers();
+
+    // We perform some basic tests of GU trigger and source fields here.  The
+    // more complicated scenarios are tested by the NudgeTracker tests.
+    if (initial_sync_types.Has(type)) {
+      EXPECT_TRUE(gu_trigger.initial_sync_in_progress());
+    } else {
+      EXPECT_TRUE(gu_trigger.has_initial_sync_in_progress());
+      EXPECT_FALSE(gu_trigger.initial_sync_in_progress());
+    }
+  }
+}
+
 TEST_F(GetUpdatesProcessorTest, ConfigureTest) {
   sync_pb::ClientToServerMessage message;
   ConfigureGetUpdatesDelegate configure_delegate(
@@ -339,7 +388,7 @@ class GetUpdatesProcessorApplyUpdatesTest : public GetUpdatesProcessorTest {
   GetUpdatesProcessorApplyUpdatesTest() {}
   virtual ~GetUpdatesProcessorApplyUpdatesTest() {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     bookmarks_handler_ = AddUpdateHandler(BOOKMARKS);
     autofill_handler_ = AddUpdateHandler(AUTOFILL);
   }