From 5e6240746646dabf353d91e65753861074ae8194 Mon Sep 17 00:00:00 2001 From: josephpv Date: Fri, 12 Apr 2024 11:48:48 +0000 Subject: [PATCH] Add mocks for LockPatternUtils.isSecure() method in setup This change adds mocking for LockPatternUtils.isSecure method in the tests where SecurityFeatureProvider is referred in setup as per the comment in b/323649600#comment7 The tests are passing locally even without this. Bug: 333504640 Test: atest com.android.settings.privatespace Change-Id: I7d9c3a8356dbf25cf09530ffb53712b3ab887160 --- .../privatespace/FaceFingerprintUnlockControllerTest.java | 1 + .../settings/privatespace/PrivateSpaceLockControllerTest.java | 1 + .../android/settings/privatespace/UseOneLockControllerTest.java | 1 + 3 files changed, 3 insertions(+) diff --git a/tests/unit/src/com/android/settings/privatespace/FaceFingerprintUnlockControllerTest.java b/tests/unit/src/com/android/settings/privatespace/FaceFingerprintUnlockControllerTest.java index f6242ef868d..bdeede874fc 100644 --- a/tests/unit/src/com/android/settings/privatespace/FaceFingerprintUnlockControllerTest.java +++ b/tests/unit/src/com/android/settings/privatespace/FaceFingerprintUnlockControllerTest.java @@ -66,6 +66,7 @@ public class FaceFingerprintUnlockControllerTest { final FakeFeatureFactory featureFactory = FakeFeatureFactory.setupForTest(); when(featureFactory.securityFeatureProvider.getLockPatternUtils(mContext)) .thenReturn(mLockPatternUtils); + doReturn(true).when(mLockPatternUtils).isSecure(anyInt()); mFaceFingerprintUnlockController = new FaceFingerprintUnlockController(mContext, mLifecycle); diff --git a/tests/unit/src/com/android/settings/privatespace/PrivateSpaceLockControllerTest.java b/tests/unit/src/com/android/settings/privatespace/PrivateSpaceLockControllerTest.java index c203a3cd72f..08f86182b56 100644 --- a/tests/unit/src/com/android/settings/privatespace/PrivateSpaceLockControllerTest.java +++ b/tests/unit/src/com/android/settings/privatespace/PrivateSpaceLockControllerTest.java @@ -72,6 +72,7 @@ public class PrivateSpaceLockControllerTest { final FakeFeatureFactory featureFactory = FakeFeatureFactory.setupForTest(); when(featureFactory.securityFeatureProvider.getLockPatternUtils(mContext)) .thenReturn(mLockPatternUtils); + doReturn(true).when(mLockPatternUtils).isSecure(anyInt()); mPrivateSpaceLockController = new PrivateSpaceLockController(mContext, mSettingsPreferenceFragment); diff --git a/tests/unit/src/com/android/settings/privatespace/UseOneLockControllerTest.java b/tests/unit/src/com/android/settings/privatespace/UseOneLockControllerTest.java index d029552ee0a..027904e6e64 100644 --- a/tests/unit/src/com/android/settings/privatespace/UseOneLockControllerTest.java +++ b/tests/unit/src/com/android/settings/privatespace/UseOneLockControllerTest.java @@ -68,6 +68,7 @@ public class UseOneLockControllerTest { final FakeFeatureFactory featureFactory = FakeFeatureFactory.setupForTest(); when(featureFactory.securityFeatureProvider.getLockPatternUtils(mContext)) .thenReturn(mLockPatternUtils); + doReturn(true).when(mLockPatternUtils).isSecure(anyInt()); mUseOneLockController = new UseOneLockController(mContext, preferenceKey); }