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

Commit e18531db authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add verifications that functions get called on key gesture events." into main

parents 99222ab9 49678004

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopModeKeyGestureHandlerTest.kt

+27 −4
Original line number Original line Diff line number Diff line
@@ -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.TestShellExecutor

import com.android.wm.shell.common.DisplayController

import com.android.wm.shell.common.DisplayController

import com.android.wm.shell.common.DisplayLayout

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.shared.desktopmode.DesktopModeStatus

import com.android.wm.shell.sysui.ShellInit

import com.android.wm.shell.sysui.ShellInit

import com.android.wm.shell.windowdecor.DesktopModeWindowDecorViewModel

import com.android.wm.shell.windowdecor.DesktopModeWindowDecorViewModel
@@ -204,9 +205,15 @@ class DesktopModeKeyGestureHandlerTest : ShellTestCase() { 
            .setModifierState(KeyEvent.META_META_ON)

            .setModifierState(KeyEvent.META_META_ON)

            .build()

            .build()

        val result = keyGestureEventHandler.handleKeyGestureEvent(event, null)

        val result = keyGestureEventHandler.handleKeyGestureEvent(event, null)

        testExecutor.flushAll()





        assertThat(result).isTrue()

        assertThat(result).isTrue()

        assertThat(testExecutor.callbacks.size).isEqualTo(1)

        verify(desktopModeWindowDecorViewModel).onSnapResize(

            task.taskId,

            true,

            DesktopModeEventLogger.Companion.InputMethod.KEYBOARD,

            /* fromMenu= */ false

        )

    }

    }





    @Test

    @Test
@@ -226,9 +233,15 @@ class DesktopModeKeyGestureHandlerTest : ShellTestCase() { 
            .setModifierState(KeyEvent.META_META_ON)

            .setModifierState(KeyEvent.META_META_ON)

            .build()

            .build()

        val result = keyGestureEventHandler.handleKeyGestureEvent(event, null)

        val result = keyGestureEventHandler.handleKeyGestureEvent(event, null)

        testExecutor.flushAll()





        assertThat(result).isTrue()

        assertThat(result).isTrue()

        assertThat(testExecutor.callbacks.size).isEqualTo(1)

        verify(desktopModeWindowDecorViewModel).onSnapResize(

            task.taskId,

            false,

            DesktopModeEventLogger.Companion.InputMethod.KEYBOARD,

            /* fromMenu= */ false

        )

    }

    }





    @Test

    @Test
@@ -248,9 +261,18 @@ class DesktopModeKeyGestureHandlerTest : ShellTestCase() { 
            .setModifierState(KeyEvent.META_META_ON)

            .setModifierState(KeyEvent.META_META_ON)

            .build()

            .build()

        val result = keyGestureEventHandler.handleKeyGestureEvent(event, null)

        val result = keyGestureEventHandler.handleKeyGestureEvent(event, null)

        testExecutor.flushAll()





        assertThat(result).isTrue()

        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

    @Test
@@ -270,9 +292,10 @@ class DesktopModeKeyGestureHandlerTest : ShellTestCase() { 
            .setModifierState(KeyEvent.META_META_ON)

            .setModifierState(KeyEvent.META_META_ON)

            .build()

            .build()

        val result = keyGestureEventHandler.handleKeyGestureEvent(event, null)

        val result = keyGestureEventHandler.handleKeyGestureEvent(event, null)

        testExecutor.flushAll()





        assertThat(result).isTrue()

        assertThat(result).isTrue()

        assertThat(testExecutor.callbacks.size).isEqualTo(1)

        verify(desktopTasksController).minimizeTask(task)

    }

    }





    private fun setUpFreeformTask(

    private fun setUpFreeformTask(