From 499723636d2cf39278ae8f2423d696c4abd170a9 Mon Sep 17 00:00:00 2001 From: Alex Chau Date: Tue, 5 Apr 2022 18:47:01 +0100 Subject: [PATCH] Ensure TestLauncher is actaully shown in goToOverviewFromHome - The previous activity can be other test activity with same package name, the check should be more speciifc on the launcher activity itself Bug: 223278795 Test: com.android.quickstep.FallbackRecentsTest#goToOverviewFromHome Change-Id: Ie9b88fa0ee16a5b1aec23258b09ab2a22450ac38 --- .../src/com/android/quickstep/FallbackRecentsTest.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java b/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java index ae00d82fea..8a62c14309 100644 --- a/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java +++ b/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java @@ -79,6 +79,8 @@ import java.util.function.Function; @RunWith(AndroidJUnit4.class) public class FallbackRecentsTest { + private static final String FALLBACK_LAUNCHER_TITLE = "Test launcher"; + private final UiDevice mDevice; private final LauncherInstrumentation mLauncher; private final ActivityInfo mOtherLauncherActivity; @@ -169,7 +171,7 @@ public class FallbackRecentsTest { public void goToOverviewFromHome() { mDevice.pressHome(); assertTrue("Fallback Launcher not visible", mDevice.wait(Until.hasObject(By.pkg( - mOtherLauncherActivity.packageName)), WAIT_TIME_MS)); + mOtherLauncherActivity.packageName).text(FALLBACK_LAUNCHER_TITLE)), WAIT_TIME_MS)); mLauncher.getLaunchedAppState().switchToOverview(); } @@ -258,7 +260,7 @@ public class FallbackRecentsTest { // Test dismissing all tasks. pressHomeAndGoToOverview().dismissAllTasks(); assertTrue("Fallback Launcher not visible", TestHelpers.wait(Until.hasObject(By.pkg( - mOtherLauncherActivity.packageName)), WAIT_TIME_MS)); + mOtherLauncherActivity.packageName).text(FALLBACK_LAUNCHER_TITLE)), WAIT_TIME_MS)); } private int getCurrentOverviewPage(RecentsActivity recents) {