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

Commit 0e6ba6a0 authored by Orhan Uysal's avatar Orhan Uysal Committed by Android (Google) Code Review
Browse files

Merge "Generate new task IDs in tests based on current running tasks instead... 

Merge "Generate new task IDs in tests based on current running tasks instead of hardcoding values." into main
parents 88dde6f1 58c8c1e1

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

+3 −3
Original line number Diff line number Diff line
@@ -3425,7 +3425,7 @@ class DesktopTasksControllerTest(flags: FlagsParameterization) : ShellTestCase() 
            (1..MAX_TASK_LIMIT).map { _ ->

                setUpFreeformTask(displayId = DEFAULT_DISPLAY, deskId = deskId)

            }

        val task = createRecentTaskInfo(1001)

        val task = createRecentTaskInfo(freeformTasks.maxOf { it.taskId } + 10)

        whenever(shellTaskOrganizer.getRunningTaskInfo(task.taskId)).thenReturn(null)

        whenever(

                desktopMixedTransitionHandler.startLaunchTransition(
@@ -3457,7 +3457,7 @@ class DesktopTasksControllerTest(flags: FlagsParameterization) : ShellTestCase() 
            (1..MAX_TASK_LIMIT).map { _ ->

                setUpFreeformTask(displayId = DEFAULT_DISPLAY, deskId = deskId)

            }

        val task = createRecentTaskInfo(1001)

        val task = createRecentTaskInfo(freeformTasks.maxOf { it.taskId } + 10)

        whenever(shellTaskOrganizer.getRunningTaskInfo(task.taskId)).thenReturn(null)

        val transition = Binder()

        whenever(
@@ -3490,7 +3490,7 @@ class DesktopTasksControllerTest(flags: FlagsParameterization) : ShellTestCase() 
            (1..MAX_TASK_LIMIT).map { _ ->

                setUpFreeformTask(displayId = DEFAULT_DISPLAY, deskId = deskId)

            }

        val task = createRecentTaskInfo(freeformTasks.last().taskId + 10)

        val task = createRecentTaskInfo(freeformTasks.maxOf { it.taskId } + 10)

        whenever(shellTaskOrganizer.getRunningTaskInfo(task.taskId)).thenReturn(null)

        whenever(

                desktopMixedTransitionHandler.startLaunchTransition(