Merge "Fix RotationTest inheritance in ActivityEmbedding" into main (1e5fd802) · Commits · e / os / android_frameworks_base

tests/FlickerTests/ActivityEmbedding/src/com/android/server/wm/flicker/activityembedding/rotation/RotateSplitNoChangeTest.kt

+0 −2

Original line number	Diff line number	Diff line
		@@ -43,8 +43,6 @@ import org.junit.runners.Parameterized
		@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)
		@FixMethodOrder(MethodSorters.NAME_ASCENDING)
		open class RotateSplitNoChangeTest(flicker: LegacyFlickerTest) : RotationTransition(flicker) {

		override val testApp = ActivityEmbeddingAppHelper(instrumentation)
		override val transition: FlickerBuilder.() -> Unit
		get() = {
		super.transition(this)

+2 −5

Original line number	Diff line number	Diff line
		@@ -18,17 +18,14 @@ package com.android.server.wm.flicker.activityembedding.rotation

		import android.platform.test.annotations.Presubmit
		import android.tools.common.traces.component.ComponentNameMatcher
		import android.tools.device.apphelpers.StandardAppHelper
		import android.tools.device.flicker.legacy.FlickerBuilder
		import android.tools.device.flicker.legacy.LegacyFlickerTest
		import com.android.server.wm.flicker.BaseTest
		import com.android.server.wm.flicker.activityembedding.ActivityEmbeddingTestBase
		import com.android.server.wm.flicker.helpers.setRotation
		import org.junit.Test

		/** Base class for app rotation tests */
		abstract class RotationTransition(flicker: LegacyFlickerTest) : BaseTest(flicker) {
		protected abstract val testApp: StandardAppHelper

		abstract class RotationTransition(flicker: LegacyFlickerTest) : ActivityEmbeddingTestBase(flicker) {
		/** {@inheritDoc} */
		override val transition: FlickerBuilder.() -> Unit = {
		setup { this.setRotation(flicker.scenario.startRotation) }