Enable interactive_ui_tests

chrome/browser/views/tabs/tab_dragging_test.cc

 // Copyright (c) 2006-2008 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 "base/command_line.h"
 #include "base/file_util.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/view_ids.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/automation/window_proxy.h"
 #include "chrome/test/ui/ui_test.h"
 #include "gfx/rect.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/net_util.h"
 #include "views/event.h"
 
+#if defined(OS_CHROMEOS)
+// Disabled, see http://crbug.com/40043.
+#define MAYBE_Tab2OutOfTabStrip DISABLED_Tab2OutOfTabStrip
+#define MAYBE_Tab1Tab3Escape DISABLED_Tab1Tab3Escape
+
+#else
+#define MAYBE_Tab2OutOfTabStrip Tab2OutOfTabStrip
+
+// Flaky, see http://crbug.com/21092.
+#define MAYBE_Tab1Tab3Escape FLAKY_Tab1Tab3Escape
+
+#endif
+
 
 class TabDraggingTest : public UITest {
 protected:
   TabDraggingTest() {
     show_window_ = true;
   }
 };
 
 // Automated UI test to open three tabs in a new window, and drag Tab_1 into
 // the position of Tab_2.
@@ skipping 54 matching lines @@
 
   // Get url Bar bounds.
   gfx::Rect urlbar_bounds;
   ASSERT_TRUE(window->GetViewBounds(VIEW_ID_LOCATION_BAR, &urlbar_bounds,
                                     false));
   EXPECT_LT(0, urlbar_bounds.x());
   EXPECT_LT(0, urlbar_bounds.y());
   EXPECT_LT(0, urlbar_bounds.width());
   EXPECT_LT(0, urlbar_bounds.height());
 
-  // TEST: Move Tab_1 to the position of Tab_2
-  //   ____________   ____________   ____________
-  //  /            \ /            \ /            \
-  // |    Tab_1     |     Tab_2    |    Tab_3     |
-  //  ---- ---- ---- ---- ---- ---- ---- ---- ----
-  //         x---- ---->
-  //              ____________
-  //             /     X      \
-  //            |    Tab_1     |
-  //             ---- ---- ----
+  /*
+    TEST: Move Tab_1 to the position of Tab_2
+     ____________   ____________   ____________
+    /            \ /            \ /            \
+   |    Tab_1     |     Tab_2    |    Tab_3     |
+    ---- ---- ---- ---- ---- ---- ---- ---- ----
+           x---- ---->
+                ____________
+               /     X      \
+              |    Tab_1     |
+               ---- ---- ----
+  */
 
   gfx::Point start(bounds1.x() + bounds1.width() / 2,
                    bounds1.y() + bounds1.height() / 2);
   gfx::Point end(start.x() + 2 * bounds1.width() / 3, start.y());
   ASSERT_TRUE(browser->SimulateDrag(start, end,
                                     views::Event::EF_LEFT_BUTTON_DOWN,
                                     false));
 
   // Now check for expected results.
   tab1 = browser->GetTab(0);
@@ skipping 68 matching lines @@
 
   // Get url Bar bounds.
   gfx::Rect urlbar_bounds;
   ASSERT_TRUE(window->GetViewBounds(VIEW_ID_LOCATION_BAR, &urlbar_bounds,
                                     false));
   EXPECT_LT(0, urlbar_bounds.x());
   EXPECT_LT(0, urlbar_bounds.y());
   EXPECT_LT(0, urlbar_bounds.width());
   EXPECT_LT(0, urlbar_bounds.height());
 
-  // TEST: Move Tab_1 to the middle position of Tab_3
-  //   ____________   ____________   ____________
-  //  /            \ /            \ /            \
-  // |    Tab_1     |     Tab_2    |    Tab_3     |
-  //  ---- ---- ---- ---- ---- ---- ---- ---- ----
-  //         x---- ---- ---- ---- ---- ---->
-  //                                  ____________
-  //                                 /     X      \
-  //                                |    Tab_1     |
-  //                                 ---- ---- ----
+  /*
+   TEST: Move Tab_1 to the middle position of Tab_3
+     ____________   ____________   ____________
+    /            \ /            \ /            \
+   |    Tab_1     |     Tab_2    |    Tab_3     |
+    ---- ---- ---- ---- ---- ---- ---- ---- ----
+           x---- ---- ---- ---- ---- ---->
+                                    ____________
+                                   /     X      \
+                                  |    Tab_1     |
+                                   ---- ---- ----
+  */
 
   gfx::Point start(bounds1.x() + bounds1.width() / 2,
                    bounds1.y() + bounds1.height() / 2);
   gfx::Point end(start.x() + bounds1.width() / 2 + bounds2.width() +
                      bounds3.width() / 2,
                  start.y());
   ASSERT_TRUE(browser->SimulateDrag(start, end,
                                     views::Event::EF_LEFT_BUTTON_DOWN,
                                     false));
 
@@ skipping 13 matching lines @@
   GURL tab3_new_url;
   ASSERT_TRUE(tab3->GetCurrentURL(&tab3_new_url));
 
   EXPECT_EQ(tab1_new_url.spec(), tab2_url.spec());
   EXPECT_EQ(tab2_new_url.spec(), tab3_url.spec());
   EXPECT_EQ(tab3_new_url.spec(), tab1_url.spec());
 }
 
 // Drag Tab_1 into the position of Tab_3, and press ESCAPE before releasing the
 // left mouse button.
-// Flaky, see http://crbug.com/21092.
-TEST_F(TabDraggingTest, FLAKY_Tab1Tab3Escape) {
+TEST_F(TabDraggingTest, MAYBE_Tab1Tab3Escape) {
   scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(browser.get());
   scoped_refptr<WindowProxy> window(browser->GetWindow());
   ASSERT_TRUE(window.get());
 
   // Get initial tab count.
   int initial_tab_count = 0;
   ASSERT_TRUE(browser->GetTabCount(&initial_tab_count));
   ASSERT_TRUE(1 == initial_tab_count);
 
@@ skipping 42 matching lines @@
 
   // Get url Bar bounds.
   gfx::Rect urlbar_bounds;
   ASSERT_TRUE(window->GetViewBounds(VIEW_ID_LOCATION_BAR, &urlbar_bounds,
                                     false));
   EXPECT_LT(0, urlbar_bounds.x());
   EXPECT_LT(0, urlbar_bounds.y());
   EXPECT_LT(0, urlbar_bounds.width());
   EXPECT_LT(0, urlbar_bounds.height());
 
-  // TEST: Move Tab_1 to the middle position of Tab_3
-  //   ____________   ____________   ____________
-  //  /            \ /            \ /            \
-  // |    Tab_1     |     Tab_2    |    Tab_3     |
-  //  ---- ---- ---- ---- ---- ---- ---- ---- ----
-  //         x---- ---- ---- ---- ---- ----> + ESCAPE
-  //                                  ____________
-  //                                 /     X      \
-  //                                |    Tab_1     |
-  //                                 ---- ---- ----
+  /*
+   TEST: Move Tab_1 to the middle position of Tab_3
+     ____________   ____________   ____________
+    /            \ /            \ /            \
+   |    Tab_1     |     Tab_2    |    Tab_3     |
+    ---- ---- ---- ---- ---- ---- ---- ---- ----
+           x---- ---- ---- ---- ---- ----> + ESCAPE
+                                    ____________
+                                   /     X      \
+                                  |    Tab_1     |
+                                   ---- ---- ----
+  */
 
   gfx::Point start(bounds1.x() + bounds1.width() / 2,
                    bounds1.y() + bounds1.height() / 2);
   gfx::Point end(start.x() + bounds1.width() / 2 + bounds2.width() +
                      bounds3.width() / 2,
                  start.y());
 
   // Simulate drag with 'true' as the last parameter. This will interrupt
   // in-flight with Escape.
   ASSERT_TRUE(browser->SimulateDrag(start, end,
@@ skipping 16 matching lines @@
   GURL tab3_new_url;
   ASSERT_TRUE(tab3->GetCurrentURL(&tab3_new_url));
 
   // The tabs should be in their original positions.
   EXPECT_EQ(tab1_new_url.spec(), tab1_url.spec());
   EXPECT_EQ(tab2_new_url.spec(), tab2_url.spec());
   EXPECT_EQ(tab3_new_url.spec(), tab3_url.spec());
 }
 
 // Drag Tab_2 out of the Tab strip. A new window should open with this tab.
-TEST_F(TabDraggingTest, Tab2OutOfTabStrip) {
+TEST_F(TabDraggingTest, MAYBE_Tab2OutOfTabStrip) {
   scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(browser.get());
   scoped_refptr<WindowProxy> window(browser->GetWindow());
   ASSERT_TRUE(window.get());
 
   // Get initial tab count.
   int initial_tab_count = 0;
   ASSERT_TRUE(browser->GetTabCount(&initial_tab_count));
   ASSERT_TRUE(1 == initial_tab_count);
 
@@ skipping 47 matching lines @@
 
   // Get url Bar bounds.
   gfx::Rect urlbar_bounds;
   ASSERT_TRUE(window->GetViewBounds(VIEW_ID_LOCATION_BAR, &urlbar_bounds,
                                     false));
   EXPECT_LT(0, urlbar_bounds.x());
   EXPECT_LT(0, urlbar_bounds.y());
   EXPECT_LT(0, urlbar_bounds.width());
   EXPECT_LT(0, urlbar_bounds.height());
 
-  // TEST: Move Tab_2 down, out of the tab strip.
-  // This should result in the following:
-  //  1- Tab_3 shift left in place of Tab_2 in Window 1
-  //  2- Tab_1 to remain in its place
-  //  3- Tab_2 openes in a new window
-  //
-  //   ____________   ____________   ____________
-  //  /            \ /            \ /            \
-  // |    Tab_1     |     Tab_2    |    Tab_3     |
-  //  ---- ---- ---- ---- ---- ---- ---- ---- ----
-  //                       x
-  //                       |
-  //                       |  (Drag this below, out of tab strip)
-  //                       V
-  //                  ____________
-  //                 /     X      \
-  //                |    Tab_2     |   (New Window)
-  //                ---- ---- ---- ---- ---- ---- ----
+  /*
+   TEST: Move Tab_2 down, out of the tab strip.
+   This should result in the following:
+    1- Tab_3 shift left in place of Tab_2 in Window 1
+    2- Tab_1 to remain in its place
+    3- Tab_2 openes in a new window
+
+     ____________   ____________   ____________
+    /            \ /            \ /            \
+    |    Tab_1     |     Tab_2    |    Tab_3     |
+    ---- ---- ---- ---- ---- ---- ---- ---- ----
+                         x
+                         |
+                         |  (Drag this below, out of tab strip)
+                         V
+                    ____________
+                   /     X      \
+                  |    Tab_2     |   (New Window)
+                  ---- ---- ---- ---- ---- ---- ----
+  */
 
   gfx::Point start(bounds2.x() + bounds2.width() / 2,
                    bounds2.y() + bounds2.height() / 2);
   gfx::Point end(start.x(),
                  start.y() + 3 * urlbar_bounds.height());
 
   // Simulate tab drag.
   ASSERT_TRUE(browser->SimulateDrag(start, end,
                                     views::Event::EF_LEFT_BUTTON_DOWN,
                                     false));
@@ skipping 34 matching lines @@
   scoped_refptr<TabProxy> tab1_2(browser2->GetTab(0));
   ASSERT_TRUE(tab1_2.get());
   GURL tab1_2_url;
   ASSERT_TRUE(tab1_2->GetCurrentURL(&tab1_2_url));
 
   // Tab_1_2 of Window 2 should essentially be Tab_2 of Window 1.
   EXPECT_EQ(tab1_2_url.spec(), tab2_url.spec());
   EXPECT_NE(tab1_2_url.spec(), tab1_url.spec());
   EXPECT_NE(tab1_2_url.spec(), tab3_url.spec());
 }