From 4d3348974d828f5dfb2386faab1a63b296ea4de3 Mon Sep 17 00:00:00 2001 From: Nataniel Borges Date: Mon, 9 Jan 2023 17:33:48 +0000 Subject: [PATCH] Cleanup pip tests Removing all tasks, going home, and setting initial and final orientation are done by the flicker infra automatically and don't need to be re-executed by the test Remove these commands to improve test speed Test: atest WMShellFlickerTests Bug: 264637221 Change-Id: Ie3b31dfe0340126102d6178de2d4a58033adc955 --- .../wm/shell/flicker/pip/AutoEnterPipOnGoToHomeTest.kt | 10 ---------- .../shell/flicker/pip/EnterPipOnUserLeaveHintTest.kt | 9 --------- .../com/android/wm/shell/flicker/pip/EnterPipTest.kt | 7 ------- .../flicker/pip/EnterPipToOtherOrientationTest.kt | 8 -------- .../android/wm/shell/flicker/pip/PipKeyboardTest.kt | 1 - .../com/android/wm/shell/flicker/pip/PipTransition.kt | 2 -- .../pip/SetRequestedOrientationWhilePinnedTest.kt | 8 -------- 7 files changed, 45 deletions(-) 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 5e898e8710cd3..4f3facb5b4848 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 @@ -21,12 +21,7 @@ import android.platform.test.annotations.Presubmit import androidx.test.filters.RequiresDevice import com.android.server.wm.flicker.FlickerBuilder import com.android.server.wm.flicker.FlickerTest -import com.android.server.wm.flicker.helpers.setRotation -import com.android.server.wm.flicker.helpers.wakeUpAndGoToHomeScreen import com.android.server.wm.flicker.junit.FlickerParametersRunnerFactory -import com.android.server.wm.flicker.rules.RemoveAllTasksButHomeRule -import com.android.server.wm.flicker.rules.RemoveAllTasksButHomeRule.Companion.removeAllTasksButHome -import com.android.server.wm.traces.common.service.PlatformConsts import org.junit.Assume import org.junit.FixMethodOrder import org.junit.Test @@ -64,17 +59,12 @@ class AutoEnterPipOnGoToHomeTest(flicker: FlickerTest) : EnterPipTest(flicker) { override val transition: FlickerBuilder.() -> Unit get() = { setup { - removeAllTasksButHome() - device.wakeUpAndGoToHomeScreen() pipApp.launchViaIntent(wmHelper) pipApp.enableAutoEnterForPipActivity() } teardown { // close gracefully so that onActivityUnpinned() can be called before force exit pipApp.closePipWindow(wmHelper) - - setRotation(PlatformConsts.Rotation.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 79feeaa3c2224..bc9fc73015416 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 @@ -20,11 +20,7 @@ import android.platform.test.annotations.Presubmit import androidx.test.filters.RequiresDevice import com.android.server.wm.flicker.FlickerBuilder import com.android.server.wm.flicker.FlickerTest -import com.android.server.wm.flicker.helpers.setRotation -import com.android.server.wm.flicker.helpers.wakeUpAndGoToHomeScreen import com.android.server.wm.flicker.junit.FlickerParametersRunnerFactory -import com.android.server.wm.flicker.rules.RemoveAllTasksButHomeRule -import com.android.server.wm.traces.common.service.PlatformConsts import org.junit.Assume import org.junit.FixMethodOrder import org.junit.Test @@ -61,15 +57,10 @@ class EnterPipOnUserLeaveHintTest(flicker: FlickerTest) : EnterPipTest(flicker) override val transition: FlickerBuilder.() -> Unit get() = { setup { - RemoveAllTasksButHomeRule.removeAllTasksButHome() - device.wakeUpAndGoToHomeScreen() - device.wakeUpAndGoToHomeScreen() pipApp.launchViaIntent(wmHelper) pipApp.enableEnterPipOnUserLeaveHint() } teardown { - setRotation(PlatformConsts.Rotation.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 1a76142330a71..1524b16ebe59e 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 @@ -21,10 +21,7 @@ import androidx.test.filters.RequiresDevice import com.android.server.wm.flicker.FlickerBuilder import com.android.server.wm.flicker.FlickerTest import com.android.server.wm.flicker.FlickerTestFactory -import com.android.server.wm.flicker.helpers.setRotation -import com.android.server.wm.flicker.helpers.wakeUpAndGoToHomeScreen import com.android.server.wm.flicker.junit.FlickerParametersRunnerFactory -import com.android.server.wm.flicker.rules.RemoveAllTasksButHomeRule import com.android.server.wm.traces.common.ComponentNameMatcher import com.android.server.wm.traces.common.service.PlatformConsts import org.junit.FixMethodOrder @@ -63,13 +60,9 @@ open class EnterPipTest(flicker: FlickerTest) : PipTransition(flicker) { override val transition: FlickerBuilder.() -> Unit get() = { setup { - RemoveAllTasksButHomeRule.removeAllTasksButHome() - device.wakeUpAndGoToHomeScreen() pipApp.launchViaIntent(wmHelper) } teardown { - setRotation(PlatformConsts.Rotation.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 a4c8d6f116021..da162401cf79a 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 @@ -26,11 +26,8 @@ import com.android.server.wm.flicker.FlickerTestFactory import com.android.server.wm.flicker.entireScreenCovered import com.android.server.wm.flicker.helpers.FixedOrientationAppHelper 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.junit.FlickerParametersRunnerFactory import com.android.server.wm.flicker.navBarLayerPositionAtStartAndEnd -import com.android.server.wm.flicker.rules.RemoveAllTasksButHomeRule import com.android.server.wm.flicker.testapp.ActivityOptions.Pip.ACTION_ENTER_PIP import com.android.server.wm.flicker.testapp.ActivityOptions.PortraitOnlyActivity.EXTRA_FIXED_ORIENTATION import com.android.server.wm.traces.common.ComponentNameMatcher @@ -79,9 +76,6 @@ class EnterPipToOtherOrientationTest(flicker: FlickerTest) : PipTransition(flick override val transition: FlickerBuilder.() -> Unit get() = { setup { - RemoveAllTasksButHomeRule.removeAllTasksButHome() - device.wakeUpAndGoToHomeScreen() - // Launch a portrait only app on the fullscreen stack testApp.launchViaIntent( wmHelper, @@ -95,8 +89,6 @@ class EnterPipToOtherOrientationTest(flicker: FlickerTest) : PipTransition(flick ) } teardown { - setRotation(PlatformConsts.Rotation.ROTATION_0) - RemoveAllTasksButHomeRule.removeAllTasksButHome() pipApp.exit(wmHelper) testApp.exit(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 12d6362cb0605..737e65c64f278 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 @@ -58,7 +58,6 @@ open class PipKeyboardTest(flicker: FlickerTest) : PipTransition(flicker) { } teardown { imeApp.exit(wmHelper) - setRotation(PlatformConsts.Rotation.ROTATION_0) } transitions { // open the soft keyboard 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 0e0be79e0aa08..a9fe93d15428a 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 @@ -72,8 +72,6 @@ abstract class PipTransition(flicker: FlickerTest) : BaseTest(flicker) { pipApp.launchViaIntentAndWaitForPip(wmHelper, stringExtras = stringExtras) } teardown { - setRotation(PlatformConsts.Rotation.ROTATION_0) - removeAllTasksButHome() 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 7d5dd8939899b..d7107db7be2df 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 @@ -26,10 +26,7 @@ import com.android.server.wm.flicker.FlickerTest import com.android.server.wm.flicker.FlickerTestFactory import com.android.server.wm.flicker.helpers.WindowUtils 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.junit.FlickerParametersRunnerFactory -import com.android.server.wm.flicker.rules.RemoveAllTasksButHomeRule.Companion.removeAllTasksButHome import com.android.server.wm.flicker.testapp.ActivityOptions import com.android.server.wm.flicker.testapp.ActivityOptions.PortraitOnlyActivity.EXTRA_FIXED_ORIENTATION import com.android.server.wm.traces.common.service.PlatformConsts @@ -58,9 +55,6 @@ open class SetRequestedOrientationWhilePinnedTest(flicker: FlickerTest) : PipTra override val transition: FlickerBuilder.() -> Unit get() = { setup { - removeAllTasksButHome() - device.wakeUpAndGoToHomeScreen() - // Launch the PiP activity fixed as landscape. pipApp.launchViaIntent( wmHelper, @@ -80,8 +74,6 @@ open class SetRequestedOrientationWhilePinnedTest(flicker: FlickerTest) : PipTra } teardown { pipApp.exit(wmHelper) - setRotation(PlatformConsts.Rotation.ROTATION_0) - removeAllTasksButHome() } transitions { // Launch the activity back into fullscreen and ensure that it is now in landscape