From 9772f33cffc4a99315bd011e6866293f28a0caa5 Mon Sep 17 00:00:00 2001 From: Zoey Chen Date: Wed, 15 Dec 2021 23:36:41 +0800 Subject: [PATCH] [Provider Model] Internal cleanup - remove Provider Model flag and deprecated legacy UI part.5 Test: atest MobileNetworkSummaryControllerTest, NetworkProviderWifiCallingGroupTest, NetworkProviderBackupCallingGroupTest Bug: 197066557 Change-Id: I829590bfa37ee2166d9388ccad35d306b201f844 --- .../MobileNetworkSummaryControllerTest.java | 86 ------------------- ...NetworkProviderBackupCallingGroupTest.java | 2 - .../NetworkProviderWifiCallingGroupTest.java | 4 - 3 files changed, 92 deletions(-) diff --git a/tests/robotests/src/com/android/settings/network/MobileNetworkSummaryControllerTest.java b/tests/robotests/src/com/android/settings/network/MobileNetworkSummaryControllerTest.java index 6870e7ac8a3..b60bfb83d66 100644 --- a/tests/robotests/src/com/android/settings/network/MobileNetworkSummaryControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/MobileNetworkSummaryControllerTest.java @@ -212,86 +212,6 @@ public class MobileNetworkSummaryControllerTest { } @Test - @Ignore - public void getSummary_twoSubscriptions_correctSummaryAndFragment() { - FeatureFlagUtils.setEnabled(mContext, FeatureFlagUtils.SETTINGS_PROVIDER_MODEL, false); - final SubscriptionInfo sub1 = mock(SubscriptionInfo.class); - final SubscriptionInfo sub2 = mock(SubscriptionInfo.class); - when(sub1.getSubscriptionId()).thenReturn(1); - when(sub2.getSubscriptionId()).thenReturn(2); - - SubscriptionUtil.setAvailableSubscriptionsForTesting(Arrays.asList(sub1, sub2)); - mController.displayPreference(mPreferenceScreen); - mController.onResume(); - assertThat(mController.getSummary()).isEqualTo("2 SIMs"); - assertThat(mPreference.getFragment()).isEqualTo(MobileNetworkListFragment.class.getName()); - } - - @Test - @Ignore - public void getSummaryAfterUpdate_twoSubscriptionsBecomesOne_correctSummaryAndFragment() { - FeatureFlagUtils.setEnabled(mContext, FeatureFlagUtils.SETTINGS_PROVIDER_MODEL, false); - final SubscriptionInfo sub1 = mock(SubscriptionInfo.class); - final SubscriptionInfo sub2 = mock(SubscriptionInfo.class); - when(sub1.getSubscriptionId()).thenReturn(1); - when(sub2.getSubscriptionId()).thenReturn(2); - when(sub1.getDisplayName()).thenReturn("sub1"); - when(sub2.getDisplayName()).thenReturn("sub2"); - - SubscriptionUtil.setAvailableSubscriptionsForTesting(Arrays.asList(sub1, sub2)); - SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(sub1, sub2)); - mController.displayPreference(mPreferenceScreen); - mController.onResume(); - assertThat(mController.getSummary()).isEqualTo("2 SIMs"); - assertThat(mPreference.getFragment()).isEqualTo(MobileNetworkListFragment.class.getName()); - - // Simulate sub2 having disappeared - the end result should change to be the same as - // if there were just one subscription. - SubscriptionUtil.setAvailableSubscriptionsForTesting(Arrays.asList(sub1)); - mController.onSubscriptionsChanged(); - assertThat(mController.getSummary()).isEqualTo("sub1"); - assertThat(mPreference.getFragment()).isNull(); - final ArgumentCaptor intentCaptor = ArgumentCaptor.forClass(Intent.class); - doNothing().when(mContext).startActivity(intentCaptor.capture()); - mPreference.getOnPreferenceClickListener().onPreferenceClick(mPreference); - assertThat(intentCaptor.getValue().getComponent().getClassName()).isEqualTo( - MobileNetworkActivity.class.getName()); - } - - @Test - @Ignore - public void getSummaryAfterUpdate_oneSubscriptionBecomesTwo_correctSummaryAndFragment() { - FeatureFlagUtils.setEnabled(mContext, FeatureFlagUtils.SETTINGS_PROVIDER_MODEL, false); - final SubscriptionInfo sub1 = mock(SubscriptionInfo.class); - final SubscriptionInfo sub2 = mock(SubscriptionInfo.class); - when(sub1.getSubscriptionId()).thenReturn(1); - when(sub2.getSubscriptionId()).thenReturn(2); - when(sub1.getDisplayName()).thenReturn("sub1"); - when(sub2.getDisplayName()).thenReturn("sub2"); - - when(mSubscriptionManager.getAvailableSubscriptionInfoList()).thenReturn( - Arrays.asList(sub1)); - SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(sub1)); - mController.displayPreference(mPreferenceScreen); - mController.onResume(); - assertThat(mController.getSummary()).isEqualTo("sub1"); - assertThat(mPreference.getFragment()).isNull(); - final ArgumentCaptor intentCaptor = ArgumentCaptor.forClass(Intent.class); - doNothing().when(mContext).startActivity(intentCaptor.capture()); - mPreference.getOnPreferenceClickListener().onPreferenceClick(mPreference); - assertThat(intentCaptor.getValue().getComponent().getClassName()).isEqualTo( - MobileNetworkActivity.class.getName()); - - // Simulate sub2 appearing in the list of subscriptions and check the results. - SubscriptionUtil.setAvailableSubscriptionsForTesting(Arrays.asList(sub1, sub2)); - mController.displayPreference(mPreferenceScreen); - mController.onResume(); - assertThat(mController.getSummary()).isEqualTo("2 SIMs"); - assertThat(mPreference.getFragment()).isEqualTo(MobileNetworkListFragment.class.getName()); - } - - @Test - @Ignore public void getSummary_providerModel_Enabled() { final SubscriptionInfo sub1 = mock(SubscriptionInfo.class); final SubscriptionInfo sub2 = mock(SubscriptionInfo.class); @@ -302,15 +222,9 @@ public class MobileNetworkSummaryControllerTest { SubscriptionUtil.setAvailableSubscriptionsForTesting(Arrays.asList(sub1, sub2)); SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(sub1, sub2)); - FeatureFlagUtils.setEnabled(mContext, FeatureFlagUtils.SETTINGS_PROVIDER_MODEL, true); mController.displayPreference(mPreferenceScreen); mController.onResume(); assertThat(mController.getSummary()).isEqualTo("sub1, sub2"); - - FeatureFlagUtils.setEnabled(mContext, FeatureFlagUtils.SETTINGS_PROVIDER_MODEL, false); - mController.displayPreference(mPreferenceScreen); - mController.onResume(); - assertThat(mController.getSummary()).isEqualTo("2 SIMs"); } @Test diff --git a/tests/unit/src/com/android/settings/network/telephony/NetworkProviderBackupCallingGroupTest.java b/tests/unit/src/com/android/settings/network/telephony/NetworkProviderBackupCallingGroupTest.java index e7a6af39319..8396f1b6a33 100644 --- a/tests/unit/src/com/android/settings/network/telephony/NetworkProviderBackupCallingGroupTest.java +++ b/tests/unit/src/com/android/settings/network/telephony/NetworkProviderBackupCallingGroupTest.java @@ -153,7 +153,6 @@ public class NetworkProviderBackupCallingGroupTest { @Test public void shouldShowBackupCallingForSub_crossSimDisabled_returnFalse() { - FeatureFlagUtils.setEnabled(mContext, FeatureFlagUtils.SETTINGS_PROVIDER_MODEL, true); doReturn(false).when(mNetworkProviderBackupCallingGroup).isCrossSimEnabledByPlatform( mContext, SUB_ID_1); @@ -163,7 +162,6 @@ public class NetworkProviderBackupCallingGroupTest { @Test public void shouldBackupCallingForSub_crossSimEnabled_returnTrue() { - FeatureFlagUtils.setEnabled(mContext, FeatureFlagUtils.SETTINGS_PROVIDER_MODEL, true); doReturn(true).when(mNetworkProviderBackupCallingGroup).isCrossSimEnabledByPlatform( mContext, SUB_ID_1); diff --git a/tests/unit/src/com/android/settings/network/telephony/NetworkProviderWifiCallingGroupTest.java b/tests/unit/src/com/android/settings/network/telephony/NetworkProviderWifiCallingGroupTest.java index 660772ed99f..9cd12fe09cf 100644 --- a/tests/unit/src/com/android/settings/network/telephony/NetworkProviderWifiCallingGroupTest.java +++ b/tests/unit/src/com/android/settings/network/telephony/NetworkProviderWifiCallingGroupTest.java @@ -147,7 +147,6 @@ public class NetworkProviderWifiCallingGroupTest { @Test public void shouldShowWifiCallingForSub_wifiCallingDisabledWithWifiCallingNotReady_returnFalse() { - FeatureFlagUtils.setEnabled(mContext, FeatureFlagUtils.SETTINGS_PROVIDER_MODEL, true); setWifiCallingEnabled(false); doReturn(mMockQueryWfcState).when(mNetworkProviderWifiCallingGroup).queryImsState(SUB_ID); @@ -157,7 +156,6 @@ public class NetworkProviderWifiCallingGroupTest { @Test public void shouldShowWifiCallingForSub_wifiCallingEnabledWithWifiCallingIsReady_returnTrue() { - FeatureFlagUtils.setEnabled(mContext, FeatureFlagUtils.SETTINGS_PROVIDER_MODEL, true); setWifiCallingEnabled(true); doReturn(mMockQueryWfcState).when(mNetworkProviderWifiCallingGroup).queryImsState(SUB_ID); @@ -168,7 +166,6 @@ public class NetworkProviderWifiCallingGroupTest { @Test public void shouldShowWifiCallingForSub_wifiCallingDisabledWithNoActivityHandleIntent_returnFalse() { - FeatureFlagUtils.setEnabled(mContext, FeatureFlagUtils.SETTINGS_PROVIDER_MODEL, true); buildPhoneAccountConfigureIntent(false); doReturn(mMockQueryWfcState).when(mNetworkProviderWifiCallingGroup).queryImsState(SUB_ID); doReturn(mPhoneAccountHandle).when(mNetworkProviderWifiCallingGroup) @@ -181,7 +178,6 @@ public class NetworkProviderWifiCallingGroupTest { @Test public void shouldShowWifiCallingForSub_wifiCallingEnabledWithActivityHandleIntent_returnTrue() { - FeatureFlagUtils.setEnabled(mContext, FeatureFlagUtils.SETTINGS_PROVIDER_MODEL, true); buildPhoneAccountConfigureIntent(true); doReturn(mMockQueryWfcState).when(mNetworkProviderWifiCallingGroup).queryImsState(SUB_ID); doReturn(mPhoneAccountHandle).when(mNetworkProviderWifiCallingGroup)