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

Commit 0dbf959c authored by phweiss's avatar phweiss Committed by Philipp Weiß
Browse files

Fix and add unittests for SecurityController 

testCaCertLoader was flaky because a background task started in
its constructor sometimes finished before the callback could be registered.
With this change, the callback is registered in the constructor.

Test: runtest --path frameworks/base/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/SecurityControllerTest.java
Bug: 37535489
Bug: 38045871

Change-Id: I4f5de1e142cb6e892132d804658c9b89e558144f
parent f685344b

packages/SystemUI/src/com/android/systemui/statusbar/policy/SecurityControllerImpl.java

+6 −0
Original line number Diff line number Diff line
@@ -90,6 +90,10 @@ public class SecurityControllerImpl extends CurrentUserTracker implements Securi 
    private ArrayMap<Integer, Boolean> mHasCACerts = new ArrayMap<Integer, Boolean>();



    public SecurityControllerImpl(Context context) {

        this(context, null);

    }



    public SecurityControllerImpl(Context context, SecurityControllerCallback callback) {

        super(context);

        mContext = context;

        mDevicePolicyManager = (DevicePolicyManager)
@@ -102,6 +106,8 @@ public class SecurityControllerImpl extends CurrentUserTracker implements Securi 
        mUserManager = (UserManager)

                context.getSystemService(Context.USER_SERVICE);



        addCallback(callback);



        IntentFilter filter = new IntentFilter();

        filter.addAction(KeyChain.ACTION_TRUST_STORE_CHANGED);

        context.registerReceiverAsUser(mBroadcastReceiver, UserHandle.ALL, filter, null,

packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/SecurityControllerTest.java

+42 −10
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.systemui.statusbar.policy; 
import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertFalse;

import static org.junit.Assert.assertTrue;

import static org.mockito.Matchers.anyInt;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.when;

import static org.mockito.Mockito.doThrow;
@@ -29,7 +30,9 @@ import android.content.ComponentName; 
import android.content.Context;

import android.content.Intent;

import android.content.pm.StringParceledListSlice;

import android.content.pm.UserInfo;

import android.net.ConnectivityManager;

import android.os.UserManager;

import android.security.IKeyChainService;

import android.support.test.runner.AndroidJUnit4;

import android.test.suitebuilder.annotation.SmallTest;
@@ -55,6 +58,7 @@ import org.junit.runner.RunWith; 
public class SecurityControllerTest extends SysuiTestCase implements SecurityControllerCallback {

    private final DevicePolicyManager mDevicePolicyManager = mock(DevicePolicyManager.class);

    private final IKeyChainService.Stub mKeyChainService = mock(IKeyChainService.Stub.class);

    private final UserManager mUserManager = mock(UserManager.class);

    private SecurityControllerImpl mSecurityController;

    private CountDownLatch mStateChangedLatch;
@@ -67,12 +71,15 @@ public class SecurityControllerTest extends SysuiTestCase implements SecurityCon 
    @Before

    public void setUp() throws Exception {

        mContext.addMockSystemService(Context.DEVICE_POLICY_SERVICE, mDevicePolicyManager);

        mContext.addMockSystemService(Context.USER_SERVICE, mUserManager);

        mContext.addMockSystemService(Context.CONNECTIVITY_SERVICE, mock(ConnectivityManager.class));



        Intent intent = new Intent(IKeyChainService.class.getName());

        ComponentName comp = intent.resolveSystemService(mContext.getPackageManager(), 0);

        mContext.addMockService(comp, mKeyChainService);



        when(mUserManager.getUserInfo(anyInt())).thenReturn(new UserInfo());



        when(mKeyChainService.getUserCaAliases())

                .thenReturn(new StringParceledListSlice(new ArrayList<String>()));

        // Without this line, mKeyChainService gets wrapped in a proxy when Stub.asInterface() is
@@ -80,12 +87,10 @@ public class SecurityControllerTest extends SysuiTestCase implements SecurityCon 
        when(mKeyChainService.queryLocalInterface("android.security.IKeyChainService"))

                .thenReturn(mKeyChainService);



        mSecurityController = new SecurityControllerImpl(mContext);



        // Wait for one or two state changes from the CACertLoader(s) in the constructor of

        // mSecurityController

        mStateChangedLatch = new CountDownLatch(mSecurityController.hasWorkProfile() ? 2 : 1);

        mSecurityController.addCallback(this);

        // Wait for callbacks from 1) the CACertLoader and 2) the onUserSwitched() function in the

        // constructor of mSecurityController

        mStateChangedLatch = new CountDownLatch(2);

        mSecurityController = new SecurityControllerImpl(mContext, this);

    }



    @After
@@ -109,13 +114,40 @@ public class SecurityControllerTest extends SysuiTestCase implements SecurityCon 
    }



    @Test

    @Ignore("Flaky")

    public void testCaCertLoader() throws Exception {

    public void testWorkAccount() throws Exception {

        // Wait for the callbacks from setUp()

        assertTrue(mStateChangedLatch.await(1, TimeUnit.SECONDS));

        assertFalse(mSecurityController.hasCACertInCurrentUser());



        final int PRIMARY_USER_ID = 0;

        final int MANAGED_USER_ID = 1;

        List<UserInfo> profiles = Arrays.asList(new UserInfo(PRIMARY_USER_ID, "Primary",

                                                             UserInfo.FLAG_PRIMARY),

                                                new UserInfo(MANAGED_USER_ID, "Working",

                                                             UserInfo.FLAG_MANAGED_PROFILE));

        when(mUserManager.getProfiles(anyInt())).thenReturn(profiles);

        assertTrue(mSecurityController.hasWorkProfile());

        assertFalse(mSecurityController.hasCACertInWorkProfile());



        mStateChangedLatch = new CountDownLatch(1);



        when(mKeyChainService.getUserCaAliases())

                .thenReturn(new StringParceledListSlice(Arrays.asList("One CA Alias")));



        mSecurityController.new CACertLoader()

                           .execute(MANAGED_USER_ID);



        assertTrue(mStateChangedLatch.await(3, TimeUnit.SECONDS));

        assertTrue(mSecurityController.hasCACertInWorkProfile());

    }



    @Test

    public void testCaCertLoader() throws Exception {

        // Wait for the callbacks from setUp()

        assertTrue(mStateChangedLatch.await(1, TimeUnit.SECONDS));

        assertFalse(mSecurityController.hasCACertInCurrentUser());



        // With a CA cert



        mStateChangedLatch = new CountDownLatch(1);



        when(mKeyChainService.getUserCaAliases())
@@ -138,7 +170,7 @@ public class SecurityControllerTest extends SysuiTestCase implements SecurityCon 
        mSecurityController.new CACertLoader()

                           .execute(0);



        assertFalse(mStateChangedLatch.await(3, TimeUnit.SECONDS));

        assertFalse(mStateChangedLatch.await(1, TimeUnit.SECONDS));

        assertTrue(mSecurityController.hasCACertInCurrentUser());

        // The retry takes 30s

        //assertTrue(mStateChangedLatch.await(31, TimeUnit.SECONDS));