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

Commit b34f951e authored by Vadim Tryshev's avatar Vadim Tryshev Committed by Android (Google) Code Review
Browse files

Merge "Adding a test method to get a Launcher object when it becomes non-null"... 

Merge "Adding a test method to get a Launcher object when it becomes non-null" into ub-launcher3-qt-qpr1-dev
parents 8c2efd0d cf61e16a

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

+1 −2
Original line number Diff line number Diff line
@@ -69,10 +69,9 @@ public class DigitalWellBeingToastTest extends AbstractQuickStepTest { 
    private DigitalWellBeingToast getToast() {

        executeOnLauncher(launcher -> launcher.getStateManager().goToState(OVERVIEW));

        waitForState("Launcher internal state didn't switch to Overview", OVERVIEW);

        waitForLauncherCondition("No latest task", launcher -> getLatestTask(launcher) != null);

        final TaskView task = getOnceNotNull("No latest task", launcher -> getLatestTask(launcher));



        return getFromLauncher(launcher -> {

            final TaskView task = getLatestTask(launcher);

            assertTrue("Latest task is not Calculator",

                    CALCULATOR_PACKAGE.equals(task.getTask().getTopComponent().getPackageName()));

            return task.getDigitalWellBeingToast();

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

+20 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ import static org.junit.Assert.assertTrue; 


import static java.lang.System.exit;



import android.app.Instrumentation;

import android.content.BroadcastReceiver;

import android.content.ComponentName;

import android.content.Context;
@@ -267,6 +266,12 @@ public abstract class AbstractLauncherUiTest { 
        waitForLauncherCondition(message, condition, DEFAULT_ACTIVITY_TIMEOUT);

    }



    // Cannot be used in TaplTests after injecting any gesture using Tapl because this can hide

    // flakiness.

    protected <T> T getOnceNotNull(String message, Function<Launcher, T> f) {

        return getOnceNotNull(message, f, DEFAULT_ACTIVITY_TIMEOUT);

    }



    // Cannot be used in TaplTests after injecting any gesture using Tapl because this can hide

    // flakiness.

    protected void waitForLauncherCondition(
@@ -275,6 +280,20 @@ public abstract class AbstractLauncherUiTest { 
        Wait.atMost(message, () -> getFromLauncher(condition), timeout);

    }



    // Cannot be used in TaplTests after injecting any gesture using Tapl because this can hide

    // flakiness.

    protected <T> T getOnceNotNull(String message, Function<Launcher, T> f, long timeout) {

        if (!TestHelpers.isInLauncherProcess()) return null;



        final Object[] output = new Object[1];

        Wait.atMost(message, () -> {

            final Object fromLauncher = getFromLauncher(f);

            output[0] = fromLauncher;

            return fromLauncher != null;

        }, timeout);

        return (T) output[0];

    }



    // Cannot be used in TaplTests after injecting any gesture using Tapl because this can hide

    // flakiness.

    protected void waitForLauncherCondition(