Merge "Simplify flicker provider logic" (ef6bc3d1) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/AppPairsTestCannotPairNonResizeableApps.kt

+2 −2

Original line number	Diff line number	Diff line
		@@ -52,9 +52,9 @@ class AppPairsTestCannotPairNonResizeableApps(
		testSpec: FlickerTestParameter
		) : AppPairsTransition(testSpec) {

		override val transition: FlickerBuilder.(Map<String, Any?>) -> Unit
		override val transition: FlickerBuilder.() -> Unit
		get() = {
		super.transition(this, it)
		super.transition(this)
		transitions {
		nonResizeableApp?.launchViaIntent(wmHelper)
		// TODO pair apps through normal UX flow

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/AppPairsTestPairPrimaryAndSecondaryApps.kt

+2 −2

Original line number	Diff line number	Diff line
		@@ -46,9 +46,9 @@ import org.junit.runners.Parameterized
		class AppPairsTestPairPrimaryAndSecondaryApps(
		testSpec: FlickerTestParameter
		) : AppPairsTransition(testSpec) {
		override val transition: FlickerBuilder.(Map<String, Any?>) -> Unit
		override val transition: FlickerBuilder.() -> Unit
		get() = {
		super.transition(this, it)
		super.transition(this)
		transitions {
		// TODO pair apps through normal UX flow
		executeShellCommand(

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/AppPairsTestSupportPairNonResizeableApps.kt

+2 −2

Original line number	Diff line number	Diff line
		@@ -52,9 +52,9 @@ class AppPairsTestSupportPairNonResizeableApps(
		testSpec: FlickerTestParameter
		) : AppPairsTransition(testSpec) {

		override val transition: FlickerBuilder.(Map<String, Any?>) -> Unit
		override val transition: FlickerBuilder.() -> Unit
		get() = {
		super.transition(this, it)
		super.transition(this)
		transitions {
		nonResizeableApp?.launchViaIntent(wmHelper)
		// TODO pair apps through normal UX flow

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/AppPairsTestUnpairPrimaryAndSecondaryApps.kt

+2 −2

Original line number	Diff line number	Diff line
		@@ -47,9 +47,9 @@ import org.junit.runners.Parameterized
		class AppPairsTestUnpairPrimaryAndSecondaryApps(
		testSpec: FlickerTestParameter
		) : AppPairsTransition(testSpec) {
		override val transition: FlickerBuilder.(Map<String, Any?>) -> Unit
		override val transition: FlickerBuilder.() -> Unit
		get() = {
		super.transition(this, it)
		super.transition(this)
		setup {
		eachRun {
		executeShellCommand(

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/AppPairsTransition.kt

+4 −10

Original line number	Diff line number	Diff line
		@@ -25,14 +25,11 @@ import androidx.test.platform.app.InstrumentationRegistry
		import com.android.server.wm.flicker.FlickerBuilderProvider
		import com.android.server.wm.flicker.FlickerTestParameter
		import com.android.server.wm.flicker.dsl.FlickerBuilder
		import com.android.server.wm.flicker.helpers.isRotated
		import com.android.server.wm.flicker.helpers.setRotation
		import com.android.server.wm.flicker.helpers.wakeUpAndGoToHomeScreen
		import com.android.server.wm.flicker.navBarLayerIsVisible
		import com.android.server.wm.flicker.navBarLayerRotatesAndScales
		import com.android.server.wm.flicker.navBarWindowIsVisible
		import com.android.server.wm.flicker.repetitions
		import com.android.server.wm.flicker.startRotation
		import com.android.server.wm.flicker.statusBarLayerIsVisible
		import com.android.server.wm.flicker.statusBarLayerRotatesScales
		import com.android.server.wm.flicker.statusBarWindowIsVisible
		@@ -50,7 +47,6 @@ import org.junit.Test
		abstract class AppPairsTransition(protected val testSpec: FlickerTestParameter) {
		protected val instrumentation: Instrumentation = InstrumentationRegistry.getInstrumentation()
		protected val context: Context = instrumentation.context
		protected val isRotated = testSpec.config.startRotation.isRotated()
		protected val activityHelper = ActivityHelper.getInstance()
		protected val appPairsHelper = AppPairsHelper(instrumentation,
		Components.SplitScreenActivity.LABEL,
		@@ -82,20 +78,18 @@ abstract class AppPairsTransition(protected val testSpec: FlickerTestParameter)
		@FlickerBuilderProvider
		fun buildFlicker(): FlickerBuilder {
		return FlickerBuilder(instrumentation).apply {
		withTestName { testSpec.name }
		repeat { testSpec.config.repetitions }
		transition(this, testSpec.config)
		transition(this)
		}
		}

		internal open val transition: FlickerBuilder.(Map<String, Any?>) -> Unit
		get() = { configuration ->
		internal open val transition: FlickerBuilder.() -> Unit
		get() = {
		setup {
		test {
		device.wakeUpAndGoToHomeScreen()
		}
		eachRun {
		this.setRotation(configuration.startRotation)
		this.setRotation(testSpec.startRotation)
		primaryApp.launchViaIntent(wmHelper)
		secondaryApp.launchViaIntent(wmHelper)
		nonResizeableApp?.launchViaIntent(wmHelper)