diff --git a/spring-test/src/main/java/org/springframework/test/bean/override/BeanOverride.java b/spring-test/src/main/java/org/springframework/test/context/bean/override/BeanOverride.java similarity index 96% rename from spring-test/src/main/java/org/springframework/test/bean/override/BeanOverride.java rename to spring-test/src/main/java/org/springframework/test/context/bean/override/BeanOverride.java index 9872885ec5..d93499a44d 100644 --- a/spring-test/src/main/java/org/springframework/test/bean/override/BeanOverride.java +++ b/spring-test/src/main/java/org/springframework/test/context/bean/override/BeanOverride.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.test.bean.override; +package org.springframework.test.context.bean.override; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/spring-test/src/main/java/org/springframework/test/bean/override/BeanOverrideBeanPostProcessor.java b/spring-test/src/main/java/org/springframework/test/context/bean/override/BeanOverrideBeanPostProcessor.java similarity index 99% rename from spring-test/src/main/java/org/springframework/test/bean/override/BeanOverrideBeanPostProcessor.java rename to spring-test/src/main/java/org/springframework/test/context/bean/override/BeanOverrideBeanPostProcessor.java index d6433788bc..37a11c2dd0 100644 --- a/spring-test/src/main/java/org/springframework/test/bean/override/BeanOverrideBeanPostProcessor.java +++ b/spring-test/src/main/java/org/springframework/test/context/bean/override/BeanOverrideBeanPostProcessor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.test.bean.override; +package org.springframework.test.context.bean.override; import java.lang.reflect.Field; import java.util.Arrays; diff --git a/spring-test/src/main/java/org/springframework/test/bean/override/BeanOverrideContextCustomizerFactory.java b/spring-test/src/main/java/org/springframework/test/context/bean/override/BeanOverrideContextCustomizerFactory.java similarity index 98% rename from spring-test/src/main/java/org/springframework/test/bean/override/BeanOverrideContextCustomizerFactory.java rename to spring-test/src/main/java/org/springframework/test/context/bean/override/BeanOverrideContextCustomizerFactory.java index d7a25db125..ff110f17b1 100644 --- a/spring-test/src/main/java/org/springframework/test/bean/override/BeanOverrideContextCustomizerFactory.java +++ b/spring-test/src/main/java/org/springframework/test/context/bean/override/BeanOverrideContextCustomizerFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.test.bean.override; +package org.springframework.test.context.bean.override; import java.util.List; import java.util.Set; diff --git a/spring-test/src/main/java/org/springframework/test/bean/override/BeanOverrideParser.java b/spring-test/src/main/java/org/springframework/test/context/bean/override/BeanOverrideParser.java similarity index 99% rename from spring-test/src/main/java/org/springframework/test/bean/override/BeanOverrideParser.java rename to spring-test/src/main/java/org/springframework/test/context/bean/override/BeanOverrideParser.java index 1741cbf3d0..4b89d99a82 100644 --- a/spring-test/src/main/java/org/springframework/test/bean/override/BeanOverrideParser.java +++ b/spring-test/src/main/java/org/springframework/test/context/bean/override/BeanOverrideParser.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.test.bean.override; +package org.springframework.test.context.bean.override; import java.lang.annotation.Annotation; import java.lang.reflect.Constructor; diff --git a/spring-test/src/main/java/org/springframework/test/bean/override/BeanOverrideProcessor.java b/spring-test/src/main/java/org/springframework/test/context/bean/override/BeanOverrideProcessor.java similarity index 98% rename from spring-test/src/main/java/org/springframework/test/bean/override/BeanOverrideProcessor.java rename to spring-test/src/main/java/org/springframework/test/context/bean/override/BeanOverrideProcessor.java index b3152ee2cb..8546d405b2 100644 --- a/spring-test/src/main/java/org/springframework/test/bean/override/BeanOverrideProcessor.java +++ b/spring-test/src/main/java/org/springframework/test/context/bean/override/BeanOverrideProcessor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.test.bean.override; +package org.springframework.test.context.bean.override; import java.lang.annotation.Annotation; import java.lang.reflect.Field; diff --git a/spring-test/src/main/java/org/springframework/test/bean/override/BeanOverrideStrategy.java b/spring-test/src/main/java/org/springframework/test/context/bean/override/BeanOverrideStrategy.java similarity index 96% rename from spring-test/src/main/java/org/springframework/test/bean/override/BeanOverrideStrategy.java rename to spring-test/src/main/java/org/springframework/test/context/bean/override/BeanOverrideStrategy.java index 2c51a475d3..62e398a576 100644 --- a/spring-test/src/main/java/org/springframework/test/bean/override/BeanOverrideStrategy.java +++ b/spring-test/src/main/java/org/springframework/test/context/bean/override/BeanOverrideStrategy.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.test.bean.override; +package org.springframework.test.context.bean.override; /** * Strategies for bean override instantiation, implemented in diff --git a/spring-test/src/main/java/org/springframework/test/bean/override/BeanOverrideTestExecutionListener.java b/spring-test/src/main/java/org/springframework/test/context/bean/override/BeanOverrideTestExecutionListener.java similarity index 98% rename from spring-test/src/main/java/org/springframework/test/bean/override/BeanOverrideTestExecutionListener.java rename to spring-test/src/main/java/org/springframework/test/context/bean/override/BeanOverrideTestExecutionListener.java index 91dd9760b6..0128db9889 100644 --- a/spring-test/src/main/java/org/springframework/test/bean/override/BeanOverrideTestExecutionListener.java +++ b/spring-test/src/main/java/org/springframework/test/context/bean/override/BeanOverrideTestExecutionListener.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.test.bean.override; +package org.springframework.test.context.bean.override; import java.lang.reflect.Field; import java.util.function.BiConsumer; diff --git a/spring-test/src/main/java/org/springframework/test/bean/override/OverrideMetadata.java b/spring-test/src/main/java/org/springframework/test/context/bean/override/OverrideMetadata.java similarity index 98% rename from spring-test/src/main/java/org/springframework/test/bean/override/OverrideMetadata.java rename to spring-test/src/main/java/org/springframework/test/context/bean/override/OverrideMetadata.java index ff2e693a5c..94a5b664ec 100644 --- a/spring-test/src/main/java/org/springframework/test/bean/override/OverrideMetadata.java +++ b/spring-test/src/main/java/org/springframework/test/context/bean/override/OverrideMetadata.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.test.bean.override; +package org.springframework.test.context.bean.override; import java.lang.annotation.Annotation; import java.lang.reflect.Field; diff --git a/spring-test/src/main/java/org/springframework/test/bean/override/convention/TestBean.java b/spring-test/src/main/java/org/springframework/test/context/bean/override/convention/TestBean.java similarity index 96% rename from spring-test/src/main/java/org/springframework/test/bean/override/convention/TestBean.java rename to spring-test/src/main/java/org/springframework/test/context/bean/override/convention/TestBean.java index 85402eab76..d78a5b0384 100644 --- a/spring-test/src/main/java/org/springframework/test/bean/override/convention/TestBean.java +++ b/spring-test/src/main/java/org/springframework/test/context/bean/override/convention/TestBean.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.test.bean.override.convention; +package org.springframework.test.context.bean.override.convention; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; @@ -22,7 +22,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import org.springframework.test.bean.override.BeanOverride; +import org.springframework.test.context.bean.override.BeanOverride; /** * Mark a field to override a bean instance in the {@code BeanFactory}. @@ -109,4 +109,5 @@ public @interface TestBean { * annotated field. */ String name() default ""; + } diff --git a/spring-test/src/main/java/org/springframework/test/bean/override/convention/TestBeanOverrideProcessor.java b/spring-test/src/main/java/org/springframework/test/context/bean/override/convention/TestBeanOverrideProcessor.java similarity index 94% rename from spring-test/src/main/java/org/springframework/test/bean/override/convention/TestBeanOverrideProcessor.java rename to spring-test/src/main/java/org/springframework/test/context/bean/override/convention/TestBeanOverrideProcessor.java index f2b659b0be..f62b70d215 100644 --- a/spring-test/src/main/java/org/springframework/test/bean/override/convention/TestBeanOverrideProcessor.java +++ b/spring-test/src/main/java/org/springframework/test/context/bean/override/convention/TestBeanOverrideProcessor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.test.bean.override.convention; +package org.springframework.test.context.bean.override.convention; import java.lang.annotation.Annotation; import java.lang.reflect.Field; @@ -29,9 +29,9 @@ import java.util.Set; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.core.ResolvableType; import org.springframework.lang.Nullable; -import org.springframework.test.bean.override.BeanOverrideProcessor; -import org.springframework.test.bean.override.BeanOverrideStrategy; -import org.springframework.test.bean.override.OverrideMetadata; +import org.springframework.test.context.bean.override.BeanOverrideProcessor; +import org.springframework.test.context.bean.override.BeanOverrideStrategy; +import org.springframework.test.context.bean.override.OverrideMetadata; import org.springframework.util.Assert; import org.springframework.util.StringUtils; diff --git a/spring-test/src/main/java/org/springframework/test/bean/override/convention/package-info.java b/spring-test/src/main/java/org/springframework/test/context/bean/override/convention/package-info.java similarity index 82% rename from spring-test/src/main/java/org/springframework/test/bean/override/convention/package-info.java rename to spring-test/src/main/java/org/springframework/test/context/bean/override/convention/package-info.java index 2173d67995..59256e3fe6 100644 --- a/spring-test/src/main/java/org/springframework/test/bean/override/convention/package-info.java +++ b/spring-test/src/main/java/org/springframework/test/context/bean/override/convention/package-info.java @@ -5,7 +5,7 @@ */ @NonNullApi @NonNullFields -package org.springframework.test.bean.override.convention; +package org.springframework.test.context.bean.override.convention; import org.springframework.lang.NonNullApi; import org.springframework.lang.NonNullFields; diff --git a/spring-test/src/main/java/org/springframework/test/bean/override/mockito/Definition.java b/spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/Definition.java similarity index 94% rename from spring-test/src/main/java/org/springframework/test/bean/override/mockito/Definition.java rename to spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/Definition.java index 42bc1c3885..b68d96c381 100644 --- a/spring-test/src/main/java/org/springframework/test/bean/override/mockito/Definition.java +++ b/spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/Definition.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.test.bean.override.mockito; +package org.springframework.test.context.bean.override.mockito; import java.lang.annotation.Annotation; import java.lang.reflect.Field; @@ -23,8 +23,8 @@ import org.springframework.beans.factory.NoSuchBeanDefinitionException; import org.springframework.beans.factory.config.SingletonBeanRegistry; import org.springframework.core.ResolvableType; import org.springframework.lang.Nullable; -import org.springframework.test.bean.override.BeanOverrideStrategy; -import org.springframework.test.bean.override.OverrideMetadata; +import org.springframework.test.context.bean.override.BeanOverrideStrategy; +import org.springframework.test.context.bean.override.OverrideMetadata; import org.springframework.util.ObjectUtils; import org.springframework.util.StringUtils; diff --git a/spring-test/src/main/java/org/springframework/test/bean/override/mockito/MockDefinition.java b/spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/MockDefinition.java similarity index 97% rename from spring-test/src/main/java/org/springframework/test/bean/override/mockito/MockDefinition.java rename to spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/MockDefinition.java index 19f03b5154..ff7aedd5b9 100644 --- a/spring-test/src/main/java/org/springframework/test/bean/override/mockito/MockDefinition.java +++ b/spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/MockDefinition.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.test.bean.override.mockito; +package org.springframework.test.context.bean.override.mockito; import java.lang.annotation.Annotation; import java.lang.reflect.Field; @@ -30,7 +30,7 @@ import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.core.ResolvableType; import org.springframework.core.style.ToStringCreator; import org.springframework.lang.Nullable; -import org.springframework.test.bean.override.BeanOverrideStrategy; +import org.springframework.test.context.bean.override.BeanOverrideStrategy; import org.springframework.util.Assert; import org.springframework.util.ClassUtils; import org.springframework.util.ObjectUtils; diff --git a/spring-test/src/main/java/org/springframework/test/bean/override/mockito/MockReset.java b/spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/MockReset.java similarity index 98% rename from spring-test/src/main/java/org/springframework/test/bean/override/mockito/MockReset.java rename to spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/MockReset.java index 51b2dbed90..d8d8cbed0f 100644 --- a/spring-test/src/main/java/org/springframework/test/bean/override/mockito/MockReset.java +++ b/spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/MockReset.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.test.bean.override.mockito; +package org.springframework.test.context.bean.override.mockito; import java.util.List; diff --git a/spring-test/src/main/java/org/springframework/test/bean/override/mockito/MockitoBean.java b/spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/MockitoBean.java similarity index 95% rename from spring-test/src/main/java/org/springframework/test/bean/override/mockito/MockitoBean.java rename to spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/MockitoBean.java index c95ed9dba9..536f612cab 100644 --- a/spring-test/src/main/java/org/springframework/test/bean/override/mockito/MockitoBean.java +++ b/spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/MockitoBean.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.test.bean.override.mockito; +package org.springframework.test.context.bean.override.mockito; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; @@ -25,7 +25,7 @@ import java.lang.annotation.Target; import org.mockito.Answers; import org.mockito.MockSettings; -import org.springframework.test.bean.override.BeanOverride; +import org.springframework.test.context.bean.override.BeanOverride; /** * Mark a field to trigger a bean override using a Mockito mock. If no explicit diff --git a/spring-test/src/main/java/org/springframework/test/bean/override/mockito/MockitoBeanOverrideProcessor.java b/spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/MockitoBeanOverrideProcessor.java similarity index 87% rename from spring-test/src/main/java/org/springframework/test/bean/override/mockito/MockitoBeanOverrideProcessor.java rename to spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/MockitoBeanOverrideProcessor.java index 83ab8c8499..b4781b2318 100644 --- a/spring-test/src/main/java/org/springframework/test/bean/override/mockito/MockitoBeanOverrideProcessor.java +++ b/spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/MockitoBeanOverrideProcessor.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.test.bean.override.mockito; +package org.springframework.test.context.bean.override.mockito; import java.lang.annotation.Annotation; import java.lang.reflect.Field; import org.springframework.core.ResolvableType; -import org.springframework.test.bean.override.BeanOverrideProcessor; -import org.springframework.test.bean.override.OverrideMetadata; +import org.springframework.test.context.bean.override.BeanOverrideProcessor; +import org.springframework.test.context.bean.override.OverrideMetadata; /** * A {@link BeanOverrideProcessor} for mockito-related annotations diff --git a/spring-test/src/main/java/org/springframework/test/bean/override/mockito/MockitoBeans.java b/spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/MockitoBeans.java similarity index 94% rename from spring-test/src/main/java/org/springframework/test/bean/override/mockito/MockitoBeans.java rename to spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/MockitoBeans.java index 7f596b6d76..3e5f3e4983 100644 --- a/spring-test/src/main/java/org/springframework/test/bean/override/mockito/MockitoBeans.java +++ b/spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/MockitoBeans.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.test.bean.override.mockito; +package org.springframework.test.context.bean.override.mockito; import java.util.ArrayList; import java.util.Iterator; diff --git a/spring-test/src/main/java/org/springframework/test/bean/override/mockito/MockitoResetTestExecutionListener.java b/spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/MockitoResetTestExecutionListener.java similarity index 98% rename from spring-test/src/main/java/org/springframework/test/bean/override/mockito/MockitoResetTestExecutionListener.java rename to spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/MockitoResetTestExecutionListener.java index 8eb6d55055..0d20c65e14 100644 --- a/spring-test/src/main/java/org/springframework/test/bean/override/mockito/MockitoResetTestExecutionListener.java +++ b/spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/MockitoResetTestExecutionListener.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.test.bean.override.mockito; +package org.springframework.test.context.bean.override.mockito; import java.util.Arrays; import java.util.HashSet; diff --git a/spring-test/src/main/java/org/springframework/test/bean/override/mockito/MockitoSpyBean.java b/spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/MockitoSpyBean.java similarity index 95% rename from spring-test/src/main/java/org/springframework/test/bean/override/mockito/MockitoSpyBean.java rename to spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/MockitoSpyBean.java index d70e182cf9..774d9f70e5 100644 --- a/spring-test/src/main/java/org/springframework/test/bean/override/mockito/MockitoSpyBean.java +++ b/spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/MockitoSpyBean.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.test.bean.override.mockito; +package org.springframework.test.context.bean.override.mockito; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; @@ -24,7 +24,7 @@ import java.lang.annotation.Target; import org.mockito.Mockito; -import org.springframework.test.bean.override.BeanOverride; +import org.springframework.test.context.bean.override.BeanOverride; /** * Mark a field to trigger a bean override using a Mockito spy, which will wrap diff --git a/spring-test/src/main/java/org/springframework/test/bean/override/mockito/MockitoTestExecutionListener.java b/spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/MockitoTestExecutionListener.java similarity index 98% rename from spring-test/src/main/java/org/springframework/test/bean/override/mockito/MockitoTestExecutionListener.java rename to spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/MockitoTestExecutionListener.java index 7d117a37e4..fdc82091ae 100644 --- a/spring-test/src/main/java/org/springframework/test/bean/override/mockito/MockitoTestExecutionListener.java +++ b/spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/MockitoTestExecutionListener.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.test.bean.override.mockito; +package org.springframework.test.context.bean.override.mockito; import java.lang.annotation.Annotation; import java.lang.reflect.Field; diff --git a/spring-test/src/main/java/org/springframework/test/bean/override/mockito/SpyDefinition.java b/spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/SpyDefinition.java similarity index 97% rename from spring-test/src/main/java/org/springframework/test/bean/override/mockito/SpyDefinition.java rename to spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/SpyDefinition.java index db21bc9c67..6bf70473df 100644 --- a/spring-test/src/main/java/org/springframework/test/bean/override/mockito/SpyDefinition.java +++ b/spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/SpyDefinition.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.test.bean.override.mockito; +package org.springframework.test.context.bean.override.mockito; import java.lang.annotation.Annotation; import java.lang.reflect.Field; @@ -30,7 +30,7 @@ import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.core.ResolvableType; import org.springframework.core.style.ToStringCreator; import org.springframework.lang.Nullable; -import org.springframework.test.bean.override.BeanOverrideStrategy; +import org.springframework.test.context.bean.override.BeanOverrideStrategy; import org.springframework.test.util.AopTestUtils; import org.springframework.util.Assert; import org.springframework.util.ObjectUtils; diff --git a/spring-test/src/main/java/org/springframework/test/bean/override/mockito/package-info.java b/spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/package-info.java similarity index 75% rename from spring-test/src/main/java/org/springframework/test/bean/override/mockito/package-info.java rename to spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/package-info.java index e0714d2f9c..15330b2b51 100644 --- a/spring-test/src/main/java/org/springframework/test/bean/override/mockito/package-info.java +++ b/spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/package-info.java @@ -3,7 +3,7 @@ */ @NonNullApi @NonNullFields -package org.springframework.test.bean.override.mockito; +package org.springframework.test.context.bean.override.mockito; import org.springframework.lang.NonNullApi; import org.springframework.lang.NonNullFields; diff --git a/spring-test/src/main/java/org/springframework/test/bean/override/package-info.java b/spring-test/src/main/java/org/springframework/test/context/bean/override/package-info.java similarity index 76% rename from spring-test/src/main/java/org/springframework/test/bean/override/package-info.java rename to spring-test/src/main/java/org/springframework/test/context/bean/override/package-info.java index 567521dac4..4969d011ca 100644 --- a/spring-test/src/main/java/org/springframework/test/bean/override/package-info.java +++ b/spring-test/src/main/java/org/springframework/test/context/bean/override/package-info.java @@ -3,7 +3,7 @@ */ @NonNullApi @NonNullFields -package org.springframework.test.bean.override; +package org.springframework.test.context.bean.override; import org.springframework.lang.NonNullApi; import org.springframework.lang.NonNullFields; diff --git a/spring-test/src/main/resources/META-INF/spring.factories b/spring-test/src/main/resources/META-INF/spring.factories index ad629a95e9..570054a05e 100644 --- a/spring-test/src/main/resources/META-INF/spring.factories +++ b/spring-test/src/main/resources/META-INF/spring.factories @@ -1,22 +1,22 @@ # Default TestExecutionListeners for the Spring TestContext Framework # org.springframework.test.context.TestExecutionListener = \ - org.springframework.test.bean.override.BeanOverrideTestExecutionListener,\ - org.springframework.test.bean.override.mockito.MockitoTestExecutionListener,\ - org.springframework.test.bean.override.mockito.MockitoResetTestExecutionListener,\ org.springframework.test.context.web.ServletTestExecutionListener,\ org.springframework.test.context.support.DirtiesContextBeforeModesTestExecutionListener,\ org.springframework.test.context.event.ApplicationEventsTestExecutionListener,\ + org.springframework.test.context.bean.override.mockito.MockitoTestExecutionListener,\ org.springframework.test.context.support.DependencyInjectionTestExecutionListener,\ org.springframework.test.context.observation.MicrometerObservationRegistryTestExecutionListener,\ org.springframework.test.context.support.DirtiesContextTestExecutionListener,\ org.springframework.test.context.transaction.TransactionalTestExecutionListener,\ org.springframework.test.context.jdbc.SqlScriptsTestExecutionListener,\ - org.springframework.test.context.event.EventPublishingTestExecutionListener + org.springframework.test.context.event.EventPublishingTestExecutionListener,\ + org.springframework.test.context.bean.override.mockito.MockitoResetTestExecutionListener,\ + org.springframework.test.context.bean.override.BeanOverrideTestExecutionListener # Default ContextCustomizerFactory implementations for the Spring TestContext Framework # org.springframework.test.context.ContextCustomizerFactory = \ - org.springframework.test.bean.override.BeanOverrideContextCustomizerFactory,\ + org.springframework.test.context.bean.override.BeanOverrideContextCustomizerFactory,\ org.springframework.test.context.web.socket.MockServerContainerContextCustomizerFactory,\ org.springframework.test.context.support.DynamicPropertiesContextCustomizerFactory diff --git a/spring-test/src/test/java/org/springframework/test/context/TestExecutionListenersTests.java b/spring-test/src/test/java/org/springframework/test/context/TestExecutionListenersTests.java index d69b97501e..728c6c9db6 100644 --- a/spring-test/src/test/java/org/springframework/test/context/TestExecutionListenersTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/TestExecutionListenersTests.java @@ -25,9 +25,9 @@ import org.junit.jupiter.api.Test; import org.springframework.core.Ordered; import org.springframework.core.annotation.AliasFor; import org.springframework.core.annotation.AnnotationConfigurationException; -import org.springframework.test.bean.override.BeanOverrideTestExecutionListener; -import org.springframework.test.bean.override.mockito.MockitoResetTestExecutionListener; -import org.springframework.test.bean.override.mockito.MockitoTestExecutionListener; +import org.springframework.test.context.bean.override.BeanOverrideTestExecutionListener; +import org.springframework.test.context.bean.override.mockito.MockitoResetTestExecutionListener; +import org.springframework.test.context.bean.override.mockito.MockitoTestExecutionListener; import org.springframework.test.context.event.ApplicationEventsTestExecutionListener; import org.springframework.test.context.event.EventPublishingTestExecutionListener; import org.springframework.test.context.jdbc.SqlScriptsTestExecutionListener; diff --git a/spring-test/src/test/java/org/springframework/test/bean/override/BeanOverrideBeanPostProcessorTests.java b/spring-test/src/test/java/org/springframework/test/context/bean/override/BeanOverrideBeanPostProcessorTests.java similarity index 96% rename from spring-test/src/test/java/org/springframework/test/bean/override/BeanOverrideBeanPostProcessorTests.java rename to spring-test/src/test/java/org/springframework/test/context/bean/override/BeanOverrideBeanPostProcessorTests.java index 138bc5eee6..7e97cfd5ce 100644 --- a/spring-test/src/test/java/org/springframework/test/bean/override/BeanOverrideBeanPostProcessorTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/bean/override/BeanOverrideBeanPostProcessorTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.test.bean.override; +package org.springframework.test.context.bean.override; import java.util.Map; import java.util.function.Predicate; @@ -34,10 +34,10 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.support.SimpleThreadScope; import org.springframework.core.Ordered; import org.springframework.core.ResolvableType; -import org.springframework.test.bean.override.example.ExampleBeanOverrideAnnotation; -import org.springframework.test.bean.override.example.ExampleService; -import org.springframework.test.bean.override.example.FailingExampleService; -import org.springframework.test.bean.override.example.RealExampleService; +import org.springframework.test.context.bean.override.example.ExampleBeanOverrideAnnotation; +import org.springframework.test.context.bean.override.example.ExampleService; +import org.springframework.test.context.bean.override.example.FailingExampleService; +import org.springframework.test.context.bean.override.example.RealExampleService; import org.springframework.test.util.ReflectionTestUtils; import org.springframework.util.Assert; diff --git a/spring-test/src/test/java/org/springframework/test/bean/override/BeanOverrideParserTests.java b/spring-test/src/test/java/org/springframework/test/context/bean/override/BeanOverrideParserTests.java similarity index 89% rename from spring-test/src/test/java/org/springframework/test/bean/override/BeanOverrideParserTests.java rename to spring-test/src/test/java/org/springframework/test/context/bean/override/BeanOverrideParserTests.java index 35a5640bd4..3c0bf9c20e 100644 --- a/spring-test/src/test/java/org/springframework/test/bean/override/BeanOverrideParserTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/bean/override/BeanOverrideParserTests.java @@ -14,19 +14,19 @@ * limitations under the License. */ -package org.springframework.test.bean.override; +package org.springframework.test.context.bean.override; import java.lang.reflect.Field; import org.junit.jupiter.api.Test; -import org.springframework.test.bean.override.example.ExampleBeanOverrideAnnotation; -import org.springframework.test.bean.override.example.TestBeanOverrideMetaAnnotation; +import org.springframework.test.context.bean.override.example.ExampleBeanOverrideAnnotation; +import org.springframework.test.context.bean.override.example.TestBeanOverrideMetaAnnotation; import org.springframework.util.ReflectionUtils; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatRuntimeException; -import static org.springframework.test.bean.override.example.ExampleBeanOverrideProcessor.DUPLICATE_TRIGGER; +import static org.springframework.test.context.bean.override.example.ExampleBeanOverrideProcessor.DUPLICATE_TRIGGER; /** * Unit tests for {@link BeanOverrideParser}. diff --git a/spring-test/src/test/java/org/springframework/test/bean/override/OverrideMetadataTests.java b/spring-test/src/test/java/org/springframework/test/context/bean/override/OverrideMetadataTests.java similarity index 97% rename from spring-test/src/test/java/org/springframework/test/bean/override/OverrideMetadataTests.java rename to spring-test/src/test/java/org/springframework/test/context/bean/override/OverrideMetadataTests.java index 1a011a6a45..feb9cf9a4b 100644 --- a/spring-test/src/test/java/org/springframework/test/bean/override/OverrideMetadataTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/bean/override/OverrideMetadataTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.test.bean.override; +package org.springframework.test.context.bean.override; import java.lang.annotation.Annotation; import java.lang.reflect.Field; diff --git a/spring-test/src/test/java/org/springframework/test/bean/override/convention/TestBeanOverrideProcessorTests.java b/spring-test/src/test/java/org/springframework/test/context/bean/override/convention/TestBeanOverrideProcessorTests.java similarity index 95% rename from spring-test/src/test/java/org/springframework/test/bean/override/convention/TestBeanOverrideProcessorTests.java rename to spring-test/src/test/java/org/springframework/test/context/bean/override/convention/TestBeanOverrideProcessorTests.java index b2b63706a8..8b3bce0e3e 100644 --- a/spring-test/src/test/java/org/springframework/test/bean/override/convention/TestBeanOverrideProcessorTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/bean/override/convention/TestBeanOverrideProcessorTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.test.bean.override.convention; +package org.springframework.test.context.bean.override.convention; import java.lang.reflect.Field; import java.lang.reflect.Method; @@ -25,8 +25,8 @@ import org.junit.jupiter.api.Test; import org.springframework.context.annotation.Bean; import org.springframework.core.ResolvableType; import org.springframework.core.annotation.AnnotationUtils; -import org.springframework.test.bean.override.example.ExampleService; -import org.springframework.test.bean.override.example.FailingExampleService; +import org.springframework.test.context.bean.override.example.ExampleService; +import org.springframework.test.context.bean.override.example.FailingExampleService; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatException; diff --git a/spring-test/src/test/java/org/springframework/test/bean/override/example/ExampleBeanOverrideAnnotation.java b/spring-test/src/test/java/org/springframework/test/context/bean/override/example/ExampleBeanOverrideAnnotation.java similarity index 89% rename from spring-test/src/test/java/org/springframework/test/bean/override/example/ExampleBeanOverrideAnnotation.java rename to spring-test/src/test/java/org/springframework/test/context/bean/override/example/ExampleBeanOverrideAnnotation.java index a4a3f58a85..bf9fec1cf0 100644 --- a/spring-test/src/test/java/org/springframework/test/bean/override/example/ExampleBeanOverrideAnnotation.java +++ b/spring-test/src/test/java/org/springframework/test/context/bean/override/example/ExampleBeanOverrideAnnotation.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.test.bean.override.example; +package org.springframework.test.context.bean.override.example; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import org.springframework.test.bean.override.BeanOverride; +import org.springframework.test.context.bean.override.BeanOverride; @BeanOverride(ExampleBeanOverrideProcessor.class) @Target({ElementType.FIELD, ElementType.ANNOTATION_TYPE}) diff --git a/spring-test/src/test/java/org/springframework/test/bean/override/example/ExampleBeanOverrideProcessor.java b/spring-test/src/test/java/org/springframework/test/context/bean/override/example/ExampleBeanOverrideProcessor.java similarity index 87% rename from spring-test/src/test/java/org/springframework/test/bean/override/example/ExampleBeanOverrideProcessor.java rename to spring-test/src/test/java/org/springframework/test/context/bean/override/example/ExampleBeanOverrideProcessor.java index b0566875cf..e92c483101 100644 --- a/spring-test/src/test/java/org/springframework/test/bean/override/example/ExampleBeanOverrideProcessor.java +++ b/spring-test/src/test/java/org/springframework/test/context/bean/override/example/ExampleBeanOverrideProcessor.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.test.bean.override.example; +package org.springframework.test.context.bean.override.example; import java.lang.annotation.Annotation; import java.lang.reflect.Field; import org.springframework.core.ResolvableType; -import org.springframework.test.bean.override.BeanOverrideProcessor; -import org.springframework.test.bean.override.OverrideMetadata; +import org.springframework.test.context.bean.override.BeanOverrideProcessor; +import org.springframework.test.context.bean.override.OverrideMetadata; public class ExampleBeanOverrideProcessor implements BeanOverrideProcessor { diff --git a/spring-test/src/test/java/org/springframework/test/bean/override/example/ExampleService.java b/spring-test/src/test/java/org/springframework/test/context/bean/override/example/ExampleService.java similarity index 92% rename from spring-test/src/test/java/org/springframework/test/bean/override/example/ExampleService.java rename to spring-test/src/test/java/org/springframework/test/context/bean/override/example/ExampleService.java index 272d42956c..81e6788eb4 100644 --- a/spring-test/src/test/java/org/springframework/test/bean/override/example/ExampleService.java +++ b/spring-test/src/test/java/org/springframework/test/context/bean/override/example/ExampleService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.test.bean.override.example; +package org.springframework.test.context.bean.override.example; /** * Example service interface for mocking tests. diff --git a/spring-test/src/test/java/org/springframework/test/bean/override/example/FailingExampleService.java b/spring-test/src/test/java/org/springframework/test/context/bean/override/example/FailingExampleService.java similarity index 93% rename from spring-test/src/test/java/org/springframework/test/bean/override/example/FailingExampleService.java rename to spring-test/src/test/java/org/springframework/test/context/bean/override/example/FailingExampleService.java index 786b29de65..ce322fc02b 100644 --- a/spring-test/src/test/java/org/springframework/test/bean/override/example/FailingExampleService.java +++ b/spring-test/src/test/java/org/springframework/test/context/bean/override/example/FailingExampleService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.test.bean.override.example; +package org.springframework.test.context.bean.override.example; import org.springframework.stereotype.Service; diff --git a/spring-test/src/test/java/org/springframework/test/bean/override/example/RealExampleService.java b/spring-test/src/test/java/org/springframework/test/context/bean/override/example/RealExampleService.java similarity index 93% rename from spring-test/src/test/java/org/springframework/test/bean/override/example/RealExampleService.java rename to spring-test/src/test/java/org/springframework/test/context/bean/override/example/RealExampleService.java index df0f1f070c..2563da1708 100644 --- a/spring-test/src/test/java/org/springframework/test/bean/override/example/RealExampleService.java +++ b/spring-test/src/test/java/org/springframework/test/context/bean/override/example/RealExampleService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.test.bean.override.example; +package org.springframework.test.context.bean.override.example; /** * Example service implementation for spy tests. diff --git a/spring-test/src/test/java/org/springframework/test/bean/override/example/TestBeanOverrideMetaAnnotation.java b/spring-test/src/test/java/org/springframework/test/context/bean/override/example/TestBeanOverrideMetaAnnotation.java similarity index 93% rename from spring-test/src/test/java/org/springframework/test/bean/override/example/TestBeanOverrideMetaAnnotation.java rename to spring-test/src/test/java/org/springframework/test/context/bean/override/example/TestBeanOverrideMetaAnnotation.java index 4a6af18901..49410ca315 100644 --- a/spring-test/src/test/java/org/springframework/test/bean/override/example/TestBeanOverrideMetaAnnotation.java +++ b/spring-test/src/test/java/org/springframework/test/context/bean/override/example/TestBeanOverrideMetaAnnotation.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.test.bean.override.example; +package org.springframework.test.context.bean.override.example; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/spring-test/src/test/java/org/springframework/test/bean/override/example/TestOverrideMetadata.java b/spring-test/src/test/java/org/springframework/test/context/bean/override/example/TestOverrideMetadata.java similarity index 91% rename from spring-test/src/test/java/org/springframework/test/bean/override/example/TestOverrideMetadata.java rename to spring-test/src/test/java/org/springframework/test/context/bean/override/example/TestOverrideMetadata.java index 4af81e4293..124c1eea61 100644 --- a/spring-test/src/test/java/org/springframework/test/bean/override/example/TestOverrideMetadata.java +++ b/spring-test/src/test/java/org/springframework/test/context/bean/override/example/TestOverrideMetadata.java @@ -14,7 +14,8 @@ * limitations under the License. */ -package org.springframework.test.bean.override.example; +package org.springframework.test.context.bean.override.example; + import java.lang.reflect.AnnotatedElement; import java.lang.reflect.Field; @@ -25,11 +26,11 @@ import java.lang.reflect.Modifier; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.core.ResolvableType; import org.springframework.lang.Nullable; -import org.springframework.test.bean.override.BeanOverrideStrategy; -import org.springframework.test.bean.override.OverrideMetadata; +import org.springframework.test.context.bean.override.BeanOverrideStrategy; +import org.springframework.test.context.bean.override.OverrideMetadata; import org.springframework.util.StringUtils; -import static org.springframework.test.bean.override.example.ExampleBeanOverrideAnnotation.DEFAULT_VALUE; +import static org.springframework.test.context.bean.override.example.ExampleBeanOverrideAnnotation.DEFAULT_VALUE; public class TestOverrideMetadata extends OverrideMetadata { diff --git a/spring-test/src/test/java/org/springframework/test/bean/override/example/package-info.java b/spring-test/src/test/java/org/springframework/test/context/bean/override/example/package-info.java similarity index 75% rename from spring-test/src/test/java/org/springframework/test/bean/override/example/package-info.java rename to spring-test/src/test/java/org/springframework/test/context/bean/override/example/package-info.java index 699aba4869..c642f01155 100644 --- a/spring-test/src/test/java/org/springframework/test/bean/override/example/package-info.java +++ b/spring-test/src/test/java/org/springframework/test/context/bean/override/example/package-info.java @@ -3,7 +3,7 @@ */ @NonNullApi @NonNullFields -package org.springframework.test.bean.override.example; +package org.springframework.test.context.bean.override.example; import org.springframework.lang.NonNullApi; import org.springframework.lang.NonNullFields;