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

Merge "Update add network dialog to not make networks hidden by default" into pi-dev am: 9dc3f74ccf

Browse Source 
am: e36aafd230

Change-Id: I1899e6d309bdb6c997cc9846742623cb272a8aab
This commit is contained in:
Salvador Martinez
2018-03-31 07:43:17 +00:00
committed by android-build-merger
parent a90332397b e36aafd230
commit 0f9a6d439f
5 changed files with 76 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -61,6 +61,7 @@ public class WifiConfigControllerTest {
private AccessPoint mAccessPoint;
@Mock
private KeyStore mKeyStore;
private Spinner mHiddenSettingsSpinner;
public WifiConfigController mController;
private static final String HEX_PSK = "01234567012345670123456701234567012345670123456701234567"
@@ -82,6 +83,7 @@ public class WifiConfigControllerTest {
when(mAccessPoint.getSecurity()).thenReturn(AccessPoint.SECURITY_PSK);
mView = LayoutInflater.from(mContext).inflate(R.layout.wifi_dialog, null);
final Spinner ipSettingsSpinner = mView.findViewById(R.id.ip_settings);
mHiddenSettingsSpinner = mView.findViewById(R.id.hidden_settings);
ipSettingsSpinner.setSelection(DHCP);
mController = new TestWifiConfigController(mConfigUiBase, mView, mAccessPoint,
@@ -246,6 +248,16 @@ public class WifiConfigControllerTest {
assertThat(password.isFocused()).isTrue();
}
@Test
public void hiddenWarning_warningVisibilityProperlyUpdated() {
View warningView = mView.findViewById(R.id.hidden_settings_warning);
mController.onItemSelected(mHiddenSettingsSpinner, null, mController.HIDDEN_NETWORK, 0);
assertThat(warningView.getVisibility()).isEqualTo(View.VISIBLE);
mController.onItemSelected(mHiddenSettingsSpinner, null, mController.NOT_HIDDEN_NETWORK, 0);
assertThat(warningView.getVisibility()).isEqualTo(View.GONE);
}
public class TestWifiConfigController extends WifiConfigController {
private TestWifiConfigController(