Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8750ab19 authored by Eric Biggers's avatar Eric Biggers
Browse files

LockPatternUtilsTest: don't call the real TrustManagerService 

As LockPatternUtilsTest is a unit test that doesn't otherwise interact
with the real system services, inject a mock TrustManager so that
LockPatternUtilsTest#testSetEnabledTrustAgents doesn't call into the
real TrustManagerService#reportEnabledTrustAgentsChanged.  This was
making this test require the ACCESS_KEYGUARD_SECURE_STORAGE permission.
This fix makes it possible to merge the utiltests version of
LockPatternUtilsTest into the coretests version.

Bug: 321737173
Ignore-AOSP-First: Conflict due to security fix ag/25939141
Test: atest FrameworksUtilTests:LockPatternUtilsTest
Change-Id: I81e25db9acbceefbc6e37352820dc0bd76d61b76
parent 37d64fa5

core/tests/utiltests/src/com/android/internal/util/LockPatternUtilsTest.java

+10 −5
Original line number Diff line number Diff line
@@ -33,10 +33,12 @@ import static org.mockito.Mockito.any; 
import static org.mockito.Mockito.anyInt;

import static org.mockito.Mockito.anyString;

import static org.mockito.Mockito.doNothing;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;



import android.app.trust.TrustManager;

import android.content.ComponentName;

import android.content.Context;

import android.content.ContextWrapper;
@@ -65,7 +67,6 @@ import org.junit.Rule; 
import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.ArgumentCaptor;

import org.mockito.Mockito;



import java.nio.charset.StandardCharsets;

import java.util.List;
@@ -85,7 +86,7 @@ public class LockPatternUtilsTest { 


    private void configureTest(boolean isSecure, boolean isDemoUser, int deviceDemoMode)

            throws Exception {

        mLockSettings = Mockito.mock(ILockSettings.class);

        mLockSettings = mock(ILockSettings.class);

        final Context context = spy(new ContextWrapper(InstrumentationRegistry.getTargetContext()));



        final MockContentResolver cr = new MockContentResolver(context);
@@ -101,9 +102,9 @@ public class LockPatternUtilsTest { 
        when(mLockSettings.hasSecureLockScreen()).thenReturn(true);

        mLockPatternUtils = new LockPatternUtils(context, mLockSettings);



        final UserInfo userInfo = Mockito.mock(UserInfo.class);

        final UserInfo userInfo = mock(UserInfo.class);

        when(userInfo.isDemo()).thenReturn(isDemoUser);

        final UserManager um = Mockito.mock(UserManager.class);

        final UserManager um = mock(UserManager.class);

        when(um.getUserInfo(DEMO_USER_ID)).thenReturn(userInfo);

        when(context.getSystemService(Context.USER_SERVICE)).thenReturn(um);

    }
@@ -310,7 +311,11 @@ public class LockPatternUtilsTest { 


    private ILockSettings createTestLockSettings() {

        final Context context = spy(new ContextWrapper(InstrumentationRegistry.getTargetContext()));

        final ILockSettings ils = Mockito.mock(ILockSettings.class);



        final TrustManager trustManager = mock(TrustManager.class);

        when(context.getSystemService(Context.TRUST_SERVICE)).thenReturn(trustManager);



        final ILockSettings ils = mock(ILockSettings.class);

        mLockPatternUtils = new LockPatternUtils(context, ils);

        return ils;

    }