[Provider Model] Internal cleanup - remove Provider Model flag and deprecated legacy UI part.3

Test: atest DefaultSubscriptionControllerTest, NetworkProviderSettingsTest
Bug: 197066557
Change-Id: I7d29b58ca5476ae0bb6fe2e04fecb96164cb1ada
This commit is contained in:
Zoey Chen
2021-11-15 22:24:03 +08:00
parent 439bc7f9dd
commit e714654c94
7 changed files with 15 additions and 47 deletions

View File

@@ -89,13 +89,6 @@ public class DefaultSubscriptionControllerTest {
SubscriptionUtil.setActiveSubscriptionsForTesting(null);
}
@Test
public void getAvailabilityStatus_onlyOneSubscription_notAvailable() {
SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(
createMockSub(1, "sub1")));
assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
}
@Test
public void getAvailabilityStatus_twoSubscriptions_isAvailable() {
SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(
@@ -248,7 +241,7 @@ public class DefaultSubscriptionControllerTest {
mController.setDefaultSubscription(sub1.getSubscriptionId());
mController.displayPreference(mScreen);
assertThat(mController.isAvailable()).isFalse();
assertThat(mController.isAvailable()).isTrue();
// Now make two subs be active - the pref should become available, and the
// onPreferenceChange callback should be properly wired up.
@@ -289,12 +282,14 @@ public class DefaultSubscriptionControllerTest {
mController.displayPreference(mScreen);
assertThat(mController.isAvailable()).isTrue();
assertThat(mListPreference.isVisible()).isTrue();
assertThat(mListPreference.isEnabled()).isTrue();
SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(sub1));
mController.onSubscriptionsChanged();
assertThat(mController.isAvailable()).isFalse();
assertThat(mListPreference.isVisible()).isFalse();
assertThat(mController.isAvailable()).isTrue();
assertThat(mListPreference.isVisible()).isTrue();
assertThat(mListPreference.isEnabled()).isFalse();
}
@Test
@@ -306,8 +301,9 @@ public class DefaultSubscriptionControllerTest {
mController.setDefaultSubscription(sub1.getSubscriptionId());
mController.displayPreference(mScreen);
assertThat(mController.isAvailable()).isFalse();
assertThat(mListPreference.isVisible()).isFalse();
assertThat(mController.isAvailable()).isTrue();
assertThat(mListPreference.isVisible()).isTrue();
assertThat(mListPreference.isEnabled()).isFalse();
SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(sub1, sub2));
when(mSubMgr.getAvailableSubscriptionInfoList()).thenReturn(Arrays.asList(sub1, sub2));
@@ -315,6 +311,7 @@ public class DefaultSubscriptionControllerTest {
assertThat(mController.isAvailable()).isTrue();
assertThat(mListPreference.isVisible()).isTrue();
assertThat(mListPreference.isEnabled()).isTrue();
}
@Test