Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a9de34cf authored by Zoey Chen's avatar Zoey Chen Committed by Android (Google) Code Review
Browse files

Merge "[Provider Model] Internal cleanup - remove Provider Model flag and... 

Merge "[Provider Model] Internal cleanup - remove Provider Model flag and deprecated legacy UI part.5"
parents fcc30a08 9772f33c

tests/robotests/src/com/android/settings/network/MobileNetworkSummaryControllerTest.java

+0 −86
Original line number Diff line number Diff line
@@ -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<Intent> 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<Intent> 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

tests/unit/src/com/android/settings/network/telephony/NetworkProviderBackupCallingGroupTest.java

+0 −2
Original line number Diff line number Diff line
@@ -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);

tests/unit/src/com/android/settings/network/telephony/NetworkProviderWifiCallingGroupTest.java

+0 −4
Original line number Diff line number Diff line
@@ -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)