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

Commit e687ddbf authored by Jack Yu's avatar Jack Yu Committed by Automerger Merge Worker
Browse files

Merge "Fixed telephony unit tests failure" into tm-dev am: d3f3058c 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/17450859



Change-Id: I67668ea2499dde33be058aabf34039efa0786e7b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f48876cb d3f3058c

tests/telephonytests/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ android_test { 
    name: "FrameworksTelephonyTests",

    // For access hidden connectivity methods in tests

    defaults: ["framework-connectivity-test-defaults"],



    certificate: "platform",

    srcs: ["**/*.java"],



    libs: [

tests/telephonytests/src/com/android/internal/telephony/dataconnection/DcNetworkAgentTest.java

+7 −7
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ import org.junit.After; 
import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;

import org.mockito.Mockito;



import java.lang.reflect.Field;
@@ -51,11 +51,8 @@ public class DcNetworkAgentTest extends TelephonyTest { 
    private DcController mDcc;

    private DcFailBringUp mDcFailBringUp;



    @Mock

    private DataServiceManager mDataServiceManager;

    @Mock

    private DcTesterFailBringUpAll mDcTesterFailBringUpAll;

    @Mock

    private NetworkProvider mNetworkProvider;



    @Before
@@ -66,6 +63,11 @@ public class DcNetworkAgentTest extends TelephonyTest { 
            Looper.prepare();

        }



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

        mDataServiceManager = Mockito.mock(DataServiceManager.class);

        mDcTesterFailBringUpAll = Mockito.mock(DcTesterFailBringUpAll.class);

        mNetworkProvider = Mockito.mock(NetworkProvider.class);



        final NetworkAgentConfig.Builder configBuilder = new NetworkAgentConfig.Builder();

        configBuilder.setLegacyType(ConnectivityManager.TYPE_MOBILE);

        configBuilder.setLegacyTypeName("MOBILE");
@@ -110,9 +112,7 @@ public class DcNetworkAgentTest extends TelephonyTest { 
    public void testUnwantedTimeout() throws Exception {

        mDcNetworkAgent.markConnected();

        mDcNetworkAgent.onNetworkUnwanted();

        processAllMessages();

        moveTimeForward(60000);

        processAllMessages();

        processAllFutureMessages();

        verifyDisconnected();

    }

}

tests/telephonytests/src/com/android/internal/telephony/gsm/GsmSmsDispatcherTest.java

+2 −0
Original line number Diff line number Diff line
@@ -371,6 +371,7 @@ public class GsmSmsDispatcherTest extends TelephonyTest { 
                any(ICarrierMessagingCallback.class));

    }



    @Ignore("b/227110770") // Enable the test after b/227110770 is fixed.

    @Test

    @SmallTest

    public void testSendSmsByCarrierApp() throws Exception {
@@ -445,6 +446,7 @@ public class GsmSmsDispatcherTest extends TelephonyTest { 
                withSentIntents ? sentIntents : null, null, null, null, false, -1, false, -1, 0L);

    }



    @Ignore("b/227110770") // Enable the test after b/227110770 is fixed.

    @Test

    @SmallTest

    public void testSendMultipartSmsByCarrierApp() throws Exception {