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

Show mobile data icon with carrier Wi-Fi level in Settings

Browse Source 
- If carrier Wi-Fi is active then use carrier Wi-Fi level instead of
  mobile data level.

- If carrier Wi-Fi level is less than min-level, use min-level instead.

Bug: 222885558
Test: manual test
atest -c SubscriptionsPreferenceControllerTest \
         WifiPickerTrackerHelperTest

Change-Id: I46ba5129357bae47e5e44dcbbb26e6673581fdc8
This commit is contained in:
Weng Su
2022-05-19 05:03:58 +08:00
parent 1cf78b8b83
commit f8f2d17b66
4 changed files with 120 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,6 +16,10 @@
package com.android.settings.wifi;
import static com.android.wifitrackerlib.WifiEntry.WIFI_LEVEL_MAX;
import static com.android.wifitrackerlib.WifiEntry.WIFI_LEVEL_MIN;
import static com.android.wifitrackerlib.WifiEntry.WIFI_LEVEL_UNREACHABLE;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any;
@@ -23,7 +27,6 @@ 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.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -48,6 +51,7 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.Spy;
import org.mockito.junit.MockitoJUnit;
import org.mockito.junit.MockitoRule;
@@ -58,6 +62,8 @@ public class WifiPickerTrackerHelperTest {
@Rule
public final MockitoRule mMockitoRule = MockitoJUnit.rule();
@Spy
Context mContext = ApplicationProvider.getApplicationContext();
@Mock
public WifiManager mWifiManager;
@Mock
@@ -76,11 +82,10 @@ public class WifiPickerTrackerHelperTest {
@Before
public void setUp() {
final Context context = spy(ApplicationProvider.getApplicationContext());
when(context.getSystemService(WifiManager.class)).thenReturn(mWifiManager);
when(mContext.getSystemService(WifiManager.class)).thenReturn(mWifiManager);
mCarrierConfig = new PersistableBundle();
when(mCarrierConfigCache.getConfigForSubId(SUB_ID)).thenReturn(mCarrierConfig);
CarrierConfigCache.setTestInstance(context, mCarrierConfigCache);
CarrierConfigCache.setTestInstance(mContext, mCarrierConfigCache);
mFeatureFactory = FakeFeatureFactory.setupForTest();
when(mFeatureFactory.wifiTrackerLibProvider
@@ -88,7 +93,9 @@ public class WifiPickerTrackerHelperTest {
any(), any(), any(), any(), any(), anyLong(), anyLong(), any()))
.thenReturn(mWifiPickerTracker);
mWifiPickerTrackerHelper = new WifiPickerTrackerHelper(mock(Lifecycle.class),
context, null);
mContext, null);
when(mWifiPickerTracker.getMergedCarrierEntry()).thenReturn(mMergedCarrierEntry);
mWifiPickerTrackerHelper.setWifiPickerTracker(mWifiPickerTracker);
}
@Test
@@ -140,9 +147,6 @@ public class WifiPickerTrackerHelperTest {
@Test
public void setCarrierNetworkEnabled_shouldSetCorrect() {
mWifiPickerTrackerHelper.setWifiPickerTracker(mWifiPickerTracker);
when(mWifiPickerTracker.getMergedCarrierEntry()).thenReturn(mMergedCarrierEntry);
mWifiPickerTrackerHelper.setCarrierNetworkEnabled(true);
verify(mMergedCarrierEntry).setEnabled(true);
@@ -154,7 +158,6 @@ public class WifiPickerTrackerHelperTest {
@Test
public void setCarrierNetworkEnabled_mergedCarrierEntryIsNull_shouldNotSet() {
mWifiPickerTrackerHelper.setWifiPickerTracker(mWifiPickerTracker);
when(mWifiPickerTracker.getMergedCarrierEntry()).thenReturn(null);
mWifiPickerTrackerHelper.setCarrierNetworkEnabled(true);
@@ -168,8 +171,6 @@ public class WifiPickerTrackerHelperTest {
@Test
public void connectCarrierNetwork_returnTrueAndConnect() {
mWifiPickerTrackerHelper.setWifiPickerTracker(mWifiPickerTracker);
when(mWifiPickerTracker.getMergedCarrierEntry()).thenReturn(mMergedCarrierEntry);
when(mMergedCarrierEntry.canConnect()).thenReturn(true);
assertThat(mWifiPickerTrackerHelper.connectCarrierNetwork(mConnectCallback)).isTrue();
@@ -178,7 +179,6 @@ public class WifiPickerTrackerHelperTest {
@Test
public void connectCarrierNetwork_mergedCarrierEntryIsNull_returnFalse() {
mWifiPickerTrackerHelper.setWifiPickerTracker(mWifiPickerTracker);
when(mWifiPickerTracker.getMergedCarrierEntry()).thenReturn(null);
assertThat(mWifiPickerTrackerHelper.connectCarrierNetwork(mConnectCallback)).isFalse();
@@ -186,11 +186,32 @@ public class WifiPickerTrackerHelperTest {
@Test
public void connectCarrierNetwork_canConnectIsFalse_returnFalseAndNeverConnect() {
mWifiPickerTrackerHelper.setWifiPickerTracker(mWifiPickerTracker);
when(mWifiPickerTracker.getMergedCarrierEntry()).thenReturn(mMergedCarrierEntry);
when(mMergedCarrierEntry.canConnect()).thenReturn(false);
assertThat(mWifiPickerTrackerHelper.connectCarrierNetwork(mConnectCallback)).isFalse();
verify(mMergedCarrierEntry, never()).connect(mConnectCallback);
}
@Test
public void getCarrierNetworkLevel_mergedCarrierEntryIsNull_returnMinLevel() {
when(mWifiPickerTracker.getMergedCarrierEntry()).thenReturn(null);
assertThat(mWifiPickerTrackerHelper.getCarrierNetworkLevel()).isEqualTo(WIFI_LEVEL_MIN);
}
@Test
public void getCarrierNetworkLevel_getUnreachableLevel_returnMinLevel() {
when(mMergedCarrierEntry.getLevel()).thenReturn(WIFI_LEVEL_UNREACHABLE);
assertThat(mWifiPickerTrackerHelper.getCarrierNetworkLevel()).isEqualTo(WIFI_LEVEL_MIN);
}
@Test
public void getCarrierNetworkLevel_getAvailableLevel_returnSameLevel() {
for (int level = WIFI_LEVEL_MIN; level <= WIFI_LEVEL_MAX; level++) {
when(mMergedCarrierEntry.getLevel()).thenReturn(level);
assertThat(mWifiPickerTrackerHelper.getCarrierNetworkLevel()).isEqualTo(level);
}
}
}