From a56f6c5bdb8ba6cc984301721357c05b8c208d7f Mon Sep 17 00:00:00 2001 From: "Philip P. Moltmann" Date: Wed, 22 Nov 2017 16:07:48 -0800 Subject: [PATCH] Switch to modern ArgumentMatchers Test: adb shell am instrument -w -e class com.android.settings.vpn2.PreferenceListTest com.android.settings.tests.unit/android.support.test.runner.AndroidJUnitRunner Change-Id: Id2e4684f6d3048cfb60fee1f747d0796c157a3da --- .../android/settings/vpn2/PreferenceListTest.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/tests/unit/src/com/android/settings/vpn2/PreferenceListTest.java b/tests/unit/src/com/android/settings/vpn2/PreferenceListTest.java index bb12efacf09..2accbf2aa0c 100644 --- a/tests/unit/src/com/android/settings/vpn2/PreferenceListTest.java +++ b/tests/unit/src/com/android/settings/vpn2/PreferenceListTest.java @@ -36,9 +36,9 @@ import java.util.List; import java.util.Map; import org.mockito.ArgumentCaptor; +import org.mockito.ArgumentMatcher; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.mockito.compat.ArgumentMatcher; public class PreferenceListTest extends AndroidTestCase { private static final String TAG = "PreferenceListTest"; @@ -135,13 +135,10 @@ public class PreferenceListTest extends AndroidTestCase { /* lockdownVpnKey */ null); updater.run(); - final ArgumentMatcher equalsFake = new ArgumentMatcher() { - @Override - public boolean matchesObject(final Object arg) { - if (arg == vpnProfile) return true; - if (arg == null) return false; - return TextUtils.equals(((VpnProfile) arg).key, vpnProfile.key); - } + final ArgumentMatcher equalsFake = arg -> { + if (arg == vpnProfile) return true; + if (arg == null) return false; + return TextUtils.equals(arg.key, vpnProfile.key); }; // The VPN profile should have been used to create a preference and set up at laest once