Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 476b7d43 authored by Tony Wickham's avatar Tony Wickham
Browse files

Fix testQuickSwitchFromApp 

Instead of starting getAppPackageName() and relying on it being our Test
Pin Item activity, instead launch our own test activities with the
FLAG_ACTIVITY_MULTIPLE_TASK and FLAG_ACTIVITY_NEW_DOCUMENT flags.

Test:
- Locally run testQuickSwitchFromApp() from Android Studio
- flake -oop -t com.android.quickstep.TaplTestsQuickstep#testQuickSwitchFromApp

Bug: 140252765
Change-Id: Ie137261ce65bfd3dd39df78d57784854a026e967
Merged-In: Ie137261ce65bfd3dd39df78d57784854a026e967
parent a0f77c44

quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java

+9 −10
Original line number Diff line number Diff line
@@ -248,33 +248,32 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest { 
    @Test

    @NavigationModeSwitch

    @PortraitLandscape

    @Ignore("Temporarily disabled b/140252765")

    public void testQuickSwitchFromApp() throws Exception {

        startAppFast(getAppPackageName());

        startTestActivity(2);

        String calculatorPackage = resolveSystemApp(Intent.CATEGORY_APP_CALCULATOR);

        startAppFast(calculatorPackage);

        startTestActivity(3);

        startTestActivity(4);



        Background background = getAndAssertBackground();

        background.quickSwitchToPreviousApp();

        assertTrue("The first app we should have quick switched to is not running",

                isTestActivityRunning("TestActivity2"));

                isTestActivityRunning(3));



        background = getAndAssertBackground();

        background.quickSwitchToPreviousApp();

        if (mLauncher.getNavigationModel() == NavigationModel.THREE_BUTTON) {

            // 3-button mode toggles between 2 apps, rather than going back further.

            assertTrue("Second quick switch should have returned to the first app.",

                    mDevice.wait(Until.hasObject(By.pkg(calculatorPackage)), DEFAULT_UI_TIMEOUT));

                    isTestActivityRunning(4));

        } else {

            assertTrue("The second app we should have quick switched to is not running",

                    isTestActivityRunning("Test Pin Item"));

                    isTestActivityRunning(2));

        }

        getAndAssertBackground();

    }



    private boolean isTestActivityRunning(String activityLabel) {

        return mDevice.wait(Until.hasObject(By.pkg(getAppPackageName()).text(activityLabel)),

    private boolean isTestActivityRunning(int activityNumber) {

        return mDevice.wait(Until.hasObject(By.pkg(getAppPackageName())

                        .text("TestActivity" + activityNumber)),

                DEFAULT_UI_TIMEOUT);

    }
@@ -285,7 +284,7 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest { 
        startTestActivity(2);

        mLauncher.pressHome().quickSwitchToPreviousApp();

        assertTrue("The most recent task is not running after quick switching from home",

                isTestActivityRunning("TestActivity2"));

                isTestActivityRunning(2));

        getAndAssertBackground();

    }

}

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

+12 −6
Original line number Diff line number Diff line
@@ -15,8 +15,6 @@ 
 */

package com.android.launcher3.ui;



import static androidx.test.InstrumentationRegistry.getInstrumentation;



import static com.android.launcher3.tapl.LauncherInstrumentation.ContainerType;

import static com.android.launcher3.ui.TaplTestsLauncher3.getAppPackageName;

import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
@@ -25,6 +23,8 @@ import static org.junit.Assert.assertTrue; 


import static java.lang.System.exit;



import static androidx.test.InstrumentationRegistry.getInstrumentation;



import android.content.BroadcastReceiver;

import android.content.ComponentName;

import android.content.Context;
@@ -348,7 +348,8 @@ public abstract class AbstractLauncherUiTest { 
        startIntent(

                getInstrumentation().getContext().getPackageManager().getLaunchIntentForPackage(

                        packageName),

                By.pkg(packageName).depth(0));

                By.pkg(packageName).depth(0),

                true /* newTask */);

    }



    protected void startTestActivity(int activityNumber) {
@@ -357,12 +358,17 @@ public abstract class AbstractLauncherUiTest { 
                getLaunchIntentForPackage(packageName);

        intent.setComponent(new ComponentName(packageName,

                "com.android.launcher3.tests.Activity" + activityNumber));

        startIntent(intent, By.pkg(packageName).text("TestActivity" + activityNumber));

        startIntent(intent, By.pkg(packageName).text("TestActivity" + activityNumber),

                false /* newTask */);

    }



    private void startIntent(Intent intent, BySelector selector) {

    private void startIntent(Intent intent, BySelector selector, boolean newTask) {

        intent.addCategory(Intent.CATEGORY_LAUNCHER);

        if (newTask) {

            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);

        } else {

            intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK | Intent.FLAG_ACTIVITY_NEW_DOCUMENT);

        }

        getInstrumentation().getTargetContext().startActivity(intent);

        assertTrue("App didn't start: " + selector,

                mDevice.wait(Until.hasObject(selector), DEFAULT_UI_TIMEOUT));