From 49678004ccac914919533547c39f92b191220576 Mon Sep 17 00:00:00 2001 From: Vania Desmonda Date: Mon, 2 Dec 2024 14:18:36 +0000 Subject: Add verifications that functions get called on key gesture events. Test: atest DesktopModeKeyGestureHandlerTest Bug: 380036936 Flag: com.android.window.flags.enable_task_resizing_keyboard_shortcuts Change-Id: If143b9854f31e881a3639485bb72c4508624b1b5 --- .../DesktopModeKeyGestureHandlerTest.kt | 31 +++++++++++++++++++--- 1 file changed, 27 insertions(+), 4 deletions(-) (limited to 'libs') diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopModeKeyGestureHandlerTest.kt b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopModeKeyGestureHandlerTest.kt index dc7fb5f36952..0bc1fb94038e 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopModeKeyGestureHandlerTest.kt +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopModeKeyGestureHandlerTest.kt @@ -56,6 +56,7 @@ import com.android.window.flags.Flags.FLAG_ENABLE_TASK_RESIZING_KEYBOARD_SHORTCU import com.android.wm.shell.TestShellExecutor import com.android.wm.shell.common.DisplayController import com.android.wm.shell.common.DisplayLayout +import com.android.wm.shell.desktopmode.common.ToggleTaskSizeInteraction import com.android.wm.shell.shared.desktopmode.DesktopModeStatus import com.android.wm.shell.sysui.ShellInit import com.android.wm.shell.windowdecor.DesktopModeWindowDecorViewModel @@ -204,9 +205,15 @@ class DesktopModeKeyGestureHandlerTest : ShellTestCase() { .setModifierState(KeyEvent.META_META_ON) .build() val result = keyGestureEventHandler.handleKeyGestureEvent(event, null) + testExecutor.flushAll() assertThat(result).isTrue() - assertThat(testExecutor.callbacks.size).isEqualTo(1) + verify(desktopModeWindowDecorViewModel).onSnapResize( + task.taskId, + true, + DesktopModeEventLogger.Companion.InputMethod.KEYBOARD, + /* fromMenu= */ false + ) } @Test @@ -226,9 +233,15 @@ class DesktopModeKeyGestureHandlerTest : ShellTestCase() { .setModifierState(KeyEvent.META_META_ON) .build() val result = keyGestureEventHandler.handleKeyGestureEvent(event, null) + testExecutor.flushAll() assertThat(result).isTrue() - assertThat(testExecutor.callbacks.size).isEqualTo(1) + verify(desktopModeWindowDecorViewModel).onSnapResize( + task.taskId, + false, + DesktopModeEventLogger.Companion.InputMethod.KEYBOARD, + /* fromMenu= */ false + ) } @Test @@ -248,9 +261,18 @@ class DesktopModeKeyGestureHandlerTest : ShellTestCase() { .setModifierState(KeyEvent.META_META_ON) .build() val result = keyGestureEventHandler.handleKeyGestureEvent(event, null) + testExecutor.flushAll() assertThat(result).isTrue() - assertThat(testExecutor.callbacks.size).isEqualTo(1) + verify(desktopTasksController).toggleDesktopTaskSize( + task, + ToggleTaskSizeInteraction( + isMaximized = isTaskMaximized(task, displayController), + source = ToggleTaskSizeInteraction.Source.KEYBOARD_SHORTCUT, + inputMethod = + DesktopModeEventLogger.Companion.InputMethod.KEYBOARD, + ), + ) } @Test @@ -270,9 +292,10 @@ class DesktopModeKeyGestureHandlerTest : ShellTestCase() { .setModifierState(KeyEvent.META_META_ON) .build() val result = keyGestureEventHandler.handleKeyGestureEvent(event, null) + testExecutor.flushAll() assertThat(result).isTrue() - assertThat(testExecutor.callbacks.size).isEqualTo(1) + verify(desktopTasksController).minimizeTask(task) } private fun setUpFreeformTask( -- cgit v1.2.3-59-g8ed1b