diff options
4 files changed, 33 insertions, 5 deletions
diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/CommonAssertions.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/CommonAssertions.kt index 6b974ff8eba3..db0eed84b785 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/CommonAssertions.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/CommonAssertions.kt @@ -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, diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/CommonAssertions.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/CommonAssertions.kt index d31c4ba1f9f3..72efdb173d44 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/CommonAssertions.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/CommonAssertions.kt @@ -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()) diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdTest.kt index ad23d9f48568..1f03c4dc056d 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdTest.kt @@ -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 { diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppWarmTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppWarmTest.kt index 5886a61eed34..9b4223a0ea80 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppWarmTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppWarmTest.kt @@ -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 { |