Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update test to adopt new API for check network support

Browse Source 
The isAvailable() in AbstractSimStatusImeiInfoPreferenceController
refers to Utils.isWifiOnly() which was updated in the modulization
work to refer TelephonyManager.isDataCapable(). The test here
should mock the data capable value instead of the connectivity one.

Update the usage accordingly to fix the broken test.

Test: make RunSettingsLibRoboTests \
      ROBOTEST_FILTER=SimStatusImeiInfoPreferenceControllerTest
Bug: 205788196
Change-Id: I79f6dad54cdcb1c506355a43b5c2030c93af96c8
This commit is contained in:
Chiachang Wang
2021-11-10 15:44:29 +08:00
parent ce650fd908
commit 15595b76f6
1 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
packages/SettingsLib/tests/robotests/src/com/android/settingslib/deviceinfo/SimStatusImeiInfoPreferenceControllerTest.java
View File

@@ -20,9 +20,8 @@ import static com.google.common.truth.Truth.assertThat;
import static org.robolectric.shadow.api.Shadow.extract;
import android.net.ConnectivityManager;
import android.os.UserManager;
import android.util.SparseBooleanArray;
import android.telephony.TelephonyManager;
import org.junit.Before;
import org.junit.Test;
@@ -35,7 +34,7 @@ import org.robolectric.annotation.Implements;
@RunWith(RobolectricTestRunner.class)
@Config(shadows = {SimStatusImeiInfoPreferenceControllerTest.ShadowUserManager.class,
SimStatusImeiInfoPreferenceControllerTest.ShadowConnectivityManager.class})
SimStatusImeiInfoPreferenceControllerTest.ShadowTelephonyManager.class})
public class SimStatusImeiInfoPreferenceControllerTest {
private AbstractSimStatusImeiInfoPreferenceController mController;
@@ -56,9 +55,9 @@ public class SimStatusImeiInfoPreferenceControllerTest {
ShadowUserManager userManager =
extract(RuntimeEnvironment.application.getSystemService(UserManager.class));
userManager.setIsAdminUser(true);
ShadowConnectivityManager connectivityManager =
extract(RuntimeEnvironment.application.getSystemService(ConnectivityManager.class));
connectivityManager.setNetworkSupported(ConnectivityManager.TYPE_MOBILE, true);
ShadowTelephonyManager telephonyManager =
extract(RuntimeEnvironment.application.getSystemService(TelephonyManager.class));
telephonyManager.setDataCapable(true);
assertThat(mController.isAvailable()).isTrue();
}
@@ -68,9 +67,9 @@ public class SimStatusImeiInfoPreferenceControllerTest {
ShadowUserManager userManager =
extract(RuntimeEnvironment.application.getSystemService(UserManager.class));
userManager.setIsAdminUser(true);
ShadowConnectivityManager connectivityManager =
extract(RuntimeEnvironment.application.getSystemService(ConnectivityManager.class));
connectivityManager.setNetworkSupported(ConnectivityManager.TYPE_MOBILE, false);
ShadowTelephonyManager telephonyManager =
extract(RuntimeEnvironment.application.getSystemService(TelephonyManager.class));
telephonyManager.setDataCapable(false);
assertThat(mController.isAvailable()).isFalse();
}
@@ -99,19 +98,17 @@ public class SimStatusImeiInfoPreferenceControllerTest {
}
}
@Implements(ConnectivityManager.class)
public static class ShadowConnectivityManager
extends org.robolectric.shadows.ShadowConnectivityManager {
private final SparseBooleanArray mSupportedNetworkTypes = new SparseBooleanArray();
private void setNetworkSupported(int networkType, boolean supported) {
mSupportedNetworkTypes.put(networkType, supported);
@Implements(TelephonyManager.class)
public static class ShadowTelephonyManager
extends org.robolectric.shadows.ShadowTelephonyManager {
private boolean mDataCapable = false;
private void setDataCapable(boolean capable) {
mDataCapable = capable;
}
@Implementation
public boolean isNetworkSupported(int networkType) {
return mSupportedNetworkTypes.get(networkType);
public boolean isDataCapable() {
return mDataCapable;
}
}
}