Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1327)

Unified Diff: chrome/browser/blocked_popup_container_interactive_uitest.cc

Issue 174201: More interactive test porting for Linux. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fixes Created 11 years, 4 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/blocked_popup_container_interactive_uitest.cc
===================================================================
--- chrome/browser/blocked_popup_container_interactive_uitest.cc (revision 23895)
+++ chrome/browser/blocked_popup_container_interactive_uitest.cc (working copy)
@@ -61,7 +61,7 @@
scoped_refptr<TabProxy> tab_;
};
-TEST_F(BlockedPopupContainerInteractiveTest, DISABLED_TestOpenAndResizeTo) {
+TEST_F(BlockedPopupContainerInteractiveTest, TestOpenAndResizeTo) {
NavigateMainTabTo(L"constrained_window_onload_resizeto.html");
SimulateClickInCenterOf(window_);
@@ -100,12 +100,17 @@
ASSERT_TRUE(popup_window->GetViewBoundsWithTimeout(
VIEW_ID_TAB_CONTAINER, &rect, false, 1000, &is_timeout));
ASSERT_FALSE(is_timeout);
+ EXPECT_LT(rect.height(), 200);
+#if defined(OS_LINUX)
+ // On Linux we may run in an environment where there is no window frame. In
+ // this case our width might be exactly 200. The height will still be less
+ // because we have to show the location bar.
+ EXPECT_LE(rect.width(), 200);
+#else
EXPECT_LT(rect.width(), 200);
- EXPECT_LT(rect.height(), 200);
+#endif
}
-// TODO(estade): port.
-#if !defined(OS_LINUX)
// Helper function used to get the number of blocked popups out of the window
// title.
bool ParseCountOutOfTitle(const std::wstring& title, int* output) {
@@ -128,7 +133,7 @@
// Tests that in the window.open() equivalent of a fork bomb, we stop building
// windows.
-TEST_F(BlockedPopupContainerInteractiveTest, DISABLED_DontSpawnEndlessPopups) {
+TEST_F(BlockedPopupContainerInteractiveTest, DontSpawnEndlessPopups) {
NavigateMainTabTo(L"infinite_popups.html");
SimulateClickInCenterOf(window_);
@@ -171,7 +176,7 @@
// Make sure that we refuse to close windows when a constrained popup is
// displayed.
-TEST_F(BlockedPopupContainerInteractiveTest, DISABLED_WindowOpenWindowClosePopup) {
+TEST_F(BlockedPopupContainerInteractiveTest, WindowOpenWindowClosePopup) {
NavigateMainTabTo(L"openclose_main.html");
SimulateClickInCenterOf(window_);
@@ -207,7 +212,7 @@
ASSERT_EQ(1, popup_count);
}
-TEST_F(BlockedPopupContainerInteractiveTest, DISABLED_ShowAlertFromNormalPopup) {
+TEST_F(BlockedPopupContainerInteractiveTest, ShowAlertFromNormalPopup) {
NavigateMainTabTo(L"show_alert.html");
SimulateClickInCenterOf(window_);
@@ -228,7 +233,7 @@
// Make sure that window focus works while creating a popup window so that we
// don't
-TEST_F(BlockedPopupContainerInteractiveTest, DISABLED_DontBreakOnBlur) {
+TEST_F(BlockedPopupContainerInteractiveTest, DontBreakOnBlur) {
NavigateMainTabTo(L"window_blur_test.html");
SimulateClickInCenterOf(window_);
@@ -238,4 +243,3 @@
// We popup shouldn't be closed by the onblur handler.
ASSERT_FALSE(automation()->WaitForWindowCountToBecome(1, 1500));
}
-#endif

Powered by Google App Engine
This is Rietveld 408576698