Drop support for Mockito 1.x

Closes gh-10247

Author: wilkinsona

spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockDefinition.java

@@ -149,7 +149,7 @@ public <T> T createMock(String name) {
 		if (!this.extraInterfaces.isEmpty()) {
 			settings.extraInterfaces(this.extraInterfaces.toArray(new Class<?>[] {}));
 		}
-		settings.defaultAnswer(MockitoApi.get().getAnswer(this.answer));
+		settings.defaultAnswer(this.answer);
 		if (this.serializable) {
 			settings.serializable();
 		}

spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockReset.java

@@ -19,13 +19,13 @@
 import java.util.List;
 
 import org.mockito.MockSettings;
+import org.mockito.MockingDetails;
 import org.mockito.Mockito;
 import org.mockito.listeners.InvocationListener;
 import org.mockito.listeners.MethodInvocationReport;
 import org.mockito.mock.MockCreationSettings;
 
 import org.springframework.util.Assert;
-import org.springframework.util.ClassUtils;
 
 /**
  * Reset strategy used on a mock bean. Usually applied to a mock via the
@@ -100,17 +100,15 @@ public static MockSettings apply(MockReset reset, MockSettings settings) {
 	 * @param mock the source mock
 	 * @return the reset type (never {@code null})
 	 */
-	@SuppressWarnings("rawtypes")
 	static MockReset get(Object mock) {
 		MockReset reset = MockReset.NONE;
-		if (ClassUtils.isPresent("org.mockito.internal.util.MockUtil", null)) {
-			if (Mockito.mockingDetails(mock).isMock()) {
-				MockCreationSettings settings = MockitoApi.get().getMockSettings(mock);
-				List listeners = settings.getInvocationListeners();
-				for (Object listener : listeners) {
-					if (listener instanceof ResetInvocationListener) {
-						reset = ((ResetInvocationListener) listener).getReset();
-					}
+		MockingDetails mockingDetails = Mockito.mockingDetails(mock);
+		if (mockingDetails.isMock()) {
+			MockCreationSettings<?> settings = mockingDetails.getMockCreationSettings();
+			List<InvocationListener> listeners = settings.getInvocationListeners();
+			for (Object listener : listeners) {
+				if (listener instanceof ResetInvocationListener) {
+					reset = ((ResetInvocationListener) listener).getReset();
 				}
 			}
 		}

spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockitoAopProxyTargetInterceptor.java

@@ -16,6 +16,7 @@
 
 package org.springframework.boot.test.mock.mockito;
 
+import java.util.Collections;
 import java.util.List;
 
 import org.aopalliance.aop.Advice;
@@ -25,6 +26,7 @@
 import org.mockito.internal.matchers.LocalizedMatcher;
 import org.mockito.internal.progress.ArgumentMatcherStorage;
 import org.mockito.internal.progress.MockingProgress;
+import org.mockito.internal.progress.ThreadSafeMockingProgress;
 import org.mockito.internal.verification.MockAwareVerificationMode;
 import org.mockito.verification.VerificationMode;
 
@@ -48,12 +50,11 @@ class MockitoAopProxyTargetInterceptor implements MethodInterceptor {
 
 	private final Object target;
 
-	private final Verification verification;
+	private final Verification verification = new Verification();
 
 	MockitoAopProxyTargetInterceptor(Object source, Object target) throws Exception {
 		this.source = source;
 		this.target = target;
-		this.verification = new Verification(target);
 	}
 
 	@Override
@@ -89,11 +90,8 @@ private static class Verification {
 
 		private final Object monitor = new Object();
 
-		private final MockingProgress progress;
-
-		Verification(Object target) {
-			this.progress = MockitoApi.get().mockingProgress(target);
-		}
+		private final MockingProgress progress = ThreadSafeMockingProgress
+				.mockingProgress();
 
 		public boolean isVerifying() {
 			synchronized (this.monitor) {
@@ -113,8 +111,8 @@ public void replaceVerifyMock(Object source, Object target) {
 					if (mode instanceof MockAwareVerificationMode) {
 						MockAwareVerificationMode mockAwareMode = (MockAwareVerificationMode) mode;
 						if (mockAwareMode.getMock() == source) {
-							mode = MockitoApi.get().createMockAwareVerificationMode(
-									target, mockAwareMode);
+							mode = new MockAwareVerificationMode(target, mode,
+									Collections.emptySet());
 						}
 					}
 					resetVerificationStarted(mode);
@@ -126,7 +124,8 @@ private void resetVerificationStarted(VerificationMode mode) {
 			ArgumentMatcherStorage storage = this.progress.getArgumentMatcherStorage();
 			List<LocalizedMatcher> matchers = storage.pullLocalizedMatchers();
 			this.progress.verificationStarted(mode);
-			MockitoApi.get().reportMatchers(storage, matchers);
+			matchers.stream().map(LocalizedMatcher::getMatcher)
+					.forEach(storage::reportMatcher);
 		}
 
 	}

spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockitoApi.java

@@ -20,6 +20,7 @@
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.mockito.Answers;
+import org.mockito.Mockito;
 import org.mockito.mock.MockCreationSettings;
 
 import org.springframework.boot.test.mock.mockito.example.ExampleExtraInterface;
@@ -85,7 +86,8 @@ public void createMock() throws Exception {
 				new Class<?>[] { ExampleExtraInterface.class },
 				Answers.RETURNS_SMART_NULLS, true, MockReset.BEFORE, null);
 		ExampleService mock = definition.createMock();
-		MockCreationSettings<?> settings = MockitoApi.get().getMockSettings(mock);
+		MockCreationSettings<?> settings = Mockito.mockingDetails(mock)
+				.getMockCreationSettings();
 		assertThat(mock).isInstanceOf(ExampleService.class);
 		assertThat(mock).isInstanceOf(ExampleExtraInterface.class);
 		assertThat(settings.getMockName().toString()).isEqualTo("name");

spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockDefinitionTests.java

@@ -20,6 +20,7 @@
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.mockito.Answers;
+import org.mockito.Mockito;
 import org.mockito.mock.MockCreationSettings;
 
 import org.springframework.boot.test.mock.mockito.example.ExampleService;
@@ -78,7 +79,8 @@ public void createSpy() throws Exception {
 		SpyDefinition definition = new SpyDefinition("name", REAL_SERVICE_TYPE,
 				MockReset.BEFORE, true, null);
 		RealExampleService spy = definition.createSpy(new RealExampleService("hello"));
-		MockCreationSettings<?> settings = MockitoApi.get().getMockSettings(spy);
+		MockCreationSettings<?> settings = Mockito.mockingDetails(spy)
+				.getMockCreationSettings();
 		assertThat(spy).isInstanceOf(ExampleService.class);
 		assertThat(settings.getMockName().toString()).isEqualTo("name");
 		assertThat(settings.getDefaultAnswer()).isEqualTo(Answers.CALLS_REAL_METHODS);