From 1974bdc4bab061ff905128031128c158961eab6a Mon Sep 17 00:00:00 2001 From: Bill Lin Date: Thu, 10 Dec 2020 13:07:44 +0800 Subject: [PATCH] Align SplitDivider layer name for AppPairs flicker test Test: atest com.android.wm.shell.flicker.apppairs Test: go/wm-tests-flicker should become green Fixes: 175230170 Bug: 172704238 Change-Id: I210430a9f36fe8aca43bc0e97d29b5530c9dcb28 --- .../src/com/android/wm/shell/flicker/CommonAssertions.kt | 4 ++-- .../src/com/android/wm/shell/flicker/FlickerTestBase.kt | 2 +- .../src/com/android/wm/shell/flicker/apppairs/AppPairsTest.kt | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/CommonAssertions.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/CommonAssertions.kt index 3ed53fb221a73..1638d72f99140 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/CommonAssertions.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/CommonAssertions.kt @@ -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) } } diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/FlickerTestBase.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/FlickerTestBase.kt index 54b8fdc83a1f5..7809be04de96f 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/FlickerTestBase.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/FlickerTestBase.kt @@ -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" } } diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/AppPairsTest.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/AppPairsTest.kt index 7ac91b065fcab..0f8d30a94ec6f 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/AppPairsTest.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/AppPairsTest.kt @@ -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()