Merge "Allow 64 char HEX string PSKs in WifiSettingsUi" into oc-mr1-dev am: 85f59ff42d

am: 91aeed6f55

Change-Id: I65d9d59816f9a1b248bfa9bcf7e801260f60bc01
This commit is contained in:
Glen Kuhne
2017-10-12 19:14:50 +00:00
committed by android-build-merger
2 changed files with 21 additions and 4 deletions

View File

@@ -55,8 +55,9 @@ public class WifiConfigControllerTest {
private AccessPoint mAccessPoint;
public WifiConfigController mController;
// An invalid PSK pass phrase. It is 64 characters long, must not be greater than 63
private static final String HEX_PSK = "01234567012345670123456701234567012345670123456701234567"
+ "01abcdef";
// An invalid ASCII PSK pass phrase. It is 64 characters long, must not be greater than 63
private static final String LONG_PSK =
"abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijkl";
// An invalid PSK pass phrase. It is 7 characters long, must be at least 8
@@ -140,6 +141,14 @@ public class WifiConfigControllerTest {
}
@Test
public void isSubmittable_hexPsk_shouldReturnTrue() {
final TextView password = mView.findViewById(R.id.password);
password.setText(HEX_PSK);
assertThat(mController.isSubmittable()).isTrue();
}
@Test
public void isSubmittable_savedConfigZeroLengthPassword_shouldReturnTrue() {
final TextView password = mView.findViewById(R.id.password);