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

Align SplitDivider layer name for AppPairs flicker test

Browse Source 
Test: atest com.android.wm.shell.flicker.apppairs
Test: go/wm-tests-flicker should become green
Fixes: 175230170
Bug: 172704238
Change-Id: I210430a9f36fe8aca43bc0e97d29b5530c9dcb28
This commit is contained in:
Bill Lin
2020-12-10 13:07:44 +08:00
parent 70c3cc171a
commit 1974bdc4ba
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/CommonAssertions.kt
View File

@@ -25,7 +25,7 @@ fun LayersAssertion.appPairsDividerIsVisible(
enabled: Boolean = bugId == 0
) {
end("appPairsDividerIsVisible", bugId, enabled) {
this.showsLayer(FlickerTestBase.APP_PAIRS_DIVIDER)
this.showsLayer(FlickerTestBase.SPLIT_DIVIDER)
}
}
@@ -35,7 +35,7 @@ fun LayersAssertion.appPairsDividerIsInvisible(
enabled: Boolean = bugId == 0
) {
end("appPairsDividerIsInVisible", bugId, enabled) {
this.hasNotLayer(FlickerTestBase.APP_PAIRS_DIVIDER)
this.hasNotLayer(FlickerTestBase.SPLIT_DIVIDER)
}
}

2
libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/FlickerTestBase.kt
View File

@@ -130,7 +130,7 @@ abstract class FlickerTestBase {
const val NAVIGATION_BAR_WINDOW_TITLE = "NavigationBar"
const val STATUS_BAR_WINDOW_TITLE = "StatusBar"
const val DOCKED_STACK_DIVIDER = "DockedStackDivider"
const val APP_PAIRS_DIVIDER = "AppPairDivider"
const val SPLIT_DIVIDER = "SplitDivider"
const val IMAGE_WALLPAPER = "ImageWallpaper"
}
}

4
libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/AppPairsTest.kt
View File

@@ -108,7 +108,7 @@ class AppPairsTest(
end("appsEndingBounds", enabled = false) {
val entry = this.trace.entries.firstOrNull()
?: throw IllegalStateException("Trace is empty")
val dividerRegion = entry.getVisibleBounds(APP_PAIRS_DIVIDER)
val dividerRegion = entry.getVisibleBounds(SPLIT_DIVIDER)
this.hasVisibleRegion(primaryApp.defaultWindowName,
appPairsHelper.getPrimaryBounds(dividerRegion))
.and()
@@ -152,7 +152,7 @@ class AppPairsTest(
start("appsStartingBounds", enabled = false) {
val entry = this.trace.entries.firstOrNull()
?: throw IllegalStateException("Trace is empty")
val dividerRegion = entry.getVisibleBounds(APP_PAIRS_DIVIDER)
val dividerRegion = entry.getVisibleBounds(SPLIT_DIVIDER)
this.hasVisibleRegion(primaryApp.defaultWindowName,
appPairsHelper.getPrimaryBounds(dividerRegion))
.and()