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

Side by Side Diff: chrome/browser/sync/test/integration/two_client_dictionary_sync_test.cc

Issue 293993019: sync: Block reflections in more integration tests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Re-enable reflections for MultipleClientSessionsSyncTest Created 6 years, 6 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/browser/sync/test/integration/multiple_client_typed_urls_sync_test.cc ('k') | no next file » | 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/strings/string_number_conversions.h" 5 #include "base/strings/string_number_conversions.h"
6 #include "chrome/browser/sync/test/integration/dictionary_helper.h" 6 #include "chrome/browser/sync/test/integration/dictionary_helper.h"
7 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h" 7 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h"
8 #include "chrome/browser/sync/test/integration/sync_integration_test_util.h" 8 #include "chrome/browser/sync/test/integration/sync_integration_test_util.h"
9 #include "chrome/browser/sync/test/integration/sync_test.h" 9 #include "chrome/browser/sync/test/integration/sync_test.h"
10 #include "chrome/common/spellcheck_common.h" 10 #include "chrome/common/spellcheck_common.h"
11 11
12 using sync_integration_test_util::AwaitCommitActivityCompletion; 12 using sync_integration_test_util::AwaitCommitActivityCompletion;
13 13
14 class TwoClientDictionarySyncTest : public SyncTest { 14 class TwoClientDictionarySyncTest : public SyncTest {
15 public: 15 public:
16 TwoClientDictionarySyncTest() : SyncTest(TWO_CLIENT) {} 16 TwoClientDictionarySyncTest() : SyncTest(TWO_CLIENT) {}
17 virtual ~TwoClientDictionarySyncTest() {} 17 virtual ~TwoClientDictionarySyncTest() {}
18 18
19 virtual bool TestUsesSelfNotifications() OVERRIDE {
20 return false;
21 }
22
19 private: 23 private:
20 DISALLOW_COPY_AND_ASSIGN(TwoClientDictionarySyncTest); 24 DISALLOW_COPY_AND_ASSIGN(TwoClientDictionarySyncTest);
21 }; 25 };
22 26
23 IN_PROC_BROWSER_TEST_F(TwoClientDictionarySyncTest, Sanity) { 27 IN_PROC_BROWSER_TEST_F(TwoClientDictionarySyncTest, Sanity) {
24 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; 28 ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
25 dictionary_helper::LoadDictionaries(); 29 dictionary_helper::LoadDictionaries();
26 ASSERT_TRUE(dictionary_helper::AwaitDictionariesMatch()); 30 ASSERT_TRUE(dictionary_helper::AwaitDictionariesMatch());
27 31
28 std::vector<std::string> words; 32 std::vector<std::string> words;
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 ASSERT_TRUE(dictionary_helper::AwaitDictionariesMatch()); 91 ASSERT_TRUE(dictionary_helper::AwaitDictionariesMatch());
88 // Remove on client A, check it disappears on B. 92 // Remove on client A, check it disappears on B.
89 ASSERT_TRUE(dictionary_helper::RemoveWord(0, word)); 93 ASSERT_TRUE(dictionary_helper::RemoveWord(0, word));
90 ASSERT_TRUE(dictionary_helper::AwaitDictionariesMatch()); 94 ASSERT_TRUE(dictionary_helper::AwaitDictionariesMatch());
91 // Add on client B, check it appears on A. 95 // Add on client B, check it appears on A.
92 ASSERT_TRUE(dictionary_helper::AddWord(1, word)); 96 ASSERT_TRUE(dictionary_helper::AddWord(1, word));
93 ASSERT_TRUE(dictionary_helper::AwaitDictionariesMatch()); 97 ASSERT_TRUE(dictionary_helper::AwaitDictionariesMatch());
94 ASSERT_EQ(1UL, dictionary_helper::GetDictionarySize(0)); 98 ASSERT_EQ(1UL, dictionary_helper::GetDictionarySize(0));
95 } 99 }
96 100
OLDNEW
« no previous file with comments | « chrome/browser/sync/test/integration/multiple_client_typed_urls_sync_test.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698