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

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

Issue 10411040: Disable all the rest of the MenuItemView tests, they're all failing :( (Closed) Base URL: svn://chrome-svn/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/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 330 matching lines...) Expand 10 before | Expand all | Expand 10 after
341 private: 341 private:
342 int last_command_; 342 int last_command_;
343 views::MenuItemView* submenu_; 343 views::MenuItemView* submenu_;
344 views::MenuItemView* inserted_item_; 344 views::MenuItemView* inserted_item_;
345 }; 345 };
346 346
347 // MenuItemViewTestInsertWithSubmenuX posts a menu and its submenu, 347 // MenuItemViewTestInsertWithSubmenuX posts a menu and its submenu,
348 // then inserts an item in the top-level menu at X. 348 // then inserts an item in the top-level menu at X.
349 typedef MenuItemViewTestInsertWithSubmenu<0> MenuItemViewTestInsertWithSubmenu0; 349 typedef MenuItemViewTestInsertWithSubmenu<0> MenuItemViewTestInsertWithSubmenu0;
350 typedef MenuItemViewTestInsertWithSubmenu<1> MenuItemViewTestInsertWithSubmenu1; 350 typedef MenuItemViewTestInsertWithSubmenu<1> MenuItemViewTestInsertWithSubmenu1;
351 VIEW_TEST(MenuItemViewTestInsertWithSubmenu0, InsertItemWithSubmenu0) 351 #if defined(OS_WIN)
352 VIEW_TEST(MenuItemViewTestInsertWithSubmenu1, InsertItemWithSubmenu1) 352 #define MAYBE_InsertItemWithSubmenu0 DISABLED_InsertItemWithSubmenu0
353 #define MAYBE_InsertItemWithSubmenu1 DISABLED_InsertItemWithSubmenu1
354 #else
355 #define MAYBE_InsertItemWithSubmenu0 InsertItemWithSubmenu0
356 #define MAYBE_InsertItemWithSubmenu1 InsertItemWithSubmenu1
357 #endif
358 VIEW_TEST(MenuItemViewTestInsertWithSubmenu0, MAYBE_InsertItemWithSubmenu0)
359 VIEW_TEST(MenuItemViewTestInsertWithSubmenu1, MAYBE_InsertItemWithSubmenu1)
353 360
354 // Test class for removing a menu item while the menu is open. 361 // Test class for removing a menu item while the menu is open.
355 template<int REMOVE_INDEX, int SELECT_INDEX> 362 template<int REMOVE_INDEX, int SELECT_INDEX>
356 class MenuItemViewTestRemove : public MenuItemViewTestBase { 363 class MenuItemViewTestRemove : public MenuItemViewTestBase {
357 public: 364 public:
358 MenuItemViewTestRemove() 365 MenuItemViewTestRemove()
359 : last_command_(0) { 366 : last_command_(0) {
360 } 367 }
361 368
362 virtual ~MenuItemViewTestRemove() { 369 virtual ~MenuItemViewTestRemove() {
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
418 private: 425 private:
419 int last_command_; 426 int last_command_;
420 }; 427 };
421 428
422 typedef MenuItemViewTestRemove<0,0> MenuItemViewTestRemove00; 429 typedef MenuItemViewTestRemove<0,0> MenuItemViewTestRemove00;
423 typedef MenuItemViewTestRemove<0,1> MenuItemViewTestRemove01; 430 typedef MenuItemViewTestRemove<0,1> MenuItemViewTestRemove01;
424 typedef MenuItemViewTestRemove<1,0> MenuItemViewTestRemove10; 431 typedef MenuItemViewTestRemove<1,0> MenuItemViewTestRemove10;
425 typedef MenuItemViewTestRemove<1,1> MenuItemViewTestRemove11; 432 typedef MenuItemViewTestRemove<1,1> MenuItemViewTestRemove11;
426 typedef MenuItemViewTestRemove<2,0> MenuItemViewTestRemove20; 433 typedef MenuItemViewTestRemove<2,0> MenuItemViewTestRemove20;
427 typedef MenuItemViewTestRemove<2,1> MenuItemViewTestRemove21; 434 typedef MenuItemViewTestRemove<2,1> MenuItemViewTestRemove21;
428 VIEW_TEST(MenuItemViewTestRemove00, RemoveItem00) 435 #if defined(OS_WIN)
429 VIEW_TEST(MenuItemViewTestRemove01, RemoveItem01) 436 #define MAYBE_RemoveItem00 DISABLED_RemoveItem00
430 VIEW_TEST(MenuItemViewTestRemove10, RemoveItem10) 437 #define MAYBE_RemoveItem01 DISABLED_RemoveItem01
431 VIEW_TEST(MenuItemViewTestRemove11, RemoveItem11) 438 #define MAYBE_RemoveItem10 DISABLED_RemoveItem10
432 VIEW_TEST(MenuItemViewTestRemove20, RemoveItem20) 439 #define MAYBE_RemoveItem11 DISABLED_RemoveItem11
433 VIEW_TEST(MenuItemViewTestRemove21, RemoveItem21) 440 #define MAYBE_RemoveItem20 DISABLED_RemoveItem20
441 #define MAYBE_RemoveItem21 DISABLED_RemoveItem21
442 #else
443 #define MAYBE_RemoveItem00 RemoveItem00
444 #define MAYBE_RemoveItem01 RemoveItem01
445 #define MAYBE_RemoveItem10 RemoveItem10
446 #define MAYBE_RemoveItem11 RemoveItem11
447 #define MAYBE_RemoveItem20 RemoveItem20
448 #define MAYBE_RemoveItem21 RemoveItem21
449 #endif
450 VIEW_TEST(MenuItemViewTestRemove00, MAYBE_RemoveItem00)
451 VIEW_TEST(MenuItemViewTestRemove01, MAYBE_RemoveItem01)
452 VIEW_TEST(MenuItemViewTestRemove10, MAYBE_RemoveItem10)
453 VIEW_TEST(MenuItemViewTestRemove11, MAYBE_RemoveItem11)
454 VIEW_TEST(MenuItemViewTestRemove20, MAYBE_RemoveItem20)
455 VIEW_TEST(MenuItemViewTestRemove21, MAYBE_RemoveItem21)
434 456
435 // Test class for removing a menu item while a submenu is open. 457 // Test class for removing a menu item while a submenu is open.
436 template<int REMOVE_INDEX> 458 template<int REMOVE_INDEX>
437 class MenuItemViewTestRemoveWithSubmenu : public MenuItemViewTestBase { 459 class MenuItemViewTestRemoveWithSubmenu : public MenuItemViewTestBase {
438 public: 460 public:
439 MenuItemViewTestRemoveWithSubmenu() : 461 MenuItemViewTestRemoveWithSubmenu() :
440 last_command_(0), 462 last_command_(0),
441 submenu_(NULL) { 463 submenu_(NULL) {
442 } 464 }
443 465
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
504 Done(); 526 Done();
505 } 527 }
506 528
507 private: 529 private:
508 int last_command_; 530 int last_command_;
509 views::MenuItemView* submenu_; 531 views::MenuItemView* submenu_;
510 }; 532 };
511 533
512 typedef MenuItemViewTestRemoveWithSubmenu<0> MenuItemViewTestRemoveWithSubmenu0; 534 typedef MenuItemViewTestRemoveWithSubmenu<0> MenuItemViewTestRemoveWithSubmenu0;
513 typedef MenuItemViewTestRemoveWithSubmenu<1> MenuItemViewTestRemoveWithSubmenu1; 535 typedef MenuItemViewTestRemoveWithSubmenu<1> MenuItemViewTestRemoveWithSubmenu1;
514 VIEW_TEST(MenuItemViewTestRemoveWithSubmenu0, RemoveItemWithSubmenu0) 536 #if defined(OS_WIN)
515 VIEW_TEST(MenuItemViewTestRemoveWithSubmenu1, RemoveItemWithSubmenu1) 537 #define MAYBE_RemoveItemWithSubmenu0 DISABLED_RemoveItemWithSubmenu0
538 #define MAYBE_RemoveItemWithSubmenu1 DISABLED_RemoveItemWithSubmenu1
539 #else
540 #define MAYBE_RemoveItemWithSubmenu0 RemoveItemWithSubmenu0
541 #define MAYBE_RemoveItemWithSubmenu1 RemoveItemWithSubmenu1
542 #endif
543 VIEW_TEST(MenuItemViewTestRemoveWithSubmenu0, MAYBE_RemoveItemWithSubmenu0)
544 VIEW_TEST(MenuItemViewTestRemoveWithSubmenu1, MAYBE_RemoveItemWithSubmenu1)
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