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

Commit ef9bc1e3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Move all FakeBroadcastDispatcher uses to #sendIntentToMatching." into... 

Merge "Move all FakeBroadcastDispatcher uses to #sendIntentToMatching." into udc-qpr-dev am: bedae25d

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



Change-Id: If8accbdc17631cd0e657cf5a1b388c0f2df94c51
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents efb48537 bedae25d

packages/SystemUI/tests/src/com/android/systemui/demomode/DemoModeControllerTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ class DemoModeControllerTest : SysuiTestCase() { 
        intent.putExtra("command", command)

        args.forEach { arg -> intent.putExtra(arg.key, arg.value) }



        fakeBroadcastDispatcher.registeredReceivers.forEach { it.onReceive(context, intent) }

        fakeBroadcastDispatcher.sendIntentToMatchingReceiversOnly(context, intent)

    }



    companion object {

packages/SystemUI/tests/src/com/android/systemui/keyguard/data/quickaffordance/KeyguardQuickAffordanceLocalUserSelectionManagerTest.kt

+11 −6
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import androidx.test.filters.SmallTest 
import com.android.systemui.R

import com.android.systemui.RoboPilotTest

import com.android.systemui.SysuiTestCase

import com.android.systemui.backup.BackupHelper

import com.android.systemui.settings.FakeUserTracker

import com.android.systemui.settings.UserFileManager

import com.android.systemui.util.FakeSharedPreferences
@@ -360,7 +361,10 @@ class KeyguardQuickAffordanceLocalUserSelectionManagerTest : SysuiTestCase() { 
            }

        clearInvocations(userFileManager)



        fakeBroadcastDispatcher.registeredReceivers.firstOrNull()?.onReceive(context, Intent())

        fakeBroadcastDispatcher.sendIntentToMatchingReceiversOnly(

            context,

            Intent(BackupHelper.ACTION_RESTORE_FINISHED),

        )



        verify(userFileManager, atLeastOnce()).getSharedPreferences(anyString(), anyInt(), anyInt())

        job.cancel()
@@ -374,7 +378,8 @@ class KeyguardQuickAffordanceLocalUserSelectionManagerTest : SysuiTestCase() { 
            arrayOf("leftTest:testShortcut1", "rightTest:testShortcut2")

        )



        assertThat(underTest.getSelections()).isEqualTo(

        assertThat(underTest.getSelections())

            .isEqualTo(

                mapOf(

                    "leftTest" to listOf("testShortcut1"),

                    "rightTest" to listOf("testShortcut2"),

packages/SystemUI/tests/src/com/android/systemui/keyguard/data/repository/BiometricSettingsRepositoryTest.kt

+4 −6
Original line number Diff line number Diff line
@@ -461,13 +461,11 @@ class BiometricSettingsRepositoryTest : SysuiTestCase() { 
    }



    private fun broadcastDPMStateChange() {

        fakeBroadcastDispatcher.registeredReceivers.forEach { receiver ->

            receiver.onReceive(

        fakeBroadcastDispatcher.sendIntentToMatchingReceiversOnly(

            context,

                Intent(DevicePolicyManager.ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED)

            Intent(DevicePolicyManager.ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED),

        )

    }

    }



    companion object {

        private const val PRIMARY_USER_ID = 0

packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardLongPressInteractorTest.kt

+4 −3
Original line number Diff line number Diff line
@@ -194,9 +194,10 @@ class KeyguardLongPressInteractorTest : SysuiTestCase() { 
            underTest.onLongPress()

            assertThat(isMenuVisible).isTrue()



            fakeBroadcastDispatcher.registeredReceivers.forEach { broadcastReceiver ->

                broadcastReceiver.onReceive(context, Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS))

            }

            fakeBroadcastDispatcher.sendIntentToMatchingReceiversOnly(

                context,

                Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS),

            )



            assertThat(isMenuVisible).isFalse()

        }

packages/SystemUI/tests/src/com/android/systemui/user/domain/interactor/UserInteractorTest.kt

+18 −26
Original line number Diff line number Diff line
@@ -633,13 +633,11 @@ class UserInteractorTest : SysuiTestCase() { 


            userRepository.setSelectedUserInfo(userInfos[1])

            runCurrent()

            fakeBroadcastDispatcher.registeredReceivers.forEach {

                it.onReceive(

            fakeBroadcastDispatcher.sendIntentToMatchingReceiversOnly(

                context,

                Intent(Intent.ACTION_USER_SWITCHED)

                    .putExtra(Intent.EXTRA_USER_HANDLE, userInfos[1].id),

            )

            }

            runCurrent()



            verify(callback1, atLeastOnce()).onUserStateChanged()
@@ -656,12 +654,10 @@ class UserInteractorTest : SysuiTestCase() { 
            userRepository.setSelectedUserInfo(userInfos[0])

            val refreshUsersCallCount = userRepository.refreshUsersCallCount



            fakeBroadcastDispatcher.registeredReceivers.forEach {

                it.onReceive(

            fakeBroadcastDispatcher.sendIntentToMatchingReceiversOnly(

                context,

                Intent(Intent.ACTION_USER_INFO_CHANGED),

            )

            }



            runCurrent()
@@ -676,13 +672,11 @@ class UserInteractorTest : SysuiTestCase() { 
            userRepository.setSelectedUserInfo(userInfos[0])

            val refreshUsersCallCount = userRepository.refreshUsersCallCount



            fakeBroadcastDispatcher.registeredReceivers.forEach {

                it.onReceive(

            fakeBroadcastDispatcher.sendIntentToMatchingReceiversOnly(

                context,

                Intent(Intent.ACTION_USER_UNLOCKED)

                    .putExtra(Intent.EXTRA_USER_HANDLE, UserHandle.USER_SYSTEM),

            )

            }

            runCurrent()



            assertThat(userRepository.refreshUsersCallCount).isEqualTo(refreshUsersCallCount + 1)
@@ -696,12 +690,10 @@ class UserInteractorTest : SysuiTestCase() { 
            userRepository.setSelectedUserInfo(userInfos[0])

            val refreshUsersCallCount = userRepository.refreshUsersCallCount



            fakeBroadcastDispatcher.registeredReceivers.forEach {

                it.onReceive(

            fakeBroadcastDispatcher.sendIntentToMatchingReceiversOnly(

                context,

                Intent(Intent.ACTION_USER_UNLOCKED).putExtra(Intent.EXTRA_USER_HANDLE, 1337),

            )

            }



            assertThat(userRepository.refreshUsersCallCount).isEqualTo(refreshUsersCallCount)

        }