Merge "Switch to modern ArgumentMatchers"

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";

                /* 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