commit 878784aa2d46b0e2657b0967da2769bef9061790
author Vadim Tryshev <vadimt@google.com> Tue Dec 05 21:34:23 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Dec 05 21:34:23 2023 +0000
tree e4a3fcbcb7b353e96686c7d4cbdc83861a6e99b4
parent 85cea3e07b25ada65b19be70c473b8bc1aecf8a6
parent 01444246cde2ec529521fe2897690f498417f1b4

Merge "Waiting for Launcher activity to stop in OverviewTaskMenu.tapAppInfoMenuItem" into main

tests/tapl/com/android/launcher3/tapl/OverviewTaskMenu.java

diff --git a/tests/tapl/com/android/launcher3/tapl/OverviewTaskMenu.java b/tests/tapl/com/android/launcher3/tapl/OverviewTaskMenu.java
index 38cc321..4a0131b 100644
--- a/tests/tapl/com/android/launcher3/tapl/OverviewTaskMenu.java
+++ b/tests/tapl/com/android/launcher3/tapl/OverviewTaskMenu.java
@@ -20,6 +20,8 @@
 import androidx.test.uiautomator.By;
 import androidx.test.uiautomator.UiObject2;
 
+import com.android.launcher3.testing.shared.TestProtocol;
+
 /** Represents the menu of an overview task. */
 public class OverviewTaskMenu {
 
@@ -59,8 +61,13 @@
         try (LauncherInstrumentation.Closable e = mLauncher.eventsCheck();
              LauncherInstrumentation.Closable c = mLauncher.addContextLayer(
                      "before tapping the app info menu item")) {
-            mLauncher.clickLauncherObject(
-                    mLauncher.findObjectInContainer(mMenu, By.text("App info")));
+            mLauncher.executeAndWaitForLauncherEvent(
+                    () -> mLauncher.clickLauncherObject(
+                            mLauncher.findObjectInContainer(mMenu, By.text("App info"))),
+                    event -> TestProtocol.LAUNCHER_ACTIVITY_STOPPED_MESSAGE
+                            .equals(event.getClassName().toString()),
+                    () -> "Launcher activity didn't stop",
+                    "tapped app info menu item");
 
             try (LauncherInstrumentation.Closable c1 = mLauncher.addContextLayer(
                     "tapped app info menu item")) {