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

Commit 33a05e84 authored Jul 23, 2022 by Nataniel Borges Committed by Android (Google) Code Review Jul 23, 2022

Merge "Revert "Enable Flicker as a Service on some legacy flicker tests""

parents 3f4a4e05 f0da57d6

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

+0 −2

Original line number	Diff line number	Diff line
		@@ -22,7 +22,6 @@ import androidx.test.filters.RequiresDevice
		import com.android.server.wm.flicker.FlickerParametersRunnerFactory
		import com.android.server.wm.flicker.FlickerTestParameter
		import com.android.server.wm.flicker.FlickerTestParameterFactory
		import com.android.server.wm.flicker.annotation.FlickerServiceCompatible
		import com.android.server.wm.flicker.annotation.Group4
		import com.android.server.wm.flicker.dsl.FlickerBuilder
		import org.junit.FixMethodOrder
		@@ -61,7 +60,6 @@ import org.junit.runners.Parameterized
		* apps are running before setup
		*/
		@RequiresDevice
		@FlickerServiceCompatible
		@RunWith(Parameterized::class)
		@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)
		@FixMethodOrder(MethodSorters.NAME_ASCENDING)

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

+0 −2

Original line number	Diff line number	Diff line
		@@ -21,7 +21,6 @@ import androidx.test.filters.RequiresDevice
		import com.android.server.wm.flicker.FlickerParametersRunnerFactory
		import com.android.server.wm.flicker.FlickerTestParameter
		import com.android.server.wm.flicker.FlickerTestParameterFactory
		import com.android.server.wm.flicker.annotation.FlickerServiceCompatible
		import com.android.server.wm.flicker.annotation.Group4
		import com.android.server.wm.flicker.dsl.FlickerBuilder
		import org.junit.FixMethodOrder
		@@ -60,7 +59,6 @@ import org.junit.runners.Parameterized
		* apps are running before setup
		*/
		@RequiresDevice
		@FlickerServiceCompatible
		@RunWith(Parameterized::class)
		@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)
		@FixMethodOrder(MethodSorters.NAME_ASCENDING)

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

+0 −2

Original line number	Diff line number	Diff line
		@@ -22,7 +22,6 @@ import android.platform.test.annotations.RequiresDevice
		import com.android.server.wm.flicker.FlickerParametersRunnerFactory
		import com.android.server.wm.flicker.FlickerTestParameter
		import com.android.server.wm.flicker.FlickerTestParameterFactory
		import com.android.server.wm.flicker.annotation.FlickerServiceCompatible
		import com.android.server.wm.flicker.annotation.Group1
		import com.android.server.wm.flicker.dsl.FlickerBuilder
		import com.android.server.wm.flicker.helpers.setRotation
		@@ -51,7 +50,6 @@ import org.junit.runners.Parameterized
		* apps are running before setup
		*/
		@RequiresDevice
		@FlickerServiceCompatible
		@RunWith(Parameterized::class)
		@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)
		@FixMethodOrder(MethodSorters.NAME_ASCENDING)

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

+0 −2

Original line number	Diff line number	Diff line
		@@ -23,7 +23,6 @@ import android.view.Surface
		import com.android.server.wm.flicker.FlickerParametersRunnerFactory
		import com.android.server.wm.flicker.FlickerTestParameter
		import com.android.server.wm.flicker.FlickerTestParameterFactory
		import com.android.server.wm.flicker.annotation.FlickerServiceCompatible
		import com.android.server.wm.flicker.annotation.Group1
		import com.android.server.wm.flicker.dsl.FlickerBuilder
		import com.android.server.wm.flicker.helpers.setRotation
		@@ -53,7 +52,6 @@ import org.junit.runners.Parameterized
		* apps are running before setup
		*/
		@RequiresDevice
		@FlickerServiceCompatible
		@RunWith(Parameterized::class)
		@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)
		@FixMethodOrder(MethodSorters.NAME_ASCENDING)

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

+0 −2

Original line number	Diff line number	Diff line
		@@ -25,7 +25,6 @@ import android.view.WindowManagerPolicyConstants
		import com.android.server.wm.flicker.FlickerParametersRunnerFactory
		import com.android.server.wm.flicker.FlickerTestParameter
		import com.android.server.wm.flicker.FlickerTestParameterFactory
		import com.android.server.wm.flicker.annotation.FlickerServiceCompatible
		import com.android.server.wm.flicker.annotation.Group1
		import com.android.server.wm.flicker.helpers.NonResizeableAppHelper
		import com.android.server.wm.flicker.statusBarLayerPositionAtEnd
		@@ -58,7 +57,6 @@ import org.junit.runners.Parameterized
		* apps are running before setup
		*/
		@RequiresDevice
		@FlickerServiceCompatible
		@RunWith(Parameterized::class)
		@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)
		@FixMethodOrder(MethodSorters.NAME_ASCENDING)