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

chrome/test/live_sync/two_client_extensions_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_extensions_sync_test.h"
+#include "chrome/test/live_sync/extensions_helper.h"
+#include "chrome/test/live_sync/live_sync_test.h"
 
-IN_PROC_BROWSER_TEST_F(TwoClientLiveExtensionsSyncTest,
-                       StartWithNoExtensions) {
+using extensions_helper::AllProfilesHaveSameExtensionsAsVerifier;
+using extensions_helper::DisableExtension;
+using extensions_helper::EnableExtension;
+using extensions_helper::HasSameExtensionsAsVerifier;
+using extensions_helper::IncognitoDisableExtension;
+using extensions_helper::IncognitoEnableExtension;
+using extensions_helper::InstallExtension;
+using extensions_helper::InstallExtensionsPendingForSync;
+using extensions_helper::UninstallExtension;
+
+class TwoClientExtensionsSyncTest : public LiveSyncTest {
+ public:
+  TwoClientExtensionsSyncTest() : LiveSyncTest(TWO_CLIENT) {}
+
+  virtual ~TwoClientExtensionsSyncTest() {}
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(TwoClientExtensionsSyncTest);
+};
+
+IN_PROC_BROWSER_TEST_F(TwoClientExtensionsSyncTest, StartWithNoExtensions) {
   ASSERT_TRUE(SetupSync());
 
   ASSERT_TRUE(AllProfilesHaveSameExtensionsAsVerifier());
 }
 
-IN_PROC_BROWSER_TEST_F(TwoClientLiveExtensionsSyncTest,
-                       StartWithSameExtensions) {
+IN_PROC_BROWSER_TEST_F(TwoClientExtensionsSyncTest, StartWithSameExtensions) {
   ASSERT_TRUE(SetupClients());
 
   const int kNumExtensions = 5;
   for (int i = 0; i < kNumExtensions; ++i) {
     InstallExtension(GetProfile(0), i);
     InstallExtension(GetProfile(1), i);
     InstallExtension(verifier(), i);
   }
 
   ASSERT_TRUE(SetupSync());
 
   ASSERT_TRUE(AwaitQuiescence());
 
   ASSERT_TRUE(AllProfilesHaveSameExtensionsAsVerifier());
 }
 
-IN_PROC_BROWSER_TEST_F(TwoClientLiveExtensionsSyncTest,
+IN_PROC_BROWSER_TEST_F(TwoClientExtensionsSyncTest,
                        StartWithDifferentExtensions) {
   ASSERT_TRUE(SetupClients());
 
   int i = 0;
 
   const int kNumCommonExtensions = 5;
   for (int j = 0; j < kNumCommonExtensions; ++i, ++j) {
     InstallExtension(GetProfile(0), i);
     InstallExtension(GetProfile(1), i);
     InstallExtension(verifier(), i);
@@ skipping 14 matching lines @@
   ASSERT_TRUE(SetupSync());
 
   ASSERT_TRUE(AwaitQuiescence());
 
   InstallExtensionsPendingForSync(GetProfile(0));
   InstallExtensionsPendingForSync(GetProfile(1));
 
   ASSERT_TRUE(AllProfilesHaveSameExtensionsAsVerifier());
 }
 
-IN_PROC_BROWSER_TEST_F(TwoClientLiveExtensionsSyncTest,
+IN_PROC_BROWSER_TEST_F(TwoClientExtensionsSyncTest,
                        InstallDifferentExtensions) {
   ASSERT_TRUE(SetupClients());
 
   int i = 0;
 
   const int kNumCommonExtensions = 5;
   for (int j = 0; j < kNumCommonExtensions; ++i, ++j) {
     InstallExtension(GetProfile(0), i);
     InstallExtension(GetProfile(1), i);
     InstallExtension(verifier(), i);
@@ skipping 17 matching lines @@
 
   ASSERT_TRUE(AwaitQuiescence());
 
   InstallExtensionsPendingForSync(GetProfile(0));
   InstallExtensionsPendingForSync(GetProfile(1));
 
   ASSERT_TRUE(AllProfilesHaveSameExtensionsAsVerifier());
 }
 
 // TCM ID - 3637311.
-IN_PROC_BROWSER_TEST_F(TwoClientLiveExtensionsSyncTest, Add) {
+IN_PROC_BROWSER_TEST_F(TwoClientExtensionsSyncTest, Add) {
   ASSERT_TRUE(SetupSync());
   ASSERT_TRUE(AllProfilesHaveSameExtensionsAsVerifier());
 
   InstallExtension(GetProfile(0), 0);
   InstallExtension(verifier(), 0);
   ASSERT_TRUE(AwaitQuiescence());
 
   InstallExtensionsPendingForSync(GetProfile(0));
   InstallExtensionsPendingForSync(GetProfile(1));
   ASSERT_TRUE(AllProfilesHaveSameExtensionsAsVerifier());
 }
 
 // TCM ID - 3724281.
-IN_PROC_BROWSER_TEST_F(TwoClientLiveExtensionsSyncTest, Uninstall) {
+IN_PROC_BROWSER_TEST_F(TwoClientExtensionsSyncTest, Uninstall) {
   ASSERT_TRUE(SetupSync());
   ASSERT_TRUE(AllProfilesHaveSameExtensionsAsVerifier());
 
   InstallExtension(GetProfile(0), 0);
   InstallExtension(verifier(), 0);
   ASSERT_TRUE(AwaitQuiescence());
 
   InstallExtensionsPendingForSync(GetProfile(0));
   InstallExtensionsPendingForSync(GetProfile(1));
   ASSERT_TRUE(AllProfilesHaveSameExtensionsAsVerifier());
 
   UninstallExtension(GetProfile(0), 0);
   UninstallExtension(verifier(), 0);
   ASSERT_TRUE(AwaitQuiescence());
   ASSERT_TRUE(AllProfilesHaveSameExtensionsAsVerifier());
 }
 
 // TCM ID - 3635304.
-IN_PROC_BROWSER_TEST_F(TwoClientLiveExtensionsSyncTest, Merge) {
+IN_PROC_BROWSER_TEST_F(TwoClientExtensionsSyncTest, Merge) {
   ASSERT_TRUE(SetupSync());
   ASSERT_TRUE(AllProfilesHaveSameExtensionsAsVerifier());
 
   InstallExtension(GetProfile(0), 0);
   InstallExtension(GetProfile(1), 0);
   ASSERT_TRUE(AwaitQuiescence());
 
   UninstallExtension(GetProfile(0), 0);
   InstallExtension(GetProfile(0), 1);
   InstallExtension(verifier(), 1);
 
   InstallExtension(GetProfile(0), 2);
   InstallExtension(GetProfile(1), 2);
   InstallExtension(verifier(), 2);
 
   InstallExtension(GetProfile(1), 3);
   InstallExtension(verifier(), 3);
 
   ASSERT_TRUE(AwaitQuiescence());
   InstallExtensionsPendingForSync(GetProfile(0));
   InstallExtensionsPendingForSync(GetProfile(1));
   ASSERT_TRUE(AllProfilesHaveSameExtensionsAsVerifier());
 }
 
 // TCM ID - 3605300.
-IN_PROC_BROWSER_TEST_F(TwoClientLiveExtensionsSyncTest,
+IN_PROC_BROWSER_TEST_F(TwoClientExtensionsSyncTest,
                        UpdateEnableDisableExtension) {
   ASSERT_TRUE(SetupSync());
   ASSERT_TRUE(AllProfilesHaveSameExtensionsAsVerifier());
 
   InstallExtension(GetProfile(0), 0);
   InstallExtension(GetProfile(1), 0);
   InstallExtension(verifier(), 0);
   ASSERT_TRUE(AwaitQuiescence());
   ASSERT_TRUE(AllProfilesHaveSameExtensionsAsVerifier());
 
   DisableExtension(GetProfile(0), 0);
   DisableExtension(verifier(), 0);
   ASSERT_TRUE(HasSameExtensionsAsVerifier(0));
   ASSERT_FALSE(HasSameExtensionsAsVerifier(1));
 
   ASSERT_TRUE(AwaitQuiescence());
   ASSERT_TRUE(AllProfilesHaveSameExtensionsAsVerifier());
 
   EnableExtension(GetProfile(1), 0);
   EnableExtension(verifier(), 0);
   ASSERT_TRUE(HasSameExtensionsAsVerifier(1));
   ASSERT_FALSE(HasSameExtensionsAsVerifier(0));
 
   ASSERT_TRUE(AwaitQuiescence());
   ASSERT_TRUE(AllProfilesHaveSameExtensionsAsVerifier());
 }
 
 // TCM ID - 3728322.
-IN_PROC_BROWSER_TEST_F(TwoClientLiveExtensionsSyncTest,
+IN_PROC_BROWSER_TEST_F(TwoClientExtensionsSyncTest,
                        UpdateIncognitoEnableDisable) {
   ASSERT_TRUE(SetupSync());
   ASSERT_TRUE(AllProfilesHaveSameExtensionsAsVerifier());
 
   InstallExtension(GetProfile(0), 0);
   InstallExtension(GetProfile(1), 0);
   InstallExtension(verifier(), 0);
   ASSERT_TRUE(AwaitQuiescence());
   ASSERT_TRUE(AllProfilesHaveSameExtensionsAsVerifier());
 
   IncognitoEnableExtension(GetProfile(0), 0);
   IncognitoEnableExtension(verifier(), 0);
   ASSERT_TRUE(HasSameExtensionsAsVerifier(0));
   ASSERT_FALSE(HasSameExtensionsAsVerifier(1));
 
   ASSERT_TRUE(AwaitQuiescence());
   ASSERT_TRUE(AllProfilesHaveSameExtensionsAsVerifier());
 
   IncognitoDisableExtension(GetProfile(1), 0);
   IncognitoDisableExtension(verifier(), 0);
   ASSERT_TRUE(HasSameExtensionsAsVerifier(1));
   ASSERT_FALSE(HasSameExtensionsAsVerifier(0));
 
   ASSERT_TRUE(AwaitQuiescence());
   ASSERT_TRUE(AllProfilesHaveSameExtensionsAsVerifier());
 }
 
 // TCM ID - 3732278.
-IN_PROC_BROWSER_TEST_F(TwoClientLiveExtensionsSyncTest, DisableExtensions) {
+IN_PROC_BROWSER_TEST_F(TwoClientExtensionsSyncTest, DisableExtensions) {
   ASSERT_TRUE(SetupSync());
   ASSERT_TRUE(AllProfilesHaveSameExtensionsAsVerifier());
 
   ASSERT_TRUE(GetClient(1)->DisableSyncForDatatype(syncable::EXTENSIONS));
   InstallExtension(GetProfile(0), 1);
   InstallExtension(verifier(), 1);
   ASSERT_TRUE(AwaitQuiescence());
   ASSERT_FALSE(AllProfilesHaveSameExtensionsAsVerifier());
 
   ASSERT_TRUE(GetClient(1)->EnableSyncForDatatype(syncable::EXTENSIONS));
   ASSERT_TRUE(AwaitQuiescence());
   InstallExtensionsPendingForSync(GetProfile(0));
   InstallExtensionsPendingForSync(GetProfile(1));
   InstallExtensionsPendingForSync(verifier());
   ASSERT_TRUE(AllProfilesHaveSameExtensionsAsVerifier());
 }
 
 // TCM ID - 3606290.
-IN_PROC_BROWSER_TEST_F(TwoClientLiveExtensionsSyncTest, DisableSync) {
+IN_PROC_BROWSER_TEST_F(TwoClientExtensionsSyncTest, DisableSync) {
   ASSERT_TRUE(SetupSync());
   ASSERT_TRUE(AllProfilesHaveSameExtensionsAsVerifier());
 
   ASSERT_TRUE(GetClient(1)->DisableSyncForAllDatatypes());
   InstallExtension(GetProfile(0), 0);
   InstallExtension(verifier(), 0);
   ASSERT_TRUE(
       GetClient(0)->AwaitSyncCycleCompletion("Installed an extension."));
   ASSERT_TRUE(HasSameExtensionsAsVerifier(0));
   ASSERT_FALSE(HasSameExtensionsAsVerifier(1));
 
   ASSERT_TRUE(GetClient(1)->EnableSyncForAllDatatypes());
   ASSERT_TRUE(AwaitQuiescence());
   InstallExtensionsPendingForSync(GetProfile(0));
   InstallExtensionsPendingForSync(GetProfile(1));
   InstallExtensionsPendingForSync(verifier());
   ASSERT_TRUE(AllProfilesHaveSameExtensionsAsVerifier());
 }
 
 // TODO(akalin): Add tests exercising:
 //   - Offline installation/uninstallation behavior