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

[Provider Model] Carrie Wi-Fi offload toggle request (panel)

Browse Source 
- Do not set Carrier Network together when setting Mobile Data, if
carrner network provision enabled.

Bug: 182324921
Test: manual test
atest -c ProviderModelSliceTest
make RunSettingsRoboTests ROBOTEST_FILTER=WifiScanWorkerTest

Change-Id: Ic8b77fd7b43372f077ba1c8be8fd9a7c3bcff197
This commit is contained in:
Weng Su
2021-04-20 22:27:44 +08:00
parent aeb6200bfe
commit a320fb12a1
4 changed files with 46 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
tests/robotests/src/com/android/settings/wifi/slice/WifiScanWorkerTest.java
View File

@@ -22,12 +22,13 @@ import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import androidx.lifecycle.Lifecycle;
import com.android.wifitrackerlib.MergedCarrierEntry;
import com.android.settings.wifi.WifiPickerTrackerHelper;
import com.android.wifitrackerlib.WifiEntry;
import com.android.wifitrackerlib.WifiPickerTracker;
@@ -44,11 +45,13 @@ import java.util.Arrays;
@RunWith(RobolectricTestRunner.class)
public class WifiScanWorkerTest {
private static final int SUB_ID = 2;
private WifiScanWorker mWifiScanWorker;
@Mock
WifiPickerTracker mWifiPickerTracker;
@Mock
MergedCarrierEntry mMergedCarrierEntry;
WifiPickerTrackerHelper mWifiPickerTrackerHelper;
@Before
public void setUp() {
@@ -56,7 +59,8 @@ public class WifiScanWorkerTest {
mWifiScanWorker = new WifiScanWorker(RuntimeEnvironment.application, WIFI_SLICE_URI);
mWifiScanWorker.mWifiPickerTracker = mWifiPickerTracker;
when(mWifiPickerTracker.getMergedCarrierEntry()).thenReturn(mMergedCarrierEntry);
mWifiScanWorker.mWifiPickerTrackerHelper = mWifiPickerTrackerHelper;
when(mWifiPickerTrackerHelper.isCarrierNetworkProvisionEnabled(SUB_ID)).thenReturn(false);
}
@Test
@@ -110,22 +114,33 @@ public class WifiScanWorkerTest {
}
@Test
public void setCarrierNetworkEnabled_shouldCallMergedCarrierEntrySetEnabled() {
mWifiScanWorker.setCarrierNetworkEnabled(true);
public void setCarrierNetworkEnabledIfNeeded_shouldSetCarrierNetworkEnabled() {
mWifiScanWorker.setCarrierNetworkEnabledIfNeeded(true, SUB_ID);
verify(mMergedCarrierEntry).setEnabled(true);
verify(mWifiPickerTrackerHelper).setCarrierNetworkEnabled(true);
mWifiScanWorker.setCarrierNetworkEnabled(false);
mWifiScanWorker.setCarrierNetworkEnabledIfNeeded(false, SUB_ID);
verify(mMergedCarrierEntry).setEnabled(false);
verify(mWifiPickerTrackerHelper).setCarrierNetworkEnabled(false);
}
@Test
public void connectCarrierNetwork_shouldCallMergedCarrierEntryConnect() {
when(mMergedCarrierEntry.canConnect()).thenReturn(true);
public void setCarrierNetworkEnabledIfNeeded_enabledProvision_neverSetCarrierNetworkEnabled() {
when(mWifiPickerTrackerHelper.isCarrierNetworkProvisionEnabled(SUB_ID)).thenReturn(true);
mWifiScanWorker.setCarrierNetworkEnabledIfNeeded(true, SUB_ID);
verify(mWifiPickerTrackerHelper, never()).setCarrierNetworkEnabled(true);
mWifiScanWorker.setCarrierNetworkEnabledIfNeeded(false, SUB_ID);
verify(mWifiPickerTrackerHelper, never()).setCarrierNetworkEnabled(false);
}
@Test
public void connectCarrierNetwork_shouldConnectCarrierNetwork() {
mWifiScanWorker.connectCarrierNetwork();
verify(mMergedCarrierEntry).connect(any());
verify(mWifiPickerTrackerHelper).connectCarrierNetwork(any());
}
}