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
eb927f1b
Commit
eb927f1b
authored
Nov 01, 2016
by
Aleksander Bartnikiewicz
Committed by
Andy Wilkinson
Nov 25, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Prevent a broken factory bean from breaking the resetting of mocks
Closes gh-7271
parent
e19c6245
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
ResetMocksTestExecutionListener.java
...ot/test/mock/mockito/ResetMocksTestExecutionListener.java
+1
-1
No files found.
spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/ResetMocksTestExecutionListener.java
View file @
eb927f1b
...
...
@@ -65,7 +65,7 @@ public class ResetMocksTestExecutionListener extends AbstractTestExecutionListen
for
(
String
name
:
names
)
{
BeanDefinition
definition
=
beanFactory
.
getBeanDefinition
(
name
);
if
(
definition
.
isSingleton
()
&&
instantiatedSingletons
.
contains
(
name
))
{
Object
bean
=
beanFactory
.
get
Bea
n
(
name
);
Object
bean
=
beanFactory
.
get
Singleto
n
(
name
);
if
(
reset
.
equals
(
MockReset
.
get
(
bean
)))
{
Mockito
.
reset
(
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