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

Commit a9b8253b authored by Eric Sandness's avatar Eric Sandness
Browse files

Fix mock of setApplicationRestrictions() 

If any(Bundle.class) is used in the mock's when() clause instead of
nullable(Bundle.class), the mock is not called when the bundle argument
is null.

Test: runtest -c com.android.server.devicepolicy.DevicePolicyManagerTest
frameworks-services

Bug: 36808416
Change-Id: Iab96fe88837e8f27a1da5775494b4611a547f13a
parent 67ee79e8

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -92,6 +92,7 @@ import static org.mockito.Mockito.doAnswer; 
import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.nullable;

import static org.mockito.Mockito.reset;

import static org.mockito.Mockito.reset;

import static org.mockito.Mockito.timeout;

import static org.mockito.Mockito.timeout;

import static org.mockito.Mockito.times;

import static org.mockito.Mockito.times;
@@ -213,7 +214,7 @@ public class DevicePolicyManagerTest extends DpmTestBase { 
                return null;

                return null;

            }

            }

        }).when(mContext.userManager).setApplicationRestrictions(

        }).when(mContext.userManager).setApplicationRestrictions(

                anyString(), any(Bundle.class), any(UserHandle.class));

                anyString(), nullable(Bundle.class), any(UserHandle.class));





        // UM.getApplicationRestrictions() will read from appRestrictions.

        // UM.getApplicationRestrictions() will read from appRestrictions.

        doAnswer(new Answer<Bundle>() {

        doAnswer(new Answer<Bundle>() {