Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix AppRestrictionsHelperTest.

Browse Source 
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
This commit is contained in:
Sudheer Shanka
2017-03-22 17:54:13 -07:00
parent 74cb00696e
commit 83083cf358
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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