summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser_keyevents_browsertest.cc
diff options
context:
space:
mode:
authoroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-06 08:02:42 +0000
committeroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-06 08:02:42 +0000
commitf07d7bfb75a35d89075e6b88ace6ccfb76cbe97b (patch)
treed650fed9834d5a7468321ace5cc4502c728a7caa /chrome/browser/browser_keyevents_browsertest.cc
parenta67e851f7913d42e4e550062d23779acec333aab (diff)
downloadchromium_src-f07d7bfb75a35d89075e6b88ace6ccfb76cbe97b.zip
chromium_src-f07d7bfb75a35d89075e6b88ace6ccfb76cbe97b.tar.gz
chromium_src-f07d7bfb75a35d89075e6b88ace6ccfb76cbe97b.tar.bz2
Enable interactive_ui_tests
* changed DCHECK in tree_node_model to make it easy to find how it failed. * Fixed compilation error in find_bar_host_interactive_uitest.cc on linux/views. * Disabled BrowserKeyEventsTest.AccessKeys for Chromeos Added/Changed ui_test_utils::RunAllPendingInMessageLoop where necessary. * Disabled tab_dragging_tests. I included the source so that we can catch compilation error even if tests do not run. Changed the comment from // -> /* as GCC complains the use of "\" (and potentially dangerous) * Added SleepInMessageLoop to allow event loop to execute the tasks/events while waiting. * For RunAllPendingInMessageLoop change, please see http://codereview.chromium.org/1591004 BUG=39736 TEST=interactive_ui_tests should pass with following cls http://codereview.chromium.org/1594003 http://codereview.chromium.org/1545011. Review URL: http://codereview.chromium.org/1576008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43701 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_keyevents_browsertest.cc')
-rw-r--r--chrome/browser/browser_keyevents_browsertest.cc14
1 files changed, 11 insertions, 3 deletions
diff --git a/chrome/browser/browser_keyevents_browsertest.cc b/chrome/browser/browser_keyevents_browsertest.cc
index cf23cba..e7c9ba0 100644
--- a/chrome/browser/browser_keyevents_browsertest.cc
+++ b/chrome/browser/browser_keyevents_browsertest.cc
@@ -134,8 +134,8 @@ class BrowserKeyEventsTest : public InProcessBrowserTest {
void SendKey(base::KeyboardCode key, bool control, bool shift, bool alt) {
gfx::NativeWindow window = NULL;
ASSERT_NO_FATAL_FAILURE(GetNativeWindow(&window));
- ui_controls::SendKeyPressNotifyWhenDone(window, key, control, shift, alt,
- new MessageLoop::QuitTask());
+ EXPECT_TRUE(ui_controls::SendKeyPressNotifyWhenDone(
+ window, key, control, shift, alt, new MessageLoop::QuitTask()));
ui_test_utils::RunMessageLoop();
}
@@ -447,7 +447,14 @@ IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, CtrlKeyEvents) {
EXPECT_NO_FATAL_FAILURE(TestKeyEvent(tab_index, kTestCtrlEnter));
}
-IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, AccessKeys) {
+#if defined(OS_CHROMEOS)
+// See http://crbug.com/40037 for details.
+#define MAYBE_AccessKeys DISABLED_AccessKeys
+#else
+#define MAYBE_AccessKeys AccessKeys
+#endif
+
+IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, MAYBE_AccessKeys) {
static const KeyEventTestData kTestAltA = {
base::VKEY_A, false, false, true,
false, false, false, false, 4,
@@ -487,6 +494,7 @@ IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, AccessKeys) {
GURL url = server->TestServerPageW(kTestingPage);
ui_test_utils::NavigateToURL(browser(), url);
+ ui_test_utils::RunAllPendingInMessageLoop();
ASSERT_NO_FATAL_FAILURE(ClickOnView(VIEW_ID_TAB_CONTAINER));
ASSERT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER_FOCUS_VIEW));