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

Commit c35d3591 authored by Pablo Gamito's avatar Pablo Gamito
Browse files

Fix PiP Flicker test transitions 

Ensures we don't have no-op transitions anymore. Another change makes it
so we assert and fail if we have transitions we no entries to make sure
we don't fail silenetly in these cases.

Test: atest FlickerTests WmShellFlickerTests
Bug: 247464790
Change-Id: Iaad739c4bb869c51c6deee582ae5ff9c81013ea2
parent d6b03121

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/ExitPipTransition.kt

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ import org.junit.Test 
 */

abstract class ExitPipTransition(testSpec: FlickerTestParameter) : PipTransition(testSpec) {

    override val transition: FlickerBuilder.() -> Unit

        get() = buildTransition(eachRun = true) {

        get() = buildTransition {

            setup {

                this.setRotation(testSpec.startRotation)

            }

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/ExitPipViaExpandButtonClickTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ class ExitPipViaExpandButtonClickTest( 
     * Defines the transition used to run the test

     */

    override val transition: FlickerBuilder.() -> Unit

        get() = buildTransition(eachRun = true) {

        get() = buildTransition {

            setup {

                // launch an app behind the pip one

                testApp.launchViaIntent(wmHelper)

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/ExitPipViaIntentTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ class ExitPipViaIntentTest(testSpec: FlickerTestParameter) : ExitPipToAppTransit 
     * Defines the transition used to run the test

     */

    override val transition: FlickerBuilder.() -> Unit

        get() = buildTransition(eachRun = true) {

        get() = buildTransition {

            setup {

                // launch an app behind the pip one

                testApp.launchViaIntent(wmHelper)

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/ExpandPipOnDoubleClickTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ import org.junit.runners.Parameterized 
@Group3

class ExpandPipOnDoubleClickTest(testSpec: FlickerTestParameter) : PipTransition(testSpec) {

    override val transition: FlickerBuilder.() -> Unit

        get() = buildTransition(eachRun = true) {

        get() = buildTransition {

            transitions {

                pipApp.doubleClickPipWindow(wmHelper)

            }

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/MovePipDownShelfHeightChangeTest.kt

+5 −3
Original line number Diff line number Diff line
@@ -60,14 +60,16 @@ open class MovePipDownShelfHeightChangeTest( 
     * Defines the transition used to run the test

     */

    override val transition: FlickerBuilder.() -> Unit

        get() = buildTransition(eachRun = false) {

            teardown {

        get() = buildTransition() {

            setup {

                testApp.launchViaIntent(wmHelper)

                testApp.exit(wmHelper)

            }

            transitions {

                tapl.pressHome()

            }

            teardown {

                testApp.exit(wmHelper)

            }

        }



    override fun assertRegionMovement(previous: RegionSubject, current: RegionSubject) {