From 80bec7adef9cdcf93dde7cc0aaa81f2534c12d5c Mon Sep 17 00:00:00 2001 From: Diya Bera Date: Thu, 11 Jul 2024 21:13:01 +0000 Subject: [PATCH] Update tests for mandatory biometrics Flag: android.hardware.biometrics.Flag.MANDATORY_BIOMETRICS Fixes: 352036009 Test: atest MainClearTest CombinedBiometricProfileSettingsTest Change-Id: If778dcb138b82814621186ddd7f89d77dc4a9b18 --- .../robotests/src/com/android/settings/MainClearTest.java | 6 +++++- .../combination/CombinedBiometricProfileSettingsTest.java | 8 ++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/tests/robotests/src/com/android/settings/MainClearTest.java b/tests/robotests/src/com/android/settings/MainClearTest.java index 1136d946746..187fce113f9 100644 --- a/tests/robotests/src/com/android/settings/MainClearTest.java +++ b/tests/robotests/src/com/android/settings/MainClearTest.java @@ -138,7 +138,11 @@ public class MainClearTest { // Make scrollView only have one child when(mScrollView.getChildAt(0)).thenReturn(mLinearLayout); when(mScrollView.getChildCount()).thenReturn(1); - doReturn(mActivity).when(mMainClear).getActivity(); + doReturn(mMockActivity).when(mMainClear).getActivity(); + when(mMockActivity.getSystemService(BiometricManager.class)).thenReturn(mBiometricManager); + when(mBiometricManager.canAuthenticate( + BiometricManager.Authenticators.MANDATORY_BIOMETRICS)) + .thenReturn(BiometricManager.BIOMETRIC_ERROR_HW_UNAVAILABLE); } @After diff --git a/tests/robotests/src/com/android/settings/biometrics/combination/CombinedBiometricProfileSettingsTest.java b/tests/robotests/src/com/android/settings/biometrics/combination/CombinedBiometricProfileSettingsTest.java index a0ef57f3c77..8593860e5aa 100644 --- a/tests/robotests/src/com/android/settings/biometrics/combination/CombinedBiometricProfileSettingsTest.java +++ b/tests/robotests/src/com/android/settings/biometrics/combination/CombinedBiometricProfileSettingsTest.java @@ -31,9 +31,11 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; import android.content.Context; import android.content.Intent; +import android.hardware.biometrics.BiometricManager; import android.hardware.face.FaceManager; import android.hardware.fingerprint.FingerprintManager; import android.os.Bundle; @@ -102,6 +104,8 @@ public class CombinedBiometricProfileSettingsTest { private FaceStatusPreferenceController mFaceStatusPreferenceController; @Mock private FaceManager mFaceManager; + @Mock + private BiometricManager mBiometricManager; @Before public void setUp() { @@ -114,6 +118,10 @@ public class CombinedBiometricProfileSettingsTest { mContext = spy(ApplicationProvider.getApplicationContext()); mFragment = spy(new TestCombinedBiometricProfileSettings(mContext)); doReturn(mActivity).when(mFragment).getActivity(); + doReturn(mBiometricManager).when(mActivity).getSystemService(BiometricManager.class); + when(mBiometricManager.canAuthenticate( + BiometricManager.Authenticators.MANDATORY_BIOMETRICS)) + .thenReturn(BiometricManager.BIOMETRIC_ERROR_HW_UNAVAILABLE); ReflectionHelpers.setField(mFragment, "mDashboardFeatureProvider", FakeFeatureFactory.setupForTest().dashboardFeatureProvider);