BookmarkBarView tests fixes

chrome/browser/views/bookmark_bar_view_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/keyboard_codes.h"
 #include "base/string_util.h"
 #include "chrome/browser/automation/ui_controls.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/pref_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/page_navigator.h"
 #include "chrome/browser/views/bookmark_bar_view.h"
+#include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/testing_profile.h"
 #include "chrome/test/interactive_ui/view_event_test_base.h"
+#include "chrome/test/ui_test_utils.h"
 #include "grit/generated_resources.h"
 #include "views/controls/button/menu_button.h"
 #include "views/controls/button/text_button.h"
 #include "views/controls/menu/menu_controller.h"
 #include "views/controls/menu/menu_item_view.h"
 #include "views/controls/menu/submenu_view.h"
 #include "views/window/window.h"
 
+#if defined(OS_LINUX)
+// See http://crbug.com/40040 for details.
+#define MAYBE_DND DISABLED_DND
+#define MAYBE_DNDToDifferentMenu DISABLED_DNDToDifferentMenu
+#define MAYBE_DNDBackToOriginatingMenu DISABLED_DNDBackToOriginatingMenu
+
+// See http://crbug.com/40039 for details.
+#define MAYBE_KeyEvents DISABLED_KeyEvents
+
+#else
+
+#define MAYBE_DND DND
+#define MAYBE_DNDToDifferentMenu DNDToDifferentMenu
+#define MAYBE_DNDBackToOriginatingMenu DNDBackToOriginatingMenu
+#define MAYBE_DNDBackToOriginatingMenu DNDBackToOriginatingMenu
+#define MAYBE_KeyEvents KeyEvents
+
+#endif
+
 namespace {
 
 // PageNavigator implementation that records the URL.
 class TestingPageNavigator : public PageNavigator {
  public:
   virtual void OpenURL(const GURL& url, const GURL& referrer,
                        WindowOpenDisposition disposition,
                        PageTransition::Type transition) {
     url_ = url;
   }
@@ skipping 303 matching lines @@
         menu->GetSubmenu()->GetMenuItemAt(1);
     ASSERT_TRUE(child_menu->GetSubmenu() != NULL);
     ASSERT_FALSE(child_menu->GetSubmenu()->IsShowing());
 
     // And submenu we last clicked is showing.
     child_menu = menu->GetSubmenu()->GetMenuItemAt(2);
     ASSERT_TRUE(child_menu != NULL);
     ASSERT_TRUE(child_menu->GetSubmenu()->IsShowing());
 
     // Nothing should have been selected.
-    ASSERT_TRUE(navigator_.url_ == GURL());
+    EXPECT_EQ(GURL(), navigator_.url_);
 
     // Hide menu.
     menu->GetMenuController()->Cancel(true);
 
     Done();
   }
 };
 
 VIEW_TEST(BookmarkBarViewTest3, Submenus)
 
+// Observer that posts task upon the context menu creation.
+// This is necessary for Linux as the context menu has to check
+// the clipboard, which invokes the event loop.
+class ContextMenuNotificationObserver : public NotificationObserver {
+ public:
+  explicit ContextMenuNotificationObserver(Task* task) : task_(task) {
+    registrar_.Add(this,
+                   NotificationType::BOOKMARK_CONTEXT_MENU_SHOWN,
+                   NotificationService::AllSources());
+  }
+
+  virtual void Observe(NotificationType type,
+                       const NotificationSource& source,
+                       const NotificationDetails& details) {
+    MessageLoop::current()->PostTask(FROM_HERE, task_);
+  }
+
+ private:
+  NotificationRegistrar registrar_;
+  Task* task_;
+
+  DISALLOW_COPY_AND_ASSIGN(ContextMenuNotificationObserver);
+};
+
 // Tests context menus by way of opening a context menu for a bookmark,
 // then right clicking to get context menu and selecting the first menu item
 // (open).
 class BookmarkBarViewTest4 : public BookmarkBarViewEventTestBase {
+ public:
+  BookmarkBarViewTest4()
+      : ALLOW_THIS_IN_INITIALIZER_LIST(
+          observer_(CreateEventTask(this, &BookmarkBarViewTest4::Step3))) {
+  }
+
  protected:
   virtual void DoTestOnMessageLoop() {
     // Move the mouse to the first folder on the bookmark bar and press the
     // mouse.
     views::TextButton* button = bb_view_->other_bookmarked_button();
     ui_controls::MoveMouseToCenterAndPress(button, ui_controls::LEFT,
         ui_controls::DOWN | ui_controls::UP,
         CreateEventTask(this, &BookmarkBarViewTest4::Step2));
   }
 
  private:
   void Step2() {
     // Menu should be showing.
     views::MenuItemView* menu = bb_view_->GetMenu();
     ASSERT_TRUE(menu != NULL);
     ASSERT_TRUE(menu->GetSubmenu()->IsShowing());
 
     views::MenuItemView* child_menu =
         menu->GetSubmenu()->GetMenuItemAt(0);
     ASSERT_TRUE(child_menu != NULL);
 
     // Right click on the first child to get its context menu.
     ui_controls::MoveMouseToCenterAndPress(child_menu, ui_controls::RIGHT,
-        ui_controls::DOWN | ui_controls::UP,
-        CreateEventTask(this, &BookmarkBarViewTest4::Step3));
+        ui_controls::DOWN | ui_controls::UP, NULL);
+    // Step3 will be invoked by ContextMenuNotificationObserver.
   }
 
   void Step3() {
     // Make sure the context menu is showing.
     views::MenuItemView* menu = bb_view_->GetContextMenu();
     ASSERT_TRUE(menu != NULL);
     ASSERT_TRUE(menu->GetSubmenu());
     ASSERT_TRUE(menu->GetSubmenu()->IsShowing());
 
     // Select the first menu item (open).
     ui_controls::MoveMouseToCenterAndPress(menu->GetSubmenu()->GetMenuItemAt(0),
         ui_controls::LEFT, ui_controls::DOWN | ui_controls::UP,
         CreateEventTask(this, &BookmarkBarViewTest4::Step4));
   }
 
   void Step4() {
-    ASSERT_TRUE(navigator_.url_ ==
-                model_->other_node()->GetChild(0)->GetURL());
+    EXPECT_EQ(navigator_.url_,
+              model_->other_node()->GetChild(0)->GetURL());
 
     Done();
   }
+
+  ContextMenuNotificationObserver observer_;
 };
 
 VIEW_TEST(BookmarkBarViewTest4, ContextMenus)
 
 // Tests drag and drop within the same menu.
 class BookmarkBarViewTest5 : public BookmarkBarViewEventTestBase {
  protected:
   virtual void DoTestOnMessageLoop() {
     url_dragging_ =
         model_->GetBookmarkBarNode()->GetChild(0)->GetChild(0)->GetURL();
@@ skipping 32 matching lines @@
     // Start a drag.
     ui_controls::SendMouseMoveNotifyWhenDone(loc.x() + 10, loc.y(),
         CreateEventTask(this, &BookmarkBarViewTest5::Step4));
 
     // See comment above this method as to why we do this.
     ScheduleMouseMoveInBackground(loc.x(), loc.y());
   }
 
   void Step4() {
     // Drop the item so that it's now the second item.
-   views::MenuItemView* target_menu =
+    views::MenuItemView* target_menu =
         bb_view_->GetMenu()->GetSubmenu()->GetMenuItemAt(1);
-   gfx::Point loc(1, target_menu->height() - 1);
+    gfx::Point loc(1, target_menu->height() - 1);
     views::View::ConvertPointToScreen(target_menu, &loc);
     ui_controls::SendMouseMove(loc.x(), loc.y());
 
     ui_controls::SendMouseEventsNotifyWhenDone(ui_controls::LEFT,
         ui_controls::UP,
         CreateEventTask(this, &BookmarkBarViewTest5::Step5));
   }
 
   void Step5() {
     GURL url = model_->GetBookmarkBarNode()->GetChild(0)->GetChild(1)->GetURL();
-    ASSERT_TRUE(url == url_dragging_);
+    EXPECT_EQ(url_dragging_, url);
     Done();
   }
 
   GURL url_dragging_;
 };
 
-VIEW_TEST(BookmarkBarViewTest5, DND)
+VIEW_TEST(BookmarkBarViewTest5, MAYBE_DND)
 
 // Tests holding mouse down on overflow button, dragging such that menu pops up
 // then selecting an item.
 class BookmarkBarViewTest6 : public BookmarkBarViewEventTestBase {
  protected:
   virtual void DoTestOnMessageLoop() {
     // Press the mouse button on the overflow button. Don't release it though.
     views::TextButton* button = bb_view_->overflow_button();
     ui_controls::MoveMouseToCenterAndPress(button, ui_controls::LEFT,
         ui_controls::DOWN, CreateEventTask(this, &BookmarkBarViewTest6::Step2));
@@ skipping 89 matching lines @@
   }
 
   void Step5() {
     ASSERT_TRUE(model_->other_node()->GetChild(0)->GetURL() == url_dragging_);
     Done();
   }
 
   GURL url_dragging_;
 };
 
-VIEW_TEST(BookmarkBarViewTest7, DNDToDifferentMenu)
+VIEW_TEST(BookmarkBarViewTest7, MAYBE_DNDToDifferentMenu)
 
 // Drags from one menu to next so that original menu closes, then back to
 // original menu.
 class BookmarkBarViewTest8 : public BookmarkBarViewEventTestBase {
  protected:
   virtual void DoTestOnMessageLoop() {
     url_dragging_ =
         model_->GetBookmarkBarNode()->GetChild(0)->GetChild(0)->GetURL();
 
     // Move the mouse to the first folder on the bookmark bar and press the
@@ skipping 66 matching lines @@
     // Make sure drop was processed.
     GURL final_url = model_->GetBookmarkBarNode()->GetChild(0)->GetChild(0)->
         GetChild(1)->GetURL();
     ASSERT_TRUE(final_url == url_dragging_);
     Done();
   }
 
   GURL url_dragging_;
 };
 
-VIEW_TEST(BookmarkBarViewTest8, DNDBackToOriginatingMenu)
+VIEW_TEST(BookmarkBarViewTest8, MAYBE_DNDBackToOriginatingMenu)
 
 // Moves the mouse over the scroll button and makes sure we get scrolling.
 class BookmarkBarViewTest9 : public BookmarkBarViewEventTestBase {
  protected:
   virtual bool CreateBigMenu() { return true; }
 
   virtual void DoTestOnMessageLoop() {
     // Move the mouse to the first folder on the bookmark bar and press the
     // mouse.
     views::TextButton* button = bb_view_->GetBookmarkButton(0);
@@ skipping 17 matching lines @@
     // Move the mouse over the scroll button.
     views::View* scroll_container = menu->GetSubmenu()->GetParent();
     ASSERT_TRUE(scroll_container != NULL);
     scroll_container = scroll_container->GetParent();
     ASSERT_TRUE(scroll_container != NULL);
     views::View* scroll_down_button = scroll_container->GetChildViewAt(1);
     ASSERT_TRUE(scroll_down_button);
     gfx::Point loc(scroll_down_button->width() / 2,
                    scroll_down_button->height() / 2);
     views::View::ConvertPointToScreen(scroll_down_button, &loc);
+
+    // On linux, the sending one location isn't enough.
+    ui_controls::SendMouseMove(loc.x() - 1 , loc.y() - 1);
     ui_controls::SendMouseMoveNotifyWhenDone(
         loc.x(), loc.y(), CreateEventTask(this, &BookmarkBarViewTest9::Step3));
   }
 
   void Step3() {
     MessageLoop::current()->PostDelayedTask(FROM_HERE,
         NewRunnableMethod(this, &BookmarkBarViewTest9::Step4), 200);
   }
 
   void Step4() {
     gfx::Point menu_loc;
     views::View::ConvertPointToScreen(first_menu_, &menu_loc);
     ASSERT_NE(start_y_, menu_loc.y());
 
     // Hide menu.
     bb_view_->GetMenu()->GetMenuController()->Cancel(true);
 
-    Done();
+    // On linux, Cancelling menu will call Quit on the message loop,
+    // which can interfere with Done. We need to run Done in the
+    // next execution loop.
+    MessageLoop::current()->PostTask(
+        FROM_HERE,
+        NewRunnableMethod(this, &ViewEventTestBase::Done));
   }
 
   int start_y_;
   views::MenuItemView* first_menu_;
 };
 
 VIEW_TEST(BookmarkBarViewTest9, ScrollButtonScrolls)
 
 // Tests up/down/left/enter key messages.
 class BookmarkBarViewTest10 : public BookmarkBarViewEventTestBase {
  protected:
   virtual void DoTestOnMessageLoop() {
     // Move the mouse to the first folder on the bookmark bar and press the
     // mouse.
     views::TextButton* button = bb_view_->GetBookmarkButton(0);
     ui_controls::MoveMouseToCenterAndPress(button, ui_controls::LEFT,
         ui_controls::DOWN | ui_controls::UP,
         CreateEventTask(this, &BookmarkBarViewTest10::Step2));
+    MessageLoop::current()->RunAllPending();
   }
 
  private:
   void Step2() {
     // Menu should be showing.
     views::MenuItemView* menu = bb_view_->GetMenu();
     ASSERT_TRUE(menu != NULL);
     ASSERT_TRUE(menu->GetSubmenu()->IsShowing());
 
     // Send a down event, which should select the first item.
@@ skipping 73 matching lines @@
   }
 
   void Step8() {
     ASSERT_TRUE(
         model_->GetBookmarkBarNode()->GetChild(0)->GetChild(0)->GetURL() ==
         navigator_.url_);
     Done();
   }
 };
 
-VIEW_TEST(BookmarkBarViewTest10, KeyEvents)
+VIEW_TEST(BookmarkBarViewTest10, MAYBE_KeyEvents)
 
 // Make sure the menu closes with the following sequence: show menu, show
 // context menu, close context menu (via escape), then click else where. This
 // effectively verifies we maintain mouse capture after the context menu is
 // hidden.
 class BookmarkBarViewTest11 : public BookmarkBarViewEventTestBase {
+ public:
+  BookmarkBarViewTest11()
+      : ALLOW_THIS_IN_INITIALIZER_LIST(
+          observer_(CreateEventTask(this, &BookmarkBarViewTest11::Step3))) {
+  }
+
  protected:
   virtual void DoTestOnMessageLoop() {
     // Move the mouse to the first folder on the bookmark bar and press the
     // mouse.
     views::TextButton* button = bb_view_->other_bookmarked_button();
     ui_controls::MoveMouseToCenterAndPress(button, ui_controls::LEFT,
         ui_controls::DOWN | ui_controls::UP,
         CreateEventTask(this, &BookmarkBarViewTest11::Step2));
   }
 
  private:
   void Step2() {
     // Menu should be showing.
     views::MenuItemView* menu = bb_view_->GetMenu();
     ASSERT_TRUE(menu != NULL);
     ASSERT_TRUE(menu->GetSubmenu()->IsShowing());
 
     views::MenuItemView* child_menu =
         menu->GetSubmenu()->GetMenuItemAt(0);
     ASSERT_TRUE(child_menu != NULL);
 
     // Right click on the first child to get its context menu.
     ui_controls::MoveMouseToCenterAndPress(child_menu, ui_controls::RIGHT,
-        ui_controls::DOWN | ui_controls::UP,
-        CreateEventTask(this, &BookmarkBarViewTest11::Step3));
+        ui_controls::DOWN | ui_controls::UP, NULL);
+    // Step3 will be invoked by ContextMenuNotificationObserver.
   }
 
   void Step3() {
     // Send escape so that the context menu hides.
     ui_controls::SendKeyPressNotifyWhenDone(
         NULL, base::VKEY_ESCAPE, false, false, false,
         CreateEventTask(this, &BookmarkBarViewTest11::Step4));
   }
 
   void Step4() {
@@ skipping 15 matching lines @@
         CreateEventTask(this, &BookmarkBarViewTest11::Step5));
   }
 
   void Step5() {
     // Make sure the menu is not showing.
     views::MenuItemView* menu = bb_view_->GetMenu();
     ASSERT_TRUE(!menu || !menu->GetSubmenu() ||
                 !menu->GetSubmenu()->IsShowing());
     Done();
   }
+
+  ContextMenuNotificationObserver observer_;
 };
 
 VIEW_TEST(BookmarkBarViewTest11, CloseMenuAfterClosingContextMenu)
 
 // Tests showing a modal dialog from a context menu.
 class BookmarkBarViewTest12 : public BookmarkBarViewEventTestBase {
  protected:
   virtual void DoTestOnMessageLoop() {
     // Open up the other folder.
     views::TextButton* button = bb_view_->other_bookmarked_button();
@@ skipping 67 matching lines @@
   void Step7() {
     Done();
   }
 };
 
 VIEW_TEST(BookmarkBarViewTest12, CloseWithModalDialog)
 
 // Tests clicking on the separator of a context menu (this is for coverage of
 // bug 17862).
 class BookmarkBarViewTest13 : public BookmarkBarViewEventTestBase {
+ public:
+  BookmarkBarViewTest13()
+      : ALLOW_THIS_IN_INITIALIZER_LIST(
+          observer_(CreateEventTask(this, &BookmarkBarViewTest13::Step3))) {
+  }
+
  protected:
   virtual void DoTestOnMessageLoop() {
     // Move the mouse to the first folder on the bookmark bar and press the
     // mouse.
     views::TextButton* button = bb_view_->other_bookmarked_button();
     ui_controls::MoveMouseToCenterAndPress(button, ui_controls::LEFT,
         ui_controls::DOWN | ui_controls::UP,
         CreateEventTask(this, &BookmarkBarViewTest13::Step2));
   }
 
  private:
   void Step2() {
     // Menu should be showing.
     views::MenuItemView* menu = bb_view_->GetMenu();
     ASSERT_TRUE(menu != NULL);
     ASSERT_TRUE(menu->GetSubmenu()->IsShowing());
 
     views::MenuItemView* child_menu =
         menu->GetSubmenu()->GetMenuItemAt(0);
     ASSERT_TRUE(child_menu != NULL);
 
     // Right click on the first child to get its context menu.
     ui_controls::MoveMouseToCenterAndPress(child_menu, ui_controls::RIGHT,
-        ui_controls::DOWN | ui_controls::UP,
-        CreateEventTask(this, &BookmarkBarViewTest13::Step3));
+        ui_controls::DOWN | ui_controls::UP, NULL);
+    // Step3 will be invoked by ContextMenuNotificationObserver.
   }
 
   void Step3() {
     // Make sure the context menu is showing.
     views::MenuItemView* menu = bb_view_->GetContextMenu();
     ASSERT_TRUE(menu != NULL);
     ASSERT_TRUE(menu->GetSubmenu());
     ASSERT_TRUE(menu->GetSubmenu()->IsShowing());
 
     // Find the first separator.
@@ skipping 22 matching lines @@
     ASSERT_TRUE(menu->GetSubmenu());
     ASSERT_TRUE(menu->GetSubmenu()->IsShowing());
 
     // Select the first context menu item.
     ui_controls::MoveMouseToCenterAndPress(menu->GetSubmenu()->GetMenuItemAt(0),
         ui_controls::LEFT, ui_controls::DOWN | ui_controls::UP,
         CreateEventTask(this, &BookmarkBarViewTest13::Step5));
   }
 
   void Step5() {
-    DLOG(WARNING) << " DONE";
     Done();
   }
+
+  ContextMenuNotificationObserver observer_;
 };
 
 VIEW_TEST(BookmarkBarViewTest13, ClickOnContextMenuSeparator)
 
 // Makes sure right cliking on a folder on the bookmark bar doesn't result in
 // both a context menu and showing the menu.
 class BookmarkBarViewTest14 : public BookmarkBarViewEventTestBase {
+ public:
+  BookmarkBarViewTest14()
+      : ALLOW_THIS_IN_INITIALIZER_LIST(
+          observer_(CreateEventTask(this, &BookmarkBarViewTest14::Step2))) {
+  }
+
  protected:
   virtual void DoTestOnMessageLoop() {
     // Move the mouse to the first folder on the bookmark bar and press the
     // right mouse button.
     views::TextButton* button = bb_view_->GetBookmarkButton(0);
     ui_controls::MoveMouseToCenterAndPress(button, ui_controls::RIGHT,
-        ui_controls::DOWN | ui_controls::UP,
-        CreateEventTask(this, &BookmarkBarViewTest14::Step2));
+        ui_controls::DOWN | ui_controls::UP, NULL);
+    // Step2 will be invoked by ContextMenuNotificationObserver.
   }
 
  private:
+
   void Step2() {
     // Menu should NOT be showing.
     views::MenuItemView* menu = bb_view_->GetMenu();
     ASSERT_TRUE(menu == NULL);
 
     // Send escape so that the context menu hides.
     ui_controls::SendKeyPressNotifyWhenDone(
         NULL, base::VKEY_ESCAPE, false, false, false,
         CreateEventTask(this, &BookmarkBarViewTest14::Step3));
   }
 
   void Step3() {
     Done();
   }
+
+  ContextMenuNotificationObserver observer_;
 };
 
 VIEW_TEST(BookmarkBarViewTest14, ContextMenus2)
 
 // Makes sure deleting from the context menu keeps the bookmark menu showing.
 class BookmarkBarViewTest15 : public BookmarkBarViewEventTestBase {
  public:
-  BookmarkBarViewTest15() : deleted_menu_id_(0) {}
+  BookmarkBarViewTest15()
+      : deleted_menu_id_(0),
+        ALLOW_THIS_IN_INITIALIZER_LIST(
+            observer_(CreateEventTask(this, &BookmarkBarViewTest15::Step3))) {
+  }
 
  protected:
   virtual void DoTestOnMessageLoop() {
     // Show the other bookmarks.
     views::TextButton* button = bb_view_->other_bookmarked_button();
     ui_controls::MoveMouseToCenterAndPress(button, ui_controls::LEFT,
         ui_controls::DOWN | ui_controls::UP,
         CreateEventTask(this, &BookmarkBarViewTest15::Step2));
   }
 
  private:
   void Step2() {
     // Menu should be showing.
     views::MenuItemView* menu = bb_view_->GetMenu();
     ASSERT_TRUE(menu != NULL);
     ASSERT_TRUE(menu->GetSubmenu()->IsShowing());
 
     views::MenuItemView* child_menu =
         menu->GetSubmenu()->GetMenuItemAt(1);
     ASSERT_TRUE(child_menu != NULL);
 
     deleted_menu_id_ = child_menu->GetCommand();
 
     // Right click on the second child to get its context menu.
     ui_controls::MoveMouseToCenterAndPress(child_menu, ui_controls::RIGHT,
-        ui_controls::DOWN | ui_controls::UP,
-        CreateEventTask(this, &BookmarkBarViewTest15::Step3));
+        ui_controls::DOWN | ui_controls::UP, NULL);
+    // Step3 will be invoked by ContextMenuNotificationObserver.
   }
 
   void Step3() {
     // Make sure the context menu is showing.
     views::MenuItemView* menu = bb_view_->GetContextMenu();
     ASSERT_TRUE(menu != NULL);
     ASSERT_TRUE(menu->GetSubmenu());
     ASSERT_TRUE(menu->GetSubmenu()->IsShowing());
 
     views::MenuItemView* delete_menu =
@@ skipping 18 matching lines @@
 
     // And the deleted_menu_id_ should have been removed.
     ASSERT_TRUE(menu->GetMenuItemByID(deleted_menu_id_) == NULL);
 
     bb_view_->GetMenu()->GetMenuController()->Cancel(true);
 
     Done();
   }
 
   int deleted_menu_id_;
+  ContextMenuNotificationObserver observer_;
 };
 
 VIEW_TEST(BookmarkBarViewTest15, MenuStaysVisibleAfterDelete)