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

Commit 83083cf3 authored by Sudheer Shanka's avatar Sudheer Shanka
Browse files

Fix AppRestrictionsHelperTest. 

Recently mockito has been updated to version 2.7.* and any(*.class) will now
reject null values.

Bug: 36531717
Test: runtest -x packages/SettingsLib/tests/integ/src/com/android/settingslib/users/AppRestrictionsHelperTest.java
Change-Id: Ia3ff2f470a95f6ee36a97eba8699425274500f17
parent 74cb0069

packages/SettingsLib/tests/integ/src/com/android/settingslib/users/AppRestrictionsHelperTest.java

+3 −2
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import static org.mockito.Matchers.any; 
import static org.mockito.Matchers.anyInt;

import static org.mockito.Matchers.argThat;

import static org.mockito.Matchers.eq;

import static org.mockito.Matchers.nullable;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.times;

import static org.mockito.Mockito.when;
@@ -148,8 +149,8 @@ public class AppRestrictionsHelperTest extends BaseTest { 
                0 /*installFlags*/, PackageManager.INSTALL_REASON_UNKNOWN);

        verify(mIpm, times(1)).setApplicationHiddenSettingAsUser("app2", false, testUserId);

        verify(mockListener).onDisableUiForPackage("app2");

        verify(mPm, times(1)).deletePackageAsUser(eq("app3"), any(IPackageDeleteObserver.class),

                anyInt(), eq(mTestUser.getIdentifier()));

        verify(mPm, times(1)).deletePackageAsUser(eq("app3"),

                nullable(IPackageDeleteObserver.class), anyInt(), eq(mTestUser.getIdentifier()));

    }



    private void addsystemImes(String[] defaultImes, String[] otherImes) throws