chrome/browser/sync/engine/build_and_process_conflict_sets_command_unittest.cc - Issue 9305001: sync: Remove the remaining conflict sets code

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: chrome/browser/sync/engine/build_and_process_conflict_sets_command_unittest.cc

Issue 9305001: sync: Remove the remaining conflict sets code (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Additional comments Created 8 years, 10 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

« chrome/browser/sync/engine/apply_updates_command_unittest.cc ('K') | « chrome/browser/sync/engine/build_and_process_conflict_sets_command.cc ('k') | chrome/browser/sync/engine/conflict_resolver.cc » ('j') | chrome/browser/sync/engine/conflict_resolver.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
	(Empty)
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

3 // found in the LICENSE file.

4

5 #include "base/basictypes.h"

6 #include "base/memory/ref_counted.h"

7 #include "chrome/browser/sync/engine/build_and_process_conflict_sets_command.h"

8 #include "chrome/browser/sync/sessions/session_state.h"

9 #include "chrome/browser/sync/sessions/sync_session.h"

10 #include "chrome/browser/sync/syncable/model_type.h"

11 #include "chrome/browser/sync/syncable/syncable_id.h"

12 #include "chrome/browser/sync/test/engine/fake_model_worker.h"

13 #include "chrome/browser/sync/test/engine/syncer_command_test.h"

14 #include "testing/gtest/include/gtest/gtest.h"

15

16 namespace browser_sync {

17

18 namespace {

19

20 class BuildAndProcessConflictSetsCommandTest : public SyncerCommandTest {

21 protected:

22 BuildAndProcessConflictSetsCommandTest() {}

23 virtual ~BuildAndProcessConflictSetsCommandTest() {}

24

25 virtual void SetUp() {

26 workers()->push_back(

27 make_scoped_refptr(new FakeModelWorker(GROUP_UI)));

28 workers()->push_back(

29 make_scoped_refptr(new FakeModelWorker(GROUP_PASSWORD)));

30 (*mutable_routing_info())[syncable::BOOKMARKS] = GROUP_UI;

31 (*mutable_routing_info())[syncable::PASSWORDS] = GROUP_PASSWORD;

32 SyncerCommandTest::SetUp();

33 }

34

35 BuildAndProcessConflictSetsCommand command_;

36

37 private:

38 DISALLOW_COPY_AND_ASSIGN(BuildAndProcessConflictSetsCommandTest);

39 };

40

41 TEST_F(BuildAndProcessConflictSetsCommandTest, GetGroupsToChange) {

42 ExpectNoGroupsToChange(command_);

43 // Put GROUP_UI in conflict.

44 session()->mutable_status_controller()->

45 GetUnrestrictedMutableConflictProgressForTest(GROUP_UI)->

46 AddConflictingItemById(syncable::Id());

47 ExpectGroupToChange(command_, GROUP_UI);

48 }

49

50 } // namespace

51

52 } // namespace browser_sync

OLD	NEW