Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Updating launch tests"

Browse Source
This commit is contained in:
Antonella Dellanzo
2020-11-04 15:39:56 +00:00
committed by Android (Google) Code Review
parent 68ef6737fe 825990379b
commit 494b090185
4 changed files with 33 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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,

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

@@ -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())

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

@@ -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 {

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

@@ -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 {