From 192bb0bc54f6bb418f5778fe26eb2e68514290fb Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Thu, 9 Mar 2017 18:49:41 +0000 Subject: [PATCH] Refactor code incompatible with Mockito 2.7.13 (cherry picked from 76e319f015c2b43498ce3ce610a253d63e76cbf3) Some additional internal only refactorings were done as well. Bug: 32912773 Test: make checkbuild Change-Id: I96e3da967fad731fc8f39bde9db95f50ab7353fb --- .../integration/CameraDeviceBinderTest.java | 4 ++-- .../unit/MediaInserterTest.java | 12 ++++-------- .../users/AppRestrictionsHelperTest.java | 9 ++++----- .../server/NetworkScoreServiceTest.java | 8 ++++---- .../server/NetworkScorerAppManagerTest.java | 8 ++++---- .../accessibility/KeyEventDispatcherTest.java | 18 ++++++++++-------- .../MagnificationControllerTest.java | 2 +- .../accessibility/MotionEventInjectorTest.java | 14 +++++++++----- .../devicepolicy/DevicePolicyManagerTest.java | 2 +- .../android/server/devicepolicy/MockUtils.java | 11 ++++++----- .../AccessibilityShortcutControllerTest.java | 12 ++++++++++-- .../retaildemo/RetailDemoModeServiceTest.java | 9 ++++----- .../webkit/WebViewUpdateServiceTest.java | 11 ++++------- .../server/wm/TestWindowManagerPolicy.java | 2 +- .../ShortcutManagerTestUtils.java | 3 ++- 15 files changed, 66 insertions(+), 59 deletions(-) diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/integration/CameraDeviceBinderTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/integration/CameraDeviceBinderTest.java index 9a78544b84155..476f0166ca0da 100644 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/integration/CameraDeviceBinderTest.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/integration/CameraDeviceBinderTest.java @@ -45,8 +45,8 @@ import static android.hardware.camera2.CameraDevice.TEMPLATE_PREVIEW; import com.android.mediaframeworktest.MediaFrameworkIntegrationTestRunner; -import org.mockito.ArgumentMatcher; import org.mockito.ArgumentCaptor; +import org.mockito.compat.ArgumentMatcher; import static org.mockito.Mockito.*; public class CameraDeviceBinderTest extends AndroidTestCase { @@ -168,7 +168,7 @@ public class CameraDeviceBinderTest extends AndroidTestCase { class IsMetadataNotEmpty extends ArgumentMatcher { @Override - public boolean matches(Object obj) { + public boolean matchesObject(Object obj) { return !((CameraMetadataNative) obj).isEmpty(); } } diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaInserterTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaInserterTest.java index 86c2284e86ffa..712039decc831 100644 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaInserterTest.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaInserterTest.java @@ -37,9 +37,9 @@ import android.test.InstrumentationTestCase; import android.test.suitebuilder.annotation.SmallTest; import org.hamcrest.Description; -import org.mockito.ArgumentMatcher; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.mockito.compat.ArgumentMatcher; public class MediaInserterTest extends InstrumentationTestCase { @@ -67,7 +67,7 @@ public class MediaInserterTest extends InstrumentationTestCase { } @Override - public boolean matches(Object argument) { + public boolean matchesObject(Object argument) { if (!(argument instanceof Uri)) { return false; } @@ -79,13 +79,9 @@ public class MediaInserterTest extends InstrumentationTestCase { } @Override - public void describeTo(Description description) { - description - .appendText("expected a TableUri '") - .appendText(mUri.toString()) - .appendText("'"); + public String toString() { + return "expected a TableUri '" + mUri.toString() + "'"; } - } private static Uri eqUri(Uri in) { 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 8cfec7a520b7f..594a294158a47 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 @@ -44,10 +44,9 @@ import android.test.suitebuilder.annotation.SmallTest; import android.view.inputmethod.InputMethodInfo; import com.android.settingslib.BaseTest; -import org.hamcrest.Description; -import org.mockito.ArgumentMatcher; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.mockito.compat.ArgumentMatcher; import java.util.ArrayList; import java.util.List; @@ -249,7 +248,7 @@ public class AppRestrictionsHelperTest extends BaseTest { } @Override - public boolean matches(Object argument) { + public boolean matchesObject(Object argument) { if (argument instanceof Intent) { return ((Intent) argument).filterEquals(mIntent); } @@ -257,8 +256,8 @@ public class AppRestrictionsHelperTest extends BaseTest { } @Override - public void describeTo(Description description) { - description.appendText("Expected: " + mIntent); + public String toString() { + return "Expected: " + mIntent; } } diff --git a/services/tests/servicestests/src/com/android/server/NetworkScoreServiceTest.java b/services/tests/servicestests/src/com/android/server/NetworkScoreServiceTest.java index 38c6b0d35a41d..6cca771539eaa 100644 --- a/services/tests/servicestests/src/com/android/server/NetworkScoreServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/NetworkScoreServiceTest.java @@ -314,8 +314,8 @@ public class NetworkScoreServiceTest { final Bundle bundle = new Bundle(); bundle.putParcelable(EXTRA_RECOMMENDATION_RESULT, providerResult); doAnswer(invocation -> { - bundle.putInt(EXTRA_SEQUENCE, invocation.getArgumentAt(2, int.class)); - invocation.getArgumentAt(1, IRemoteCallback.class).sendResult(bundle); + bundle.putInt(EXTRA_SEQUENCE, invocation.getArgument(2)); + invocation.getArgument(1).sendResult(bundle); return null; }).when(mRecommendationProvider) .requestRecommendation(eq(mRecommendationRequest), isA(IRemoteCallback.class), @@ -379,7 +379,7 @@ public class NetworkScoreServiceTest { injectProvider(); final Bundle bundle = new Bundle(); doAnswer(invocation -> { - invocation.getArgumentAt(1, IRemoteCallback.class).sendResult(bundle); + invocation.getArgument(1).sendResult(bundle); return null; }).when(mRecommendationProvider) .requestRecommendation(eq(mRecommendationRequest), isA(IRemoteCallback.class), @@ -956,7 +956,7 @@ public class NetworkScoreServiceTest { IBinder mockBinder = mock(IBinder.class); when(mockBinder.queryLocalInterface(anyString())) .thenReturn(mRecommendationProvider); - invocation.getArgumentAt(1, ServiceConnection.class) + invocation.getArgument(1) .onServiceConnected(NEW_SCORER.getRecommendationServiceComponent(), mockBinder); return true; diff --git a/services/tests/servicestests/src/com/android/server/NetworkScorerAppManagerTest.java b/services/tests/servicestests/src/com/android/server/NetworkScorerAppManagerTest.java index 64f176a41ba8e..e8663a2f2a228 100644 --- a/services/tests/servicestests/src/com/android/server/NetworkScorerAppManagerTest.java +++ b/services/tests/servicestests/src/com/android/server/NetworkScorerAppManagerTest.java @@ -50,10 +50,10 @@ import com.android.internal.R; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.ArgumentMatcher; import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.MockitoAnnotations; +import org.mockito.compat.ArgumentMatcher; import java.util.ArrayList; import java.util.List; @@ -77,7 +77,7 @@ public class NetworkScorerAppManagerTest { when(mMockContext.getPackageManager()).thenReturn(mMockPm); when(mMockPm.queryIntentServices(Mockito.argThat(new ArgumentMatcher() { @Override - public boolean matches(Object object) { + public boolean matchesObject(Object object) { Intent intent = (Intent) object; return NetworkScoreManager.ACTION_RECOMMEND_NETWORKS.equals(intent.getAction()); } @@ -395,7 +395,7 @@ public class NetworkScorerAppManagerTest { when(mMockPm.resolveService( Mockito.argThat(new ArgumentMatcher() { @Override - public boolean matches(Object object) { + public boolean matchesObject(Object object) { Intent intent = (Intent) object; return NetworkScoreManager.ACTION_RECOMMEND_NETWORKS .equals(intent.getAction()) @@ -416,7 +416,7 @@ public class NetworkScorerAppManagerTest { when(mMockPm.resolveActivity( Mockito.argThat(new ArgumentMatcher() { @Override - public boolean matches(Object object) { + public boolean matchesObject(Object object) { Intent intent = (Intent) object; return NetworkScoreManager.ACTION_CUSTOM_ENABLE.equals(intent.getAction()) && useOpenWifiComp.getPackageName().equals(intent.getPackage()); diff --git a/services/tests/servicestests/src/com/android/server/accessibility/KeyEventDispatcherTest.java b/services/tests/servicestests/src/com/android/server/accessibility/KeyEventDispatcherTest.java index 0ab91a15e348b..fc12edc7b62a8 100644 --- a/services/tests/servicestests/src/com/android/server/accessibility/KeyEventDispatcherTest.java +++ b/services/tests/servicestests/src/com/android/server/accessibility/KeyEventDispatcherTest.java @@ -22,13 +22,13 @@ import static junit.framework.TestCase.assertTrue; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyLong; import static org.mockito.Matchers.anyObject; -import static org.mockito.Matchers.argThat; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; +import static org.mockito.hamcrest.MockitoHamcrest.argThat; import java.util.ArrayList; import java.util.Arrays; @@ -46,12 +46,13 @@ import android.support.test.runner.AndroidJUnit4; import android.view.KeyEvent; import android.view.WindowManagerPolicy; import com.android.server.accessibility.KeyEventDispatcher.KeyEventFilter; +import org.hamcrest.Description; +import org.hamcrest.TypeSafeMatcher; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; -import org.mockito.ArgumentMatcher; /** * Tests for KeyEventDispatcher @@ -558,7 +559,7 @@ public class KeyEventDispatcherTest { .matches(mInputEventsHander.timedMessages.get(1).obj)); } - private class KeyEventMatcher extends ArgumentMatcher { + private class KeyEventMatcher extends TypeSafeMatcher { private KeyEvent mEventToMatch; KeyEventMatcher(KeyEvent eventToMatch) { @@ -566,14 +567,15 @@ public class KeyEventDispatcherTest { } @Override - public boolean matches(Object event) { - if (!(event instanceof KeyEvent)) { - return false; - } - KeyEvent keyEvent = (KeyEvent) event; + public boolean matchesSafely(KeyEvent keyEvent) { return (mEventToMatch.getAction() == keyEvent.getAction()) && (mEventToMatch.getKeyCode() == keyEvent.getKeyCode()); } + + @Override + public void describeTo(Description description) { + description.appendText("Key event matcher"); + } } private class MessageCapturingHandler extends Handler { diff --git a/services/tests/servicestests/src/com/android/server/accessibility/MagnificationControllerTest.java b/services/tests/servicestests/src/com/android/server/accessibility/MagnificationControllerTest.java index cb5e8bbb98631..d44c1ca0c0ef9 100644 --- a/services/tests/servicestests/src/com/android/server/accessibility/MagnificationControllerTest.java +++ b/services/tests/servicestests/src/com/android/server/accessibility/MagnificationControllerTest.java @@ -22,7 +22,6 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertFalse; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyObject; -import static org.mockito.Matchers.argThat; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.mock; @@ -30,6 +29,7 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; +import static org.mockito.hamcrest.MockitoHamcrest.argThat; import android.animation.ValueAnimator; import android.content.BroadcastReceiver; diff --git a/services/tests/servicestests/src/com/android/server/accessibility/MotionEventInjectorTest.java b/services/tests/servicestests/src/com/android/server/accessibility/MotionEventInjectorTest.java index 73344e037cdc8..12495ce90cf4d 100644 --- a/services/tests/servicestests/src/com/android/server/accessibility/MotionEventInjectorTest.java +++ b/services/tests/servicestests/src/com/android/server/accessibility/MotionEventInjectorTest.java @@ -28,7 +28,6 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.mockito.Matchers.anyBoolean; import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.argThat; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.reset; @@ -36,6 +35,7 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.hamcrest.MockitoHamcrest.argThat; import android.accessibilityservice.GestureDescription.GestureStep; import android.accessibilityservice.GestureDescription.TouchPoint; @@ -65,7 +65,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; -import org.mockito.ArgumentMatcher; +import org.mockito.compat.ArgumentMatcher; /** * Tests for MotionEventInjector @@ -738,7 +738,7 @@ public class MotionEventInjectorTest { return next; } - static class MotionEventMatcher extends ArgumentMatcher { + static class MotionEventMatcher extends TypeSafeMatcher { long mDownTime; long mEventTime; long mActionMasked; @@ -764,8 +764,7 @@ public class MotionEventInjectorTest { } @Override - public boolean matches(Object o) { - MotionEvent event = (MotionEvent) o; + public boolean matchesSafely(MotionEvent event) { if ((event.getDownTime() == mDownTime) && (event.getEventTime() == mEventTime) && (event.getActionMasked() == mActionMasked) && ((int) event.getX() == mX) && ((int) event.getY() == mY)) { @@ -782,6 +781,11 @@ public class MotionEventInjectorTest { Log.e(LOG_TAG, "event.getY() = " + event.getY() + ", expected " + mY); return false; } + + @Override + public void describeTo(Description description) { + description.appendText("Motion event matcher"); + } } private static class MotionEventActionMatcher extends TypeSafeMatcher { diff --git a/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java b/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java index f969e803e2cf8..8987ac1920268 100644 --- a/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java +++ b/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java @@ -85,7 +85,6 @@ 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.argThat; import static org.mockito.Matchers.eq; import static org.mockito.Matchers.isNull; import static org.mockito.Mockito.atLeast; @@ -99,6 +98,7 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; +import static org.mockito.hamcrest.MockitoHamcrest.argThat; /** * Tests for DevicePolicyManager( and DevicePolicyManagerService). diff --git a/services/tests/servicestests/src/com/android/server/devicepolicy/MockUtils.java b/services/tests/servicestests/src/com/android/server/devicepolicy/MockUtils.java index 3806da6692973..e43786c43cc31 100644 --- a/services/tests/servicestests/src/com/android/server/devicepolicy/MockUtils.java +++ b/services/tests/servicestests/src/com/android/server/devicepolicy/MockUtils.java @@ -29,6 +29,7 @@ import org.hamcrest.BaseMatcher; import org.hamcrest.Description; import org.hamcrest.Matcher; import org.mockito.Mockito; +import org.mockito.hamcrest.MockitoHamcrest; public class MockUtils { private MockUtils() { @@ -47,7 +48,7 @@ public class MockUtils { description.appendText("UserHandle: user-id= \"" + userId + "\""); } }; - return Mockito.argThat(m); + return MockitoHamcrest.argThat(m); } public static Intent checkIntentComponent(final ComponentName component) { @@ -63,7 +64,7 @@ public class MockUtils { description.appendText("Intent: component=\"" + component + "\""); } }; - return Mockito.argThat(m); + return MockitoHamcrest.argThat(m); } public static Intent checkIntentAction(final String action) { @@ -79,7 +80,7 @@ public class MockUtils { description.appendText("Intent: action=\"" + action + "\""); } }; - return Mockito.argThat(m); + return MockitoHamcrest.argThat(m); } public static Intent checkIntent(final Intent intent) { @@ -94,7 +95,7 @@ public class MockUtils { description.appendText(intent.toString()); } }; - return Mockito.argThat(m); + return MockitoHamcrest.argThat(m); } public static Bundle checkUserRestrictions(String... keys) { @@ -111,7 +112,7 @@ public class MockUtils { description.appendText("User restrictions=" + getRestrictionsAsString(expected)); } }; - return Mockito.argThat(m); + return MockitoHamcrest.argThat(m); } private static String getRestrictionsAsString(Bundle b) { diff --git a/services/tests/servicestests/src/com/android/server/policy/AccessibilityShortcutControllerTest.java b/services/tests/servicestests/src/com/android/server/policy/AccessibilityShortcutControllerTest.java index 1de6348c6f40d..8329d68bd1b98 100644 --- a/services/tests/servicestests/src/com/android/server/policy/AccessibilityShortcutControllerTest.java +++ b/services/tests/servicestests/src/com/android/server/policy/AccessibilityShortcutControllerTest.java @@ -45,8 +45,8 @@ import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.mockito.internal.util.reflection.Whitebox; +import java.lang.reflect.Field; import java.util.Collections; import static android.provider.Settings.Secure.ACCESSIBILITY_SHORTCUT_DIALOG_SHOWN; @@ -124,7 +124,15 @@ public class AccessibilityShortcutControllerTest { when(mToast.getWindowParams()).thenReturn(mLayoutParams); Window window = mock(Window.class); - Whitebox.setInternalState(window, "mWindowAttributes", new WindowManager.LayoutParams()); + // Initialize the mWindowAttributes field which was not properly initialized during mock + // creation. + try { + Field field = Window.class.getDeclaredField("mWindowAttributes"); + field.setAccessible(true); + field.set(window, new WindowManager.LayoutParams()); + } catch (Exception e) { + throw new RuntimeException("Unable to set mWindowAttributes", e); + } when(mAlertDialog.getWindow()).thenReturn(window); } diff --git a/services/tests/servicestests/src/com/android/server/retaildemo/RetailDemoModeServiceTest.java b/services/tests/servicestests/src/com/android/server/retaildemo/RetailDemoModeServiceTest.java index e1dda5198a360..d18457b79c554 100644 --- a/services/tests/servicestests/src/com/android/server/retaildemo/RetailDemoModeServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/retaildemo/RetailDemoModeServiceTest.java @@ -66,16 +66,15 @@ import com.android.internal.widget.LockPatternUtils; import com.android.server.SystemService; import com.android.server.retaildemo.RetailDemoModeService.Injector; -import org.hamcrest.Description; import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; import org.mockito.ArgumentCaptor; -import org.mockito.ArgumentMatcher; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.mockito.compat.ArgumentMatcher; import java.io.File; import java.util.concurrent.CountDownLatch; @@ -283,7 +282,7 @@ public class RetailDemoModeServiceTest { } @Override - public boolean matches(Object argument) { + public boolean matchesObject(Object argument) { if (argument instanceof Intent) { return ((Intent) argument).filterEquals(mIntent); } @@ -291,8 +290,8 @@ public class RetailDemoModeServiceTest { } @Override - public void describeTo(Description description) { - description.appendText("Expected: " + mIntent); + public String toString() { + return "Expected: " + mIntent; } } diff --git a/services/tests/servicestests/src/com/android/server/webkit/WebViewUpdateServiceTest.java b/services/tests/servicestests/src/com/android/server/webkit/WebViewUpdateServiceTest.java index e4b74eb07264a..925f41490e4cd 100644 --- a/services/tests/servicestests/src/com/android/server/webkit/WebViewUpdateServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/webkit/WebViewUpdateServiceTest.java @@ -35,14 +35,12 @@ import android.webkit.WebViewFactory; import android.webkit.WebViewProviderInfo; import android.webkit.WebViewProviderResponse; -import org.hamcrest.Description; - import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mockito; import org.mockito.Matchers; -import org.mockito.ArgumentMatcher; +import org.mockito.compat.ArgumentMatcher; import java.util.concurrent.CountDownLatch; @@ -149,14 +147,13 @@ public class WebViewUpdateServiceTest { } @Override - public boolean matches(Object p) { + public boolean matchesObject(Object p) { return ((PackageInfo) p).packageName.equals(mPackageName); } - // Provide a more useful description in case of mismatch @Override - public void describeTo (Description description) { - description.appendText(String.format("PackageInfo with name '%s'", mPackageName)); + public String toString() { + return String.format("PackageInfo with name '%s'", mPackageName); } } diff --git a/services/tests/servicestests/src/com/android/server/wm/TestWindowManagerPolicy.java b/services/tests/servicestests/src/com/android/server/wm/TestWindowManagerPolicy.java index c8b73f1d6807b..0971bb61ac3fa 100644 --- a/services/tests/servicestests/src/com/android/server/wm/TestWindowManagerPolicy.java +++ b/services/tests/servicestests/src/com/android/server/wm/TestWindowManagerPolicy.java @@ -82,7 +82,7 @@ class TestWindowManagerPolicy implements WindowManagerPolicy { final ActivityManagerInternal am = LocalServices.getService(ActivityManagerInternal.class); doAnswer((InvocationOnMock invocationOnMock) -> { - final Runnable runnable = invocationOnMock.getArgumentAt(0, Runnable.class); + final Runnable runnable = invocationOnMock.getArgument(0); if (runnable != null) { runnable.run(); } diff --git a/services/tests/shortcutmanagerutils/src/com/android/server/pm/shortcutmanagertest/ShortcutManagerTestUtils.java b/services/tests/shortcutmanagerutils/src/com/android/server/pm/shortcutmanagertest/ShortcutManagerTestUtils.java index fd335c3041fbf..f2bae4ce6ce08 100644 --- a/services/tests/shortcutmanagerutils/src/com/android/server/pm/shortcutmanagertest/ShortcutManagerTestUtils.java +++ b/services/tests/shortcutmanagerutils/src/com/android/server/pm/shortcutmanagertest/ShortcutManagerTestUtils.java @@ -59,6 +59,7 @@ import org.json.JSONException; import org.json.JSONObject; import org.mockito.ArgumentCaptor; import org.mockito.Mockito; +import org.mockito.hamcrest.MockitoHamcrest; import java.io.BufferedReader; import java.io.File; @@ -672,7 +673,7 @@ public class ShortcutManagerTestUtils { d.appendText(description); } }; - return Mockito.argThat(m); + return MockitoHamcrest.argThat(m); } public static List checkShortcutIds(String... ids) {