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

Merge "Refine carrier Wi-Fi functions" into tm-dev am: 750376ec40 am: 676498649e am: 42b9b5dcb4 am: 25a3f4177c

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18558087

Change-Id: I4cb1d770785f68e25f91fb8e886426344eeea8d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Weng Su
2022-05-25 09:14:35 +00:00
committed by Automerger Merge Worker
parent 81618d155e 25a3f4177c
commit 17d162c8b5
4 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -107,14 +107,14 @@ public class CarrierWifiTogglePreferenceControllerTest {
@Test
public void isChecked_carrierNetworkEnabled_returnTrue() {
doReturn(true).when(mWifiPickerTrackerHelper).isCarrierNetworkEnabled(SUB_ID);
doReturn(true).when(mWifiPickerTrackerHelper).isCarrierNetworkEnabled();
assertThat(mController.isChecked()).isEqualTo(true);
}
@Test
public void isChecked_carrierNetworkDisabled_returnFalse() {
doReturn(false).when(mWifiPickerTrackerHelper).isCarrierNetworkEnabled(SUB_ID);
doReturn(false).when(mWifiPickerTrackerHelper).isCarrierNetworkEnabled();
assertThat(mController.isChecked()).isEqualTo(false);
}

10
tests/unit/src/com/android/settings/wifi/WifiPickerTrackerHelperTest.java
View File

@@ -24,7 +24,6 @@ import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
@@ -135,14 +134,13 @@ public class WifiPickerTrackerHelperTest {
@Test
public void isCarrierNetworkEnabled_returnCorrect() {
doReturn(true).when(mWifiManager).isCarrierNetworkOffloadEnabled(SUB_ID, true /* merged */);
when(mMergedCarrierEntry.isEnabled()).thenReturn(true);
assertThat(mWifiPickerTrackerHelper.isCarrierNetworkEnabled(SUB_ID)).isTrue();
assertThat(mWifiPickerTrackerHelper.isCarrierNetworkEnabled()).isTrue();
doReturn(false).when(mWifiManager)
.isCarrierNetworkOffloadEnabled(SUB_ID, true /* merged */);
when(mMergedCarrierEntry.isEnabled()).thenReturn(false);
assertThat(mWifiPickerTrackerHelper.isCarrierNetworkEnabled(SUB_ID)).isFalse();
assertThat(mWifiPickerTrackerHelper.isCarrierNetworkEnabled()).isFalse();
}
@Test