Merge "Refactor code incompatible with Mockito 2.7.13" (bed66827) · Commits · e / os / android_frameworks_base

media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/integration/CameraDeviceBinderTest.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -45,8 +45,8 @@ import static android.hardware.camera2.CameraDevice.TEMPLATE_PREVIEW;

		import com.android.mediaframeworktest.MediaFrameworkIntegrationTestRunner;

		import org.mockito.ArgumentMatcher;
		import org.mockito.ArgumentCaptor;
		import org.mockito.compat.ArgumentMatcher;
		import static org.mockito.Mockito.*;

		public class CameraDeviceBinderTest extends AndroidTestCase {
		@@ -168,7 +168,7 @@ public class CameraDeviceBinderTest extends AndroidTestCase {

		class IsMetadataNotEmpty extends ArgumentMatcher<CameraMetadataNative> {
		@Override
		public boolean matches(Object obj) {
		public boolean matchesObject(Object obj) {
		return !((CameraMetadataNative) obj).isEmpty();
		}
		}

media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaInserterTest.java

+4 −8

Original line number	Diff line number	Diff line
		@@ -37,9 +37,9 @@ import android.test.InstrumentationTestCase;
		import android.test.suitebuilder.annotation.SmallTest;

		import org.hamcrest.Description;
		import org.mockito.ArgumentMatcher;
		import org.mockito.Mock;
		import org.mockito.MockitoAnnotations;
		import org.mockito.compat.ArgumentMatcher;

		public class MediaInserterTest extends InstrumentationTestCase {

		@@ -67,7 +67,7 @@ public class MediaInserterTest extends InstrumentationTestCase {
		}

		@Override
		public boolean matches(Object argument) {
		public boolean matchesObject(Object argument) {
		if (!(argument instanceof Uri)) {
		return false;
		}
		@@ -79,13 +79,9 @@ public class MediaInserterTest extends InstrumentationTestCase {
		}

		@Override
		public void describeTo(Description description) {
		description
		.appendText("expected a TableUri '")
		.appendText(mUri.toString())
		.appendText("'");
		public String toString() {
		return "expected a TableUri '" + mUri.toString() + "'";
		}

		}

		private static Uri eqUri(Uri in) {

packages/SettingsLib/tests/integ/src/com/android/settingslib/users/AppRestrictionsHelperTest.java

+4 −5

Original line number	Diff line number	Diff line
		@@ -44,10 +44,9 @@ import android.test.suitebuilder.annotation.SmallTest;
		import android.view.inputmethod.InputMethodInfo;
		import com.android.settingslib.BaseTest;

		import org.hamcrest.Description;
		import org.mockito.ArgumentMatcher;
		import org.mockito.Mock;
		import org.mockito.MockitoAnnotations;
		import org.mockito.compat.ArgumentMatcher;

		import java.util.ArrayList;
		import java.util.List;
		@@ -249,7 +248,7 @@ public class AppRestrictionsHelperTest extends BaseTest {
		}

		@Override
		public boolean matches(Object argument) {
		public boolean matchesObject(Object argument) {
		if (argument instanceof Intent) {
		return ((Intent) argument).filterEquals(mIntent);
		}
		@@ -257,8 +256,8 @@ public class AppRestrictionsHelperTest extends BaseTest {
		}

		@Override
		public void describeTo(Description description) {
		description.appendText("Expected: " + mIntent);
		public String toString() {
		return "Expected: " + mIntent;
		}
		}

services/tests/servicestests/src/com/android/server/NetworkScoreServiceTest.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -314,8 +314,8 @@ public class NetworkScoreServiceTest {
		final Bundle bundle = new Bundle();
		bundle.putParcelable(EXTRA_RECOMMENDATION_RESULT, providerResult);
		doAnswer(invocation -> {
		bundle.putInt(EXTRA_SEQUENCE, invocation.getArgumentAt(2, int.class));
		invocation.getArgumentAt(1, IRemoteCallback.class).sendResult(bundle);
		bundle.putInt(EXTRA_SEQUENCE, invocation.getArgument(2));
		invocation.<IRemoteCallback>getArgument(1).sendResult(bundle);
		return null;
		}).when(mRecommendationProvider)
		.requestRecommendation(eq(mRecommendationRequest), isA(IRemoteCallback.class),
		@@ -379,7 +379,7 @@ public class NetworkScoreServiceTest {
		injectProvider();
		final Bundle bundle = new Bundle();
		doAnswer(invocation -> {
		invocation.getArgumentAt(1, IRemoteCallback.class).sendResult(bundle);
		invocation.<IRemoteCallback>getArgument(1).sendResult(bundle);
		return null;
		}).when(mRecommendationProvider)
		.requestRecommendation(eq(mRecommendationRequest), isA(IRemoteCallback.class),
		@@ -956,7 +956,7 @@ public class NetworkScoreServiceTest {
		IBinder mockBinder = mock(IBinder.class);
		when(mockBinder.queryLocalInterface(anyString()))
		.thenReturn(mRecommendationProvider);
		invocation.getArgumentAt(1, ServiceConnection.class)
		invocation.<ServiceConnection>getArgument(1)
		.onServiceConnected(NEW_SCORER.getRecommendationServiceComponent(),
		mockBinder);
		return true;

services/tests/servicestests/src/com/android/server/NetworkScorerAppManagerTest.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -50,10 +50,10 @@ import com.android.internal.R;
		import org.junit.Before;
		import org.junit.Test;
		import org.junit.runner.RunWith;
		import org.mockito.ArgumentMatcher;
		import org.mockito.Mock;
		import org.mockito.Mockito;
		import org.mockito.MockitoAnnotations;
		import org.mockito.compat.ArgumentMatcher;

		import java.util.ArrayList;
		import java.util.List;
		@@ -77,7 +77,7 @@ public class NetworkScorerAppManagerTest {
		when(mMockContext.getPackageManager()).thenReturn(mMockPm);
		when(mMockPm.queryIntentServices(Mockito.argThat(new ArgumentMatcher<Intent>() {
		@Override
		public boolean matches(Object object) {
		public boolean matchesObject(Object object) {
		Intent intent = (Intent) object;
		return NetworkScoreManager.ACTION_RECOMMEND_NETWORKS.equals(intent.getAction());
		}
		@@ -395,7 +395,7 @@ public class NetworkScorerAppManagerTest {
		when(mMockPm.resolveService(
		Mockito.argThat(new ArgumentMatcher<Intent>() {
		@Override
		public boolean matches(Object object) {
		public boolean matchesObject(Object object) {
		Intent intent = (Intent) object;
		return NetworkScoreManager.ACTION_RECOMMEND_NETWORKS
		.equals(intent.getAction())
		@@ -416,7 +416,7 @@ public class NetworkScorerAppManagerTest {
		when(mMockPm.resolveActivity(
		Mockito.argThat(new ArgumentMatcher<Intent>() {
		@Override
		public boolean matches(Object object) {
		public boolean matchesObject(Object object) {
		Intent intent = (Intent) object;
		return NetworkScoreManager.ACTION_CUSTOM_ENABLE.equals(intent.getAction())
		&& useOpenWifiComp.getPackageName().equals(intent.getPackage());