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

Commit d7cf7451 authored by Nataniel Borges's avatar Nataniel Borges
Browse files

Update window visibility checks on flicker 

Check window + activity visibility now on the assertions and make the tests compatible with split isVisible/isInvisible assertions

Test: atest FlickerTests WMShellFlickerTests
Change-Id: Ia73703f385f73610ca2300ddff9d3f4356347374
parent 1ab9b20a

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

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
 * limitations under the License.

 */



@file:JvmName("CommonAssertions")

package com.android.wm.shell.flicker



import android.graphics.Region

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

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
 * limitations under the License.

 */



@file:JvmName("WaitUtils")

package com.android.wm.shell.flicker



import android.os.SystemClock

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/AppPairsTestCannotPairNonResizeableApps.kt

+2 −2
Original line number Diff line number Diff line
@@ -100,8 +100,8 @@ class AppPairsTestCannotPairNonResizeableApps( 
            "Non resizeable app not initialized"

        }

        testSpec.assertWmEnd {

            isVisible(nonResizeableApp.component)

            isInvisible(primaryApp.component)

            isAppWindowVisible(nonResizeableApp.component)

            isAppWindowInvisible(primaryApp.component)

        }

    }

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/AppPairsTestPairPrimaryAndSecondaryApps.kt

+2 −2
Original line number Diff line number Diff line
@@ -77,8 +77,8 @@ class AppPairsTestPairPrimaryAndSecondaryApps( 
    @Test

    fun bothAppWindowsVisible() {

        testSpec.assertWmEnd {

            isVisible(primaryApp.component)

            isVisible(secondaryApp.component)

            isAppWindowVisible(primaryApp.component)

            isAppWindowVisible(secondaryApp.component)

        }

    }

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/AppPairsTestSupportPairNonResizeableApps.kt

+2 −2
Original line number Diff line number Diff line
@@ -100,8 +100,8 @@ class AppPairsTestSupportPairNonResizeableApps( 
            "Non resizeable app not initialized"

        }

        testSpec.assertWmEnd {

            isVisible(nonResizeableApp.component)

            isVisible(primaryApp.component)

            isAppWindowVisible(nonResizeableApp.component)

            isAppWindowVisible(primaryApp.component)

        }

    }