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

Side by Side Diff: chrome/test/interactive_ui/keyboard_access_uitest.cc

Issue 4669001: GTTF: Disable tests that flakily time out: (Closed)
Patch Set: Created 10 years, 1 month 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
« 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 "app/keyboard_codes.h" 5 #include "app/keyboard_codes.h"
6 #include "chrome/test/automation/browser_proxy.h" 6 #include "chrome/test/automation/browser_proxy.h"
7 #include "chrome/test/automation/tab_proxy.h" 7 #include "chrome/test/automation/tab_proxy.h"
8 #include "chrome/test/automation/window_proxy.h" 8 #include "chrome/test/automation/window_proxy.h"
9 #include "chrome/test/ui/ui_test.h" 9 #include "chrome/test/ui/ui_test.h"
10 #include "googleurl/src/gurl.h" 10 #include "googleurl/src/gurl.h"
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 ASSERT_TRUE(window->SimulateOSKeyPress(app::VKEY_RETURN, 0)); 98 ASSERT_TRUE(window->SimulateOSKeyPress(app::VKEY_RETURN, 0));
99 99
100 // Wait for the new tab to appear. 100 // Wait for the new tab to appear.
101 ASSERT_TRUE(browser->WaitForTabCountToBecome(2)); 101 ASSERT_TRUE(browser->WaitForTabCountToBecome(2));
102 102
103 // Make sure that the new tab index is 1. 103 // Make sure that the new tab index is 1.
104 ASSERT_TRUE(browser->GetActiveTabIndex(&tab_index)); 104 ASSERT_TRUE(browser->GetActiveTabIndex(&tab_index));
105 ASSERT_EQ(1, tab_index); 105 ASSERT_EQ(1, tab_index);
106 } 106 }
107 107
108 TEST_F(KeyboardAccessTest, TestMenuKeyboardAccess) { 108 // Disabled, http://crbug.com/62310.
109 TEST_F(KeyboardAccessTest, DISABLED_TestMenuKeyboardAccess) {
109 TestMenuKeyboardAccess(false, 0); 110 TestMenuKeyboardAccess(false, 0);
110 } 111 }
111 112
112 TEST_F(KeyboardAccessTest, TestAltMenuKeyboardAccess) { 113 // Disabled, http://crbug.com/62310.
114 TEST_F(KeyboardAccessTest, DISABLED_TestAltMenuKeyboardAccess) {
113 TestMenuKeyboardAccess(true, 0); 115 TestMenuKeyboardAccess(true, 0);
114 } 116 }
115 117
116 TEST_F(KeyboardAccessTest, TestShiftAltMenuKeyboardAccess) { 118 TEST_F(KeyboardAccessTest, TestShiftAltMenuKeyboardAccess) {
117 TestMenuKeyboardAccess(true, views::Event::EF_SHIFT_DOWN); 119 TestMenuKeyboardAccess(true, views::Event::EF_SHIFT_DOWN);
118 } 120 }
119 121
120 // TODO(isherman): This test times out on ChromeOS. We should merge it with 122 // TODO(isherman): This test times out on ChromeOS. We should merge it with
121 // BrowserKeyEventsTest.ReservedAccelerators, but just disable for now. 123 // BrowserKeyEventsTest.ReservedAccelerators, but just disable for now.
122 #if defined(OS_CHROMEOS) 124 #if defined(OS_CHROMEOS)
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 ASSERT_TRUE(browser->ActivateTab(1)); 158 ASSERT_TRUE(browser->ActivateTab(1));
157 ASSERT_TRUE(window->SimulateOSKeyPress( 159 ASSERT_TRUE(window->SimulateOSKeyPress(
158 app::VKEY_F4, views::Event::EF_CONTROL_DOWN)); 160 app::VKEY_F4, views::Event::EF_CONTROL_DOWN));
159 ASSERT_TRUE(browser->WaitForTabCountToBecome(1)); 161 ASSERT_TRUE(browser->WaitForTabCountToBecome(1));
160 #endif 162 #endif
161 } 163 }
162 164
163 } // namespace 165 } // namespace
164 166
165 #endif // defined(TOOLKIT_VIEWS) 167 #endif // defined(TOOLKIT_VIEWS)
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