Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ced2263d authored by Philip P. Moltmann's avatar Philip P. Moltmann Committed by android-build-merger
Browse files

Merge "Switch to modern ArgumentMatchers"

am: b8bf3bbc

Change-Id: I81455eceac3a4273dc0bfd439fefa21c3b6f571c
parents 70a6dfd6 b8bf3bbc
Loading
Loading
Loading
Loading
+5 −8
Original line number Diff line number Diff line
@@ -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<VpnProfile> equalsFake = new ArgumentMatcher<VpnProfile>() {
            @Override
            public boolean matchesObject(final Object arg) {
        final ArgumentMatcher<VpnProfile> equalsFake = arg -> {
            if (arg == vpnProfile) return true;
            if (arg == null) return false;
                return TextUtils.equals(((VpnProfile) arg).key, vpnProfile.key);
            }
            return TextUtils.equals(arg.key, vpnProfile.key);
        };

        // The VPN profile should have been used to create a preference and set up at laest once