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

Side by Side Diff: chrome/browser/chromeos/accessibility/spoken_feedback_browsertest.cc

Issue 762113004: SpokenFeedbackTest.NavigateAppLaunchers: Fix for experimental app list. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@app-list-experimental-browser-tests
Patch Set: Change bug number in TODO. Created 6 years 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 <queue> 5 #include <queue>
6 6
7 #include "ash/accelerators/accelerator_controller.h" 7 #include "ash/accelerators/accelerator_controller.h"
8 #include "ash/accelerators/accelerator_table.h" 8 #include "ash/accelerators/accelerator_table.h"
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "ash/system/tray/system_tray.h" 10 #include "ash/system/tray/system_tray.h"
(...skipping 20 matching lines...) Expand all
31 #include "chrome/test/base/testing_profile.h" 31 #include "chrome/test/base/testing_profile.h"
32 #include "chrome/test/base/ui_test_utils.h" 32 #include "chrome/test/base/ui_test_utils.h"
33 #include "chromeos/chromeos_switches.h" 33 #include "chromeos/chromeos_switches.h"
34 #include "chromeos/login/user_names.h" 34 #include "chromeos/login/user_names.h"
35 #include "content/public/common/url_constants.h" 35 #include "content/public/common/url_constants.h"
36 #include "content/public/test/browser_test_utils.h" 36 #include "content/public/test/browser_test_utils.h"
37 #include "content/public/test/test_utils.h" 37 #include "content/public/test/test_utils.h"
38 #include "extensions/browser/extension_host.h" 38 #include "extensions/browser/extension_host.h"
39 #include "extensions/browser/process_manager.h" 39 #include "extensions/browser/process_manager.h"
40 #include "testing/gtest/include/gtest/gtest.h" 40 #include "testing/gtest/include/gtest/gtest.h"
41 #include "ui/app_list/app_list_switches.h"
41 #include "ui/base/test/ui_controls.h" 42 #include "ui/base/test/ui_controls.h"
42 #include "ui/views/widget/widget.h" 43 #include "ui/views/widget/widget.h"
43 44
44 using extensions::api::braille_display_private::StubBrailleController; 45 using extensions::api::braille_display_private::StubBrailleController;
45 46
46 namespace chromeos { 47 namespace chromeos {
47 48
48 // 49 //
49 // Spoken feedback tests only in a logged in user's window. 50 // Spoken feedback tests only in a logged in user's window.
50 // 51 //
(...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after
309 EnableChromeVox(); 310 EnableChromeVox();
310 311
311 EXPECT_TRUE(PerformAcceleratorAction(ash::FOCUS_SHELF)); 312 EXPECT_TRUE(PerformAcceleratorAction(ash::FOCUS_SHELF));
312 while (true) { 313 while (true) {
313 std::string utterance = speech_monitor_.GetNextUtterance(); 314 std::string utterance = speech_monitor_.GetNextUtterance();
314 if (utterance == "button") 315 if (utterance == "button")
315 break; 316 break;
316 } 317 }
317 318
318 SendKeyPress(ui::VKEY_RETURN); 319 SendKeyPress(ui::VKEY_RETURN);
320 // TODO(mgiuca): This is incorrect behaviour; it should read out "Search, text
321 // box" or similar (see http://crbug.com/386826).
319 EXPECT_TRUE(MatchPattern(speech_monitor_.GetNextUtterance(), ", text box")); 322 EXPECT_TRUE(MatchPattern(speech_monitor_.GetNextUtterance(), ", text box"));
320 323
321 SendKeyPress(ui::VKEY_DOWN); 324 // TODO(mgiuca): The next part of the test fails in the experimental app list,
322 // Chrom* appears twice because the accessibility system uses the first app as 325 // because there is no keyboard navigation (see http://crbug.com/438568). Only
323 // the accessibility context. 326 // check this in the classic app launcher.
324 EXPECT_TRUE(MatchPattern(speech_monitor_.GetNextUtterance(), "Chrom*,")); 327 if (!app_list::switches::IsExperimentalAppListEnabled()) {
325 EXPECT_TRUE(MatchPattern(speech_monitor_.GetNextUtterance(), "Chrom*,")); 328 SendKeyPress(ui::VKEY_DOWN);
326 EXPECT_TRUE(MatchPattern(speech_monitor_.GetNextUtterance(), "button")); 329 // Chrom* appears twice because the accessibility system uses the first app
330 // as the accessibility context.
331 EXPECT_TRUE(MatchPattern(speech_monitor_.GetNextUtterance(), "Chrom*,"));
332 EXPECT_TRUE(MatchPattern(speech_monitor_.GetNextUtterance(), "Chrom*,"));
333 EXPECT_TRUE(MatchPattern(speech_monitor_.GetNextUtterance(), "button"));
334 }
327 } 335 }
328 336
329 IN_PROC_BROWSER_TEST_P(SpokenFeedbackTest, OpenStatusTray) { 337 IN_PROC_BROWSER_TEST_P(SpokenFeedbackTest, OpenStatusTray) {
330 EnableChromeVox(); 338 EnableChromeVox();
331 339
332 EXPECT_TRUE(PerformAcceleratorAction(ash::SHOW_SYSTEM_TRAY_BUBBLE)); 340 EXPECT_TRUE(PerformAcceleratorAction(ash::SHOW_SYSTEM_TRAY_BUBBLE));
333 EXPECT_EQ("Status tray,", speech_monitor_.GetNextUtterance()); 341 EXPECT_EQ("Status tray,", speech_monitor_.GetNextUtterance());
334 EXPECT_TRUE(MatchPattern(speech_monitor_.GetNextUtterance(), "time *")); 342 EXPECT_TRUE(MatchPattern(speech_monitor_.GetNextUtterance(), "time *"));
335 EXPECT_TRUE(MatchPattern(speech_monitor_.GetNextUtterance(), 343 EXPECT_TRUE(MatchPattern(speech_monitor_.GetNextUtterance(),
336 "Battery is*full.")); 344 "Battery is*full."));
(...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after
597 EXPECT_EQ("English ( United States)", speech_monitor_.GetNextUtterance()); 605 EXPECT_EQ("English ( United States)", speech_monitor_.GetNextUtterance());
598 EXPECT_TRUE(MatchPattern(speech_monitor_.GetNextUtterance(), 606 EXPECT_TRUE(MatchPattern(speech_monitor_.GetNextUtterance(),
599 "Combo box * of *")); 607 "Combo box * of *"));
600 ASSERT_TRUE( 608 ASSERT_TRUE(
601 ui_test_utils::SendKeyPressToWindowSync( 609 ui_test_utils::SendKeyPressToWindowSync(
602 window, ui::VKEY_TAB, false, false, false, false)); 610 window, ui::VKEY_TAB, false, false, false, false));
603 EXPECT_EQ("Select your keyboard:", speech_monitor_.GetNextUtterance()); 611 EXPECT_EQ("Select your keyboard:", speech_monitor_.GetNextUtterance());
604 } 612 }
605 613
606 } // namespace chromeos 614 } // namespace chromeos
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