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
6ec3648a
Commit
6ec3648a
authored
Sep 08, 2016
by
Phillip Webb
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #6842 from izeye/fix-test-20160908
* pr/6842: Fix ResetMocksTestExecutionListenerTests
parents
91e6a5fb
11aa4d07
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
ResetMocksTestExecutionListenerTests.java
...st/mock/mockito/ResetMocksTestExecutionListenerTests.java
+3
-3
No files found.
spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/ResetMocksTestExecutionListenerTests.java
View file @
6ec3648a
...
...
@@ -75,16 +75,16 @@ public class ResetMocksTestExecutionListenerTests {
@Bean
public
ExampleService
after
(
MockitoBeans
mockedBeans
)
{
ExampleService
mock
=
mock
(
ExampleService
.
class
,
MockReset
.
before
());
ExampleService
mock
=
mock
(
ExampleService
.
class
,
MockReset
.
after
());
mockedBeans
.
add
(
mock
);
return
mock
;
}
@Bean
public
ExampleService
none
(
MockitoBeans
mockedBeans
)
{
ExampleService
mock
=
mock
(
ExampleService
.
class
,
MockReset
.
before
()
);
ExampleService
mock
=
mock
(
ExampleService
.
class
);
mockedBeans
.
add
(
mock
);
return
mock
(
ExampleService
.
class
)
;
return
mock
;
}
@Bean
...
...
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