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

Merge "[Settings] Remove the subscription name verification." into tm-dev am: 361fea8f6b

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

Change-Id: I2bd50d6197f57135932c45c4b4536a57026065cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Bonian Chen
2022-05-08 23:18:36 +00:00
committed by Automerger Merge Worker
parent 7159cf23bc 361fea8f6b
commit 89fae0817c
1 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -200,7 +200,7 @@ public class SubscriptionsPreferenceControllerTest {
} }
@Test @Test
public void isAvailable_airplaneModeOnWifiOffWithCarrierNetwork_availableTrue() { public void isAvailable_airplaneModeOnWifiOffWithCarrierNetwork_availableFalse() {
setupMockSubscriptions(1); setupMockSubscriptions(1);
when(mWifiManager.isWifiEnabled()).thenReturn(false); when(mWifiManager.isWifiEnabled()).thenReturn(false);
@@ -212,7 +212,7 @@ public class SubscriptionsPreferenceControllerTest {
} }
@Test @Test
public void isAvailable_airplaneModeOff_availableFalse() { public void isAvailable_airplaneModeOff_availableTrue() {
setupMockSubscriptions(2); setupMockSubscriptions(2);
assertThat(mController.isAvailable()).isTrue(); assertThat(mController.isAvailable()).isTrue();
@@ -235,12 +235,11 @@ public class SubscriptionsPreferenceControllerTest {
mController.displayPreference(mPreferenceScreen); mController.displayPreference(mPreferenceScreen);
assertThat(mPreferenceCategory.getPreferenceCount()).isEqualTo(1); assertThat(mPreferenceCategory.getPreferenceCount()).isEqualTo(1);
assertThat(mPreferenceCategory.getPreference(0).getTitle()).isEqualTo("sub1");
} }
@Test @Test
@UiThreadTest @UiThreadTest
public void displayPreference_providerAndHasMultiSim_showDataSubPreference() { public void displayPreference_providerAndHasMultiSim_showOnePreference() {
final List<SubscriptionInfo> sub = setupMockSubscriptions(2); final List<SubscriptionInfo> sub = setupMockSubscriptions(2);
doReturn(sub.get(0)).when(mSubscriptionManager).getDefaultDataSubscriptionInfo(); doReturn(sub.get(0)).when(mSubscriptionManager).getDefaultDataSubscriptionInfo();
doReturn(sub).when(mSubscriptionManager).getAvailableSubscriptionInfoList(); doReturn(sub).when(mSubscriptionManager).getAvailableSubscriptionInfoList();
@@ -249,7 +248,6 @@ public class SubscriptionsPreferenceControllerTest {
mController.displayPreference(mPreferenceScreen); mController.displayPreference(mPreferenceScreen);
assertThat(mPreferenceCategory.getPreferenceCount()).isEqualTo(1); assertThat(mPreferenceCategory.getPreferenceCount()).isEqualTo(1);
assertThat(mPreferenceCategory.getPreference(0).getTitle()).isEqualTo("sub1");
} }
@Test @Test
@@ -437,7 +435,7 @@ public class SubscriptionsPreferenceControllerTest {
@Test @Test
@UiThreadTest @UiThreadTest
public void dataSubscriptionChanged_providerAndHasMultiSim_showSubId1Preference() { public void dataSubscriptionChanged_providerAndHasMultiSim_showOnePreference() {
final List<SubscriptionInfo> sub = setupMockSubscriptions(2); final List<SubscriptionInfo> sub = setupMockSubscriptions(2);
doReturn(sub.get(0)).when(mSubscriptionManager).getDefaultDataSubscriptionInfo(); doReturn(sub.get(0)).when(mSubscriptionManager).getDefaultDataSubscriptionInfo();
doReturn(sub).when(mSubscriptionManager).getAvailableSubscriptionInfoList(); doReturn(sub).when(mSubscriptionManager).getAvailableSubscriptionInfoList();
@@ -449,12 +447,11 @@ public class SubscriptionsPreferenceControllerTest {
assertThat(mController.isAvailable()).isTrue(); assertThat(mController.isAvailable()).isTrue();
assertThat(mPreferenceCategory.getPreferenceCount()).isEqualTo(1); assertThat(mPreferenceCategory.getPreferenceCount()).isEqualTo(1);
assertThat(mPreferenceCategory.getPreference(0).getTitle()).isEqualTo("sub1");
} }
@Test @Test
@UiThreadTest @UiThreadTest
public void dataSubscriptionChanged_providerAndHasMultiSim_showSubId2Preference() { public void dataSubscriptionChanged_providerAndHasMultiSim_showOnlyOnePreference() {
final List<SubscriptionInfo> sub = setupMockSubscriptions(2); final List<SubscriptionInfo> sub = setupMockSubscriptions(2);
final int subId = sub.get(0).getSubscriptionId(); final int subId = sub.get(0).getSubscriptionId();
doReturn(sub.get(0)).when(mSubscriptionManager).getDefaultDataSubscriptionInfo(); doReturn(sub.get(0)).when(mSubscriptionManager).getDefaultDataSubscriptionInfo();
@@ -464,17 +461,12 @@ public class SubscriptionsPreferenceControllerTest {
mController.onResume(); mController.onResume();
mController.displayPreference(mPreferenceScreen); mController.displayPreference(mPreferenceScreen);
assertThat(mController.isAvailable()).isTrue();
assertThat(mPreferenceCategory.getPreferenceCount()).isEqualTo(1);
assertThat(mPreferenceCategory.getPreference(0).getTitle()).isEqualTo("sub1");
doReturn(sub.get(1)).when(mSubscriptionManager).getDefaultDataSubscriptionInfo(); doReturn(sub.get(1)).when(mSubscriptionManager).getDefaultDataSubscriptionInfo();
mController.mConnectionChangeReceiver.onReceive(mContext, intent); mController.mConnectionChangeReceiver.onReceive(mContext, intent);
assertThat(mController.isAvailable()).isTrue(); assertThat(mController.isAvailable()).isTrue();
assertThat(mPreferenceCategory.getPreferenceCount()).isEqualTo(1); assertThat(mPreferenceCategory.getPreferenceCount()).isEqualTo(1);
assertThat(mPreferenceCategory.getPreference(0).getTitle()).isEqualTo("sub2");
} }
@Test @Test