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

Commit d084ca5f authored by Michal Karpinski's avatar Michal Karpinski
Browse files

Fix test DevicePolicyManagerTest#testSetRequiredStrongAuthTimeout_DeviceOwner 

1) Started returning the default value for getLong() on SystemProperties mock
2) Added a test that the minimum timeout cannot be changed using a system
   property on non-debuggable builds
3) Added new within range test for completeness.
4) Started using TimeUnit instead of ms constants.

Test: runtest --path frameworks/base/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java
Bug: 34317979
Change-Id: I0409451ae39e74ec3d96a098042302291ec3408f
parent 606c2a23

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+3 −2
Original line number Diff line number Diff line
@@ -191,6 +191,7 @@ import java.util.Date; 
import java.util.List;

import java.util.Map.Entry;

import java.util.Set;

import java.util.concurrent.TimeUnit;

import java.util.concurrent.atomic.AtomicBoolean;



/**
@@ -235,7 +236,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 


    private static final int REQUEST_EXPIRE_PASSWORD = 5571;



    private static final long MS_PER_DAY = 86400 * 1000;

    private static final long MS_PER_DAY = TimeUnit.DAYS.toMillis(1);



    private static final long EXPIRATION_GRACE_PERIOD_MS = 5 * MS_PER_DAY; // 5 days, in ms
@@ -330,7 +331,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
     * Minimum timeout in milliseconds after which unlocking with weak auth times out,

     * i.e. the user has to use a strong authentication method like password, PIN or pattern.

     */

    private static final long MINIMUM_STRONG_AUTH_TIMEOUT_MS = 1 * 60 * 60 * 1000; // 1h

    private static final long MINIMUM_STRONG_AUTH_TIMEOUT_MS = TimeUnit.HOURS.toMillis(1);



    /**

     * Strings logged with {@link

services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java

+42 −9
Original line number Diff line number Diff line
@@ -61,9 +61,11 @@ import java.util.HashMap; 
import java.util.List;

import java.util.Map;

import java.util.Set;

import java.util.concurrent.TimeUnit;



import static org.mockito.Matchers.any;

import static org.mockito.Matchers.anyInt;

import static org.mockito.Matchers.anyLong;

import static org.mockito.Matchers.anyObject;

import static org.mockito.Matchers.anyString;

import static org.mockito.Matchers.eq;
@@ -2124,8 +2126,37 @@ public class DevicePolicyManagerTest extends DpmTestBase { 
        setupDeviceOwner();

        mContext.callerPermissions.add(permission.MANAGE_PROFILE_AND_DEVICE_OWNERS);



        final long MINIMUM_STRONG_AUTH_TIMEOUT_MS = 1 * 60 * 60 * 1000; // 1h

        final long ONE_MINUTE = 60 * 1000;

        final long MINIMUM_STRONG_AUTH_TIMEOUT_MS = TimeUnit.HOURS.toMillis(1);

        final long ONE_MINUTE = TimeUnit.MINUTES.toMillis(1);

        final long MIN_PLUS_ONE_MINUTE = MINIMUM_STRONG_AUTH_TIMEOUT_MS + ONE_MINUTE;

        final long MAX_MINUS_ONE_MINUTE = DevicePolicyManager.DEFAULT_STRONG_AUTH_TIMEOUT_MS

                - ONE_MINUTE;



        // verify that the minimum timeout cannot be modified on user builds (system property is

        // not being read)

        mContext.buildMock.isDebuggable = false;



        dpm.setRequiredStrongAuthTimeout(admin1, MAX_MINUS_ONE_MINUTE);

        assertEquals(dpm.getRequiredStrongAuthTimeout(admin1), MAX_MINUS_ONE_MINUTE);

        assertEquals(dpm.getRequiredStrongAuthTimeout(null), MAX_MINUS_ONE_MINUTE);



        verify(mContext.systemProperties, never()).getLong(anyString(), anyLong());



        // restore to the debuggable build state

        mContext.buildMock.isDebuggable = true;



        // Always return the default (second arg) when getting system property for long type

        when(mContext.systemProperties.getLong(anyString(), anyLong())).thenAnswer(

                new Answer<Long>() {

                    @Override

                    public Long answer(InvocationOnMock invocation) throws Throwable {

                        return (Long) invocation.getArguments()[1];

                    }

                }

        );



        // reset to default (0 means the admin is not participating, so default should be returned)

        dpm.setRequiredStrongAuthTimeout(admin1, 0);



        // aggregation should be the default if unset by any admin

        assertEquals(dpm.getRequiredStrongAuthTimeout(null),
@@ -2142,7 +2173,7 @@ public class DevicePolicyManagerTest extends DpmTestBase { 
        assertEquals(dpm.getRequiredStrongAuthTimeout(null),

                DevicePolicyManager.DEFAULT_STRONG_AUTH_TIMEOUT_MS);



        // 0 means default

        // 0 means the admin is not participating, so default should be returned

        dpm.setRequiredStrongAuthTimeout(admin1, 0);

        assertEquals(dpm.getRequiredStrongAuthTimeout(admin1), 0);

        assertEquals(dpm.getRequiredStrongAuthTimeout(null),
@@ -2153,12 +2184,14 @@ public class DevicePolicyManagerTest extends DpmTestBase { 
        assertEquals(dpm.getRequiredStrongAuthTimeout(admin1), MINIMUM_STRONG_AUTH_TIMEOUT_MS);

        assertEquals(dpm.getRequiredStrongAuthTimeout(null), MINIMUM_STRONG_AUTH_TIMEOUT_MS);



        // value within range

        dpm.setRequiredStrongAuthTimeout(admin1, MINIMUM_STRONG_AUTH_TIMEOUT_MS + ONE_MINUTE);

        assertEquals(dpm.getRequiredStrongAuthTimeout(admin1), MINIMUM_STRONG_AUTH_TIMEOUT_MS

                + ONE_MINUTE);

        assertEquals(dpm.getRequiredStrongAuthTimeout(null), MINIMUM_STRONG_AUTH_TIMEOUT_MS

                + ONE_MINUTE);

        // values within range

        dpm.setRequiredStrongAuthTimeout(admin1, MIN_PLUS_ONE_MINUTE);

        assertEquals(dpm.getRequiredStrongAuthTimeout(admin1), MIN_PLUS_ONE_MINUTE);

        assertEquals(dpm.getRequiredStrongAuthTimeout(null), MIN_PLUS_ONE_MINUTE);



        dpm.setRequiredStrongAuthTimeout(admin1, MAX_MINUS_ONE_MINUTE);

        assertEquals(dpm.getRequiredStrongAuthTimeout(admin1), MAX_MINUS_ONE_MINUTE);

        assertEquals(dpm.getRequiredStrongAuthTimeout(null), MAX_MINUS_ONE_MINUTE);



        // reset to default

        dpm.setRequiredStrongAuthTimeout(admin1, 0);