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

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

Merge "Reformat DesktopModeTransitionObserverTest" into main

parents 88fa663e bb22d9ef
Loading
Loading
Loading
Loading
+393 −405
Original line number Diff line number Diff line
@@ -40,14 +40,14 @@ import com.android.modules.utils.testing.ExtendedMockitoRule
import com.android.wm.shell.common.ShellExecutor
import com.android.wm.shell.desktopmode.DesktopModeEventLogger.Companion.EnterReason
import com.android.wm.shell.desktopmode.DesktopModeEventLogger.Companion.ExitReason
import com.android.wm.shell.desktopmode.DesktopModeTransitionTypes.TRANSIT_EXIT_DESKTOP_MODE_HANDLE_MENU_BUTTON
import com.android.wm.shell.desktopmode.DesktopModeTransitionTypes.TRANSIT_EXIT_DESKTOP_MODE_KEYBOARD_SHORTCUT
import com.android.wm.shell.desktopmode.DesktopModeTransitionTypes.TRANSIT_EXIT_DESKTOP_MODE_TASK_DRAG
import com.android.wm.shell.desktopmode.DesktopModeTransitionTypes.TRANSIT_EXIT_DESKTOP_MODE_UNKNOWN
import com.android.wm.shell.desktopmode.DesktopModeTransitionTypes.TRANSIT_ENTER_DESKTOP_FROM_APP_FROM_OVERVIEW
import com.android.wm.shell.desktopmode.DesktopModeTransitionTypes.TRANSIT_ENTER_DESKTOP_FROM_APP_HANDLE_MENU_BUTTON
import com.android.wm.shell.desktopmode.DesktopModeTransitionTypes.TRANSIT_ENTER_DESKTOP_FROM_KEYBOARD_SHORTCUT
import com.android.wm.shell.desktopmode.DesktopModeTransitionTypes.TRANSIT_ENTER_DESKTOP_FROM_UNKNOWN
import com.android.wm.shell.desktopmode.DesktopModeTransitionTypes.TRANSIT_EXIT_DESKTOP_MODE_HANDLE_MENU_BUTTON
import com.android.wm.shell.desktopmode.DesktopModeTransitionTypes.TRANSIT_EXIT_DESKTOP_MODE_KEYBOARD_SHORTCUT
import com.android.wm.shell.desktopmode.DesktopModeTransitionTypes.TRANSIT_EXIT_DESKTOP_MODE_TASK_DRAG
import com.android.wm.shell.desktopmode.DesktopModeTransitionTypes.TRANSIT_EXIT_DESKTOP_MODE_UNKNOWN
import com.android.wm.shell.shared.DesktopModeStatus
import com.android.wm.shell.sysui.ShellInit
import com.android.wm.shell.transition.TransitionInfoBuilder
@@ -103,15 +103,10 @@ class DesktopModeLoggerTransitionObserverTest {

    transitionObserver =
        DesktopModeLoggerTransitionObserver(
                context,
                mockShellInit,
                transitions,
                desktopModeEventLogger
            )
            context, mockShellInit, transitions, desktopModeEventLogger)
    if (Transitions.ENABLE_SHELL_TRANSITIONS) {
      val initRunnableCaptor = ArgumentCaptor.forClass(Runnable::class.java)
            verify(mockShellInit)
                .addInitCallback(initRunnableCaptor.capture(), same(transitionObserver))
      verify(mockShellInit).addInitCallback(initRunnableCaptor.capture(), same(transitionObserver))
      initRunnableCaptor.value.run()
    } else {
      transitionObserver.onInit()
@@ -322,9 +317,7 @@ class DesktopModeLoggerTransitionObserverTest {
    // window mode changing from FREEFORM to FULLSCREEN
    val change = createChange(TRANSIT_TO_FRONT, createTaskInfo(1, WINDOWING_MODE_FULLSCREEN))
    val transitionInfo =
            TransitionInfoBuilder(TRANSIT_EXIT_DESKTOP_MODE_KEYBOARD_SHORTCUT)
                .addChange(change)
                .build()
        TransitionInfoBuilder(TRANSIT_EXIT_DESKTOP_MODE_KEYBOARD_SHORTCUT).addChange(change).build()
    callOnTransitionReady(transitionInfo)

    verify(desktopModeEventLogger, times(1)).logTaskRemoved(eq(sessionId), any())
@@ -364,9 +357,7 @@ class DesktopModeLoggerTransitionObserverTest {
    // recents transition
    val change = createChange(TRANSIT_TO_BACK, createTaskInfo(1, WINDOWING_MODE_FREEFORM))
    val transitionInfo =
            TransitionInfoBuilder(TRANSIT_TO_FRONT, TRANSIT_FLAG_IS_RECENTS)
                .addChange(change)
                .build()
        TransitionInfoBuilder(TRANSIT_TO_FRONT, TRANSIT_FLAG_IS_RECENTS).addChange(change).build()
    callOnTransitionReady(transitionInfo)

    verify(desktopModeEventLogger, times(1)).logTaskRemoved(eq(sessionId), any())
@@ -405,9 +396,7 @@ class DesktopModeLoggerTransitionObserverTest {
    // recents transition sent freeform window to back
    val change = createChange(TRANSIT_TO_BACK, createTaskInfo(1, WINDOWING_MODE_FREEFORM))
    val transitionInfo1 =
            TransitionInfoBuilder(TRANSIT_TO_FRONT, TRANSIT_FLAG_IS_RECENTS)
                .addChange(change)
                .build()
        TransitionInfoBuilder(TRANSIT_TO_FRONT, TRANSIT_FLAG_IS_RECENTS).addChange(change).build()
    callOnTransitionReady(transitionInfo1)
    verify(desktopModeEventLogger, times(1)).logTaskRemoved(eq(sessionId), any())
    verify(desktopModeEventLogger, times(1))
@@ -476,8 +465,7 @@ class DesktopModeLoggerTransitionObserverTest {
      val change =
          Change(
              WindowContainerToken(mock(IWindowContainerToken::class.java)),
                    mock(SurfaceControl::class.java)
                )
              mock(SurfaceControl::class.java))
      change.mode = mode
      change.taskInfo = taskInfo
      return change