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

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

Extract out rotationLayerAppearsAndVanishes assertions 

Fixes problem with rotationLayerAppearsAndVanishes_shellTransit calling rotationLayerAppearsAndVanishes which included the assertion along with an Assume.assumeFalse(isShellTransitionsEnabled) which meant the test would never run

Test: atest FlickerTests:ChangeAppRotationTest
Change-Id: Icf637f09a062e5f56cab4b5b28fbba7208b0fea4
parent 9e9c069e

tests/FlickerTests/src/com/android/server/wm/flicker/rotation/ChangeAppRotationTest.kt

+17 −5
Original line number Diff line number Diff line
@@ -112,10 +112,7 @@ class ChangeAppRotationTest( 
     * Checks that the [FlickerComponentName.ROTATION] layer appears during the transition,

     * doesn't flicker, and disappears before the transition is complete

     */

    @Presubmit

    @Test

    fun rotationLayerAppearsAndVanishes() {

        Assume.assumeFalse(isShellTransitionsEnabled)

    fun rotationLayerAppearsAndVanishesAssertion() {

        testSpec.assertLayers {

            this.isVisible(testApp.component)

                .then()
@@ -126,11 +123,26 @@ class ChangeAppRotationTest( 
        }

    }



    /**

     * Checks that the [FlickerComponentName.ROTATION] layer appears during the transition,

     * doesn't flicker, and disappears before the transition is complete

     */

    @Presubmit

    @Test

    fun rotationLayerAppearsAndVanishes() {

        Assume.assumeFalse(isShellTransitionsEnabled)

        rotationLayerAppearsAndVanishesAssertion()

    }



    /**

     * Checks that the [FlickerComponentName.ROTATION] layer appears during the transition,

     * doesn't flicker, and disappears before the transition is complete

     */

    @FlakyTest(bugId = 218484127)

    @Test

    fun rotationLayerAppearsAndVanishes_shellTransit() {

        Assume.assumeTrue(isShellTransitionsEnabled)

        rotationLayerAppearsAndVanishes()

        rotationLayerAppearsAndVanishesAssertion()

    }



    /**

tests/FlickerTests/src/com/android/server/wm/flicker/rotation/RotationTransition.kt

+1 −1

File changed.

Contains only whitespace changes.