OLD | NEW |
---|---|
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/strings/utf_string_conversions.h" | 5 #include "base/strings/utf_string_conversions.h" |
6 #include "chrome/browser/ui/views/menu_test_base.h" | 6 #include "chrome/browser/ui/views/menu_test_base.h" |
7 #include "chrome/test/base/chrome_unit_test_suite.h" | |
7 #include "ui/views/controls/menu/menu_item_view.h" | 8 #include "ui/views/controls/menu/menu_item_view.h" |
8 #include "ui/views/controls/menu/submenu_view.h" | 9 #include "ui/views/controls/menu/submenu_view.h" |
9 | 10 |
10 template<ui::KeyboardCode KEYCODE, int EXPECTED_COMMAND> | 11 template<ui::KeyboardCode KEYCODE, int EXPECTED_COMMAND> |
11 class MenuControllerMnemonicTest : public MenuTestBase { | 12 class MenuControllerMnemonicTest : public MenuTestBase { |
12 public: | 13 public: |
13 MenuControllerMnemonicTest() { | 14 MenuControllerMnemonicTest() { |
14 } | 15 } |
15 | 16 |
16 virtual ~MenuControllerMnemonicTest() { | 17 virtual ~MenuControllerMnemonicTest() { |
17 } | 18 } |
18 | 19 |
20 virtual void SetUp() OVERRIDE { | |
21 ChromeUnitTestSuite::InitializeProviders(); | |
sky
2014/03/14 21:35:56
How about promoting this to view_event_test_base?
jam
2014/03/14 22:35:40
good idea, done. i didn't realize that this specif
| |
22 ChromeUnitTestSuite::InitializeResourceBundle(); | |
23 MenuTestBase::SetUp(); | |
24 } | |
25 | |
19 // MenuTestBase overrides: | 26 // MenuTestBase overrides: |
20 virtual void BuildMenu(views::MenuItemView* menu) OVERRIDE { | 27 virtual void BuildMenu(views::MenuItemView* menu) OVERRIDE { |
21 ASSERT_NE(ui::VKEY_DIVIDE, '/'); | 28 ASSERT_NE(ui::VKEY_DIVIDE, '/'); |
22 menu->AppendMenuItemWithLabel(1, base::ASCIIToUTF16("One&/")); | 29 menu->AppendMenuItemWithLabel(1, base::ASCIIToUTF16("One&/")); |
23 menu->AppendMenuItemWithLabel(2, base::ASCIIToUTF16("Two")); | 30 menu->AppendMenuItemWithLabel(2, base::ASCIIToUTF16("Two")); |
24 } | 31 } |
25 | 32 |
26 virtual void DoTestWithMenuOpen() { | 33 virtual void DoTestWithMenuOpen() { |
27 ASSERT_TRUE(menu()->GetSubmenu()->IsShowing()); | 34 ASSERT_TRUE(menu()->GetSubmenu()->IsShowing()); |
28 KeyPress(KEYCODE, | 35 KeyPress(KEYCODE, |
(...skipping 29 matching lines...) Expand all Loading... | |
58 // Pressing a key which matches the first letter of the menu item's title | 65 // Pressing a key which matches the first letter of the menu item's title |
59 // should execute the command for that menu item. | 66 // should execute the command for that menu item. |
60 typedef MenuControllerMnemonicTest<ui::VKEY_T,2> | 67 typedef MenuControllerMnemonicTest<ui::VKEY_T,2> |
61 MenuControllerMnemonicTestTitleMatch; | 68 MenuControllerMnemonicTestTitleMatch; |
62 VIEW_TEST(MenuControllerMnemonicTestTitleMatch, TitleMatch); | 69 VIEW_TEST(MenuControllerMnemonicTestTitleMatch, TitleMatch); |
63 | 70 |
64 // Pressing an arbitrary key should not execute any commands. | 71 // Pressing an arbitrary key should not execute any commands. |
65 typedef MenuControllerMnemonicTest<ui::VKEY_A,0> | 72 typedef MenuControllerMnemonicTest<ui::VKEY_A,0> |
66 MenuControllerMnemonicTestNoMatch; | 73 MenuControllerMnemonicTestNoMatch; |
67 VIEW_TEST(MenuControllerMnemonicTestNoMatch, NoMatch); | 74 VIEW_TEST(MenuControllerMnemonicTestNoMatch, NoMatch); |
OLD | NEW |