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

Side by Side Diff: chrome/test/live_sync/two_client_bookmarks_sync_test.cc

Issue 7719011: Move some files from sync/engine to internal_api (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Respond to Tim's comments Created 9 years, 3 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/chrome.gyp ('k') | chrome/test/sync/test_http_bridge_factory.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/rand_util.h" 5 #include "base/rand_util.h"
6 #include "chrome/browser/profiles/profile.h" 6 #include "chrome/browser/profiles/profile.h"
7 #include "chrome/browser/sync/profile_sync_service_harness.h" 7 #include "chrome/browser/sync/profile_sync_service_harness.h"
8 #include "chrome/test/live_sync/bookmarks_helper.h" 8 #include "chrome/test/live_sync/bookmarks_helper.h"
9 #include "chrome/test/live_sync/live_sync_test.h" 9 #include "chrome/test/live_sync/live_sync_test.h"
10 10
(...skipping 620 matching lines...) Expand 10 before | Expand all | Expand 10 after
631 for (int i = 0; i < 15; ++i) { 631 for (int i = 0; i < 15; ++i) {
632 std::wstring title = IndexedURLTitle(i); 632 std::wstring title = IndexedURLTitle(i);
633 GURL url = GURL(IndexedURL(i)); 633 GURL url = GURL(IndexedURL(i));
634 ASSERT_TRUE(AddURL(0, folder, i, title, url) != NULL); 634 ASSERT_TRUE(AddURL(0, folder, i, title, url) != NULL);
635 } 635 }
636 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); 636 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
637 ASSERT_TRUE(AllModelsMatchVerifier()); 637 ASSERT_TRUE(AllModelsMatchVerifier());
638 638
639 Remove(0, GetBookmarkBarNode(0), 1); 639 Remove(0, GetBookmarkBarNode(0), 1);
640 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); 640 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
641 sleep(10);
rlarocque 2011/08/26 22:31:35 Oops. Good thing the try server caught this. T
641 ASSERT_TRUE(AllModelsMatchVerifier()); 642 ASSERT_TRUE(AllModelsMatchVerifier());
642 } 643 }
643 644
644 // Test Scribe ID - 371880. 645 // Test Scribe ID - 371880.
645 IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest, 646 IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
646 SC_DelBMFoldWithBMsAndBMFoldsNonEmptyACAfterwards) { 647 SC_DelBMFoldWithBMsAndBMFoldsNonEmptyACAfterwards) {
647 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; 648 ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
648 ASSERT_TRUE(AllModelsMatchVerifier()); 649 ASSERT_TRUE(AllModelsMatchVerifier());
649 650
650 ASSERT_TRUE(AddURL(0, kGenericURLTitle, GURL(kGenericURL)) != NULL); 651 ASSERT_TRUE(AddURL(0, kGenericURLTitle, GURL(kGenericURL)) != NULL);
(...skipping 1099 matching lines...) Expand 10 before | Expand all | Expand 10 after
1750 1751
1751 ASSERT_TRUE(AddURL(0, IndexedURLTitle(1), GURL(IndexedURL(1))) != NULL); 1752 ASSERT_TRUE(AddURL(0, IndexedURLTitle(1), GURL(IndexedURL(1))) != NULL);
1752 ASSERT_TRUE(AddFolder(0, IndexedFolderName(0)) != NULL); 1753 ASSERT_TRUE(AddFolder(0, IndexedFolderName(0)) != NULL);
1753 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); 1754 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
1754 ASSERT_TRUE(AllModelsMatchVerifier()); 1755 ASSERT_TRUE(AllModelsMatchVerifier());
1755 } 1756 }
1756 1757
1757 // TODO(zea): Add first time sync functionality testing. In particular, when 1758 // TODO(zea): Add first time sync functionality testing. In particular, when
1758 // there are encrypted types in first time sync we need to ensure we don't 1759 // there are encrypted types in first time sync we need to ensure we don't
1759 // duplicate bookmarks. 1760 // duplicate bookmarks.
OLDNEW
« no previous file with comments | « chrome/chrome.gyp ('k') | chrome/test/sync/test_http_bridge_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698