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

Merge branch '2.4.x' 

Closes gh-25514
This commit is contained in:
Andy Wilkinson 2021-03-05 14:16:27 +00:00
parent 2cffbc90cb 2f95c1e2c8
commit 006cb643ea
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot-docs/src/docs/asciidoc/spring-boot-features.adoc
View File

@ -6678,11 +6678,11 @@ Mock beans are automatically reset after each test method.
[NOTE] [NOTE]
==== ====
If your test uses one of Spring Boot's test annotations (such as `@SpringBootTest`), this feature is automatically enabled. If your test uses one of Spring Boot's test annotations (such as `@SpringBootTest`), this feature is automatically enabled.
To use this feature with a different arrangement, a listener must be explicitly added, as shown in the following example: To use this feature with a different arrangement, listeners must be explicitly added, as shown in the following example:
[source,java,pending-extract=true,indent=0] [source,java,pending-extract=true,indent=0]
---- ----
@TestExecutionListeners(MockitoTestExecutionListener.class) @TestExecutionListeners({ MockitoTestExecutionListener.class, ResetMocksTestExecutionListener.class })
---- ----
==== ====

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

@ -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#openMocks(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#openMocks(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 {

5
spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/ResetMocksTestExecutionListener.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2019 the original author or authors. * Copyright 2012-2021 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;
/** /**
* {@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 {