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

Side by Side Diff: chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc

Issue 10407065: Disable remaining BookmarkBarView tests on Win (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 7 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/bind.h" 5 #include "base/bind.h"
6 #include "base/callback.h" 6 #include "base/callback.h"
7 #include "base/compiler_specific.h" 7 #include "base/compiler_specific.h"
8 #include "base/string_number_conversions.h" 8 #include "base/string_number_conversions.h"
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "chrome/app/chrome_command_ids.h" 10 #include "chrome/app/chrome_command_ids.h"
(...skipping 1435 matching lines...) Expand 10 before | Expand all | Expand 10 after
1446 1446
1447 bb_view_->GetMenu()->GetMenuController()->CancelAll(); 1447 bb_view_->GetMenu()->GetMenuController()->CancelAll();
1448 1448
1449 Done(); 1449 Done();
1450 } 1450 }
1451 1451
1452 int deleted_menu_id_; 1452 int deleted_menu_id_;
1453 ContextMenuNotificationObserver observer_; 1453 ContextMenuNotificationObserver observer_;
1454 }; 1454 };
1455 1455
1456 VIEW_TEST(BookmarkBarViewTest15, MenuStaysVisibleAfterDelete) 1456 #if defined(OS_WIN)
1457 #define MAYBE_MenuStaysVisibleAfterDelete DISABLED_MenuStaysVisibleAfterDelete
1458 #else
1459 #define MAYBE_MenuStaysVisibleAfterDelete MenuStaysVisibleAfterDelete
1460 #endif
1461 VIEW_TEST(BookmarkBarViewTest15, MAYBE_MenuStaysVisibleAfterDelete)
1457 1462
1458 // Tests that we don't crash or get stuck if the parent of a menu is closed. 1463 // Tests that we don't crash or get stuck if the parent of a menu is closed.
1459 class BookmarkBarViewTest16 : public BookmarkBarViewEventTestBase { 1464 class BookmarkBarViewTest16 : public BookmarkBarViewEventTestBase {
1460 protected: 1465 protected:
1461 virtual void DoTestOnMessageLoop() { 1466 virtual void DoTestOnMessageLoop() {
1462 InstallViewsDelegate(); 1467 InstallViewsDelegate();
1463 1468
1464 // Move the mouse to the first folder on the bookmark bar and press the 1469 // Move the mouse to the first folder on the bookmark bar and press the
1465 // mouse. 1470 // mouse.
1466 views::TextButton* button = GetBookmarkButton(0); 1471 views::TextButton* button = GetBookmarkButton(0);
(...skipping 15 matching lines...) Expand all
1482 1487
1483 // Close the window. 1488 // Close the window.
1484 window_->Close(); 1489 window_->Close();
1485 window_ = NULL; 1490 window_ = NULL;
1486 1491
1487 MessageLoop::current()->PostTask( 1492 MessageLoop::current()->PostTask(
1488 FROM_HERE, CreateEventTask(this, &BookmarkBarViewTest16::Done)); 1493 FROM_HERE, CreateEventTask(this, &BookmarkBarViewTest16::Done));
1489 } 1494 }
1490 }; 1495 };
1491 1496
1492 VIEW_TEST(BookmarkBarViewTest16, DeleteMenu) 1497 #if defined(OS_WIN)
1498 #define MAYBE_DeleteMenu DISABLED_DeleteMenu
1499 #else
1500 #define MAYBE_DeleteMenu DeleteMenu
1501 #endif
1502 VIEW_TEST(BookmarkBarViewTest16, MAYBE_DeleteMenu)
1493 1503
1494 // Makes sure right clicking on an item while a context menu is already showing 1504 // Makes sure right clicking on an item while a context menu is already showing
1495 // doesn't crash and works. 1505 // doesn't crash and works.
1496 class BookmarkBarViewTest17 : public BookmarkBarViewEventTestBase { 1506 class BookmarkBarViewTest17 : public BookmarkBarViewEventTestBase {
1497 public: 1507 public:
1498 BookmarkBarViewTest17() 1508 BookmarkBarViewTest17()
1499 : ALLOW_THIS_IN_INITIALIZER_LIST( 1509 : ALLOW_THIS_IN_INITIALIZER_LIST(
1500 observer_(CreateEventTask(this, &BookmarkBarViewTest17::Step3))) { 1510 observer_(CreateEventTask(this, &BookmarkBarViewTest17::Step3))) {
1501 } 1511 }
1502 1512
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
1563 ASSERT_TRUE(menu->GetSubmenu()->IsShowing()); 1573 ASSERT_TRUE(menu->GetSubmenu()->IsShowing());
1564 1574
1565 bb_view_->GetMenu()->GetMenuController()->CancelAll(); 1575 bb_view_->GetMenu()->GetMenuController()->CancelAll();
1566 1576
1567 Done(); 1577 Done();
1568 } 1578 }
1569 1579
1570 ContextMenuNotificationObserver observer_; 1580 ContextMenuNotificationObserver observer_;
1571 }; 1581 };
1572 1582
1573 VIEW_TEST(BookmarkBarViewTest17, ContextMenus3) 1583 #if defined(OS_WIN)
1584 #define MAYBE_ContextMenus3 DISABLED_ContextMenus3
1585 #else
1586 #define MAYBE_ContextMenus3 ContextMenus3
1587 #endif
1588 VIEW_TEST(BookmarkBarViewTest17, MAYBE_ContextMenus3)
1574 1589
1575 // Verifies sibling menus works. Clicks on the 'other bookmarks' folder, then 1590 // Verifies sibling menus works. Clicks on the 'other bookmarks' folder, then
1576 // moves the mouse over the first item on the bookmark bar and makes sure the 1591 // moves the mouse over the first item on the bookmark bar and makes sure the
1577 // menu appears. 1592 // menu appears.
1578 class BookmarkBarViewTest18 : public BookmarkBarViewEventTestBase { 1593 class BookmarkBarViewTest18 : public BookmarkBarViewEventTestBase {
1579 protected: 1594 protected:
1580 virtual void DoTestOnMessageLoop() { 1595 virtual void DoTestOnMessageLoop() {
1581 // Move the mouse to the other folder on the bookmark bar and press the 1596 // Move the mouse to the other folder on the bookmark bar and press the
1582 // left mouse button. 1597 // left mouse button.
1583 views::TextButton* button = bb_view_->other_bookmarked_button(); 1598 views::TextButton* button = bb_view_->other_bookmarked_button();
(...skipping 23 matching lines...) Expand all
1607 views::MenuItemView* menu = bb_view_->GetMenu(); 1622 views::MenuItemView* menu = bb_view_->GetMenu();
1608 ASSERT_TRUE(menu != NULL); 1623 ASSERT_TRUE(menu != NULL);
1609 ASSERT_TRUE(menu->GetSubmenu()->IsShowing()); 1624 ASSERT_TRUE(menu->GetSubmenu()->IsShowing());
1610 1625
1611 menu->GetMenuController()->CancelAll(); 1626 menu->GetMenuController()->CancelAll();
1612 1627
1613 Done(); 1628 Done();
1614 } 1629 }
1615 }; 1630 };
1616 1631
1617 VIEW_TEST(BookmarkBarViewTest18, SiblingMenu) 1632 #if defined(OS_WIN)
1633 #define MAYBE_BookmarkBarViewTest18_SiblingMenu DISABLED_SiblingMenu
1634 #else
1635 #define MAYBE_BookmarkBarViewTest18_SiblingMenu SiblingMenu
1636 #endif
1637 VIEW_TEST(BookmarkBarViewTest18, MAYBE_BookmarkBarViewTest18_SiblingMenu)
1618 1638
1619 // Verifies mousing over an already open sibling menu doesn't prematurely cancel 1639 // Verifies mousing over an already open sibling menu doesn't prematurely cancel
1620 // the menu. 1640 // the menu.
1621 class BookmarkBarViewTest19 : public BookmarkBarViewEventTestBase { 1641 class BookmarkBarViewTest19 : public BookmarkBarViewEventTestBase {
1622 protected: 1642 protected:
1623 virtual void DoTestOnMessageLoop() { 1643 virtual void DoTestOnMessageLoop() {
1624 // Move the mouse to the other folder on the bookmark bar and press the 1644 // Move the mouse to the other folder on the bookmark bar and press the
1625 // left mouse button. 1645 // left mouse button.
1626 views::TextButton* button = bb_view_->other_bookmarked_button(); 1646 views::TextButton* button = bb_view_->other_bookmarked_button();
1627 ui_test_utils::MoveMouseToCenterAndPress(button, ui_controls::LEFT, 1647 ui_test_utils::MoveMouseToCenterAndPress(button, ui_controls::LEFT,
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
1681 views::MenuItemView* menu = bb_view_->GetMenu(); 1701 views::MenuItemView* menu = bb_view_->GetMenu();
1682 ASSERT_TRUE(menu != NULL); 1702 ASSERT_TRUE(menu != NULL);
1683 ASSERT_TRUE(menu->GetSubmenu()->IsShowing()); 1703 ASSERT_TRUE(menu->GetSubmenu()->IsShowing());
1684 1704
1685 menu->GetMenuController()->CancelAll(); 1705 menu->GetMenuController()->CancelAll();
1686 1706
1687 Done(); 1707 Done();
1688 } 1708 }
1689 }; 1709 };
1690 1710
1691 VIEW_TEST(BookmarkBarViewTest19, SiblingMenu) 1711 #if defined(OS_WIN)
1712 #define MAYBE_BookmarkBarViewTest19_SiblingMenu DISABLED_SiblingMenu
1713 #else
1714 #define MAYBE_BookmarkBarViewTest19_SiblingMenu SiblingMenu
1715 #endif
1716 VIEW_TEST(BookmarkBarViewTest19, MAYBE_BookmarkBarViewTest19_SiblingMenu)
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698