Revert "Temporarily disable FaaS on legacy Flicker tests" (ebddf8eb) · Commits · e / os / android_frameworks_base

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

+2 −7

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

	import android.platform.test.annotations.FlakyTest		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.junit.FlickerParametersRunnerFactory
	import android.tools.device.flicker.legacy.FlickerBuilder		import android.tools.device.flicker.legacy.FlickerBuilder
	import android.tools.device.flicker.legacy.FlickerTest		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		* Launch an app [testApp] and wait animation to complete
	* Press back button		* Press back button
	* ```		* ```
	*
	* To run only the presubmit assertions add: `--		* To run only the presubmit assertions add: `--
	*
	* ```		* ```
	* --module-arg FlickerTests:exclude-annotation:androidx.test.filters.FlakyTest		* --module-arg FlickerTests:exclude-annotation:androidx.test.filters.FlakyTest
	* --module-arg FlickerTests:include-annotation:android.platform.test.annotations.Presubmit`		* --module-arg FlickerTests:include-annotation:android.platform.test.annotations.Presubmit`
	* ```		* ```
	*
	* To run only the postsubmit assertions add: `--		* To run only the postsubmit assertions add: `--
	*
	* ```		* ```
	* --module-arg FlickerTests:exclude-annotation:androidx.test.filters.FlakyTest		* --module-arg FlickerTests:exclude-annotation:androidx.test.filters.FlakyTest
	* --module-arg FlickerTests:include-annotation:android.platform.test.annotations.Postsubmit`		* --module-arg FlickerTests:include-annotation:android.platform.test.annotations.Postsubmit`
	* ```		* ```
	*
	* To run only the flaky assertions add: `--		* To run only the flaky assertions add: `--
	*
	* ```		* ```
	* --module-arg FlickerTests:include-annotation:androidx.test.filters.FlakyTest`		* --module-arg FlickerTests:include-annotation:androidx.test.filters.FlakyTest`
	* ```		* ```
	*
	* Notes:		* Notes:
	* ```		* ```
	* 1. Some default assertions (e.g., nav bar, status bar and screen covered)		* 1. Some default assertions (e.g., nav bar, status bar and screen covered)
	@@ -71,6 +65,7 @@ import org.junit.runners.Parameterized
	* ```		* ```
	*/		*/
	@RequiresDevice		@RequiresDevice
			@FlickerServiceCompatible
	@RunWith(Parameterized::class)		@RunWith(Parameterized::class)
	@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)		@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)
	@FixMethodOrder(MethodSorters.NAME_ASCENDING)		@FixMethodOrder(MethodSorters.NAME_ASCENDING)

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

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -16,6 +16,7 @@

	package com.android.server.wm.flicker.close		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.junit.FlickerParametersRunnerFactory
	import android.tools.device.flicker.legacy.FlickerTest		import android.tools.device.flicker.legacy.FlickerTest
	import android.tools.device.flicker.legacy.FlickerTestFactory		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.MethodSorters
	import org.junit.runners.Parameterized		import org.junit.runners.Parameterized

			@FlickerServiceCompatible
	@RunWith(Parameterized::class)		@RunWith(Parameterized::class)
	@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)		@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)
	@FixMethodOrder(MethodSorters.NAME_ASCENDING)		@FixMethodOrder(MethodSorters.NAME_ASCENDING)

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

+2 −7

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

	import android.platform.test.annotations.FlakyTest		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.junit.FlickerParametersRunnerFactory
	import android.tools.device.flicker.legacy.FlickerBuilder		import android.tools.device.flicker.legacy.FlickerBuilder
	import android.tools.device.flicker.legacy.FlickerTest		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		* Launch an app [testApp] and wait animation to complete
	* Press home button		* Press home button
	* ```		* ```
	*
	* To run only the presubmit assertions add: `--		* To run only the presubmit assertions add: `--
	*
	* ```		* ```
	* --module-arg FlickerTests:exclude-annotation:androidx.test.filters.FlakyTest		* --module-arg FlickerTests:exclude-annotation:androidx.test.filters.FlakyTest
	* --module-arg FlickerTests:include-annotation:android.platform.test.annotations.Presubmit`		* --module-arg FlickerTests:include-annotation:android.platform.test.annotations.Presubmit`
	* ```		* ```
	*
	* To run only the postsubmit assertions add: `--		* To run only the postsubmit assertions add: `--
	*
	* ```		* ```
	* --module-arg FlickerTests:exclude-annotation:androidx.test.filters.FlakyTest		* --module-arg FlickerTests:exclude-annotation:androidx.test.filters.FlakyTest
	* --module-arg FlickerTests:include-annotation:android.platform.test.annotations.Postsubmit`		* --module-arg FlickerTests:include-annotation:android.platform.test.annotations.Postsubmit`
	* ```		* ```
	*
	* To run only the flaky assertions add: `--		* To run only the flaky assertions add: `--
	*
	* ```		* ```
	* --module-arg FlickerTests:include-annotation:androidx.test.filters.FlakyTest`		* --module-arg FlickerTests:include-annotation:androidx.test.filters.FlakyTest`
	* ```		* ```
	*
	* Notes:		* Notes:
	* ```		* ```
	* 1. Some default assertions (e.g., nav bar, status bar and screen covered)		* 1. Some default assertions (e.g., nav bar, status bar and screen covered)
	@@ -71,6 +65,7 @@ import org.junit.runners.Parameterized
	* ```		* ```
	*/		*/
	@RequiresDevice		@RequiresDevice
			@FlickerServiceCompatible
	@RunWith(Parameterized::class)		@RunWith(Parameterized::class)
	@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)		@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)
	@FixMethodOrder(MethodSorters.NAME_ASCENDING)		@FixMethodOrder(MethodSorters.NAME_ASCENDING)

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

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -16,6 +16,7 @@

	package com.android.server.wm.flicker.close		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.junit.FlickerParametersRunnerFactory
	import android.tools.device.flicker.legacy.FlickerTest		import android.tools.device.flicker.legacy.FlickerTest
	import android.tools.device.flicker.legacy.FlickerTestFactory		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.MethodSorters
	import org.junit.runners.Parameterized		import org.junit.runners.Parameterized

			@FlickerServiceCompatible
	@RunWith(Parameterized::class)		@RunWith(Parameterized::class)
	@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)		@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)
	@FixMethodOrder(MethodSorters.NAME_ASCENDING)		@FixMethodOrder(MethodSorters.NAME_ASCENDING)

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

+2 −0

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

	import android.platform.test.annotations.FlakyTest		import android.platform.test.annotations.FlakyTest
	import android.tools.common.NavBar		import android.tools.common.NavBar
			import android.tools.device.flicker.annotation.FlickerServiceCompatible
	import android.tools.device.flicker.junit.FlickerParametersRunnerFactory		import android.tools.device.flicker.junit.FlickerParametersRunnerFactory
	import android.tools.device.flicker.legacy.FlickerTest		import android.tools.device.flicker.legacy.FlickerTest
	import android.tools.device.flicker.legacy.FlickerTestFactory		import android.tools.device.flicker.legacy.FlickerTestFactory
	@@ -28,6 +29,7 @@ import org.junit.runners.MethodSorters
	import org.junit.runners.Parameterized		import org.junit.runners.Parameterized

	/** Some assertions will fail because of b/264415996 */		/** Some assertions will fail because of b/264415996 */
			@FlickerServiceCompatible
	@RunWith(Parameterized::class)		@RunWith(Parameterized::class)
	@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)		@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)
	@FixMethodOrder(MethodSorters.NAME_ASCENDING)		@FixMethodOrder(MethodSorters.NAME_ASCENDING)