Commit efd86b08 authored by James Cook's avatar James Cook Committed by Commit Bot

chromeos: Add LoggedInSpokenFeedbackTest.KeyboardShortcutViewer

This tests ChromeVox integration with an out-of-process mojo app.

Bug: 851578
Test: interactive_ui_tests
Change-Id: I23a6cbf9bf93d675f5cc774e3df82eb4be5a334f
Reviewed-on: https://chromium-review.googlesource.com/1132555
Commit-Queue: James Cook <jamescook@chromium.org>
Reviewed-by: default avatarDominic Mazzoni <dmazzoni@chromium.org>
Cr-Commit-Position: refs/heads/master@{#577197}
parent deff1fee
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
#include "chrome/browser/extensions/api/braille_display_private/stub_braille_controller.h" #include "chrome/browser/extensions/api/braille_display_private/stub_braille_controller.h"
#include "chrome/browser/speech/tts_controller.h" #include "chrome/browser/speech/tts_controller.h"
#include "chrome/browser/speech/tts_platform.h" #include "chrome/browser/speech/tts_platform.h"
#include "chrome/browser/ui/ash/ksv/keyboard_shortcut_viewer_util.h"
#include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_commands.h" #include "chrome/browser/ui/browser_commands.h"
#include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/browser_window.h"
...@@ -243,6 +244,17 @@ IN_PROC_BROWSER_TEST_F(LoggedInSpokenFeedbackTest, ...@@ -243,6 +244,17 @@ IN_PROC_BROWSER_TEST_F(LoggedInSpokenFeedbackTest,
EXPECT_EQ("Not pressed", speech_monitor_.GetNextUtterance()); EXPECT_EQ("Not pressed", speech_monitor_.GetNextUtterance());
} }
// Tests the keyboard shortcut viewer, which is an out-of-process mojo app.
IN_PROC_BROWSER_TEST_F(LoggedInSpokenFeedbackTest, KeyboardShortcutViewer) {
EnableChromeVox();
keyboard_shortcut_viewer_util::ShowKeyboardShortcutViewer();
// Focus should move to the search field and ChromeVox should speak it.
while ("Search for keyboard shortcuts" !=
speech_monitor_.GetNextUtterance()) {
}
}
// //
// Spoken feedback tests in both a logged in browser window and guest mode. // Spoken feedback tests in both a logged in browser window and guest mode.
// //
...@@ -325,11 +337,9 @@ IN_PROC_BROWSER_TEST_P(SpokenFeedbackTest, FocusShelf) { ...@@ -325,11 +337,9 @@ IN_PROC_BROWSER_TEST_P(SpokenFeedbackTest, FocusShelf) {
EXPECT_TRUE(base::MatchPattern(speech_monitor_.GetNextUtterance(), "Button")); EXPECT_TRUE(base::MatchPattern(speech_monitor_.GetNextUtterance(), "Button"));
} }
IN_PROC_BROWSER_TEST_P(SpokenFeedbackTest, NavigateAppLauncher) { // TODO(newcomer): reimplement this test once the AppListFocus changes are
// TODO(newcomer): reimplement this test once the AppListFocus changes are // complete (http://crbug.com/784942).
// complete (http://crbug.com/784942). IN_PROC_BROWSER_TEST_P(SpokenFeedbackTest, DISABLED_NavigateAppLauncher) {
return;
EnableChromeVox(); EnableChromeVox();
EXPECT_TRUE(PerformAcceleratorAction(ash::FOCUS_SHELF)); EXPECT_TRUE(PerformAcceleratorAction(ash::FOCUS_SHELF));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment