Add chrome frame tests for common navigation cases to ensure IE is not broken.

chrome_frame/test/test_mock_with_web_server.cc

 // Copyright (c) 2006-2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 #include "chrome_frame/test/test_mock_with_web_server.h"
 
 #include <mshtmcid.h>
 
 #include "base/scoped_bstr_win.h"
 #include "chrome/common/url_constants.h"
 #include "chrome_frame/utils.h"
@@ skipping 129 matching lines @@
   ExpectationSet new_window;
   new_window += EXPECT_CALL(*this, OnNewWindow3(_, _, _, _, _));
   new_window += EXPECT_CALL(*this, OnNewBrowserWindow(_, _))
       .WillOnce(testing::WithArgs<0>(testing::Invoke(CreateFunctor(
                 new_window_mock, &MockWebBrowserEventSink::Attach))));
 
   new_window_mock->ExpectNavigationAndSwitch(std::wstring());
   return new_window;
 }
 
+ExpectationSet MockWebBrowserEventSink::ExpectNavigationInIE(
+    const std::wstring& url) {
+  testing::InSequence sequence;
+  ExpectationSet navigation;
+  navigation += EXPECT_CALL(*this, OnBeforeNavigate2(_,
+                            testing::Field(&VARIANT::bstrVal,
+                            testing::StrCaseEq(url)), _, _, _, _, _));
+  navigation += EXPECT_CALL(*this, OnFileDownload(VARIANT_TRUE, _))
+      .Times(testing::AnyNumber());

[amit, 2010/05/26 22:58:42]

I think we need to be precise here about cardinality here.

[kkania, 2013/02/28 21:50:54]

Done.

+  navigation += EXPECT_CALL(*this, OnNavigateComplete2(_,
+                            testing::Field(&VARIANT::bstrVal,
+                            testing::StrCaseEq(url))));
+
+  return navigation;
+}
+
+ExpectationSet MockWebBrowserEventSink::ExpectNewWindowWithIE(
+  const std::wstring& url, MockWebBrowserEventSink* new_window_mock) {
+  DCHECK(new_window_mock);
+  ExpectationSet new_window;
+  new_window += EXPECT_CALL(*this, OnNewWindow3(_, _, _, _, _));
+  new_window += EXPECT_CALL(*this, OnNewBrowserWindow(_, _))
+      .WillOnce(testing::WithArgs<0>(testing::Invoke(CreateFunctor(
+                new_window_mock, &MockWebBrowserEventSink::Attach))));
+
+  new_window_mock->ExpectNavigationInIE(url);
+  return new_window;
+}
+
 }  // namespace chrome_frame_test
 
 ACTION_P3(DelayCloseBrowserMock, loop, delay, mock) {
   loop->PostDelayedTask(FROM_HERE, NewRunnableMethod(mock,
       &MockWebBrowserEventSink::CloseWebBrowser), delay);
 }
 
 ACTION_P(SetFocusToChrome, mock) {
   mock->SetFocusToChrome();
 }
@@ skipping 13 matching lines @@
 ACTION_P6(DelaySendMouseClick, mock, loop, delay, x, y, button) {
   loop->PostDelayedTask(FROM_HERE, NewRunnableMethod(mock,
       &MockWebBrowserEventSink::SendMouseClick, x, y, button), delay);
 }
 
 ACTION_P4(DelaySendChar, loop, delay, c, mod) {
   loop->PostDelayedTask(FROM_HERE, NewRunnableFunction(
       simulate_input::SendCharA, c, mod), delay);
 }
 
-ACTION_P4(DelaySendScanCode, loop, delay, c, mod) {
-  loop->PostDelayedTask(FROM_HERE, NewRunnableFunction(
-      simulate_input::SendScanCode, c, mod), delay);
-}
-
-ACTION_P5(SendExtendedKeysEnter, loop, delay, c, repeat, mod) {
-  const unsigned int kInterval = 25;
-  unsigned int next_delay = delay;
-  for (int i = 0; i < repeat; i++) {
-    loop->PostDelayedTask(FROM_HERE, NewRunnableFunction(
-        simulate_input::SendExtendedKey, c, mod), next_delay);
-    next_delay += kInterval;
-  }
-
-  loop->PostDelayedTask(FROM_HERE, NewRunnableFunction(
-    simulate_input::SendCharA, VK_RETURN, simulate_input::NONE), next_delay);
-}
-
 ACTION_P3(DelaySendString, loop, delay, str) {
   loop->PostDelayedTask(FROM_HERE, NewRunnableFunction(
       simulate_input::SendStringW, str), delay);
 }
 
+ACTION_P5(SendExtendedKeysEnter, loop, delay, c, repeat, mod) {
+  chrome_frame_test::DelaySendExtendedKeysEnter(loop, delay, c, repeat, mod);
+}
+
 ACTION(DoCloseWindow) {
   ::PostMessage(arg0, WM_SYSCOMMAND, SC_CLOSE, 0);
 }
 
 // This function selects the address bar via the Alt+d shortcut. This is done
 // via a delayed task which executes after the delay which is passed in.
 // The subsequent operations like typing in the actual url and then hitting
 // enter to force the browser to navigate to it each execute as delayed tasks
 // timed at the delay passed in. The recommended value for delay is 2000 ms
 // to account for the time taken for the accelerator keys to be reflected back
@@ skipping 1285 matching lines @@
       .WillOnce(QUIT_LOOP(loop));
 
   HRESULT hr = mock.LaunchIEAndNavigate(kSubFrameUrl1);
   ASSERT_HRESULT_SUCCEEDED(hr);
   if (hr == S_FALSE)
     return;
 
   ASSERT_TRUE(mock.web_browser2() != NULL);
   loop.RunFor(kChromeFrameLongNavigationTimeoutInSeconds);
 }