Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
0fca9aac
Commit
0fca9aac
authored
Jan 06, 2017
by
Phillip Webb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Polish Mockito 2.0 support
parent
abb8e366
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
3 deletions
+11
-3
MockitoAopProxyTargetInterceptor.java
...t/test/mock/mockito/MockitoAopProxyTargetInterceptor.java
+1
-1
MockitoApi.java
...rg/springframework/boot/test/mock/mockito/MockitoApi.java
+2
-2
Mockito21Tests.java
...pringframework/boot/test/mock/mockito/Mockito21Tests.java
+4
-0
Mockito22Tests.java
...pringframework/boot/test/mock/mockito/Mockito22Tests.java
+4
-0
No files found.
spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockitoAopProxyTargetInterceptor.java
View file @
0fca9aac
...
...
@@ -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
);
}
...
...
spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockitoApi.java
View file @
0fca9aac
...
...
@@ -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
...
...
spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/Mockito21Tests.java
View file @
0fca9aac
...
...
@@ -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 {
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
);
}
...
...
spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/Mockito22Tests.java
View file @
0fca9aac
...
...
@@ -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 {
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
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment