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

Commit 29286ec8 authored by songferngwang's avatar songferngwang
Browse files

Fix the test case failed 

-Add flag FLAG_IS_DUAL_SIM_ONBOARDING_ENABLED
-Add mock for SubscriptionManager.createForAllUserProfiles

Bug: 323652989
Test: atest NetworkProviderCallsSmsFragmentTest
atest SubscriptionsPreferenceControllerTest
atest DefaultSubscriptionControllerTest
atest DisableSimFooterPreferenceControllerTest
atest MobileDataPreferenceControllerTest
atest MobileNetworkSwitchControllerTest
atest MobileNetworkUtilsTest
atest NetworkSelectSettingsTest

Change-Id: I4d473140f291daec0f8e56c01bd8f7cfa2d0c82e
parent c9a3eeb7

tests/unit/src/com/android/settings/network/NetworkProviderCallsSmsFragmentTest.java

+7 −1
Original line number Diff line number Diff line
@@ -22,12 +22,16 @@ import static org.mockito.Mockito.spy; 


import android.content.Context;

import android.os.Looper;

import android.platform.test.flag.junit.SetFlagsRule;



import androidx.test.annotation.UiThreadTest;

import androidx.test.core.app.ApplicationProvider;

import androidx.test.ext.junit.runners.AndroidJUnit4;



import com.android.settings.flags.Flags;



import org.junit.Before;

import org.junit.Rule;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.MockitoAnnotations;
@@ -36,7 +40,8 @@ import java.util.List; 


@RunWith(AndroidJUnit4.class)

public class NetworkProviderCallsSmsFragmentTest {



    @Rule

    public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();

    private Context mContext;

    private List<String> mPreferenceKeyList;
@@ -49,6 +54,7 @@ public class NetworkProviderCallsSmsFragmentTest { 
        if (Looper.myLooper() == null) {

            Looper.prepare();

        }

        mSetFlagsRule.disableFlags(Flags.FLAG_IS_DUAL_SIM_ONBOARDING_ENABLED);

    }



    @Test

tests/unit/src/com/android/settings/network/SubscriptionsPreferenceControllerTest.java

+1 −0
Original line number Diff line number Diff line
@@ -148,6 +148,7 @@ public class SubscriptionsPreferenceControllerTest { 
        when(mUserManager.isAdminUser()).thenReturn(true);

        when(mContext.getSystemService(WifiManager.class)).thenReturn(mWifiManager);

        when(mLifecycleOwner.getLifecycle()).thenReturn(mLifecycleRegistry);

        when(mSubscriptionManager.createForAllUserProfiles()).thenReturn(mSubscriptionManager);



        mPreferenceManager = new PreferenceManager(mContext);

        mPreferenceScreen = mPreferenceManager.createPreferenceScreen(mContext);

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

+8 −2
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import static org.mockito.Mockito.when; 


import android.content.Context;

import android.os.Looper;

import android.platform.test.flag.junit.SetFlagsRule;

import android.telecom.TelecomManager;

import android.telephony.SubscriptionInfo;

import android.telephony.SubscriptionManager;
@@ -40,6 +41,7 @@ import androidx.test.annotation.UiThreadTest; 
import androidx.test.core.app.ApplicationProvider;

import androidx.test.ext.junit.runners.AndroidJUnit4;



import com.android.settings.flags.Flags;

import com.android.settings.network.SubscriptionUtil;

import com.android.settings.testutils.ResourcesUtils;

import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -47,6 +49,7 @@ import com.android.settingslib.mobile.dataservice.SubscriptionInfoEntity; 


import org.junit.After;

import org.junit.Before;

import org.junit.Rule;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;
@@ -58,6 +61,8 @@ import java.util.List; 


@RunWith(AndroidJUnit4.class)

public class DefaultSubscriptionControllerTest {

    @Rule

    public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();



    private static final String SUB_ID_1 = "1";

    private static final String SUB_ID_2 = "2";
@@ -105,10 +110,11 @@ public class DefaultSubscriptionControllerTest { 
        if (Looper.myLooper() == null) {

            Looper.prepare();

        }



        mSetFlagsRule.disableFlags(Flags.FLAG_IS_DUAL_SIM_ONBOARDING_ENABLED);

        mContext = spy(ApplicationProvider.getApplicationContext());

        when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubMgr);

        when(mContext.getSystemService(TelecomManager.class)).thenReturn(mTelecomManager);

        when(mSubMgr.createForAllUserProfiles()).thenReturn(mSubMgr);



        final String key = "prefkey";

        mController = new TestDefaultSubscriptionController(mContext, key, mLifecycle,
@@ -312,9 +318,9 @@ public class DefaultSubscriptionControllerTest { 
        mController.setDefaultSubscription(Integer.parseInt(mSubInfo1.subId));

        mSubscriptionInfoEntityList.add(mSubInfo1);

        mSubscriptionInfoEntityList.add(mSubInfo2);

        mController.onActiveSubInfoChanged(mSubscriptionInfoEntityList);



        mController.displayPreference(mScreen);

        mController.onActiveSubInfoChanged(mSubscriptionInfoEntityList);

        assertThat(mListPreference.getEntries().length).isEqualTo(3);



        mSubscriptionInfoEntityList.add(mSubInfo3);

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

+2 −0
Original line number Diff line number Diff line
@@ -57,6 +57,8 @@ public class DisableSimFooterPreferenceControllerTest { 
        MockitoAnnotations.initMocks(this);

        mContext = spy(ApplicationProvider.getApplicationContext());

        when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubscriptionManager);

        when(mSubscriptionManager.createForAllUserProfiles()).thenReturn(mSubscriptionManager);



        when(mInfo.getSubscriptionId()).thenReturn(SUB_ID);

        SubscriptionUtil.setAvailableSubscriptionsForTesting(Arrays.asList(mInfo));

        mController = new DisableSimFooterPreferenceController(mContext, PREF_KEY);

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

+6 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import static org.mockito.Mockito.when; 
import android.app.Instrumentation;

import android.content.Context;

import android.os.Looper;

import android.platform.test.flag.junit.SetFlagsRule;

import android.telephony.SubscriptionInfo;

import android.telephony.SubscriptionManager;

import android.telephony.TelephonyManager;
@@ -41,12 +42,14 @@ import androidx.test.core.app.ApplicationProvider; 
import androidx.test.ext.junit.runners.AndroidJUnit4;

import androidx.test.platform.app.InstrumentationRegistry;



import com.android.settings.flags.Flags;

import com.android.settings.testutils.ResourcesUtils;

import com.android.settingslib.core.lifecycle.Lifecycle;

import com.android.settingslib.mobile.dataservice.MobileNetworkInfoEntity;

import com.android.settingslib.mobile.dataservice.SubscriptionInfoEntity;



import org.junit.Before;

import org.junit.Rule;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;
@@ -54,6 +57,8 @@ import org.mockito.MockitoAnnotations; 


@RunWith(AndroidJUnit4.class)

public class MobileDataPreferenceControllerTest {

    @Rule

    public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();

    private static final String SUB_ID_1 = "1";

    private static final String SUB_ID_2 = "2";

    private static final String DISPLAY_NAME_1 = "Sub 1";
@@ -93,6 +98,7 @@ public class MobileDataPreferenceControllerTest { 
        if (Looper.myLooper() == null) {

            Looper.prepare();

        }

        mSetFlagsRule.disableFlags(Flags.FLAG_IS_DUAL_SIM_ONBOARDING_ENABLED);



        mContext = spy(ApplicationProvider.getApplicationContext());

        doReturn(mTelephonyManager).when(mContext).getSystemService(Context.TELEPHONY_SERVICE);