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

Merge "Switch to modern ArgumentMatchers"

Browse Source
This commit is contained in:
Treehugger Robot
2017-12-15 10:33:13 +00:00
committed by Gerrit Code Review
parent d46153c3d3 a56f6c5bdb
commit b8bf3bbc72
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,9 +36,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";
@@ -135,13 +135,10 @@ public class PreferenceListTest extends AndroidTestCase {
/* lockdownVpnKey */ null); /* lockdownVpnKey */ null);
updater.run(); updater.run();
final ArgumentMatcher<VpnProfile> equalsFake = new ArgumentMatcher<VpnProfile>() { final ArgumentMatcher<VpnProfile> equalsFake = arg -> {
@Override if (arg == vpnProfile) return true;
public boolean matchesObject(final Object arg) { if (arg == null) return false;
if (arg == vpnProfile) return true; return TextUtils.equals(arg.key, vpnProfile.key);
if (arg == null) return false;
return TextUtils.equals(((VpnProfile) arg).key, vpnProfile.key);
}
}; };
// The VPN profile should have been used to create a preference and set up at laest once // The VPN profile should have been used to create a preference and set up at laest once