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

Merge pull request #15422 from dreis2211 

* pr/15422:
  Remove Mockito 1 leftover
This commit is contained in:
Stephane Nicoll 2018-12-11 08:52:41 +01:00
parent 554e7061ce 0f92b139f3
commit adb145e225
1 changed files with 5 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/SpyBeanWithAopProxyTests.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2012-2017 the original author or authors.
* Copyright 2012-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -16,12 +16,10 @@
package org.springframework.boot.test.mock.mockito;
import java.lang.reflect.Method;
import java.util.Arrays;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.ArgumentMatchers;
import org.springframework.cache.CacheManager;
import org.springframework.cache.annotation.Cacheable;
@ -34,10 +32,10 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.springframework.stereotype.Service;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.util.ClassUtils;
import org.springframework.util.ReflectionUtils;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
@ -60,32 +58,8 @@ public class SpyBeanWithAopProxyTests {
Long d2 = this.dateService.getDate(false);
assertThat(d1).isEqualTo(d2);
verify(this.dateService, times(1)).getDate(false);
verify(this.dateService, times(1)).getDate(matchesFalse());
verify(this.dateService, times(1)).getDate(matchesAnyBoolean());
}
private boolean matchesFalse() {
if (isTestingMockito1()) {
Method method = ReflectionUtils.findMethod(
ClassUtils.resolveClassName("org.mockito.Matchers", null), "eq",
Boolean.TYPE);
return (boolean) ReflectionUtils.invokeMethod(method, null, false);
}
return ArgumentMatchers.eq(false);
}
private boolean matchesAnyBoolean() {
if (isTestingMockito1()) {
Method method = ReflectionUtils.findMethod(
ClassUtils.resolveClassName("org.mockito.Matchers", null),
"anyBoolean");
return (boolean) ReflectionUtils.invokeMethod(method, null);
}
return ArgumentMatchers.anyBoolean();
}
private boolean isTestingMockito1() {
return ClassUtils.isPresent("org.mockito.ReturnValues", null);
verify(this.dateService, times(1)).getDate(eq(false));
verify(this.dateService, times(1)).getDate(anyBoolean());
}
@Configuration