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

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

Merge "Clean up Telephony tests" into stage-aosp-master

parents d1d8d5a6 67b0f728

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

+6 −4
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package android.telephony.ims; 
import static org.junit.Assert.assertEquals;

import static org.mockito.ArgumentMatchers.anyInt;

import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.verify;



import android.telephony.AccessNetworkConstants;
@@ -34,12 +35,11 @@ import org.junit.After; 
import org.junit.Before;

import org.junit.Test;

import org.mockito.ArgumentCaptor;

import org.mockito.Mock;



public class ImsMmTelManagerTests extends TelephonyTest {



    @Mock ITelephony mMockTelephonyInterface;

    @Mock BinderCacheManager<ITelephony> mBinderCache;

    // Mocked classes

    ITelephony mMockTelephonyInterface;

    BinderCacheManager<ITelephony> mBinderCache;



    public class LocalCallback extends ImsMmTelManager.RegistrationCallback {

        int mRegResult = -1;
@@ -53,6 +53,8 @@ public class ImsMmTelManagerTests extends TelephonyTest { 
    @Before

    public void setUp() throws Exception {

        super.setUp("ImsMmTelManagerTests");

        mMockTelephonyInterface = mock(ITelephony.class);

        mBinderCache = mock(BinderCacheManager.class);

        doReturn(mMockTelephonyInterface).when(mBinderCache).getBinder();

    }

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

+8 −5
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


package android.telephony.ims;





import static android.telephony.ims.feature.ImsFeature.FEATURE_MMTEL;

import static android.telephony.ims.feature.ImsFeature.FEATURE_RCS;
@@ -24,6 +23,7 @@ import static org.junit.Assert.assertEquals; 
import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.verify;



import android.telephony.BinderCacheManager;
@@ -38,7 +38,6 @@ import org.junit.After; 
import org.junit.Before;

import org.junit.Test;

import org.mockito.ArgumentCaptor;

import org.mockito.Mock;



public class ImsStateCallbackTest extends TelephonyTest {

    private static final int ON_ERROR = Integer.MAX_VALUE;
@@ -46,9 +45,10 @@ public class ImsStateCallbackTest extends TelephonyTest { 


    private static final int SUB_ID_ONE = 1;



    @Mock ITelephony mMockTelephonyInterface;

    @Mock BinderCacheManager<ITelephony> mBinderCache;

    @Mock BinderCacheManager<IImsRcsController> mRcsBinderCache;

    // Mocked classes

    ITelephony mMockTelephonyInterface;

    BinderCacheManager<ITelephony> mBinderCache;

    BinderCacheManager<IImsRcsController> mRcsBinderCache;



    public class LocalCallback extends ImsStateCallback {

        int mRegResult = -1;
@@ -72,6 +72,9 @@ public class ImsStateCallbackTest extends TelephonyTest { 
    @Before

    public void setUp() throws Exception {

        super.setUp("ImsStateCallbackTests");

        mMockTelephonyInterface = mock(ITelephony.class);

        mBinderCache = mock(BinderCacheManager.class);

        mRcsBinderCache = mock(BinderCacheManager.class);

        doReturn(mMockTelephonyInterface).when(mBinderCache)

                .listenOnBinder(any(), any(Runnable.class));

        doReturn(mMockTelephonyInterface).when(mBinderCache)

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

+2 −1
Original line number Diff line number Diff line
@@ -50,12 +50,13 @@ public class AppSmsManagerTest extends TelephonyTest { 


    @Before

    public void setUp() throws Exception {

        super.setUp("AppSmsManagerTest");

        super.setUp(getClass().getSimpleName());

        mAppSmsManagerUT = new AppSmsManager(mContextFixture.getTestDouble());

    }



    @After

    public void tearDown() throws Exception {

        mAppSmsManagerUT = null;

        super.tearDown();

    }

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

+6 −7
Original line number Diff line number Diff line
@@ -44,24 +44,23 @@ import org.junit.Before; 
import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.ArgumentCaptor;

import org.mockito.Mock;



@RunWith(AndroidTestingRunner.class)

@TestableLooper.RunWithLooper

public class CallManagerTest extends TelephonyTest {



    @Mock

    // Mocked classes

    GsmCdmaCall mFgCall;

    @Mock

    GsmCdmaCall mBgCall;

    @Mock

    GsmCdmaCall mRingingCall;

    @Mock

    Phone mSecondPhone;



    @Before

    public void setUp() throws Exception {

        super.setUp(this.getClass().getSimpleName());

        super.setUp(getClass().getSimpleName());

        mFgCall = mock(GsmCdmaCall.class);

        mBgCall = mock(GsmCdmaCall.class);

        mRingingCall = mock(GsmCdmaCall.class);

        mSecondPhone = mock(Phone.class);

        restoreInstance(CallManager.class, "INSTANCE", null);

        /* Mock Phone and Call, initially all calls are idle */

        doReturn(ServiceState.STATE_IN_SERVICE).when(mServiceState).getState();

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

+7 −3
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.internal.telephony; 
import static org.junit.Assert.assertEquals;

import static org.mockito.Matchers.anyLong;

import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.times;

import static org.mockito.Mockito.verify;
@@ -39,7 +40,6 @@ import org.junit.Before; 
import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.ArgumentCaptor;

import org.mockito.Mock;



@RunWith(AndroidTestingRunner.class)

@TestableLooper.RunWithLooper
@@ -48,9 +48,9 @@ public class CarrierActionAgentTest extends TelephonyTest { 
    private FakeContentResolver mFakeContentResolver;

    private static int DATA_CARRIER_ACTION_EVENT = 0;

    private static int RADIO_CARRIER_ACTION_EVENT = 1;

    @Mock



    // Mocked classes

    private Handler mDataActionHandler;

    @Mock

    private Handler mRadioActionHandler;



    private class FakeContentResolver extends MockContentResolver {
@@ -70,6 +70,8 @@ public class CarrierActionAgentTest extends TelephonyTest { 
    public void setUp() throws Exception {

        logd("CarrierActionAgentTest +Setup!");

        super.setUp(getClass().getSimpleName());

        mDataActionHandler = mock(Handler.class);

        mRadioActionHandler = mock(Handler.class);

        mFakeContentResolver = new FakeContentResolver();

        doReturn(mFakeContentResolver).when(mContext).getContentResolver();

        mCarrierActionAgentUT = new CarrierActionAgent(mPhone);
@@ -170,6 +172,8 @@ public class CarrierActionAgentTest extends TelephonyTest { 
    @After

    public void tearDown() throws Exception {

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

        mCarrierActionAgentUT = null;

        mFakeContentResolver = null;

        super.tearDown();

    }

}