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

Commit 48a5ba5d authored by Jack Yu's avatar Jack Yu
Browse files

Fixed failing unit test cases. 

bug: 31041734
Change-Id: Ia633484f768ea7565abf497a8689866a6eea264a
parent 7e924025

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

+1 −0
Original line number Diff line number Diff line
@@ -98,6 +98,7 @@ public class GsmCdmaCallTrackerTest extends TelephonyTest { 
        assertEquals(0, mCTUT.mForegroundCall.getConnections().size());

        try {

            mCTUT.dial(mDialString);

            waitForMs(100);

        } catch(Exception ex) {

            ex.printStackTrace();

            Assert.fail("unexpected exception thrown"+ex.getMessage()+ex.getStackTrace());

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

+1 −1
Original line number Diff line number Diff line
@@ -334,7 +334,7 @@ public class ServiceStateTrackerTest extends TelephonyTest { 


        mSimulatedCommands.setSignalStrength(ss);

        mSimulatedCommands.notifySignalStrength();

        waitForMs(200);

        waitForMs(300);

        assertEquals(sst.getSignalStrength(), ss);

        assertEquals(sst.getSignalStrength().isGsm(), true);

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

+5 −8
Original line number Diff line number Diff line
@@ -114,8 +114,6 @@ public class DataConnectionTest extends TelephonyTest { 
            mDcc = DcController.makeDcc(mPhone, mDcTracker, h);

            mDc = DataConnection.makeDataConnection(mPhone, 0, mDcTracker, mDcTesterFailBringUpAll,

                    mDcc);



            setReady(true);

        }

    }
@@ -153,7 +151,7 @@ public class DataConnectionTest extends TelephonyTest { 
        mDataConnectionTestHandler = new DataConnectionTestHandler(getClass().getSimpleName());

        mDataConnectionTestHandler.start();



        waitUntilReady();

        waitForMs(200);

        logd("-Setup!");

    }
@@ -192,7 +190,7 @@ public class DataConnectionTest extends TelephonyTest { 
        testSanity();



        mDc.sendMessage(DataConnection.EVENT_CONNECT, mCp);

        waitForMs(100);

        waitForMs(200);



        verify(mCT, times(1)).registerForVoiceCallStarted(any(Handler.class),

                eq(DataConnection.EVENT_DATA_CONNECTION_VOICE_CALL_STARTED), eq(null));
@@ -281,25 +279,24 @@ public class DataConnectionTest extends TelephonyTest { 


        testConnectEvent();



        assertTrue(getNetworkInfo().isMetered());

        assertFalse(getCopyNetworkCapabilities().

                hasCapability(NetworkCapabilities.NET_CAPABILITY_NOT_METERED));

        assertTrue(getNetworkInfo().isMetered());

    }



    @Postsubmit

    @Test

    @SmallTest

    public void testNonMeteredCapability() throws Exception {



        doReturn(1).when(mPhone).getSubId();

        doReturn(2819).when(mPhone).getSubId();

        mContextFixture.getCarrierConfigBundle().

                putStringArray(CarrierConfigManager.KEY_CARRIER_METERED_APN_TYPES_STRINGS,

                        new String[] {"mms"});



        testConnectEvent();



        assertFalse(getNetworkInfo().isMetered());

        assertTrue(getCopyNetworkCapabilities().

                hasCapability(NetworkCapabilities.NET_CAPABILITY_NOT_METERED));

        assertFalse(getNetworkInfo().isMetered());

    }

}
 
 No newline at end of file