Merge "[Wi-Fi HotSpot] Improve Wi-Fi hotspot settings entries visibility problem"

This commit is contained in:
Goven Liu
2019-08-16 07:51:50 +00:00
committed by Android (Google) Code Review
10 changed files with 42 additions and 19 deletions

View File

@@ -128,19 +128,19 @@ public class WifiTetherApBandPreferenceControllerTest {
mController.onPreferenceChange(mPreference, "-1");
assertThat(mController.getBandIndex()).isEqualTo(1);
assertThat(mPreference.getSummary()).isEqualTo(FIVE_GHZ_STRING);
verify(mListener, times(1)).onTetherConfigUpdated();
verify(mListener, times(1)).onTetherConfigUpdated(mController);
// set to 5 Ghz
mController.onPreferenceChange(mPreference, "1");
assertThat(mController.getBandIndex()).isEqualTo(1);
assertThat(mPreference.getSummary()).isEqualTo(FIVE_GHZ_STRING);
verify(mListener, times(2)).onTetherConfigUpdated();
verify(mListener, times(2)).onTetherConfigUpdated(mController);
// set to 2 Ghz
mController.onPreferenceChange(mPreference, "0");
assertThat(mController.getBandIndex()).isEqualTo(0);
assertThat(mPreference.getSummary()).isEqualTo(TWO_GHZ_STRING);
verify(mListener, times(3)).onTetherConfigUpdated();
verify(mListener, times(3)).onTetherConfigUpdated(mController);
}
@Test
@@ -155,19 +155,19 @@ public class WifiTetherApBandPreferenceControllerTest {
mController.onPreferenceChange(mPreference, "-1");
assertThat(mController.getBandIndex()).isEqualTo(-1);
assertThat(mPreference.getSummary()).isEqualTo(ALL_BANDS);
verify(mListener, times(1)).onTetherConfigUpdated();
verify(mListener, times(1)).onTetherConfigUpdated(mController);
// should revert to the default for 5 Ghz only since this is not supported with this config
mController.onPreferenceChange(mPreference, "1");
assertThat(mController.getBandIndex()).isEqualTo(-1);
assertThat(mPreference.getSummary()).isEqualTo(ALL_BANDS);
verify(mListener, times(2)).onTetherConfigUpdated();
verify(mListener, times(2)).onTetherConfigUpdated(mController);
// set to 2 Ghz
mController.onPreferenceChange(mPreference, "0");
assertThat(mController.getBandIndex()).isEqualTo(0);
assertThat(mPreference.getSummary()).isEqualTo(TWO_GHZ_STRING);
verify(mListener, times(3)).onTetherConfigUpdated();
verify(mListener, times(3)).onTetherConfigUpdated(mController);
}
@Test

View File

@@ -99,7 +99,7 @@ public class WifiTetherPasswordPreferenceControllerTest {
assertThat(mController.getPasswordValidated(WifiConfiguration.KeyMgmt.WPA2_PSK))
.isEqualTo(VALID_PASS2);
verify(mListener, times(2)).onTetherConfigUpdated();
verify(mListener, times(2)).onTetherConfigUpdated(mController);
}
@Test

View File

@@ -102,7 +102,7 @@ public class WifiTetherSSIDPreferenceControllerTest {
mController.onPreferenceChange(mPreference, "0");
assertThat(mController.getSSID()).isEqualTo("0");
verify(mListener, times(2)).onTetherConfigUpdated();
verify(mListener, times(2)).onTetherConfigUpdated(mController);
}
@Test