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

Merge "[Provider Model] Hide W+ network if it's inactive" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-06-15 09:23:58 +00:00
committed by Android (Google) Code Review
parent 153c3a1dc2 c4eb3b1320
commit 1ce0d1117e
6 changed files with 59 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
tests/unit/src/com/android/settings/network/CarrierWifiTogglePreferenceControllerTest.java
View File

@@ -72,8 +72,10 @@ public class CarrierWifiTogglePreferenceControllerTest {
mController.init(mock(Lifecycle.class), SUB_ID);
mController.mIsProviderModelEnabled = true;
mController.mIsCarrierProvisionWifiEnabled = true;
doReturn(true).when(mWifiPickerTrackerHelper).isCarrierNetworkActive();
doReturn(SSID).when(mWifiPickerTrackerHelper).getCarrierNetworkSsid();
mController.mWifiPickerTrackerHelper = mWifiPickerTrackerHelper;
if (Looper.myLooper() == null) {
Looper.prepare();
}
@@ -87,6 +89,7 @@ public class CarrierWifiTogglePreferenceControllerTest {
mNetworkPreference.setKey(
CarrierWifiTogglePreferenceController.CARRIER_WIFI_NETWORK_PREF_KEY);
mScreen.addPreference(mNetworkPreference);
mController.mCarrierNetworkPreference = mNetworkPreference;
}
@Test
@@ -139,8 +142,9 @@ public class CarrierWifiTogglePreferenceControllerTest {
}
@Test
public void displayPreference_carrierNetworkEnabled_showCarrierNetwork() {
doReturn(true).when(mWifiPickerTrackerHelper).isCarrierNetworkEnabled(SUB_ID);
public void displayPreference_carrierNetworkActive_showCarrierNetwork() {
doReturn(true).when(mWifiPickerTrackerHelper).isCarrierNetworkActive();
doReturn(SSID).when(mWifiPickerTrackerHelper).getCarrierNetworkSsid();
mController.displayPreference(mScreen);
@@ -150,8 +154,8 @@ public class CarrierWifiTogglePreferenceControllerTest {
}
@Test
public void displayPreference_carrierNetworkDisabled_hideCarrierNetwork() {
doReturn(false).when(mWifiPickerTrackerHelper).isCarrierNetworkEnabled(SUB_ID);
public void displayPreference_carrierNetworkInactive_hideCarrierNetwork() {
doReturn(false).when(mWifiPickerTrackerHelper).isCarrierNetworkActive();
mController.displayPreference(mScreen);
@@ -160,24 +164,48 @@ public class CarrierWifiTogglePreferenceControllerTest {
}
@Test
public void onWifiStateChanged_carrierNetworkVisible_shouldSetSummary() {
mController.mCarrierNetworkPreference = mNetworkPreference;
mNetworkPreference.setVisible(true);
public void onWifiStateChanged_carrierNetworkActive_shouldSetSummary() {
doReturn(true).when(mWifiPickerTrackerHelper).isCarrierNetworkActive();
doReturn(SSID).when(mWifiPickerTrackerHelper).getCarrierNetworkSsid();
mNetworkPreference.setVisible(false);
mNetworkPreference.setSummary(null);
mController.onWifiEntriesChanged();
assertThat(mNetworkPreference.isVisible()).isEqualTo(true);
assertThat(mNetworkPreference.getSummary()).isEqualTo(SSID);
}
@Test
public void onWifiEntriesChanged_carrierNetworkVisible_shouldSetSummary() {
mController.mCarrierNetworkPreference = mNetworkPreference;
public void onWifiStateChanged_carrierNetworkInactive_shouldHideNetwork() {
doReturn(false).when(mWifiPickerTrackerHelper).isCarrierNetworkActive();
mNetworkPreference.setVisible(true);
mController.onWifiEntriesChanged();
assertThat(mNetworkPreference.isVisible()).isEqualTo(false);
}
@Test
public void onWifiEntriesChanged_carrierNetworkActive_shouldSetSummary() {
doReturn(true).when(mWifiPickerTrackerHelper).isCarrierNetworkActive();
doReturn(SSID).when(mWifiPickerTrackerHelper).getCarrierNetworkSsid();
mNetworkPreference.setVisible(false);
mNetworkPreference.setSummary(null);
mController.onWifiEntriesChanged();
assertThat(mNetworkPreference.isVisible()).isEqualTo(true);
assertThat(mNetworkPreference.getSummary()).isEqualTo(SSID);
}
@Test
public void onWifiEntriesChanged_carrierNetworkInactive_shouldHideNetwork() {
doReturn(false).when(mWifiPickerTrackerHelper).isCarrierNetworkActive();
mNetworkPreference.setVisible(true);
mController.onWifiEntriesChanged();
assertThat(mNetworkPreference.isVisible()).isEqualTo(false);
}
}

2
tests/unit/src/com/android/settings/network/SubscriptionsPreferenceControllerTest.java
View File

@@ -455,7 +455,7 @@ public class SubscriptionsPreferenceControllerTest {
doReturn(mock(MobileMappings.Config.class)).when(sInjector).getConfig(mContext);
doReturn(networkType)
.when(sInjector).getNetworkType(any(), any(), any(), anyInt(), eq(true));
doReturn(true).when(mWifiPickerTrackerHelper).isActiveCarrierNetwork();
doReturn(true).when(mWifiPickerTrackerHelper).isCarrierNetworkActive();
mController.setWifiPickerTrackerHelper(mWifiPickerTrackerHelper);
mController.onResume();