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

Commit 5075b84c authored by Amit Mahajan's avatar Amit Mahajan Committed by Android Partner Code Review
Browse files

Merge "Fix failing sms tests." into mm-wireless-dev

parents 285d26b2 217d4d95

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

+1 −5
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
 */

package com.android.internal.telephony;



import android.app.IActivityManager;

import android.content.ContentProvider;

import android.content.ContentValues;

import android.content.Context;
@@ -54,8 +53,6 @@ public class SubscriptionInfoUpdaterTest extends TelephonyTest { 
    private SubscriptionInfoUpdater mSubscriptionInfoUpdaterUT;

    private IccRecords mIccRecord;

    @Mock

    private IActivityManager mActivityManager;

    @Mock

    private UserInfo mUserInfo;

    @Mock

    private SubscriptionInfo mSubInfo;
@@ -110,8 +107,7 @@ public class SubscriptionInfoUpdaterTest extends TelephonyTest { 
        doReturn(SubscriptionInfoUpdater.STATUS_SIM1_INSERTED)

                .when(mTelephonyManager).getPhoneCount();



        doReturn(mActivityManager).when(mActivityManagerNative).get();

        doReturn(mUserInfo).when(mActivityManager).getCurrentUser();

        doReturn(mUserInfo).when(mIActivityManager).getCurrentUser();

        mContentProvider = new FakeSubscriptionContentProvider();

        ((MockContentResolver) mContext.getContentResolver()).addProvider(

                SubscriptionManager.CONTENT_URI.getAuthority(),

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

+20 −13
Original line number Diff line number Diff line
@@ -121,7 +121,9 @@ public abstract class TelephonyTest { 
    @Mock

    protected ProxyController mProxyController;

    @Mock

    protected Singleton<IActivityManager> mActivityManagerNative;

    protected Singleton<IActivityManager> mIActivityManagerSingleton;

    @Mock

    protected IActivityManager mIActivityManager;





    protected SimulatedCommands mSimulatedCommands;
@@ -230,7 +232,7 @@ public abstract class TelephonyTest { 
        replaceInstance(ImsManager.class, "sImsManagerInstances", null, mImsManagerInstances);

        replaceInstance(SubscriptionController.class, "sInstance", null, mSubscriptionController);

        replaceInstance(ProxyController.class, "sProxyController", null, mProxyController);

        replaceInstance(ActivityManagerNative.class, "gDefault", null, mActivityManagerNative);

        replaceInstance(ActivityManagerNative.class, "gDefault", null, mIActivityManagerSingleton);

        replaceInstance(TelephonyEventLog.class, "sInstances", null, mTelephonyEventLogInstances);

        replaceInstance(CdmaSubscriptionSourceManager.class,

                "mCdmaSubscriptionSourceChangedRegistrants", mCdmaSSM, mRegistrantList);
@@ -246,13 +248,13 @@ public abstract class TelephonyTest { 
        replaceInstance(TelephonyManager.class, "sInstance", null,

                mContext.getSystemService(Context.TELEPHONY_SERVICE));



        //mTelephonyComponentFactory

        doReturn(mSST).when(mTelephonyComponentFactory)

                .makeServiceStateTracker(any(GsmCdmaPhone.class), any(CommandsInterface.class));

        doReturn(mIccCardProxy).when(mTelephonyComponentFactory)

                .makeIccCardProxy(any(Context.class), any(CommandsInterface.class), anyInt());

        doReturn(mCT).when(mTelephonyComponentFactory)

                .makeGsmCdmaCallTracker(any(GsmCdmaPhone.class));

        doReturn(mPhone).when(mCT).getPhone();

        doReturn(mIccPhoneBookIntManager).when(mTelephonyComponentFactory)

                .makeIccPhoneBookInterfaceManager(any(Phone.class));

        doReturn(mDcTracker).when(mTelephonyComponentFactory)
@@ -266,15 +268,15 @@ public abstract class TelephonyTest { 
                        any(CommandsInterface.class), any(Handler.class),

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



        //mPhone

        doReturn(mContext).when(mPhone).getContext();

        doReturn(true).when(mPhone).getUnitTestMode();

        doReturn(mIccCardProxy).when(mPhone).getIccCard();

        doReturn(mServiceState).when(mPhone).getServiceState();

        doReturn(true).when(mPhone).isPhoneTypeGsm();

        doReturn(PhoneConstants.PHONE_TYPE_GSM).when(mPhone).getPhoneType();



        doReturn(true).when(mImsManagerInstances).containsKey(anyInt());



        doReturn(mPhone).when(mInboundSmsHandler).getPhone();



        doReturn(mTelephonyEventLog).when(mTelephonyEventLogInstances).get(anyInt());



        //mUiccController

        doReturn(mUiccCardApplication3gpp).when(mUiccController).getUiccCardApplication(anyInt(),

                eq(UiccController.APP_FAM_3GPP));

        doReturn(mUiccCardApplication3gpp2).when(mUiccController).getUiccCardApplication(anyInt(),
@@ -282,13 +284,12 @@ public abstract class TelephonyTest { 
        doReturn(mUiccCardApplicationIms).when(mUiccController).getUiccCardApplication(anyInt(),

                eq(UiccController.APP_FAM_IMS));



        //UiccCardApplication

        doReturn(mSimRecords).when(mUiccCardApplication3gpp).getIccRecords();

        doReturn(mRuimRecords).when(mUiccCardApplication3gpp2).getIccRecords();

        doReturn(mIsimUiccRecords).when(mUiccCardApplicationIms).getIccRecords();

        doReturn(mIccCardProxy).when(mPhone).getIccCard();

        doReturn(mServiceState).when(mPhone).getServiceState();

        doReturn(true).when(mPhone).isPhoneTypeGsm();

        doReturn(PhoneConstants.PHONE_TYPE_GSM).when(mPhone).getPhoneType();



        //mIccCardProxy

        doReturn(mSimRecords).when(mIccCardProxy).getIccRecords();

        doAnswer(new Answer<IccRecords>() {

            public IccRecords answer(InvocationOnMock invocation) {
@@ -296,6 +297,12 @@ public abstract class TelephonyTest { 
            }

        }).when(mIccCardProxy).getIccRecords();



        doReturn(mPhone).when(mCT).getPhone();

        doReturn(true).when(mImsManagerInstances).containsKey(anyInt());

        doReturn(mPhone).when(mInboundSmsHandler).getPhone();

        doReturn(mTelephonyEventLog).when(mTelephonyEventLogInstances).get(anyInt());

        doReturn(mIActivityManager).when(mIActivityManagerSingleton).get();



        setReady(false);

    }

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

+7 −0
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ package com.android.internal.telephony.cdma; 
import android.content.Intent;

import android.os.AsyncResult;

import android.os.HandlerThread;

import android.os.RemoteException;

import android.os.UserHandle;

import android.provider.Telephony;

import android.telephony.*;

import android.test.suitebuilder.annotation.SmallTest;
@@ -135,6 +137,11 @@ public class CdmaInboundSmsHandlerTest extends TelephonyTest { 
                intentArgumentCaptor.getValue().getAction());

        assertEquals("WaitingState", getCurrentState().getName());



        try {

            doReturn(new int[]{UserHandle.USER_SYSTEM}).when(mIActivityManager).getRunningUserIds();

        } catch (RemoteException re) {

            fail("Unexpected RemoteException: " + re.getStackTrace());

        }

        mContextFixture.sendBroadcastToOrderedBroadcastReceivers();

        waitForMs(50);

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

+7 −0
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ package com.android.internal.telephony.gsm; 
import android.content.Intent;

import android.os.AsyncResult;

import android.os.HandlerThread;

import android.os.RemoteException;

import android.os.UserHandle;

import android.provider.Telephony;

import android.telephony.*;

import android.test.suitebuilder.annotation.SmallTest;
@@ -128,6 +130,11 @@ public class GsmInboundSmsHandlerTest extends TelephonyTest { 
                intentArgumentCaptor.getValue().getAction());

        assertEquals("WaitingState", getCurrentState().getName());



        try {

            doReturn(new int[]{UserHandle.USER_SYSTEM}).when(mIActivityManager).getRunningUserIds();

        } catch (RemoteException re) {

            fail("Unexpected RemoteException: " + re.getStackTrace());

        }

        mContextFixture.sendBroadcastToOrderedBroadcastReceivers();

        waitForMs(50);