commit 0d9cb19453d1314ae7d4a6a7b3a8031d309888ef
author vadimt <vadimt@google.com> Mon Dec 14 19:57:59 2020 -0800
committer vadimt <vadimt@google.com> Mon Dec 14 19:57:59 2020 -0800
tree a7d5f2fd5155212f34d8cc2bb513e821f09a10db
parent d0269cd0daa7a233e797ff8c7f939943275e0705

Checking menu item test to improve test fail diags

Test: atest
Bug: 75641613
Change-Id: Idb5c7fe744e4a3e69ee0fdb59d1a5a58bc6ce0b2

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());