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

Fix LockSettingsServiceTest

Browse Source 
Fix mocking of FingerprintManager and FaceManager methods.

Bug: 184664830
Test: atest com.android.server.locksettings
Change-Id: I97c33f3b21ac16d2bb92e1658c222e4d0fd1970e
This commit is contained in:
Rubin Xu
2021-04-15 22:08:53 +01:00
parent 39d923d7f6
commit cba2ce26c2
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
services/tests/servicestests/src/com/android/server/locksettings/BaseLockSettingsServiceTests.java
View File

@@ -36,9 +36,7 @@ import android.content.ComponentName;
import android.content.pm.PackageManager;
import android.content.pm.UserInfo;
import android.hardware.authsecret.V1_0.IAuthSecret;
import android.hardware.face.Face;
import android.hardware.face.FaceManager;
import android.hardware.fingerprint.Fingerprint;
import android.hardware.fingerprint.FingerprintManager;
import android.os.FileUtils;
import android.os.IProgressListener;
@@ -261,13 +259,12 @@ public abstract class BaseLockSettingsServiceTests {
doAnswer(new Answer<Void>() {
@Override
public Void answer(InvocationOnMock invocation) throws Throwable {
Fingerprint fp = (Fingerprint) invocation.getArguments()[0];
FingerprintManager.RemovalCallback callback =
(FingerprintManager.RemovalCallback) invocation.getArguments()[2];
callback.onRemovalSucceeded(fp, 0);
(FingerprintManager.RemovalCallback) invocation.getArguments()[1];
callback.onRemovalSucceeded(null, 0);
return null;
}
}).when(mFingerprintManager).remove(any(), eq(userId), any());
}).when(mFingerprintManager).removeAll(eq(userId), any());
// Hardware must be detected and templates must be enrolled
@@ -277,13 +274,12 @@ public abstract class BaseLockSettingsServiceTests {
doAnswer(new Answer<Void>() {
@Override
public Void answer(InvocationOnMock invocation) throws Throwable {
Face face = (Face) invocation.getArguments()[0];
FaceManager.RemovalCallback callback =
(FaceManager.RemovalCallback) invocation.getArguments()[2];
callback.onRemovalSucceeded(face, 0);
(FaceManager.RemovalCallback) invocation.getArguments()[1];
callback.onRemovalSucceeded(null, 0);
return null;
}
}).when(mFaceManager).remove(any(), eq(userId), any());
}).when(mFaceManager).removeAll(eq(userId), any());
}
@After