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

Polishing

This commit is contained in:
Sam Brannen 2024-09-29 16:28:06 +02:00
parent 625614a4d2
commit 5c08f81d80
3 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -104,12 +104,12 @@ public class MockitoTestExecutionListener extends AbstractTestExecutionListener
} }
private void initMocks(TestContext testContext) { private void initMocks(TestContext testContext) {
if (MockitoAnnotationDetector.hasMockitoAnnotations(testContext.getTestClass())) { Class<?> testClass = testContext.getTestClass();
if (MockitoAnnotationDetector.hasMockitoAnnotations(testClass)) {
Object testInstance = testContext.getTestInstance(); Object testInstance = testContext.getTestInstance();
MockitoBeanSettings annotation = AnnotationUtils.findAnnotation(testInstance.getClass(), MockitoBeanSettings annotation = AnnotationUtils.findAnnotation(testClass, MockitoBeanSettings.class);
MockitoBeanSettings.class); Strictness strictness = (annotation != null ? annotation.value() : Strictness.STRICT_STUBS);
testContext.setAttribute(MOCKS_ATTRIBUTE_NAME, initMockitoSession(testInstance, testContext.setAttribute(MOCKS_ATTRIBUTE_NAME, initMockitoSession(testInstance, strictness));
annotation != null ? annotation.value() : Strictness.STRICT_STUBS));
} }
} }

10
spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanSettingsLenientIntegrationTests.java
View File

@ -21,6 +21,8 @@ import java.util.List;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.mockito.quality.Strictness; import org.mockito.quality.Strictness;
import org.springframework.context.annotation.Configuration;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyInt;
@ -34,7 +36,8 @@ import static org.mockito.Mockito.mock;
* @author Simon Baslé * @author Simon Baslé
* @since 6.2 * @since 6.2
*/ */
@SpringJUnitConfig(MockitoBeanForByNameLookupIntegrationTests.Config.class) @SpringJUnitConfig
@DirtiesContext
@MockitoBeanSettings(Strictness.LENIENT) @MockitoBeanSettings(Strictness.LENIENT)
class MockitoBeanSettingsLenientIntegrationTests { class MockitoBeanSettingsLenientIntegrationTests {
@ -45,4 +48,9 @@ class MockitoBeanSettingsLenientIntegrationTests {
when(list.get(anyInt())).thenReturn(new Object()); when(list.get(anyInt())).thenReturn(new Object());
} }
@Configuration(proxyBeanMethods = false)
static class Config {
// no beans
}
} }

20
spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanSettingsStrictIntegrationTests.java
View File

@ -25,11 +25,11 @@ import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.FieldSource; import org.junit.jupiter.params.provider.FieldSource;
import org.junit.platform.testkit.engine.EngineTestKit; import org.junit.platform.testkit.engine.EngineTestKit;
import org.junit.platform.testkit.engine.Events; import org.junit.platform.testkit.engine.Events;
import org.mockito.Mockito;
import org.mockito.exceptions.misusing.UnnecessaryStubbingException; import org.mockito.exceptions.misusing.UnnecessaryStubbingException;
import org.mockito.quality.Strictness; import org.mockito.quality.Strictness;
import org.springframework.test.context.bean.override.mockito.MockitoBeanForByNameLookupIntegrationTests.Config; import org.springframework.context.annotation.Configuration;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
import static org.junit.jupiter.params.provider.Arguments.argumentSet; import static org.junit.jupiter.params.provider.Arguments.argumentSet;
@ -39,9 +39,12 @@ import static org.junit.platform.testkit.engine.EventConditions.finishedWithFail
import static org.junit.platform.testkit.engine.EventConditions.test; import static org.junit.platform.testkit.engine.EventConditions.test;
import static org.junit.platform.testkit.engine.TestExecutionResultConditions.instanceOf; import static org.junit.platform.testkit.engine.TestExecutionResultConditions.instanceOf;
import static org.junit.platform.testkit.engine.TestExecutionResultConditions.message; import static org.junit.platform.testkit.engine.TestExecutionResultConditions.message;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.BDDMockito.when;
import static org.mockito.Mockito.mock;
/** /**
* Integration tests ensuring unnecessary stubbings are reported in various * Integration tests ensuring unnecessary stubbing is reported in various
* cases where a strict style is chosen or assumed. * cases where a strict style is chosen or assumed.
* *
* @author Simon Baslé * @author Simon Baslé
@ -75,17 +78,19 @@ class MockitoBeanSettingsStrictIntegrationTests {
@Test @Test
@SuppressWarnings("rawtypes") @SuppressWarnings("rawtypes")
void unnecessaryStub() { void unnecessaryStub() {
List list = Mockito.mock(List.class); List list = mock();
Mockito.when(list.get(Mockito.anyInt())).thenReturn(new Object()); when(list.get(anyInt())).thenReturn(new Object());
} }
} }
@SpringJUnitConfig(Config.class) @SpringJUnitConfig(Config.class)
@DirtiesContext
@MockitoBeanSettings(Strictness.STRICT_STUBS) @MockitoBeanSettings(Strictness.STRICT_STUBS)
static class ExplicitStrictness extends BaseCase { static class ExplicitStrictness extends BaseCase {
} }
@SpringJUnitConfig(Config.class) @SpringJUnitConfig(Config.class)
@DirtiesContext
static class ImplicitStrictnessWithMockitoBean extends BaseCase { static class ImplicitStrictnessWithMockitoBean extends BaseCase {
@MockitoBean @MockitoBean
@ -93,4 +98,9 @@ class MockitoBeanSettingsStrictIntegrationTests {
DateTimeFormatter ignoredMock; DateTimeFormatter ignoredMock;
} }
@Configuration(proxyBeanMethods = false)
static class Config {
// no beans
}
} }