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

Commit 36e5b324 authored Jun 12, 2025 by Treehugger Robot Committed by Android (Google) Code Review Jun 12, 2025

Merge "Add RequiresDevice annotation to e2e tests that need a device" into main

parents b16f1c27 9c4adc16

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"])