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

Merge "Still check the visibility of view"

Browse Source
This commit is contained in:
Lei Yu
2018-10-04 17:08:58 +00:00
committed by Android (Google) Code Review
parent 03f2d1e55d e95f07dff6
commit 220b11b0f3
2 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/wifi/WifiConfigController.java
View File

@@ -123,7 +123,8 @@ public class WifiConfigController implements TextWatcher,
private final ArrayAdapter<String> mPhase2FullAdapter; private final ArrayAdapter<String> mPhase2FullAdapter;
// e.g. AccessPoint.SECURITY_NONE // e.g. AccessPoint.SECURITY_NONE
private int mAccessPointSecurity; @VisibleForTesting
int mAccessPointSecurity;
private TextView mPasswordView; private TextView mPasswordView;
private String mUnspecifiedCertString; private String mUnspecifiedCertString;
@@ -465,7 +466,8 @@ public class WifiConfigController implements TextWatcher,
} else { } else {
enabled = ipAndProxyFieldsAreValid(); enabled = ipAndProxyFieldsAreValid();
} }
if (mAccessPointSecurity == AccessPoint.SECURITY_EAP) { if (mAccessPointSecurity == AccessPoint.SECURITY_EAP && mEapCaCertSpinner != null
&& mView.findViewById(R.id.l_ca_cert).getVisibility() != View.GONE) {
String caCertSelection = (String) mEapCaCertSpinner.getSelectedItem(); String caCertSelection = (String) mEapCaCertSpinner.getSelectedItem();
if (caCertSelection.equals(mUnspecifiedCertString)) { if (caCertSelection.equals(mUnspecifiedCertString)) {
// Disallow submit if the user has not selected a CA certificate for an EAP network // Disallow submit if the user has not selected a CA certificate for an EAP network
@@ -481,7 +483,8 @@ public class WifiConfigController implements TextWatcher,
enabled = false; enabled = false;
} }
} }
if (mAccessPointSecurity == AccessPoint.SECURITY_EAP if (mAccessPointSecurity == AccessPoint.SECURITY_EAP && mEapUserCertSpinner != null
&& mView.findViewById(R.id.l_user_cert).getVisibility() != View.GONE
&& mEapUserCertSpinner.getSelectedItem().equals(mUnspecifiedCertString)) { && mEapUserCertSpinner.getSelectedItem().equals(mUnspecifiedCertString)) {
// Disallow submit if the user has not selected a user certificate for an EAP network // Disallow submit if the user has not selected a user certificate for an EAP network
// configuration. // configuration.

17
tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java
View File

@@ -57,11 +57,10 @@ public class WifiConfigControllerTest {
@Mock @Mock
private Context mContext; private Context mContext;
@Mock @Mock
private View mView;
@Mock
private AccessPoint mAccessPoint; private AccessPoint mAccessPoint;
@Mock @Mock
private KeyStore mKeyStore; private KeyStore mKeyStore;
private View mView;
private Spinner mHiddenSettingsSpinner; private Spinner mHiddenSettingsSpinner;
public WifiConfigController mController; public WifiConfigController mController;
@@ -74,6 +73,7 @@ public class WifiConfigControllerTest {
private static final String SHORT_PSK = "abcdefg"; private static final String SHORT_PSK = "abcdefg";
// Valid PSK pass phrase // Valid PSK pass phrase
private static final String GOOD_PSK = "abcdefghijklmnopqrstuvwxyz"; private static final String GOOD_PSK = "abcdefghijklmnopqrstuvwxyz";
private static final String GOOD_SSID = "abc";
private static final int DHCP = 0; private static final int DHCP = 0;
@Before @Before
@@ -185,6 +185,9 @@ public class WifiConfigControllerTest {
@Test @Test
public void isSubmittable_EapToPskWithValidPassword_shouldReturnTrue() { public void isSubmittable_EapToPskWithValidPassword_shouldReturnTrue() {
mController = new TestWifiConfigController(mConfigUiBase, mView, null,
WifiConfigUiBase.MODE_CONNECT);
final TextView ssid = mView.findViewById(R.id.ssid);
final TextView password = mView.findViewById(R.id.password); final TextView password = mView.findViewById(R.id.password);
final Spinner securitySpinner = mView.findViewById(R.id.security); final Spinner securitySpinner = mView.findViewById(R.id.security);
assertThat(password).isNotNull(); assertThat(password).isNotNull();
@@ -195,6 +198,16 @@ public class WifiConfigControllerTest {
mController.onItemSelected(securitySpinner, null, AccessPoint.SECURITY_EAP, 0); mController.onItemSelected(securitySpinner, null, AccessPoint.SECURITY_EAP, 0);
mController.onItemSelected(securitySpinner, null, AccessPoint.SECURITY_PSK, 0); mController.onItemSelected(securitySpinner, null, AccessPoint.SECURITY_PSK, 0);
password.setText(GOOD_PSK); password.setText(GOOD_PSK);
ssid.setText(GOOD_SSID);
assertThat(mController.isSubmittable()).isTrue();
}
@Test
public void isSubmittable_EapWithAkaMethod_shouldReturnTrue() {
when(mAccessPoint.isSaved()).thenReturn(true);
mController.mAccessPointSecurity = AccessPoint.SECURITY_EAP;
mView.findViewById(R.id.l_ca_cert).setVisibility(View.GONE);
assertThat(mController.isSubmittable()).isTrue(); assertThat(mController.isSubmittable()).isTrue();
} }