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

Commit 76ed737a authored by Nataniel Borges's avatar Nataniel Borges Committed by Automerger Merge Worker
Browse files

Merge "Migrate OpenAppColdTest to CF ARM" into udc-dev am: f7e7e294 

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



Change-Id: I692cb10614450b62032d10dcff9b30bbf246589e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cec6e3e9 f7e7e294

tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdTest.kt

+5 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.server.wm.flicker.launch



import android.platform.test.annotations.Postsubmit

import android.platform.test.annotations.Presubmit

import android.tools.device.flicker.annotation.FlickerServiceCompatible

import android.tools.device.flicker.junit.FlickerParametersRunnerFactory
@@ -72,6 +73,10 @@ open class OpenAppColdTest(flicker: FlickerTest) : OpenAppFromLauncherTransition 
    /** {@inheritDoc} */

    @Presubmit @Test override fun appLayerReplacesLauncher() = super.appLayerReplacesLauncher()



    @Postsubmit

    @Test

    override fun navBarLayerPositionAtStartAndEnd() = super.navBarLayerPositionAtStartAndEnd()



    companion object {

        /**

         * Creates the test configurations.

tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdTestCfArm.kt

0 → 100644
+52 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2023 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.server.wm.flicker.launch



import android.platform.test.annotations.FlakyTest

import android.tools.device.flicker.annotation.FlickerServiceCompatible

import android.tools.device.flicker.junit.FlickerParametersRunnerFactory

import android.tools.device.flicker.legacy.FlickerTest

import android.tools.device.flicker.legacy.FlickerTestFactory

import org.junit.FixMethodOrder

import org.junit.Test

import org.junit.runner.RunWith

import org.junit.runners.MethodSorters

import org.junit.runners.Parameterized



@FlickerServiceCompatible

@RunWith(Parameterized::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

class OpenAppColdTestCfArm(flicker: FlickerTest) : OpenAppColdTest(flicker) {

    @FlakyTest(bugId = 273696733)

    @Test

    override fun appLayerReplacesLauncher() = super.appLayerReplacesLauncher()



    companion object {

        /**

         * Creates the test configurations.

         *

         * See [FlickerTestFactory.nonRotationTests] for configuring screen orientation and

         * navigation modes.

         */

        @Parameterized.Parameters(name = "{0}")

        @JvmStatic

        fun getParams(): Collection<FlickerTest> {

            return FlickerTestFactory.nonRotationTests()

        }

    }

}
 
 No newline at end of file