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

Commit 1b9718ab authored by Jack Yu's avatar Jack Yu
Browse files

Fixed failed unit tests 

1. Fixed a failed/flaky signal strength unit test caused
   by ag/2247950
2. Gracefully reset airplane mode settings in testCarrierActionResetOnAPM

Test: Telephony unit tests
bug: 29579544
Merged-In: I1108e62d1b970c5ac267173ea61afab9b78a624b
Change-Id: I1108e62d1b970c5ac267173ea61afab9b78a624b
parent 0998eac4

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

+2 −2
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ public class CarrierActionAgentTest extends TelephonyTest { 
        Settings.Global.putInt(mFakeContentResolver, Settings.Global.AIRPLANE_MODE_ON, 1);

        mFakeContentProvider.simulateChange(

                Settings.Global.getUriFor(Settings.Global.AIRPLANE_MODE_ON));

        waitForMs(50);

        waitForMs(200);

        ArgumentCaptor<Message> message = ArgumentCaptor.forClass(Message.class);



        verify(mDataActionHandler).sendMessageAtTime(message.capture(), anyLong());
@@ -126,11 +126,11 @@ public class CarrierActionAgentTest extends TelephonyTest { 


        verify(mRadioActionHandler).sendMessageAtTime(message.capture(), anyLong());

        assertEquals(RADIO_CARRIER_ACTION_EVENT, message.getValue().what);

        Settings.Global.putInt(mFakeContentResolver, Settings.Global.AIRPLANE_MODE_ON, 0);

    }



    @After

    public void tearDown() throws Exception {

        Settings.Global.putInt(mFakeContentResolver, Settings.Global.AIRPLANE_MODE_ON, 0);

        super.tearDown();

    }

}

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

+3 −3
Original line number Diff line number Diff line
@@ -328,7 +328,6 @@ public class ServiceStateTrackerTest extends TelephonyTest { 
        assertFalse(sst.isImsRegistered());

    }



    @FlakyTest

    @Test

    @MediumTest

    public void testSignalStrength() {
@@ -362,14 +361,15 @@ public class ServiceStateTrackerTest extends TelephonyTest { 
        sst.mSS.setRilDataRadioTechnology(ServiceState.RIL_RADIO_TECHNOLOGY_LTE);



        mSimulatedCommands.notifySignalStrength();

        waitForMs(200);

        waitForMs(300);

        assertEquals(sst.getSignalStrength(), ss);

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



        // notify signal strength again, but this time data RAT is not LTE

        sst.mSS.setRilVoiceRadioTechnology(ServiceState.RIL_RADIO_TECHNOLOGY_1xRTT);

        sst.mSS.setRilDataRadioTechnology(ServiceState.RIL_RADIO_TECHNOLOGY_EHRPD);

        mSimulatedCommands.notifySignalStrength();

        waitForMs(200);

        waitForMs(300);

        assertEquals(sst.getSignalStrength(), ss);

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

    }