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

Commit 3ed74f4b authored by Amit Mahajan's avatar Amit Mahajan Committed by Gerrit Code Review
Browse files

Merge "Unit test fixes. Most failures were due to new mockito."

parents 1cb7194e 37800d3c

src/java/com/android/internal/telephony/imsphone/ImsPhoneConnection.java

+6 −4
Original line number Diff line number Diff line
@@ -583,6 +583,7 @@ public class ImsPhoneConnection extends Connection implements 


    void

    releaseWakeLock() {

        if (mPartialWakeLock != null) {

            synchronized (mPartialWakeLock) {

                if (mPartialWakeLock.isHeld()) {

                    Rlog.d(LOG_TAG, "releaseWakeLock");
@@ -590,6 +591,7 @@ public class ImsPhoneConnection extends Connection implements 
                }

            }

        }

    }



    private void fetchDtmfToneDelay(Phone phone) {

        CarrierConfigManager configMgr = (CarrierConfigManager)

tests/telephonytests/src/android/telephony/ims/ImsServiceTest.java

+2 −2
Original line number Diff line number Diff line
@@ -43,10 +43,10 @@ import static junit.framework.Assert.assertEquals; 
import static junit.framework.Assert.assertNotNull;

import static junit.framework.Assert.assertNull;

import static junit.framework.Assert.fail;

import static org.mockito.Matchers.any;

import static org.mockito.Matchers.anyInt;

import static org.mockito.Matchers.anyString;

import static org.mockito.Matchers.eq;

import static org.mockito.Matchers.nullable;

import static org.mockito.Mockito.doThrow;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.times;
@@ -154,7 +154,7 @@ public class ImsServiceTest { 
    @SmallTest

    public void testMethodWithNoPermissions() throws RemoteException {

        doThrow(new SecurityException()).when(mMockContext).enforceCallingOrSelfPermission(

                eq(READ_PHONE_STATE), anyString());

                eq(READ_PHONE_STATE), nullable(String.class));

        mTestImsServiceBinder.createImsFeature(TEST_SLOT_0, ImsFeature.MMTEL, mTestCallback);



        try {

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

+3 −2
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import static com.android.internal.telephony.TelephonyTestUtils.waitForMs; 


import static org.mockito.Matchers.any;

import static org.mockito.Matchers.eq;

import static org.mockito.Matchers.nullable;

import static org.mockito.Mockito.times;

import static org.mockito.Mockito.verify;
@@ -87,7 +88,7 @@ public class DeviceStateMonitorTest extends TelephonyTest { 
        waitForMs(100);



        verify(mSimulatedCommandsVerifier, times(1)).setUnsolResponseFilter(eq(6),

                any(Message.class));

                nullable(Message.class));



        // Turn tethering off

        intent = new Intent(ConnectivityManager.ACTION_TETHER_STATE_CHANGED);
@@ -112,7 +113,7 @@ public class DeviceStateMonitorTest extends TelephonyTest { 
        waitForMs(100);



        verify(mSimulatedCommandsVerifier, times(1)).sendDeviceState(eq(CHARGING_STATE),

                eq(true), any(Message.class));

                eq(true), nullable(Message.class));



        // Not charging

        intent = new Intent(BatteryManager.ACTION_DISCHARGING);

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

+38 −36
Original line number Diff line number Diff line
@@ -58,11 +58,9 @@ import static org.junit.Assert.assertFalse; 
import static org.junit.Assert.assertTrue;

import static org.junit.Assert.fail;

import static org.mockito.Matchers.anyLong;

import static org.mockito.Mockito.any;

import static org.mockito.Matchers.nullable;

import static org.mockito.Mockito.anyBoolean;

import static org.mockito.Mockito.anyInt;

import static org.mockito.Mockito.anyObject;

import static org.mockito.Mockito.anyString;

import static org.mockito.Mockito.atLeast;

import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.eq;
@@ -123,7 +121,7 @@ public class GsmCdmaPhoneTest extends TelephonyTest { 
        waitUntilReady();

        ArgumentCaptor<Integer> integerArgumentCaptor = ArgumentCaptor.forClass(Integer.class);

        verify(mUiccController).registerForIccChanged(eq(mPhoneUT), integerArgumentCaptor.capture(),

                anyObject());

                nullable(Object.class));

        Message msg = Message.obtain();

        msg.what = integerArgumentCaptor.getValue();

        mPhoneUT.sendMessage(msg);
@@ -202,7 +200,8 @@ public class GsmCdmaPhoneTest extends TelephonyTest { 
        waitForMs(50);

        */



        CdmaCellLocation actualCellLocation = (CdmaCellLocation) mPhoneUT.getCellLocation(workSource);

        CdmaCellLocation actualCellLocation =

                (CdmaCellLocation) mPhoneUT.getCellLocation(workSource);

        assertEquals(CdmaCellLocation.INVALID_LAT_LONG,

                actualCellLocation.getBaseStationLatitude());

        assertEquals(CdmaCellLocation.INVALID_LAT_LONG,
@@ -315,26 +314,26 @@ public class GsmCdmaPhoneTest extends TelephonyTest { 
    public void testSendBurstDtmf() {

        //Should do nothing for GSM

        mPhoneUT.sendBurstDtmf("1234567890", 0, 0, null);

        verify(mSimulatedCommandsVerifier, times(0)).sendBurstDtmf(anyString(), anyInt(), anyInt(),

                any(Message.class));

        verify(mSimulatedCommandsVerifier, times(0)).sendBurstDtmf(nullable(String.class), anyInt(),

                anyInt(), nullable(Message.class));



        switchToCdma();

        //invalid character

        mPhoneUT.sendBurstDtmf("12345a67890", 0, 0, null);

        verify(mSimulatedCommandsVerifier, times(0)).sendBurstDtmf(anyString(), anyInt(), anyInt(),

                any(Message.class));

        verify(mSimulatedCommandsVerifier, times(0)).sendBurstDtmf(nullable(String.class), anyInt(),

                anyInt(), nullable(Message.class));



        //state IDLE

        mCT.mState = PhoneConstants.State.IDLE;

        mPhoneUT.sendBurstDtmf("1234567890", 0, 0, null);

        verify(mSimulatedCommandsVerifier, times(0)).sendBurstDtmf(anyString(), anyInt(), anyInt(),

                any(Message.class));

        verify(mSimulatedCommandsVerifier, times(0)).sendBurstDtmf(nullable(String.class), anyInt(),

                anyInt(), nullable(Message.class));



        //state RINGING

        mCT.mState = PhoneConstants.State.RINGING;

        mPhoneUT.sendBurstDtmf("1234567890", 0, 0, null);

        verify(mSimulatedCommandsVerifier, times(0)).sendBurstDtmf(anyString(), anyInt(), anyInt(),

                any(Message.class));

        verify(mSimulatedCommandsVerifier, times(0)).sendBurstDtmf(nullable(String.class), anyInt(),

                anyInt(), nullable(Message.class));



        mCT.mState = PhoneConstants.State.OFFHOOK;

        mPhoneUT.sendBurstDtmf("1234567890", 0, 0, null);
@@ -360,7 +359,7 @@ public class GsmCdmaPhoneTest extends TelephonyTest { 
        voiceMailNumber = "1234567891";

        mPhoneUT.setVoiceMailNumber("alphaTag", voiceMailNumber, null);

        verify(mSimRecords).setVoiceMailNumber(eq("alphaTag"), eq(voiceMailNumber),

                any(Message.class));

                nullable(Message.class));



        doReturn(voiceMailNumber).when(mSimRecords).getVoiceMailNumber();

        assertEquals(voiceMailNumber, mPhoneUT.getVoiceMailNumber());
@@ -460,16 +459,18 @@ public class GsmCdmaPhoneTest extends TelephonyTest { 
        // invalid reason (-1)

        mPhoneUT.getCallForwardingOption(-1, null);

        verify(mSimulatedCommandsVerifier, times(0)).queryCallForwardStatus(

                anyInt(), anyInt(), anyString(), any(Message.class));

                anyInt(), anyInt(), nullable(String.class), nullable(Message.class));



        // valid reason

        String imsi = "1234567890";

        doReturn(imsi).when(mSimRecords).getIMSI();

        mPhoneUT.getCallForwardingOption(CF_REASON_UNCONDITIONAL, null);

        verify(mSimulatedCommandsVerifier).queryCallForwardStatus(

                eq(CF_REASON_UNCONDITIONAL), anyInt(), anyString(), any(Message.class));

                eq(CF_REASON_UNCONDITIONAL), anyInt(), nullable(String.class),

                nullable(Message.class));

        waitForMs(50);

        verify(mSimRecords).setVoiceCallForwardingFlag(anyInt(), anyBoolean(), anyString());

        verify(mSimRecords).setVoiceCallForwardingFlag(anyInt(), anyBoolean(),

                nullable(String.class));



        // should have updated shared preferences

        SharedPreferences sharedPreferences = PreferenceManager.
@@ -493,13 +494,14 @@ public class GsmCdmaPhoneTest extends TelephonyTest { 
        mPhoneUT.setCallForwardingOption(-1, CF_REASON_UNCONDITIONAL,

                cfNumber, 0, null);

        verify(mSimulatedCommandsVerifier, times(0)).setCallForward(anyInt(), anyInt(), anyInt(),

                anyString(), anyInt(), any(Message.class));

                nullable(String.class), anyInt(), nullable(Message.class));



        // valid action

        mPhoneUT.setCallForwardingOption(CF_ACTION_ENABLE, CF_REASON_UNCONDITIONAL, cfNumber, 0,

                null);

        verify(mSimulatedCommandsVerifier).setCallForward(eq(CF_ACTION_ENABLE),

                eq(CF_REASON_UNCONDITIONAL), anyInt(), eq(cfNumber), eq(0), any(Message.class));

                eq(CF_REASON_UNCONDITIONAL), anyInt(), eq(cfNumber), eq(0),

                nullable(Message.class));

        waitForMs(50);

        verify(mSimRecords).setVoiceCallForwardingFlag(anyInt(), anyBoolean(), eq(cfNumber));

    }
@@ -513,48 +515,48 @@ public class GsmCdmaPhoneTest extends TelephonyTest { 
    @SmallTest

    public void testHandleInitialMessages() {

        // EVENT_RADIO_AVAILABLE

        verify(mSimulatedCommandsVerifier).getBasebandVersion(any(Message.class));

        verify(mSimulatedCommandsVerifier).getIMEI(any(Message.class));

        verify(mSimulatedCommandsVerifier).getIMEISV(any(Message.class));

        verify(mSimulatedCommandsVerifier).getRadioCapability(any(Message.class));

        verify(mSimulatedCommandsVerifier).getBasebandVersion(nullable(Message.class));

        verify(mSimulatedCommandsVerifier).getDeviceIdentity(nullable(Message.class));

        verify(mSimulatedCommandsVerifier).getRadioCapability(nullable(Message.class));

        // once as part of constructor, and once on radio available

        verify(mSimulatedCommandsVerifier, times(2)).startLceService(anyInt(), anyBoolean(),

                any(Message.class));

                nullable(Message.class));



        // EVENT_RADIO_ON

        verify(mSimulatedCommandsVerifier).getVoiceRadioTechnology(any(Message.class));

        verify(mSimulatedCommandsVerifier).getVoiceRadioTechnology(nullable(Message.class));

        verify(mSimulatedCommandsVerifier).setPreferredNetworkType(

                eq(RILConstants.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA), any(Message.class));

                eq(RILConstants.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA), nullable(Message.class));



        // verify responses for above requests:

        // baseband version

        verify(mTelephonyManager).setBasebandVersionForPhone(eq(mPhoneUT.getPhoneId()),

                anyString());

                nullable(String.class));

        // IMEI

        assertEquals(SimulatedCommands.FAKE_IMEI, mPhoneUT.getImei());

        // IMEISV

        assertEquals(SimulatedCommands.FAKE_IMEISV, mPhoneUT.getDeviceSvn());

        // radio capability

        verify(mSimulatedCommandsVerifier).getNetworkSelectionMode(any(Message.class));

        verify(mSimulatedCommandsVerifier).getNetworkSelectionMode(nullable(Message.class));



        switchToCdma(); // this leads to eventRadioAvailable handling on cdma



        // EVENT_RADIO_AVAILABLE

        verify(mSimulatedCommandsVerifier, times(2)).getBasebandVersion(any(Message.class));

        verify(mSimulatedCommandsVerifier).getDeviceIdentity(any(Message.class));

        verify(mSimulatedCommandsVerifier, times(2)).getBasebandVersion(nullable(Message.class));

        verify(mSimulatedCommandsVerifier, times(2)).getDeviceIdentity(nullable(Message.class));

        verify(mSimulatedCommandsVerifier, times(3)).startLceService(anyInt(), anyBoolean(),

                any(Message.class));

                nullable(Message.class));



        // EVENT_RADIO_ON

        verify(mSimulatedCommandsVerifier, times(2)).getVoiceRadioTechnology(any(Message.class));

        verify(mSimulatedCommandsVerifier, times(2)).getVoiceRadioTechnology(

                nullable(Message.class));

        // once on radio on, and once on get baseband version

        verify(mSimulatedCommandsVerifier, times(3)).setPreferredNetworkType(

                eq(RILConstants.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA), any(Message.class));

                eq(RILConstants.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA), nullable(Message.class));



        // verify responses for above requests:

        // baseband version

        verify(mTelephonyManager, times(2)).setBasebandVersionForPhone(eq(mPhoneUT.getPhoneId()),

                anyString());

                nullable(String.class));

        // device identity

        assertEquals(SimulatedCommands.FAKE_IMEI, mPhoneUT.getImei());

        assertEquals(SimulatedCommands.FAKE_IMEISV, mPhoneUT.getDeviceSvn());
@@ -566,9 +568,9 @@ public class GsmCdmaPhoneTest extends TelephonyTest { 
    @SmallTest

    public void testEmergencyCallbackMessages() {

        verify(mSimulatedCommandsVerifier).setEmergencyCallbackMode(eq(mPhoneUT), anyInt(),

                anyObject());

                nullable(Object.class));

        verify(mSimulatedCommandsVerifier).registerForExitEmergencyCallbackMode(eq(mPhoneUT),

                anyInt(), anyObject());

                anyInt(), nullable(Object.class));



        // verify handling of emergency callback mode

        mSimulatedCommands.notifyEmergencyCallbackMode();

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

+4 −2
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import static org.junit.Assert.assertTrue; 
import static org.mockito.Matchers.any;

import static org.mockito.Matchers.anyLong;

import static org.mockito.Matchers.anyString;

import static org.mockito.Matchers.nullable;

import static org.mockito.Mockito.anyInt;

import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.eq;
@@ -405,7 +406,7 @@ public class ServiceStateTrackerTest extends TelephonyTest { 


        ArgumentCaptor<Integer> integerArgumentCaptor = ArgumentCaptor.forClass(Integer.class);

        verify(mRuimRecords).registerForRecordsLoaded(eq(sst), integerArgumentCaptor.capture(),

                any(Object.class));

                nullable(Object.class));



        // response for mRuimRecords.registerForRecordsLoaded()

        Message msg = Message.obtain();
@@ -652,6 +653,7 @@ public class ServiceStateTrackerTest extends TelephonyTest { 
        // verify that no new message posted to handler

        verify(mTestHandler, times(1)).sendMessageAtTime(any(Message.class), anyLong());

    }



    @Test

    @MediumTest

    public void testRegAndUnregForDataConnAttach() throws Exception {
@@ -994,7 +996,7 @@ public class ServiceStateTrackerTest extends TelephonyTest { 
    public void testDisableLocationUpdates() throws Exception {

        sst.disableLocationUpdates();

        verify(mSimulatedCommandsVerifier, times(1)).setLocationUpdates(eq(false),

                any(Message.class));

                nullable(Message.class));

    }



    @Test