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

Commit d401433e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Downgrade failing flicker tests or fix assertions"

parents e3e40885 af7c16a4

tests/FlickerTests/src/com/android/server/wm/flicker/CommonAssertions.kt

+0 −5
Original line number Diff line number Diff line
@@ -21,11 +21,6 @@ import com.android.server.wm.flicker.helpers.WindowUtils 
import com.android.server.wm.flicker.traces.region.RegionSubject

import com.android.server.wm.traces.common.FlickerComponentName



val LAUNCHER_COMPONENT = FlickerComponentName(

    "com.google.android.apps.nexuslauncher",

    "com.google.android.apps.nexuslauncher.NexusLauncherActivity"

)



/**

 * Checks that [FlickerComponentName.STATUS_BAR] window is visible and above the app windows in

 * all WM trace entries

tests/FlickerTests/src/com/android/server/wm/flicker/close/CloseAppTransition.kt

+5 −1
Original line number Diff line number Diff line
@@ -191,6 +191,10 @@ abstract class CloseAppTransition(protected val testSpec: FlickerTestParameter) 
    @Presubmit

    @Test

    open fun launcherLayerReplacesApp() {

        testSpec.replacesLayer(testApp.component, LAUNCHER)

        testSpec.replacesLayer(

            testApp.component,

            LAUNCHER,

            ignoreEntriesWithRotationLayer = testSpec.isLandscapeOrSeascapeAtStart

        )

    }

}

tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromLauncherTransition.kt

+5 −5
Original line number Diff line number Diff line
@@ -60,11 +60,11 @@ abstract class OpenAppFromLauncherTransition(testSpec: FlickerTestParameter) : 
        testSpec.assertWm {

            this.isAppWindowOnTop(FlickerComponentName.LAUNCHER)

                    .then()

                    .isAppWindowOnTop(FlickerComponentName.SNAPSHOT, isOptional = true)

                    .then()

                    .isAppWindowOnTop(FlickerComponentName.SPLASH_SCREEN, isOptional = true)

                    .then()

                    .isAppWindowOnTop(testApp.component)

                    .isAppWindowOnTop(

                        testApp.component

                            .or(FlickerComponentName.SNAPSHOT)

                            .or(FlickerComponentName.SPLASH_SCREEN)

                    )

        }

    }

}

tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromLockNotificationCold.kt

+6 −0
Original line number Diff line number Diff line
@@ -143,6 +143,12 @@ open class OpenAppFromLockNotificationCold(testSpec: FlickerTestParameter) : 
    override fun visibleLayersShownMoreThanOneConsecutiveEntry() =

        super.visibleLayersShownMoreThanOneConsecutiveEntry()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun appWindowIsTopWindowAtEnd() =

        super.appWindowIsTopWindowAtEnd()



    companion object {

        /**

         * Creates the test configurations.

tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromLockNotificationWarm.kt

+6 −0
Original line number Diff line number Diff line
@@ -174,6 +174,12 @@ open class OpenAppFromLockNotificationWarm(testSpec: FlickerTestParameter) : 
    override fun visibleLayersShownMoreThanOneConsecutiveEntry() =

        super.visibleLayersShownMoreThanOneConsecutiveEntry()



    /** {@inheritDoc} */

    @Postsubmit

    @Test

    override fun appWindowIsTopWindowAtEnd() =

        super.appWindowIsTopWindowAtEnd()



    companion object {

        /**

         * Creates the test configurations.