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
This commit is contained in:
@@ -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() }
|
||||
|
||||
@@ -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() }
|
||||
|
||||
@@ -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) }
|
||||
|
||||
@@ -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)
|
||||
}
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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)
|
||||
}
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user