From 83083cf358e7a59eefe09bb96a8c86b1e797beb7 Mon Sep 17 00:00:00 2001 From: Sudheer Shanka Date: Wed, 22 Mar 2017 17:54:13 -0700 Subject: [PATCH] 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 --- .../android/settingslib/users/AppRestrictionsHelperTest.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/SettingsLib/tests/integ/src/com/android/settingslib/users/AppRestrictionsHelperTest.java b/packages/SettingsLib/tests/integ/src/com/android/settingslib/users/AppRestrictionsHelperTest.java index 594a294158a47..85b04c8fdf154 100644 --- a/packages/SettingsLib/tests/integ/src/com/android/settingslib/users/AppRestrictionsHelperTest.java +++ b/packages/SettingsLib/tests/integ/src/com/android/settingslib/users/AppRestrictionsHelperTest.java @@ -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