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

Commit d0819f20 authored by Mady Mellor's avatar Mady Mellor Committed by Automerger Merge Worker
Browse files

Merge "Fix BubbleDataRepositoryTest" into udc-qpr-dev am: 5d4c52c0 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24227395



Change-Id: I9b7fa6024486a173cfb3187aadec2f6773ceae7c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 400bd345 5d4c52c0

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleDataRepository.kt

+4 −3
Original line number Diff line number Diff line
@@ -103,7 +103,8 @@ class BubbleDataRepository( 
     * Removes all entities that don't have a user in the activeUsers list, if any entities were

     * removed it persists the new list to disk.

     */

    private fun filterForActiveUsersAndPersist(

    @VisibleForTesting

    fun filterForActiveUsersAndPersist(

            activeUsers: List<Int>,

            entitiesByUser: SparseArray<List<BubbleEntity>>

    ): SparseArray<List<BubbleEntity>> {
@@ -167,7 +168,8 @@ class BubbleDataRepository( 
     * Job C resumes and reaches yield() and is then cancelled

     * Job D resumes and performs another blocking I/O

     */

    private fun persistToDisk(

    @VisibleForTesting

    fun persistToDisk(

            entitiesByUser: SparseArray<List<BubbleEntity>> = volatileRepository.bubbles

    ) {

        val prev = job
@@ -188,7 +190,6 @@ class BubbleDataRepository( 
     *           bubbles.

     */

    @SuppressLint("WrongConstant")

    @VisibleForTesting

    fun loadBubbles(

            userId: Int,

            currentUsers: List<Int>,

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/bubbles/BubbleDataRepositoryTest.kt

+58 −44
Original line number Diff line number Diff line
@@ -18,18 +18,22 @@ package com.android.wm.shell.bubbles 


import android.app.ActivityTaskManager

import android.content.pm.LauncherApps

import android.content.pm.ShortcutInfo

import android.os.Handler

import android.os.Looper

import android.util.SparseArray

import com.android.wm.shell.ShellTestCase

import com.android.wm.shell.bubbles.storage.BubbleEntity

import com.android.wm.shell.bubbles.storage.BubblePersistentRepository

import com.android.wm.shell.common.ShellExecutor

import com.android.wm.shell.common.HandlerExecutor

import com.google.common.truth.Truth.assertThat

import org.junit.After

import org.junit.Before

import org.junit.Test

import org.mockito.Mockito

import org.mockito.Mockito.mock

import org.mockito.Mockito.never

import org.mockito.Mockito.spy

import org.mockito.Mockito.verify



class BubbleDataRepositoryTest : ShellTestCase() {
@@ -118,7 +122,8 @@ class BubbleDataRepositoryTest : ShellTestCase() { 
        )

    )



    private val mainExecutor = mock(ShellExecutor::class.java)

    private val testHandler = Handler(Looper.getMainLooper())

    private val mainExecutor = HandlerExecutor(testHandler)

    private val launcherApps = mock(LauncherApps::class.java)



    private val persistedBubbles = SparseArray<List<BubbleEntity>>()
@@ -128,13 +133,11 @@ class BubbleDataRepositoryTest : ShellTestCase() { 


    @Before

    fun setup() {

        persistentRepository = spy(BubblePersistentRepository(mContext))

        dataRepository = BubbleDataRepository(launcherApps, mainExecutor, persistentRepository)

        persistentRepository = BubblePersistentRepository(mContext)

        dataRepository = spy(BubbleDataRepository(launcherApps, mainExecutor, persistentRepository))



        // Add the bubbles to the persistent repository

        persistedBubbles.put(0, user0BubbleEntities)

        persistedBubbles.put(1, user1BubbleEntities)

        persistentRepository.persistsToDisk(persistedBubbles)

    }



    @After
@@ -144,47 +147,58 @@ class BubbleDataRepositoryTest : ShellTestCase() { 
    }



    @Test

    fun testLoadBubbles_invalidParent() {

        val activeUserIds = listOf(10, 1, 12) // Missing user 0 in persistedBubbles

        dataRepository.loadBubbles(1, activeUserIds) {

            // Verify that user 0 has been removed from the persisted list

            val entitiesByUser = persistentRepository.readFromDisk()

            assertThat(entitiesByUser.get(0)).isNull()

    fun testFilterForActiveUsersAndPersist_allValid() {

        // Matches all the users in user0BubbleEntities & user1BubbleEntities

        val activeUserIds = listOf(0, 10, 1, 12)



        val validEntitiesByUser = dataRepository.filterForActiveUsersAndPersist(

            activeUserIds, persistedBubbles)



        // No invalid users, so no changes

        assertThat(persistedBubbles).isEqualTo(validEntitiesByUser)



        // No invalid users, so no persist to disk happened

        verify(dataRepository, never()).persistToDisk(

            any(SparseArray<List<BubbleEntity>>()::class.java))

    }



    @Test

    fun testFilterForActiveUsersAndPersist_invalidParent() {

        // When we start, we do have user 0 bubbles.

        assertThat(persistedBubbles.get(0)).isNotEmpty()



        val activeUserIds = listOf(10, 1, 12) // Missing user 0

        val validEntitiesByUser = dataRepository.filterForActiveUsersAndPersist(

            activeUserIds, persistedBubbles)



        // We no longer have any user 0 bubbles.

        assertThat(validEntitiesByUser.get(0)).isNull()

        // User 1 bubbles should be the same.

        assertThat(validEntitiesByUser.get(1)).isEqualTo(user1BubbleEntities)



        // Verify that persist to disk happened with the new valid entities list.

        verify(dataRepository).persistToDisk(validEntitiesByUser)

    }



    @Test

    fun testLoadBubbles_invalidChild() {

    fun testFilterForActiveUsersAndPersist_invalidChild() {

        // Build a list to compare against (remove all user 12 bubbles)

        val (user1EntitiesWithUser12, user1EntitiesWithoutUser12) =

            user1BubbleEntities.partition { it.userId == 12 }



        // Verify we start with user 12 bubbles

        assertThat(persistedBubbles.get(1).containsAll(user1EntitiesWithUser12)).isTrue()



        val activeUserIds = listOf(0, 10, 1) // Missing user 1's child user 12

        dataRepository.loadBubbles(1, activeUserIds) {

            // Build a list to compare against

            val user1BubblesWithoutUser12 = mutableListOf<Bubble>()

            val user1EntitiesWithoutUser12 = mutableListOf<BubbleEntity>()

            for (entity in user1BubbleEntities) {

                if (entity.userId != 12) {

                    user1BubblesWithoutUser12.add(entity.toBubble())

                    user1EntitiesWithoutUser12.add(entity)

                }

            }

        val validEntitiesByUser = dataRepository.filterForActiveUsersAndPersist(

            activeUserIds, persistedBubbles)



            // Verify that user 12 has been removed from the persisted list

            val entitiesByUser = persistentRepository.readFromDisk()

            assertThat(entitiesByUser.get(1)).isEqualTo(user1EntitiesWithoutUser12)

        }

    }

        // We no longer have any user 12 bubbles.

        assertThat(validEntitiesByUser.get(1)).isEqualTo(user1EntitiesWithoutUser12)



    private fun BubbleEntity.toBubble(): Bubble {

        return Bubble(

            key,

            mock(ShortcutInfo::class.java),

            desiredHeight,

            desiredHeightResId,

            title,

            taskId,

            locus,

            isDismissable,

            mainExecutor,

            mock(Bubbles.BubbleMetadataFlagListener::class.java)

        )

        // Verify that persist to disk happened with the new valid entities list.

        verify(dataRepository).persistToDisk(validEntitiesByUser)

    }



    fun <T> any(type: Class<T>): T = Mockito.any<T>(type)

}
 
 No newline at end of file