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

Commit 03132bbc authored by Brad Ebinger's avatar Brad Ebinger Committed by Gerrit Code Review
Browse files

Merge "Modify tests in accordance with API changes"

parents 4841c770 e0f74003

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

+9 −0
Original line number Diff line number Diff line
@@ -20,8 +20,10 @@ import static junit.framework.Assert.assertEquals; 
import static junit.framework.Assert.assertTrue;



import static org.mockito.Matchers.eq;

import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.verify;



import android.os.IBinder;

import android.os.Parcel;

import android.os.RemoteException;

import android.telephony.ims.aidl.IImsCapabilityCallback;
@@ -71,12 +73,19 @@ public class ImsFeatureTest { 
    @Mock

    private IImsFeatureStatusCallback mTestStatusCallback;

    @Mock

    private IBinder mTestBinder;

    @Mock

    private IImsFeatureStatusCallback mTestStatusCallback2;

    @Mock

    private IBinder mTestBinder2;



    @Before

    public void setUp() {

        MockitoAnnotations.initMocks(this);

        mTestImsFeature = new TestImsFeature();

        // Needed for RemoteCallbackList registration

        doReturn(mTestBinder).when(mTestStatusCallback).asBinder();

        doReturn(mTestBinder2).when(mTestStatusCallback2).asBinder();

    }



    @After

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

+5 −0
Original line number Diff line number Diff line
@@ -24,9 +24,11 @@ import static junit.framework.Assert.fail; 
import static org.mockito.Matchers.eq;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;



import android.content.Context;

import android.content.Intent;

import android.os.IBinder;

import android.os.RemoteException;

import android.telephony.ims.aidl.IImsMmTelFeature;

import android.telephony.ims.aidl.IImsServiceController;
@@ -59,11 +61,14 @@ public class ImsServiceTest { 


    private Context mMockContext;

    private IImsFeatureStatusCallback mTestCallback;

    private IBinder mImsFeatureStatusCallbackBinder;



    @Before

    public void setUp() throws Exception {

        mMockContext = mock(Context.class);

        mTestCallback = mock(IImsFeatureStatusCallback.class);

        mImsFeatureStatusCallbackBinder = mock(IBinder.class);

        when(mTestCallback.asBinder()).thenReturn(mImsFeatureStatusCallbackBinder);

        mTestImsService = new TestImsService(mMockContext);

        mTestImsServiceBinder = (IImsServiceController) mTestImsService.onBind(

                new Intent(ImsService.SERVICE_INTERFACE));

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

+5 −0
Original line number Diff line number Diff line
@@ -39,6 +39,11 @@ public class TestImsFeature extends ImsFeature { 
        notifyCapabilitiesStatusChanged(c);

    }



    @Override

    public boolean queryCapabilityConfiguration(int capability, int radioTech) {

        return false;

    }



    @Override

    public void changeEnabledCapabilities(CapabilityChangeRequest request,

            CapabilityCallbackProxy c) {