summaryrefslogtreecommitdiffstats
path: root/chrome_frame
diff options
context:
space:
mode:
authorananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-01 20:02:48 +0000
committerananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-01 20:02:48 +0000
commit402dbe7586f255309c0c32fdd77dd002a159b36a (patch)
treed7d0c4a978addadbb6f0d6e83e283e13d5f8a68f /chrome_frame
parente5cd1be9da487fc02770064c27275d07590b1433 (diff)
downloadchromium_src-402dbe7586f255309c0c32fdd77dd002a159b36a.zip
chromium_src-402dbe7586f255309c0c32fdd77dd002a159b36a.tar.gz
chromium_src-402dbe7586f255309c0c32fdd77dd002a159b36a.tar.bz2
An attempt to fix the flakiness with the JavascriptWindow open test series. These tests
validate the window dimensions. The code to validate this was all wrong. TBR=amit Review URL: http://codereview.chromium.org/4102017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64652 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
-rw-r--r--chrome_frame/test/mock_ie_event_sink_actions.h10
1 files changed, 4 insertions, 6 deletions
diff --git a/chrome_frame/test/mock_ie_event_sink_actions.h b/chrome_frame/test/mock_ie_event_sink_actions.h
index 1a360e9..0bb51a9 100644
--- a/chrome_frame/test/mock_ie_event_sink_actions.h
+++ b/chrome_frame/test/mock_ie_event_sink_actions.h
@@ -302,13 +302,11 @@ ACTION_P5(ValidateWindowSize, mock, left, top, width, height) {
web_browser2->get_Width(reinterpret_cast<long*>(&actual_width)); // NOLINT
web_browser2->get_Height(reinterpret_cast<long*>(&actual_height)); // NOLINT
- EXPECT_EQ(actual_left, left);
- EXPECT_EQ(actual_top, top);
+ EXPECT_GE(actual_left, left);
+ EXPECT_GE(actual_top, top);
- EXPECT_LE(actual_width, width + 20);
- EXPECT_GT(actual_width, width - 20);
- EXPECT_LE(actual_height, height + 100);
- EXPECT_GT(actual_height, height - 100);
+ EXPECT_GE(actual_width, width);
+ EXPECT_GE(actual_height, height);
}
ACTION_P(VerifyAddressBarUrlWithGcf, mock) {