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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc

Issue 2379433002: [Sync] Refactoring of sync integration test checkers to remove boilerplate await methods. (Closed)
Patch Set: Rebase Created 4 years, 2 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
« no previous file with comments | « chrome/browser/sync/test/integration/two_client_passwords_sync_test.cc ('k') | chrome/browser/sync/test/integration/two_client_search_engines_sync_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc
diff --git a/chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc b/chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc
index 78b30043982fa31260c2bde4507e3670ebac6bd6..a74ec050e420a0ccdf6e0031ead1f9f47602c794 100644
--- a/chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc
+++ b/chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc
@@ -14,10 +14,6 @@
#include "chrome/common/pref_names.h"
#include "components/prefs/pref_service.h"
-using preferences_helper::AwaitBooleanPrefMatches;
-using preferences_helper::AwaitIntegerPrefMatches;
-using preferences_helper::AwaitListPrefMatches;
-using preferences_helper::AwaitStringPrefMatches;
using preferences_helper::BooleanPrefMatches;
using preferences_helper::ChangeBooleanPref;
using preferences_helper::ChangeIntegerPref;
@@ -39,11 +35,11 @@ class TwoClientPreferencesSyncTest : public SyncTest {
IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, E2E_ONLY(Sanity)) {
DisableVerifier();
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
- ASSERT_TRUE(AwaitStringPrefMatches(prefs::kHomePage));
+ ASSERT_TRUE(StringPrefMatchChecker(prefs::kHomePage).Wait());
const std::string new_home_page = base::StringPrintf(
"https://example.com/%s", base::GenerateGUID().c_str());
ChangeStringPref(0, prefs::kHomePage, new_home_page);
- ASSERT_TRUE(AwaitStringPrefMatches(prefs::kHomePage));
+ ASSERT_TRUE(StringPrefMatchChecker(prefs::kHomePage).Wait());
for (int i = 0; i < num_clients(); ++i) {
ASSERT_EQ(new_home_page, GetPrefs(i)->GetString(prefs::kHomePage));
}
@@ -51,33 +47,35 @@ IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, E2E_ONLY(Sanity)) {
IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, E2E_ENABLED(BooleanPref)) {
ASSERT_TRUE(SetupSync());
- ASSERT_TRUE(AwaitBooleanPrefMatches(prefs::kHomePageIsNewTabPage));
+ ASSERT_TRUE(BooleanPrefMatchChecker(prefs::kHomePageIsNewTabPage).Wait());
ChangeBooleanPref(0, prefs::kHomePageIsNewTabPage);
- ASSERT_TRUE(AwaitBooleanPrefMatches(prefs::kHomePageIsNewTabPage));
+ ASSERT_TRUE(BooleanPrefMatchChecker(prefs::kHomePageIsNewTabPage).Wait());
}
IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest,
E2E_ENABLED(Bidirectional)) {
ASSERT_TRUE(SetupSync());
- ASSERT_TRUE(AwaitStringPrefMatches(prefs::kHomePage));
+ ASSERT_TRUE(StringPrefMatchChecker(prefs::kHomePage).Wait());
ChangeStringPref(0, prefs::kHomePage, "http://www.google.com/0");
- ASSERT_TRUE(AwaitStringPrefMatches(prefs::kHomePage));
- EXPECT_EQ("http://www.google.com/0", GetPrefs(0)->GetString(prefs::kHomePage));
+ ASSERT_TRUE(StringPrefMatchChecker(prefs::kHomePage).Wait());
+ EXPECT_EQ("http://www.google.com/0",
+ GetPrefs(0)->GetString(prefs::kHomePage));
ChangeStringPref(1, prefs::kHomePage, "http://www.google.com/1");
- ASSERT_TRUE(AwaitStringPrefMatches(prefs::kHomePage));
- EXPECT_EQ("http://www.google.com/1", GetPrefs(0)->GetString(prefs::kHomePage));
+ ASSERT_TRUE(StringPrefMatchChecker(prefs::kHomePage).Wait());
+ EXPECT_EQ("http://www.google.com/1",
+ GetPrefs(0)->GetString(prefs::kHomePage));
}
IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest,
E2E_ENABLED(UnsyncableBooleanPref)) {
ASSERT_TRUE(SetupSync());
DisableVerifier();
- ASSERT_TRUE(AwaitStringPrefMatches(prefs::kHomePage));
- ASSERT_TRUE(AwaitBooleanPrefMatches(prefs::kDisableScreenshots));
+ ASSERT_TRUE(StringPrefMatchChecker(prefs::kHomePage).Wait());
+ ASSERT_TRUE(BooleanPrefMatchChecker(prefs::kDisableScreenshots).Wait());
// This pref is not syncable.
ChangeBooleanPref(0, prefs::kDisableScreenshots);
@@ -87,62 +85,62 @@ IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest,
// Wait until the syncable pref is synced, then expect that the non-syncable
// one is still out of sync.
- ASSERT_TRUE(AwaitStringPrefMatches(prefs::kHomePage));
+ ASSERT_TRUE(StringPrefMatchChecker(prefs::kHomePage).Wait());
ASSERT_FALSE(BooleanPrefMatches(prefs::kDisableScreenshots));
}
IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, E2E_ENABLED(StringPref)) {
ASSERT_TRUE(SetupSync());
- ASSERT_TRUE(AwaitStringPrefMatches(prefs::kHomePage));
+ ASSERT_TRUE(StringPrefMatchChecker(prefs::kHomePage).Wait());
ChangeStringPref(0, prefs::kHomePage, "http://news.google.com");
- ASSERT_TRUE(AwaitStringPrefMatches(prefs::kHomePage));
+ ASSERT_TRUE(StringPrefMatchChecker(prefs::kHomePage).Wait());
}
IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest,
E2E_ENABLED(ComplexPrefs)) {
ASSERT_TRUE(SetupSync());
- ASSERT_TRUE(AwaitIntegerPrefMatches(prefs::kRestoreOnStartup));
- ASSERT_TRUE(AwaitListPrefMatches(prefs::kURLsToRestoreOnStartup));
+ ASSERT_TRUE(IntegerPrefMatchChecker(prefs::kRestoreOnStartup).Wait());
+ ASSERT_TRUE(ListPrefMatchChecker(prefs::kURLsToRestoreOnStartup).Wait());
ChangeIntegerPref(0, prefs::kRestoreOnStartup, 0);
- ASSERT_TRUE(AwaitIntegerPrefMatches(prefs::kRestoreOnStartup));
+ ASSERT_TRUE(IntegerPrefMatchChecker(prefs::kRestoreOnStartup).Wait());
base::ListValue urls;
urls.AppendString("http://www.google.com/");
urls.AppendString("http://www.flickr.com/");
ChangeIntegerPref(0, prefs::kRestoreOnStartup, 4);
ChangeListPref(0, prefs::kURLsToRestoreOnStartup, urls);
- ASSERT_TRUE(AwaitIntegerPrefMatches(prefs::kRestoreOnStartup));
- ASSERT_TRUE(AwaitListPrefMatches(prefs::kURLsToRestoreOnStartup));
+ ASSERT_TRUE(IntegerPrefMatchChecker(prefs::kRestoreOnStartup).Wait());
+ ASSERT_TRUE(ListPrefMatchChecker(prefs::kURLsToRestoreOnStartup).Wait());
}
IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest,
E2E_ENABLED(SingleClientEnabledEncryptionBothChanged)) {
ASSERT_TRUE(SetupSync());
- ASSERT_TRUE(AwaitBooleanPrefMatches(prefs::kHomePageIsNewTabPage));
- ASSERT_TRUE(AwaitStringPrefMatches(prefs::kHomePage));
+ ASSERT_TRUE(BooleanPrefMatchChecker(prefs::kHomePageIsNewTabPage).Wait());
+ ASSERT_TRUE(StringPrefMatchChecker(prefs::kHomePage).Wait());
ASSERT_TRUE(EnableEncryption(0));
ChangeBooleanPref(0, prefs::kHomePageIsNewTabPage);
ChangeStringPref(1, prefs::kHomePage, "http://www.google.com/1");
ASSERT_TRUE(AwaitEncryptionComplete(0));
ASSERT_TRUE(AwaitEncryptionComplete(1));
- ASSERT_TRUE(AwaitStringPrefMatches(prefs::kHomePage));
+ ASSERT_TRUE(StringPrefMatchChecker(prefs::kHomePage).Wait());
ASSERT_TRUE(BooleanPrefMatches(prefs::kHomePageIsNewTabPage));
}
IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest,
E2E_ENABLED(BothClientsEnabledEncryptionAndChangedMultipleTimes)) {
ASSERT_TRUE(SetupSync());
- ASSERT_TRUE(AwaitBooleanPrefMatches(prefs::kHomePageIsNewTabPage));
+ ASSERT_TRUE(BooleanPrefMatchChecker(prefs::kHomePageIsNewTabPage).Wait());
ChangeBooleanPref(0, prefs::kHomePageIsNewTabPage);
ASSERT_TRUE(EnableEncryption(0));
ASSERT_TRUE(EnableEncryption(1));
- ASSERT_TRUE(AwaitBooleanPrefMatches(prefs::kHomePageIsNewTabPage));
+ ASSERT_TRUE(BooleanPrefMatchChecker(prefs::kHomePageIsNewTabPage).Wait());
- ASSERT_TRUE(AwaitBooleanPrefMatches(prefs::kShowHomeButton));
+ ASSERT_TRUE(BooleanPrefMatchChecker(prefs::kShowHomeButton).Wait());
ChangeBooleanPref(0, prefs::kShowHomeButton);
- ASSERT_TRUE(AwaitBooleanPrefMatches(prefs::kShowHomeButton));
+ ASSERT_TRUE(BooleanPrefMatchChecker(prefs::kShowHomeButton).Wait());
}
« no previous file with comments | « chrome/browser/sync/test/integration/two_client_passwords_sync_test.cc ('k') | chrome/browser/sync/test/integration/two_client_search_engines_sync_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698