Add keyboard foldering and reordering app list spoken feedback tests.

This change adds two new app list spoken feedback tests. These tests
ensure that app item reordering and folder creation are announced
correctly in the app list.

Also in this change, the incomplete NavigateAppLauncher test has been
removed as its purpose it no longer required. In its place, the tests
PeekingLauncherFocusTraversal and FullscreenLauncherFocusTraversal
already exist which cover the same relevant test case for app list
focus traversal.

Bug: 784942
Change-Id: I02120a6eff8ba1dad698a86bf1977aa9895988d7
AX-Relnotes: n/a.
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2242917
Commit-Queue: Matthew Mourgos <mmourgos@chromium.org>
Reviewed-by: Dominic Mazzoni <dmazzoni@chromium.org>
Cr-Commit-Position: refs/heads/master@{#781604}

chrome/browser/chromeos/accessibility/spoken_feedback_app_list_browsertest.cc

@@ -18,6 +18,7 @@
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/grit/generated_resources.h"
+#include "chrome/test/base/interactive_test_utils.h"
 #include "chromeos/constants/chromeos_switches.h"
 #include "components/user_manager/user_names.h"
 #include "content/public/test/browser_test.h"
@@ -28,6 +29,15 @@
 
 namespace chromeos {
 
+namespace {
+
+void SendKeyPressWithShiftAndControl(ui::KeyboardCode key) {
+  ASSERT_NO_FATAL_FAILURE(ASSERT_TRUE(ui_test_utils::SendKeyPressToWindowSync(
+      nullptr, key, true, true, false, false)));
+}
+
+}  // namespace
+
 enum SpokenFeedbackAppListTestVariant { kTestAsNormalUser, kTestAsGuestUser };
 
 class TestSuggestionChipResult : public ash::TestSearchResult {
@@ -353,49 +363,123 @@ IN_PROC_BROWSER_TEST_P(SpokenFeedbackAppListTest,
   sm_.Replay();
 }
 
-IN_PROC_BROWSER_TEST_P(SpokenFeedbackAppListTest, NavigateAppLauncher) {
+// Checks that app list keyboard foldering is announced.
+IN_PROC_BROWSER_TEST_P(SpokenFeedbackAppListTest, AppListFoldering) {
+  // Add 3 apps.
+  PopulateApps(3);
+
   EnableChromeVox();
 
-  sm_.Call([this]() {
-    // Add one app to the applist.
-    PopulateApps(1);
+  sm_.Call(
+      [this]() { EXPECT_TRUE(PerformAcceleratorAction(ash::FOCUS_SHELF)); });
+  sm_.ExpectSpeech("Shelf");
+  // Press space on the launcher button in shelf, this opens peeking
+  // launcher.
+  sm_.Call([this]() { SendKeyPressWithSearch(ui::VKEY_SPACE); });
+  sm_.ExpectSpeech("Launcher, partial view");
+  // Send a key press to enable keyboard traversal
+  sm_.Call([this]() { SendKeyPressWithSearch(ui::VKEY_UP); });
+  // Move focus to expand all apps button.
+  sm_.Call([this]() { SendKeyPressWithSearch(ui::VKEY_UP); });
+  sm_.ExpectSpeech("Expand to all apps");
+  // Press space on expand arrow to go to fullscreen launcher.
+  sm_.Call([this]() { SendKeyPressWithSearch(ui::VKEY_SPACE); });
+  sm_.ExpectSpeech("Launcher, all apps");
 
-    EXPECT_TRUE(PerformAcceleratorAction(ash::FOCUS_SHELF));
-  });
+  // Move focus to 1st app;
+  sm_.Call([this]() { SendKeyPressWithSearch(ui::VKEY_RIGHT); });
+  sm_.ExpectSpeech("Item 0");
+  sm_.ExpectSpeech("Button");
 
-  // Wait for it to say "Launcher", "Button", "Shelf", "Tool bar".
-  sm_.ExpectSpeechPattern("Launcher");
+  // Combine items and create a new folder.
+  sm_.Call([]() { SendKeyPressWithShiftAndControl(ui::VKEY_RIGHT); });
+  sm_.ExpectSpeech("Folder Unnamed");
   sm_.ExpectSpeech("Button");
-  sm_.ExpectSpeech("Shelf");
-  sm_.ExpectSpeech("Tool bar");
+  sm_.ExpectSpeech("Alert");
+  sm_.ExpectSpeech("Item 0 combined with Item 1 to create new folder.");
 
-  // Click on the launcher, it brings up the app list UI.
-  sm_.Call([this]() { SendKeyPress(ui::VKEY_SPACE); });
-  sm_.ExpectSpeech(
-      "Search your device, apps, settings, and web. Use the arrow keys to "
-      "navigate your apps.");
-  sm_.ExpectSpeech("Edit text");
+  // Open the folder and move focus to the first item of the folder.
+  sm_.Call([this]() { SendKeyPressWithSearch(ui::VKEY_SPACE); });
+  sm_.ExpectSpeech("Item 1");
+  sm_.ExpectSpeech("Button");
+
+  // Remove the first item from the folder back to the top level app list.
+  sm_.Call([]() { SendKeyPressWithShiftAndControl(ui::VKEY_LEFT); });
+  sm_.ExpectSpeech("Item 1");
+  sm_.ExpectSpeech("Button");
+  sm_.ExpectSpeech("Alert");
+  sm_.ExpectSpeech("Moved to Page 1, row 1, column 1.");
+
+  sm_.Replay();
+}
 
-  // Close it and open it again.
-  sm_.Call([this]() { SendKeyPress(ui::VKEY_ESCAPE); });
-  sm_.ExpectSpeechPattern("*window*");
+// Checks that app list keyboard reordering is announced.
+// TODO(mmourgos): The current method of accessibility announcements for item
+// reordering uses alerts, this works for spoken feedback but does not work as
+// well for braille users. The preferred way to handle this is to actually
+// change focus as the user navigates, and to have each object's
+// accessible name describe its position. (See crbug.com/1098495)
+IN_PROC_BROWSER_TEST_P(SpokenFeedbackAppListTest, AppListReordering) {
+  // Add 7 apps.
+  PopulateApps(22);
+
+  EnableChromeVox();
 
   sm_.Call(
       [this]() { EXPECT_TRUE(PerformAcceleratorAction(ash::FOCUS_SHELF)); });
-  sm_.ExpectSpeechPattern("Launcher");
-  sm_.ExpectSpeech("Button");
-
-  sm_.Call([this]() { SendKeyPress(ui::VKEY_SPACE); });
-  sm_.ExpectSpeech(
-      "Search your device, apps, settings, and web. Use the arrow keys to "
-      "navigate your apps.");
+  sm_.ExpectSpeech("Shelf");
+  // Press space on the launcher button in shelf, this opens peeking
+  // launcher.
+  sm_.Call([this]() { SendKeyPressWithSearch(ui::VKEY_SPACE); });
+  sm_.ExpectSpeech("Launcher, partial view");
+  // Send a key press to enable keyboard traversal
+  sm_.Call([this]() { SendKeyPressWithSearchAndShift(ui::VKEY_TAB); });
+  // Move focus to expand all apps button.
+  sm_.Call([this]() { SendKeyPressWithSearchAndShift(ui::VKEY_TAB); });
+  sm_.ExpectSpeech("Expand to all apps");
+  // Press space on expand arrow to go to fullscreen launcher.
+  sm_.Call([this]() { SendKeyPressWithSearch(ui::VKEY_SPACE); });
+  sm_.ExpectSpeech("Launcher, all apps");
 
-  // Now press the right arrow and we should be focused on an app button
-  // in a dialog.
-  // THis doesn't work though (to be done below).
+  // Move focus to first app;
+  sm_.Call([this]() { SendKeyPressWithSearch(ui::VKEY_RIGHT); });
+  sm_.ExpectSpeech("Item 0");
+  sm_.ExpectSpeech("Button");
 
-  // TODO(newcomer): reimplement this test once the AppListFocus changes are
-  // complete (http://crbug.com/784942).
+  // Move the first item to the right.
+  sm_.Call([this]() { SendKeyPressWithControl(ui::VKEY_RIGHT); });
+  sm_.ExpectSpeech("Alert");
+  sm_.ExpectSpeech("Moved to Page 1, row 1, column 2.");
+
+  // Move the focused item down.
+  sm_.Call([this]() { SendKeyPressWithControl(ui::VKEY_DOWN); });
+  sm_.ExpectSpeech("Alert");
+  sm_.ExpectSpeech("Moved to Page 1, row 2, column 2.");
+
+  // Move the focused item down.
+  sm_.Call([this]() { SendKeyPressWithControl(ui::VKEY_DOWN); });
+  sm_.ExpectSpeech("Alert");
+  sm_.ExpectSpeech("Moved to Page 1, row 3, column 2.");
+
+  // Move the focused item down.
+  sm_.Call([this]() { SendKeyPressWithControl(ui::VKEY_DOWN); });
+  sm_.ExpectSpeech("Alert");
+  sm_.ExpectSpeech("Moved to Page 1, row 4, column 2.");
+
+  // Move the focused item down to page 2.
+  sm_.Call([this]() { SendKeyPressWithControl(ui::VKEY_DOWN); });
+  sm_.ExpectSpeech("Alert");
+  sm_.ExpectSpeech("Moved to Page 2, row 1, column 2.");
+
+  // Move the focused item to the left.
+  sm_.Call([this]() { SendKeyPressWithControl(ui::VKEY_LEFT); });
+  sm_.ExpectSpeech("Alert");
+  sm_.ExpectSpeech("Moved to Page 2, row 1, column 1.");
+
+  // Move the focused item back up to page 1..
+  sm_.Call([this]() { SendKeyPressWithControl(ui::VKEY_UP); });
+  sm_.ExpectSpeech("Alert");
+  sm_.ExpectSpeech("Moved to Page 1, row 4, column 1.");
 
   sm_.Replay();
 }