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

Commit a8726dc9 authored by vadimt's avatar vadimt
Browse files

Tests: Use FLAG_ACTIVITY_CLEAR_TASK 

Change-Id: I58053db6f942737976afcaed26e449a1f9b98f6f
parent 2c129d3d

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

+15 −17
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ import android.util.Log; 


import androidx.test.InstrumentationRegistry;

import androidx.test.uiautomator.By;

import androidx.test.uiautomator.BySelector;

import androidx.test.uiautomator.UiDevice;

import androidx.test.uiautomator.Until;
@@ -330,30 +331,27 @@ public abstract class AbstractLauncherUiTest { 
    }



    protected void startAppFast(String packageName) {

        final Instrumentation instrumentation = getInstrumentation();

        final Intent intent = instrumentation.getContext().getPackageManager().

                getLaunchIntentForPackage(packageName);

        intent.addCategory(Intent.CATEGORY_LAUNCHER);

        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

        instrumentation.getTargetContext().startActivity(intent);

        assertTrue(packageName + " didn't start",

                mDevice.wait(Until.hasObject(By.pkg(packageName).depth(0)), DEFAULT_UI_TIMEOUT));

        startIntent(

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

                        packageName),

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

    }



    protected void startTestActivity(int activityNumber) {

        final String packageName = getAppPackageName();

        final Instrumentation instrumentation = getInstrumentation();

        final Intent intent = instrumentation.getContext().getPackageManager().

        final Intent intent = getInstrumentation().getContext().getPackageManager().

                getLaunchIntentForPackage(packageName);

        intent.addCategory(Intent.CATEGORY_LAUNCHER);

        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

        intent.setComponent(new ComponentName(packageName,

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

        instrumentation.getTargetContext().startActivity(intent);

        assertTrue(packageName + " didn't start",

                mDevice.wait(

                        Until.hasObject(By.pkg(packageName).text("TestActivity" + activityNumber)),

                        DEFAULT_UI_TIMEOUT));

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

    }



    private void startIntent(Intent intent, BySelector selector) {

        intent.addCategory(Intent.CATEGORY_LAUNCHER);

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

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

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

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

    }



    public static String resolveSystemApp(String category) {