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

Ignore letterbox in two tests

Browse Source 
Two tests in EnterLegacySplitScreen were failing from time to time with letter box layer not showing 2+ times. We are ignoring it also in the assertions and refactoring the assertion to only ignore the app layers used in each corresponding case instead of ignoring all of them.

Test: atest WMShellFlickerTests
Bug: b/171049797
Change-Id: I6212f833c790fb0fa002cae2f7a3efc688168578
This commit is contained in:
Antonella Dellanzo
2020-12-18 11:23:48 +01:00
parent 17116c1049
commit 3bc2c00a53
1 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/EnterLegacySplitScreenTest.kt
View File

@@ -58,6 +58,8 @@ class EnterLegacySplitScreenTest(
rotationName: String,
rotation: Int
) : SplitScreenTestBase(rotationName, rotation) {
private val letterBox = "Letterbox"
private val splitScreenSetup: FlickerBuilder
get() = FlickerBuilder(instrumentation).apply {
val testLaunchActivity = "launch_splitScreen_test_activity"
@@ -83,11 +85,6 @@ class EnterLegacySplitScreenTest(
layersTrace {
navBarLayerIsAlwaysVisible()
statusBarLayerIsAlwaysVisible()
visibleLayersShownMoreThanOneConsecutiveEntry(
listOf(launcherPackageName, splitScreenApp.defaultWindowName,
secondaryApp.defaultWindowName,
nonResizeableApp.defaultWindowName)
)
}
windowManagerTrace {
navBarWindowIsAlwaysVisible()
@@ -114,6 +111,9 @@ class EnterLegacySplitScreenTest(
dockedStackPrimaryBoundsIsVisible(
rotation, splitScreenApp.defaultWindowName, 169271943)
dockedStackDividerBecomesVisible()
visibleLayersShownMoreThanOneConsecutiveEntry(
listOf(launcherPackageName, splitScreenApp.defaultWindowName)
)
}
windowManagerTrace {
end {
@@ -145,6 +145,10 @@ class EnterLegacySplitScreenTest(
dockedStackSecondaryBoundsIsVisible(
rotation, secondaryApp.defaultWindowName, 169271943)
dockedStackDividerBecomesVisible()
visibleLayersShownMoreThanOneConsecutiveEntry(
listOf(launcherPackageName, splitScreenApp.defaultWindowName,
secondaryApp.defaultWindowName)
)
}
windowManagerTrace {
end {
@@ -174,6 +178,9 @@ class EnterLegacySplitScreenTest(
assertions {
layersTrace {
dockedStackDividerIsInvisible()
visibleLayersShownMoreThanOneConsecutiveEntry(
listOf(launcherPackageName, nonResizeableApp.defaultWindowName)
)
}
windowManagerTrace {
end {
@@ -205,6 +212,10 @@ class EnterLegacySplitScreenTest(
val displayBounds = WindowUtils.getDisplayBounds(rotation)
this.hasVisibleRegion(nonResizeableApp.defaultWindowName, displayBounds)
}
visibleLayersShownMoreThanOneConsecutiveEntry(
listOf(launcherPackageName, splitScreenApp.defaultWindowName,
nonResizeableApp.defaultWindowName, letterBox)
)
}
windowManagerTrace {
end {
@@ -237,6 +248,10 @@ class EnterLegacySplitScreenTest(
val displayBounds = WindowUtils.getDisplayBounds(rotation)
this.hasVisibleRegion(nonResizeableApp.defaultWindowName, displayBounds)
}
visibleLayersShownMoreThanOneConsecutiveEntry(
listOf(launcherPackageName, splitScreenApp.defaultWindowName,
nonResizeableApp.defaultWindowName, letterBox)
)
}
windowManagerTrace {
end {