diff options
3 files changed, 43 insertions, 51 deletions
diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/MovePipDownOnShelfHeightChange.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/MovePipDownOnShelfHeightChange.kt index 5efa51b53970..421ad757f76a 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/MovePipDownOnShelfHeightChange.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/MovePipDownOnShelfHeightChange.kt @@ -63,12 +63,8 @@ class MovePipDownOnShelfHeightChange(flicker: LegacyFlickerTest) : } /** Checks that the visible region of [pipApp] window always moves down during the animation. */ - @Presubmit - @Test - fun pipWindowMovesDown() = pipWindowMoves(Direction.DOWN) + @Presubmit @Test fun pipWindowMovesDown() = pipWindowMoves(Direction.DOWN) /** Checks that the visible region of [pipApp] layer always moves down during the animation. */ - @Presubmit - @Test - fun pipLayerMovesDown() = pipLayerMoves(Direction.DOWN) + @Presubmit @Test fun pipLayerMovesDown() = pipLayerMoves(Direction.DOWN) } diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/SwitchBetweenSplitPairsNoPip.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/SwitchBetweenSplitPairsNoPip.kt index 91e7d478557e..e59ed6491eca 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/SwitchBetweenSplitPairsNoPip.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/SwitchBetweenSplitPairsNoPip.kt @@ -25,8 +25,8 @@ import android.tools.device.flicker.legacy.LegacyFlickerTest import android.tools.device.flicker.legacy.LegacyFlickerTestFactory import androidx.test.filters.RequiresDevice import com.android.server.wm.flicker.helpers.PipAppHelper -import com.android.wm.shell.flicker.utils.SplitScreenUtils import com.android.wm.shell.flicker.splitscreen.benchmark.SplitScreenBase +import com.android.wm.shell.flicker.utils.SplitScreenUtils import com.android.wm.shell.flicker.utils.layerBecomesInvisible import com.android.wm.shell.flicker.utils.splitAppLayerBoundsIsVisibleAtEnd import com.android.wm.shell.flicker.utils.splitAppLayerBoundsSnapToDivider @@ -45,8 +45,8 @@ import org.junit.runners.Parameterized @RunWith(Parameterized::class) @Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class) @FixMethodOrder(MethodSorters.NAME_ASCENDING) -class SwitchBetweenSplitPairsNoPip (override val flicker: LegacyFlickerTest) : - SplitScreenBase(flicker) { +class SwitchBetweenSplitPairsNoPip(override val flicker: LegacyFlickerTest) : + SplitScreenBase(flicker) { val thirdApp = SplitScreenUtils.getSendNotification(instrumentation) val pipApp = PipAppHelper(instrumentation) @@ -77,74 +77,69 @@ class SwitchBetweenSplitPairsNoPip (override val flicker: LegacyFlickerTest) : } } - /** - * Checks that [pipApp] window won't enter pip - */ + /** Checks that [pipApp] window won't enter pip */ @Presubmit @Test fun notEnterPip() { flicker.assertWm { isNotPinned(pipApp) } } - /** - * Checks the [pipApp] task did not reshow during transition. - */ + /** Checks the [pipApp] task did not reshow during transition. */ @Presubmit @Test fun app1WindowIsVisibleOnceApp2WindowIsInvisible() { flicker.assertLayers { this.isVisible(pipApp) - .then().isVisible(ComponentNameMatcher.LAUNCHER, isOptional = true) - .then().isVisible(ComponentNameMatcher.SNAPSHOT, isOptional = true) - .then().isInvisible(pipApp).isVisible(secondaryApp) + .then() + .isVisible(ComponentNameMatcher.LAUNCHER, isOptional = true) + .then() + .isVisible(ComponentNameMatcher.SNAPSHOT, isOptional = true) + .then() + .isInvisible(pipApp) + .isVisible(secondaryApp) } } @Presubmit @Test fun primaryAppBoundsIsVisibleAtEnd() = - flicker.splitAppLayerBoundsIsVisibleAtEnd( - primaryApp, - landscapePosLeft = tapl.isTablet, - portraitPosTop = false - ) + flicker.splitAppLayerBoundsIsVisibleAtEnd( + primaryApp, + landscapePosLeft = tapl.isTablet, + portraitPosTop = false + ) @Presubmit @Test fun secondaryAppBoundsIsVisibleAtEnd() = - flicker.splitAppLayerBoundsIsVisibleAtEnd( - secondaryApp, - landscapePosLeft = !tapl.isTablet, - portraitPosTop = true - ) + flicker.splitAppLayerBoundsIsVisibleAtEnd( + secondaryApp, + landscapePosLeft = !tapl.isTablet, + portraitPosTop = true + ) - /** - * Checks the [pipApp] task become invisible after transition finish. - */ - @Presubmit - @Test - fun pipAppLayerBecomesInvisible() = flicker.layerBecomesInvisible(pipApp) + /** Checks the [pipApp] task become invisible after transition finish. */ + @Presubmit @Test fun pipAppLayerBecomesInvisible() = flicker.layerBecomesInvisible(pipApp) - /** - * Checks the [pipApp] task is in split screen bounds when transition start. - */ + /** Checks the [pipApp] task is in split screen bounds when transition start. */ @Presubmit @Test fun pipAppBoundsIsVisibleAtBegin() = - flicker.assertLayersStart { - this.splitAppLayerBoundsSnapToDivider( - pipApp, - landscapePosLeft = !tapl.isTablet, - portraitPosTop = true, - flicker.scenario.startRotation - ) - } + flicker.assertLayersStart { + this.splitAppLayerBoundsSnapToDivider( + pipApp, + landscapePosLeft = !tapl.isTablet, + portraitPosTop = true, + flicker.scenario.startRotation + ) + } companion object { @Parameterized.Parameters(name = "{0}") @JvmStatic - fun getParams() = LegacyFlickerTestFactory.nonRotationTests( + fun getParams() = + LegacyFlickerTestFactory.nonRotationTests( supportedNavigationModes = listOf(NavBar.MODE_GESTURAL) - ) + ) } } diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/UnlockKeyguardToSplitScreen.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/UnlockKeyguardToSplitScreen.kt index 10dceba3d680..4c4402803ae2 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/UnlockKeyguardToSplitScreen.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/UnlockKeyguardToSplitScreen.kt @@ -69,11 +69,12 @@ class UnlockKeyguardToSplitScreen(override val flicker: LegacyFlickerTest) : @Test @Presubmit fun visibleLayersShownMoreThanOneConsecutiveEntry_withoutWallpaper() = - flicker.assertLayers { this.visibleLayersShownMoreThanOneConsecutiveEntry( - LayersTraceSubject.VISIBLE_FOR_MORE_THAN_ONE_ENTRY_IGNORE_LAYERS + listOf( - WALLPAPER_BBQ_WRAPPER + flicker.assertLayers { + this.visibleLayersShownMoreThanOneConsecutiveEntry( + LayersTraceSubject.VISIBLE_FOR_MORE_THAN_ONE_ENTRY_IGNORE_LAYERS + + listOf(WALLPAPER_BBQ_WRAPPER) ) - ) } + } @Test fun splitScreenDividerIsVisibleAtEnd() { |