MacViews: Disable tests in MenuViewDragAndDropTest.

chrome/browser/ui/views/menu_view_drag_and_drop_test.cc

 // Copyright 2014 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/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/views/menu_test_base.h"
 #include "chrome/test/base/interactive_test_utils.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "ui/views/controls/menu/menu_controller.h"
 #include "ui/views/controls/menu/menu_item_view.h"
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/controls/menu/submenu_view.h"
 #include "ui/views/view.h"
 
 namespace {
 
 // Borrowed from chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc,
 // since these are also disabled on Linux for drag and drop.
 // TODO(erg): Fix DND tests on linux_aura. crbug.com/163931
-#if defined(OS_LINUX) && defined(USE_AURA)
+// Windows: Flaky. http://crbug.com/401226
+// MacViews: Enable these tests if they get fixed. https://crbug.com/449058
+#if defined(OS_LINUX) && defined(USE_AURA) || defined(OS_WIN) || defined(OS_MACOSX)

[tapted, 2015/01/15 06:38:07]

Since this is basically #if (true)... we might as well reorganise a bit. This
bit up here feels out of place.

I'd just change the two tests do say DISABLED_TestFoo, but put a comment above
them like

// ...
// to stay open.
// Disabled on all platforms for being flaky. Tracked in:
// TODO(erg): Fix DND tests on linux_aura. http://crbug.com/163931.
// Windows: http://crbug.com/401226.
// TODO(tapted): De-flake and run on Mac https://crbug.com/449058.
VIEW_TEST(MenuViewDragAndDropTestTestInMenuDrag, DISABLED_TestInMenuDrag)

/* ... */
// after the drag.
// Disabled on all platforms for being flaky. Tracked in:
// TODO(erg): Fix DND tests on linux_aura. http://crbug.com/163931.
// Windows: http://crbug.com/401226.
// TODO(tapted): De-flake and run on Mac https://crbug.com/449058.
VIEW_TEST(MenuViewDragAndDropTestNestedDrag, \
    DISABLED_MenuViewDragAndDropNestedDrag)


For mac, I wouldn't say enable these tests if they get fixed. Ideally myself, or
someone, finds time to get the test running on Mac in a non-flaky way, and
investigates de-flaking it on all platforms.

[jackhou1, 2015/01/15 06:53:28]

Done.

 #define MAYBE(x) DISABLED_##x
 #else
 #define MAYBE(x) x
 #endif
 
 const char kTestNestedDragData[] = "test_nested_drag_data";
 const char kTestTopLevelDragData[] = "test_top_level_drag_data";
 
 // A simple view which can be dragged.
 class TestDragView : public views::View {
@@ skipping 309 matching lines @@
   EXPECT_FALSE(target_view()->dropped());
   EXPECT_FALSE(asked_to_close());
   EXPECT_FALSE(menu()->GetSubmenu()->IsShowing());
 
   Done();
 }
 
 // Test that an in-menu (i.e., entirely implemented in the menu code) closes the
 // menu automatically once the drag is complete, and does not ask the delegate
 // to stay open.
-#if !defined(OS_WIN)  // flaky http://crbug.com/401226
 VIEW_TEST(MenuViewDragAndDropTestTestInMenuDrag, MAYBE(TestInMenuDrag))
-#endif
 
 class MenuViewDragAndDropTestNestedDrag : public MenuViewDragAndDropTest {
  public:
   MenuViewDragAndDropTestNestedDrag() {}
   ~MenuViewDragAndDropTestNestedDrag() override {}
 
  private:
   // MenuViewDragAndDropTest:
   void DoTestWithMenuOpen() override;
 
@@ skipping 77 matching lines @@
 
   // Clean up.
   menu()->GetSubmenu()->Close();
 
   Done();
 }
 
 // Test that a nested drag (i.e. one via a child view, and not entirely
 // implemented in menu code) will consult the delegate before closing the view
 // after the drag.
-#if !defined(OS_WIN)  // http://crbug.com/401226
 VIEW_TEST(MenuViewDragAndDropTestNestedDrag,
           MAYBE(MenuViewDragAndDropNestedDrag))
-#endif
 
 class MenuViewDragAndDropForDropStayOpen : public MenuViewDragAndDropTest {
  public:
   MenuViewDragAndDropForDropStayOpen() {}
   ~MenuViewDragAndDropForDropStayOpen() override {}
 
  private:
   // MenuViewDragAndDropTest:
   int GetMenuRunnerFlags() override;
   void DoTestWithMenuOpen() override;
@@ skipping 44 matching lines @@
   views::MenuController* controller = menu()->GetMenuController();
   ASSERT_TRUE(controller);
   EXPECT_TRUE(controller->IsCancelAllTimerRunningForTest());
 
   Done();
 }
 
 // Test that if a menu is opened for a drop handled entirely by menu code, the
 // menu will try to close if it does not receive any drag updates.
 VIEW_TEST(MenuViewDragAndDropForDropCancel, MenuViewCancelsForOwnDrag)