Merge "Remove duplicated metered & privacy spinner" into main
This commit is contained in:
Chaohui Wang
Android (Google) Code Review
@@ -53,7 +53,6 @@ import android.widget.TextView;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.network.SubscriptionUtil;
|
||||
import com.android.settings.testutils.shadow.ShadowConnectivityManager;
|
||||
import com.android.settings.utils.AndroidKeystoreAliasLoader;
|
||||
import com.android.settings.wifi.details2.WifiPrivacyPreferenceController2;
|
||||
import com.android.wifitrackerlib.WifiEntry;
|
||||
@@ -69,7 +68,6 @@ import org.mockito.MockitoAnnotations;
|
||||
import org.robolectric.RobolectricTestRunner;
|
||||
import org.robolectric.RuntimeEnvironment;
|
||||
import org.robolectric.Shadows;
|
||||
import org.robolectric.annotation.Config;
|
||||
import org.robolectric.shadows.ShadowInputMethodManager;
|
||||
import org.robolectric.shadows.ShadowSubscriptionManager;
|
||||
|
||||
@@ -79,7 +77,6 @@ import java.util.stream.Collectors;
|
||||
import java.util.stream.IntStream;
|
||||
|
||||
@RunWith(RobolectricTestRunner.class)
|
||||
@Config(shadows = ShadowConnectivityManager.class)
|
||||
public class WifiConfigController2Test {
|
||||
|
||||
static final String WIFI_EAP_TLS_V1_3 = "TLS v1.3";
|
||||
@@ -138,6 +135,7 @@ public class WifiConfigController2Test {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
mContext = spy(RuntimeEnvironment.application);
|
||||
when(mContext.getSystemService(eq(WifiManager.class))).thenReturn(mWifiManager);
|
||||
when(mWifiManager.isConnectedMacRandomizationSupported()).thenReturn(true);
|
||||
when(mConfigUiBase.getContext()).thenReturn(mContext);
|
||||
when(mWifiEntry.getSecurity()).thenReturn(WifiEntry.SECURITY_PSK);
|
||||
mView = LayoutInflater.from(mContext).inflate(R.layout.wifi_dialog, null);
|
||||
@@ -152,15 +150,17 @@ public class WifiConfigController2Test {
|
||||
ipSettingsSpinner.setSelection(DHCP);
|
||||
mShadowSubscriptionManager = shadowOf(mContext.getSystemService(SubscriptionManager.class));
|
||||
when(mEapMethodSimSpinner.getSelectedItemPosition()).thenReturn(WIFI_EAP_METHOD_SIM);
|
||||
}
|
||||
|
||||
mController = new TestWifiConfigController2(mConfigUiBase, mView, mWifiEntry,
|
||||
WifiConfigUiBase2.MODE_CONNECT);
|
||||
private void createController(
|
||||
WifiEntry mWifiEntry, int modeConnect, boolean hideMeteredAndPrivacy) {
|
||||
mController = new WifiConfigController2(mConfigUiBase, mView, mWifiEntry,
|
||||
modeConnect, hideMeteredAndPrivacy, mWifiManager, mAndroidKeystoreAliasLoader);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void ssidExceeds32Bytes_shouldShowSsidTooLongWarning() {
|
||||
mController = new TestWifiConfigController2(mConfigUiBase, mView, null /* wifiEntry */,
|
||||
WifiConfigUiBase2.MODE_CONNECT);
|
||||
createController(null, WifiConfigUiBase2.MODE_CONNECT, false);
|
||||
final TextView ssid = mView.findViewById(R.id.ssid);
|
||||
assertThat(ssid).isNotNull();
|
||||
ssid.setText("☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎");
|
||||
@@ -172,8 +172,7 @@ public class WifiConfigController2Test {
|
||||
|
||||
@Test
|
||||
public void ssidShorterThan32Bytes_shouldNotShowSsidTooLongWarning() {
|
||||
mController = new TestWifiConfigController2(mConfigUiBase, mView, null /* wifiEntry */,
|
||||
WifiConfigUiBase2.MODE_CONNECT);
|
||||
createController(null, WifiConfigUiBase2.MODE_CONNECT, false);
|
||||
|
||||
final TextView ssid = mView.findViewById(R.id.ssid);
|
||||
assertThat(ssid).isNotNull();
|
||||
@@ -192,6 +191,7 @@ public class WifiConfigController2Test {
|
||||
|
||||
@Test
|
||||
public void isSubmittable_noSSID_shouldReturnFalse() {
|
||||
createController(mWifiEntry, WifiConfigUiBase2.MODE_CONNECT, false);
|
||||
final TextView ssid = mView.findViewById(R.id.ssid);
|
||||
assertThat(ssid).isNotNull();
|
||||
ssid.setText("");
|
||||
@@ -200,6 +200,7 @@ public class WifiConfigController2Test {
|
||||
|
||||
@Test
|
||||
public void isSubmittable_longPsk_shouldReturnFalse() {
|
||||
createController(mWifiEntry, WifiConfigUiBase2.MODE_CONNECT, false);
|
||||
final TextView password = mView.findViewById(R.id.password);
|
||||
assertThat(password).isNotNull();
|
||||
password.setText(LONG_PSK);
|
||||
@@ -208,6 +209,7 @@ public class WifiConfigController2Test {
|
||||
|
||||
@Test
|
||||
public void isSubmittable_shortPsk_shouldReturnFalse() {
|
||||
createController(mWifiEntry, WifiConfigUiBase2.MODE_CONNECT, false);
|
||||
final TextView password = mView.findViewById(R.id.password);
|
||||
assertThat(password).isNotNull();
|
||||
password.setText(SHORT_PSK);
|
||||
@@ -216,6 +218,7 @@ public class WifiConfigController2Test {
|
||||
|
||||
@Test
|
||||
public void isSubmittable_goodPsk_shouldReturnTrue() {
|
||||
createController(mWifiEntry, WifiConfigUiBase2.MODE_CONNECT, false);
|
||||
final TextView password = mView.findViewById(R.id.password);
|
||||
assertThat(password).isNotNull();
|
||||
password.setText(GOOD_PSK);
|
||||
@@ -224,6 +227,7 @@ public class WifiConfigController2Test {
|
||||
|
||||
@Test
|
||||
public void isSubmittable_hexPsk_shouldReturnTrue() {
|
||||
createController(mWifiEntry, WifiConfigUiBase2.MODE_CONNECT, false);
|
||||
final TextView password = mView.findViewById(R.id.password);
|
||||
assertThat(password).isNotNull();
|
||||
password.setText(HEX_PSK);
|
||||
@@ -232,6 +236,7 @@ public class WifiConfigController2Test {
|
||||
|
||||
@Test
|
||||
public void isSubmittable_savedConfigZeroLengthPassword_shouldReturnTrue() {
|
||||
createController(mWifiEntry, WifiConfigUiBase2.MODE_CONNECT, false);
|
||||
final TextView password = mView.findViewById(R.id.password);
|
||||
assertThat(password).isNotNull();
|
||||
password.setText("");
|
||||
@@ -241,15 +246,13 @@ public class WifiConfigController2Test {
|
||||
|
||||
@Test
|
||||
public void isSubmittable_nullWifiEntry_noException() {
|
||||
mController = new TestWifiConfigController2(mConfigUiBase, mView, null,
|
||||
WifiConfigUiBase2.MODE_CONNECT);
|
||||
createController(null, WifiConfigUiBase2.MODE_CONNECT, false);
|
||||
mController.isSubmittable();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void isSubmittable_EapToPskWithValidPassword_shouldReturnTrue() {
|
||||
mController = new TestWifiConfigController2(mConfigUiBase, mView, null,
|
||||
WifiConfigUiBase2.MODE_CONNECT);
|
||||
createController(null, WifiConfigUiBase2.MODE_CONNECT, false);
|
||||
final TextView ssid = mView.findViewById(R.id.ssid);
|
||||
final TextView password = mView.findViewById(R.id.password);
|
||||
final Spinner securitySpinner = mView.findViewById(R.id.security);
|
||||
@@ -268,6 +271,7 @@ public class WifiConfigController2Test {
|
||||
|
||||
@Test
|
||||
public void isSubmittable_EapWithAkaMethod_shouldReturnTrue() {
|
||||
createController(mWifiEntry, WifiConfigUiBase2.MODE_CONNECT, false);
|
||||
when(mWifiEntry.isSaved()).thenReturn(true);
|
||||
mController.mWifiEntrySecurity = WifiEntry.SECURITY_EAP;
|
||||
mView.findViewById(R.id.l_ca_cert).setVisibility(View.GONE);
|
||||
@@ -278,8 +282,7 @@ public class WifiConfigController2Test {
|
||||
@Test
|
||||
public void isSubmittable_caCertWithoutDomain_shouldReturnFalse() {
|
||||
when(mWifiEntry.getSecurity()).thenReturn(WifiEntry.SECURITY_EAP);
|
||||
mController = new TestWifiConfigController2(mConfigUiBase, mView, mWifiEntry,
|
||||
WifiConfigUiBase2.MODE_CONNECT);
|
||||
createController(mWifiEntry, WifiConfigUiBase2.MODE_CONNECT, false);
|
||||
mView.findViewById(R.id.l_ca_cert).setVisibility(View.VISIBLE);
|
||||
final Spinner eapCaCertSpinner = mView.findViewById(R.id.ca_cert);
|
||||
eapCaCertSpinner.setAdapter(mController.getSpinnerAdapter(new String[]{"certificate"}));
|
||||
@@ -292,8 +295,7 @@ public class WifiConfigController2Test {
|
||||
@Test
|
||||
public void isSubmittable_caCertWithDomain_shouldReturnTrue() {
|
||||
when(mWifiEntry.getSecurity()).thenReturn(WifiEntry.SECURITY_EAP);
|
||||
mController = new TestWifiConfigController2(mConfigUiBase, mView, mWifiEntry,
|
||||
WifiConfigUiBase2.MODE_CONNECT);
|
||||
createController(mWifiEntry, WifiConfigUiBase2.MODE_CONNECT, false);
|
||||
mView.findViewById(R.id.l_ca_cert).setVisibility(View.VISIBLE);
|
||||
final Spinner eapCaCertSpinner = mView.findViewById(R.id.ca_cert);
|
||||
eapCaCertSpinner.setAdapter(mController.getSpinnerAdapter(new String[]{"certificate"}));
|
||||
@@ -306,6 +308,7 @@ public class WifiConfigController2Test {
|
||||
|
||||
@Test
|
||||
public void getSignalString_notReachable_shouldHaveNoSignalString() {
|
||||
createController(mWifiEntry, WifiConfigUiBase2.MODE_CONNECT, false);
|
||||
when(mWifiEntry.getLevel()).thenReturn(WifiEntry.WIFI_LEVEL_UNREACHABLE);
|
||||
|
||||
assertThat(mController.getSignalString()).isNull();
|
||||
@@ -313,6 +316,7 @@ public class WifiConfigController2Test {
|
||||
|
||||
@Test
|
||||
public void loadCertificates_undesiredCertificates_shouldNotLoadUndesiredCertificates() {
|
||||
createController(mWifiEntry, WifiConfigUiBase2.MODE_CONNECT, false);
|
||||
final Spinner spinner = new Spinner(mContext);
|
||||
|
||||
mController.loadCertificates(spinner,
|
||||
@@ -326,8 +330,7 @@ public class WifiConfigController2Test {
|
||||
|
||||
@Test
|
||||
public void ssidGetFocus_addNewNetwork_shouldReturnTrue() {
|
||||
mController = new TestWifiConfigController2(mConfigUiBase, mView, null /* wifiEntry */,
|
||||
WifiConfigUiBase2.MODE_CONNECT);
|
||||
createController(null, WifiConfigUiBase2.MODE_CONNECT, false);
|
||||
final TextView ssid = mView.findViewById(R.id.ssid);
|
||||
// Verify ssid text get focus when add new network (wifiEntry is null)
|
||||
assertThat(ssid.isFocused()).isTrue();
|
||||
@@ -335,6 +338,7 @@ public class WifiConfigController2Test {
|
||||
|
||||
@Test
|
||||
public void passwordGetFocus_connectSecureWifi_shouldReturnTrue() {
|
||||
createController(mWifiEntry, WifiConfigUiBase2.MODE_CONNECT, false);
|
||||
final TextView password = mView.findViewById(R.id.password);
|
||||
// Verify password get focus when connect to secure wifi without eap type
|
||||
assertThat(password.isFocused()).isTrue();
|
||||
@@ -342,6 +346,7 @@ public class WifiConfigController2Test {
|
||||
|
||||
@Test
|
||||
public void hiddenWarning_warningVisibilityProperlyUpdated() {
|
||||
createController(mWifiEntry, WifiConfigUiBase2.MODE_CONNECT, false);
|
||||
View warningView = mView.findViewById(R.id.hidden_settings_warning);
|
||||
mController.onItemSelected(mHiddenSettingsSpinner, null, mController.HIDDEN_NETWORK, 0);
|
||||
assertThat(warningView.getVisibility()).isEqualTo(View.VISIBLE);
|
||||
@@ -355,8 +360,7 @@ public class WifiConfigController2Test {
|
||||
View hiddenField = mView.findViewById(R.id.hidden_settings_field);
|
||||
assertThat(hiddenField.getVisibility()).isEqualTo(View.GONE);
|
||||
|
||||
mController = new TestWifiConfigController2(mConfigUiBase, mView, null /* wifiEntry */,
|
||||
WifiConfigUiBase2.MODE_CONNECT);
|
||||
createController(null, WifiConfigUiBase2.MODE_CONNECT, false);
|
||||
assertThat(hiddenField.getVisibility()).isEqualTo(View.VISIBLE);
|
||||
}
|
||||
|
||||
@@ -382,13 +386,11 @@ public class WifiConfigController2Test {
|
||||
|
||||
private void securitySpinnerTestHelper(boolean saeVisible, boolean suitebVisible,
|
||||
boolean oweVisible) {
|
||||
WifiManager wifiManager = mock(WifiManager.class);
|
||||
when(wifiManager.isWpa3SaeSupported()).thenReturn(saeVisible);
|
||||
when(wifiManager.isWpa3SuiteBSupported()).thenReturn(suitebVisible);
|
||||
when(wifiManager.isEnhancedOpenSupported()).thenReturn(oweVisible);
|
||||
when(mWifiManager.isWpa3SaeSupported()).thenReturn(saeVisible);
|
||||
when(mWifiManager.isWpa3SuiteBSupported()).thenReturn(suitebVisible);
|
||||
when(mWifiManager.isEnhancedOpenSupported()).thenReturn(oweVisible);
|
||||
|
||||
mController = new TestWifiConfigController2(mConfigUiBase, mView, null /* wifiEntry */,
|
||||
WifiConfigUiBase2.MODE_MODIFY, wifiManager);
|
||||
createController(null, WifiConfigUiBase2.MODE_MODIFY, false);
|
||||
|
||||
final Spinner securitySpinner = mView.findViewById(R.id.security);
|
||||
final ArrayAdapter<String> adapter = (ArrayAdapter) securitySpinner.getAdapter();
|
||||
@@ -431,23 +433,22 @@ public class WifiConfigController2Test {
|
||||
}
|
||||
}
|
||||
|
||||
public class TestWifiConfigController2 extends WifiConfigController2 {
|
||||
@Test
|
||||
public void whenHideMeteredAndPrivacy_shouldHideMetered() {
|
||||
createController(mWifiEntry, WifiConfigUiBase2.MODE_CONNECT, true);
|
||||
|
||||
private TestWifiConfigController2(
|
||||
WifiConfigUiBase2 parent, View view, WifiEntry wifiEntry, int mode) {
|
||||
super(parent, view, wifiEntry, mode, mWifiManager);
|
||||
}
|
||||
View view = mView.findViewById(R.id.metered_settings_fields);
|
||||
|
||||
private TestWifiConfigController2(
|
||||
WifiConfigUiBase2 parent, View view, WifiEntry wifiEntry, int mode,
|
||||
WifiManager wifiManager) {
|
||||
super(parent, view, wifiEntry, mode, wifiManager);
|
||||
}
|
||||
assertThat(view.getVisibility()).isEqualTo(View.GONE);
|
||||
}
|
||||
|
||||
@Override
|
||||
AndroidKeystoreAliasLoader getAndroidKeystoreAliasLoader() {
|
||||
return mAndroidKeystoreAliasLoader;
|
||||
}
|
||||
@Test
|
||||
public void whenHideMeteredAndPrivacy_shouldHidePrivacy() {
|
||||
createController(mWifiEntry, WifiConfigUiBase2.MODE_CONNECT, true);
|
||||
|
||||
View view = mView.findViewById(R.id.privacy_settings_fields);
|
||||
|
||||
assertThat(view.getVisibility()).isEqualTo(View.GONE);
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -477,8 +478,7 @@ public class WifiConfigController2Test {
|
||||
when(mockWifiConfig.getIpConfiguration()).thenReturn(mock(IpConfiguration.class));
|
||||
when(mWifiEntry.getWifiConfiguration()).thenReturn(mockWifiConfig);
|
||||
mockWifiConfig.macRandomizationSetting = macRandomizedValue;
|
||||
mController = new TestWifiConfigController2(mConfigUiBase, mView, mWifiEntry,
|
||||
WifiConfigUiBase2.MODE_CONNECT);
|
||||
createController(mWifiEntry, WifiConfigUiBase2.MODE_CONNECT, false);
|
||||
|
||||
final Spinner privacySetting = mView.findViewById(R.id.privacy_settings);
|
||||
final int expectedPrefValue =
|
||||
@@ -491,6 +491,7 @@ public class WifiConfigController2Test {
|
||||
|
||||
@Test
|
||||
public void saveMacRandomizedValue_noChanged_shouldPersistentAsDefault() {
|
||||
createController(mWifiEntry, WifiConfigUiBase2.MODE_CONNECT, false);
|
||||
WifiConfiguration config = mController.getConfig();
|
||||
assertThat(config.macRandomizationSetting).isEqualTo(
|
||||
WifiConfiguration.RANDOMIZATION_PERSISTENT);
|
||||
@@ -498,6 +499,7 @@ public class WifiConfigController2Test {
|
||||
|
||||
@Test
|
||||
public void saveMacRandomizedValue_ChangedToNone_shouldGetNone() {
|
||||
createController(mWifiEntry, WifiConfigUiBase2.MODE_CONNECT, false);
|
||||
final Spinner privacySetting = mView.findViewById(R.id.privacy_settings);
|
||||
final int prefMacNone =
|
||||
WifiPrivacyPreferenceController2.translateMacRandomizedValueToPrefValue(
|
||||
@@ -510,6 +512,7 @@ public class WifiConfigController2Test {
|
||||
|
||||
@Test
|
||||
public void replaceTtsString_whenTargetMatched_shouldSuccess() {
|
||||
createController(mWifiEntry, WifiConfigUiBase2.MODE_CONNECT, false);
|
||||
final CharSequence[] display = {"PEAP", "AKA1", "AKA2'"};
|
||||
final CharSequence[] target = {"AKA1", "AKA2'"};
|
||||
final CharSequence[] ttsString = {"AKA1_TTS", "AKA2_TTS"};
|
||||
@@ -524,6 +527,7 @@ public class WifiConfigController2Test {
|
||||
|
||||
@Test
|
||||
public void replaceTtsString_whenNoTargetStringMatched_originalStringShouldNotChanged() {
|
||||
createController(mWifiEntry, WifiConfigUiBase2.MODE_CONNECT, false);
|
||||
final CharSequence[] display = {"PEAP", "AKA1", "AKA2"};
|
||||
final CharSequence[] target = {"WEP1", "WEP2'"};
|
||||
final CharSequence[] ttsString = {"WEP1_TTS", "WEP2_TTS"};
|
||||
@@ -549,10 +553,8 @@ public class WifiConfigController2Test {
|
||||
|
||||
@Test
|
||||
public void selectSecurity_wpa3Eap192bit_eapMethodTls() {
|
||||
final WifiManager wifiManager = mock(WifiManager.class);
|
||||
when(wifiManager.isWpa3SuiteBSupported()).thenReturn(true);
|
||||
mController = new TestWifiConfigController2(mConfigUiBase, mView, null /* wifiEntry */,
|
||||
WifiConfigUiBase2.MODE_MODIFY, wifiManager);
|
||||
when(mWifiManager.isWpa3SuiteBSupported()).thenReturn(true);
|
||||
createController(null, WifiConfigUiBase2.MODE_MODIFY, false);
|
||||
final Spinner securitySpinner = mView.findViewById(R.id.security);
|
||||
final Spinner eapMethodSpinner = mView.findViewById(R.id.method);
|
||||
int wpa3Eap192bitPosition = -1;
|
||||
@@ -573,6 +575,7 @@ public class WifiConfigController2Test {
|
||||
|
||||
@Test
|
||||
public void checkImeStatus_whenAdvancedToggled_shouldBeHide() {
|
||||
createController(mWifiEntry, WifiConfigUiBase2.MODE_CONNECT, false);
|
||||
final InputMethodManager inputMethodManager = mContext
|
||||
.getSystemService(InputMethodManager.class);
|
||||
final ShadowInputMethodManager shadowImm = Shadows.shadowOf(inputMethodManager);
|
||||
@@ -586,6 +589,7 @@ public class WifiConfigController2Test {
|
||||
|
||||
@Test
|
||||
public void selectEapMethod_savedWifiEntry_shouldGetCorrectPosition() {
|
||||
createController(mWifiEntry, WifiConfigUiBase2.MODE_CONNECT, false);
|
||||
setUpModifyingSavedPeapConfigController();
|
||||
final Spinner eapMethodSpinner = mView.findViewById(R.id.method);
|
||||
final Spinner phase2Spinner = mView.findViewById(R.id.phase2);
|
||||
@@ -630,6 +634,7 @@ public class WifiConfigController2Test {
|
||||
|
||||
@Test
|
||||
public void getWepConfig_withNumberAndCharacterKey_shouldContainTheSameKey() {
|
||||
createController(mWifiEntry, WifiConfigUiBase2.MODE_CONNECT, false);
|
||||
final TextView password = mView.findViewById(R.id.password);
|
||||
password.setText(NUMBER_AND_CHARACTER_KEY);
|
||||
mController.mWifiEntrySecurity = WifiEntry.SECURITY_WEP;
|
||||
@@ -641,6 +646,7 @@ public class WifiConfigController2Test {
|
||||
|
||||
@Test
|
||||
public void getWepConfig_withPartialNumberAndCharacterKey_shouldContainDifferentKey() {
|
||||
createController(mWifiEntry, WifiConfigUiBase2.MODE_CONNECT, false);
|
||||
final TextView password = mView.findViewById(R.id.password);
|
||||
password.setText(PARTIAL_NUMBER_AND_CHARACTER_KEY);
|
||||
mController.mWifiEntrySecurity = WifiEntry.SECURITY_WEP;
|
||||
@@ -652,6 +658,7 @@ public class WifiConfigController2Test {
|
||||
|
||||
@Test
|
||||
public void getPskConfig_withValidHexKey_shouldContainTheSameKey() {
|
||||
createController(mWifiEntry, WifiConfigUiBase2.MODE_CONNECT, false);
|
||||
final TextView password = mView.findViewById(R.id.password);
|
||||
password.setText(VALID_HEX_PSK);
|
||||
mController.mWifiEntrySecurity = WifiEntry.SECURITY_PSK;
|
||||
@@ -663,6 +670,7 @@ public class WifiConfigController2Test {
|
||||
|
||||
@Test
|
||||
public void getPskConfig_withInvalidHexKey_shouldContainDifferentKey() {
|
||||
createController(mWifiEntry, WifiConfigUiBase2.MODE_CONNECT, false);
|
||||
final TextView password = mView.findViewById(R.id.password);
|
||||
password.setText(INVALID_HEX_PSK);
|
||||
mController.mWifiEntrySecurity = WifiEntry.SECURITY_PSK;
|
||||
@@ -674,6 +682,7 @@ public class WifiConfigController2Test {
|
||||
|
||||
@Test
|
||||
public void getEapConfig_withPhase2Gtc_shouldContainGtcMethod() {
|
||||
createController(mWifiEntry, WifiConfigUiBase2.MODE_CONNECT, false);
|
||||
setUpModifyingSavedPeapConfigController();
|
||||
|
||||
// Test EAP method PEAP
|
||||
@@ -691,6 +700,7 @@ public class WifiConfigController2Test {
|
||||
|
||||
@Test
|
||||
public void getEapConfig_withPhase2Sim_shouldContainSimMethod() {
|
||||
createController(mWifiEntry, WifiConfigUiBase2.MODE_CONNECT, false);
|
||||
setUpModifyingSavedPeapConfigController();
|
||||
|
||||
// Test EAP method PEAP
|
||||
@@ -708,6 +718,7 @@ public class WifiConfigController2Test {
|
||||
|
||||
@Test
|
||||
public void getEapConfig_withPhase2Aka_shouldContainAkaMethod() {
|
||||
createController(mWifiEntry, WifiConfigUiBase2.MODE_CONNECT, false);
|
||||
setUpModifyingSavedPeapConfigController();
|
||||
|
||||
// Test EAP method PEAP
|
||||
@@ -725,6 +736,7 @@ public class WifiConfigController2Test {
|
||||
|
||||
@Test
|
||||
public void getEapConfig_withPhase2AkaPrime_shouldContainAkaPrimeMethod() {
|
||||
createController(mWifiEntry, WifiConfigUiBase2.MODE_CONNECT, false);
|
||||
setUpModifyingSavedPeapConfigController();
|
||||
|
||||
// Test EAP method PEAP
|
||||
@@ -743,6 +755,7 @@ public class WifiConfigController2Test {
|
||||
|
||||
@Test
|
||||
public void getEapConfig_withPeapPhase2Unknown_shouldContainNoneMethod() {
|
||||
createController(mWifiEntry, WifiConfigUiBase2.MODE_CONNECT, false);
|
||||
setUpModifyingSavedPeapConfigController();
|
||||
|
||||
// Test EAP method PEAP
|
||||
@@ -760,6 +773,7 @@ public class WifiConfigController2Test {
|
||||
|
||||
@Test
|
||||
public void getEapConfig_withTTLSPhase2Pap_shouldContainPapMethod() {
|
||||
createController(mWifiEntry, WifiConfigUiBase2.MODE_CONNECT, false);
|
||||
setUpModifyingSavedPeapConfigController();
|
||||
|
||||
// Test EAP method TTLS
|
||||
@@ -777,6 +791,7 @@ public class WifiConfigController2Test {
|
||||
|
||||
@Test
|
||||
public void getEapConfig_withTTLSPhase2Mschap_shouldContainMschapMethod() {
|
||||
createController(mWifiEntry, WifiConfigUiBase2.MODE_CONNECT, false);
|
||||
setUpModifyingSavedPeapConfigController();
|
||||
|
||||
// Test EAP method TTLS
|
||||
@@ -794,6 +809,7 @@ public class WifiConfigController2Test {
|
||||
|
||||
@Test
|
||||
public void getEapConfig_withTTLSPhase2Gtc_shouldContainGtcMethod() {
|
||||
createController(mWifiEntry, WifiConfigUiBase2.MODE_CONNECT, false);
|
||||
setUpModifyingSavedPeapConfigController();
|
||||
|
||||
// Test EAP method TTLS
|
||||
@@ -819,15 +835,13 @@ public class WifiConfigController2Test {
|
||||
when(mockWifiEnterpriseConfig.getEapMethod()).thenReturn(Eap.PEAP);
|
||||
mockWifiConfig.enterpriseConfig = mockWifiEnterpriseConfig;
|
||||
when(mWifiEntry.getWifiConfiguration()).thenReturn(mockWifiConfig);
|
||||
mController = new TestWifiConfigController2(mConfigUiBase, mView, mWifiEntry,
|
||||
WifiConfigUiBase2.MODE_MODIFY);
|
||||
createController(mWifiEntry, WifiConfigUiBase2.MODE_MODIFY, false);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void loadSims_noSim_simSpinnerDefaultNoSim() {
|
||||
when(mWifiEntry.getSecurity()).thenReturn(WifiEntry.SECURITY_EAP);
|
||||
mController = new TestWifiConfigController2(mConfigUiBase, mView, mWifiEntry,
|
||||
WifiConfigUiBase2.MODE_CONNECT);
|
||||
createController(mWifiEntry, WifiConfigUiBase2.MODE_CONNECT, false);
|
||||
mController.mEapMethodSpinner = mEapMethodSimSpinner;
|
||||
|
||||
mController.loadSims();
|
||||
@@ -847,8 +861,7 @@ public class WifiConfigController2Test {
|
||||
when(subscriptionInfo.getCarrierName()).thenReturn("FAKE-CARRIER");
|
||||
SubscriptionUtil.setAvailableSubscriptionsForTesting(Arrays.asList(subscriptionInfo));
|
||||
mShadowSubscriptionManager.setActiveSubscriptionInfoList(Arrays.asList(subscriptionInfo));
|
||||
mController = new TestWifiConfigController2(mConfigUiBase, mView, mWifiEntry,
|
||||
WifiConfigUiBase2.MODE_CONNECT);
|
||||
createController(mWifiEntry, WifiConfigUiBase2.MODE_CONNECT, false);
|
||||
mController.mEapMethodSpinner = mEapMethodSimSpinner;
|
||||
|
||||
mController.loadSims();
|
||||
@@ -864,8 +877,7 @@ public class WifiConfigController2Test {
|
||||
SubscriptionUtil.setAvailableSubscriptionsForTesting(Arrays.asList(sub1, sub2));
|
||||
mShadowSubscriptionManager.setActiveSubscriptionInfoList(Arrays.asList(sub1, sub2));
|
||||
when(mWifiEntry.getSecurity()).thenReturn(WifiEntry.SECURITY_EAP);
|
||||
mController = new TestWifiConfigController2(mConfigUiBase, mView, mWifiEntry,
|
||||
WifiConfigUiBase2.MODE_CONNECT);
|
||||
createController(mWifiEntry, WifiConfigUiBase2.MODE_CONNECT, false);
|
||||
mController.mEapMethodSpinner = mEapMethodSimSpinner;
|
||||
ShadowSubscriptionManager.setDefaultDataSubscriptionId(1);
|
||||
|
||||
@@ -881,8 +893,7 @@ public class WifiConfigController2Test {
|
||||
SubscriptionUtil.setAvailableSubscriptionsForTesting(Arrays.asList(sub1, sub2));
|
||||
mShadowSubscriptionManager.setActiveSubscriptionInfoList(Arrays.asList(sub1, sub2));
|
||||
when(mWifiEntry.getSecurity()).thenReturn(WifiEntry.SECURITY_EAP);
|
||||
mController = new TestWifiConfigController2(mConfigUiBase, mView, mWifiEntry,
|
||||
WifiConfigUiBase2.MODE_CONNECT);
|
||||
createController(mWifiEntry, WifiConfigUiBase2.MODE_CONNECT, false);
|
||||
mController.mEapMethodSpinner = mEapMethodSimSpinner;
|
||||
ShadowSubscriptionManager.setDefaultDataSubscriptionId(1);
|
||||
|
||||
@@ -909,6 +920,7 @@ public class WifiConfigController2Test {
|
||||
|
||||
@Test
|
||||
public void onItemSelected_shouldPersistentInstallCertsAndStartInstallActivity() {
|
||||
createController(mWifiEntry, WifiConfigUiBase2.MODE_CONNECT, false);
|
||||
String installCertsString = "install_certs";
|
||||
Spinner eapCaCertSpinner = mock(Spinner.class);
|
||||
AdapterView view = mock(AdapterView.class);
|
||||
@@ -950,6 +962,7 @@ public class WifiConfigController2Test {
|
||||
|
||||
@Test
|
||||
public void getEapMinTlsVerSpinner_isTlsV13Supported_containsTlsV13() {
|
||||
createController(mWifiEntry, WifiConfigUiBase2.MODE_CONNECT, false);
|
||||
Spinner spinner = mController.getEapMinTlsVerSpinner(true /* isTlsV13Supported */);
|
||||
|
||||
List<Object> list = IntStream.range(0, spinner.getAdapter().getCount())
|
||||
@@ -960,6 +973,7 @@ public class WifiConfigController2Test {
|
||||
|
||||
@Test
|
||||
public void getEapMinTlsVerSpinner_isNotTlsV13Supported_doesNotContainTlsV13() {
|
||||
createController(mWifiEntry, WifiConfigUiBase2.MODE_CONNECT, false);
|
||||
Spinner spinner = mController.getEapMinTlsVerSpinner(false /* isTlsV13Supported */);
|
||||
|
||||
List<Object> list = IntStream.range(0, spinner.getAdapter().getCount())
|
||||
@@ -970,6 +984,7 @@ public class WifiConfigController2Test {
|
||||
|
||||
@Test
|
||||
public void setAnonymousIdVisible_showAnonymousIdAndSetDefaultId() {
|
||||
createController(mWifiEntry, WifiConfigUiBase2.MODE_CONNECT, false);
|
||||
View anonymousLayout = mView.findViewById(R.id.l_anonymous);
|
||||
TextView anonymousId = mView.findViewById(R.id.anonymous);
|
||||
mController.mEapAnonymousView = anonymousId;
|
||||
@@ -1008,8 +1023,7 @@ public class WifiConfigController2Test {
|
||||
.thenReturn(ImmutableList.of(savedUserCertificate));
|
||||
}
|
||||
|
||||
mController = new TestWifiConfigController2(mConfigUiBase, mView, mWifiEntry,
|
||||
WifiConfigUiBase2.MODE_MODIFY);
|
||||
createController(mWifiEntry, WifiConfigUiBase2.MODE_MODIFY, false);
|
||||
|
||||
// Because Robolectric has a different behavior from normal flow.
|
||||
//
|
||||
|
||||
Reference in New Issue
Block a user