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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 474273003: sync: Refactor bookmarks integration tests Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Use RunLoop for favicon wait Created 6 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
« no previous file with comments | « chrome/browser/sync/test/integration/sync_test.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/test/integration/two_client_bookmarks_sync_test.cc
diff --git a/chrome/browser/sync/test/integration/two_client_bookmarks_sync_test.cc b/chrome/browser/sync/test/integration/two_client_bookmarks_sync_test.cc
index 7fb554c8ec06630e1fe065c064f99bf1f74a6d84..762240bfe1e8f72670675fee9e1a1c845f04bad5 100644
--- a/chrome/browser/sync/test/integration/two_client_bookmarks_sync_test.cc
+++ b/chrome/browser/sync/test/integration/two_client_bookmarks_sync_test.cc
@@ -10,6 +10,8 @@
#include "chrome/browser/sync/test/integration/sync_integration_test_util.h"
#include "chrome/browser/sync/test/integration/sync_test.h"
#include "sync/internal_api/public/sessions/sync_session_snapshot.h"
+#include "sync/test/fake_server/bookmark_entity_builder.h"
+#include "sync/test/fake_server/entity_builder_factory.h"
#include "ui/base/layout.h"
using bookmarks_helper::AddFolder;
@@ -39,10 +41,12 @@ using bookmarks_helper::SetURL;
using bookmarks_helper::SortChildren;
using passwords_helper::SetDecryptionPassphrase;
using passwords_helper::SetEncryptionPassphrase;
-using sync_integration_test_util::AwaitCommitActivityCompletion;
using sync_integration_test_util::AwaitPassphraseAccepted;
using sync_integration_test_util::AwaitPassphraseRequired;
+using bookmarks_helper::AwaitAllModelsMatch;
+using bookmarks_helper::AwaitAllModelsMatchVerifier;
+
const std::string kGenericURL = "http://www.host.ext:1234/path/filename";
const std::string kGenericURLTitle = "URL Title";
const std::string kGenericFolderName = "Folder Name";
@@ -55,56 +59,44 @@ class TwoClientBookmarksSyncTest : public SyncTest {
TwoClientBookmarksSyncTest() : SyncTest(TWO_CLIENT) {}
virtual ~TwoClientBookmarksSyncTest() {}
- private:
- DISALLOW_COPY_AND_ASSIGN(TwoClientBookmarksSyncTest);
-};
-
-class LegacyTwoClientBookmarksSyncTest : public SyncTest {
- public:
- LegacyTwoClientBookmarksSyncTest() : SyncTest(TWO_CLIENT_LEGACY) {}
- virtual ~LegacyTwoClientBookmarksSyncTest() {}
+ virtual bool TestUsesSelfNotifications() OVERRIDE { return false; }
private:
- DISALLOW_COPY_AND_ASSIGN(LegacyTwoClientBookmarksSyncTest);
+ DISALLOW_COPY_AND_ASSIGN(TwoClientBookmarksSyncTest);
};
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest, Sanity) {
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(SetupSync());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
GURL google_url("http://www.google.com");
ASSERT_TRUE(AddURL(0, "Google", google_url) != NULL);
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
ASSERT_TRUE(AddURL(1, "Yahoo", GURL("http://www.yahoo.com")) != NULL);
- ASSERT_TRUE(GetClient(1)->AwaitMutualSyncCycleCompletion(GetClient(0)));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
const BookmarkNode* new_folder = AddFolder(0, 2, "New Folder");
Move(0, GetUniqueNodeByURL(0, google_url), new_folder, 0);
SetTitle(0, GetBookmarkBarNode(0)->GetChild(0), "Yahoo!!");
ASSERT_TRUE(AddURL(0, GetBookmarkBarNode(0), 1, "CNN",
GURL("http://www.cnn.com")) != NULL);
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
ASSERT_TRUE(AddURL(1, "Facebook", GURL("http://www.facebook.com")) != NULL);
- ASSERT_TRUE(GetClient(1)->AwaitMutualSyncCycleCompletion(GetClient(0)));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
SortChildren(1, GetBookmarkBarNode(1));
- ASSERT_TRUE(GetClient(1)->AwaitMutualSyncCycleCompletion(GetClient(0)));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
DisableVerifier();
SetTitle(0, GetUniqueNodeByURL(0, google_url), "Google++");
SetTitle(1, GetUniqueNodeByURL(1, google_url), "Google--");
- ASSERT_TRUE(AwaitQuiescence());
- ASSERT_TRUE(AllModelsMatch());
+ ASSERT_TRUE(AwaitAllModelsMatch());
}
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest, SimultaneousURLChanges) {
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(SetupSync());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
GURL initial_url("http://www.google.com");
GURL second_url("http://www.google.com/abc");
@@ -112,46 +104,42 @@ IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest, SimultaneousURLChanges) {
std::string title = "Google";
ASSERT_TRUE(AddURL(0, title, initial_url) != NULL);
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
DisableVerifier();
ASSERT_TRUE(SetURL(
0, GetUniqueNodeByURL(0, initial_url), second_url) != NULL);
ASSERT_TRUE(SetURL(
1, GetUniqueNodeByURL(1, initial_url), third_url) != NULL);
- ASSERT_TRUE(AwaitQuiescence());
- ASSERT_TRUE(AllModelsMatch());
+ ASSERT_TRUE(AwaitAllModelsMatch());
SetTitle(0, GetBookmarkBarNode(0)->GetChild(0), "Google1");
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(AllModelsMatch());
+ ASSERT_TRUE(AwaitAllModelsMatch());
}
// Test Scribe ID - 370558.
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest, SC_AddFirstFolder) {
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(SetupSync());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
ASSERT_TRUE(AddFolder(0, kGenericFolderName) != NULL);
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
}
// Test Scribe ID - 370559.
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
SC_AddFirstBMWithoutFavicon) {
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(SetupSync());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
ASSERT_TRUE(AddURL(0, kGenericURLTitle, GURL(kGenericURL)) != NULL);
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
}
// Test Scribe ID - 370489.
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest, SC_AddFirstBMWithFavicon) {
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(SetupSync());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
const GURL page_url(kGenericURL);
const GURL icon_url("http://www.google.com/favicon.ico");
@@ -159,11 +147,10 @@ IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest, SC_AddFirstBMWithFavicon) {
const BookmarkNode* bookmark = AddURL(0, kGenericURLTitle, page_url);
ASSERT_TRUE(bookmark != NULL);
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
SetFavicon(0, bookmark, icon_url, CreateFavicon(SK_ColorWHITE),
bookmarks_helper::FROM_UI);
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
}
// Test that the history service logic for not losing the hidpi versions of
@@ -184,60 +171,55 @@ IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest, SC_SetFaviconHiDPI) {
const GURL icon_url1("http://www.google.com/favicon1.ico");
const GURL icon_url2("http://www.google.com/favicon2.ico");
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(SetupSync());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
const BookmarkNode* bookmark0 = AddURL(0, kGenericURLTitle, page_url);
ASSERT_TRUE(bookmark0 != NULL);
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
SetFavicon(0, bookmark0, icon_url1, CreateFavicon(SK_ColorWHITE),
bookmarks_helper::FROM_UI);
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
const BookmarkNode* bookmark1 = GetUniqueNodeByURL(1, page_url);
SetFavicon(1, bookmark1, icon_url1, CreateFavicon(SK_ColorBLUE),
bookmarks_helper::FROM_UI);
- ASSERT_TRUE(GetClient(1)->AwaitMutualSyncCycleCompletion(GetClient(0)));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
SetFavicon(0, bookmark0, icon_url2, CreateFavicon(SK_ColorGREEN),
bookmarks_helper::FROM_UI);
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
}
// Test Scribe ID - 370560.
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest, SC_AddNonHTTPBMs) {
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(SetupSync());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
ASSERT_TRUE(AddURL(
0, "FTP UR", GURL("ftp://user:password@host:1234/path")) != NULL);
ASSERT_TRUE(AddURL(0, "File UR", GURL("file://host/path")) != NULL);
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
}
// Test Scribe ID - 370561.
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
SC_AddFirstBMUnderFolder) {
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(SetupSync());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
const BookmarkNode* folder = AddFolder(0, kGenericFolderName);
ASSERT_TRUE(folder != NULL);
ASSERT_TRUE(AddURL(
0, folder, 0, kGenericURLTitle, GURL(kGenericURL)) != NULL);
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
}
// Test Scribe ID - 370562.
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
SC_AddSeveralBMsUnderBMBarAndOtherBM) {
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(SetupSync());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
for (int i = 0; i < 20; ++i) {
std::string title = IndexedURLTitle(i);
@@ -246,15 +228,14 @@ IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
ASSERT_TRUE(AddURL(
0, GetOtherNode(0), i, title, url) != NULL);
}
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
}
// Test Scribe ID - 370563.
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
SC_AddSeveralBMsAndFolders) {
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(SetupSync());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
for (int i = 0; i < 15; ++i) {
if (base::RandDouble() > 0.6) {
@@ -280,156 +261,139 @@ IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
GURL url = GURL(IndexedURL(i));
ASSERT_TRUE(AddURL(0, GetOtherNode(0), i, title, url) != NULL);
}
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
}
// Test Scribe ID - 370641.
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
SC_DuplicateBMWithDifferentURLSameName) {
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(SetupSync());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
GURL url0 = GURL(IndexedURL(0));
GURL url1 = GURL(IndexedURL(1));
ASSERT_TRUE(AddURL(0, kGenericURLTitle, url0) != NULL);
ASSERT_TRUE(AddURL(0, kGenericURLTitle, url1) != NULL);
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
}
// Test Scribe ID - 370639 - Add bookmarks with different name and same URL.
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
SC_DuplicateBookmarksWithSameURL) {
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(SetupSync());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
std::string title0 = IndexedURLTitle(0);
std::string title1 = IndexedURLTitle(1);
ASSERT_TRUE(AddURL(0, title0, GURL(kGenericURL)) != NULL);
ASSERT_TRUE(AddURL(0, title1, GURL(kGenericURL)) != NULL);
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
}
// Test Scribe ID - 371817.
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest, SC_RenameBMName) {
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(SetupSync());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
std::string title = IndexedURLTitle(1);
const BookmarkNode* bookmark = AddURL(0, title, GURL(kGenericURL));
ASSERT_TRUE(bookmark != NULL);
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
std::string new_title = IndexedURLTitle(2);
SetTitle(0, bookmark, new_title);
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
}
// Test Scribe ID - 371822.
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest, SC_RenameBMURL) {
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(SetupSync());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
GURL url = GURL(IndexedURL(1));
const BookmarkNode* bookmark = AddURL(0, kGenericURLTitle, url);
ASSERT_TRUE(bookmark != NULL);
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
GURL new_url = GURL(IndexedURL(2));
ASSERT_TRUE(SetURL(0, bookmark, new_url) != NULL);
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
}
// Test Scribe ID - 371818 - Renaming the same bookmark name twice.
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
SC_TwiceRenamingBookmarkName) {
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(SetupSync());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
std::string title = IndexedURLTitle(1);
const BookmarkNode* bookmark = AddURL(0, title, GURL(kGenericURL));
ASSERT_TRUE(bookmark != NULL);
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
std::string new_title = IndexedURLTitle(2);
SetTitle(0, bookmark, new_title);
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
SetTitle(0, bookmark, title);
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
}
// Test Scribe ID - 371823 - Renaming the same bookmark URL twice.
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
SC_TwiceRenamingBookmarkURL) {
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(SetupSync());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
GURL url = GURL(IndexedURL(1));
const BookmarkNode* bookmark = AddURL(0, kGenericURLTitle, url);
ASSERT_TRUE(bookmark != NULL);
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
GURL new_url = GURL(IndexedURL(2));
ASSERT_TRUE(SetURL(0, bookmark, new_url) != NULL);
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
ASSERT_TRUE(SetURL(0, bookmark, url) != NULL);
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
}
// Test Scribe ID - 371824.
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest, SC_RenameBMFolder) {
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(SetupSync());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
std::string title = IndexedFolderName(1);
const BookmarkNode* folder = AddFolder(0, title);
ASSERT_TRUE(AddURL(
0, folder, 0, kGenericURLTitle, GURL(kGenericURL)) != NULL);
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
std::string new_title = IndexedFolderName(2);
SetTitle(0, folder, new_title);
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
}
// Test Scribe ID - 371825.
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest, SC_RenameEmptyBMFolder) {
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(SetupSync());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
std::string title = IndexedFolderName(1);
const BookmarkNode* folder = AddFolder(0, title);
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
std::string new_title = IndexedFolderName(2);
SetTitle(0, folder, new_title);
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
}
// Test Scribe ID - 371826.
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
SC_RenameBMFolderWithLongHierarchy) {
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(SetupSync());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
std::string title = IndexedFolderName(1);
const BookmarkNode* folder = AddFolder(0, title);
@@ -444,20 +408,18 @@ IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
ASSERT_TRUE(AddFolder(0, folder, i, title) != NULL);
}
}
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
std::string new_title = IndexedFolderName(2);
SetTitle(0, folder, new_title);
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
}
// Test Scribe ID - 371827.
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
SC_RenameBMFolderThatHasParentAndChildren) {
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(SetupSync());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
const BookmarkNode* folder = AddFolder(0, kGenericFolderName);
ASSERT_TRUE(folder != NULL);
@@ -478,76 +440,68 @@ IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
ASSERT_TRUE(AddFolder(0, subfolder, i, title) != NULL);
}
}
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
std::string new_title = IndexedSubfolderName(2);
SetTitle(0, subfolder, new_title);
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
}
// Test Scribe ID - 371828.
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest, SC_RenameBMNameAndURL) {
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(SetupSync());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
GURL url = GURL(IndexedURL(1));
std::string title = IndexedURLTitle(1);
const BookmarkNode* bookmark = AddURL(0, title, url);
ASSERT_TRUE(bookmark != NULL);
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
GURL new_url = GURL(IndexedURL(2));
std::string new_title = IndexedURLTitle(2);
bookmark = SetURL(0, bookmark, new_url);
ASSERT_TRUE(bookmark != NULL);
SetTitle(0, bookmark, new_title);
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
}
// Test Scribe ID - 371832.
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
SC_DeleteBMEmptyAccountAfterwards) {
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(SetupSync());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
ASSERT_TRUE(AddURL(
0, kGenericURLTitle, GURL(kGenericURL)) != NULL);
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
Remove(0, GetBookmarkBarNode(0), 0);
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
}
// Test Scribe ID - 371833.
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
SC_DelBMNonEmptyAccountAfterwards) {
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(SetupSync());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
for (int i = 0; i < 20; ++i) {
std::string title = IndexedURLTitle(i);
GURL url = GURL(IndexedURL(i));
ASSERT_TRUE(AddURL(0, i, title, url) != NULL);
}
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
Remove(0, GetBookmarkBarNode(0), 0);
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
}
// Test Scribe ID - 371835.
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
SC_DelFirstBMUnderBMFoldNonEmptyFoldAfterwards) {
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(SetupSync());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
const BookmarkNode* folder = AddFolder(0, kGenericFolderName);
ASSERT_TRUE(folder != NULL);
@@ -556,19 +510,17 @@ IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
GURL url = GURL(IndexedURL(i));
ASSERT_TRUE(AddURL(0, folder, i, title, url) != NULL);
}
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
Remove(0, folder, 0);
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
}
// Test Scribe ID - 371836.
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
SC_DelLastBMUnderBMFoldNonEmptyFoldAfterwards) {
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(SetupSync());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
const BookmarkNode* folder = AddFolder(0, kGenericFolderName);
ASSERT_TRUE(folder != NULL);
@@ -577,19 +529,17 @@ IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
GURL url = GURL(IndexedURL(i));
ASSERT_TRUE(AddURL(0, folder, i, title, url) != NULL);
}
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
Remove(0, folder, folder->child_count() - 1);
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
}
// Test Scribe ID - 371856.
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
SC_DelMiddleBMUnderBMFoldNonEmptyFoldAfterwards) {
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(SetupSync());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
const BookmarkNode* folder = AddFolder(0, kGenericFolderName);
ASSERT_TRUE(folder != NULL);
@@ -598,19 +548,17 @@ IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
GURL url = GURL(IndexedURL(i));
ASSERT_TRUE(AddURL(0, folder, i, title, url) != NULL);
}
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
Remove(0, folder, 4);
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
}
// Test Scribe ID - 371857.
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
SC_DelBMsUnderBMFoldEmptyFolderAfterwards) {
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(SetupSync());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
const BookmarkNode* folder = AddFolder(0, kGenericFolderName);
ASSERT_TRUE(folder != NULL);
@@ -619,37 +567,33 @@ IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
GURL url = GURL(IndexedURL(i));
ASSERT_TRUE(AddURL(0, folder, i, title, url) != NULL);
}
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
int child_count = folder->child_count();
for (int i = 0; i < child_count; ++i) {
Remove(0, folder, 0);
}
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
}
// Test Scribe ID - 371858.
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
SC_DelEmptyBMFoldEmptyAccountAfterwards) {
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(SetupSync());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
ASSERT_TRUE(AddFolder(0, kGenericFolderName) != NULL);
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
Remove(0, GetBookmarkBarNode(0), 0);
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
}
// Test Scribe ID - 371869.
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
SC_DelEmptyBMFoldNonEmptyAccountAfterwards) {
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(SetupSync());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
ASSERT_TRUE(AddFolder(0, kGenericFolderName) != NULL);
for (int i = 1; i < 15; ++i) {
@@ -662,19 +606,17 @@ IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
ASSERT_TRUE(AddFolder(0, i, title) != NULL);
}
}
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
Remove(0, GetBookmarkBarNode(0), 0);
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
}
// Test Scribe ID - 371879.
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
SC_DelBMFoldWithBMsNonEmptyAccountAfterwards) {
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(SetupSync());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
ASSERT_TRUE(AddURL(0, kGenericURLTitle, GURL(kGenericURL)) != NULL);
const BookmarkNode* folder = AddFolder(0, 1, kGenericFolderName);
@@ -694,19 +636,17 @@ IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
GURL url = GURL(IndexedURL(i));
ASSERT_TRUE(AddURL(0, folder, i, title, url) != NULL);
}
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
Remove(0, GetBookmarkBarNode(0), 1);
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
}
// Test Scribe ID - 371880.
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
SC_DelBMFoldWithBMsAndBMFoldsNonEmptyACAfterwards) {
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(SetupSync());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
ASSERT_TRUE(AddURL(0, kGenericURLTitle, GURL(kGenericURL)) != NULL);
const BookmarkNode* folder = AddFolder(0, 1, kGenericFolderName);
@@ -747,19 +687,17 @@ IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
}
}
}
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
Remove(0, GetBookmarkBarNode(0), 1);
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
}
// Test Scribe ID - 371882.
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
SC_DelBMFoldWithParentAndChildrenBMsAndBMFolds) {
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(SetupSync());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
const BookmarkNode* folder = AddFolder(0, kGenericFolderName);
ASSERT_TRUE(folder != NULL);
@@ -781,19 +719,17 @@ IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
ASSERT_TRUE(AddFolder(0, subfolder, i, title) != NULL);
}
}
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
Remove(0, folder, 0);
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
}
// Test Scribe ID - 371931.
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
SC_ReverseTheOrderOfTwoBMs) {
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(SetupSync());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
GURL url0 = GURL(IndexedURL(0));
GURL url1 = GURL(IndexedURL(1));
@@ -803,37 +739,33 @@ IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
const BookmarkNode* bookmark1 = AddURL(0, 1, title1, url1);
ASSERT_TRUE(bookmark0 != NULL);
ASSERT_TRUE(bookmark1 != NULL);
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
Move(0, bookmark0, GetBookmarkBarNode(0), 2);
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
}
// Test Scribe ID - 371933.
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest, SC_ReverseTheOrderOf10BMs) {
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(SetupSync());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
for (int i = 0; i < 10; ++i) {
std::string title = IndexedURLTitle(i);
GURL url = GURL(IndexedURL(i));
ASSERT_TRUE(AddURL(0, i, title, url) != NULL);
}
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
ReverseChildOrder(0, GetBookmarkBarNode(0));
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
}
// Test Scribe ID - 371954.
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
SC_MovingBMsFromBMBarToBMFolder) {
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(SetupSync());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
ASSERT_TRUE(AddURL(0, kGenericURLTitle, GURL(kGenericURL)) != NULL);
const BookmarkNode* folder = AddFolder(0, 1, kGenericFolderName);
@@ -843,24 +775,22 @@ IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
GURL url = GURL(IndexedURL(i));
ASSERT_TRUE(AddURL(0, i, title, url) != NULL);
}
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
int num_bookmarks_to_move =
GetBookmarkBarNode(0)->child_count() - 2;
for (int i = 0; i < num_bookmarks_to_move; ++i) {
Move(
0, GetBookmarkBarNode(0)->GetChild(2), folder, i);
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
}
}
// Test Scribe ID - 371957.
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
SC_MovingBMsFromBMFoldToBMBar) {
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(SetupSync());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
ASSERT_TRUE(AddURL(0, kGenericURLTitle, GURL(kGenericURL)) != NULL);
const BookmarkNode* folder = AddFolder(0, 1, kGenericFolderName);
@@ -870,22 +800,20 @@ IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
GURL url = GURL(IndexedURL(i));
ASSERT_TRUE(AddURL(0, folder, i, title, url) != NULL);
}
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
int num_bookmarks_to_move = folder->child_count() - 2;
for (int i = 0; i < num_bookmarks_to_move; ++i) {
Move(0, folder->GetChild(0), GetBookmarkBarNode(0), i);
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
}
}
// Test Scribe ID - 371961.
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
SC_MovingBMsFromParentBMFoldToChildBMFold) {
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(SetupSync());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
const BookmarkNode* folder = AddFolder(0, kGenericFolderName);
ASSERT_TRUE(folder != NULL);
@@ -902,22 +830,20 @@ IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
GURL url = GURL(IndexedURL(i + 3));
ASSERT_TRUE(AddURL(0, subfolder, i, title, url) != NULL);
}
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
for (int i = 0; i < 3; ++i) {
GURL url = GURL(IndexedURL(i));
Move(0, GetUniqueNodeByURL(0, url), subfolder, i + 10);
}
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
}
// Test Scribe ID - 371964.
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
SC_MovingBMsFromChildBMFoldToParentBMFold) {
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(SetupSync());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
const BookmarkNode* folder = AddFolder(0, kGenericFolderName);
ASSERT_TRUE(folder != NULL);
@@ -934,21 +860,19 @@ IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
GURL url = GURL(IndexedURL(i + 3));
ASSERT_TRUE(AddURL(0, subfolder, i, title, url) != NULL);
}
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
for (int i = 0; i < 3; ++i) {
GURL url = GURL(IndexedURL(i + 3));
Move(0, GetUniqueNodeByURL(0, url), folder, i + 4);
}
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
}
// Test Scribe ID - 371967.
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest, SC_HoistBMs10LevelUp) {
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(SetupSync());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
const BookmarkNode* folder = GetBookmarkBarNode(0);
const BookmarkNode* folder_L0 = NULL;
@@ -971,8 +895,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest, SC_HoistBMs10LevelUp) {
GURL url = GURL(IndexedURL(i + 10));
ASSERT_TRUE(AddURL(0, folder_L10, i, title, url) != NULL);
}
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
GURL url10 = GURL(IndexedURL(10));
Move(0, GetUniqueNodeByURL(
@@ -981,15 +904,14 @@ IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest, SC_HoistBMs10LevelUp) {
Move(0, GetUniqueNodeByURL(0, url11), folder_L0, 0);
GURL url12 = GURL(IndexedURL(12));
Move(0, GetUniqueNodeByURL(0, url12), folder_L0, 1);
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
}
// Test Scribe ID - 371968.
// Flaky. http://crbug.com/107744.
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest, SC_SinkBMs10LevelDown) {
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(SetupSync());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
const BookmarkNode* folder = GetBookmarkBarNode(0);
const BookmarkNode* folder_L0 = NULL;
@@ -1012,8 +934,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest, SC_SinkBMs10LevelDown) {
GURL url = GURL(IndexedURL(i + 10));
ASSERT_TRUE(AddURL(0, folder_L0, 0, title, url) != NULL);
}
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
GURL url10 = GURL(IndexedURL(10));
Move(0, GetUniqueNodeByURL(0, url10), folder_L10, folder_L10->child_count());
@@ -1021,15 +942,14 @@ IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest, SC_SinkBMs10LevelDown) {
Move(0, GetUniqueNodeByURL(0, url11), folder_L10, 0);
GURL url12 = GURL(IndexedURL(12));
Move(0, GetUniqueNodeByURL(0, url12), folder_L10, 1);
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
}
// Test Scribe ID - 371980.
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
SC_SinkEmptyBMFold5LevelsDown) {
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(SetupSync());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
const BookmarkNode* folder = GetBookmarkBarNode(0);
const BookmarkNode* folder_L5 = NULL;
@@ -1049,19 +969,17 @@ IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
folder = AddFolder(
0, GetBookmarkBarNode(0)->child_count(), kGenericFolderName);
ASSERT_TRUE(folder != NULL);
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
Move(0, folder, folder_L5, folder_L5->child_count());
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
}
// Test Scribe ID - 371997.
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
SC_SinkNonEmptyBMFold5LevelsDown) {
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(SetupSync());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
const BookmarkNode* folder = GetBookmarkBarNode(0);
const BookmarkNode* folder_L5 = NULL;
@@ -1085,19 +1003,16 @@ IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
GURL url = GURL(IndexedURL(i));
ASSERT_TRUE(AddURL(0, folder, i, title, url) != NULL);
}
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
Move(0, folder, folder_L5, folder_L5->child_count());
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
}
// Test Scribe ID - 372006.
-IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
- SC_HoistFolder5LevelsUp) {
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
- ASSERT_TRUE(AllModelsMatchVerifier());
+IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest, SC_HoistFolder5LevelsUp) {
+ ASSERT_TRUE(SetupSync());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
const BookmarkNode* folder = GetBookmarkBarNode(0);
const BookmarkNode* folder_L5 = NULL;
@@ -1122,19 +1037,17 @@ IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
GURL url = GURL(IndexedURL(i));
ASSERT_TRUE(AddURL(0, folder, i, title, url) != NULL);
}
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
Move(0, folder, GetBookmarkBarNode(0), GetBookmarkBarNode(0)->child_count());
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
}
// Test Scribe ID - 372026.
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
SC_ReverseTheOrderOfTwoBMFolders) {
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(SetupSync());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
for (int i = 0; i < 2; ++i) {
std::string title = IndexedFolderName(i);
@@ -1146,19 +1059,17 @@ IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
ASSERT_TRUE(AddURL(0, folder, j, title, url) != NULL);
}
}
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
ReverseChildOrder(0, GetBookmarkBarNode(0));
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
}
// Test Scribe ID - 372028.
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
SC_ReverseTheOrderOfTenBMFolders) {
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(SetupSync());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
for (int i = 0; i < 10; ++i) {
std::string title = IndexedFolderName(i);
@@ -1170,19 +1081,17 @@ IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
ASSERT_TRUE(AddURL(0, folder, j, title, url) != NULL);
}
}
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
ReverseChildOrder(0, GetBookmarkBarNode(0));
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
}
// Test Scribe ID - 373379.
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
MC_BiDirectionalPushAddingBM) {
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(SetupSync());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
DisableVerifier();
for (int i = 0; i < 2; ++i) {
@@ -1193,16 +1102,15 @@ IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
GURL url1 = GURL(IndexedURL(2*i+1));
ASSERT_TRUE(AddURL(1, title1, url1) != NULL);
}
- ASSERT_TRUE(AwaitQuiescence());
- ASSERT_TRUE(AllModelsMatch());
+ ASSERT_TRUE(AwaitAllModelsMatch());
ASSERT_FALSE(ContainsDuplicateBookmarks(0));
}
// Test Scribe ID - 373503.
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
MC_BiDirectionalPush_AddingSameBMs) {
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(SetupSync());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
// Note: When a racy commit is done with identical bookmarks, it is possible
// for duplicates to exist after sync completes. See http://crbug.com/19769.
@@ -1213,22 +1121,20 @@ IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
ASSERT_TRUE(AddURL(0, title, url) != NULL);
ASSERT_TRUE(AddURL(1, title, url) != NULL);
}
- ASSERT_TRUE(AwaitQuiescence());
- ASSERT_TRUE(AllModelsMatch());
+ ASSERT_TRUE(AwaitAllModelsMatch());
}
// Test Scribe ID - 373506.
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
MC_BootStrapEmptyStateEverywhere) {
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
- ASSERT_TRUE(AwaitQuiescence());
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(SetupSync());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
}
// Test Scribe ID - 373505.
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
MC_Merge_CaseInsensitivity_InNames) {
- ASSERT_TRUE(SetupClients()) << "SetupClients() failed.";
+ ASSERT_TRUE(SetupClients());
DisableVerifier();
const BookmarkNode* folder0 = AddFolder(0, "Folder");
@@ -1243,16 +1149,15 @@ IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
ASSERT_TRUE(AddURL(1, folder1, 1, "BooKMarK 1", GURL(kGenericURL)) != NULL);
ASSERT_TRUE(AddURL(1, folder1, 2, "bOOKMARK 2", GURL(kGenericURL)) != NULL);
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
- ASSERT_TRUE(AwaitQuiescence());
- ASSERT_TRUE(AllModelsMatch());
+ ASSERT_TRUE(SetupSync());
+ ASSERT_TRUE(AwaitAllModelsMatch());
ASSERT_FALSE(ContainsDuplicateBookmarks(0));
}
// Test Scribe ID - 373508.
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
MC_SimpleMergeOfDifferentBMModels) {
- ASSERT_TRUE(SetupClients()) << "SetupClients() failed.";
+ ASSERT_TRUE(SetupClients());
DisableVerifier();
for (int i = 0; i < 3; ++i) {
@@ -1271,16 +1176,15 @@ IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
ASSERT_TRUE(AddURL(1, i, title1, url1) != NULL);
}
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
- ASSERT_TRUE(AwaitQuiescence());
- ASSERT_TRUE(AllModelsMatch());
+ ASSERT_TRUE(SetupSync());
+ ASSERT_TRUE(AwaitAllModelsMatch());
ASSERT_FALSE(ContainsDuplicateBookmarks(0));
}
// Test Scribe ID - 386586.
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
MC_MergeSimpleBMHierarchyUnderBMBar) {
- ASSERT_TRUE(SetupClients()) << "SetupClients() failed.";
+ ASSERT_TRUE(SetupClients());
DisableVerifier();
for (int i = 0; i < 3; ++i) {
@@ -1296,16 +1200,15 @@ IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
ASSERT_TRUE(AddURL(1, i, title, url) != NULL);
}
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
- ASSERT_TRUE(AwaitQuiescence());
- ASSERT_TRUE(AllModelsMatch());
+ ASSERT_TRUE(SetupSync());
+ ASSERT_TRUE(AwaitAllModelsMatch());
ASSERT_FALSE(ContainsDuplicateBookmarks(0));
}
// Test Scribe ID - 386589.
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
MC_MergeSimpleBMHierarchyEqualSetsUnderBMBar) {
- ASSERT_TRUE(SetupClients()) << "SetupClients() failed.";
+ ASSERT_TRUE(SetupClients());
DisableVerifier();
for (int i = 0; i < 3; ++i) {
@@ -1315,16 +1218,15 @@ IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
ASSERT_TRUE(AddURL(1, i, title, url) != NULL);
}
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
- ASSERT_TRUE(AwaitQuiescence());
- ASSERT_TRUE(AllModelsMatch());
+ ASSERT_TRUE(SetupSync());
+ ASSERT_TRUE(AwaitAllModelsMatch());
ASSERT_FALSE(ContainsDuplicateBookmarks(0));
}
// Test Scribe ID - 373504 - Merge bookmark folders with different bookmarks.
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
MC_MergeBMFoldersWithDifferentBMs) {
- ASSERT_TRUE(SetupClients()) << "SetupClients() failed.";
+ ASSERT_TRUE(SetupClients());
DisableVerifier();
const BookmarkNode* folder0 = AddFolder(0, kGenericFolderName);
@@ -1339,16 +1241,15 @@ IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
GURL url1 = GURL(IndexedURL(2*i+1));
ASSERT_TRUE(AddURL(1, folder1, i, title1, url1) != NULL);
}
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
- ASSERT_TRUE(AwaitQuiescence());
- ASSERT_TRUE(AllModelsMatch());
+ ASSERT_TRUE(SetupSync());
+ ASSERT_TRUE(AwaitAllModelsMatch());
ASSERT_FALSE(ContainsDuplicateBookmarks(0));
}
// Test Scribe ID - 373509 - Merge moderately complex bookmark models.
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
MC_MergeDifferentBMModelsModeratelyComplex) {
- ASSERT_TRUE(SetupClients()) << "SetupClients() failed.";
+ ASSERT_TRUE(SetupClients());
DisableVerifier();
for (int i = 0; i < 25; ++i) {
@@ -1381,16 +1282,15 @@ IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
ASSERT_TRUE(AddURL(0, title, url) != NULL);
ASSERT_TRUE(AddURL(1, title, url) != NULL);
}
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
- ASSERT_TRUE(AwaitQuiescence());
- ASSERT_TRUE(AllModelsMatch());
+ ASSERT_TRUE(SetupSync());
+ ASSERT_TRUE(AwaitAllModelsMatch());
ASSERT_FALSE(ContainsDuplicateBookmarks(0));
}
// TCM ID - 3675271 - Merge simple bookmark subset under bookmark folder.
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
MC_MergeSimpleBMHierarchySubsetUnderBMFolder) {
- ASSERT_TRUE(SetupClients()) << "SetupClients() failed.";
+ ASSERT_TRUE(SetupClients());
DisableVerifier();
for (int i = 0; i < 2; ++i) {
@@ -1407,16 +1307,15 @@ IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
}
}
}
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
- ASSERT_TRUE(AwaitQuiescence());
- ASSERT_TRUE(AllModelsMatch());
+ ASSERT_TRUE(SetupSync());
+ ASSERT_TRUE(AwaitAllModelsMatch());
ASSERT_FALSE(ContainsDuplicateBookmarks(0));
}
// TCM ID - 3727284 - Merge subsets of bookmark under bookmark bar.
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
MC_MergeSimpleBMHierarchySubsetUnderBookmarkBar) {
- ASSERT_TRUE(SetupClients()) << "SetupClients() failed.";
+ ASSERT_TRUE(SetupClients());
DisableVerifier();
for (int i = 0; i < 4; ++i) {
@@ -1431,9 +1330,8 @@ IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
ASSERT_TRUE(AddURL(1, j, title, url) != NULL);
}
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
- ASSERT_TRUE(AwaitQuiescence());
- ASSERT_TRUE(AllModelsMatch());
+ ASSERT_TRUE(SetupSync());
+ ASSERT_TRUE(AwaitAllModelsMatch());
ASSERT_FALSE(ContainsDuplicateBookmarks(0));
ASSERT_FALSE(ContainsDuplicateBookmarks(1));
}
@@ -1441,7 +1339,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
// TCM ID - 3659294 - Merge simple bookmark hierarchy under bookmark folder.
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
MC_Merge_SimpleBMHierarchy_Under_BMFolder) {
- ASSERT_TRUE(SetupClients()) << "SetupClients() failed.";
+ ASSERT_TRUE(SetupClients());
DisableVerifier();
const BookmarkNode* folder0 = AddFolder(0, 0, kGenericFolderName);
@@ -1463,9 +1361,8 @@ IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
ASSERT_TRUE(AddURL(
1, folder1, 4, IndexedURLTitle(1), GURL(IndexedURL(1))) != NULL);
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
- ASSERT_TRUE(AwaitQuiescence());
- ASSERT_TRUE(AllModelsMatch());
+ ASSERT_TRUE(SetupSync());
+ ASSERT_TRUE(AwaitAllModelsMatch());
ASSERT_FALSE(ContainsDuplicateBookmarks(0));
}
@@ -1473,7 +1370,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
// folder.
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
MC_Merge_SimpleBMHierarchy_DisjointSets_Under_BMFolder) {
- ASSERT_TRUE(SetupClients()) << "SetupClients() failed.";
+ ASSERT_TRUE(SetupClients());
DisableVerifier();
const BookmarkNode* folder0 =
@@ -1495,9 +1392,8 @@ IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
ASSERT_TRUE(AddURL(
1, folder1, 3, IndexedURLTitle(8), GURL(IndexedURL(8))) != NULL);
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
- ASSERT_TRUE(AwaitQuiescence());
- ASSERT_TRUE(AllModelsMatch());
+ ASSERT_TRUE(SetupSync());
+ ASSERT_TRUE(AwaitAllModelsMatch());
ASSERT_FALSE(ContainsDuplicateBookmarks(0));
}
@@ -1505,7 +1401,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
// bar.
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
MC_Merge_SimpleBMHierarchy_DisjointSets_Under_BookmarkBar) {
- ASSERT_TRUE(SetupClients()) << "SetupClients() failed.";
+ ASSERT_TRUE(SetupClients());
DisableVerifier();
for (int i = 0; i < 3; ++i) {
@@ -1520,16 +1416,15 @@ IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
ASSERT_TRUE(AddURL(0, j, title, url) != NULL);
}
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
- ASSERT_TRUE(AwaitQuiescence());
- ASSERT_TRUE(AllModelsMatch());
+ ASSERT_TRUE(SetupSync());
+ ASSERT_TRUE(AwaitAllModelsMatch());
ASSERT_FALSE(ContainsDuplicateBookmarks(0));
}
// TCM ID - 3616282 - Merge sets of duplicate bookmarks under bookmark bar.
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
MC_Merge_SimpleBMHierarchy_DuplicateBMs_Under_BMBar) {
- ASSERT_TRUE(SetupClients()) << "SetupClients() failed.";
+ ASSERT_TRUE(SetupClients());
DisableVerifier();
// Let's add duplicate set of bookmark {1,2,2,3,3,3,4,4,4,4} to client0.
@@ -1549,52 +1444,18 @@ IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
ASSERT_TRUE(AddURL(1, i, title, url) != NULL);
}
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
- ASSERT_TRUE(AwaitQuiescence());
- ASSERT_TRUE(AllModelsMatch());
+ ASSERT_TRUE(SetupSync());
+ ASSERT_TRUE(AwaitAllModelsMatch());
for (int i = 1; i < 5 ; ++i) {
ASSERT_TRUE(CountBookmarksWithTitlesMatching(1, IndexedURLTitle(i)) == i);
}
}
-// TCM ID - 6593872.
-IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest, DisableBookmarks) {
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
- ASSERT_TRUE(AllModelsMatchVerifier());
-
- ASSERT_TRUE(GetClient(1)->DisableSyncForDatatype(syncer::BOOKMARKS));
- ASSERT_TRUE(AddFolder(1, kGenericFolderName) != NULL);
- ASSERT_TRUE(AwaitQuiescence());
- ASSERT_FALSE(AllModelsMatch());
-
- ASSERT_TRUE(GetClient(1)->EnableSyncForDatatype(syncer::BOOKMARKS));
- ASSERT_TRUE(AwaitQuiescence());
- ASSERT_TRUE(AllModelsMatch());
-}
-
-// TCM ID - 7343544.
-IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest, DisableSync) {
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
- ASSERT_TRUE(AllModelsMatchVerifier());
-
- ASSERT_TRUE(GetClient(1)->DisableSyncForAllDatatypes());
- ASSERT_TRUE(AddFolder(0, IndexedFolderName(0)) != NULL);
- ASSERT_TRUE(AwaitCommitActivityCompletion(GetSyncService((0))));
- ASSERT_FALSE(AllModelsMatch());
-
- ASSERT_TRUE(AddFolder(1, IndexedFolderName(1)) != NULL);
- ASSERT_FALSE(AllModelsMatch());
-
- ASSERT_TRUE(GetClient(1)->EnableSyncForAllDatatypes());
- ASSERT_TRUE(AwaitQuiescence());
- ASSERT_TRUE(AllModelsMatch());
-}
-
// TCM ID - 3662298 - Test adding duplicate folder - Both with different BMs
// underneath.
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest, MC_DuplicateFolders) {
- ASSERT_TRUE(SetupClients()) << "SetupClients() failed.";
+ ASSERT_TRUE(SetupClients());
DisableVerifier();
const BookmarkNode* folder0 = AddFolder(0, kGenericFolderName);
@@ -1610,15 +1471,14 @@ IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest, MC_DuplicateFolders) {
ASSERT_TRUE(AddURL(1, folder1, i, title1, url1) != NULL);
}
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
- ASSERT_TRUE(AwaitQuiescence());
- ASSERT_TRUE(AllModelsMatch());
+ ASSERT_TRUE(SetupSync());
+ ASSERT_TRUE(AwaitAllModelsMatch());
ASSERT_FALSE(ContainsDuplicateBookmarks(0));
}
// This test fails when run with FakeServer and FakeServerInvalidationService.
-IN_PROC_BROWSER_TEST_F(LegacyTwoClientBookmarksSyncTest, MC_DeleteBookmark) {
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
+IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest, MC_DeleteBookmark) {
+ ASSERT_TRUE(SetupSync());
ASSERT_TRUE(GetClient(1)->DisableSyncForDatatype(syncer::BOOKMARKS));
const GURL bar_url("http://example.com/bar");
@@ -1627,21 +1487,18 @@ IN_PROC_BROWSER_TEST_F(LegacyTwoClientBookmarksSyncTest, MC_DeleteBookmark) {
ASSERT_TRUE(AddURL(0, GetBookmarkBarNode(0), 0, "bar", bar_url) != NULL);
ASSERT_TRUE(AddURL(0, GetOtherNode(0), 0, "other", other_url) != NULL);
- ASSERT_TRUE(AwaitCommitActivityCompletion(GetSyncService((0))));
-
ASSERT_TRUE(HasNodeWithURL(0, bar_url));
ASSERT_TRUE(HasNodeWithURL(0, other_url));
ASSERT_FALSE(HasNodeWithURL(1, bar_url));
ASSERT_FALSE(HasNodeWithURL(1, other_url));
Remove(0, GetBookmarkBarNode(0), 0);
- ASSERT_TRUE(AwaitCommitActivityCompletion(GetSyncService((0))));
ASSERT_FALSE(HasNodeWithURL(0, bar_url));
ASSERT_TRUE(HasNodeWithURL(0, other_url));
ASSERT_TRUE(GetClient(1)->EnableSyncForDatatype(syncer::BOOKMARKS));
- ASSERT_TRUE(AwaitQuiescence());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
ASSERT_FALSE(HasNodeWithURL(0, bar_url));
ASSERT_TRUE(HasNodeWithURL(0, other_url));
@@ -1653,7 +1510,7 @@ IN_PROC_BROWSER_TEST_F(LegacyTwoClientBookmarksSyncTest, MC_DeleteBookmark) {
// from two clients at the same time.
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
MC_BookmarkNameChangeConflict) {
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
+ ASSERT_TRUE(SetupSync());
const BookmarkNode* folder0 = AddFolder(0, kGenericFolderName);
ASSERT_TRUE(folder0 != NULL);
@@ -1662,8 +1519,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
GURL url = GURL(IndexedURL(i));
ASSERT_TRUE(AddURL(0, folder0, i, title, url) != NULL);
}
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
ASSERT_FALSE(ContainsDuplicateBookmarks(0));
DisableVerifier();
@@ -1671,8 +1527,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
SetTitle(0, GetUniqueNodeByURL(0, url), "Title++");
SetTitle(1, GetUniqueNodeByURL(1, url), "Title--");
- ASSERT_TRUE(AwaitQuiescence());
- ASSERT_TRUE(AllModelsMatch());
+ ASSERT_TRUE(AwaitAllModelsMatch());
ASSERT_FALSE(ContainsDuplicateBookmarks(0));
}
@@ -1680,7 +1535,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
// from two clients at the same time.
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
MC_BookmarkURLChangeConflict) {
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
+ ASSERT_TRUE(SetupSync());
const BookmarkNode* folder0 = AddFolder(0, kGenericFolderName);
ASSERT_TRUE(folder0 != NULL);
@@ -1689,8 +1544,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
GURL url = GURL(IndexedURL(i));
ASSERT_TRUE(AddURL(0, folder0, i, title, url) != NULL);
}
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
ASSERT_FALSE(ContainsDuplicateBookmarks(0));
DisableVerifier();
@@ -1700,8 +1554,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
ASSERT_TRUE(SetURL(
1, GetUniqueNodeByURL(1, url), GURL("http://www.google.com/11")));
- ASSERT_TRUE(AwaitQuiescence());
- ASSERT_TRUE(AllModelsMatch());
+ ASSERT_TRUE(AwaitAllModelsMatch());
ASSERT_FALSE(ContainsDuplicateBookmarks(0));
}
@@ -1709,7 +1562,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
// clients at the same time.
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
MC_FolderNameChangeConflict) {
- ASSERT_TRUE(SetupClients()) << "SetupClients() failed.";
+ ASSERT_TRUE(SetupClients());
DisableVerifier();
const BookmarkNode* folderA[2];
@@ -1749,127 +1602,110 @@ IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
}
}
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
- ASSERT_TRUE(AwaitQuiescence());
- ASSERT_TRUE(AllModelsMatch());
+ ASSERT_TRUE(SetupSync());
+ ASSERT_TRUE(AwaitAllModelsMatch());
ASSERT_FALSE(ContainsDuplicateBookmarks(0));
// Simultaneously rename folder A on both clients.
SetTitle(0, folderA[0], "Folder A++");
SetTitle(1, folderA[1], "Folder A--");
- ASSERT_TRUE(AwaitQuiescence());
- ASSERT_TRUE(AllModelsMatch());
+ ASSERT_TRUE(AwaitAllModelsMatch());
ASSERT_FALSE(ContainsDuplicateBookmarks(0));
// Simultaneously rename folder B on both clients.
SetTitle(0, folderB[0], "Folder B++");
SetTitle(1, folderB[1], "Folder B--");
- ASSERT_TRUE(AwaitQuiescence());
- ASSERT_TRUE(AllModelsMatch());
+ ASSERT_TRUE(AwaitAllModelsMatch());
ASSERT_FALSE(ContainsDuplicateBookmarks(0));
// Simultaneously rename folder C on both clients.
SetTitle(0, folderC[0], "Folder C++");
SetTitle(1, folderC[1], "Folder C--");
- ASSERT_TRUE(AwaitQuiescence());
- ASSERT_TRUE(AllModelsMatch());
+ ASSERT_TRUE(AwaitAllModelsMatch());
ASSERT_FALSE(ContainsDuplicateBookmarks(0));
}
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
SingleClientEnabledEncryption) {
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
- ASSERT_TRUE(AllModelsMatchVerifier());
-
+ ASSERT_TRUE(SetupSync());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
ASSERT_TRUE(EnableEncryption(0));
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(IsEncryptionComplete(0));
- ASSERT_TRUE(IsEncryptionComplete(1));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitEncryptionComplete(1));
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
}
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
SingleClientEnabledEncryptionAndChanged) {
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(SetupSync());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
ASSERT_TRUE(EnableEncryption(0));
ASSERT_TRUE(AddURL(0, IndexedURLTitle(0), GURL(IndexedURL(0))) != NULL);
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(IsEncryptionComplete(0));
- ASSERT_TRUE(IsEncryptionComplete(1));
- ASSERT_TRUE(AllModelsMatchVerifier());
+
+ ASSERT_TRUE(AwaitEncryptionComplete(1));
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
}
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
BothClientsEnabledEncryption) {
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(SetupSync());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
ASSERT_TRUE(EnableEncryption(0));
ASSERT_TRUE(EnableEncryption(1));
- ASSERT_TRUE(AwaitQuiescence());
ASSERT_TRUE(IsEncryptionComplete(0));
ASSERT_TRUE(IsEncryptionComplete(1));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
}
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
SingleClientEnabledEncryptionBothChanged) {
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(SetupSync());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
ASSERT_TRUE(EnableEncryption(0));
- ASSERT_TRUE(AwaitQuiescence());
- ASSERT_TRUE(IsEncryptionComplete(0));
- ASSERT_TRUE(IsEncryptionComplete(1));
+ ASSERT_TRUE(AwaitEncryptionComplete(1));
+
ASSERT_TRUE(AddURL(0, IndexedURLTitle(0), GURL(IndexedURL(0))) != NULL);
ASSERT_TRUE(AddURL(0, IndexedURLTitle(1), GURL(IndexedURL(1))) != NULL);
- ASSERT_TRUE(AwaitQuiescence());
- ASSERT_TRUE(AllModelsMatchVerifier());
+
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
ASSERT_TRUE(IsEncryptionComplete(0));
ASSERT_TRUE(IsEncryptionComplete(1));
}
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
SingleClientEnabledEncryptionAndChangedMultipleTimes) {
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(SetupSync());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
ASSERT_TRUE(AddURL(0, IndexedURLTitle(0), GURL(IndexedURL(0))) != NULL);
ASSERT_TRUE(EnableEncryption(0));
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(IsEncryptionComplete(0));
- ASSERT_TRUE(IsEncryptionComplete(1));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitEncryptionComplete(1));
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
ASSERT_TRUE(AddURL(0, IndexedURLTitle(1), GURL(IndexedURL(1))) != NULL);
ASSERT_TRUE(AddFolder(0, IndexedFolderName(0)) != NULL);
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
}
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
FirstClientEnablesEncryptionWithPassSecondChanges) {
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(SetupSync());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
// Add initial bookmarks.
ASSERT_TRUE(AddURL(0, 0, IndexedURLTitle(0), GURL(IndexedURL(0))) != NULL);
ASSERT_TRUE(AddURL(0, 1, IndexedURLTitle(1), GURL(IndexedURL(1))) != NULL);
ASSERT_TRUE(AddURL(0, 2, IndexedURLTitle(2), GURL(IndexedURL(2))) != NULL);
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
// Set a passphrase and enable encryption on Client 0. Client 1 will not
// understand the bookmark updates.
SetEncryptionPassphrase(0, kValidPassphrase, ProfileSyncService::EXPLICIT);
ASSERT_TRUE(AwaitPassphraseAccepted(GetSyncService((0))));
ASSERT_TRUE(EnableEncryption(0));
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(IsEncryptionComplete(0));
- ASSERT_TRUE(IsEncryptionComplete(1));
- ASSERT_TRUE(GetSyncService((1))->IsPassphraseRequired());
+ ASSERT_TRUE(AwaitEncryptionComplete(1));
// Client 1 adds bookmarks between the first two and between the second two.
ASSERT_TRUE(AddURL(0, 1, IndexedURLTitle(3), GURL(IndexedURL(3))) != NULL);
@@ -1881,15 +1717,13 @@ IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
ASSERT_TRUE(AwaitPassphraseRequired(GetSyncService((1))));
ASSERT_TRUE(SetDecryptionPassphrase(1, kValidPassphrase));
ASSERT_TRUE(AwaitPassphraseAccepted(GetSyncService((1))));
- ASSERT_TRUE(AwaitQuiescence());
- EXPECT_TRUE(AllModelsMatch());
+ ASSERT_TRUE(AwaitAllModelsMatch());
ASSERT_EQ(0,
GetClient(1)->GetLastSessionSnapshot().num_encryption_conflicts());
// Ensure everything is syncing normally by appending a final bookmark.
ASSERT_TRUE(AddURL(1, 5, IndexedURLTitle(5), GURL(IndexedURL(5))) != NULL);
- ASSERT_TRUE(GetClient(1)->AwaitMutualSyncCycleCompletion(GetClient(0)));
- EXPECT_TRUE(AllModelsMatch());
+ EXPECT_TRUE(AwaitAllModelsMatch());
ASSERT_EQ(0,
GetClient(1)->GetLastSessionSnapshot().num_encryption_conflicts());
}
@@ -1898,7 +1732,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
// code results in a consistent view across machines (no matter what the final
// order is).
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest, RacyPositionChanges) {
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
+ ASSERT_TRUE(SetupSync());
ASSERT_TRUE(AllModelsMatchVerifier());
// Add initial bookmarks.
@@ -1908,8 +1742,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest, RacyPositionChanges) {
}
// Once we make diverging changes the verifer is helpless.
- ASSERT_TRUE(AwaitQuiescence());
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(AwaitAllModelsMatch());
DisableVerifier();
// Make changes on client 0.
@@ -1930,8 +1763,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest, RacyPositionChanges) {
Move(1, node, node->parent(), rand_pos);
}
- ASSERT_TRUE(AwaitQuiescence());
- ASSERT_TRUE(AllModelsMatch());
+ ASSERT_TRUE(AwaitAllModelsMatch());
// Now make changes to client 1 first.
for (size_t i = 0; i < num_bookmarks; ++i) {
@@ -1951,41 +1783,33 @@ IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest, RacyPositionChanges) {
Move(0, node, node->parent(), rand_pos);
}
- ASSERT_TRUE(AwaitQuiescence());
- ASSERT_TRUE(AllModelsMatch());
+ ASSERT_TRUE(AwaitAllModelsMatch());
}
// Trigger the server side creation of Synced Bookmarks. Ensure both clients
// remain syncing afterwards. Add bookmarks to the synced bookmarks folder
// and ensure both clients receive the boomkmark.
-IN_PROC_BROWSER_TEST_F(LegacyTwoClientBookmarksSyncTest,
- CreateSyncedBookmarks) {
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
- ASSERT_TRUE(AllModelsMatchVerifier());
+IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest, CreateSyncedBookmarks) {
+ std::string title = "Montreal Canadiens";
+ fake_server::EntityBuilderFactory entity_builder_factory;
+ scoped_ptr<fake_server::FakeServerEntity> entity =
+ entity_builder_factory.NewBookmarkEntityBuilder(
+ title, GURL("http://canadiens.nhl.com"))
+ .Build();
+ fake_server_->InjectEntity(entity.Pass());
- TriggerCreateSyncedBookmarks();
-
- // Add a bookmark on Client 0 and ensure it syncs over. This will also trigger
- // both clients downloading the new Synced Bookmarks folder.
- ASSERT_TRUE(AddURL(0, "Google", GURL("http://www.google.com")));
- ASSERT_TRUE(AwaitQuiescence());
- ASSERT_TRUE(AllModelsMatch());
+ DisableVerifier();
+ ASSERT_TRUE(SetupSync());
+ ASSERT_TRUE(AwaitAllModelsMatch());
- // Now add a bookmark within the Synced Bookmarks folder and ensure it syncs
- // over.
- const BookmarkNode* synced_bookmarks = GetSyncedBookmarksNode(0);
- ASSERT_TRUE(synced_bookmarks);
- ASSERT_TRUE(AddURL(0, synced_bookmarks, 0, "Google2",
- GURL("http://www.google2.com")));
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
- ASSERT_TRUE(AllModelsMatch());
+ ASSERT_EQ(1, CountBookmarksWithTitlesMatching(0, title));
+ ASSERT_EQ(1, CountBookmarksWithTitlesMatching(1, title));
}
IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
BookmarkAllNodesRemovedEvent) {
-
- ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
- ASSERT_TRUE(AllModelsMatchVerifier());
+ ASSERT_TRUE(SetupSync());
+ ASSERT_TRUE(AwaitAllModelsMatchVerifier());
// Starting state:
// other_node
@@ -2018,15 +1842,14 @@ IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
ASSERT_TRUE(
AddURL(0, GetBookmarkBarNode(0), 2, "Gmai", GURL("http://gmail.com")));
- ASSERT_TRUE(AwaitQuiescence());
- ASSERT_TRUE(AllModelsMatch());
+ ASSERT_TRUE(AwaitAllModelsMatch());
// Remove all
RemoveAll(0);
- ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
+ ASSERT_TRUE(AwaitAllModelsMatch());
+
// Verify other node has no children now.
EXPECT_EQ(0, GetOtherNode(0)->child_count());
EXPECT_EQ(0, GetBookmarkBarNode(0)->child_count());
- ASSERT_TRUE(AllModelsMatch());
}
« no previous file with comments | « chrome/browser/sync/test/integration/sync_test.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698