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

Commit 4d6a5d1f authored by Ling Ma's avatar Ling Ma Committed by Jack Yu
Browse files

Default unit tests to use new data stack 

Test: atest
Bug: 222311623
Merged-In: Id4f531a8d5ea4e02f8f85bf7753de6455104ae81
Change-Id: Id4f531a8d5ea4e02f8f85bf7753de6455104ae81
parent f1f81e2e

tests/telephonytests/src/com/android/internal/telephony/ServiceStateTrackerTest.java

+2 −1
Original line number Diff line number Diff line
@@ -1719,6 +1719,7 @@ public class ServiceStateTrackerTest extends TelephonyTest { 
    @Test

    @SmallTest

    public void testImsRegisteredDelayShutDown() throws Exception {

        doReturn(false).when(mPhone).isUsingNewDataStack();

        doReturn(true).when(mPhone).isPhoneTypeGsm();

        mContextFixture.putIntResource(

                com.android.internal.R.integer.config_delay_for_ims_dereg_millis, 1000 /*ms*/);
@@ -1759,6 +1760,7 @@ public class ServiceStateTrackerTest extends TelephonyTest { 
    @Test

    @SmallTest

    public void testImsRegisteredDelayShutDownTimeout() throws Exception {

        doReturn(false).when(mPhone).isUsingNewDataStack();

        doReturn(true).when(mPhone).isPhoneTypeGsm();

        mContextFixture.putIntResource(

                com.android.internal.R.integer.config_delay_for_ims_dereg_millis, 1000 /*ms*/);
@@ -2203,7 +2205,6 @@ public class ServiceStateTrackerTest extends TelephonyTest { 


    @Test

    public void testUpdateNrFrequencyRangeFromPhysicalChannelConfigs() {

        doReturn(true).when(mPhone).isUsingNewDataStack();

        when(mPhone.getDataNetworkController().isInternetNetwork(eq(3))).thenReturn(true);

        sendPhyChanConfigChange(new int[] {1000, 500}, TelephonyManager.NETWORK_TYPE_NR, 1,

                new int[][]{{0, 1}, {2, 3}});

tests/telephonytests/src/com/android/internal/telephony/TelephonyTest.java

+1 −0
Original line number Diff line number Diff line
@@ -651,6 +651,7 @@ public abstract class TelephonyTest { 
        doReturn(mDataProfileManager).when(mDataNetworkController).getDataProfileManager();

        doReturn(mDataRetryManager).when(mDataNetworkController).getDataRetryManager();

        doReturn(mCarrierPrivilegesTracker).when(mPhone).getCarrierPrivilegesTracker();

        doReturn(true).when(mPhone).isUsingNewDataStack();



        //mUiccController

        doReturn(mUiccCardApplication3gpp).when(mUiccController).getUiccCardApplication(anyInt(),

tests/telephonytests/src/com/android/internal/telephony/data/DataNetworkControllerTest.java

+0 −1
Original line number Diff line number Diff line
@@ -437,7 +437,6 @@ public class DataNetworkControllerTest extends TelephonyTest { 
                any(DataSettingsManager.DataSettingsManagerCallback.class))).thenCallRealMethod();



        initializeConfig();

        doReturn(true).when(mPhone).isUsingNewDataStack();

        mMockedDataServiceManagers.put(AccessNetworkConstants.TRANSPORT_TYPE_WWAN,

                mMockedWwanDataServiceManager);

        mMockedDataServiceManagers.put(AccessNetworkConstants.TRANSPORT_TYPE_WLAN,

tests/telephonytests/src/com/android/internal/telephony/data/DataNetworkTest.java

+0 −1
Original line number Diff line number Diff line
@@ -229,7 +229,6 @@ public class DataNetworkTest extends TelephonyTest { 
        super.setUp(getClass().getSimpleName());

        mDataNetworkCallback = Mockito.mock(DataNetworkCallback.class);

        mDataCallSessionStats = Mockito.mock(DataCallSessionStats.class);

        doReturn(true).when(mPhone).isUsingNewDataStack();

        doAnswer(invocation -> {

            ((Runnable) invocation.getArguments()[0]).run();

            return null;

tests/telephonytests/src/com/android/internal/telephony/data/DataProfileManagerTest.java

+0 −1
Original line number Diff line number Diff line
@@ -403,7 +403,6 @@ public class DataProfileManagerTest extends TelephonyTest { 
        logd("DataProfileManagerTest +Setup!");

        super.setUp(getClass().getSimpleName());

        mDataProfileManagerCallback = Mockito.mock(DataProfileManagerCallback.class);

        doReturn(true).when(mPhone).isUsingNewDataStack();

        ((MockContentResolver) mContext.getContentResolver()).addProvider(

                Telephony.Carriers.CONTENT_URI.getAuthority(), mApnSettingContentProvider);