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

Commit d703f90a authored by Brad Ebinger's avatar Brad Ebinger Committed by Automerger Merge Worker
Browse files

Merge "Update Tests to use BinderCacheManager" am: c5b753ed

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1477490

Change-Id: Ia8285867a13c4619283e1c4bb2a664a863bb72aa
parents c39d6f57 c5b753ed
Loading
Loading
Loading
Loading
+5 −16
Original line number Diff line number Diff line
@@ -18,14 +18,11 @@ package android.telephony.ims;

import static org.junit.Assert.assertEquals;
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.verify;

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

public class ImsMmTelManagerTests extends TelephonyTest {

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

    public class LocalCallback extends ImsMmTelManager.RegistrationCallback {
        int mRegResult = -1;
@@ -58,13 +53,7 @@ public class ImsMmTelManagerTests extends TelephonyTest {
    @Before
    public void setUp() throws Exception {
        super.setUp("ImsMmTelManagerTests");
        doReturn(mMockTelephonyInterface).when(mMockTelephonyInterface).queryLocalInterface(
                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);
        doReturn(mMockTelephonyInterface).when(mBinderCache).getBinder();
    }

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

        // Capture the RegistrationCallback that was registered.