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

Commit 8b441b63 authored by Nataniel Borges's avatar Nataniel Borges Committed by Android (Google) Code Review
Browse files

Merge "Improve app launch test naming" into udc-qpr-dev

parents 7fbd2d37 d597620c

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 Original line Diff line number Diff line
@@ -57,7 +57,7 @@ import org.junit.runners.Parameterized 
@RunWith(Parameterized::class)

@RunWith(Parameterized::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

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

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

    private val testApp: TwoActivitiesAppHelper = TwoActivitiesAppHelper(instrumentation)

    private val testApp: TwoActivitiesAppHelper = TwoActivitiesAppHelper(instrumentation)





    /** {@inheritDoc} */

    /** {@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 Original line Diff line number Diff line
@@ -27,7 +27,7 @@ import org.junit.runners.Parameterized 
@RunWith(Parameterized::class)

@RunWith(Parameterized::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

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

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

    companion object {

    companion object {

        /**

        /**

         * Creates the test configurations.

         * 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 Original line Diff line number Diff line
@@ -55,7 +55,7 @@ import org.junit.runners.Parameterized 
@RunWith(Parameterized::class)

@RunWith(Parameterized::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

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

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

    /** {@inheritDoc} */

    /** {@inheritDoc} */

    override val transition: FlickerBuilder.() -> Unit

    override val transition: FlickerBuilder.() -> Unit

        get() = {

        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 Original line Diff line number Diff line
@@ -32,7 +32,7 @@ import org.junit.runners.Parameterized 
@RunWith(Parameterized::class)

@RunWith(Parameterized::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

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

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

    @Test

    @Test

    @FlakyTest

    @FlakyTest

    override fun visibleLayersShownMoreThanOneConsecutiveEntry() {

    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 Original line Diff line number Diff line
@@ -38,7 +38,8 @@ import org.junit.runners.Parameterized 
@RunWith(Parameterized::class)

@RunWith(Parameterized::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

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

open class OpenAppFromIntentColdAfterCameraTest(flicker: FlickerTest) :

    OpenAppFromLauncherTransition(flicker) {

    private val cameraApp = CameraAppHelper(instrumentation)

    private val cameraApp = CameraAppHelper(instrumentation)

    /** {@inheritDoc} */

    /** {@inheritDoc} */

    override val transition: FlickerBuilder.() -> Unit

    override val transition: FlickerBuilder.() -> Unit