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

Commit 69d23794 authored by Yuichiro Hanada's avatar Yuichiro Hanada
Browse files

Add assertions to PiP related test cases in DesktopTasksControllerTest 

Transaction is not examined actually before this CL.
This CL adds assertions and also updates the test name according to the
current behavior.

Bug: 396215361
Flag: EXEMPT test only change
Test: WMShellUnitTests
Change-Id: Ifa2cdb6d2146ba3ed7ec9c3e3833094fb5ae7bf1
parent 9a110e09

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

+12 −10
Original line number Diff line number Diff line
@@ -2900,7 +2900,10 @@ class DesktopTasksControllerTest(flags: FlagsParameterization) : ShellTestCase() 
    }



    @Test

    @EnableFlags(FLAG_ENABLE_DESKTOP_WINDOWING_PIP)

    @EnableFlags(

        FLAG_ENABLE_DESKTOP_WINDOWING_PIP,

        Flags.FLAG_ENABLE_DESKTOP_WALLPAPER_ACTIVITY_FOR_SYSTEM_USER,

    )

    fun onDesktopWindowClose_minimizedPipNotPresent_exitDesktop() {

        val freeformTask = setUpFreeformTask()

        val pipTask = setUpPipTask(autoEnterEnabled = true)
@@ -2915,10 +2918,8 @@ class DesktopTasksControllerTest(flags: FlagsParameterization) : ShellTestCase() 
        val wct = WindowContainerTransaction()

        controller.onDesktopWindowClose(wct, displayId = DEFAULT_DISPLAY, freeformTask)



        // Remove wallpaper operation

        wct.hierarchyOps.any { hop ->

            hop.type == HIERARCHY_OP_TYPE_REMOVE_TASK && hop.container == wallpaperToken.asBinder()

        }

        // Moves wallpaper activity to back when leaving desktop

        wct.assertReorder(wallpaperToken, toTop = false)

    }



    @Test
@@ -4270,7 +4271,10 @@ class DesktopTasksControllerTest(flags: FlagsParameterization) : ShellTestCase() 
    }



    @Test

    @EnableFlags(FLAG_ENABLE_DESKTOP_WINDOWING_PIP)

    @EnableFlags(

        FLAG_ENABLE_DESKTOP_WINDOWING_PIP,

        Flags.FLAG_ENABLE_DESKTOP_WALLPAPER_ACTIVITY_FOR_SYSTEM_USER,

    )

    fun moveFocusedTaskToFullscreen_minimizedPipPresent_removeWallpaperActivity() {

        val freeformTask = setUpFreeformTask()

        val pipTask = setUpPipTask(autoEnterEnabled = true)
@@ -4288,10 +4292,8 @@ class DesktopTasksControllerTest(flags: FlagsParameterization) : ShellTestCase() 
        val taskChange = assertNotNull(wct.changes[freeformTask.token.asBinder()])

        assertThat(taskChange.windowingMode)

            .isEqualTo(WINDOWING_MODE_UNDEFINED) // inherited FULLSCREEN

        // Remove wallpaper operation

        wct.hierarchyOps.any { hop ->

            hop.type == HIERARCHY_OP_TYPE_REMOVE_TASK && hop.container == wallpaperToken.asBinder()

        }

        // Moves wallpaper activity to back when leaving desktop

        wct.assertReorder(wallpaperToken, toTop = false)

    }



    @Test