Browse Source

Polish Mockito 2.0 support

pull/7881/merge
Phillip Webb 9 years ago
parent
commit
0fca9aaccb
  1. 2
      spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockitoAopProxyTargetInterceptor.java
  2. 4
      spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockitoApi.java
  3. 4
      spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/Mockito21Tests.java
  4. 4
      spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/Mockito22Tests.java

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

@ -91,7 +91,7 @@ class MockitoAopProxyTargetInterceptor implements MethodInterceptor { @@ -91,7 +91,7 @@ class MockitoAopProxyTargetInterceptor implements MethodInterceptor {
private final MockingProgress progress;
public Verification(Object target) {
Verification(Object target) {
this.progress = MockitoApi.get().mockingProgress(target);
}

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

@ -164,9 +164,9 @@ abstract class MockitoApi { @@ -164,9 +164,9 @@ abstract class MockitoApi {
private final Method getMatcherMethod;
private Constructor<MockAwareVerificationMode> mockAwareVerificationModeConstructor;
private final Constructor<MockAwareVerificationMode> mockAwareVerificationModeConstructor;
public Mockito2Api() {
Mockito2Api() {
this.getMockSettingsMethod = ReflectionUtils.findMethod(MockUtil.class,
"getMockSettings", Object.class);
this.mockingProgressMethod = ReflectionUtils

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

@ -20,6 +20,7 @@ import org.junit.Test; @@ -20,6 +20,7 @@ import org.junit.Test;
import org.junit.runner.JUnitCore;
import org.junit.runner.Result;
import org.junit.runner.RunWith;
import org.junit.runner.notification.Failure;
import org.springframework.boot.junit.runner.classpath.ClassPathOverrides;
import org.springframework.boot.junit.runner.classpath.ModifiedClassPathRunner;
@ -47,6 +48,9 @@ public class Mockito21Tests { @@ -47,6 +48,9 @@ public class Mockito21Tests {
private void runTests(Class<?> testClass) {
Result result = new JUnitCore().run(testClass);
for (Failure failure : result.getFailures()) {
System.err.println(failure.getTrace());
}
assertThat(result.getFailureCount()).isEqualTo(0);
assertThat(result.getRunCount()).isGreaterThan(0);
}

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

@ -20,6 +20,7 @@ import org.junit.Test; @@ -20,6 +20,7 @@ import org.junit.Test;
import org.junit.runner.JUnitCore;
import org.junit.runner.Result;
import org.junit.runner.RunWith;
import org.junit.runner.notification.Failure;
import org.springframework.boot.junit.runner.classpath.ClassPathOverrides;
import org.springframework.boot.junit.runner.classpath.ModifiedClassPathRunner;
@ -47,6 +48,9 @@ public class Mockito22Tests { @@ -47,6 +48,9 @@ public class Mockito22Tests {
private void runTests(Class<?> testClass) {
Result result = new JUnitCore().run(testClass);
for (Failure failure : result.getFailures()) {
System.err.println(failure.getTrace());
}
assertThat(result.getFailureCount()).isEqualTo(0);
assertThat(result.getRunCount()).isGreaterThan(0);
}

Loading…
Cancel
Save