diff options
69 files changed, 397 insertions, 651 deletions
diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/BaseTest.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/BaseTest.kt index a8154e818a04..2b162aec34ca 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/BaseTest.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/BaseTest.kt @@ -68,9 +68,7 @@ abstract class BaseTest @JvmOverloads constructor( fun buildFlicker(): FlickerBuilder { return FlickerBuilder(instrumentation).apply { setup { - test { - testSpec.setIsTablet(wmHelper.currentState.wmState.isTablet) - } + testSpec.setIsTablet(wmHelper.currentState.wmState.isTablet) } transition() } diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/bubble/BaseBubbleScreen.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/bubble/BaseBubbleScreen.kt index 298bf68c41a7..1390334f7938 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/bubble/BaseBubbleScreen.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/bubble/BaseBubbleScreen.kt @@ -55,21 +55,17 @@ abstract class BaseBubbleScreen( ): FlickerBuilder.() -> Unit { return { setup { - test { - notifyManager.setBubblesAllowed(testApp.`package`, - uid, NotificationManager.BUBBLE_PREFERENCE_ALL) - testApp.launchViaIntent(wmHelper) - waitAndGetAddBubbleBtn() - waitAndGetCancelAllBtn() - } + notifyManager.setBubblesAllowed(testApp.`package`, + uid, NotificationManager.BUBBLE_PREFERENCE_ALL) + testApp.launchViaIntent(wmHelper) + waitAndGetAddBubbleBtn() + waitAndGetCancelAllBtn() } teardown { - test { - notifyManager.setBubblesAllowed(testApp.`package`, - uid, NotificationManager.BUBBLE_PREFERENCE_NONE) - testApp.exit() - } + notifyManager.setBubblesAllowed(testApp.`package`, + uid, NotificationManager.BUBBLE_PREFERENCE_NONE) + testApp.exit() } extraSpec(this) diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/bubble/DismissBubbleScreen.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/bubble/DismissBubbleScreen.kt index c44e250901f5..ac4de4780746 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/bubble/DismissBubbleScreen.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/bubble/DismissBubbleScreen.kt @@ -54,10 +54,8 @@ open class DismissBubbleScreen(testSpec: FlickerTestParameter) : BaseBubbleScree override val transition: FlickerBuilder.() -> Unit get() = buildTransition { setup { - eachRun { - val addBubbleBtn = waitAndGetAddBubbleBtn() - addBubbleBtn?.click() ?: error("Add Bubble not found") - } + val addBubbleBtn = waitAndGetAddBubbleBtn() + addBubbleBtn?.click() ?: error("Add Bubble not found") } transitions { wm.run { wm.defaultDisplay.getMetrics(displaySize) } diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/bubble/ExpandBubbleScreen.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/bubble/ExpandBubbleScreen.kt index bab0112fa68f..7807854ac70a 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/bubble/ExpandBubbleScreen.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/bubble/ExpandBubbleScreen.kt @@ -48,10 +48,8 @@ open class ExpandBubbleScreen(testSpec: FlickerTestParameter) : BaseBubbleScreen override val transition: FlickerBuilder.() -> Unit get() = buildTransition { setup { - test { - val addBubbleBtn = waitAndGetAddBubbleBtn() - addBubbleBtn?.click() ?: error("Add Bubble not found") - } + val addBubbleBtn = waitAndGetAddBubbleBtn() + addBubbleBtn?.click() ?: error("Add Bubble not found") } transitions { val showBubble = device.wait( diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/bubble/LaunchBubbleFromLockScreen.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/bubble/LaunchBubbleFromLockScreen.kt index 47557bcead2f..49681e140cef 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/bubble/LaunchBubbleFromLockScreen.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/bubble/LaunchBubbleFromLockScreen.kt @@ -49,15 +49,13 @@ class LaunchBubbleFromLockScreen(testSpec: FlickerTestParameter) : BaseBubbleScr override val transition: FlickerBuilder.() -> Unit get() = buildTransition { setup { - eachRun { - val addBubbleBtn = waitAndGetAddBubbleBtn() - addBubbleBtn?.click() ?: error("Bubble widget not found") - device.sleep() - wmHelper.StateSyncBuilder() - .withoutTopVisibleAppWindows() - .waitForAndVerify() - device.wakeUp() - } + val addBubbleBtn = waitAndGetAddBubbleBtn() + addBubbleBtn?.click() ?: error("Bubble widget not found") + device.sleep() + wmHelper.StateSyncBuilder() + .withoutTopVisibleAppWindows() + .waitForAndVerify() + device.wakeUp() } transitions { // Swipe & wait for the notification shade to expand so all can be seen diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/bubble/MultiBubblesScreen.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/bubble/MultiBubblesScreen.kt index 3ad92f87421b..2dccda6f9fd5 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/bubble/MultiBubblesScreen.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/bubble/MultiBubblesScreen.kt @@ -57,20 +57,18 @@ open class MultiBubblesScreen(testSpec: FlickerTestParameter) : BaseBubbleScreen override val transition: FlickerBuilder.() -> Unit get() = buildTransition { setup { - test { - for (i in 1..3) { - val addBubbleBtn = waitAndGetAddBubbleBtn() ?: error("Add Bubble not found") - addBubbleBtn.click() - SystemClock.sleep(1000) - } - val showBubble = device.wait( - Until.findObject( - By.res(SYSTEM_UI_PACKAGE, BUBBLE_RES_NAME) - ), FIND_OBJECT_TIMEOUT - ) ?: error("Show bubble not found") - showBubble.click() + for (i in 1..3) { + val addBubbleBtn = waitAndGetAddBubbleBtn() ?: error("Add Bubble not found") + addBubbleBtn.click() SystemClock.sleep(1000) } + val showBubble = device.wait( + Until.findObject( + By.res(SYSTEM_UI_PACKAGE, BUBBLE_RES_NAME) + ), FIND_OBJECT_TIMEOUT + ) ?: error("Show bubble not found") + showBubble.click() + SystemClock.sleep(1000) } transitions { val bubbles: List<UiObject2> = device.wait( diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/AutoEnterPipOnGoToHomeTest.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/AutoEnterPipOnGoToHomeTest.kt index 87fa548e8027..eebc97bd75ed 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/AutoEnterPipOnGoToHomeTest.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/AutoEnterPipOnGoToHomeTest.kt @@ -18,11 +18,16 @@ package com.android.wm.shell.flicker.pip import android.platform.test.annotations.FlakyTest import android.platform.test.annotations.Postsubmit +import android.view.Surface import androidx.test.filters.RequiresDevice import com.android.server.wm.flicker.FlickerParametersRunnerFactory import com.android.server.wm.flicker.FlickerTestParameter import com.android.server.wm.flicker.annotation.Group3 import com.android.server.wm.flicker.dsl.FlickerBuilder +import com.android.server.wm.flicker.helpers.setRotation +import com.android.server.wm.flicker.helpers.wakeUpAndGoToHomeScreen +import com.android.server.wm.flicker.rules.RemoveAllTasksButHomeRule +import com.android.server.wm.flicker.rules.RemoveAllTasksButHomeRule.Companion.removeAllTasksButHome import org.junit.Assume import org.junit.FixMethodOrder import org.junit.Test @@ -59,19 +64,19 @@ class AutoEnterPipOnGoToHomeTest(testSpec: FlickerTestParameter) : EnterPipTest( */ override val transition: FlickerBuilder.() -> Unit get() = { - setupAndTeardown(this) setup { - eachRun { - pipApp.launchViaIntent(wmHelper) - pipApp.enableAutoEnterForPipActivity() - } + removeAllTasksButHome() + device.wakeUpAndGoToHomeScreen() + pipApp.launchViaIntent(wmHelper) + pipApp.enableAutoEnterForPipActivity() } teardown { - eachRun { - // close gracefully so that onActivityUnpinned() can be called before force exit - pipApp.closePipWindow(wmHelper) - pipApp.exit(wmHelper) - } + // close gracefully so that onActivityUnpinned() can be called before force exit + pipApp.closePipWindow(wmHelper) + + setRotation(Surface.ROTATION_0) + RemoveAllTasksButHomeRule.removeAllTasksButHome() + pipApp.exit(wmHelper) } transitions { tapl.goHome() diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/EnterPipOnUserLeaveHintTest.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/EnterPipOnUserLeaveHintTest.kt index 42aac573ca9e..bac6a0c925fd 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/EnterPipOnUserLeaveHintTest.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/EnterPipOnUserLeaveHintTest.kt @@ -19,12 +19,16 @@ package com.android.wm.shell.flicker.pip import android.platform.test.annotations.FlakyTest import android.platform.test.annotations.Postsubmit import android.platform.test.annotations.Presubmit +import android.view.Surface import androidx.test.filters.RequiresDevice import com.android.server.wm.flicker.FlickerParametersRunnerFactory import com.android.server.wm.flicker.FlickerTestParameter import com.android.server.wm.flicker.annotation.Group3 import com.android.server.wm.flicker.dsl.FlickerBuilder import com.android.server.wm.flicker.helpers.isShellTransitionsEnabled +import com.android.server.wm.flicker.helpers.setRotation +import com.android.server.wm.flicker.helpers.wakeUpAndGoToHomeScreen +import com.android.server.wm.flicker.rules.RemoveAllTasksButHomeRule import org.junit.Assume import org.junit.FixMethodOrder import org.junit.Test @@ -60,17 +64,17 @@ class EnterPipOnUserLeaveHintTest(testSpec: FlickerTestParameter) : EnterPipTest */ override val transition: FlickerBuilder.() -> Unit get() = { - setupAndTeardown(this) setup { - eachRun { - pipApp.launchViaIntent(wmHelper) - pipApp.enableEnterPipOnUserLeaveHint() - } + RemoveAllTasksButHomeRule.removeAllTasksButHome() + device.wakeUpAndGoToHomeScreen() + device.wakeUpAndGoToHomeScreen() + pipApp.launchViaIntent(wmHelper) + pipApp.enableEnterPipOnUserLeaveHint() } teardown { - eachRun { - pipApp.exit(wmHelper) - } + setRotation(Surface.ROTATION_0) + RemoveAllTasksButHomeRule.removeAllTasksButHome() + pipApp.exit(wmHelper) } transitions { tapl.goHome() diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/EnterPipTest.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/EnterPipTest.kt index b1b97367b378..c9e38e4231b6 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/EnterPipTest.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/EnterPipTest.kt @@ -25,6 +25,9 @@ import com.android.server.wm.flicker.FlickerTestParameter import com.android.server.wm.flicker.FlickerTestParameterFactory import com.android.server.wm.flicker.annotation.Group3 import com.android.server.wm.flicker.dsl.FlickerBuilder +import com.android.server.wm.flicker.helpers.setRotation +import com.android.server.wm.flicker.helpers.wakeUpAndGoToHomeScreen +import com.android.server.wm.flicker.rules.RemoveAllTasksButHomeRule import com.android.server.wm.traces.common.ComponentNameMatcher import org.junit.FixMethodOrder import org.junit.Test @@ -59,16 +62,15 @@ open class EnterPipTest(testSpec: FlickerTestParameter) : PipTransition(testSpec /** {@inheritDoc} */ override val transition: FlickerBuilder.() -> Unit get() = { - setupAndTeardown(this) setup { - eachRun { - pipApp.launchViaIntent(wmHelper) - } + RemoveAllTasksButHomeRule.removeAllTasksButHome() + device.wakeUpAndGoToHomeScreen() + pipApp.launchViaIntent(wmHelper) } teardown { - eachRun { - pipApp.exit(wmHelper) - } + setRotation(Surface.ROTATION_0) + RemoveAllTasksButHomeRule.removeAllTasksButHome() + pipApp.exit(wmHelper) } transitions { pipApp.clickEnterPipButton(wmHelper) diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/EnterPipToOtherOrientationTest.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/EnterPipToOtherOrientationTest.kt index 3bd2bf391d17..f6bb534663b8 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/EnterPipToOtherOrientationTest.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/EnterPipToOtherOrientationTest.kt @@ -29,7 +29,10 @@ import com.android.server.wm.flicker.annotation.Group3 import com.android.server.wm.flicker.dsl.FlickerBuilder import com.android.server.wm.flicker.entireScreenCovered import com.android.server.wm.flicker.helpers.WindowUtils +import com.android.server.wm.flicker.helpers.setRotation +import com.android.server.wm.flicker.helpers.wakeUpAndGoToHomeScreen import com.android.server.wm.flicker.navBarLayerPositionAtStartAndEnd +import com.android.server.wm.flicker.rules.RemoveAllTasksButHomeRule import com.android.wm.shell.flicker.helpers.FixedAppHelper import com.android.wm.shell.flicker.pip.PipTransition.BroadcastActionTrigger.Companion.ORIENTATION_LANDSCAPE import com.android.wm.shell.flicker.pip.PipTransition.BroadcastActionTrigger.Companion.ORIENTATION_PORTRAIT @@ -78,29 +81,28 @@ class EnterPipToOtherOrientationTest( */ override val transition: FlickerBuilder.() -> Unit get() = { - setupAndTeardown(this) - setup { - eachRun { - // Launch a portrait only app on the fullscreen stack - testApp.launchViaIntent( - wmHelper, stringExtras = mapOf( - EXTRA_FIXED_ORIENTATION to ORIENTATION_PORTRAIT.toString() - ) + RemoveAllTasksButHomeRule.removeAllTasksButHome() + device.wakeUpAndGoToHomeScreen() + + // Launch a portrait only app on the fullscreen stack + testApp.launchViaIntent( + wmHelper, stringExtras = mapOf( + EXTRA_FIXED_ORIENTATION to ORIENTATION_PORTRAIT.toString() ) - // Launch the PiP activity fixed as landscape - pipApp.launchViaIntent( - wmHelper, stringExtras = mapOf( - EXTRA_FIXED_ORIENTATION to ORIENTATION_LANDSCAPE.toString() - ) + ) + // Launch the PiP activity fixed as landscape + pipApp.launchViaIntent( + wmHelper, stringExtras = mapOf( + EXTRA_FIXED_ORIENTATION to ORIENTATION_LANDSCAPE.toString() ) - } + ) } teardown { - eachRun { - pipApp.exit(wmHelper) - testApp.exit(wmHelper) - } + setRotation(Surface.ROTATION_0) + RemoveAllTasksButHomeRule.removeAllTasksButHome() + pipApp.exit(wmHelper) + testApp.exit(wmHelper) } transitions { // Enter PiP, and assert that the PiP is within bounds now that the device is back diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/ExitPipTransition.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/ExitPipTransition.kt index fd1fe65fa3a8..183c06f8ce7c 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/ExitPipTransition.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/ExitPipTransition.kt @@ -33,14 +33,10 @@ abstract class ExitPipTransition(testSpec: FlickerTestParameter) : PipTransition override val transition: FlickerBuilder.() -> Unit get() = buildTransition(eachRun = true) { setup { - eachRun { - this.setRotation(testSpec.startRotation) - } + this.setRotation(testSpec.startRotation) } teardown { - eachRun { - this.setRotation(Surface.ROTATION_0) - } + this.setRotation(Surface.ROTATION_0) } } diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/ExitPipViaExpandButtonClickTest.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/ExitPipViaExpandButtonClickTest.kt index 39a7017a16d0..53450de5221d 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/ExitPipViaExpandButtonClickTest.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/ExitPipViaExpandButtonClickTest.kt @@ -64,10 +64,8 @@ class ExitPipViaExpandButtonClickTest( override val transition: FlickerBuilder.() -> Unit get() = buildTransition(eachRun = true) { setup { - eachRun { - // launch an app behind the pip one - testApp.launchViaIntent(wmHelper) - } + // launch an app behind the pip one + testApp.launchViaIntent(wmHelper) } transitions { // This will bring PipApp to fullscreen diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/ExitPipViaIntentTest.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/ExitPipViaIntentTest.kt index 421a6fc38e4c..034f623ec3f8 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/ExitPipViaIntentTest.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/ExitPipViaIntentTest.kt @@ -64,10 +64,8 @@ class ExitPipViaIntentTest(testSpec: FlickerTestParameter) : ExitPipToAppTransit override val transition: FlickerBuilder.() -> Unit get() = buildTransition(eachRun = true) { setup { - eachRun { - // launch an app behind the pip one - testApp.launchViaIntent(wmHelper) - } + // launch an app behind the pip one + testApp.launchViaIntent(wmHelper) } transitions { // This will bring PipApp to fullscreen diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/MovePipDownShelfHeightChangeTest.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/MovePipDownShelfHeightChangeTest.kt index d3e2ce1571b4..de8c0093bfc5 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/MovePipDownShelfHeightChangeTest.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/MovePipDownShelfHeightChangeTest.kt @@ -62,12 +62,8 @@ open class MovePipDownShelfHeightChangeTest( override val transition: FlickerBuilder.() -> Unit get() = buildTransition(eachRun = false) { teardown { - eachRun { - testApp.launchViaIntent(wmHelper) - } - test { - testApp.exit(wmHelper) - } + testApp.launchViaIntent(wmHelper) + testApp.exit(wmHelper) } transitions { tapl.pressHome() diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/MovePipUpShelfHeightChangeTest.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/MovePipUpShelfHeightChangeTest.kt index 3d64bbeb720b..0b6e7ee84708 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/MovePipUpShelfHeightChangeTest.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/MovePipUpShelfHeightChangeTest.kt @@ -72,12 +72,8 @@ class MovePipUpShelfHeightChangeTest( override val transition: FlickerBuilder.() -> Unit get() = buildTransition(eachRun = false) { teardown { - eachRun { - tapl.pressHome() - } - test { - testApp.exit(wmHelper) - } + tapl.pressHome() + testApp.exit(wmHelper) } transitions { testApp.launchViaIntent(wmHelper) diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipKeyboardTest.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipKeyboardTest.kt index be39faeff321..df6ba987e095 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipKeyboardTest.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipKeyboardTest.kt @@ -59,16 +59,12 @@ open class PipKeyboardTest(testSpec: FlickerTestParameter) : PipTransition(testS override val transition: FlickerBuilder.() -> Unit get() = buildTransition(eachRun = false) { setup { - test { - imeApp.launchViaIntent(wmHelper) - setRotation(testSpec.startRotation) - } + imeApp.launchViaIntent(wmHelper) + setRotation(testSpec.startRotation) } teardown { - test { - imeApp.exit(wmHelper) - setRotation(Surface.ROTATION_0) - } + imeApp.exit(wmHelper) + setRotation(Surface.ROTATION_0) } transitions { // open the soft keyboard diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipRotationTest.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipRotationTest.kt index 4dc98588217a..fc0f0ee87ec7 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipRotationTest.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipRotationTest.kt @@ -74,12 +74,8 @@ open class PipRotationTest(testSpec: FlickerTestParameter) : PipTransition(testS override val transition: FlickerBuilder.() -> Unit get() = buildTransition(eachRun = false) { setup { - test { - fixedApp.launchViaIntent(wmHelper) - } - eachRun { - setRotation(testSpec.startRotation) - } + fixedApp.launchViaIntent(wmHelper) + setRotation(testSpec.startRotation) } transitions { setRotation(testSpec.endRotation) diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipTransition.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipTransition.kt index 9ade59783700..faf6afc64c69 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipTransition.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipTransition.kt @@ -23,7 +23,6 @@ import com.android.server.wm.flicker.FlickerTestParameter import com.android.server.wm.flicker.dsl.FlickerBuilder import com.android.server.wm.flicker.helpers.WindowUtils import com.android.server.wm.flicker.helpers.setRotation -import com.android.server.wm.flicker.helpers.wakeUpAndGoToHomeScreen import com.android.server.wm.flicker.rules.RemoveAllTasksButHomeRule.Companion.removeAllTasksButHome import com.android.wm.shell.flicker.BaseTest import com.android.wm.shell.flicker.helpers.PipAppHelper @@ -57,28 +56,6 @@ abstract class PipTransition(testSpec: FlickerTestParameter) : BaseTest(testSpec } /** - * Gets a configuration that handles basic setup and teardown of pip tests - */ - protected val setupAndTeardown: FlickerBuilder.() -> Unit - get() = { - setup { - test { - removeAllTasksButHome() - device.wakeUpAndGoToHomeScreen() - } - } - teardown { - eachRun { - setRotation(Surface.ROTATION_0) - } - test { - removeAllTasksButHome() - pipApp.exit(wmHelper) - } - } - } - - /** * Gets a configuration that handles basic setup and teardown of pip tests and that * launches the Pip app for test * @@ -93,30 +70,27 @@ abstract class PipTransition(testSpec: FlickerTestParameter) : BaseTest(testSpec extraSpec: FlickerBuilder.() -> Unit = {} ): FlickerBuilder.() -> Unit { return { - setupAndTeardown(this) - setup { - test { - if (!eachRun) { - pipApp.launchViaIntentAndWaitForPip(wmHelper, stringExtras = stringExtras) - } + setRotation(Surface.ROTATION_0) + removeAllTasksButHome() + + if (!eachRun) { + pipApp.launchViaIntentAndWaitForPip(wmHelper, stringExtras = stringExtras) } - eachRun { - if (eachRun) { - pipApp.launchViaIntentAndWaitForPip(wmHelper, stringExtras = stringExtras) - } + if (eachRun) { + pipApp.launchViaIntentAndWaitForPip(wmHelper, stringExtras = stringExtras) } } teardown { - eachRun { - if (eachRun) { - pipApp.exit(wmHelper) - } + setRotation(Surface.ROTATION_0) + removeAllTasksButHome() + pipApp.exit(wmHelper) + + if (eachRun) { + pipApp.exit(wmHelper) } - test { - if (!eachRun) { - pipApp.exit(wmHelper) - } + if (!eachRun) { + pipApp.exit(wmHelper) } } diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/SetRequestedOrientationWhilePinnedTest.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/SetRequestedOrientationWhilePinnedTest.kt index d5de22fb49c0..acada4c8cca3 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/SetRequestedOrientationWhilePinnedTest.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/SetRequestedOrientationWhilePinnedTest.kt @@ -61,33 +61,26 @@ open class SetRequestedOrientationWhilePinnedTest( override val transition: FlickerBuilder.() -> Unit get() = { setup { - test { - removeAllTasksButHome() - device.wakeUpAndGoToHomeScreen() - } - eachRun { - // Launch the PiP activity fixed as landscape. - pipApp.launchViaIntent(wmHelper, stringExtras = mapOf( - EXTRA_FIXED_ORIENTATION to ORIENTATION_LANDSCAPE.toString())) - // Enter PiP. - broadcastActionTrigger.doAction(Components.PipActivity.ACTION_ENTER_PIP) - // System bar may fade out during fixed rotation. - wmHelper.StateSyncBuilder() - .withPipShown() - .withRotation(Surface.ROTATION_0) - .withNavOrTaskBarVisible() - .withStatusBarVisible() - .waitForAndVerify() - } + removeAllTasksButHome() + device.wakeUpAndGoToHomeScreen() + + // Launch the PiP activity fixed as landscape. + pipApp.launchViaIntent(wmHelper, stringExtras = mapOf( + EXTRA_FIXED_ORIENTATION to ORIENTATION_LANDSCAPE.toString())) + // Enter PiP. + broadcastActionTrigger.doAction(Components.PipActivity.ACTION_ENTER_PIP) + // System bar may fade out during fixed rotation. + wmHelper.StateSyncBuilder() + .withPipShown() + .withRotation(Surface.ROTATION_0) + .withNavOrTaskBarVisible() + .withStatusBarVisible() + .waitForAndVerify() } teardown { - eachRun { - pipApp.exit(wmHelper) - setRotation(Surface.ROTATION_0) - } - test { - removeAllTasksButHome() - } + pipApp.exit(wmHelper) + setRotation(Surface.ROTATION_0) + removeAllTasksButHome() } transitions { // Launch the activity back into fullscreen and ensure that it is now in landscape diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/CopyContentInSplit.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/CopyContentInSplit.kt index 49b31d815fb3..2acdfbf32a9e 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/CopyContentInSplit.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/CopyContentInSplit.kt @@ -55,9 +55,7 @@ class CopyContentInSplit(testSpec: FlickerTestParameter) : SplitScreenBase(testS get() = { super.transition(this) setup { - eachRun { - SplitScreenHelper.enterSplit(wmHelper, tapl, primaryApp, textEditApp) - } + SplitScreenHelper.enterSplit(wmHelper, tapl, primaryApp, textEditApp) } transitions { SplitScreenHelper.copyContentInSplit( diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/DismissSplitScreenByDivider.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/DismissSplitScreenByDivider.kt index 2d3a72689d97..44157b8aa269 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/DismissSplitScreenByDivider.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/DismissSplitScreenByDivider.kt @@ -40,6 +40,7 @@ import org.junit.Test import org.junit.runner.RunWith import org.junit.runners.MethodSorters import org.junit.runners.Parameterized + /** * Test dismiss split screen by dragging the divider bar. * @@ -57,9 +58,7 @@ class DismissSplitScreenByDivider (testSpec: FlickerTestParameter) : SplitScreen get() = { super.transition(this) setup { - eachRun { - SplitScreenHelper.enterSplit(wmHelper, tapl, primaryApp, secondaryApp) - } + SplitScreenHelper.enterSplit(wmHelper, tapl, primaryApp, secondaryApp) } transitions { if (tapl.isTablet) { diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/DismissSplitScreenByGoHome.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/DismissSplitScreenByGoHome.kt index df855bb11bfd..df83d7082936 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/DismissSplitScreenByGoHome.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/DismissSplitScreenByGoHome.kt @@ -56,9 +56,7 @@ class DismissSplitScreenByGoHome( get() = { super.transition(this) setup { - eachRun { - SplitScreenHelper.enterSplit(wmHelper, tapl, primaryApp, secondaryApp) - } + SplitScreenHelper.enterSplit(wmHelper, tapl, primaryApp, secondaryApp) } transitions { tapl.goHome() diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/DragDividerToResize.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/DragDividerToResize.kt index 47c1ca7cc10a..b77e8da6fca2 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/DragDividerToResize.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/DragDividerToResize.kt @@ -55,9 +55,7 @@ class DragDividerToResize (testSpec: FlickerTestParameter) : SplitScreenBase(tes get() = { super.transition(this) setup { - eachRun { - SplitScreenHelper.enterSplit(wmHelper, tapl, primaryApp, secondaryApp) - } + SplitScreenHelper.enterSplit(wmHelper, tapl, primaryApp, secondaryApp) } transitions { SplitScreenHelper.dragDividerToResizeAndWait(device, wmHelper) diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/EnterSplitScreenByDragFromAllApps.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/EnterSplitScreenByDragFromAllApps.kt index 69b66e420678..3cd74716ec39 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/EnterSplitScreenByDragFromAllApps.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/EnterSplitScreenByDragFromAllApps.kt @@ -69,10 +69,8 @@ class EnterSplitScreenByDragFromAllApps( get() = { super.transition(this) setup { - eachRun { - tapl.goHome() - primaryApp.launchViaIntent(wmHelper) - } + tapl.goHome() + primaryApp.launchViaIntent(wmHelper) } transitions { tapl.launchedAppState.taskbar diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/EnterSplitScreenByDragFromNotification.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/EnterSplitScreenByDragFromNotification.kt index a65db97213c1..7db55ad21a14 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/EnterSplitScreenByDragFromNotification.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/EnterSplitScreenByDragFromNotification.kt @@ -73,27 +73,23 @@ class EnterSplitScreenByDragFromNotification( get() = { super.transition(this) setup { - eachRun { - // Send a notification - sendNotificationApp.launchViaIntent(wmHelper) - val sendNotification = device.wait( - Until.findObject(By.text("Send Notification")), - SplitScreenHelper.TIMEOUT_MS - ) - sendNotification?.click() ?: error("Send notification button not found") - - tapl.goHome() - primaryApp.launchViaIntent(wmHelper) - } + // Send a notification + sendNotificationApp.launchViaIntent(wmHelper) + val sendNotification = device.wait( + Until.findObject(By.text("Send Notification")), + SplitScreenHelper.TIMEOUT_MS + ) + sendNotification?.click() ?: error("Send notification button not found") + + tapl.goHome() + primaryApp.launchViaIntent(wmHelper) } transitions { SplitScreenHelper.dragFromNotificationToSplit(instrumentation, device, wmHelper) SplitScreenHelper.waitForSplitComplete(wmHelper, primaryApp, sendNotificationApp) } teardown { - eachRun { - sendNotificationApp.exit(wmHelper) - } + sendNotificationApp.exit(wmHelper) } } diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/EnterSplitScreenByDragFromTaskbar.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/EnterSplitScreenByDragFromTaskbar.kt index fd3fa6274115..82124128afa1 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/EnterSplitScreenByDragFromTaskbar.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/EnterSplitScreenByDragFromTaskbar.kt @@ -70,13 +70,11 @@ class EnterSplitScreenByDragFromTaskbar( get() = { super.transition(this) setup { - eachRun { - tapl.goHome() - SplitScreenHelper.createShortcutOnHotseatIfNotExist( - tapl, secondaryApp.appName - ) - primaryApp.launchViaIntent(wmHelper) - } + tapl.goHome() + SplitScreenHelper.createShortcutOnHotseatIfNotExist( + tapl, secondaryApp.appName + ) + primaryApp.launchViaIntent(wmHelper) } transitions { tapl.launchedAppState.taskbar diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/EnterSplitScreenFromOverview.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/EnterSplitScreenFromOverview.kt index 518486f206b9..1868602df7a8 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/EnterSplitScreenFromOverview.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/EnterSplitScreenFromOverview.kt @@ -55,16 +55,14 @@ class EnterSplitScreenFromOverview(testSpec: FlickerTestParameter) : SplitScreen get() = { super.transition(this) setup { - eachRun { - tapl.workspace.switchToOverview().dismissAllTasks() - primaryApp.launchViaIntent(wmHelper) - secondaryApp.launchViaIntent(wmHelper) - tapl.goHome() - wmHelper.StateSyncBuilder() - .withAppTransitionIdle() - .withHomeActivityVisible() - .waitForAndVerify() - } + tapl.workspace.switchToOverview().dismissAllTasks() + primaryApp.launchViaIntent(wmHelper) + secondaryApp.launchViaIntent(wmHelper) + tapl.goHome() + wmHelper.StateSyncBuilder() + .withAppTransitionIdle() + .withHomeActivityVisible() + .waitForAndVerify() } transitions { SplitScreenHelper.splitFromOverview(tapl) diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/SplitScreenBase.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/SplitScreenBase.kt index 81390b243ef9..eab473ca55a1 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/SplitScreenBase.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/SplitScreenBase.kt @@ -32,17 +32,13 @@ abstract class SplitScreenBase(testSpec: FlickerTestParameter) : BaseTest(testSp override val transition: FlickerBuilder.() -> Unit get() = { setup { - test { - tapl.setEnableRotation(true) - setRotation(testSpec.startRotation) - tapl.setExpectedRotation(testSpec.startRotation) - } + tapl.setEnableRotation(true) + setRotation(testSpec.startRotation) + tapl.setExpectedRotation(testSpec.startRotation) } teardown { - eachRun { - primaryApp.exit(wmHelper) - secondaryApp.exit(wmHelper) - } + primaryApp.exit(wmHelper) + secondaryApp.exit(wmHelper) } } } diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/SwitchAppByDoubleTapDivider.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/SwitchAppByDoubleTapDivider.kt index 8a22d55ac05c..d265f83ddb96 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/SwitchAppByDoubleTapDivider.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/SwitchAppByDoubleTapDivider.kt @@ -55,9 +55,7 @@ class SwitchAppByDoubleTapDivider (testSpec: FlickerTestParameter) : SplitScreen get() = { super.transition(this) setup { - eachRun { - SplitScreenHelper.enterSplit(wmHelper, tapl, primaryApp, secondaryApp) - } + SplitScreenHelper.enterSplit(wmHelper, tapl, primaryApp, secondaryApp) } transitions { SplitScreenHelper.doubleTapDividerToSwitch(device) diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/SwitchBackToSplitFromAnotherApp.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/SwitchBackToSplitFromAnotherApp.kt index 80d599967aae..8b905effa8f8 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/SwitchBackToSplitFromAnotherApp.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/SwitchBackToSplitFromAnotherApp.kt @@ -55,14 +55,12 @@ class SwitchBackToSplitFromAnotherApp(testSpec: FlickerTestParameter) : SplitScr get() = { super.transition(this) setup { - eachRun { - SplitScreenHelper.enterSplit(wmHelper, tapl, primaryApp, secondaryApp) - - thirdApp.launchViaIntent(wmHelper) - wmHelper.StateSyncBuilder() - .withWindowSurfaceAppeared(thirdApp) - .waitForAndVerify() - } + SplitScreenHelper.enterSplit(wmHelper, tapl, primaryApp, secondaryApp) + + thirdApp.launchViaIntent(wmHelper) + wmHelper.StateSyncBuilder() + .withWindowSurfaceAppeared(thirdApp) + .waitForAndVerify() } transitions { tapl.launchedAppState.quickSwitchToPreviousApp() diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/SwitchBackToSplitFromHome.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/SwitchBackToSplitFromHome.kt index 79c917ad98f2..fcab70204909 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/SwitchBackToSplitFromHome.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/SwitchBackToSplitFromHome.kt @@ -54,14 +54,12 @@ class SwitchBackToSplitFromHome(testSpec: FlickerTestParameter) : SplitScreenBas get() = { super.transition(this) setup { - eachRun { - SplitScreenHelper.enterSplit(wmHelper, tapl, primaryApp, secondaryApp) - - tapl.goHome() - wmHelper.StateSyncBuilder() - .withHomeActivityVisible() - .waitForAndVerify() - } + SplitScreenHelper.enterSplit(wmHelper, tapl, primaryApp, secondaryApp) + + tapl.goHome() + wmHelper.StateSyncBuilder() + .withHomeActivityVisible() + .waitForAndVerify() } transitions { tapl.workspace.quickSwitchToPreviousApp() diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/SwitchBackToSplitFromRecent.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/SwitchBackToSplitFromRecent.kt index 166caa74e6d2..5364492cf59c 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/SwitchBackToSplitFromRecent.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/SwitchBackToSplitFromRecent.kt @@ -54,14 +54,12 @@ class SwitchBackToSplitFromRecent(testSpec: FlickerTestParameter) : SplitScreenB get() = { super.transition(this) setup { - eachRun { - SplitScreenHelper.enterSplit(wmHelper, tapl, primaryApp, secondaryApp) - - tapl.goHome() - wmHelper.StateSyncBuilder() - .withHomeActivityVisible() - .waitForAndVerify() - } + SplitScreenHelper.enterSplit(wmHelper, tapl, primaryApp, secondaryApp) + + tapl.goHome() + wmHelper.StateSyncBuilder() + .withHomeActivityVisible() + .waitForAndVerify() } transitions { tapl.workspace.switchToOverview() diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/BaseTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/BaseTest.kt index 8df3548465bd..1e798f3ed12e 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/BaseTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/BaseTest.kt @@ -58,9 +58,7 @@ abstract class BaseTest @JvmOverloads constructor( fun buildFlicker(): FlickerBuilder { return FlickerBuilder(instrumentation).apply { setup { - test { - testSpec.setIsTablet(wmHelper.currentState.wmState.isTablet) - } + testSpec.setIsTablet(wmHelper.currentState.wmState.isTablet) } transition() } diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/activityembedding/OpenActivityEmbeddingPlaceholderSplit.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/activityembedding/OpenActivityEmbeddingPlaceholderSplit.kt index 1a40f82654ff..34544eab8e57 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/activityembedding/OpenActivityEmbeddingPlaceholderSplit.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/activityembedding/OpenActivityEmbeddingPlaceholderSplit.kt @@ -49,21 +49,15 @@ class OpenActivityEmbeddingPlaceholderSplit( /** {@inheritDoc} */ override val transition: FlickerBuilder.() -> Unit = { setup { - test { - tapl.setExpectedRotationCheckEnabled(false) - } - eachRun { - testApp.launchViaIntent(wmHelper) - } + tapl.setExpectedRotationCheckEnabled(false) + testApp.launchViaIntent(wmHelper) } transitions { testApp.launchPlaceholderSplit(wmHelper) } teardown { - test { - tapl.goHome() - testApp.exit(wmHelper) - } + tapl.goHome() + testApp.exit(wmHelper) } } diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/close/CloseAppHomeButtonTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/close/CloseAppHomeButtonTest.kt index 55d412927ba6..1322a1cfed2a 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/close/CloseAppHomeButtonTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/close/CloseAppHomeButtonTest.kt @@ -71,9 +71,7 @@ class CloseAppHomeButtonTest(testSpec: FlickerTestParameter) : CloseAppTransitio get() = { super.transition(this) setup { - test { - tapl.setExpectedRotationCheckEnabled(false) - } + tapl.setExpectedRotationCheckEnabled(false) } transitions { // Can't use TAPL at the moment because of rotation test issues diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/close/CloseAppTransition.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/close/CloseAppTransition.kt index cb197cdf04d3..f296d9746aef 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/close/CloseAppTransition.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/close/CloseAppTransition.kt @@ -36,18 +36,12 @@ abstract class CloseAppTransition(testSpec: FlickerTestParameter) : BaseTest(tes /** {@inheritDoc} */ override val transition: FlickerBuilder.() -> Unit = { setup { - test { - tapl.setExpectedRotation(testSpec.startRotation) - } - eachRun { - testApp.launchViaIntent(wmHelper) - this.setRotation(testSpec.startRotation) - } + tapl.setExpectedRotation(testSpec.startRotation) + testApp.launchViaIntent(wmHelper) + this.setRotation(testSpec.startRotation) } teardown { - test { - testApp.exit(wmHelper) - } + testApp.exit(wmHelper) } } diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeAutoOpenWindowToAppTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeAutoOpenWindowToAppTest.kt index 725c10a8ada0..479ac8ed55a3 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeAutoOpenWindowToAppTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeAutoOpenWindowToAppTest.kt @@ -57,14 +57,10 @@ class CloseImeAutoOpenWindowToAppTest(testSpec: FlickerTestParameter) : BaseTest /** {@inheritDoc} */ override val transition: FlickerBuilder.() -> Unit = { setup { - eachRun { - testApp.launchViaIntent(wmHelper) - } + testApp.launchViaIntent(wmHelper) } teardown { - eachRun { - testApp.exit(wmHelper) - } + testApp.exit(wmHelper) } transitions { testApp.closeIME(wmHelper) diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeAutoOpenWindowToHomeTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeAutoOpenWindowToHomeTest.kt index 8832686b43aa..07b52a6679bf 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeAutoOpenWindowToHomeTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeAutoOpenWindowToHomeTest.kt @@ -57,17 +57,11 @@ class CloseImeAutoOpenWindowToHomeTest(testSpec: FlickerTestParameter) : BaseTes /** {@inheritDoc} */ override val transition: FlickerBuilder.() -> Unit = { setup { - test { - tapl.setExpectedRotationCheckEnabled(false) - } - eachRun { - testApp.launchViaIntent(wmHelper) - } + tapl.setExpectedRotationCheckEnabled(false) + testApp.launchViaIntent(wmHelper) } teardown { - eachRun { - testApp.exit(wmHelper) - } + testApp.exit(wmHelper) } transitions { tapl.goHome() diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeEditorPopupDialogTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeEditorPopupDialogTest.kt index 71e0aa1f9628..fec7727b5731 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeEditorPopupDialogTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeEditorPopupDialogTest.kt @@ -46,13 +46,9 @@ class CloseImeEditorPopupDialogTest(testSpec: FlickerTestParameter) : BaseTest(t /** {@inheritDoc} */ override val transition: FlickerBuilder.() -> Unit = { setup { - test { - tapl.setExpectedRotationCheckEnabled(false) - } - eachRun { - imeTestApp.launchViaIntent(wmHelper) - imeTestApp.openIME(wmHelper) - } + tapl.setExpectedRotationCheckEnabled(false) + imeTestApp.launchViaIntent(wmHelper) + imeTestApp.openIME(wmHelper) } transitions { imeTestApp.dismissDialog(wmHelper) @@ -61,13 +57,11 @@ class CloseImeEditorPopupDialogTest(testSpec: FlickerTestParameter) : BaseTest(t .waitForAndVerify() } teardown { - eachRun { - tapl.goHome() - wmHelper.StateSyncBuilder() - .withHomeActivityVisible() - .waitForAndVerify() - imeTestApp.exit(wmHelper) - } + tapl.goHome() + wmHelper.StateSyncBuilder() + .withHomeActivityVisible() + .waitForAndVerify() + imeTestApp.exit(wmHelper) } } diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeWindowToAppTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeWindowToAppTest.kt index 0f91fd58abb7..50596f1668eb 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeWindowToAppTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeWindowToAppTest.kt @@ -50,17 +50,11 @@ class CloseImeWindowToAppTest(testSpec: FlickerTestParameter) : BaseTest(testSpe /** {@inheritDoc} */ override val transition: FlickerBuilder.() -> Unit = { setup { - test { - testApp.launchViaIntent(wmHelper) - } - eachRun { - testApp.openIME(wmHelper) - } + testApp.launchViaIntent(wmHelper) + testApp.openIME(wmHelper) } teardown { - test { - testApp.exit(wmHelper) - } + testApp.exit(wmHelper) } transitions { testApp.closeIME(wmHelper) diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeWindowToHomeTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeWindowToHomeTest.kt index 007a4f1835d7..17eb8f9a005e 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeWindowToHomeTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeWindowToHomeTest.kt @@ -49,13 +49,9 @@ class CloseImeWindowToHomeTest(testSpec: FlickerTestParameter) : BaseTest(testSp /** {@inheritDoc} */ override val transition: FlickerBuilder.() -> Unit = { setup { - test { - tapl.setExpectedRotationCheckEnabled(false) - } - eachRun { - testApp.launchViaIntent(wmHelper) - testApp.openIME(wmHelper) - } + tapl.setExpectedRotationCheckEnabled(false) + testApp.launchViaIntent(wmHelper) + testApp.openIME(wmHelper) } transitions { tapl.goHome() @@ -65,9 +61,7 @@ class CloseImeWindowToHomeTest(testSpec: FlickerTestParameter) : BaseTest(testSp .waitForAndVerify() } teardown { - test { - testApp.exit(wmHelper) - } + testApp.exit(wmHelper) } } diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/LaunchAppShowImeAndDialogThemeAppTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/LaunchAppShowImeAndDialogThemeAppTest.kt index 216e0edaf451..f0776c10bd69 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/LaunchAppShowImeAndDialogThemeAppTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/LaunchAppShowImeAndDialogThemeAppTest.kt @@ -55,22 +55,18 @@ class LaunchAppShowImeAndDialogThemeAppTest( /** {@inheritDoc} */ override val transition: FlickerBuilder.() -> Unit = { setup { - eachRun { - testApp.launchViaIntent(wmHelper) - wmHelper.StateSyncBuilder() - .withImeShown() - .waitForAndVerify() - testApp.startDialogThemedActivity(wmHelper) - // Verify IME insets isn't visible on dialog since it's non-IME focusable window - assertFalse(testApp.getInsetsVisibleFromDialog(ime())) - assertTrue(testApp.getInsetsVisibleFromDialog(statusBars())) - assertTrue(testApp.getInsetsVisibleFromDialog(navigationBars())) - } + testApp.launchViaIntent(wmHelper) + wmHelper.StateSyncBuilder() + .withImeShown() + .waitForAndVerify() + testApp.startDialogThemedActivity(wmHelper) + // Verify IME insets isn't visible on dialog since it's non-IME focusable window + assertFalse(testApp.getInsetsVisibleFromDialog(ime())) + assertTrue(testApp.getInsetsVisibleFromDialog(statusBars())) + assertTrue(testApp.getInsetsVisibleFromDialog(navigationBars())) } teardown { - eachRun { - testApp.exit(wmHelper) - } + testApp.exit(wmHelper) } transitions { testApp.dismissDialog(wmHelper) diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/LaunchAppShowImeOnStartTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/LaunchAppShowImeOnStartTest.kt index 868290ec7585..85e9e75776fb 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/LaunchAppShowImeOnStartTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/LaunchAppShowImeOnStartTest.kt @@ -74,16 +74,12 @@ class LaunchAppShowImeOnStartTest(testSpec: FlickerTestParameter) : BaseTest(tes /** {@inheritDoc} */ override val transition: FlickerBuilder.() -> Unit = { setup { - eachRun { - initializeApp.launchViaIntent(wmHelper) - this.setRotation(testSpec.startRotation) - } + initializeApp.launchViaIntent(wmHelper) + this.setRotation(testSpec.startRotation) } teardown { - eachRun { - initializeApp.exit(wmHelper) - testApp.exit(wmHelper) - } + initializeApp.exit(wmHelper) + testApp.exit(wmHelper) } transitions { testApp.launchViaIntent(wmHelper) diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/OpenImeWindowAndCloseTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/OpenImeWindowAndCloseTest.kt index 16c23b93a5de..d42a6c3d3d80 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/OpenImeWindowAndCloseTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/OpenImeWindowAndCloseTest.kt @@ -52,19 +52,15 @@ class OpenImeWindowAndCloseTest(testSpec: FlickerTestParameter) : BaseTest(testS /** {@inheritDoc} */ override val transition: FlickerBuilder.() -> Unit = { setup { - eachRun { - simpleApp.launchViaIntent(wmHelper) - testApp.launchViaIntent(wmHelper) - testApp.openIME(wmHelper) - } + simpleApp.launchViaIntent(wmHelper) + testApp.launchViaIntent(wmHelper) + testApp.openIME(wmHelper) } transitions { testApp.finishActivity(wmHelper) } teardown { - test { - simpleApp.exit(wmHelper) - } + simpleApp.exit(wmHelper) } } diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/OpenImeWindowFromFixedOrientationAppTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/OpenImeWindowFromFixedOrientationAppTest.kt index e5874921ddfa..c41c65950e52 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/OpenImeWindowFromFixedOrientationAppTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/OpenImeWindowFromFixedOrientationAppTest.kt @@ -54,20 +54,16 @@ class OpenImeWindowFromFixedOrientationAppTest( /** {@inheritDoc} */ override val transition: FlickerBuilder.() -> Unit = { setup { - test { - tapl.setExpectedRotationCheckEnabled(false) - } - test { - // Launch the activity with expecting IME will be shown. - imeTestApp.launchViaIntent(wmHelper) - } - eachRun { - // Swiping out the IME activity to home. - tapl.goHome() - wmHelper.StateSyncBuilder() - .withHomeActivityVisible() - .waitForAndVerify() - } + tapl.setExpectedRotationCheckEnabled(false) + + // Launch the activity with expecting IME will be shown. + imeTestApp.launchViaIntent(wmHelper) + + // Swiping out the IME activity to home. + tapl.goHome() + wmHelper.StateSyncBuilder() + .withHomeActivityVisible() + .waitForAndVerify() } transitions { // Bring the exist IME activity to the front in landscape mode device rotation. @@ -75,9 +71,7 @@ class OpenImeWindowFromFixedOrientationAppTest( imeTestApp.launchViaIntent(wmHelper) } teardown { - test { - imeTestApp.exit(wmHelper) - } + imeTestApp.exit(wmHelper) } } diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/OpenImeWindowTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/OpenImeWindowTest.kt index c1f17f3deb2e..84b0f607056c 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/OpenImeWindowTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/OpenImeWindowTest.kt @@ -48,20 +48,14 @@ class OpenImeWindowTest(testSpec: FlickerTestParameter) : BaseTest(testSpec) { /** {@inheritDoc} */ override val transition: FlickerBuilder.() -> Unit = { setup { - test { - testApp.launchViaIntent(wmHelper) - } + testApp.launchViaIntent(wmHelper) } transitions { testApp.openIME(wmHelper) } teardown { - eachRun { - testApp.closeIME(wmHelper) - } - test { - testApp.exit(wmHelper) - } + testApp.closeIME(wmHelper) + testApp.exit(wmHelper) } } diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/OpenImeWindowToOverViewTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/OpenImeWindowToOverViewTest.kt index 5fd94427dc82..1af88204c876 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/OpenImeWindowToOverViewTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/OpenImeWindowToOverViewTest.kt @@ -57,9 +57,7 @@ class OpenImeWindowToOverViewTest(testSpec: FlickerTestParameter) : BaseTest(tes /** {@inheritDoc} */ override val transition: FlickerBuilder.() -> Unit = { setup { - eachRun { - imeTestApp.launchViaIntent(wmHelper) - } + imeTestApp.launchViaIntent(wmHelper) } transitions { device.pressRecentApps() @@ -69,13 +67,11 @@ class OpenImeWindowToOverViewTest(testSpec: FlickerTestParameter) : BaseTest(tes builder.waitForAndVerify() } teardown { - test { - device.pressHome() - wmHelper.StateSyncBuilder() - .withHomeActivityVisible() - .waitForAndVerify() - imeTestApp.exit(wmHelper) - } + device.pressHome() + wmHelper.StateSyncBuilder() + .withHomeActivityVisible() + .waitForAndVerify() + imeTestApp.exit(wmHelper) } } diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/ReOpenImeWindowTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/ReOpenImeWindowTest.kt index 0281a60bbc3b..f7e5b239ec29 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/ReOpenImeWindowTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/ReOpenImeWindowTest.kt @@ -52,17 +52,13 @@ open class ReOpenImeWindowTest(testSpec: FlickerTestParameter) : BaseTest(testSp /** {@inheritDoc} */ override val transition: FlickerBuilder.() -> Unit = { setup { - test { testApp.launchViaIntent(wmHelper) testApp.openIME(wmHelper) - } - eachRun { this.setRotation(testSpec.startRotation) device.pressRecentApps() wmHelper.StateSyncBuilder() .withRecentsActivityVisible() .waitForAndVerify() - } } transitions { device.reopenAppFromOverview(wmHelper) @@ -72,9 +68,7 @@ open class ReOpenImeWindowTest(testSpec: FlickerTestParameter) : BaseTest(testSp .waitForAndVerify() } teardown { - test { - testApp.exit(wmHelper) - } + testApp.exit(wmHelper) } } diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/SwitchImeWindowsFromGestureNavTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/SwitchImeWindowsFromGestureNavTest.kt index 85bf6d752bf5..b75183d063a1 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/SwitchImeWindowsFromGestureNavTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/SwitchImeWindowsFromGestureNavTest.kt @@ -64,33 +64,27 @@ open class SwitchImeWindowsFromGestureNavTest( /** {@inheritDoc} */ override val transition: FlickerBuilder.() -> Unit = { setup { - test { - tapl.setExpectedRotationCheckEnabled(false) - } - eachRun { - this.setRotation(testSpec.startRotation) - testApp.launchViaIntent(wmHelper) - wmHelper.StateSyncBuilder() - .withFullScreenApp(testApp) - .waitForAndVerify() - - imeTestApp.launchViaIntent(wmHelper) - wmHelper.StateSyncBuilder() - .withFullScreenApp(imeTestApp) - .waitForAndVerify() - - imeTestApp.openIME(wmHelper) - } + tapl.setExpectedRotationCheckEnabled(false) + this.setRotation(testSpec.startRotation) + testApp.launchViaIntent(wmHelper) + wmHelper.StateSyncBuilder() + .withFullScreenApp(testApp) + .waitForAndVerify() + + imeTestApp.launchViaIntent(wmHelper) + wmHelper.StateSyncBuilder() + .withFullScreenApp(imeTestApp) + .waitForAndVerify() + + imeTestApp.openIME(wmHelper) } teardown { - eachRun { - tapl.goHome() - wmHelper.StateSyncBuilder() - .withHomeActivityVisible() - .waitForAndVerify() - testApp.exit(wmHelper) - imeTestApp.exit(wmHelper) - } + tapl.goHome() + wmHelper.StateSyncBuilder() + .withHomeActivityVisible() + .waitForAndVerify() + testApp.exit(wmHelper) + imeTestApp.exit(wmHelper) } transitions { // [Step1]: Swipe right from imeTestApp to testApp task diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/ActivitiesTransitionTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/ActivitiesTransitionTest.kt index eb9acc4b8e4e..08d7be2ac662 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/ActivitiesTransitionTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/ActivitiesTransitionTest.kt @@ -62,15 +62,11 @@ class ActivitiesTransitionTest(testSpec: FlickerTestParameter) : BaseTest(testSp /** {@inheritDoc} */ override val transition: FlickerBuilder.() -> Unit = { setup { - test { - tapl.setExpectedRotation(testSpec.startRotation) - testApp.launchViaIntent(wmHelper) - } + tapl.setExpectedRotation(testSpec.startRotation) + testApp.launchViaIntent(wmHelper) } teardown { - test { - testApp.exit(wmHelper) - } + testApp.exit(wmHelper) } transitions { testApp.openSecondActivity(device, wmHelper) diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppAfterCameraTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppAfterCameraTest.kt index 3ff59e9d5716..5eba78c51059 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppAfterCameraTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppAfterCameraTest.kt @@ -52,21 +52,15 @@ open class OpenAppAfterCameraTest( get() = { super.transition(this) setup { - test{ - tapl.setExpectedRotationCheckEnabled(false) - } - eachRun { - // 1. Open camera - cold -> close it first - cameraApp.exit(wmHelper) - cameraApp.launchViaIntent(wmHelper) - // 2. Press home button (button nav mode) / swipe up to home (gesture nav mode) - tapl.goHome() - } + tapl.setExpectedRotationCheckEnabled(false) + // 1. Open camera - cold -> close it first + cameraApp.exit(wmHelper) + cameraApp.launchViaIntent(wmHelper) + // 2. Press home button (button nav mode) / swipe up to home (gesture nav mode) + tapl.goHome() } teardown { - eachRun { - testApp.exit(wmHelper) - } + testApp.exit(wmHelper) } transitions { testApp.launchViaIntent(wmHelper) diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdFromIcon.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdFromIcon.kt index accf8afe14ea..354964d33ece 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdFromIcon.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdFromIcon.kt @@ -62,16 +62,12 @@ class OpenAppColdFromIcon( get() = { super.transition(this) setup { - eachRun { - tapl.setExpectedRotation(Surface.ROTATION_0) - RemoveAllTasksButHomeRule.removeAllTasksButHome() - this.setRotation(testSpec.startRotation) - } + tapl.setExpectedRotation(Surface.ROTATION_0) + RemoveAllTasksButHomeRule.removeAllTasksButHome() + this.setRotation(testSpec.startRotation) } teardown { - eachRun { - testApp.exit(wmHelper) - } + testApp.exit(wmHelper) } transitions { tapl.goHome() diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdTest.kt index cd01f7467c17..2c776681b054 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdTest.kt @@ -64,15 +64,11 @@ open class OpenAppColdTest( get() = { super.transition(this) setup { - eachRun { - removeAllTasksButHome() - this.setRotation(testSpec.startRotation) - } + removeAllTasksButHome() + this.setRotation(testSpec.startRotation) } teardown { - eachRun { - testApp.exit(wmHelper) - } + testApp.exit(wmHelper) } transitions { testApp.launchViaIntent(wmHelper) diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromLockNotificationCold.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromLockNotificationCold.kt index b3db5b70fafa..b70bdd730a5a 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromLockNotificationCold.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromLockNotificationCold.kt @@ -64,12 +64,10 @@ open class OpenAppFromLockNotificationCold(testSpec: FlickerTestParameter) : // Needs to run at the end of the setup, so after the setup defined in super.transition setup { - eachRun { - device.sleep() - wmHelper.StateSyncBuilder() - .withoutTopVisibleAppWindows() - .waitForAndVerify() - } + device.sleep() + wmHelper.StateSyncBuilder() + .withoutTopVisibleAppWindows() + .waitForAndVerify() } } diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromLockNotificationWarm.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromLockNotificationWarm.kt index 8c1d244b69e0..48602c43c6f2 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromLockNotificationWarm.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromLockNotificationWarm.kt @@ -68,12 +68,10 @@ open class OpenAppFromLockNotificationWarm(testSpec: FlickerTestParameter) : // Needs to run at the end of the setup, so after the setup defined in super.transition setup { - eachRun { - device.sleep() - wmHelper.StateSyncBuilder() - .withoutTopVisibleAppWindows() - .waitForAndVerify() - } + device.sleep() + wmHelper.StateSyncBuilder() + .withoutTopVisibleAppWindows() + .waitForAndVerify() } } diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromLockNotificationWithLockOverlayApp.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromLockNotificationWithLockOverlayApp.kt index caf2e2dbadc6..83350ea9ce74 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromLockNotificationWithLockOverlayApp.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromLockNotificationWithLockOverlayApp.kt @@ -59,26 +59,22 @@ class OpenAppFromLockNotificationWithLockOverlayApp(testSpec: FlickerTestParamet super.transition(this) setup { - eachRun { - device.wakeUpAndGoToHomeScreen() + device.wakeUpAndGoToHomeScreen() - // Launch an activity that is shown when the device is locked - showWhenLockedApp.launchViaIntent(wmHelper) - wmHelper.StateSyncBuilder() - .withFullScreenApp(showWhenLockedApp) - .waitForAndVerify() + // Launch an activity that is shown when the device is locked + showWhenLockedApp.launchViaIntent(wmHelper) + wmHelper.StateSyncBuilder() + .withFullScreenApp(showWhenLockedApp) + .waitForAndVerify() - device.sleep() - wmHelper.StateSyncBuilder() - .withoutTopVisibleAppWindows() - .waitForAndVerify() - } + device.sleep() + wmHelper.StateSyncBuilder() + .withoutTopVisibleAppWindows() + .waitForAndVerify() } teardown { - test { - showWhenLockedApp.exit(wmHelper) - } + showWhenLockedApp.exit(wmHelper) } } diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromLockTransition.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromLockTransition.kt index ecc60b8d45c0..f574c9e12c96 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromLockTransition.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromLockTransition.kt @@ -39,17 +39,13 @@ abstract class OpenAppFromLockTransition(testSpec: FlickerTestParameter) : override val transition: FlickerBuilder.() -> Unit = { super.transition(this) setup { - eachRun { - device.sleep() - wmHelper.StateSyncBuilder() - .withoutTopVisibleAppWindows() - .waitForAndVerify() - } + device.sleep() + wmHelper.StateSyncBuilder() + .withoutTopVisibleAppWindows() + .waitForAndVerify() } teardown { - eachRun { - testApp.exit(wmHelper) - } + testApp.exit(wmHelper) } transitions { testApp.launchViaIntent(wmHelper) diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromNotificationCold.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromNotificationCold.kt index e744d44bc542..24f2ae961b43 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromNotificationCold.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromNotificationCold.kt @@ -51,13 +51,11 @@ open class OpenAppFromNotificationCold( super.transition(this) setup { - eachRun { - // Close the app that posted the notification to trigger a cold start next time - // it is open - can't just kill it because that would remove the notification. - tapl.goHome() - tapl.workspace.switchToOverview() - tapl.overview.dismissAllTasks() - } + // Close the app that posted the notification to trigger a cold start next time + // it is open - can't just kill it because that would remove the notification. + tapl.goHome() + tapl.workspace.switchToOverview() + tapl.overview.dismissAllTasks() } } diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromNotificationWarm.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromNotificationWarm.kt index 4ea42433e054..77f28f60d2cc 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromNotificationWarm.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromNotificationWarm.kt @@ -67,21 +67,17 @@ open class OpenAppFromNotificationWarm( override val transition: FlickerBuilder.() -> Unit get() = { setup { - test { - device.wakeUpAndGoToHomeScreen() - this.setRotation(testSpec.startRotation) - } - eachRun { - testApp.launchViaIntent(wmHelper) - wmHelper.StateSyncBuilder() - .withFullScreenApp(testApp) - .waitForAndVerify() - testApp.postNotification(wmHelper) - tapl.goHome() - wmHelper.StateSyncBuilder() - .withHomeActivityVisible() - .waitForAndVerify() - } + device.wakeUpAndGoToHomeScreen() + this.setRotation(testSpec.startRotation) + testApp.launchViaIntent(wmHelper) + wmHelper.StateSyncBuilder() + .withFullScreenApp(testApp) + .waitForAndVerify() + testApp.postNotification(wmHelper) + tapl.goHome() + wmHelper.StateSyncBuilder() + .withHomeActivityVisible() + .waitForAndVerify() } transitions { @@ -125,9 +121,7 @@ open class OpenAppFromNotificationWarm( } teardown { - test { - testApp.exit(wmHelper) - } + testApp.exit(wmHelper) } } diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromOverviewTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromOverviewTest.kt index a3dd0cbcf64f..bc86cdfd6b1b 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromOverviewTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromOverviewTest.kt @@ -69,27 +69,23 @@ open class OpenAppFromOverviewTest( get() = { super.transition(this) setup { - test { - tapl.setExpectedRotationCheckEnabled(false) - testApp.launchViaIntent(wmHelper) - } - eachRun { - tapl.goHome() - wmHelper.StateSyncBuilder() - .withHomeActivityVisible() - .waitForAndVerify() - // By default, launcher doesn't rotate on phones, but rotates on tablets - if (testSpec.isTablet) { - tapl.setExpectedRotation(testSpec.startRotation) - } else { - tapl.setExpectedRotation(Surface.ROTATION_0) - } - tapl.workspace.switchToOverview() - wmHelper.StateSyncBuilder() - .withRecentsActivityVisible() - .waitForAndVerify() - this.setRotation(testSpec.startRotation) + tapl.setExpectedRotationCheckEnabled(false) + testApp.launchViaIntent(wmHelper) + tapl.goHome() + wmHelper.StateSyncBuilder() + .withHomeActivityVisible() + .waitForAndVerify() + // By default, launcher doesn't rotate on phones, but rotates on tablets + if (testSpec.isTablet) { + tapl.setExpectedRotation(testSpec.startRotation) + } else { + tapl.setExpectedRotation(Surface.ROTATION_0) } + tapl.workspace.switchToOverview() + wmHelper.StateSyncBuilder() + .withRecentsActivityVisible() + .waitForAndVerify() + this.setRotation(testSpec.startRotation) } transitions { tapl.overview.currentTask.open() diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppTransition.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppTransition.kt index 8658c03acf60..face7da6f623 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppTransition.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppTransition.kt @@ -36,16 +36,12 @@ abstract class OpenAppTransition(testSpec: FlickerTestParameter) : BaseTest(test /** {@inheritDoc} */ override val transition: FlickerBuilder.() -> Unit = { setup { - test { - tapl.setExpectedRotation(testSpec.startRotation) - device.wakeUpAndGoToHomeScreen() - this.setRotation(testSpec.startRotation) - } + tapl.setExpectedRotation(testSpec.startRotation) + device.wakeUpAndGoToHomeScreen() + this.setRotation(testSpec.startRotation) } teardown { - test { - testApp.exit(wmHelper) - } + testApp.exit(wmHelper) } } diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppWarmTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppWarmTest.kt index 4f69f01ce39b..8077398073da 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppWarmTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppWarmTest.kt @@ -65,22 +65,16 @@ open class OpenAppWarmTest(testSpec: FlickerTestParameter) : get() = { super.transition(this) setup { - test { - tapl.setExpectedRotationCheckEnabled(false) - testApp.launchViaIntent(wmHelper) - } - eachRun { - tapl.goHome() - wmHelper.StateSyncBuilder() - .withHomeActivityVisible() - .waitForAndVerify() - this.setRotation(testSpec.startRotation) - } + tapl.setExpectedRotationCheckEnabled(false) + testApp.launchViaIntent(wmHelper) + tapl.goHome() + wmHelper.StateSyncBuilder() + .withHomeActivityVisible() + .waitForAndVerify() + this.setRotation(testSpec.startRotation) } teardown { - test { - testApp.exit(wmHelper) - } + testApp.exit(wmHelper) } transitions { testApp.launchViaIntent(wmHelper) diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/TaskTransitionTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/TaskTransitionTest.kt index 5f342a00bf8c..26f46cd073f1 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/TaskTransitionTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/TaskTransitionTest.kt @@ -65,14 +65,10 @@ class TaskTransitionTest(testSpec: FlickerTestParameter) : BaseTest(testSpec) { /** {@inheritDoc} */ override val transition: FlickerBuilder.() -> Unit = { setup { - eachRun { - testApp.launchViaIntent(wmHelper) - } + testApp.launchViaIntent(wmHelper) } teardown { - test { - testApp.exit(wmHelper) - } + testApp.exit(wmHelper) } transitions { testApp.openNewTask(device, wmHelper) diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/quickswitch/QuickSwitchBetweenTwoAppsBackTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/quickswitch/QuickSwitchBetweenTwoAppsBackTest.kt index aaace590bfa9..a1df1df8c55c 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/quickswitch/QuickSwitchBetweenTwoAppsBackTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/quickswitch/QuickSwitchBetweenTwoAppsBackTest.kt @@ -69,15 +69,11 @@ open class QuickSwitchBetweenTwoAppsBackTest( /** {@inheritDoc} */ override val transition: FlickerBuilder.() -> Unit = { setup { - test { - tapl.setExpectedRotation(testSpec.startRotation) - } - eachRun { - testApp1.launchViaIntent(wmHelper) - testApp2.launchViaIntent(wmHelper) - startDisplayBounds = wmHelper.currentState.layerState - .physicalDisplayBounds ?: error("Display not found") - } + tapl.setExpectedRotation(testSpec.startRotation) + testApp1.launchViaIntent(wmHelper) + testApp2.launchViaIntent(wmHelper) + startDisplayBounds = wmHelper.currentState.layerState + .physicalDisplayBounds ?: error("Display not found") } transitions { tapl.launchedAppState.quickSwitchToPreviousApp() @@ -89,10 +85,8 @@ open class QuickSwitchBetweenTwoAppsBackTest( } teardown { - test { - testApp1.exit(wmHelper) - testApp2.exit(wmHelper) - } + testApp1.exit(wmHelper) + testApp2.exit(wmHelper) } } diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/quickswitch/QuickSwitchBetweenTwoAppsForwardTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/quickswitch/QuickSwitchBetweenTwoAppsForwardTest.kt index bb656e834eb2..5ab9f1435b08 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/quickswitch/QuickSwitchBetweenTwoAppsForwardTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/quickswitch/QuickSwitchBetweenTwoAppsForwardTest.kt @@ -69,10 +69,8 @@ open class QuickSwitchBetweenTwoAppsForwardTest( /** {@inheritDoc} */ override val transition: FlickerBuilder.() -> Unit = { setup { - test { tapl.setExpectedRotation(testSpec.startRotation) - } - eachRun { + testApp1.launchViaIntent(wmHelper) testApp2.launchViaIntent(wmHelper) tapl.launchedAppState.quickSwitchToPreviousApp() @@ -83,7 +81,6 @@ open class QuickSwitchBetweenTwoAppsForwardTest( .waitForAndVerify() startDisplayBounds = wmHelper.currentState.layerState .physicalDisplayBounds ?: error("Display not found") - } } transitions { tapl.launchedAppState.quickSwitchToPreviousAppSwipeLeft() @@ -95,10 +92,8 @@ open class QuickSwitchBetweenTwoAppsForwardTest( } teardown { - test { - testApp1.exit(wmHelper) - testApp2.exit(wmHelper) - } + testApp1.exit(wmHelper) + testApp2.exit(wmHelper) } } diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/quickswitch/QuickSwitchFromLauncherTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/quickswitch/QuickSwitchFromLauncherTest.kt index 13c9e2b586c4..00e60234ba77 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/quickswitch/QuickSwitchFromLauncherTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/quickswitch/QuickSwitchFromLauncherTest.kt @@ -60,24 +60,19 @@ class QuickSwitchFromLauncherTest(testSpec: FlickerTestParameter) : BaseTest(tes /** {@inheritDoc} */ override val transition: FlickerBuilder.() -> Unit = { setup { - test { - tapl.setExpectedRotationCheckEnabled(false) - } - test { - tapl.setExpectedRotation(testSpec.startRotation) - } + tapl.setExpectedRotationCheckEnabled(false) - eachRun { - testApp.launchViaIntent(wmHelper) - tapl.goHome() - wmHelper.StateSyncBuilder() - .withHomeActivityVisible() - .withWindowSurfaceDisappeared(testApp) - .waitForAndVerify() + tapl.setExpectedRotation(testSpec.startRotation) - startDisplayBounds = wmHelper.currentState.layerState - .physicalDisplayBounds ?: error("Display not found") - } + testApp.launchViaIntent(wmHelper) + tapl.goHome() + wmHelper.StateSyncBuilder() + .withHomeActivityVisible() + .withWindowSurfaceDisappeared(testApp) + .waitForAndVerify() + + startDisplayBounds = wmHelper.currentState.layerState + .physicalDisplayBounds ?: error("Display not found") } transitions { tapl.workspace.quickSwitchToPreviousApp() @@ -87,11 +82,8 @@ class QuickSwitchFromLauncherTest(testSpec: FlickerTestParameter) : BaseTest(tes .withStatusBarVisible() .waitForAndVerify() } - teardown { - eachRun { - testApp.exit(wmHelper) - } + testApp.exit(wmHelper) } } diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/rotation/ChangeAppRotationTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/rotation/ChangeAppRotationTest.kt index e6c1eaca9380..d09507f9cd21 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/rotation/ChangeAppRotationTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/rotation/ChangeAppRotationTest.kt @@ -80,9 +80,7 @@ class ChangeAppRotationTest( get() = { super.transition(this) setup { - test { - testApp.launchViaIntent(wmHelper) - } + testApp.launchViaIntent(wmHelper) } } diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/rotation/RotationTransition.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/rotation/RotationTransition.kt index 7e159d465b13..afe2ea678e39 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/rotation/RotationTransition.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/rotation/RotationTransition.kt @@ -34,14 +34,10 @@ abstract class RotationTransition(testSpec: FlickerTestParameter) : BaseTest(tes /** {@inheritDoc} */ override val transition: FlickerBuilder.() -> Unit = { setup { - eachRun { - this.setRotation(testSpec.startRotation) - } + this.setRotation(testSpec.startRotation) } teardown { - test { - testApp.exit(wmHelper) - } + testApp.exit(wmHelper) } transitions { this.setRotation(testSpec.endRotation) diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/rotation/SeamlessAppRotationTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/rotation/SeamlessAppRotationTest.kt index 07c213034642..16ad6309af40 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/rotation/SeamlessAppRotationTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/rotation/SeamlessAppRotationTest.kt @@ -87,15 +87,13 @@ open class SeamlessAppRotationTest( get() = { super.transition(this) setup { - test { - testApp.launchViaIntent( - wmHelper, - stringExtras = mapOf( - ActivityOptions.EXTRA_STARVE_UI_THREAD - to testSpec.starveUiThread.toString() - ) + testApp.launchViaIntent( + wmHelper, + stringExtras = mapOf( + ActivityOptions.EXTRA_STARVE_UI_THREAD + to testSpec.starveUiThread.toString() ) - } + ) } } |