Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(980)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/test/live_sync/two_client_live_themes_sync_test.cc

Issue 7599019: Allow sync integration tests to operate on multiple datatypes: Apps, Extensions, Themes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: CR feedback Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« chrome/test/live_sync/sync_extension_helper.cc ('K') | « chrome/test/live_sync/two_client_live_extensions_sync_test.cc ('k') | chrome/test/live_sync/two_client_themes_sync_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/live_sync/two_client_live_themes_sync_test.cc
diff --git a/chrome/test/live_sync/two_client_live_themes_sync_test.cc b/chrome/test/live_sync/two_client_live_themes_sync_test.cc
deleted file mode 100644
index 509de4eab5461fd0ab596e953ad5aeef66c74b97..0000000000000000000000000000000000000000
--- a/chrome/test/live_sync/two_client_live_themes_sync_test.cc
+++ /dev/null
@@ -1,233 +0,0 @@
-// 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_themes_sync_test.h"
-
-class TwoClientLiveThemesSyncTest : public LiveThemesSyncTest {
- public:
- TwoClientLiveThemesSyncTest() : LiveThemesSyncTest(TWO_CLIENT) {}
- virtual ~TwoClientLiveThemesSyncTest() {}
-
- private:
- DISALLOW_COPY_AND_ASSIGN(TwoClientLiveThemesSyncTest);
-};
-
-// TODO(akalin): Add tests for model association (i.e., tests that
-// start with SetupClients(), change the theme state, then call
-// SetupSync()).
-
-// TCM ID - 3667311.
-IN_PROC_BROWSER_TEST_F(TwoClientLiveThemesSyncTest, CustomTheme) {
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
-
- ASSERT_FALSE(UsingCustomTheme(GetProfile(0)));
- ASSERT_FALSE(UsingCustomTheme(GetProfile(1)));
- ASSERT_FALSE(UsingCustomTheme(verifier()));
-
- UseCustomTheme(GetProfile(0), 0);
- UseCustomTheme(verifier(), 0);
- ASSERT_EQ(GetCustomTheme(0), GetThemeID(GetProfile(0)));
- ASSERT_EQ(GetCustomTheme(0), GetThemeID(verifier()));
-
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
-
- ASSERT_EQ(GetCustomTheme(0), GetThemeID(GetProfile(0)));
- ASSERT_FALSE(UsingCustomTheme(GetProfile(1)));
- // TODO(akalin): Add functions to simulate when a pending extension
- // is installed as well as when a pending extension fails to
- // install.
- ASSERT_TRUE(ThemeIsPendingInstall(GetProfile(1), GetCustomTheme(0)));
- ASSERT_EQ(GetCustomTheme(0), GetThemeID(verifier()));
-}
-
-// TCM ID - 3599303.
-// TODO(sync): Fails on Chrome OS. See http://crbug.com/84575.
-#if defined(OS_CHROMEOS)
-IN_PROC_BROWSER_TEST_F(TwoClientLiveThemesSyncTest, FAILS_NativeTheme) {
-#else
-IN_PROC_BROWSER_TEST_F(TwoClientLiveThemesSyncTest, NativeTheme) {
-#endif // OS_CHROMEOS
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
-
- UseCustomTheme(GetProfile(0), 0);
- UseCustomTheme(GetProfile(1), 0);
- UseCustomTheme(verifier(), 0);
-
- ASSERT_TRUE(AwaitQuiescence());
-
- UseNativeTheme(GetProfile(0));
- UseNativeTheme(verifier());
- ASSERT_TRUE(UsingNativeTheme(GetProfile(0)));
- ASSERT_TRUE(UsingNativeTheme(verifier()));
-
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
-
- ASSERT_TRUE(UsingNativeTheme(GetProfile(0)));
- ASSERT_TRUE(UsingNativeTheme(GetProfile(1)));
- ASSERT_TRUE(UsingNativeTheme(verifier()));
-}
-
-// TCM ID - 7247455.
-IN_PROC_BROWSER_TEST_F(TwoClientLiveThemesSyncTest, DefaultTheme) {
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
-
- UseCustomTheme(GetProfile(0), 0);
- UseCustomTheme(GetProfile(1), 0);
- UseCustomTheme(verifier(), 0);
-
- ASSERT_TRUE(AwaitQuiescence());
-
- UseDefaultTheme(GetProfile(0));
- UseDefaultTheme(verifier());
- ASSERT_TRUE(UsingDefaultTheme(GetProfile(0)));
- ASSERT_TRUE(UsingDefaultTheme(verifier()));
-
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
-
- ASSERT_TRUE(UsingDefaultTheme(GetProfile(0)));
- ASSERT_TRUE(UsingDefaultTheme(GetProfile(1)));
- ASSERT_TRUE(UsingDefaultTheme(verifier()));
-}
-
-// TCM ID - 7292065.
-// TODO(sync): Fails on Chrome OS. See http://crbug.com/84575.
-#if defined(OS_CHROMEOS)
-IN_PROC_BROWSER_TEST_F(TwoClientLiveThemesSyncTest, FAILS_NativeDefaultRace) {
-#else
-IN_PROC_BROWSER_TEST_F(TwoClientLiveThemesSyncTest, NativeDefaultRace) {
-#endif // OS_CHROMEOS
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
-
- UseNativeTheme(GetProfile(0));
- UseDefaultTheme(GetProfile(1));
- ASSERT_TRUE(UsingNativeTheme(GetProfile(0)));
- ASSERT_TRUE(UsingDefaultTheme(GetProfile(1)));
-
- ASSERT_TRUE(AwaitQuiescence());
-
- // TODO(akalin): Add function that compares two profiles to see if
- // they're at the same state.
-
- ASSERT_EQ(UsingNativeTheme(GetProfile(0)),
- UsingNativeTheme(GetProfile(1)));
- ASSERT_EQ(UsingDefaultTheme(GetProfile(0)),
- UsingDefaultTheme(GetProfile(1)));
-}
-
-// TCM ID - 7294077.
-// TODO(sync): Fails on Chrome OS. See http://crbug.com/84575.
-#if defined(OS_CHROMEOS)
-IN_PROC_BROWSER_TEST_F(TwoClientLiveThemesSyncTest, FAILS_CustomNativeRace) {
-#else
-IN_PROC_BROWSER_TEST_F(TwoClientLiveThemesSyncTest, CustomNativeRace) {
-#endif // OS_CHROMEOS
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
-
- UseCustomTheme(GetProfile(0), 0);
- UseNativeTheme(GetProfile(1));
- ASSERT_EQ(GetCustomTheme(0), GetThemeID(GetProfile(0)));
- ASSERT_TRUE(UsingNativeTheme(GetProfile(1)));
-
- ASSERT_TRUE(AwaitQuiescence());
-
- // TODO(akalin): Add function to wait for pending extensions to be
- // installed.
-
- ASSERT_EQ(HasOrWillHaveCustomTheme(GetProfile(0), GetCustomTheme(0)),
- HasOrWillHaveCustomTheme(GetProfile(1), GetCustomTheme(0)));
-}
-
-// TCM ID - 7307225.
-IN_PROC_BROWSER_TEST_F(TwoClientLiveThemesSyncTest, CustomDefaultRace) {
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
-
- UseCustomTheme(GetProfile(0), 0);
- UseDefaultTheme(GetProfile(1));
- ASSERT_EQ(GetCustomTheme(0), GetThemeID(GetProfile(0)));
- ASSERT_TRUE(UsingDefaultTheme(GetProfile(1)));
-
- ASSERT_TRUE(AwaitQuiescence());
-
- ASSERT_EQ(HasOrWillHaveCustomTheme(GetProfile(0), GetCustomTheme(0)),
- HasOrWillHaveCustomTheme(GetProfile(1), GetCustomTheme(0)));
-}
-
-// TCM ID - 7264758.
-IN_PROC_BROWSER_TEST_F(TwoClientLiveThemesSyncTest, CustomCustomRace) {
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
-
- // TODO(akalin): Generalize this to n clients.
-
- UseCustomTheme(GetProfile(0), 0);
- UseCustomTheme(GetProfile(1), 1);
- ASSERT_EQ(GetCustomTheme(0), GetThemeID(GetProfile(0)));
- ASSERT_EQ(GetCustomTheme(1), GetThemeID(GetProfile(1)));
-
- ASSERT_TRUE(AwaitQuiescence());
-
- bool using_theme_0 =
- (GetThemeID(GetProfile(0)) == GetCustomTheme(0)) &&
- HasOrWillHaveCustomTheme(GetProfile(1), GetCustomTheme(0));
- bool using_theme_1 =
- HasOrWillHaveCustomTheme(GetProfile(0), GetCustomTheme(1)) &&
- (GetThemeID(GetProfile(1)) == GetCustomTheme(1));
-
- // Equivalent to using_theme_0 xor using_theme_1.
- ASSERT_NE(using_theme_0, using_theme_1);
-}
-
-// TCM ID - 3723272.
-IN_PROC_BROWSER_TEST_F(TwoClientLiveThemesSyncTest, DisableThemes) {
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
-
- ASSERT_FALSE(UsingCustomTheme(GetProfile(0)));
- ASSERT_FALSE(UsingCustomTheme(GetProfile(1)));
- ASSERT_FALSE(UsingCustomTheme(verifier()));
-
- ASSERT_TRUE(GetClient(1)->DisableSyncForDatatype(syncable::THEMES));
- UseCustomTheme(GetProfile(0), 0);
- UseCustomTheme(verifier(), 0);
- ASSERT_TRUE(AwaitQuiescence());
-
- ASSERT_EQ(GetCustomTheme(0), GetThemeID(GetProfile(0)));
- ASSERT_FALSE(UsingCustomTheme(GetProfile(1)));
- ASSERT_EQ(GetCustomTheme(0), GetThemeID(verifier()));
-
- ASSERT_TRUE(GetClient(1)->EnableSyncForDatatype(syncable::THEMES));
- ASSERT_TRUE(AwaitQuiescence());
-
- ASSERT_EQ(GetCustomTheme(0), GetThemeID(GetProfile(0)));
- ASSERT_FALSE(UsingCustomTheme(GetProfile(1)));
- ASSERT_TRUE(ThemeIsPendingInstall(GetProfile(1), GetCustomTheme(0)));
- ASSERT_EQ(GetCustomTheme(0), GetThemeID(verifier()));
-}
-
-// TCM ID - 3687288.
-IN_PROC_BROWSER_TEST_F(TwoClientLiveThemesSyncTest, DisableSync) {
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
-
- ASSERT_FALSE(UsingCustomTheme(GetProfile(0)));
- ASSERT_FALSE(UsingCustomTheme(GetProfile(1)));
- ASSERT_FALSE(UsingCustomTheme(verifier()));
-
- ASSERT_TRUE(GetClient(1)->DisableSyncForAllDatatypes());
- UseCustomTheme(GetProfile(0), 0);
- UseCustomTheme(verifier(), 0);
- ASSERT_TRUE(
- GetClient(0)->AwaitSyncCycleCompletion("Installed a custom theme."));
-
- ASSERT_EQ(GetCustomTheme(0), GetThemeID(GetProfile(0)));
- ASSERT_FALSE(UsingCustomTheme(GetProfile(1)));
- ASSERT_EQ(GetCustomTheme(0), GetThemeID(verifier()));
-
- ASSERT_TRUE(GetClient(1)->EnableSyncForAllDatatypes());
- ASSERT_TRUE(AwaitQuiescence());
-
- ASSERT_EQ(GetCustomTheme(0), GetThemeID(GetProfile(0)));
- ASSERT_EQ(GetCustomTheme(0), GetThemeID(verifier()));
- ASSERT_FALSE(UsingCustomTheme(GetProfile(1)));
- ASSERT_TRUE(ThemeIsPendingInstall(GetProfile(1), GetCustomTheme(0)));
-}
« chrome/test/live_sync/sync_extension_helper.cc ('K') | « chrome/test/live_sync/two_client_live_extensions_sync_test.cc ('k') | chrome/test/live_sync/two_client_themes_sync_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698