Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix crash when running UserSwitcherControllerTest

Browse Source 
Previously, test would fail on wembley with the following errors:

 - No service published for: fingerprint

 - No service published for: face

 - java.lang.AssertionError: expected:<1> but was:<0>

Fixes: 191280089
Bug: 194441567
Test: atest SystemUITests:com.android.systemui.statusbar.policy.UserSwitcherControllerTest
Change-Id: I34539a5e9678b308b4d3a03e4593fb9385e7831f
Merged-In: I34539a5e9678b308b4d3a03e4593fb9385e7831f
This commit is contained in:
Peter Kalauskas
2021-06-16 13:40:55 -07:00
parent 7c060b2951
commit f69d25f7f2
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/UserSwitcherControllerTest.kt
View File

@@ -17,10 +17,13 @@
package com.android.systemui.statusbar.policy package com.android.systemui.statusbar.policy
import android.app.IActivityTaskManager import android.app.IActivityTaskManager
import android.content.Context
import android.content.DialogInterface import android.content.DialogInterface
import android.content.Intent import android.content.Intent
import android.content.pm.UserInfo import android.content.pm.UserInfo
import android.graphics.Bitmap import android.graphics.Bitmap
import android.hardware.face.FaceManager
import android.hardware.fingerprint.FingerprintManager
import android.os.Handler import android.os.Handler
import android.os.UserHandle import android.os.UserHandle
import android.os.UserManager import android.os.UserManager
@@ -51,6 +54,7 @@ import org.mockito.ArgumentMatchers.eq
import org.mockito.Mock import org.mockito.Mock
import org.mockito.Mockito.any import org.mockito.Mockito.any
import org.mockito.Mockito.anyString import org.mockito.Mockito.anyString
import org.mockito.Mockito.mock
import org.mockito.Mockito.`when` import org.mockito.Mockito.`when`
import org.mockito.MockitoAnnotations import org.mockito.MockitoAnnotations
@@ -93,6 +97,10 @@ class UserSwitcherControllerTest : SysuiTestCase() {
context.orCreateTestableResources.addOverride( context.orCreateTestableResources.addOverride(
com.android.internal.R.bool.config_guestUserAutoCreated, false) com.android.internal.R.bool.config_guestUserAutoCreated, false)
context.addMockSystemService(Context.FACE_SERVICE, mock(FaceManager::class.java))
context.addMockSystemService(Context.FINGERPRINT_SERVICE,
mock(FingerprintManager::class.java))
`when`(userManager.canAddMoreUsers()).thenReturn(true) `when`(userManager.canAddMoreUsers()).thenReturn(true)
userSwitcherController = UserSwitcherController(context, userSwitcherController = UserSwitcherController(context,
@@ -130,6 +138,7 @@ class UserSwitcherControllerTest : SysuiTestCase() {
`when`(userManager.createGuest(any(), anyString())).thenReturn(guestInfo) `when`(userManager.createGuest(any(), anyString())).thenReturn(guestInfo)
userSwitcherController.onUserListItemClicked(emptyGuestUserRecord) userSwitcherController.onUserListItemClicked(emptyGuestUserRecord)
testableLooper.processAllMessages()
assertEquals(1, uiEventLogger.numLogs()) assertEquals(1, uiEventLogger.numLogs())
assertEquals(QSUserSwitcherEvent.QS_USER_GUEST_ADD.id, uiEventLogger.eventId(0)) assertEquals(QSUserSwitcherEvent.QS_USER_GUEST_ADD.id, uiEventLogger.eventId(0))
} }