[Sync] Add tests for migration triggered by notifications

chrome/test/live_sync/migration_errors_test.cc

 // 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.
 
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/profile_sync_service_harness.h"
 #include "chrome/browser/translate/translate_prefs.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "chrome/test/live_sync/live_sync_test.h"
 #include "chrome/test/live_sync/bookmarks_helper.h"

[Raghu Simha, 2011/08/26 01:30:21]

While you're editing this file, could I ask you to switch the 2 lines above? :)

[akalin, 2011/08/26 23:42:09]

Done.

 #include "chrome/test/live_sync/preferences_helper.h"
 
 using bookmarks_helper::AddURL;
 using bookmarks_helper::IndexedURL;
 using bookmarks_helper::IndexedURLTitle;
 
 using preferences_helper::BooleanPrefMatches;
 using preferences_helper::ChangeBooleanPref;
 
 // Tests to make sure that the migration cycle works properly,
 // i.e. doesn't stall.
 
 class MigrationCycleTest : public LiveSyncTest {
  public:
   MigrationCycleTest() : LiveSyncTest(SINGLE_CLIENT) {}
   virtual ~MigrationCycleTest() {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MigrationCycleTest);
 };
 
 IN_PROC_BROWSER_TEST_F(MigrationCycleTest, PrefsOnly) {
-  if (!ServerSupportsErrorTriggering()) {
+  if (!ServerSupportsNotificationControl() ||
+      !ServerSupportsErrorTriggering()) {
     LOG(WARNING) << "Test skipped in this server environment.";
     return;
   }
 
+  ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
+
   DisableNotifications();
 
-  ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
-
   // Phase 1: Trigger a preference migration on the server.
   syncable::ModelTypeSet migrate_types;
   migrate_types.insert(syncable::PREFERENCES);
   TriggerMigrationDoneError(migrate_types);
 
   // Phase 2: Modify a pref (to trigger migration) and wait for a sync
   // cycle.
   // TODO(akalin): Shouldn't need to wait for full sync cycle; see
   // 93167.
   ASSERT_TRUE(BooleanPrefMatches(prefs::kShowHomeButton));
   ChangeBooleanPref(0, prefs::kShowHomeButton);
   ASSERT_TRUE(GetClient(0)->AwaitSyncCycleCompletion("Migration"));
 }
 
 // TODO(akalin): Fails due to http://crbug.com/92928.
+IN_PROC_BROWSER_TEST_F(MigrationCycleTest,
+                       FAILS_PrefsOnlyTriggerNotification) {
+  if (!ServerSupportsNotificationControl() ||
+      !ServerSupportsErrorTriggering()) {
+    LOG(WARNING) << "Test skipped in this server environment.";
+    return;
+  }
+
+  ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
+
+  // Phase 1: Trigger a preference migration on the server.
+  syncable::ModelTypeSet migrate_types;
+  migrate_types.insert(syncable::PREFERENCES);
+  TriggerMigrationDoneError(migrate_types);
+
+  // Phase 2: Synthesize a notification (to trigger migration) and
+  // wait for a sync cycle.
+  // TODO(akalin): Shouldn't need to wait for full sync cycle; see
+  // 93167.
+  TriggerNotification(migrate_types);
+  ASSERT_TRUE(GetClient(0)->AwaitNextSyncCycleCompletion("Migration"));
+}
+
+// TODO(akalin): Fails due to http://crbug.com/92928.
 IN_PROC_BROWSER_TEST_F(MigrationCycleTest, FAILS_PrefsNigori) {
-  if (!ServerSupportsErrorTriggering()) {
+  if (!ServerSupportsNotificationControl() ||
+      !ServerSupportsErrorTriggering()) {
     LOG(WARNING) << "Test skipped in this server environment.";
     return;
   }
 
+  ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
+
   DisableNotifications();
 
-  ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
-
   // Phase 1: Trigger a preference and nigori migration on the server.
   {
     syncable::ModelTypeSet migrate_types;
     migrate_types.insert(syncable::PREFERENCES);
     TriggerMigrationDoneError(migrate_types);
   }
   {
     syncable::ModelTypeSet migrate_types;
     migrate_types.insert(syncable::NIGORI);
     TriggerMigrationDoneError(migrate_types);
   }
 
   // Phase 2: Modify a pref (to trigger migration) and wait for a sync
   // cycle.
   // TODO(akalin): Shouldn't need to wait for full sync cycle; see
   // 93167.
   ASSERT_TRUE(BooleanPrefMatches(prefs::kShowHomeButton));
   ChangeBooleanPref(0, prefs::kShowHomeButton);
   ASSERT_TRUE(GetClient(0)->AwaitSyncCycleCompletion("Migration"));
 }
 
 // TODO(akalin): Fails due to http://crbug.com/92928.
 IN_PROC_BROWSER_TEST_F(MigrationCycleTest, FAILS_BookmarksPrefs) {
-  if (!ServerSupportsErrorTriggering()) {
+  if (!ServerSupportsNotificationControl() ||
+      !ServerSupportsErrorTriggering()) {
     LOG(WARNING) << "Test skipped in this server environment.";
     return;
   }
 
+  ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
+
   DisableNotifications();
 
-  ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
-
   // Phase 1: Trigger a bookmark and preference migration on the
   // server.
   {
     syncable::ModelTypeSet migrate_types;
     migrate_types.insert(syncable::BOOKMARKS);
     TriggerMigrationDoneError(migrate_types);
   }
   {
     syncable::ModelTypeSet migrate_types;
     migrate_types.insert(syncable::PREFERENCES);
     TriggerMigrationDoneError(migrate_types);
   }
 
   // Phase 2: Modify a bookmark (to trigger migration) and wait for a
   // sync cycle.
   // TODO(akalin): Shouldn't need to wait for full sync cycle; see
   // 93167.
   ASSERT_TRUE(AddURL(0, IndexedURLTitle(0), GURL(IndexedURL(0))) != NULL);
   ASSERT_TRUE(GetClient(0)->AwaitSyncCycleCompletion("Migration"));
 }
 
-// TODO(akalin): Add tests where the migration trigger is a poll or a
-// nudge from notifications.
+// TODO(akalin): Add tests where the migration trigger is a poll.
 
 class MigrationErrorsTest : public LiveSyncTest {
  public:
   MigrationErrorsTest() : LiveSyncTest(TWO_CLIENT) {}
   virtual ~MigrationErrorsTest() {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MigrationErrorsTest);
 };
 
@@ skipping 195 matching lines @@
   ASSERT_TRUE(BooleanPrefMatches(prefs::kShowHomeButton));
   ChangeBooleanPref(0, prefs::kShowHomeButton);
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
   ASSERT_TRUE(BooleanPrefMatches(prefs::kShowHomeButton));
 
   // Phase 5: Verify that sessions are registered and enabled.
   ASSERT_TRUE(GetClient(0)->IsTypeRegistered(syncable::SESSIONS));
   ASSERT_TRUE(GetClient(0)->IsTypePreferred(syncable::SESSIONS));
 }
 
 IN_PROC_BROWSER_TEST_F(MigrationReconfigureTest, SetSyncTabsAndMigrate) {

[Nicolas Zea, 2011/08/26 21:42:56]

Looks like this needs to be FAILS as well? (Although as I mentioned in the other
code review, if these are timing out after a minute, I'd prefer disabled)

[akalin, 2011/08/26 23:42:09]

Done.

   if (!ServerSupportsErrorTriggering()) {
     LOG(WARNING) << "Test skipped in this server environment.";
     return;
   }
 
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
   ASSERT_FALSE(GetClient(0)->IsTypeRegistered(syncable::SESSIONS));
   ASSERT_FALSE(GetClient(0)->IsTypePreferred(syncable::SESSIONS));
 
   // Phase 1: Before migrating anything, create & sync a preference.
@@ skipping 17 matching lines @@
   // Phase 5: Verify that preferences can still be synchronized.
   ASSERT_TRUE(BooleanPrefMatches(prefs::kShowHomeButton));
   ChangeBooleanPref(0, prefs::kShowHomeButton);
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
   ASSERT_TRUE(BooleanPrefMatches(prefs::kShowHomeButton));
 
   // Phase 6: Verify that sessions are registered and enabled.
   ASSERT_TRUE(GetClient(0)->IsTypeRegistered(syncable::SESSIONS));
   ASSERT_TRUE(GetClient(0)->IsTypePreferred(syncable::SESSIONS));
 }