commit 6fa0d55a78dbb66cb248d7cfc7cb7c334b23f442
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Dec 17 21:03:17 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Dec 17 21:03:17 2020 +0000
tree 57f7b1ad95116bb70c392a2051b06159eeb7afc7
parent 5e394d9a9a66975b85d32af9f86dba776a52f6a5
parent 0d9cb19453d1314ae7d4a6a7b3a8031d309888ef

Merge "Checking menu item test to improve test fail diags"

tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java

diff --git a/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java b/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java
index a39f215..1648bdd 100644
--- a/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java
+++ b/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java
@@ -299,7 +299,9 @@
                     launcher -> assertTrue("Launcher internal state didn't switch to Showing Menu",
                             isOptionsPopupVisible(launcher)));
 
-            menu.getMenuItem(1).launch(getAppPackageName());
+            final AppIconMenuItem menuItem = menu.getMenuItem(1);
+            assertEquals("Wrong menu item", "Shortcut 2", menuItem.getText());
+            menuItem.launch(getAppPackageName());
         } finally {
             allApps.unfreeze();
         }
@@ -342,6 +344,7 @@
                     openMenu().
                     getMenuItem(0);
             final String shortcutName = menuItem.getText();
+            assertEquals("Wrong menu item", "Shortcut 3", shortcutName);
 
             menuItem.dragToWorkspace(false, false);
             mLauncher.getWorkspace().getWorkspaceAppIcon(shortcutName).launch(getAppPackageName());