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

Side by Side Diff: chrome/browser/browser_keyevents_browsertest.cc

Issue 10414060: Disable tests broken by WK r118001 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Copy/paste glitch 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 "build/build_config.h" 5 #include "build/build_config.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/message_loop.h" 9 #include "base/message_loop.h"
10 #include "base/stringprintf.h" 10 #include "base/stringprintf.h"
(...skipping 275 matching lines...) Expand 10 before | Expand all | Expand 10 after
286 desc.append(data.result[i]); 286 desc.append(data.result[i]);
287 desc.append("\n"); 287 desc.append("\n");
288 } 288 }
289 return desc; 289 return desc;
290 } 290 }
291 }; 291 };
292 292
293 #if defined(OS_MACOSX) 293 #if defined(OS_MACOSX)
294 // http://crbug.com/81451 294 // http://crbug.com/81451
295 IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, DISABLED_NormalKeyEvents) { 295 IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, DISABLED_NormalKeyEvents) {
296 #elif defined(OS_LINUX)
vandebo (ex-Chrome) 2012/05/22 23:03:49 This stuff is more commonly done with a MAYBE patt
jsbell 2012/05/22 23:18:12 Yeah, initially I wanted a less intrusive change b
297 // http://crbug.com/129235
298 IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, FAILS_NormalKeyEvents) {
296 #else 299 #else
297 IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, NormalKeyEvents) { 300 IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, NormalKeyEvents) {
298 #endif 301 #endif
299 302
300 static const KeyEventTestData kTestNoInput[] = { 303 static const KeyEventTestData kTestNoInput[] = {
301 // a 304 // a
302 { ui::VKEY_A, false, false, false, false, 305 { ui::VKEY_A, false, false, false, false,
303 false, false, false, false, 3, 306 false, false, false, false, 3,
304 { "D 65 0 false false false false", 307 { "D 65 0 false false false false",
305 "P 97 97 false false false false", 308 "P 97 97 false false false false",
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
385 ASSERT_NO_FATAL_FAILURE(SetFocusedElement(tab_index, L"B")); 388 ASSERT_NO_FATAL_FAILURE(SetFocusedElement(tab_index, L"B"));
386 for (size_t i = 0; i < arraysize(kTestWithInput); ++i) { 389 for (size_t i = 0; i < arraysize(kTestWithInput); ++i) {
387 EXPECT_NO_FATAL_FAILURE(TestKeyEvent(tab_index, kTestWithInput[i])) 390 EXPECT_NO_FATAL_FAILURE(TestKeyEvent(tab_index, kTestWithInput[i]))
388 << "kTestWithInput[" << i << "] in password box failed:\n" 391 << "kTestWithInput[" << i << "] in password box failed:\n"
389 << GetTestDataDescription(kTestWithInput[i]); 392 << GetTestDataDescription(kTestWithInput[i]);
390 } 393 }
391 EXPECT_NO_FATAL_FAILURE(CheckTextBoxValue(tab_index, L"B", L"aA")); 394 EXPECT_NO_FATAL_FAILURE(CheckTextBoxValue(tab_index, L"B", L"aA"));
392 } 395 }
393 396
394 #if defined(OS_WIN) || defined(OS_LINUX) 397 #if defined(OS_WIN) || defined(OS_LINUX)
398 #if defined(OS_LINUX)
399 // http://crbug.com/129235
400 IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, FAILS_CtrlKeyEvents) {
401 #else
395 IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, CtrlKeyEvents) { 402 IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, CtrlKeyEvents) {
403 #endif
396 static const KeyEventTestData kTestCtrlF = { 404 static const KeyEventTestData kTestCtrlF = {
397 ui::VKEY_F, true, false, false, false, 405 ui::VKEY_F, true, false, false, false,
398 false, false, false, false, 2, 406 false, false, false, false, 2,
399 { "D 17 0 true false false false", 407 { "D 17 0 true false false false",
400 "D 70 0 true false false false" } 408 "D 70 0 true false false false" }
401 }; 409 };
402 410
403 static const KeyEventTestData kTestCtrlFSuppressKeyDown = { 411 static const KeyEventTestData kTestCtrlFSuppressKeyDown = {
404 ui::VKEY_F, true, false, false, false, 412 ui::VKEY_F, true, false, false, false,
405 true, false, false, false, 4, 413 true, false, false, false, 4,
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
508 516
509 // Press Cmd+F with keydown suppressed shall not open the find box. 517 // Press Cmd+F with keydown suppressed shall not open the find box.
510 EXPECT_NO_FATAL_FAILURE(TestKeyEvent(tab_index, kTestCmdFSuppressKeyDown)); 518 EXPECT_NO_FATAL_FAILURE(TestKeyEvent(tab_index, kTestCmdFSuppressKeyDown));
511 ASSERT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER)); 519 ASSERT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER));
512 } 520 }
513 #endif 521 #endif
514 522
515 #if defined(OS_MACOSX) 523 #if defined(OS_MACOSX)
516 // http://crbug.com/81451 for mac 524 // http://crbug.com/81451 for mac
517 IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, DISABLED_AccessKeys) { 525 IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, DISABLED_AccessKeys) {
526 #elif defined(OS_LINUX)
527 // http://crbug.com/129235
528 IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, FAILS_AccessKeyEvents) {
518 #else 529 #else
519 IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, AccessKeys) { 530 IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, AccessKeys) {
520 #endif 531 #endif
521 #if defined(OS_MACOSX) 532 #if defined(OS_MACOSX)
522 // On Mac, access keys use ctrl+alt modifiers. 533 // On Mac, access keys use ctrl+alt modifiers.
523 static const KeyEventTestData kTestAccessA = { 534 static const KeyEventTestData kTestAccessA = {
524 ui::VKEY_A, true, false, true, false, 535 ui::VKEY_A, true, false, true, false,
525 false, false, false, false, 6, 536 false, false, false, false, 6,
526 { "D 17 0 true false false false", 537 { "D 17 0 true false false false",
527 "D 18 0 true false true false", 538 "D 18 0 true false true false",
(...skipping 337 matching lines...) Expand 10 before | Expand all | Expand 10 after
865 EXPECT_NO_FATAL_FAILURE(TestKeyEvent(tab_index, kTestAltKeySuppress)); 876 EXPECT_NO_FATAL_FAILURE(TestKeyEvent(tab_index, kTestAltKeySuppress));
866 ASSERT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER)); 877 ASSERT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER));
867 878
868 // Ctrl+Alt should have no effect. 879 // Ctrl+Alt should have no effect.
869 EXPECT_NO_FATAL_FAILURE(TestKeyEvent(tab_index, kTestCtrlAltKey)); 880 EXPECT_NO_FATAL_FAILURE(TestKeyEvent(tab_index, kTestCtrlAltKey));
870 ASSERT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER)); 881 ASSERT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER));
871 } 882 }
872 #endif 883 #endif
873 884
874 } // namespace 885 } // namespace
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