chrome_frame/test/external_sites_test.cc - Issue 10007043: Attempt to fix ChromeFrameTestWithWebServer tests.

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_frame/test/external_sites_test.cc

Issue 10007043: Attempt to fix ChromeFrameTestWithWebServer tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Added retry logic for WidgetModeIE_Version. Created 8 years, 8 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_frame/test/chrome_frame_test_utils.h ('K') | « chrome_frame/test/delete_chrome_history_test.cc ('k') | chrome_frame/test/infobar_unittests.cc » ('j') | chrome_frame/test/mock_ie_event_sink_test.cc » ('J')
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) 2012 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 <string>	5 #include <string>

6	6

7 #include "chrome_frame/test/chrome_frame_test_utils.h"	7 #include "chrome_frame/test/chrome_frame_test_utils.h"

8 #include "chrome_frame/test/mock_ie_event_sink_actions.h"	8 #include "chrome_frame/test/mock_ie_event_sink_actions.h"

9 #include "chrome_frame/test/mock_ie_event_sink_test.h"	9 #include "chrome_frame/test/mock_ie_event_sink_test.h"

10	10

11 using testing::_;	11 using testing::_;

(...skipping 24 matching lines...) Expand all Loading...
36 TEST_P(ChromeFrameSitesTest, LoadSite) {	36 TEST_P(ChromeFrameSitesTest, LoadSite) {

37 // Print name of site for debugging purposes.	37 // Print name of site for debugging purposes.

38 std::wcout << L"Navigating to site: " << GetParam() << std::endl;	38 std::wcout << L"Navigating to site: " << GetParam() << std::endl;

39	39

40 // Verify navigation to the url passed in as parameter.	40 // Verify navigation to the url passed in as parameter.

41 EXPECT_CALL(ie_mock_, OnLoad(IN_CF, StrEq(GetParam())))	41 EXPECT_CALL(ie_mock_, OnLoad(IN_CF, StrEq(GetParam())))

42 .WillOnce(testing::DoAll(	42 .WillOnce(testing::DoAll(

43 VerifyAddressBarUrl(&ie_mock_),	43 VerifyAddressBarUrl(&ie_mock_),

44 CloseBrowserMock(&ie_mock_)));	44 CloseBrowserMock(&ie_mock_)));

45	45

46 LaunchIENavigateAndLoop(GetParam(),	46 LaunchIENavigateAndLoop(GetParam(), kChromeFrameLongNavigationTimeout * 2);

47 kChromeFrameLongNavigationTimeoutInSeconds * 2);

48 }	47 }

49	48

50 } // namespace chrome_frame_test	49 } // namespace chrome_frame_test

OLD	NEW