Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 81f9cf0c authored by Nataniel Borges's avatar Nataniel Borges Committed by Automerger Merge Worker
Browse files

Merge "Improve app launch test naming" into udc-qpr-dev am: 8b441b63 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23448696



Change-Id: Ie319b770eedfe510292650673801037e93b41898
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3cc9cd01 8b441b63

tests/FlickerTests/src/com/android/server/wm/flicker/launch/ActivitiesTransitionTest.kt→tests/FlickerTests/src/com/android/server/wm/flicker/launch/ActivityTransitionTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ import org.junit.runners.Parameterized 
@RunWith(Parameterized::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

open class ActivitiesTransitionTest(flicker: FlickerTest) : BaseTest(flicker) {

open class ActivityTransitionTest(flicker: FlickerTest) : BaseTest(flicker) {

    private val testApp: TwoActivitiesAppHelper = TwoActivitiesAppHelper(instrumentation)



    /** {@inheritDoc} */

tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppAfterCameraTestCfArm.kt→tests/FlickerTests/src/com/android/server/wm/flicker/launch/ActivityTransitionTestCfArm.kt

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ import org.junit.runners.Parameterized 
@RunWith(Parameterized::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

class OpenAppAfterCameraTestCfArm(flicker: FlickerTest) : OpenAppAfterCameraTest(flicker) {

class ActivityTransitionTestCfArm(flicker: FlickerTest) : ActivityTransitionTest(flicker) {

    companion object {

        /**

         * Creates the test configurations.

tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdFromIcon.kt→tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromIconColdTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ import org.junit.runners.Parameterized 
@RunWith(Parameterized::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

open class OpenAppColdFromIcon(flicker: FlickerTest) : OpenAppFromLauncherTransition(flicker) {

open class OpenAppFromIconColdTest(flicker: FlickerTest) : OpenAppFromLauncherTransition(flicker) {

    /** {@inheritDoc} */

    override val transition: FlickerBuilder.() -> Unit

        get() = {

tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdFromIconCfArm.kt→tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromIconColdTestCfArm.kt

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ import org.junit.runners.Parameterized 
@RunWith(Parameterized::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

class OpenAppColdFromIconCfArm(flicker: FlickerTest) : OpenAppColdFromIcon(flicker) {

class OpenAppFromIconColdTestCfArm(flicker: FlickerTest) : OpenAppFromIconColdTest(flicker) {

    @Test

    @FlakyTest

    override fun visibleLayersShownMoreThanOneConsecutiveEntry() {

tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppAfterCameraTest.kt→tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromIntentColdAfterCameraTest.kt

+2 −1
Original line number Diff line number Diff line
@@ -38,7 +38,8 @@ import org.junit.runners.Parameterized 
@RunWith(Parameterized::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

open class OpenAppAfterCameraTest(flicker: FlickerTest) : OpenAppFromLauncherTransition(flicker) {

open class OpenAppFromIntentColdAfterCameraTest(flicker: FlickerTest) :

    OpenAppFromLauncherTransition(flicker) {

    private val cameraApp = CameraAppHelper(instrumentation)

    /** {@inheritDoc} */

    override val transition: FlickerBuilder.() -> Unit