Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polishing

Browse Source
This commit is contained in:
Simon Baslé
2024-08-07 16:42:51 +02:00
parent 25b57d4808
commit 52bc3cf5aa
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/MockitoTestExecutionListener.java
View File

@@ -21,7 +21,6 @@ import java.lang.reflect.Field;
import java.util.LinkedHashSet;
import java.util.Set;
import org.mockito.BDDMockito;
import org.mockito.Mockito;
import org.mockito.MockitoSession;
import org.mockito.quality.Strictness;
@@ -36,8 +35,8 @@ import org.springframework.util.ReflectionUtils.FieldCallback;
/**
* {@code TestExecutionListener} that enables {@link MockitoBean @MockitoBean}
* and {@link MockitoSpyBean @MockitoSpyBean} support. Also triggers Mockito set
* up of a {@link Mockito#mockitoSession() session} for each test class that
* and {@link MockitoSpyBean @MockitoSpyBean} support. Also triggers Mockito
* setup of a {@link Mockito#mockitoSession() session} for each test class that
* uses these annotations (or any annotation in that package).
*
* <p>The {@link MockitoSession#setStrictness(Strictness) strictness} of the
@@ -107,12 +106,12 @@ public class MockitoTestExecutionListener extends AbstractTestExecutionListener
MockitoBeanSettings annotation = AnnotationUtils.findAnnotation(testInstance.getClass(),
MockitoBeanSettings.class);
testContext.setAttribute(MOCKS_ATTRIBUTE_NAME, initMockitoSession(testInstance,
annotation == null ? Strictness.STRICT_STUBS: annotation.value()));
annotation != null ? annotation.value() : Strictness.STRICT_STUBS));
}
}
private MockitoSession initMockitoSession(Object testInstance, Strictness strictness) {
return BDDMockito.mockitoSession()
return Mockito.mockitoSession()
.initMocks(testInstance)
.strictness(strictness)
.startMocking();