root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Polish Mockito 2.0 support

This commit is contained in:
Phillip Webb 2017-01-05 16:42:12 -08:00
parent abb8e3663a
commit 0fca9aaccb
4 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

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

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

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