Merge "Fix PiP Flicker test transitions" (520f0183) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -30,7 +30,7 @@ import org.junit.Test
		*/
		abstract class ExitPipTransition(testSpec: FlickerTestParameter) : PipTransition(testSpec) {
		override val transition: FlickerBuilder.() -> Unit
		get() = buildTransition(eachRun = true) {
		get() = buildTransition {
		setup {
		this.setRotation(testSpec.startRotation)
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -62,7 +62,7 @@ class ExitPipViaExpandButtonClickTest(
		* Defines the transition used to run the test
		*/
		override val transition: FlickerBuilder.() -> Unit
		get() = buildTransition(eachRun = true) {
		get() = buildTransition {
		setup {
		// launch an app behind the pip one
		testApp.launchViaIntent(wmHelper)

+1 −1

Original line number	Diff line number	Diff line
		@@ -62,7 +62,7 @@ class ExitPipViaIntentTest(testSpec: FlickerTestParameter) : ExitPipToAppTransit
		* Defines the transition used to run the test
		*/
		override val transition: FlickerBuilder.() -> Unit
		get() = buildTransition(eachRun = true) {
		get() = buildTransition {
		setup {
		// launch an app behind the pip one
		testApp.launchViaIntent(wmHelper)

+1 −1

Original line number	Diff line number	Diff line
		@@ -56,7 +56,7 @@ import org.junit.runners.Parameterized
		@Group3
		class ExpandPipOnDoubleClickTest(testSpec: FlickerTestParameter) : PipTransition(testSpec) {
		override val transition: FlickerBuilder.() -> Unit
		get() = buildTransition(eachRun = true) {
		get() = buildTransition {
		transitions {
		pipApp.doubleClickPipWindow(wmHelper)
		}

+5 −3

Original line number	Diff line number	Diff line
		@@ -60,14 +60,16 @@ open class MovePipDownShelfHeightChangeTest(
		* Defines the transition used to run the test
		*/
		override val transition: FlickerBuilder.() -> Unit
		get() = buildTransition(eachRun = false) {
		teardown {
		get() = buildTransition() {
		setup {
		testApp.launchViaIntent(wmHelper)
		testApp.exit(wmHelper)
		}
		transitions {
		tapl.pressHome()
		}
		teardown {
		testApp.exit(wmHelper)
		}
		}

		override fun assertRegionMovement(previous: RegionSubject, current: RegionSubject) {