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

Commit e25a9551 authored by Daniel Akinola's avatar Daniel Akinola
Browse files

Fix LauncherProxyServiceTest 

Test was failing on specific builds due to a HSUM issue. The userId didn't match the calling id in the test, which stopped the expected method from being called. Fix is to just mock the userId to always match the calling userId

Bug: 362719719
Bug: 417734966
Bug: 419057255
Test: LauncherProxyServiceTest
Flag: com.android.systemui.shade_window_goes_around
Change-Id: I5088f6d19a532438c5064367760657da74bc2d9f
parent 9bcb8485

packages/SystemUI/tests/src/com/android/systemui/LauncherProxyServiceTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -178,6 +178,7 @@ class LauncherProxyServiceTest : SysuiTestCase() { 
        sysuiStatePerDisplayRepository.add(Display.DEFAULT_DISPLAY, sysUiState)

        runBlocking { kosmos.displayRepository.apply { addDisplay(0) } }

        fakeHeadlessSystemUserMode.setIsHeadlessSystemUser(false)

        whenever(userTracker.userId).then { Binder.getCallingUserHandle().identifier }

        subject = createLauncherProxyService(context)

    }
@@ -413,7 +414,6 @@ class LauncherProxyServiceTest : SysuiTestCase() { 
    @DisableFlags(Flags.FLAG_SCENE_CONTAINER, Flags.FLAG_KEYGUARD_WM_STATE_REFACTOR)

    fun onStatusBarTouchEvent_withoutSceneFlag_onSameDisplayTouch_handlesInput() =

        kosmos.testScope.runTest {

            whenever(userTracker.userId).thenReturn(Binder.getCallingUserHandle().identifier)

            val shadeDisplayId = 0

            whenever(statusBarShadeDisplayPolicy.displayId)

                .thenReturn(MutableStateFlow(shadeDisplayId))