| commit | b3c23e19576c3fff0f20a5658c37145dd23c386f | [log] [tgz] |
|---|---|---|
| author | Nataniel Borges <natanieljr@google.com> | Tue Dec 05 16:59:13 2023 +0000 |
| committer | Nataniel Borges <natanieljr@google.com> | Tue Dec 05 17:39:04 2023 +0000 |
| tree | d93089af4c26c3997c681eb279ab8b960d3e21b0 | |
| parent | 4a4bbbfb7e7c64b2201780c06dcd93dc355d6b2b [diff] |
Fix RotationTest inheritance in ActivityEmbedding Bug: 310969700 Test: <flicker tests in presubmit> Change-Id: I6869855047eac8aa662358011158f0c2e449e0de
diff --git a/tests/FlickerTests/ActivityEmbedding/src/com/android/server/wm/flicker/activityembedding/rotation/RotateSplitNoChangeTest.kt b/tests/FlickerTests/ActivityEmbedding/src/com/android/server/wm/flicker/activityembedding/rotation/RotateSplitNoChangeTest.kt index e8389d19..0dce870 100644 --- a/tests/FlickerTests/ActivityEmbedding/src/com/android/server/wm/flicker/activityembedding/rotation/RotateSplitNoChangeTest.kt +++ b/tests/FlickerTests/ActivityEmbedding/src/com/android/server/wm/flicker/activityembedding/rotation/RotateSplitNoChangeTest.kt
@@ -43,8 +43,6 @@ @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)
diff --git a/tests/FlickerTests/ActivityEmbedding/src/com/android/server/wm/flicker/activityembedding/rotation/RotationTransition.kt b/tests/FlickerTests/ActivityEmbedding/src/com/android/server/wm/flicker/activityembedding/rotation/RotationTransition.kt index 1123c5b..f6d51f9 100644 --- a/tests/FlickerTests/ActivityEmbedding/src/com/android/server/wm/flicker/activityembedding/rotation/RotationTransition.kt +++ b/tests/FlickerTests/ActivityEmbedding/src/com/android/server/wm/flicker/activityembedding/rotation/RotationTransition.kt
@@ -18,17 +18,14 @@ 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) }