chrome/test/live_sync/two_client_live_sessions_sync_test.cc - Issue 6462015: Cleanup more test 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/test/live_sync/two_client_live_sessions_sync_test.cc

Issue 6462015: Cleanup more test code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: wtf windows is this me Created 9 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

« no previous file with comments | « chrome/test/live_sync/two_client_live_preferences_sync_test.cc ('k') | chrome/test/live_sync/two_client_live_themes_sync_test.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2010 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 "chrome/browser/sessions/session_service.h"

	6 #include "chrome/browser/sync/profile_sync_service_harness.h"

5 #include "chrome/test/live_sync/live_sessions_sync_test.h"	7 #include "chrome/test/live_sync/live_sessions_sync_test.h"

6	8

7 // @TODO(zea): Test each individual session command we care about separately.	9 // @TODO(zea): Test each individual session command we care about separately.

8 // (as well as multi-window). We're currently only checking basic single-window/	10 // (as well as multi-window). We're currently only checking basic single-window/

9 // single-tab functionality.	11 // single-tab functionality.

10	12

11 IN_PROC_BROWSER_TEST_F(TwoClientLiveSessionsSyncTest, SingleClientChanged) {	13 IN_PROC_BROWSER_TEST_F(TwoClientLiveSessionsSyncTest, SingleClientChanged) {

12 ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";	14 ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";

13	15

14 ASSERT_TRUE(CheckInitialState(0));	16 ASSERT_TRUE(CheckInitialState(0));

(...skipping 37 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
52 ASSERT_TRUE(GetSessionData(0, &sessions0));	54 ASSERT_TRUE(GetSessionData(0, &sessions0));

53 ASSERT_TRUE(GetSessionData(1, &sessions1));	55 ASSERT_TRUE(GetSessionData(1, &sessions1));

54	56

55 // Verify client 1's foreign session matches client 0's current window and	57 // Verify client 1's foreign session matches client 0's current window and

56 // vice versa.	58 // vice versa.

57 ASSERT_EQ(1U, sessions0.size());	59 ASSERT_EQ(1U, sessions0.size());

58 ASSERT_EQ(1U, sessions1.size());	60 ASSERT_EQ(1U, sessions1.size());

59 ASSERT_TRUE(WindowsMatch(sessions1[0]->windows, *client0_windows));	61 ASSERT_TRUE(WindowsMatch(sessions1[0]->windows, *client0_windows));

60 ASSERT_TRUE(WindowsMatch(sessions0[0]->windows, *client1_windows));	62 ASSERT_TRUE(WindowsMatch(sessions0[0]->windows, *client1_windows));

61 }	63 }

OLD	NEW