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

Commit 46d29c50 authored by Kazuki Takise's avatar Kazuki Takise
Browse files

Add unit tests for RootTaskDesksOrganizer#childLeashes 

Flag: com.android.window.flags.enable_multiple_desktops_backend
Bug: 416126996
Test: atest RootTaskDesksOrganizerTest
Change-Id: Ib22218fe2b504c9b057f7fad25293b1a78b66045
parent af3aec1e

libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/multidesks/RootTaskDesksOrganizer.kt

+1 −1
Original line number Original line Diff line number Diff line
@@ -64,7 +64,7 @@ class RootTaskDesksOrganizer( 
    @VisibleForTesting

    @VisibleForTesting

    val deskMinimizationRootsByDeskId: MutableMap<Int, DeskMinimizationRoot> = mutableMapOf()

    val deskMinimizationRootsByDeskId: MutableMap<Int, DeskMinimizationRoot> = mutableMapOf()

    private val removeDeskRootRequests = mutableSetOf<Int>()

    private val removeDeskRootRequests = mutableSetOf<Int>()

    private val childLeashes = SparseArray<SurfaceControl>()

    @VisibleForTesting val childLeashes = SparseArray<SurfaceControl>()

    private var onTaskInfoChangedListener: ((RunningTaskInfo) -> Unit)? = null

    private var onTaskInfoChangedListener: ((RunningTaskInfo) -> Unit)? = null





    init {

    init {

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

+12 −0
Original line number Original line Diff line number Diff line
@@ -278,6 +278,13 @@ class RootTaskDesksOrganizerTest : ShellTestCase() { 
            )

            )

    }

    }





    @Test

    fun testCreateDesk_notAddedAsChildLeash() = runTest {

        val desk = createDeskSuspending()

        assertThat(organizer.childLeashes.contains(desk.deskRoot.taskInfo.taskId)).isFalse()

        assertThat(organizer.childLeashes.contains(desk.minimizationRoot.taskInfo.taskId)).isFalse()

    }



    @Test

    @Test

    fun testCreateMinimizationRoot_marksHidden() = runTest {

    fun testCreateMinimizationRoot_marksHidden() = runTest {

        val desk = createDeskSuspending()

        val desk = createDeskSuspending()
@@ -348,6 +355,7 @@ class RootTaskDesksOrganizerTest : ShellTestCase() { 
        organizer.onTaskAppeared(child, SurfaceControl())

        organizer.onTaskAppeared(child, SurfaceControl())





        assertThat(desk.deskRoot.children).contains(child.taskId)

        assertThat(desk.deskRoot.children).contains(child.taskId)

        assertThat(organizer.childLeashes.contains(child.taskId)).isTrue()

    }

    }





    @Test

    @Test
@@ -358,6 +366,7 @@ class RootTaskDesksOrganizerTest : ShellTestCase() { 
        organizer.onTaskAppeared(child, SurfaceControl())

        organizer.onTaskAppeared(child, SurfaceControl())





        assertThat(desk.minimizationRoot.children).contains(child.taskId)

        assertThat(desk.minimizationRoot.children).contains(child.taskId)

        assertThat(organizer.childLeashes.contains(child.taskId)).isTrue()

    }

    }





    @Test

    @Test
@@ -371,6 +380,7 @@ class RootTaskDesksOrganizerTest : ShellTestCase() { 




        assertThat(desk.deskRoot.children).doesNotContain(child.taskId)

        assertThat(desk.deskRoot.children).doesNotContain(child.taskId)

        assertThat(desk.minimizationRoot.children).contains(child.taskId)

        assertThat(desk.minimizationRoot.children).contains(child.taskId)

        assertThat(organizer.childLeashes.contains(child.taskId)).isTrue()

    }

    }





    @Test

    @Test
@@ -382,6 +392,7 @@ class RootTaskDesksOrganizerTest : ShellTestCase() { 
        organizer.onTaskVanished(child)

        organizer.onTaskVanished(child)





        assertThat(desk.deskRoot.children).doesNotContain(child.taskId)

        assertThat(desk.deskRoot.children).doesNotContain(child.taskId)

        assertThat(organizer.childLeashes.contains(child.taskId)).isFalse()

    }

    }





    @Test

    @Test
@@ -393,6 +404,7 @@ class RootTaskDesksOrganizerTest : ShellTestCase() { 
        organizer.onTaskVanished(child)

        organizer.onTaskVanished(child)





        assertThat(desk.minimizationRoot.children).doesNotContain(child.taskId)

        assertThat(desk.minimizationRoot.children).doesNotContain(child.taskId)

        assertThat(organizer.childLeashes.contains(child.taskId)).isFalse()

    }

    }





    @Test

    @Test