Merge "Modify tests in accordance with API changes"
diff --git a/tests/telephonytests/src/android/telephony/ims/ImsFeatureTest.java b/tests/telephonytests/src/android/telephony/ims/ImsFeatureTest.java
index 2695e4c..319d200 100644
--- a/tests/telephonytests/src/android/telephony/ims/ImsFeatureTest.java
+++ b/tests/telephonytests/src/android/telephony/ims/ImsFeatureTest.java
@@ -20,8 +20,10 @@
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 @@
@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
diff --git a/tests/telephonytests/src/android/telephony/ims/ImsServiceTest.java b/tests/telephonytests/src/android/telephony/ims/ImsServiceTest.java
index ec4bf33..80cae94 100644
--- a/tests/telephonytests/src/android/telephony/ims/ImsServiceTest.java
+++ b/tests/telephonytests/src/android/telephony/ims/ImsServiceTest.java
@@ -24,9 +24,11 @@
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 @@
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));
diff --git a/tests/telephonytests/src/android/telephony/ims/TestImsFeature.java b/tests/telephonytests/src/android/telephony/ims/TestImsFeature.java
index ec09b4a..5f9327e 100644
--- a/tests/telephonytests/src/android/telephony/ims/TestImsFeature.java
+++ b/tests/telephonytests/src/android/telephony/ims/TestImsFeature.java
@@ -40,6 +40,11 @@
}
@Override
+ public boolean queryCapabilityConfiguration(int capability, int radioTech) {
+ return false;
+ }
+
+ @Override
public void changeEnabledCapabilities(CapabilityChangeRequest request,
CapabilityCallbackProxy c) {
lastRequest = request;