From efda3f0f99ef72468f91735c4890a524cece7801 Mon Sep 17 00:00:00 2001 From: Sam Brannen <104798+sbrannen@users.noreply.github.com> Date: Thu, 24 Oct 2024 12:14:51 +0200 Subject: [PATCH] Reorganize Mockito integration tests --- ...ests.java => MockitoBeanConfigurationErrorTests.java} | 4 ++-- ...s.java => MockitoSpyBeanConfigurationErrorTests.java} | 4 ++-- ...kitoBeanAndAsyncInterfaceMethodIntegrationTests.java} | 5 +++-- ...toBeanAndContextHierarchyParentIntegrationTests.java} | 7 ++++--- .../MockitoBeanAndScopedProxyIntegrationTests.java} | 5 +++-- .../MockitoBeanAndSpringAopProxyIntegrationTests.java} | 7 ++++--- ...SpyBeanAndContextHierarchyChildIntegrationTests.java} | 9 ++++++--- ...MockitoSpyBeanAndSpringAopProxyIntegrationTests.java} | 7 ++++--- 8 files changed, 28 insertions(+), 20 deletions(-) rename spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/{MockitoMockBeanTests.java => MockitoBeanConfigurationErrorTests.java} (97%) rename spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/{MockitoSpyBeanTests.java => MockitoSpyBeanConfigurationErrorTests.java} (96%) rename spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/{MockitoBeanAndAsyncInterfaceMethodTests.java => integration/MockitoBeanAndAsyncInterfaceMethodIntegrationTests.java} (92%) rename spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/{MockitoBeanAndContextHierarchyParentTests.java => integration/MockitoBeanAndContextHierarchyParentIntegrationTests.java} (86%) rename spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/{MockitoBeanAndScopedProxyTests.java => integration/MockitoBeanAndScopedProxyIntegrationTests.java} (92%) rename spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/{MockitoBeanAndSpringAopProxyTests.java => integration/MockitoBeanAndSpringAopProxyIntegrationTests.java} (93%) rename spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/{MockitoSpyBeanAndContextHierarchyChildTests.java => integration/MockitoSpyBeanAndContextHierarchyChildIntegrationTests.java} (86%) rename spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/{MockitoSpyBeanAndSpringAopProxyTests.java => integration/MockitoSpyBeanAndSpringAopProxyIntegrationTests.java} (96%) diff --git a/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoMockBeanTests.java b/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanConfigurationErrorTests.java similarity index 97% rename from spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoMockBeanTests.java rename to spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanConfigurationErrorTests.java index 4addd24ebf4..f9b9f920678 100644 --- a/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoMockBeanTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanConfigurationErrorTests.java @@ -26,12 +26,12 @@ import org.springframework.test.context.bean.override.BeanOverrideContextCustomi import static org.assertj.core.api.Assertions.assertThatIllegalStateException; /** - * Tests for {@link MockitoBean}. + * Tests for {@link MockitoBean @MockitoBean}. * * @author Stephane Nicoll * @author Sam Brannen */ -class MockitoMockBeanTests { +class MockitoBeanConfigurationErrorTests { @Test void cannotOverrideBeanByNameWithNoSuchBeanName() { diff --git a/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoSpyBeanTests.java b/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoSpyBeanConfigurationErrorTests.java similarity index 96% rename from spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoSpyBeanTests.java rename to spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoSpyBeanConfigurationErrorTests.java index b788ba6561c..0d9933272c5 100644 --- a/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoSpyBeanTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoSpyBeanConfigurationErrorTests.java @@ -26,11 +26,11 @@ import org.springframework.test.context.bean.override.BeanOverrideContextCustomi import static org.assertj.core.api.Assertions.assertThatIllegalStateException; /** - * Tests for {@link MockitoSpyBean}. + * Tests for {@link MockitoSpyBean @MockitoSpyBean}. * * @author Stephane Nicoll */ -class MockitoSpyBeanTests { +class MockitoSpyBeanConfigurationErrorTests { @Test void contextCustomizerCannotBeCreatedWithNoSuchBeanName() { diff --git a/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanAndAsyncInterfaceMethodTests.java b/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/integration/MockitoBeanAndAsyncInterfaceMethodIntegrationTests.java similarity index 92% rename from spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanAndAsyncInterfaceMethodTests.java rename to spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/integration/MockitoBeanAndAsyncInterfaceMethodIntegrationTests.java index 94d40e2b788..79c5f0332e6 100644 --- a/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanAndAsyncInterfaceMethodTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/integration/MockitoBeanAndAsyncInterfaceMethodIntegrationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.test.context.bean.override.mockito; +package org.springframework.test.context.bean.override.mockito.integration; import java.util.concurrent.CompletableFuture; @@ -28,6 +28,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.EnableAsync; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.springframework.test.context.junit.jupiter.SpringExtension; import static java.util.concurrent.CompletableFuture.completedFuture; @@ -43,7 +44,7 @@ import static org.mockito.BDDMockito.given; * @since 6.2 */ @ExtendWith(SpringExtension.class) -public class MockitoBeanAndAsyncInterfaceMethodTests { +public class MockitoBeanAndAsyncInterfaceMethodIntegrationTests { @MockitoBean Transformer transformer; diff --git a/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanAndContextHierarchyParentTests.java b/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/integration/MockitoBeanAndContextHierarchyParentIntegrationTests.java similarity index 86% rename from spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanAndContextHierarchyParentTests.java rename to spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/integration/MockitoBeanAndContextHierarchyParentIntegrationTests.java index 19b464fb48b..c2f218d03b6 100644 --- a/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanAndContextHierarchyParentTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/integration/MockitoBeanAndContextHierarchyParentIntegrationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.test.context.bean.override.mockito; +package org.springframework.test.context.bean.override.mockito.integration; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -24,6 +24,7 @@ import org.springframework.context.ApplicationContext; import org.springframework.test.context.ContextHierarchy; import org.springframework.test.context.bean.override.example.ExampleService; import org.springframework.test.context.bean.override.example.ExampleServiceCaller; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import static org.assertj.core.api.Assertions.assertThat; @@ -36,10 +37,10 @@ import static org.mockito.BDDMockito.given; * @author Sam Brannen * @author Phillip Webb * @since 6.2 - * @see MockitoSpyBeanAndContextHierarchyChildTests + * @see MockitoSpyBeanAndContextHierarchyChildIntegrationTests */ @SpringJUnitConfig -public class MockitoBeanAndContextHierarchyParentTests { +public class MockitoBeanAndContextHierarchyParentIntegrationTests { @MockitoBean ExampleService service; diff --git a/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanAndScopedProxyTests.java b/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/integration/MockitoBeanAndScopedProxyIntegrationTests.java similarity index 92% rename from spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanAndScopedProxyTests.java rename to spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/integration/MockitoBeanAndScopedProxyIntegrationTests.java index e4a99ebef5e..94978cd9080 100644 --- a/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanAndScopedProxyTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/integration/MockitoBeanAndScopedProxyIntegrationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.test.context.bean.override.mockito; +package org.springframework.test.context.bean.override.mockito.integration; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -28,6 +28,7 @@ import org.springframework.context.annotation.ScopedProxyMode; import org.springframework.test.context.bean.override.example.ExampleService; import org.springframework.test.context.bean.override.example.ExampleServiceCaller; import org.springframework.test.context.bean.override.example.FailingExampleService; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.springframework.test.context.junit.jupiter.SpringExtension; import static org.assertj.core.api.Assertions.assertThat; @@ -43,7 +44,7 @@ import static org.mockito.BDDMockito.given; * @see gh-5724 */ @ExtendWith(SpringExtension.class) -public class MockitoBeanAndScopedProxyTests { +public class MockitoBeanAndScopedProxyIntegrationTests { @MockitoBean // The ExampleService mock should replace the scoped-proxy FailingExampleService diff --git a/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanAndSpringAopProxyTests.java b/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/integration/MockitoBeanAndSpringAopProxyIntegrationTests.java similarity index 93% rename from spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanAndSpringAopProxyTests.java rename to spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/integration/MockitoBeanAndSpringAopProxyIntegrationTests.java index a8fd6338b24..087256016d3 100644 --- a/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanAndSpringAopProxyTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/integration/MockitoBeanAndSpringAopProxyIntegrationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.test.context.bean.override.mockito; +package org.springframework.test.context.bean.override.mockito.integration; import org.junit.jupiter.api.RepeatedTest; import org.junit.jupiter.api.extension.ExtendWith; @@ -30,6 +30,7 @@ import org.springframework.cache.interceptor.SimpleCacheResolver; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.springframework.test.context.junit.jupiter.SpringExtension; import static org.assertj.core.api.Assertions.assertThat; @@ -46,10 +47,10 @@ import static org.mockito.Mockito.verify; * @author Phillip Webb * @since 6.2 * @see 5837 - * @see MockitoSpyBeanAndSpringAopProxyTests + * @see MockitoSpyBeanAndSpringAopProxyIntegrationTests */ @ExtendWith(SpringExtension.class) -class MockitoBeanAndSpringAopProxyTests { +class MockitoBeanAndSpringAopProxyIntegrationTests { @MockitoBean DateService dateService; diff --git a/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoSpyBeanAndContextHierarchyChildTests.java b/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/integration/MockitoSpyBeanAndContextHierarchyChildIntegrationTests.java similarity index 86% rename from spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoSpyBeanAndContextHierarchyChildTests.java rename to spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/integration/MockitoSpyBeanAndContextHierarchyChildIntegrationTests.java index 3f3d419e611..11a93c874f5 100644 --- a/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoSpyBeanAndContextHierarchyChildTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/integration/MockitoSpyBeanAndContextHierarchyChildIntegrationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.test.context.bean.override.mockito; +package org.springframework.test.context.bean.override.mockito.integration; import org.junit.jupiter.api.Test; @@ -27,6 +27,8 @@ import org.springframework.test.context.ContextHierarchy; import org.springframework.test.context.aot.DisabledInAotMode; import org.springframework.test.context.bean.override.example.ExampleService; import org.springframework.test.context.bean.override.example.ExampleServiceCaller; +import org.springframework.test.context.bean.override.mockito.MockitoBean; +import org.springframework.test.context.bean.override.mockito.MockitoSpyBean; import static org.assertj.core.api.Assertions.assertThat; @@ -38,11 +40,12 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Sam Brannen * @author Phillip Webb * @since 6.2 - * @see MockitoBeanAndContextHierarchyParentTests + * @see MockitoBeanAndContextHierarchyParentIntegrationTests */ @ContextHierarchy(@ContextConfiguration) @DisabledInAotMode // @ContextHierarchy is not supported in AOT. -public class MockitoSpyBeanAndContextHierarchyChildTests extends MockitoBeanAndContextHierarchyParentTests { +public class MockitoSpyBeanAndContextHierarchyChildIntegrationTests extends + MockitoBeanAndContextHierarchyParentIntegrationTests { @MockitoSpyBean ExampleServiceCaller serviceCaller; diff --git a/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoSpyBeanAndSpringAopProxyTests.java b/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/integration/MockitoSpyBeanAndSpringAopProxyIntegrationTests.java similarity index 96% rename from spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoSpyBeanAndSpringAopProxyTests.java rename to spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/integration/MockitoSpyBeanAndSpringAopProxyIntegrationTests.java index 1a880075ddd..ecbf02ffda9 100644 --- a/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoSpyBeanAndSpringAopProxyTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/integration/MockitoSpyBeanAndSpringAopProxyIntegrationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.test.context.bean.override.mockito; +package org.springframework.test.context.bean.override.mockito.integration; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; @@ -33,6 +33,7 @@ import org.springframework.cache.interceptor.SimpleCacheResolver; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; +import org.springframework.test.context.bean.override.mockito.MockitoSpyBean; import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.test.util.AopTestUtils; @@ -51,10 +52,10 @@ import static org.mockito.Mockito.verify; * @author Phillip Webb * @since 6.2 * @see 5837 - * @see MockitoBeanAndSpringAopProxyTests + * @see MockitoBeanAndSpringAopProxyIntegrationTests */ @ExtendWith(SpringExtension.class) -class MockitoSpyBeanAndSpringAopProxyTests { +class MockitoSpyBeanAndSpringAopProxyIntegrationTests { @MockitoSpyBean DateService dateService;