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

Commit 4faf3782 authored by Pablo Gamito's avatar Pablo Gamito
Browse files

Run tablet specific assertions only on tablets 

To avoid assumption failures

Fixes: 262390300

Test: atest FlickerTests:SeamlessAppRotationTest
Change-Id: Ie02ef527640f1e0637297deefe7a743a5e126d5c
parent bfb05c5e

tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeWindowToAppTest.kt

+3 −1
Original line number Diff line number Diff line
@@ -106,7 +106,9 @@ class CloseImeWindowToAppTest(flicker: FlickerTest) : BaseTest(flicker) { 
    @IwTest(focusArea = "ime")

    override fun cujCompleted() {

        super.cujCompleted()

        if (!flicker.scenario.isTablet) {

            navBarLayerPositionAtStartAndEnd()

        }

        imeLayerBecomesInvisible()

        imeAppLayerIsAlwaysVisible()

        imeAppWindowIsAlwaysVisible()

tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeWindowToHomeTest.kt

+3 −1
Original line number Diff line number Diff line
@@ -104,7 +104,9 @@ class CloseImeWindowToHomeTest(flicker: FlickerTest) : BaseTest(flicker) { 
    @IwTest(focusArea = "ime")

    override fun cujCompleted() {

        super.cujCompleted()

        if (!flicker.scenario.isTablet) {

            navBarLayerPositionAtStartAndEnd()

        }

        imeLayerBecomesInvisible()

        imeAppWindowBecomesInvisible()

        imeWindowBecomesInvisible()

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

+8 −4
Original line number Diff line number Diff line
@@ -213,6 +213,14 @@ open class SeamlessAppRotationTest(flicker: FlickerTest) : RotationTransition(fl 
            // not yet tablet compatible

            appLayerRotates()

            appLayerAlwaysVisible()

            // not tablet compatible

            navBarLayerIsVisibleAtStartAndEnd()

            navBarWindowIsAlwaysVisible()

        }



        if (flicker.scenario.isTablet) {

            taskBarLayerIsVisibleAtStartAndEnd()

            taskBarWindowIsAlwaysVisible()

        }



        appWindowFullScreen()
@@ -223,10 +231,6 @@ open class SeamlessAppRotationTest(flicker: FlickerTest) : RotationTransition(fl 
        appLayerRotates_StartingPos()

        appLayerRotates_EndingPos()

        entireScreenCovered()

        navBarLayerIsVisibleAtStartAndEnd()

        navBarWindowIsAlwaysVisible()

        taskBarLayerIsVisibleAtStartAndEnd()

        taskBarWindowIsAlwaysVisible()

        visibleLayersShownMoreThanOneConsecutiveEntry()

        visibleWindowsShownMoreThanOneConsecutiveEntry()

    }