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

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

Issue 3033034: Mark BrowserKeyEventsTest.ReservedAccelerators flaky on Mac. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: Created 10 years, 5 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
« 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 "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/keyboard_codes.h" 8 #include "base/keyboard_codes.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/message_loop.h" 10 #include "base/message_loop.h"
(...skipping 651 matching lines...) Expand 10 before | Expand all | Expand 10 after
662 EXPECT_NO_FATAL_FAILURE(TestKeyEvent(tab_index, kTestAccess1)); 662 EXPECT_NO_FATAL_FAILURE(TestKeyEvent(tab_index, kTestAccess1));
663 #if defined(TOOLKIT_GTK) 663 #if defined(TOOLKIT_GTK)
664 // On GTK, alt-0..9 are assigned as tab selection accelerators, so they can 664 // On GTK, alt-0..9 are assigned as tab selection accelerators, so they can
665 // not be used as accesskeys. 665 // not be used as accesskeys.
666 EXPECT_NO_FATAL_FAILURE(CheckFocusedElement(tab_index, L"")); 666 EXPECT_NO_FATAL_FAILURE(CheckFocusedElement(tab_index, L""));
667 #else 667 #else
668 EXPECT_NO_FATAL_FAILURE(CheckFocusedElement(tab_index, L"1")); 668 EXPECT_NO_FATAL_FAILURE(CheckFocusedElement(tab_index, L"1"));
669 #endif 669 #endif
670 } 670 }
671 671
672 IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, ReservedAccelerators) { 672 #if defined(OS_MACOSX)
673 // See http://crbug.com/50447 for details.
674 #define MAYBE_ReservedAccelerators FLAKY_ReservedAccelerators
675 #else
676 #define MAYBE_ReservedAccelerators ReservedAccelerators
677 #endif
678
679 IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, MAYBE_ReservedAccelerators) {
673 HTTPTestServer* server = StartHTTPServer(); 680 HTTPTestServer* server = StartHTTPServer();
674 ASSERT_TRUE(server); 681 ASSERT_TRUE(server);
675 682
676 BringBrowserWindowToFront(); 683 BringBrowserWindowToFront();
677 GURL url = server->TestServerPage(kTestingPage); 684 GURL url = server->TestServerPage(kTestingPage);
678 ui_test_utils::NavigateToURL(browser(), url); 685 ui_test_utils::NavigateToURL(browser(), url);
679 686
680 ASSERT_NO_FATAL_FAILURE(ClickOnView(VIEW_ID_TAB_CONTAINER)); 687 ASSERT_NO_FATAL_FAILURE(ClickOnView(VIEW_ID_TAB_CONTAINER));
681 ASSERT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER_FOCUS_VIEW)); 688 ASSERT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER_FOCUS_VIEW));
682 689
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after
877 ASSERT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER_FOCUS_VIEW)); 884 ASSERT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER_FOCUS_VIEW));
878 885
879 int tab_index = browser()->selected_index(); 886 int tab_index = browser()->selected_index();
880 ASSERT_NO_FATAL_FAILURE(SetFocusedElement(tab_index, L"A")); 887 ASSERT_NO_FATAL_FAILURE(SetFocusedElement(tab_index, L"A"));
881 EXPECT_NO_FATAL_FAILURE(TestKeyEvent(tab_index, kTestPageUp)); 888 EXPECT_NO_FATAL_FAILURE(TestKeyEvent(tab_index, kTestPageUp));
882 EXPECT_NO_FATAL_FAILURE(TestKeyEvent(tab_index, kTestPageDown)); 889 EXPECT_NO_FATAL_FAILURE(TestKeyEvent(tab_index, kTestPageDown));
883 EXPECT_NO_FATAL_FAILURE(CheckTextBoxValue(tab_index, L"A", L"")); 890 EXPECT_NO_FATAL_FAILURE(CheckTextBoxValue(tab_index, L"A", L""));
884 } 891 }
885 892
886 } // namespace 893 } // 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