chrome/browser/sync/test/integration/single_client_dictionary_sync_test.cc - Issue 2379433002: [Sync] Refactoring of sync integration test checkers to remove boilerplate await methods.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/sync/test/integration/single_client_dictionary_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/single_client_bookmarks_sync_test.cc ('k') | chrome/browser/sync/test/integration/single_client_directory_sync_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/test/integration/single_client_dictionary_sync_test.cc

diff --git a/chrome/browser/sync/test/integration/single_client_dictionary_sync_test.cc b/chrome/browser/sync/test/integration/single_client_dictionary_sync_test.cc

index 02f30de5c640899cdef32d36f821d00e333058a3..763e1a398580c299fb0ac4a2edb07d6c2f1e626e 100644

--- a/chrome/browser/sync/test/integration/single_client_dictionary_sync_test.cc

+++ b/chrome/browser/sync/test/integration/single_client_dictionary_sync_test.cc

@@ -4,12 +4,10 @@

#include "base/macros.h"

#include "chrome/browser/sync/test/integration/dictionary_helper.h"

-#include "chrome/browser/sync/test/integration/sync_integration_test_util.h"

#include "chrome/browser/sync/test/integration/sync_test.h"

+#include "chrome/browser/sync/test/integration/updated_progress_marker_checker.h"

#include "components/browser_sync/profile_sync_service.h"

-using sync_integration_test_util::AwaitCommitActivityCompletion;

class SingleClientDictionarySyncTest : public SyncTest {

public:

SingleClientDictionarySyncTest() : SyncTest(SINGLE_CLIENT) {}

@@ -26,10 +24,10 @@ IN_PROC_BROWSER_TEST_F(SingleClientDictionarySyncTest, Sanity) {

std::string word = "foo";

ASSERT_TRUE(dictionary_helper::AddWord(0, word));

- ASSERT_TRUE(AwaitCommitActivityCompletion(GetSyncService(0)));

+ ASSERT_TRUE(UpdatedProgressMarkerChecker(GetSyncService(0)).Wait());

ASSERT_TRUE(dictionary_helper::DictionariesMatch());

ASSERT_TRUE(dictionary_helper::RemoveWord(0, word));

- ASSERT_TRUE(AwaitCommitActivityCompletion(GetSyncService(0)));

+ ASSERT_TRUE(UpdatedProgressMarkerChecker(GetSyncService(0)).Wait());

ASSERT_TRUE(dictionary_helper::DictionariesMatch());

}