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

Commit f95fca0f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Insert a check that keyguard is invisible into... 

Merge "Insert a check that keyguard is invisible into waitForLauncherCondition" into udc-dev am: db700954 am: 03d0cd83

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23441208



Change-Id: Ib4549e9712251a6c9eb85dfb5229d2d7addc4482
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8d55e507 03d0cd83

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

+16 −11
Original line number Diff line number Diff line
@@ -232,17 +232,7 @@ public abstract class AbstractLauncherUiTest { 
    public void setUp() throws Exception {

        mLauncher.onTestStart();



        final boolean keyguardAlreadyVisible = sSeenKeygard;



        sSeenKeygard = sSeenKeygard

                || !TestHelpers.wait(

                Until.gone(By.res(SYSTEMUI_PACKAGE, "keyguard_status_view")), 60000);



        Assert.assertFalse(

                "Keyguard is visible, which is likely caused by a crash in SysUI, seeing keyguard"

                        + " for the first time = "

                        + !keyguardAlreadyVisible,

                sSeenKeygard);

        verifyKeyguardInvisible();



        final String launcherPackageName = mDevice.getLauncherPackageName();

        try {
@@ -275,6 +265,20 @@ public abstract class AbstractLauncherUiTest { 
        }

    }



    private static void verifyKeyguardInvisible() {

        final boolean keyguardAlreadyVisible = sSeenKeygard;



        sSeenKeygard = sSeenKeygard

                || !TestHelpers.wait(

                Until.gone(By.res(SYSTEMUI_PACKAGE, "keyguard_status_view")), 60000);



        Assert.assertFalse(

                "Keyguard is visible, which is likely caused by a crash in SysUI, seeing keyguard"

                        + " for the first time = "

                        + !keyguardAlreadyVisible,

                sSeenKeygard);

    }



    @After

    public void verifyLauncherState() {

        try {
@@ -392,6 +396,7 @@ public abstract class AbstractLauncherUiTest { 
    // flakiness.

    protected void waitForLauncherCondition(

            String message, Function<Launcher, Boolean> condition, long timeout) {

        verifyKeyguardInvisible();

        if (!TestHelpers.isInLauncherProcess()) return;

        Wait.atMost(message, () -> getFromLauncher(condition), timeout, mLauncher);

    }