PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor code incompatible with Mockito 2.7.13

Browse Source 
Bug: 32912773
Test: make checkbuild
Change-Id: Idcd89438aa05ed2d010934cc6613763d4cfb9885
This commit is contained in:
Paul Duffin
2017-03-10 14:59:09 +00:00
parent e11cb90ed2
commit c1542f1fd4
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/unit/src/com/android/settings/vpn2/PreferenceListTest.java
View File

@@ -37,9 +37,9 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import org.mockito.ArgumentCaptor; import org.mockito.ArgumentCaptor;
import org.mockito.ArgumentMatcher;
import org.mockito.Mock; import org.mockito.Mock;
import org.mockito.MockitoAnnotations; import org.mockito.MockitoAnnotations;
import org.mockito.compat.ArgumentMatcher;
public class PreferenceListTest extends AndroidTestCase { public class PreferenceListTest extends AndroidTestCase {
private static final String TAG = "PreferenceListTest"; private static final String TAG = "PreferenceListTest";
@@ -138,7 +138,7 @@ public class PreferenceListTest extends AndroidTestCase {
final ArgumentMatcher<VpnProfile> equalsFake = new ArgumentMatcher<VpnProfile>() { final ArgumentMatcher<VpnProfile> equalsFake = new ArgumentMatcher<VpnProfile>() {
@Override @Override
public boolean matches(final Object arg) { public boolean matchesObject(final Object arg) {
if (arg == vpnProfile) return true; if (arg == vpnProfile) return true;
if (arg == null) return false; if (arg == null) return false;
return TextUtils.equals(((VpnProfile) arg).key, vpnProfile.key); return TextUtils.equals(((VpnProfile) arg).key, vpnProfile.key);