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

Commit f3840b85 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix ServiceStateTrackerTest and CdmaSmsCbTest"

parents c9f45c9b 85a3c169

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

+8 −8
Original line number Diff line number Diff line
@@ -432,7 +432,7 @@ public class ServiceStateTrackerTest extends TelephonyTest { 
        mSimulatedCommands.setDataRegState(ServiceState.RIL_REG_STATE_ROAMING);

        mSimulatedCommands.notifyVoiceNetworkStateChanged();



        waitForMs(100);

        waitForMs(200);



        // verify if registered handler has message posted to it

        ArgumentCaptor<Message> messageArgumentCaptor = ArgumentCaptor.forClass(Message.class);
@@ -454,7 +454,7 @@ public class ServiceStateTrackerTest extends TelephonyTest { 
        mSimulatedCommands.setDataRegState(ServiceState.RIL_REG_STATE_ROAMING);

        mSimulatedCommands.notifyVoiceNetworkStateChanged();



        waitForMs(100);

        waitForMs(200);



        // verify that no new message posted to handler

        verify(mTestHandler, times(1)).sendMessageAtTime(any(Message.class), anyLong());
@@ -479,7 +479,7 @@ public class ServiceStateTrackerTest extends TelephonyTest { 
        mSimulatedCommands.setDataRegState(ServiceState.RIL_REG_STATE_HOME);

        mSimulatedCommands.notifyVoiceNetworkStateChanged();



        waitForMs(100);

        waitForMs(200);



        // verify if registered handler has message posted to it

        ArgumentCaptor<Message> messageArgumentCaptor = ArgumentCaptor.forClass(Message.class);
@@ -518,7 +518,7 @@ public class ServiceStateTrackerTest extends TelephonyTest { 
        mSimulatedCommands.setDataRegState(ServiceState.RIL_REG_STATE_ROAMING);

        mSimulatedCommands.notifyVoiceNetworkStateChanged();



        waitForMs(100);

        waitForMs(200);



        // verify if registered handler has message posted to it

        ArgumentCaptor<Message> messageArgumentCaptor = ArgumentCaptor.forClass(Message.class);
@@ -540,7 +540,7 @@ public class ServiceStateTrackerTest extends TelephonyTest { 
        mSimulatedCommands.setDataRegState(ServiceState.RIL_REG_STATE_ROAMING);

        mSimulatedCommands.notifyVoiceNetworkStateChanged();



        waitForMs(100);

        waitForMs(200);



        // verify that no new message posted to handler

        verify(mTestHandler, times(1)).sendMessageAtTime(any(Message.class), anyLong());
@@ -655,7 +655,7 @@ public class ServiceStateTrackerTest extends TelephonyTest { 
        mSimulatedCommands.setDataRegState(ServiceState.RIL_REG_STATE_UNKNOWN);

        mSimulatedCommands.notifyVoiceNetworkStateChanged();



        waitForMs(100);

        waitForMs(200);



        // verify if registered handler has message posted to it

        ArgumentCaptor<Message> messageArgumentCaptor = ArgumentCaptor.forClass(Message.class);
@@ -872,14 +872,14 @@ public class ServiceStateTrackerTest extends TelephonyTest { 


        // Mock sending incorrect nitz str from RIL

        mSimulatedCommands.triggerNITZupdate("38/06/20,00:00:00+0");

        waitForMs(100);

        waitForMs(200);

        // AlarmManger.setTime is triggered by SystemClock.setCurrentTimeMillis().

        // Verify system time is not set to incorrect NITZ time

        verify(mAlarmManager, times(0)).setTime(anyLong());



        // Mock sending correct nitz str from RIL

        mSimulatedCommands.triggerNITZupdate("15/06/20,00:00:00+0");

        waitForMs(100);

        waitForMs(200);

        verify(mAlarmManager, times(1)).setTime(anyLong());

    }

}

tests/telephonytests/src/com/android/internal/telephony/cdma/CdmaSmsCbTest.java

+1 −2
Original line number Diff line number Diff line
@@ -483,12 +483,11 @@ public class CdmaSmsCbTest extends AndroidTestCase { 


    // VZW requirement is to discard message with unsupported charset. Verify that we return null

    // for this unsupported character set.

    @Postsubmit

    @Test @SmallTest

    public void testCmasUnsupportedCharSet() throws Exception {

        SmsMessage msg = createCmasSmsMessage(SmsEnvelope.SERVICE_CATEGORY_CMAS_EXTREME_THREAT,

                12345, BearerData.PRIORITY_EMERGENCY, BearerData.LANGUAGE_ENGLISH,

                UserData.ENCODING_GSM_DCS, EXTREME_ALERT, -1, -1, -1, -1, -1);

                0x1F, EXTREME_ALERT, -1, -1, -1, -1, -1);



        SmsCbMessage cbMessage = msg.parseBroadcastSms();

        assertNull("expected null for unsupported charset", cbMessage);