diff options
| author | 2024-11-18 15:40:21 +0000 | |
|---|---|---|
| committer | 2024-11-18 15:40:21 +0000 | |
| commit | 84d80c52a62f8839cc5801f02a6b72cbbc841988 (patch) | |
| tree | 44fad0e569a08832634ba2f7d0230b0a62ce21cf | |
| parent | 6c99a72748b093ce950b9b230e0158c616ee5e35 (diff) | |
Fix enterDesktopWithDrag test
A previous change made this test to fail due to test app not being
launched. Use new enterDesktopMode method instead as it defaults to
enterDesktopWithDrag now.
Fix: 379662054
Test: atest EnterDesktopWithDragPortraitTest
Flag: EXEMPT Bugfix
Change-Id: If8025cd5d601be5c972c0fa5d002cf4a9ccc7837
2 files changed, 3 insertions, 2 deletions
diff --git a/libs/WindowManager/Shell/tests/e2e/desktopmode/scenarios/src/com/android/wm/shell/scenarios/EnterDesktopWithDrag.kt b/libs/WindowManager/Shell/tests/e2e/desktopmode/scenarios/src/com/android/wm/shell/scenarios/EnterDesktopWithDrag.kt index 0f546cdf97c5..8d04749d76a5 100644 --- a/libs/WindowManager/Shell/tests/e2e/desktopmode/scenarios/src/com/android/wm/shell/scenarios/EnterDesktopWithDrag.kt +++ b/libs/WindowManager/Shell/tests/e2e/desktopmode/scenarios/src/com/android/wm/shell/scenarios/EnterDesktopWithDrag.kt @@ -49,7 +49,8 @@ constructor( @Test open fun enterDesktopWithDrag() { - testApp.enterDesktopModeWithDrag(wmHelper, device) + // By default this method uses drag to desktop + testApp.enterDesktopMode(wmHelper, device) } @After diff --git a/tests/FlickerTests/test-apps/app-helpers/src/com/android/server/wm/flicker/helpers/DesktopModeAppHelper.kt b/tests/FlickerTests/test-apps/app-helpers/src/com/android/server/wm/flicker/helpers/DesktopModeAppHelper.kt index d2c9eb30e2fc..64328275085d 100644 --- a/tests/FlickerTests/test-apps/app-helpers/src/com/android/server/wm/flicker/helpers/DesktopModeAppHelper.kt +++ b/tests/FlickerTests/test-apps/app-helpers/src/com/android/server/wm/flicker/helpers/DesktopModeAppHelper.kt @@ -92,7 +92,7 @@ open class DesktopModeAppHelper(private val innerHelper: IStandardAppHelper) : } /** Move an app to Desktop by dragging the app handle at the top. */ - fun enterDesktopModeWithDrag( + private fun enterDesktopModeWithDrag( wmHelper: WindowManagerStateHelper, device: UiDevice, motionEventHelper: MotionEventHelper = MotionEventHelper(getInstrumentation(), TOUCH) |