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

Commit 8f68ba6d authored by Pablo Gamito's avatar Pablo Gamito Committed by Automerger Merge Worker
Browse files

Merge "Revert "Temporarily disable FaaS on legacy Flicker tests"" into udc-dev am: 6bb1e7bb 

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



Change-Id: Ib3fc93aebe2fca71fec71c5b1b08f8b7eb4fa6f7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7fea268b 6bb1e7bb

tests/FlickerTests/src/com/android/server/wm/flicker/close/CloseAppBackButtonTest.kt

+2 −7
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.server.wm.flicker.close



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.FlickerBuilder

import android.tools.device.flicker.legacy.FlickerTest
@@ -39,27 +40,20 @@ import org.junit.runners.Parameterized 
 *     Launch an app [testApp] and wait animation to complete

 *     Press back button

 * ```

 *

 * To run only the presubmit assertions add: `--

 *

 * ```

 *      --module-arg FlickerTests:exclude-annotation:androidx.test.filters.FlakyTest

 *      --module-arg FlickerTests:include-annotation:android.platform.test.annotations.Presubmit`

 * ```

 *

 * To run only the postsubmit assertions add: `--

 *

 * ```

 *      --module-arg FlickerTests:exclude-annotation:androidx.test.filters.FlakyTest

 *      --module-arg FlickerTests:include-annotation:android.platform.test.annotations.Postsubmit`

 * ```

 *

 * To run only the flaky assertions add: `--

 *

 * ```

 *      --module-arg FlickerTests:include-annotation:androidx.test.filters.FlakyTest`

 * ```

 *

 * Notes:

 * ```

 *     1. Some default assertions (e.g., nav bar, status bar and screen covered)
@@ -71,6 +65,7 @@ import org.junit.runners.Parameterized 
 * ```

 */

@RequiresDevice

@FlickerServiceCompatible

@RunWith(Parameterized::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

tests/FlickerTests/src/com/android/server/wm/flicker/close/CloseAppBackButtonTestCfArm.kt

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


package com.android.server.wm.flicker.close



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
@@ -24,6 +25,7 @@ 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)

tests/FlickerTests/src/com/android/server/wm/flicker/close/CloseAppHomeButtonTest.kt

+2 −7
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.server.wm.flicker.close



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.FlickerBuilder

import android.tools.device.flicker.legacy.FlickerTest
@@ -39,27 +40,20 @@ import org.junit.runners.Parameterized 
 *     Launch an app [testApp] and wait animation to complete

 *     Press home button

 * ```

 *

 * To run only the presubmit assertions add: `--

 *

 * ```

 *      --module-arg FlickerTests:exclude-annotation:androidx.test.filters.FlakyTest

 *      --module-arg FlickerTests:include-annotation:android.platform.test.annotations.Presubmit`

 * ```

 *

 * To run only the postsubmit assertions add: `--

 *

 * ```

 *      --module-arg FlickerTests:exclude-annotation:androidx.test.filters.FlakyTest

 *      --module-arg FlickerTests:include-annotation:android.platform.test.annotations.Postsubmit`

 * ```

 *

 * To run only the flaky assertions add: `--

 *

 * ```

 *      --module-arg FlickerTests:include-annotation:androidx.test.filters.FlakyTest`

 * ```

 *

 * Notes:

 * ```

 *     1. Some default assertions (e.g., nav bar, status bar and screen covered)
@@ -71,6 +65,7 @@ import org.junit.runners.Parameterized 
 * ```

 */

@RequiresDevice

@FlickerServiceCompatible

@RunWith(Parameterized::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

tests/FlickerTests/src/com/android/server/wm/flicker/close/CloseAppHomeButtonTestCfArm.kt

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


package com.android.server.wm.flicker.close



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
@@ -24,6 +25,7 @@ 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)

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

+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.server.wm.flicker.launch 


import android.platform.test.annotations.FlakyTest

import android.tools.common.NavBar

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
@@ -28,6 +29,7 @@ import org.junit.runners.MethodSorters 
import org.junit.runners.Parameterized



/** Some assertions will fail because of b/264415996 */

@FlickerServiceCompatible

@RunWith(Parameterized::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)