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

Side by Side Diff: chrome/browser/ui/views/menu_item_view_test.cc

Issue 10409027: Disable or mark flaky several UI tests on Win (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Updated 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
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/callback.h" 5 #include "base/callback.h"
6 #include "base/utf_string_conversions.h" 6 #include "base/utf_string_conversions.h"
7 #include "chrome/test/base/view_event_test_base.h" 7 #include "chrome/test/base/view_event_test_base.h"
8 #include "chrome/test/base/ui_test_utils.h" 8 #include "chrome/test/base/ui_test_utils.h"
9 #include "ui/ui_controls/ui_controls.h" 9 #include "ui/ui_controls/ui_controls.h"
10 #include "ui/views/controls/button/menu_button.h" 10 #include "ui/views/controls/button/menu_button.h"
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 } 155 }
156 156
157 private: 157 private:
158 int last_command_; 158 int last_command_;
159 }; 159 };
160 160
161 // Click each item of a 3-item menu (with separator). 161 // Click each item of a 3-item menu (with separator).
162 typedef MenuItemViewTestBasic<0> MenuItemViewTestBasic0; 162 typedef MenuItemViewTestBasic<0> MenuItemViewTestBasic0;
163 typedef MenuItemViewTestBasic<1> MenuItemViewTestBasic1; 163 typedef MenuItemViewTestBasic<1> MenuItemViewTestBasic1;
164 typedef MenuItemViewTestBasic<2> MenuItemViewTestBasic2; 164 typedef MenuItemViewTestBasic<2> MenuItemViewTestBasic2;
165 VIEW_TEST(MenuItemViewTestBasic0, SelectItem0) 165 #if defined(OS_WIN)
166 VIEW_TEST(MenuItemViewTestBasic1, SelectItem1) 166 #define MAYBE_SelectItem0 DISABLED_SelectItem0
167 VIEW_TEST(MenuItemViewTestBasic2, SelectItem2) 167 #define MAYBE_SelectItem1 DISABLED_SelectItem1
168 #define MAYBE_SelectItem2 DISABLED_SelectItem2
169 #else
170 #define MAYBE_SelectItem0 SelectItem0
171 #define MAYBE_SelectItem1 SelectItem1
172 #define MAYBE_SelectItem2 SelectItem2
173 #endif
174 VIEW_TEST(MenuItemViewTestBasic0, MAYBE_SelectItem0)
175 VIEW_TEST(MenuItemViewTestBasic1, MAYBE_SelectItem1)
176 VIEW_TEST(MenuItemViewTestBasic2, MAYBE_SelectItem2)
168 177
169 // Test class for inserting a menu item while the menu is open. 178 // Test class for inserting a menu item while the menu is open.
170 template<int INSERT_INDEX, int SELECT_INDEX> 179 template<int INSERT_INDEX, int SELECT_INDEX>
171 class MenuItemViewTestInsert : public MenuItemViewTestBase { 180 class MenuItemViewTestInsert : public MenuItemViewTestBase {
172 public: 181 public:
173 MenuItemViewTestInsert() : 182 MenuItemViewTestInsert() :
174 last_command_(0), 183 last_command_(0),
175 inserted_item_(NULL) { 184 inserted_item_(NULL) {
176 } 185 }
177 186
(...skipping 304 matching lines...) Expand 10 before | Expand all | Expand 10 after
482 491
483 private: 492 private:
484 int last_command_; 493 int last_command_;
485 views::MenuItemView* submenu_; 494 views::MenuItemView* submenu_;
486 }; 495 };
487 496
488 typedef MenuItemViewTestRemoveWithSubmenu<0> MenuItemViewTestRemoveWithSubmenu0; 497 typedef MenuItemViewTestRemoveWithSubmenu<0> MenuItemViewTestRemoveWithSubmenu0;
489 typedef MenuItemViewTestRemoveWithSubmenu<1> MenuItemViewTestRemoveWithSubmenu1; 498 typedef MenuItemViewTestRemoveWithSubmenu<1> MenuItemViewTestRemoveWithSubmenu1;
490 VIEW_TEST(MenuItemViewTestRemoveWithSubmenu0, RemoveItemWithSubmenu0) 499 VIEW_TEST(MenuItemViewTestRemoveWithSubmenu0, RemoveItemWithSubmenu0)
491 VIEW_TEST(MenuItemViewTestRemoveWithSubmenu1, RemoveItemWithSubmenu1) 500 VIEW_TEST(MenuItemViewTestRemoveWithSubmenu1, RemoveItemWithSubmenu1)
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/find_bar_host_interactive_uitest.cc ('k') | chrome/browser/ui/views/menu_model_adapter_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698