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

Commit 8a054061 authored by Tony Wickham's avatar Tony Wickham
Browse files

Change LauncherState to Supplier<LauncherState> in tests 

This prevents the test from statically initializing LauncherState and
all its static dependencies, which might lead to runtime exceptions in
out-of-proc tests.

Change-Id: I0e4e09dfb31a8b256c2c0c0b3d1d2ecd0cc92230
parent 8f76378b

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

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ public class DigitalWellBeingToastTest extends AbstractQuickStepTest { 


    private DigitalWellBeingToast getToast() {

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

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

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

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



        return getFromLauncher(launcher -> {

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

+23 −16
Original line number Diff line number Diff line
@@ -82,7 +82,8 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest { 
    @Ignore // Enable after b/131115533

    public void testPressRecentAppsLauncherAndGetOverview() throws RemoteException {

        mDevice.pressRecentApps();

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

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

                () -> LauncherState.OVERVIEW);



        assertNotNull("getOverview() returned null", mLauncher.getOverview());

    }
@@ -93,7 +94,8 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest { 
    public void testWorkspaceSwitchToAllApps() {

        assertNotNull("switchToAllApps() returned null",

                mLauncher.getWorkspace().switchToAllApps());

        assertTrue("Launcher internal state is not All Apps", isInState(LauncherState.ALL_APPS));

        assertTrue("Launcher internal state is not All Apps",

                isInState(() -> LauncherState.ALL_APPS));

    }



    @Test
@@ -112,7 +114,7 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest { 
        // mLauncher.pressHome() also tests an important case of pressing home while in background.

        Overview overview = mLauncher.pressHome().switchToOverview();

        assertTrue("Launcher internal state didn't switch to Overview",

                isInState(LauncherState.OVERVIEW));

                isInState(() -> LauncherState.OVERVIEW));

        executeOnLauncher(

                launcher -> assertTrue("Don't have at least 3 tasks", getTaskCount(launcher) >= 3));
@@ -121,14 +123,16 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest { 
                0, getCurrentOverviewPage(launcher)));



        overview.flingForward();

        assertTrue("Launcher internal state is not Overview", isInState(LauncherState.OVERVIEW));

        assertTrue("Launcher internal state is not Overview",

                isInState(() -> LauncherState.OVERVIEW));

        final Integer currentTaskAfterFlingForward = getFromLauncher(

                launcher -> getCurrentOverviewPage(launcher));

        executeOnLauncher(launcher -> assertTrue("Current task in Overview is still 0",

                currentTaskAfterFlingForward > 0));



        overview.flingBackward();

        assertTrue("Launcher internal state is not Overview", isInState(LauncherState.OVERVIEW));

        assertTrue("Launcher internal state is not Overview",

                isInState(() -> LauncherState.OVERVIEW));

        executeOnLauncher(launcher -> assertTrue("Flinging back in Overview did nothing",

                getCurrentOverviewPage(launcher) < currentTaskAfterFlingForward));
@@ -147,7 +151,7 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest { 
        // Test dismissing a task.

        overview = mLauncher.pressHome().switchToOverview();

        assertTrue("Launcher internal state didn't switch to Overview",

                isInState(LauncherState.OVERVIEW));

                isInState(() -> LauncherState.OVERVIEW));

        final Integer numTasks = getFromLauncher(launcher -> getTaskCount(launcher));

        task = overview.getCurrentTask();

        assertNotNull("overview.getCurrentTask() returned null (2)", task);
@@ -162,29 +166,29 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest { 
            final AllAppsFromOverview allApps = overview.switchToAllApps();

            assertNotNull("overview.switchToAllApps() returned null (1)", allApps);

            assertTrue("Launcher internal state is not All Apps (1)",

                    isInState(LauncherState.ALL_APPS));

                    isInState(() -> LauncherState.ALL_APPS));



            overview = allApps.switchBackToOverview();

            assertNotNull("allApps.switchBackToOverview() returned null", overview);

            assertTrue("Launcher internal state didn't switch to Overview",

                    isInState(LauncherState.OVERVIEW));

                    isInState(() -> LauncherState.OVERVIEW));



            // Test UIDevice.pressBack()

            overview.switchToAllApps();

            assertNotNull("overview.switchToAllApps() returned null (2)", allApps);

            assertTrue("Launcher internal state is not All Apps (2)",

                    isInState(LauncherState.ALL_APPS));

                    isInState(() -> LauncherState.ALL_APPS));

            mDevice.pressBack();

            mLauncher.getOverview();

        }



        // Test UIDevice.pressHome, once we are in AllApps.

        mDevice.pressHome();

        waitForState("Launcher internal state didn't switch to Home", LauncherState.NORMAL);

        waitForState("Launcher internal state didn't switch to Home", () -> LauncherState.NORMAL);



        // Test dismissing all tasks.

        mLauncher.getWorkspace().switchToOverview().dismissAllTasks();

        waitForState("Launcher internal state didn't switch to Home", LauncherState.NORMAL);

        waitForState("Launcher internal state didn't switch to Home", () -> LauncherState.NORMAL);

        executeOnLauncher(

                launcher -> assertEquals("Still have tasks after dismissing all",

                        0, getTaskCount(launcher)));
@@ -202,7 +206,8 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest { 
    public void testAppIconLaunchFromAllAppsFromOverview() throws Exception {

        final AllApps allApps =

                mLauncher.getWorkspace().switchToOverview().switchToAllApps();

        assertTrue("Launcher internal state is not All Apps", isInState(LauncherState.ALL_APPS));

        assertTrue("Launcher internal state is not All Apps",

                isInState(() -> LauncherState.ALL_APPS));



        TaplTestsLauncher3.runIconLaunchFromAllAppsTest(this, allApps);

    }
@@ -214,7 +219,7 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest { 
        assertNotNull("Workspace.switchToOverview() returned null",

                mLauncher.pressHome().switchToOverview());

        assertTrue("Launcher internal state didn't switch to Overview",

                isInState(LauncherState.OVERVIEW));

                isInState(() -> LauncherState.OVERVIEW));

    }



    @Test
@@ -226,7 +231,7 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest { 


        assertNotNull("Background.switchToOverview() returned null", background.switchToOverview());

        assertTrue("Launcher internal state didn't switch to Overview",

                isInState(LauncherState.OVERVIEW));

                isInState(() -> LauncherState.OVERVIEW));

    }



    private Background getAndAssertBackground() {
@@ -249,9 +254,11 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest { 
        TaplTestsLauncher3.runAllAppsTest(this, mLauncher.getAllApps());



        // Testing pressHome.

        assertTrue("Launcher internal state is not All Apps", isInState(LauncherState.ALL_APPS));

        assertTrue("Launcher internal state is not All Apps",

                isInState(() -> LauncherState.ALL_APPS));

        assertNotNull("pressHome returned null", mLauncher.pressHome());

        assertTrue("Launcher internal state is not Home", isInState(LauncherState.NORMAL));

        assertTrue("Launcher internal state is not Home",

                isInState(() -> LauncherState.NORMAL));

        assertNotNull("getHome returned null", mLauncher.getWorkspace());

    }

tests/src/com/android/launcher3/compat/PromiseIconUiTest.java

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ public class PromiseIconUiTest extends AbstractLauncherUiTest { 
        super.setUp();

        mDevice.pressHome();

        waitForLauncherCondition("Launcher didn't start", launcher -> launcher != null);

        waitForState("Launcher internal state didn't switch to Home", LauncherState.NORMAL);

        waitForState("Launcher internal state didn't switch to Home", () -> LauncherState.NORMAL);

        mSessionId = -1;

    }

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

+5 −4
Original line number Diff line number Diff line
@@ -84,6 +84,7 @@ import java.util.concurrent.CountDownLatch; 
import java.util.concurrent.TimeUnit;

import java.util.function.Consumer;

import java.util.function.Function;

import java.util.function.Supplier;



/**

 * Base class for all instrumentation tests providing various utility methods.
@@ -281,9 +282,9 @@ public abstract class AbstractLauncherUiTest { 


    // Cannot be used in TaplTests between a Tapl call injecting a gesture and a tapl call expecting

    // the results of that gesture because the wait can hide flakeness.

    protected void waitForState(String message, LauncherState state) {

    protected void waitForState(String message, Supplier<LauncherState> state) {

        waitForLauncherCondition(message,

                launcher -> launcher.getStateManager().getCurrentStableState() == state);

                launcher -> launcher.getStateManager().getCurrentStableState() == state.get());

    }



    protected void waitForResumed(String message) {
@@ -430,9 +431,9 @@ public abstract class AbstractLauncherUiTest { 
        return !launcher.hasBeenResumed();

    }



    protected boolean isInState(LauncherState state) {

    protected boolean isInState(Supplier<LauncherState> state) {

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

        return getFromLauncher(launcher -> launcher.getStateManager().getState() == state);

        return getFromLauncher(launcher -> launcher.getStateManager().getState() == state.get());

    }



    protected int getAllAppsScroll(Launcher launcher) {

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

+12 −9
Original line number Diff line number Diff line
@@ -73,7 +73,8 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest { 
        test.clearLauncherData();

        test.mDevice.pressHome();

        test.waitForLauncherCondition("Launcher didn't start", launcher -> launcher != null);

        test.waitForState("Launcher internal state didn't switch to Home", LauncherState.NORMAL);

        test.waitForState("Launcher internal state didn't switch to Home",

                () -> LauncherState.NORMAL);

        test.waitForResumed("Launcher internal state is still Background");

        // Check that we switched to home.

        test.mLauncher.getWorkspace();
@@ -143,7 +144,7 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest { 


            assertTrue(

                    "Launcher internal state is not All Apps",

                    test.isInState(LauncherState.ALL_APPS));

                    test.isInState(() -> LauncherState.ALL_APPS));



            // Test flinging forward and backward.

            test.executeOnLauncher(launcher -> assertEquals(
@@ -152,7 +153,7 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest { 


            allApps.flingForward();

            assertTrue("Launcher internal state is not All Apps",

                    test.isInState(LauncherState.ALL_APPS));

                    test.isInState(() -> LauncherState.ALL_APPS));

            final Integer flingForwardY = test.getFromLauncher(

                    launcher -> test.getAllAppsScroll(launcher));

            test.executeOnLauncher(
@@ -162,7 +163,7 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest { 
            allApps.flingBackward();

            assertTrue(

                    "Launcher internal state is not All Apps",

                    test.isInState(LauncherState.ALL_APPS));

                    test.isInState(() -> LauncherState.ALL_APPS));

            final Integer flingBackwardY = test.getFromLauncher(

                    launcher -> test.getAllAppsScroll(launcher));

            test.executeOnLauncher(launcher -> assertTrue("flingBackward() didn't scroll App Apps",
@@ -179,7 +180,7 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest { 


            assertTrue(

                    "Launcher internal state is not All Apps",

                    test.isInState(LauncherState.ALL_APPS));

                    test.isInState(() -> LauncherState.ALL_APPS));

        } finally {

            allApps.unfreeze();

        }
@@ -190,7 +191,8 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest { 
    public void testWorkspaceSwitchToAllApps() {

        assertNotNull("switchToAllApps() returned null",

                mLauncher.getWorkspace().switchToAllApps());

        assertTrue("Launcher internal state is not All Apps", isInState(LauncherState.ALL_APPS));

        assertTrue("Launcher internal state is not All Apps",

                isInState(() -> LauncherState.ALL_APPS));

    }



    @Test
@@ -216,7 +218,7 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest { 


        // Test flinging workspace.

        workspace.flingBackward();

        assertTrue("Launcher internal state is not Home", isInState(LauncherState.NORMAL));

        assertTrue("Launcher internal state is not Home", isInState(() -> LauncherState.NORMAL));

        executeOnLauncher(

                launcher -> assertEquals("Flinging back didn't switch workspace to page #0",

                        0, getCurrentWorkspacePage(launcher)));
@@ -225,7 +227,7 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest { 
        executeOnLauncher(

                launcher -> assertEquals("Flinging forward didn't switch workspace to page #1",

                        1, getCurrentWorkspacePage(launcher)));

        assertTrue("Launcher internal state is not Home", isInState(LauncherState.NORMAL));

        assertTrue("Launcher internal state is not Home", isInState(() -> LauncherState.NORMAL));



        // Test starting a workspace app.

        final AppIcon app = workspace.getWorkspaceAppIcon("Chrome");
@@ -251,7 +253,8 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest { 
    @PortraitLandscape

    public void testAppIconLaunchFromAllAppsFromHome() throws Exception {

        final AllApps allApps = mLauncher.getWorkspace().switchToAllApps();

        assertTrue("Launcher internal state is not All Apps", isInState(LauncherState.ALL_APPS));

        assertTrue("Launcher internal state is not All Apps",

                isInState(() -> LauncherState.ALL_APPS));



        runIconLaunchFromAllAppsTest(this, allApps);

    }