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

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

Merge "Update Tests to use BinderCacheManager"

parents e25ed076 17fed876
Loading
Loading
Loading
Loading
+5 −16
Original line number Original line Diff line number Diff line
@@ -18,14 +18,11 @@ package android.telephony.ims;


import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertEquals;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verify;


import android.content.pm.IPackageManager;
import android.content.pm.PackageManager;
import android.telephony.AccessNetworkConstants;
import android.telephony.AccessNetworkConstants;
import android.telephony.BinderCacheManager;
import android.telephony.ims.aidl.IImsRegistrationCallback;
import android.telephony.ims.aidl.IImsRegistrationCallback;
import android.telephony.ims.stub.ImsRegistrationImplBase;
import android.telephony.ims.stub.ImsRegistrationImplBase;
import android.test.suitebuilder.annotation.SmallTest;
import android.test.suitebuilder.annotation.SmallTest;
@@ -41,10 +38,8 @@ import org.mockito.Mock;


public class ImsMmTelManagerTests extends TelephonyTest {
public class ImsMmTelManagerTests extends TelephonyTest {


    @Mock
    @Mock ITelephony mMockTelephonyInterface;
    ITelephony.Stub mMockTelephonyInterface;
    @Mock BinderCacheManager<ITelephony> mBinderCache;
    @Mock
    IPackageManager.Stub mMockPackageManager;


    public class LocalCallback extends ImsMmTelManager.RegistrationCallback {
    public class LocalCallback extends ImsMmTelManager.RegistrationCallback {
        int mRegResult = -1;
        int mRegResult = -1;
@@ -58,13 +53,7 @@ public class ImsMmTelManagerTests extends TelephonyTest {
    @Before
    @Before
    public void setUp() throws Exception {
    public void setUp() throws Exception {
        super.setUp("ImsMmTelManagerTests");
        super.setUp("ImsMmTelManagerTests");
        doReturn(mMockTelephonyInterface).when(mMockTelephonyInterface).queryLocalInterface(
        doReturn(mMockTelephonyInterface).when(mBinderCache).getBinder();
                anyString());
        doReturn(mMockPackageManager).when(mMockPackageManager).queryLocalInterface(anyString());
        doReturn(true).when(mMockPackageManager).hasSystemFeature(
                eq(PackageManager.FEATURE_TELEPHONY_IMS), anyInt());
        mServiceManagerMockedServices.put("phone", mMockTelephonyInterface);
        mServiceManagerMockedServices.put("package", mMockPackageManager);
    }
    }


    @After
    @After
@@ -80,7 +69,7 @@ public class ImsMmTelManagerTests extends TelephonyTest {
    @Test
    @Test
    public void testCallbackValues() throws Exception {
    public void testCallbackValues() throws Exception {
        LocalCallback cb = new LocalCallback();
        LocalCallback cb = new LocalCallback();
        ImsMmTelManager managerUT = new ImsMmTelManager(0);
        ImsMmTelManager managerUT = new ImsMmTelManager(0, mBinderCache);
        managerUT.registerImsRegistrationCallback(Runnable::run, cb);
        managerUT.registerImsRegistrationCallback(Runnable::run, cb);


        // Capture the RegistrationCallback that was registered.
        // Capture the RegistrationCallback that was registered.