Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9608af1e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Align SplitDivider layer name for AppPairs flicker test"

parents c8eaa82d 1974bdc4

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

+2 −2
Original line number Diff line number Diff line
@@ -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)

    }

}

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

+1 −1
Original line number Diff line number Diff line
@@ -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"

    }

}

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

+2 −2
Original line number Diff line number Diff line
@@ -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()