OLD | NEW |
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 274 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
285 desc.append(" "); | 285 desc.append(" "); |
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 #define MAYBE_NormalKeyEvents DISABLED_NormalKeyEvents |
| 296 #elif defined(OS_LINUX) |
| 297 // http://crbug.com/129235 |
| 298 #define MAYBE_NormalKeyEvents FAILS_NormalKeyEvents |
296 #else | 299 #else |
297 IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, NormalKeyEvents) { | 300 #define MAYBE_NormalKeyEvents NormalKeyEvents |
298 #endif | 301 #endif |
299 | 302 |
| 303 IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, MAYBE_NormalKeyEvents) { |
300 static const KeyEventTestData kTestNoInput[] = { | 304 static const KeyEventTestData kTestNoInput[] = { |
301 // a | 305 // a |
302 { ui::VKEY_A, false, false, false, false, | 306 { ui::VKEY_A, false, false, false, false, |
303 false, false, false, false, 3, | 307 false, false, false, false, 3, |
304 { "D 65 0 false false false false", | 308 { "D 65 0 false false false false", |
305 "P 97 97 false false false false", | 309 "P 97 97 false false false false", |
306 "U 65 0 false false false false" } }, | 310 "U 65 0 false false false false" } }, |
307 // shift-a | 311 // shift-a |
308 { ui::VKEY_A, false, true, false, false, | 312 { ui::VKEY_A, false, true, false, false, |
309 false, false, false, false, 5, | 313 false, false, false, false, 5, |
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
385 ASSERT_NO_FATAL_FAILURE(SetFocusedElement(tab_index, L"B")); | 389 ASSERT_NO_FATAL_FAILURE(SetFocusedElement(tab_index, L"B")); |
386 for (size_t i = 0; i < arraysize(kTestWithInput); ++i) { | 390 for (size_t i = 0; i < arraysize(kTestWithInput); ++i) { |
387 EXPECT_NO_FATAL_FAILURE(TestKeyEvent(tab_index, kTestWithInput[i])) | 391 EXPECT_NO_FATAL_FAILURE(TestKeyEvent(tab_index, kTestWithInput[i])) |
388 << "kTestWithInput[" << i << "] in password box failed:\n" | 392 << "kTestWithInput[" << i << "] in password box failed:\n" |
389 << GetTestDataDescription(kTestWithInput[i]); | 393 << GetTestDataDescription(kTestWithInput[i]); |
390 } | 394 } |
391 EXPECT_NO_FATAL_FAILURE(CheckTextBoxValue(tab_index, L"B", L"aA")); | 395 EXPECT_NO_FATAL_FAILURE(CheckTextBoxValue(tab_index, L"B", L"aA")); |
392 } | 396 } |
393 | 397 |
394 #if defined(OS_WIN) || defined(OS_LINUX) | 398 #if defined(OS_WIN) || defined(OS_LINUX) |
395 IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, CtrlKeyEvents) { | 399 |
| 400 #if defined(OS_LINUX) |
| 401 // http://crbug.com/129235 |
| 402 #define MAYBE_CtrlKeyEvents FAILS_CtrlKeyEvents |
| 403 #else |
| 404 #define MAYBE_CtrlKeyEvents CtrlKeyEvents |
| 405 #endif |
| 406 |
| 407 IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, MAYBE_CtrlKeyEvents) { |
396 static const KeyEventTestData kTestCtrlF = { | 408 static const KeyEventTestData kTestCtrlF = { |
397 ui::VKEY_F, true, false, false, false, | 409 ui::VKEY_F, true, false, false, false, |
398 false, false, false, false, 2, | 410 false, false, false, false, 2, |
399 { "D 17 0 true false false false", | 411 { "D 17 0 true false false false", |
400 "D 70 0 true false false false" } | 412 "D 70 0 true false false false" } |
401 }; | 413 }; |
402 | 414 |
403 static const KeyEventTestData kTestCtrlFSuppressKeyDown = { | 415 static const KeyEventTestData kTestCtrlFSuppressKeyDown = { |
404 ui::VKEY_F, true, false, false, false, | 416 ui::VKEY_F, true, false, false, false, |
405 true, false, false, false, 4, | 417 true, false, false, false, 4, |
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
507 ASSERT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER)); | 519 ASSERT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER)); |
508 | 520 |
509 // Press Cmd+F with keydown suppressed shall not open the find box. | 521 // Press Cmd+F with keydown suppressed shall not open the find box. |
510 EXPECT_NO_FATAL_FAILURE(TestKeyEvent(tab_index, kTestCmdFSuppressKeyDown)); | 522 EXPECT_NO_FATAL_FAILURE(TestKeyEvent(tab_index, kTestCmdFSuppressKeyDown)); |
511 ASSERT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER)); | 523 ASSERT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER)); |
512 } | 524 } |
513 #endif | 525 #endif |
514 | 526 |
515 #if defined(OS_MACOSX) | 527 #if defined(OS_MACOSX) |
516 // http://crbug.com/81451 for mac | 528 // http://crbug.com/81451 for mac |
517 IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, DISABLED_AccessKeys) { | 529 #define MAYBE_AccessKeys DISABLED_AccessKeys |
| 530 #elif defined(OS_LINUX) |
| 531 // http://crbug.com/129235 |
| 532 #define MAYBE_AccessKeys FAILS_AccessKeys |
518 #else | 533 #else |
519 IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, AccessKeys) { | 534 #define MAYBE_AccessKeys AccessKeys |
520 #endif | 535 #endif |
| 536 |
| 537 IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, MAYBE_AccessKeys) { |
521 #if defined(OS_MACOSX) | 538 #if defined(OS_MACOSX) |
522 // On Mac, access keys use ctrl+alt modifiers. | 539 // On Mac, access keys use ctrl+alt modifiers. |
523 static const KeyEventTestData kTestAccessA = { | 540 static const KeyEventTestData kTestAccessA = { |
524 ui::VKEY_A, true, false, true, false, | 541 ui::VKEY_A, true, false, true, false, |
525 false, false, false, false, 6, | 542 false, false, false, false, 6, |
526 { "D 17 0 true false false false", | 543 { "D 17 0 true false false false", |
527 "D 18 0 true false true false", | 544 "D 18 0 true false true false", |
528 "D 65 0 true false true false", | 545 "D 65 0 true false true false", |
529 "U 65 0 true false true false", | 546 "U 65 0 true false true false", |
530 "U 18 0 true false true false", | 547 "U 18 0 true false true false", |
(...skipping 334 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
865 EXPECT_NO_FATAL_FAILURE(TestKeyEvent(tab_index, kTestAltKeySuppress)); | 882 EXPECT_NO_FATAL_FAILURE(TestKeyEvent(tab_index, kTestAltKeySuppress)); |
866 ASSERT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER)); | 883 ASSERT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER)); |
867 | 884 |
868 // Ctrl+Alt should have no effect. | 885 // Ctrl+Alt should have no effect. |
869 EXPECT_NO_FATAL_FAILURE(TestKeyEvent(tab_index, kTestCtrlAltKey)); | 886 EXPECT_NO_FATAL_FAILURE(TestKeyEvent(tab_index, kTestCtrlAltKey)); |
870 ASSERT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER)); | 887 ASSERT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER)); |
871 } | 888 } |
872 #endif | 889 #endif |
873 | 890 |
874 } // namespace | 891 } // namespace |
OLD | NEW |