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
22b73f30
Commit
22b73f30
authored
Mar 05, 2021
by
Andy Wilkinson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Polish "Improve documentaion of Mockito test execution listeners"
See gh-25375
parent
72562e0f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
6 deletions
+12
-6
spring-boot-features.adoc
...ing-boot-docs/src/docs/asciidoc/spring-boot-features.adoc
+1
-1
MockitoTestExecutionListener.java
.../boot/test/mock/mockito/MockitoTestExecutionListener.java
+8
-3
ResetMocksTestExecutionListener.java
...ot/test/mock/mockito/ResetMocksTestExecutionListener.java
+3
-2
No files found.
spring-boot-project/spring-boot-docs/src/docs/asciidoc/spring-boot-features.adoc
View file @
22b73f30
...
@@ -6593,7 +6593,7 @@ To use this feature with a different arrangement, listeners must be explicitly a
...
@@ -6593,7 +6593,7 @@ To use this feature with a different arrangement, listeners must be explicitly a
[source,java,indent=0]
[source,java,indent=0]
----
----
@TestExecutionListeners({
MockitoTestExecutionListener.class, ResetMocksTestExecutionListener.class
})
@TestExecutionListeners({
MockitoTestExecutionListener.class, ResetMocksTestExecutionListener.class
})
----
----
====
====
...
...
spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockitoTestExecutionListener.java
View file @
22b73f30
...
@@ -33,13 +33,18 @@ import org.springframework.util.ReflectionUtils;
...
@@ -33,13 +33,18 @@ import org.springframework.util.ReflectionUtils;
import
org.springframework.util.ReflectionUtils.FieldCallback
;
import
org.springframework.util.ReflectionUtils.FieldCallback
;
/**
/**
* {@link TestExecutionListener} to trigger {@link MockitoAnnotations#initMocks(Object)}
* {@link TestExecutionListener} to enable {@link MockBean @MockBean} and
* when {@link MockBean @MockBean} annotations are used. Primarily to allow
* {@link SpyBean @SpyBean} support. Also triggers
* {@link Captor @Captor} annotations.
* {@link MockitoAnnotations#initMocks(Object)} when any Mockito annotations used,
* primarily to allow {@link Captor @Captor} annotations.
* <p>
* To use the automatic reset support of {@code @MockBean} and {@code @SpyBean}, configure
* {@link ResetMocksTestExecutionListener} as well.
*
*
* @author Phillip Webb
* @author Phillip Webb
* @author Andy Wilkinson
* @author Andy Wilkinson
* @since 1.4.2
* @since 1.4.2
* @see ResetMocksTestExecutionListener
*/
*/
public
class
MockitoTestExecutionListener
extends
AbstractTestExecutionListener
{
public
class
MockitoTestExecutionListener
extends
AbstractTestExecutionListener
{
...
...
spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/ResetMocksTestExecutionListener.java
View file @
22b73f30
/*
/*
* Copyright 2012-20
19
the original author or authors.
* Copyright 2012-20
21
the original author or authors.
*
*
* Licensed under the Apache License, Version 2.0 (the "License");
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* you may not use this file except in compliance with the License.
...
@@ -35,10 +35,11 @@ import org.springframework.util.ClassUtils;
...
@@ -35,10 +35,11 @@ import org.springframework.util.ClassUtils;
/**
/**
* {@link TestExecutionListener} to reset any mock beans that have been marked with a
* {@link TestExecutionListener} to reset any mock beans that have been marked with a
* {@link MockReset}.
* {@link MockReset}.
Typically used alongside {@link MockitoTestExecutionListener}.
*
*
* @author Phillip Webb
* @author Phillip Webb
* @since 1.4.0
* @since 1.4.0
* @see MockitoTestExecutionListener
*/
*/
public
class
ResetMocksTestExecutionListener
extends
AbstractTestExecutionListener
{
public
class
ResetMocksTestExecutionListener
extends
AbstractTestExecutionListener
{
...
...
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