From cba2ce26c249ce13a208866feaa998fc3bb0bb86 Mon Sep 17 00:00:00 2001 From: Rubin Xu Date: Thu, 15 Apr 2021 22:08:53 +0100 Subject: [PATCH] Fix LockSettingsServiceTest Fix mocking of FingerprintManager and FaceManager methods. Bug: 184664830 Test: atest com.android.server.locksettings Change-Id: I97c33f3b21ac16d2bb92e1658c222e4d0fd1970e --- .../BaseLockSettingsServiceTests.java | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/services/tests/servicestests/src/com/android/server/locksettings/BaseLockSettingsServiceTests.java b/services/tests/servicestests/src/com/android/server/locksettings/BaseLockSettingsServiceTests.java index 679d6900e47b2..d62f83c005fb7 100644 --- a/services/tests/servicestests/src/com/android/server/locksettings/BaseLockSettingsServiceTests.java +++ b/services/tests/servicestests/src/com/android/server/locksettings/BaseLockSettingsServiceTests.java @@ -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() { @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() { @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