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

Commit 9c4adc16 authored Jun 10, 2025 by Nataniel Borges

Add RequiresDevice annotation to e2e tests that need a device

This allow us to better filter which tests we should run on each target (CF and devices) without requiring a second test_mapping tag

Context: go/wm-infra-optimize

Test: atest Flickertests WMShellFlickerTests
Flag: TEST_ONLY
Bug: 311643481
Change-Id: I43481f8a26de1461ac2f1162d84064aaa0df9f3d

parent b5bf456d

libs/WindowManager/Shell/tests/e2e/desktopmode/flicker-service/src/com/android/wm/shell/flicker/BringDesktopAppsToFrontLandscape.kt

+2 −0

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ import android.tools.flicker.annotation.FlickerConfigProvider
		import android.tools.flicker.config.FlickerConfig
		import android.tools.flicker.config.FlickerServiceConfig
		import android.tools.flicker.junit.FlickerServiceJUnit4ClassRunner
		import androidx.test.filters.RequiresDevice
		import com.android.wm.shell.flicker.DesktopModeFlickerScenarios.Companion.BRING_APPS_TO_FRONT
		import com.android.wm.shell.scenarios.BringDesktopAppsToFront
		import org.junit.Test
		@@ -32,6 +33,7 @@ import org.junit.runner.RunWith
		*
		* Assert that the app windows move to front.
		*/
		@RequiresDevice
		@RunWith(FlickerServiceJUnit4ClassRunner::class)
		class BringDesktopAppsToFrontLandscape : BringDesktopAppsToFront(rotation = ROTATION_90) {

libs/WindowManager/Shell/tests/e2e/desktopmode/flicker-service/src/com/android/wm/shell/flicker/BringDesktopAppsToFrontPortrait.kt

+2 −0

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ import android.tools.flicker.annotation.FlickerConfigProvider
		import android.tools.flicker.config.FlickerConfig
		import android.tools.flicker.config.FlickerServiceConfig
		import android.tools.flicker.junit.FlickerServiceJUnit4ClassRunner
		import androidx.test.filters.RequiresDevice
		import com.android.wm.shell.flicker.DesktopModeFlickerScenarios.Companion.BRING_APPS_TO_FRONT
		import com.android.wm.shell.scenarios.BringDesktopAppsToFront
		import org.junit.Test
		@@ -32,6 +33,7 @@ import org.junit.runner.RunWith
		*
		* Assert that the app windows move to front.
		*/
		@RequiresDevice
		@RunWith(FlickerServiceJUnit4ClassRunner::class)
		class BringDesktopAppsToFrontPortrait : BringDesktopAppsToFront(rotation = ROTATION_0) {

libs/WindowManager/Shell/tests/e2e/desktopmode/flicker-service/src/com/android/wm/shell/flicker/EnterDesktopWithDragLandscape.kt

+2 −0

Original line number	Diff line number	Diff line
		@@ -23,11 +23,13 @@ import android.tools.flicker.annotation.FlickerConfigProvider
		import android.tools.flicker.config.FlickerConfig
		import android.tools.flicker.config.FlickerServiceConfig
		import android.tools.flicker.junit.FlickerServiceJUnit4ClassRunner
		import androidx.test.filters.RequiresDevice
		import com.android.wm.shell.flicker.DesktopModeFlickerScenarios.Companion.END_DRAG_TO_DESKTOP
		import com.android.wm.shell.scenarios.EnterDesktopWithDrag
		import org.junit.Test
		import org.junit.runner.RunWith

		@RequiresDevice
		@RunWith(FlickerServiceJUnit4ClassRunner::class)
		class EnterDesktopWithDragLandscape : EnterDesktopWithDrag(Rotation.ROTATION_90) {
		@ExpectedScenarios(["END_DRAG_TO_DESKTOP"])

libs/WindowManager/Shell/tests/e2e/desktopmode/flicker-service/src/com/android/wm/shell/flicker/EnterDesktopWithDragPortrait.kt

+2 −0

Original line number	Diff line number	Diff line
		@@ -23,11 +23,13 @@ import android.tools.flicker.annotation.FlickerConfigProvider
		import android.tools.flicker.config.FlickerConfig
		import android.tools.flicker.config.FlickerServiceConfig
		import android.tools.flicker.junit.FlickerServiceJUnit4ClassRunner
		import androidx.test.filters.RequiresDevice
		import com.android.wm.shell.flicker.DesktopModeFlickerScenarios.Companion.END_DRAG_TO_DESKTOP
		import com.android.wm.shell.scenarios.EnterDesktopWithDrag
		import org.junit.Test
		import org.junit.runner.RunWith

		@RequiresDevice
		@RunWith(FlickerServiceJUnit4ClassRunner::class)
		class EnterDesktopWithDragPortrait : EnterDesktopWithDrag(Rotation.ROTATION_0) {
		@ExpectedScenarios(["END_DRAG_TO_DESKTOP"])

libs/WindowManager/Shell/tests/e2e/desktopmode/flicker-service/src/com/android/wm/shell/flicker/EnterDesktopWithKeyboardShortcut.kt

+2 −0

Original line number	Diff line number	Diff line
		@@ -22,11 +22,13 @@ import android.tools.flicker.annotation.FlickerConfigProvider
		import android.tools.flicker.config.FlickerConfig
		import android.tools.flicker.config.FlickerServiceConfig
		import android.tools.flicker.junit.FlickerServiceJUnit4ClassRunner
		import androidx.test.filters.RequiresDevice
		import com.android.wm.shell.flicker.DesktopModeFlickerScenarios.Companion.ENTER_DESKTOP_FROM_KEYBOARD_SHORTCUT
		import com.android.wm.shell.scenarios.EnterDesktopFromKeyboardShortcut
		import org.junit.Test
		import org.junit.runner.RunWith

		@RequiresDevice
		@RunWith(FlickerServiceJUnit4ClassRunner::class)
		class EnterDesktopWithKeyboardShortcut : EnterDesktopFromKeyboardShortcut() {
		@ExpectedScenarios(["ENTER_DESKTOP_FROM_KEYBOARD_SHORTCUT"])