Allow sync integration tests to operate on multiple datatypes: Apps, Extensions, Themes

chrome/test/live_sync/two_client_apps_sync_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 "base/basictypes.h"
 #include "chrome/browser/sync/profile_sync_service_harness.h"
-#include "chrome/test/live_sync/live_apps_sync_test.h"
+#include "chrome/test/live_sync/apps_helper.h"
+#include "chrome/test/live_sync/live_sync_test.h"
 
-class TwoClientLiveAppsSyncTest : public LiveAppsSyncTest {
+using apps_helper::AllProfilesHaveSameAppsAsVerifier;
+using apps_helper::DisableApp;
+using apps_helper::EnableApp;
+using apps_helper::HasSameAppsAsVerifier;
+using apps_helper::IncognitoDisableApp;
+using apps_helper::IncognitoEnableApp;
+using apps_helper::InstallApp;
+using apps_helper::InstallAppsPendingForSync;
+using apps_helper::UninstallApp;
+
+class TwoClientAppsSyncTest : public LiveSyncTest {
  public:
-  TwoClientLiveAppsSyncTest()
-      : LiveAppsSyncTest(TWO_CLIENT) {}
+  TwoClientAppsSyncTest() : LiveSyncTest(TWO_CLIENT) {}
 
-  virtual ~TwoClientLiveAppsSyncTest() {}
+  virtual ~TwoClientAppsSyncTest() {}
 
  private:
-  DISALLOW_COPY_AND_ASSIGN(TwoClientLiveAppsSyncTest);
+  DISALLOW_COPY_AND_ASSIGN(TwoClientAppsSyncTest);
 };
 
-IN_PROC_BROWSER_TEST_F(TwoClientLiveAppsSyncTest,
-                       StartWithNoApps) {
+IN_PROC_BROWSER_TEST_F(TwoClientAppsSyncTest, StartWithNoApps) {
   ASSERT_TRUE(SetupSync());
 
   ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier());
 }
 
-IN_PROC_BROWSER_TEST_F(TwoClientLiveAppsSyncTest,
-                       StartWithSameApps) {
+IN_PROC_BROWSER_TEST_F(TwoClientAppsSyncTest, StartWithSameApps) {
   ASSERT_TRUE(SetupClients());
 
   const int kNumApps = 5;
   for (int i = 0; i < kNumApps; ++i) {
     InstallApp(GetProfile(0), i);
     InstallApp(GetProfile(1), i);
     InstallApp(verifier(), i);
   }
 
   ASSERT_TRUE(SetupSync());
 
   ASSERT_TRUE(AwaitQuiescence());
 
   ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier());
 }
 
-IN_PROC_BROWSER_TEST_F(TwoClientLiveAppsSyncTest,
-                       StartWithDifferentApps) {
+IN_PROC_BROWSER_TEST_F(TwoClientAppsSyncTest, StartWithDifferentApps) {
   ASSERT_TRUE(SetupClients());
 
   int i = 0;
 
   const int kNumCommonApps = 5;
   for (int j = 0; j < kNumCommonApps; ++i, ++j) {
     InstallApp(GetProfile(0), i);
     InstallApp(GetProfile(1), i);
     InstallApp(verifier(), i);
   }
@@ skipping 13 matching lines @@
   ASSERT_TRUE(SetupSync());
 
   ASSERT_TRUE(AwaitQuiescence());
 
   InstallAppsPendingForSync(GetProfile(0));
   InstallAppsPendingForSync(GetProfile(1));
 
   ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier());
 }
 
-IN_PROC_BROWSER_TEST_F(TwoClientLiveAppsSyncTest,
-                       InstallDifferentApps) {
+IN_PROC_BROWSER_TEST_F(TwoClientAppsSyncTest, InstallDifferentApps) {
   ASSERT_TRUE(SetupClients());
 
   int i = 0;
 
   const int kNumCommonApps = 5;
   for (int j = 0; j < kNumCommonApps; ++i, ++j) {
     InstallApp(GetProfile(0), i);
     InstallApp(GetProfile(1), i);
     InstallApp(verifier(), i);
   }
@@ skipping 16 matching lines @@
 
   ASSERT_TRUE(AwaitQuiescence());
 
   InstallAppsPendingForSync(GetProfile(0));
   InstallAppsPendingForSync(GetProfile(1));
 
   ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier());
 }
 
 // TCM ID - 3711279.
-IN_PROC_BROWSER_TEST_F(TwoClientLiveAppsSyncTest, Add) {
+IN_PROC_BROWSER_TEST_F(TwoClientAppsSyncTest, Add) {
   ASSERT_TRUE(SetupSync());
   ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier());
 
   InstallApp(GetProfile(0), 0);
   InstallApp(verifier(), 0);
   ASSERT_TRUE(AwaitQuiescence());
 
   InstallAppsPendingForSync(GetProfile(0));
   InstallAppsPendingForSync(GetProfile(1));
   ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier());
 }
 
 // TCM ID - 3706267.
-IN_PROC_BROWSER_TEST_F(TwoClientLiveAppsSyncTest, Uninstall) {
+IN_PROC_BROWSER_TEST_F(TwoClientAppsSyncTest, Uninstall) {
   ASSERT_TRUE(SetupSync());
   ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier());
 
   InstallApp(GetProfile(0), 0);
   InstallApp(verifier(), 0);
   ASSERT_TRUE(AwaitQuiescence());
 
   InstallAppsPendingForSync(GetProfile(0));
   InstallAppsPendingForSync(GetProfile(1));
   ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier());
 
   UninstallApp(GetProfile(0), 0);
   UninstallApp(verifier(), 0);
   ASSERT_TRUE(AwaitQuiescence());
   ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier());
 }
 
 // TCM ID - 3699295.
-IN_PROC_BROWSER_TEST_F(TwoClientLiveAppsSyncTest, Merge) {
+IN_PROC_BROWSER_TEST_F(TwoClientAppsSyncTest, Merge) {
   ASSERT_TRUE(SetupSync());
   ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier());
 
   InstallApp(GetProfile(0), 0);
   InstallApp(GetProfile(1), 0);
   ASSERT_TRUE(AwaitQuiescence());
 
   UninstallApp(GetProfile(0), 0);
   InstallApp(GetProfile(0), 1);
   InstallApp(verifier(), 1);
 
   InstallApp(GetProfile(0), 2);
   InstallApp(GetProfile(1), 2);
   InstallApp(verifier(), 2);
 
   InstallApp(GetProfile(1), 3);
   InstallApp(verifier(), 3);
 
   ASSERT_TRUE(AwaitQuiescence());
   InstallAppsPendingForSync(GetProfile(0));
   InstallAppsPendingForSync(GetProfile(1));
   ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier());
 }
 
 // TCM ID - 7723126.
-IN_PROC_BROWSER_TEST_F(TwoClientLiveAppsSyncTest, UpdateEnableDisableApp) {
+IN_PROC_BROWSER_TEST_F(TwoClientAppsSyncTest, UpdateEnableDisableApp) {
   ASSERT_TRUE(SetupSync());
   ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier());
 
   InstallApp(GetProfile(0), 0);
   InstallApp(GetProfile(1), 0);
   InstallApp(verifier(), 0);
   ASSERT_TRUE(AwaitQuiescence());
   ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier());
 
   DisableApp(GetProfile(0), 0);
   DisableApp(verifier(), 0);
   ASSERT_TRUE(HasSameAppsAsVerifier(0));
   ASSERT_FALSE(HasSameAppsAsVerifier(1));
 
   ASSERT_TRUE(AwaitQuiescence());
   ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier());
 
   EnableApp(GetProfile(1), 0);
   EnableApp(verifier(), 0);
   ASSERT_TRUE(HasSameAppsAsVerifier(1));
   ASSERT_FALSE(HasSameAppsAsVerifier(0));
 
   ASSERT_TRUE(AwaitQuiescence());
   ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier());
 }
 
 // TCM ID - 7706637.
-IN_PROC_BROWSER_TEST_F(TwoClientLiveAppsSyncTest,
-                       UpdateIncognitoEnableDisable) {
+IN_PROC_BROWSER_TEST_F(TwoClientAppsSyncTest, UpdateIncognitoEnableDisable) {
   ASSERT_TRUE(SetupSync());
   ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier());
 
   InstallApp(GetProfile(0), 0);
   InstallApp(GetProfile(1), 0);
   InstallApp(verifier(), 0);
   ASSERT_TRUE(AwaitQuiescence());
   ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier());
 
   IncognitoEnableApp(GetProfile(0), 0);
   IncognitoEnableApp(verifier(), 0);
   ASSERT_TRUE(HasSameAppsAsVerifier(0));
   ASSERT_FALSE(HasSameAppsAsVerifier(1));
 
   ASSERT_TRUE(AwaitQuiescence());
   ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier());
 
   IncognitoDisableApp(GetProfile(1), 0);
   IncognitoDisableApp(verifier(), 0);
   ASSERT_TRUE(HasSameAppsAsVerifier(1));
   ASSERT_FALSE(HasSameAppsAsVerifier(0));
 
   ASSERT_TRUE(AwaitQuiescence());
   ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier());
 }
 
 // TCM ID - 3718276.
-IN_PROC_BROWSER_TEST_F(TwoClientLiveAppsSyncTest, DisableApps) {
+IN_PROC_BROWSER_TEST_F(TwoClientAppsSyncTest, DisableApps) {
   ASSERT_TRUE(SetupSync());
   ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier());
 
   ASSERT_TRUE(GetClient(1)->DisableSyncForDatatype(syncable::APPS));
   InstallApp(GetProfile(0), 0);
   InstallApp(verifier(), 0);
   ASSERT_TRUE(AwaitQuiescence());
   ASSERT_TRUE(HasSameAppsAsVerifier(0));
   ASSERT_FALSE(HasSameAppsAsVerifier(1));
 
   ASSERT_TRUE(GetClient(1)->EnableSyncForDatatype(syncable::APPS));
   ASSERT_TRUE(AwaitQuiescence());
 
   InstallAppsPendingForSync(GetProfile(0));
   InstallAppsPendingForSync(GetProfile(1));
   ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier());
 }
 
 // TCM ID - 3720303.
-IN_PROC_BROWSER_TEST_F(TwoClientLiveAppsSyncTest, DisableSync) {
+IN_PROC_BROWSER_TEST_F(TwoClientAppsSyncTest, DisableSync) {
   ASSERT_TRUE(SetupSync());
   ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier());
 
   ASSERT_TRUE(GetClient(1)->DisableSyncForAllDatatypes());
   InstallApp(GetProfile(0), 0);
   InstallApp(verifier(), 0);
   ASSERT_TRUE(GetClient(0)->AwaitSyncCycleCompletion("Installed an app."));
   ASSERT_TRUE(HasSameAppsAsVerifier(0));
   ASSERT_FALSE(HasSameAppsAsVerifier(1));
 
   ASSERT_TRUE(GetClient(1)->EnableSyncForAllDatatypes());
   ASSERT_TRUE(AwaitQuiescence());
 
   InstallAppsPendingForSync(GetProfile(0));
   InstallAppsPendingForSync(GetProfile(1));
   ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier());
 }
 
 // TODO(akalin): Add tests exercising:
 //   - Offline installation/uninstallation behavior
 //   - App-specific properties