Fix more ChromeFrame tests so that they work on IE9.

Fix more ChromeFrame tests so that they work on IE9.


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=66193

[amit, 2010-11-15 23:57:34]

LGTM, thanks for debugging and fixing this.

On Mon, Nov 15, 2010 at 3:09 PM, <ananta@chromium.org> wrote:

> Reviewers: amit,
>
> Description:
> Fix more ChromeFrame tests so that they work on IE9.
>
>
> Please review this at http://codereview.chromium.org/4983004/
>
> SVN Base: svn://svn.chromium.org/chrome/trunk/src/
>
> Affected files:
>  M     chrome_frame/test/chrome_frame_ui_test_utils.cc
>  M     chrome_frame/test/navigation_test.cc
>  M     chrome_frame/test/test_with_web_server.cc
>
>
> Index: chrome_frame/test/chrome_frame_ui_test_utils.cc
> ===================================================================
> --- chrome_frame/test/chrome_frame_ui_test_utils.cc     (revision 65626)
> +++ chrome_frame/test/chrome_frame_ui_test_utils.cc     (working copy)
> @@ -548,7 +548,8 @@
>   std::wstring name, role_text, value;
>   if (name_.length()) {
>     object->GetName(&name);
> -    does_match = MatchPattern(name, name_);
> +    does_match = MatchPattern(StringToUpperASCII(name),
> +                              StringToUpperASCII(name_));
>   }
>   if (does_match && role_text_.length()) {
>     object->GetRoleText(&role_text);
> Index: chrome_frame/test/navigation_test.cc
> ===================================================================
> --- chrome_frame/test/navigation_test.cc        (revision 66158)
> +++ chrome_frame/test/navigation_test.cc        (working copy)
> @@ -301,8 +301,8 @@
>     win_observer_mock.WatchWindow(kAlertDlgCaption, "");
>
>     EXPECT_CALL(ie_mock_, OnBeforeNavigate2(_,
> testing::Field(&VARIANT::bstrVal,
> -          testing::StrCaseEq(GetSimplePageUrl())), _, _, _, _, _))
> -      .Times(1);
> +        testing::HasSubstr(GetSimplePageUrl())), _, _, _, _, _))
> +        .Times(testing::AtMost(2));
>
>     EXPECT_CALL(ie_mock_, OnNavigateComplete2(_,
>             testing::Field(&VARIANT::bstrVal, StrEq(GetSimplePageUrl()))))
> Index: chrome_frame/test/test_with_web_server.cc
> ===================================================================
> --- chrome_frame/test/test_with_web_server.cc   (revision 66158)
> +++ chrome_frame/test/test_with_web_server.cc   (working copy)
> @@ -1136,6 +1136,7 @@
>  TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_TestDownloadFromForm) {
>   chrome_frame_test::MockWindowObserver win_observer_mock;
>   win_observer_mock.WatchWindow("File Download", "");
> +  win_observer_mock.WatchWindow("View Downloads*", "");
>
>   // The content of our HTML test page.  This will be returned whenever
>   // we reply to a GET request.
>
>
>