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

Commit 7a5308fd authored by Nataniel Borges's avatar Nataniel Borges Committed by Android (Google) Code Review
Browse files

Merge "Enable/Disable flicker assertions"

parents fc411479 00a7fa56

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

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ abstract class FlickerTestBase { 
        app2: IAppHelper?,

        extraInfo: String

    ): String {

        var testTag = "${testName}__$${app.launcherName}"

        var testTag = "${testName}__${app.launcherName}"

        if (app2 != null) {

            testTag += "-${app2.launcherName}"

        }

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

+5 −5
Original line number Diff line number Diff line
@@ -81,11 +81,11 @@ class CloseImeAutoOpenWindowToHomeTest( 
                }



                layersTrace {

                    navBarLayerIsAlwaysVisible()

                    statusBarLayerIsAlwaysVisible()

                    noUncoveredRegions(rotation)

                    navBarLayerRotatesAndScales(rotation)

                    statusBarLayerRotatesScales(rotation)

                    navBarLayerIsAlwaysVisible(bugId = 140855415)

                    statusBarLayerIsAlwaysVisible(bugId = 140855415)

                    noUncoveredRegions(rotation, Surface.ROTATION_0, allStates = false)

                    navBarLayerRotatesAndScales(rotation, Surface.ROTATION_0)

                    statusBarLayerRotatesScales(rotation, Surface.ROTATION_0)

                    imeLayerBecomesInvisible(bugId = 141458352)

                    imeAppLayerBecomesInvisible(testApp, bugId = 153739621)

                }

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

+3 −3
Original line number Diff line number Diff line
@@ -89,9 +89,9 @@ open class CloseImeWindowToHomeTest( 
                }



                layersTrace {

                    navBarLayerIsAlwaysVisible()

                    statusBarLayerIsAlwaysVisible()

                    noUncoveredRegions(rotation)

                    navBarLayerIsAlwaysVisible(bugId = 140855415)

                    statusBarLayerIsAlwaysVisible(bugId = 140855415)

                    noUncoveredRegions(rotation, Surface.ROTATION_0, allStates = false)

                    navBarLayerRotatesAndScales(rotation, Surface.ROTATION_0)

                    statusBarLayerRotatesScales(rotation, Surface.ROTATION_0)

                    imeLayerBecomesInvisible(bugId = 153739621)

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

+5 −5
Original line number Diff line number Diff line
@@ -71,18 +71,18 @@ class OpenAppColdTest( 
                windowManagerTrace {

                    navBarWindowIsAlwaysVisible()

                    statusBarWindowIsAlwaysVisible()

                    appWindowReplacesLauncherAsTopWindow(bugId = 141361128)

                    appWindowReplacesLauncherAsTopWindow()

                    wallpaperWindowBecomesInvisible()

                }



                layersTrace {

                    noUncoveredRegions(rotation, bugId = 141361128)

                    // During testing the launcher is always in portrait mode

                    noUncoveredRegions(Surface.ROTATION_0, rotation, bugId = 141361128)

                    navBarLayerRotatesAndScales(Surface.ROTATION_0, rotation)

                    statusBarLayerRotatesScales(Surface.ROTATION_0, rotation)

                    navBarLayerIsAlwaysVisible(bugId = 141361128)

                    statusBarLayerIsAlwaysVisible(bugId = 141361128)

                    wallpaperLayerBecomesInvisible(bugId = 141361128)

                    navBarLayerIsAlwaysVisible()

                    statusBarLayerIsAlwaysVisible(enabled = false)

                    wallpaperLayerBecomesInvisible()

                }



                eventLog {

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

+2 −3
Original line number Diff line number Diff line
@@ -44,10 +44,9 @@ abstract class OpenAppTestBase( 
        enabled: Boolean = bugId == 0

    ) {

        all("appWindowReplacesLauncherAsTopWindow", enabled, bugId) {

            this.showsAppWindowOnTop(

                    "Launcher")

            this.showsAppWindowOnTop("Launcher")

                    .then()

                    .showsAppWindowOnTop(testApp.getPackage())

                    .showsAppWindowOnTop("Snapshot", testApp.getPackage())

        }

    }