Merge "Cleanup pip tests" (59dd9491) · Commits · e / os / android_frameworks_base

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

+0 −10

Original line number	Diff line number	Diff line
		@@ -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() }

+0 −9

Original line number	Diff line number	Diff line
		@@ -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() }

+0 −7

Original line number	Diff line number	Diff line
		@@ -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) }

+0 −8

Original line number	Diff line number	Diff line
		@@ -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)
		}

+0 −1

Original line number	Diff line number	Diff line
		@@ -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