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

Commit dc24231e authored by Zak Cohen's avatar Zak Cohen
Browse files

TAPL tests - make all apps in overview checks less fragile. 

Tests that check for all apps in overview mode were only checking for
actions being enabled. This isn't sufficient logic, two button mode also
uses all apps.

Centralize the check for all apps.

Test: local tapl tests
Change-Id: If1bf98019e6f1aea8f7967883aba6780743e9d6b
parent 1fabbf5a

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

+3 −5
Original line number Diff line number Diff line
@@ -81,8 +81,7 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest { 


    @Test

    public void testAllAppsFromOverview() throws Exception {

        // When actions are enabled, all apps isn't present in overview

        if (mLauncher.overviewActionsEnabled()) {

        if (!mLauncher.hasAllAppsInOverview()) {

            return;

        }
@@ -146,7 +145,7 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest { 
                launcher -> assertEquals("Dismissing a task didn't remove 1 task from Overview",

                        numTasks - 1, getTaskCount(launcher)));



        if (!mLauncher.overviewActionsEnabled() && (!TestHelpers.isInLauncherProcess()

        if (mLauncher.hasAllAppsInOverview() && (!TestHelpers.isInLauncherProcess()

                || getFromLauncher(launcher -> !launcher.getDeviceProfile().isLandscape))) {

            // Test switching to all apps and back.

            final AllAppsFromOverview allApps = overview.switchToAllApps();
@@ -190,8 +189,7 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest { 


    @Test

    public void testAppIconLaunchFromAllAppsFromOverview() throws Exception {

        // All apps doesn't exist in Overview when actions are enabled

        if (mLauncher.overviewActionsEnabled()) {

        if (!mLauncher.hasAllAppsInOverview()) {

            return;

        }

tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java

+19 −2
Original line number Diff line number Diff line
@@ -565,7 +565,7 @@ public final class LauncherInstrumentation { 
                    return waitForLauncherObject(APPS_RES_ID);

                }

                case OVERVIEW: {

                    if (mDevice.isNaturalOrientation() && !overviewActionsEnabled()) {

                    if (hasAllAppsInOverview()) {

                        waitForLauncherObject(APPS_RES_ID);

                    } else {

                        waitUntilGone(APPS_RES_ID);
@@ -1213,7 +1213,24 @@ public final class LauncherInstrumentation { 
        getTestInfo(TestProtocol.REQUEST_ENABLE_DEBUG_TRACING);

    }



    public boolean overviewActionsEnabled() {

    public boolean hasAllAppsInOverview() {

        // Vertical bar layouts don't contain all apps

        if (!mDevice.isNaturalOrientation()) {

            return false;

        }

        // Portrait two button (quickstep) always has all apps.

        if (getNavigationModel() == NavigationModel.TWO_BUTTON) {

            return true;

        }

        // Overview actions hide all apps

        if (overviewActionsEnabled()) {

            return false;

        }

        // ...otherwise there should be all apps

        return true;

    }



    private boolean overviewActionsEnabled() {

        return getTestInfo(TestProtocol.REQUEST_OVERVIEW_ACTIONS_ENABLED).getBoolean(

                TestProtocol.TEST_INFO_RESPONSE_FIELD);

    }