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

Merge pull request #6323 from szpak/issues/6320-mockito-2.0.47-compatibility 

* issues/6320-mockito-2.0.47-compatibility:
  Fix compatibility with Mockito 2.0
This commit is contained in:
Phillip Webb 2016-07-06 14:34:24 -07:00
parent 3286760073 ed829d7981
commit 4742486d3e
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,6 +24,7 @@ import java.util.Set;
import org.mockito.Answers;
import org.mockito.MockSettings;
import org.mockito.Mockito;
import org.mockito.stubbing.Answer;
import org.springframework.core.style.ToStringCreator;
import org.springframework.util.Assert;
@ -151,11 +152,19 @@ class MockDefinition extends Definition {
if (!this.extraInterfaces.isEmpty()) {
settings.extraInterfaces(this.extraInterfaces.toArray(new Class<?>[] {}));
}
settings.defaultAnswer(this.answer.get());
settings.defaultAnswer(getAnswer(this.answer));
if (this.serializable) {
settings.serializable();
}
return (T) Mockito.mock(this.classToMock, settings);
}
private Answer<?> getAnswer(Answers answer) {
if (Answer.class.isInstance(answer)) {
// With Mockito 2.0 we can directly cast the answer
return (Answer<?>) ((Object) answer);
}
return answer.get();
}
}