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

Commit e8a6da67 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Remove references to old FaaS test rule" into tm-dev am: 49afccb1 am: 42f47734"

parents a22ee5cd 2255a7a8

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/EnterPipTest.kt

+0 −4
Original line number Diff line number Diff line
@@ -26,9 +26,7 @@ import com.android.server.wm.flicker.FlickerTestParameterFactory 
import com.android.server.wm.flicker.LAUNCHER_COMPONENT

import com.android.server.wm.flicker.annotation.Group3

import com.android.server.wm.flicker.dsl.FlickerBuilder

import com.android.server.wm.flicker.rules.WMFlickerServiceRuleForTestSpec

import org.junit.FixMethodOrder

import org.junit.Rule

import org.junit.Test

import org.junit.runner.RunWith

import org.junit.runners.MethodSorters
@@ -57,8 +55,6 @@ import org.junit.runners.Parameterized 
@FixMethodOrder(MethodSorters.NAME_ASCENDING)

@Group3

class EnterPipTest(testSpec: FlickerTestParameter) : PipTransition(testSpec) {

    @get:Rule

    val flickerRule = WMFlickerServiceRuleForTestSpec(testSpec)



    /**

     * Defines the transition used to run the test

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/ExitPipViaIntentTest.kt

+0 −4
Original line number Diff line number Diff line
@@ -25,9 +25,7 @@ import com.android.server.wm.flicker.FlickerTestParameter 
import com.android.server.wm.flicker.FlickerTestParameterFactory

import com.android.server.wm.flicker.annotation.Group3

import com.android.server.wm.flicker.dsl.FlickerBuilder

import com.android.server.wm.flicker.rules.WMFlickerServiceRuleForTestSpec

import org.junit.FixMethodOrder

import org.junit.Rule

import org.junit.Test

import org.junit.runner.RunWith

import org.junit.runners.MethodSorters
@@ -57,8 +55,6 @@ import org.junit.runners.Parameterized 
@FixMethodOrder(MethodSorters.NAME_ASCENDING)

@Group3

class ExitPipViaIntentTest(testSpec: FlickerTestParameter) : ExitPipToAppTransition(testSpec) {

    @get:Rule

    val flickerRule = WMFlickerServiceRuleForTestSpec(testSpec)



    /**

     * Defines the transition used to run the test

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/ExitPipWithDismissButtonTest.kt

+0 −4
Original line number Diff line number Diff line
@@ -25,9 +25,7 @@ import com.android.server.wm.flicker.FlickerTestParameter 
import com.android.server.wm.flicker.FlickerTestParameterFactory

import com.android.server.wm.flicker.annotation.Group3

import com.android.server.wm.flicker.dsl.FlickerBuilder

import com.android.server.wm.flicker.rules.WMFlickerServiceRuleForTestSpec

import org.junit.FixMethodOrder

import org.junit.Rule

import org.junit.Test

import org.junit.runner.RunWith

import org.junit.runners.MethodSorters
@@ -57,8 +55,6 @@ import org.junit.runners.Parameterized 
@FixMethodOrder(MethodSorters.NAME_ASCENDING)

@Group3

class ExitPipWithDismissButtonTest(testSpec: FlickerTestParameter) : ExitPipTransition(testSpec) {

    @get:Rule

    val flickerRule = WMFlickerServiceRuleForTestSpec(testSpec)



    override val transition: FlickerBuilder.() -> Unit

        get() = {

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

+0 −5
Original line number Diff line number Diff line
@@ -34,8 +34,6 @@ import com.android.server.wm.flicker.statusBarLayerIsVisible 
import com.android.server.wm.flicker.statusBarLayerRotatesScales

import com.android.server.wm.flicker.statusBarWindowIsVisible

import com.android.server.wm.flicker.replacesLayer

import com.android.server.wm.flicker.rules.WMFlickerServiceRuleForTestSpec

import org.junit.Rule

import org.junit.Test



/**
@@ -45,9 +43,6 @@ abstract class CloseAppTransition(protected val testSpec: FlickerTestParameter) 
    protected val instrumentation: Instrumentation = InstrumentationRegistry.getInstrumentation()

    protected open val testApp: StandardAppHelper = SimpleAppHelper(instrumentation)



    @get:Rule

    val flickerRule = WMFlickerServiceRuleForTestSpec(testSpec)



    /**

     * Specification of the test transition to execute

     */

tests/FlickerTests/src/com/android/server/wm/flicker/rotation/ChangeAppRotationTest.kt

+0 −5
Original line number Diff line number Diff line
@@ -25,13 +25,11 @@ import com.android.server.wm.flicker.FlickerTestParameterFactory 
import com.android.server.wm.flicker.annotation.Group3

import com.android.server.wm.flicker.dsl.FlickerBuilder

import com.android.server.wm.flicker.helpers.SimpleAppHelper

import com.android.server.wm.flicker.rules.WMFlickerServiceRuleForTestSpec

import com.android.server.wm.flicker.statusBarLayerIsVisible

import com.android.server.wm.flicker.statusBarLayerRotatesScales

import com.android.server.wm.flicker.statusBarWindowIsVisible

import com.android.server.wm.traces.common.FlickerComponentName

import org.junit.FixMethodOrder

import org.junit.Rule

import org.junit.Test

import org.junit.runner.RunWith

import org.junit.runners.MethodSorters
@@ -80,9 +78,6 @@ import org.junit.runners.Parameterized 
class ChangeAppRotationTest(

    testSpec: FlickerTestParameter

) : RotationTransition(testSpec) {

    @get:Rule

    val flickerRule = WMFlickerServiceRuleForTestSpec(testSpec)



    override val testApp = SimpleAppHelper(instrumentation)

    override val transition: FlickerBuilder.() -> Unit

        get() = {