From 011b93dc3cc8eb6ef80626a2de340ee66f4ea663 Mon Sep 17 00:00:00 2001
From: "rsimha@chromium.org"
<rsimha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Mon, 27 Sep 2010 20:20:33 +0000
Subject: [PATCH] Adding automation for some P2 tests in two client live
bookmarks sync
1. Single Client Duplicate Bookmarks With Same URL
2. Single Client Twice Renaming Bookmark Name
3. Single Client Twice Renaming Bookmark URL
Patch from Sunand Tullimalli <sunandt@chromium.org>.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/3439015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60698 0039d316-1c4b-4281-b951-d872f2087c98
---
.../two_client_live_bookmarks_sync_test.cc | 105 +++++++++++++++++-
1 file changed, 102 insertions(+), 3 deletions(-)
diff --git a/chrome/test/live_sync/two_client_live_bookmarks_sync_test.cc b/chrome/test/live_sync/two_client_live_bookmarks_sync_test.cc
index 845c949ecd85a..e857d251b5117 100644
--- a/chrome/test/live_sync/two_client_live_bookmarks_sync_test.cc
+++ b/chrome/test/live_sync/two_client_live_bookmarks_sync_test.cc
@@ -2136,7 +2136,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientLiveBookmarksSyncTest,
bm0, bm1, false);
}
-// Test Scribe ID - 373504.
+// Test Scribe ID - 373504 - Merge bookmark folders with different bookmarks.
IN_PROC_BROWSER_TEST_F(TwoClientLiveBookmarksSyncTest,
MC_MergeBMFoldersWithDifferentBMs) {
ASSERT_TRUE(SetupClients()) << "SetupClients() failed.";
@@ -2181,7 +2181,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientLiveBookmarksSyncTest,
profile1_bookmark_model);
}
-// Test Scribe ID - 373509.
+// Test Scribe ID - 373509 - Merge moderately complex bookmark models.
IN_PROC_BROWSER_TEST_F(TwoClientLiveBookmarksSyncTest,
MC_MergeDifferentBMModelsModeratelyComplex) {
ASSERT_TRUE(SetupClients()) << "SetupClients() failed.";
@@ -2291,7 +2291,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientLiveBookmarksSyncTest,
profile1_bookmark_model);
}
-// Test Scribe ID - 386591.
+// Test Scribe ID - 386591 - Merge simple bookmark subset under bookmark folder.
IN_PROC_BROWSER_TEST_F(TwoClientLiveBookmarksSyncTest,
MC_MergeSimpleBMHierarchySubsetUnderBMFolder) {
ASSERT_TRUE(SetupClients()) << "SetupClients() failed.";
@@ -2360,3 +2360,102 @@ IN_PROC_BROWSER_TEST_F(TwoClientLiveBookmarksSyncTest,
profile1_bookmark_model);
}
+// Test Scribe ID - 370639 - Add bookmarks with different name and same URL.
+IN_PROC_BROWSER_TEST_F(TwoClientLiveBookmarksSyncTest,
+ SC_DuplicateBookmarksWithSameURL) {
+ ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
+
+ BookmarkModelVerifier* verifier = verifier_helper();
+ BookmarkModel* profile0_bookmark_model = GetBookmarkModel(0);
+ BookmarkModel* profile1_bookmark_model = GetBookmarkModel(1);
+
+ verifier->ExpectMatch(profile0_bookmark_model);
+ verifier->ExpectMatch(profile1_bookmark_model);
+
+ const BookmarkNode* profile0_bookmark_bar =
+ profile0_bookmark_model->GetBookmarkBarNode();
+ verifier->AddURL(profile0_bookmark_model, profile0_bookmark_bar,
+ 0, L"Bookmark0_name", GURL("http://www.bookmark-url.com"));
+ ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
+ verifier->ExpectMatch(profile0_bookmark_model);
+ verifier->ExpectMatch(profile1_bookmark_model);
+
+ verifier->AddURL(profile0_bookmark_model, profile0_bookmark_bar,
+ 1, L"Bookmark1_name", GURL("http://www.bookmark-url.com"));
+ ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
+ verifier->ExpectMatch(profile0_bookmark_model);
+ verifier->ExpectMatch(profile1_bookmark_model);
+}
+
+// Test Scribe ID - 371818 - Renaming the same bookmark name twice.
+IN_PROC_BROWSER_TEST_F(TwoClientLiveBookmarksSyncTest,
+ SC_TwiceRenamingBookmarkName) {
+ ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
+
+ BookmarkModelVerifier* verifier = verifier_helper();
+ BookmarkModel* profile0_bookmark_model = GetBookmarkModel(0);
+ BookmarkModel* profile1_bookmark_model = GetBookmarkModel(1);
+
+ verifier->ExpectMatch(profile0_bookmark_model);
+ verifier->ExpectMatch(profile1_bookmark_model);
+
+ const BookmarkNode* profile0_bookmark_bar =
+ profile0_bookmark_model->GetBookmarkBarNode();
+ const BookmarkNode* profile0_bookmark = verifier->AddURL(
+ profile0_bookmark_model, profile0_bookmark_bar,
+ 0, L"bookmark_name", GURL("http://www.bookmark-url.com"));
+ ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
+ verifier->ExpectMatch(profile0_bookmark_model);
+ verifier->ExpectMatch(profile1_bookmark_model);
+
+ verifier->SetTitle(profile0_bookmark_model,
+ profile0_bookmark, L"bookmark_renamed");
+ ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
+ verifier->ExpectMatch(profile0_bookmark_model);
+ verifier->ExpectMatch(profile1_bookmark_model);
+
+ verifier->SetTitle(profile0_bookmark_model,
+ profile0_bookmark, L"bookmark_name");
+ ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
+ BookmarkModelVerifier::VerifyNoDuplicates(profile0_bookmark_model);
+ verifier->ExpectMatch(profile0_bookmark_model);
+ verifier->ExpectMatch(profile1_bookmark_model);
+}
+
+// Test Scribe ID - 371823 - Renaming the same bookmark URL twice.
+IN_PROC_BROWSER_TEST_F(TwoClientLiveBookmarksSyncTest,
+ SC_TwiceRenamingBookmarkURL) {
+ ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
+
+ BookmarkModelVerifier* verifier = verifier_helper();
+ BookmarkModel* profile0_bookmark_model = GetBookmarkModel(0);
+ BookmarkModel* profile1_bookmark_model = GetBookmarkModel(1);
+
+ verifier->ExpectMatch(profile0_bookmark_model);
+ verifier->ExpectMatch(profile1_bookmark_model);
+
+ const BookmarkNode* profile0_bookmark_bar =
+ profile0_bookmark_model->GetBookmarkBarNode();
+ const BookmarkNode* profile0_bookmark = verifier->AddURL(
+ profile0_bookmark_model, profile0_bookmark_bar,
+ 0, L"bookmark_name", GURL("http://www.bookmark-url.com"));
+ ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
+ verifier->ExpectMatch(profile0_bookmark_model);
+ verifier->ExpectMatch(profile1_bookmark_model);
+
+ verifier->SetURL(profile0_bookmark_model,
+ profile0_bookmark,
+ GURL("http://www.bookmark-renamed-url.com"));
+ ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
+ verifier->ExpectMatch(profile0_bookmark_model);
+ verifier->ExpectMatch(profile1_bookmark_model);
+
+ verifier->SetURL(profile0_bookmark_model,
+ profile0_bookmark,
+ GURL("http://www.bookmark-url.com"));
+ ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
+ BookmarkModelVerifier::VerifyNoDuplicates(profile0_bookmark_model);
+ verifier->ExpectMatch(profile0_bookmark_model);
+ verifier->ExpectMatch(profile1_bookmark_model);
+}
+
--
GitLab