diff options
| author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-16 01:16:02 +0000 |
|---|---|---|
| committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-16 01:16:02 +0000 |
| commit | 3c903badb6eaee79699ccee5e0459855de370db5 (patch) | |
| tree | fe034544bc8e61adb37189a932f32d0da368489b /chrome_frame/test | |
| parent | 0547184a0c99964da3babb4cc6a23fc2313b69a4 (diff) | |
| download | chromium_src-3c903badb6eaee79699ccee5e0459855de370db5.zip chromium_src-3c903badb6eaee79699ccee5e0459855de370db5.tar.gz chromium_src-3c903badb6eaee79699ccee5e0459855de370db5.tar.bz2 | |
Fix the ChromeFrame back forward test failures on the builder by reverting to the original mock
specifications. These test still fail on my machine. Will debug that and submit a fix in a subsequent
CL.
TBR=amit
Review URL: http://codereview.chromium.org/1027001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41665 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/test')
| -rw-r--r-- | chrome_frame/test/test_mock_with_web_server.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/chrome_frame/test/test_mock_with_web_server.cc b/chrome_frame/test/test_mock_with_web_server.cc index 4a8f76b..cbd3b15 100644 --- a/chrome_frame/test/test_mock_with_web_server.cc +++ b/chrome_frame/test/test_mock_with_web_server.cc @@ -574,7 +574,7 @@ TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_BackForward) { // We have reached url 2 and have 1 back & 1 forward entries for url 1 & 3 // Go back to url 1 now - mock.ExpectNavigationAndSwitchSequence(kSubFrameUrl2); + mock.ExpectNavigation(kSubFrameUrl2); EXPECT_CALL(mock, OnLoad(testing::StrCaseEq(kSubFrameUrl2))) .WillOnce(testing::IgnoreResult(testing::InvokeWithoutArgs( CreateFunctor(ReceivePointer(mock.web_browser2_), @@ -582,7 +582,7 @@ TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_BackForward) { // We have reached url 1 and have 0 back & 2 forward entries for url 2 & 3 // Go back to url 1 now - mock.ExpectNavigationAndSwitchSequence(kSubFrameUrl1); + mock.ExpectNavigation(kSubFrameUrl1); EXPECT_CALL(mock, OnLoad(testing::StrCaseEq(kSubFrameUrl1))) .WillOnce(CloseBrowserMock(&mock)); EXPECT_CALL(mock, OnQuit()).WillOnce(QUIT_LOOP(loop)); @@ -849,14 +849,14 @@ TEST_F(ChromeFrameTestWithWebServer, .WillOnce(testing::DoAll( DelaySendMouseClick(&mock, &loop, 0, 10, 10, simulate_input::RIGHT), SendExtendedKeysEnter(&loop, 500, VK_DOWN, 1, simulate_input::NONE))); - mock.ExpectNavigationAndSwitchSequence(kSubFrameUrl1); + mock.ExpectNavigation(kSubFrameUrl1); // Go forward using Rt-Click + DOWN + DOWN + ENTER EXPECT_CALL(mock, OnLoad(testing::StrCaseEq(kSubFrameUrl1))) .WillOnce(testing::DoAll( DelaySendMouseClick(&mock, &loop, 0, 10, 10, simulate_input::RIGHT), SendExtendedKeysEnter(&loop, 500, VK_DOWN, 2, simulate_input::NONE))); - mock.ExpectNavigationAndSwitchSequence(kSubFrameUrl2); + mock.ExpectNavigation(kSubFrameUrl2); EXPECT_CALL(mock, OnLoad(testing::StrCaseEq(kSubFrameUrl2))) .WillOnce(CloseBrowserMock(&mock)); @@ -1087,13 +1087,13 @@ TEST_F(ChromeFrameTestWithWebServer, SetFocusToChrome(&mock), DelaySendScanCode(&loop, 500, bkspace, simulate_input::NONE))); - mock.ExpectNavigationAndSwitchSequence(kSubFrameUrl1); + mock.ExpectNavigation(kSubFrameUrl1); EXPECT_CALL(mock, OnLoad(testing::StrCaseEq(kSubFrameUrl1))) .WillOnce(testing::DoAll( SetFocusToChrome(&mock), DelaySendScanCode(&loop, 1500, bkspace, simulate_input::SHIFT))); - mock.ExpectNavigationAndSwitchSequence(kSubFrameUrl2); + mock.ExpectNavigation(kSubFrameUrl2); EXPECT_CALL(mock, OnLoad(testing::StrCaseEq(kSubFrameUrl2))) .WillOnce(CloseBrowserMock(&mock)); |