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

Commit 494b0901 authored by Antonella Dellanzo's avatar Antonella Dellanzo Committed by Android (Google) Code Review
Browse files

Merge "Updating launch tests"

parents 68ef6737 82599037

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

+18 −0
Original line number Diff line number Diff line
@@ -45,6 +45,15 @@ fun WmAssertion.navBarWindowIsAlwaysVisible( 
    }

}



fun WmAssertion.visibleWindowsShownMoreThanOneConsecutiveEntry(

    bugId: Int = 0,

    enabled: Boolean = bugId == 0

) {

    all("visibleWindowShownMoreThanOneConsecutiveEntry", bugId, enabled) {

        this.visibleWindowsShownMoreThanOneConsecutiveEntry()

    }

}



@JvmOverloads

fun LayersAssertion.noUncoveredRegions(

    beginRotation: Int,
@@ -159,6 +168,15 @@ fun LayersAssertion.statusBarLayerRotatesScales( 
    }

}



fun LayersAssertion.visibleLayersShownMoreThanOneConsecutiveEntry(

    bugId: Int = 0,

    enabled: Boolean = bugId == 0

) {

    all("visibleLayersShownMoreThanOneConsecutiveEntry", bugId, enabled) {

        this.visibleLayersShownMoreThanOneConsecutiveEntry()

    }

}



fun EventLogAssertion.focusChanges(

    vararg windows: String,

    bugId: Int = 0,

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

+2 −2
Original line number Diff line number Diff line
@@ -43,12 +43,12 @@ fun WmAssertion.appWindowReplacesLauncherAsTopWindow( 
    }

}



fun LayersAssertion.wallpaperLayerBecomesInvisible(

fun LayersAssertion.appLayerReplacesWallpaperLayer(

    testApp: IAppHelper,

    bugId: Int = 0,

    enabled: Boolean = bugId == 0

) {

    all("wallpaperLayerBecomesInvisible", bugId, enabled) {

    all("appLayerReplacesWallpaperLayer", bugId, enabled) {

        this.showsLayer("Wallpaper")

                .then()

                .replaceVisibleLayer("Wallpaper", testApp.getPackage())

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

+6 −1
Original line number Diff line number Diff line
@@ -38,6 +38,8 @@ import com.android.server.wm.flicker.startRotation 
import com.android.server.wm.flicker.statusBarLayerIsAlwaysVisible

import com.android.server.wm.flicker.statusBarLayerRotatesScales

import com.android.server.wm.flicker.statusBarWindowIsAlwaysVisible

import com.android.server.wm.flicker.visibleWindowsShownMoreThanOneConsecutiveEntry

import com.android.server.wm.flicker.visibleLayersShownMoreThanOneConsecutiveEntry

import org.junit.FixMethodOrder

import org.junit.runner.RunWith

import org.junit.runners.MethodSorters
@@ -87,6 +89,7 @@ class OpenAppColdTest( 
                        windowManagerTrace {

                            navBarWindowIsAlwaysVisible()

                            statusBarWindowIsAlwaysVisible()

                            visibleWindowsShownMoreThanOneConsecutiveEntry()



                            appWindowReplacesLauncherAsTopWindow(testApp)

                            wallpaperWindowBecomesInvisible()
@@ -102,8 +105,10 @@ class OpenAppColdTest( 
                                configuration.endRotation)

                            navBarLayerIsAlwaysVisible(enabled = false)

                            statusBarLayerIsAlwaysVisible(enabled = false)

                            visibleLayersShownMoreThanOneConsecutiveEntry(

                                    enabled = Surface.ROTATION_0 == configuration.endRotation)



                            wallpaperLayerBecomesInvisible(testApp)

                            appLayerReplacesWallpaperLayer(testApp)

                        }



                        eventLog {

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

+7 −2
Original line number Diff line number Diff line
@@ -38,6 +38,8 @@ import com.android.server.wm.flicker.startRotation 
import com.android.server.wm.flicker.statusBarLayerIsAlwaysVisible

import com.android.server.wm.flicker.statusBarLayerRotatesScales

import com.android.server.wm.flicker.statusBarWindowIsAlwaysVisible

import com.android.server.wm.flicker.visibleWindowsShownMoreThanOneConsecutiveEntry

import com.android.server.wm.flicker.visibleLayersShownMoreThanOneConsecutiveEntry

import org.junit.FixMethodOrder

import org.junit.runner.RunWith

import org.junit.runners.MethodSorters
@@ -91,9 +93,10 @@ class OpenAppWarmTest( 
                        windowManagerTrace {

                            navBarWindowIsAlwaysVisible()

                            statusBarWindowIsAlwaysVisible()

                            visibleWindowsShownMoreThanOneConsecutiveEntry()



                            appWindowReplacesLauncherAsTopWindow(testApp)

                            wallpaperWindowBecomesInvisible(enabled = false)

                            wallpaperWindowBecomesInvisible()

                        }



                        layersTrace {
@@ -106,8 +109,10 @@ class OpenAppWarmTest( 
                                configuration.endRotation)

                            navBarLayerIsAlwaysVisible(enabled = false)

                            statusBarLayerIsAlwaysVisible(enabled = false)

                            visibleLayersShownMoreThanOneConsecutiveEntry(

                                    enabled = Surface.ROTATION_0 == configuration.endRotation)



                            wallpaperLayerBecomesInvisible(testApp)

                            appLayerReplacesWallpaperLayer(testApp)

                        }



                        eventLog {