diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/aot/AotServicesTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/aot/AotServicesTests.java index a637b0e897d..f1098d11b84 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/aot/AotServicesTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/aot/AotServicesTests.java @@ -27,7 +27,7 @@ import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.beans.factory.support.RootBeanDefinition; import org.springframework.core.Ordered; import org.springframework.core.io.support.SpringFactoriesLoader; -import org.springframework.core.mock.MockSpringFactoriesLoader; +import org.springframework.core.test.io.support.MockSpringFactoriesLoader; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/aot/BeanDefinitionMethodGeneratorFactoryTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/aot/BeanDefinitionMethodGeneratorFactoryTests.java index 20d6e367d23..8c0ce75413a 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/aot/BeanDefinitionMethodGeneratorFactoryTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/aot/BeanDefinitionMethodGeneratorFactoryTests.java @@ -23,7 +23,7 @@ import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.beans.factory.support.RegisteredBean; import org.springframework.core.Ordered; -import org.springframework.core.mock.MockSpringFactoriesLoader; +import org.springframework.core.test.io.support.MockSpringFactoriesLoader; import org.springframework.lang.Nullable; import static org.assertj.core.api.Assertions.assertThat; diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/aot/BeanDefinitionMethodGeneratorTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/aot/BeanDefinitionMethodGeneratorTests.java index aacf2f0f2fd..9a75ee859d9 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/aot/BeanDefinitionMethodGeneratorTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/aot/BeanDefinitionMethodGeneratorTests.java @@ -44,7 +44,7 @@ import org.springframework.beans.testfixture.beans.GenericBean; import org.springframework.beans.testfixture.beans.TestBean; import org.springframework.beans.testfixture.beans.factory.aot.MockBeanRegistrationsCode; import org.springframework.core.ResolvableType; -import org.springframework.core.mock.MockSpringFactoriesLoader; +import org.springframework.core.test.io.support.MockSpringFactoriesLoader; import org.springframework.core.test.tools.CompileWithForkedClassLoader; import org.springframework.core.test.tools.Compiled; import org.springframework.core.test.tools.SourceFile; diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/aot/BeanRegistrationsAotContributionTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/aot/BeanRegistrationsAotContributionTests.java index dcc280c4d48..d36f7548202 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/aot/BeanRegistrationsAotContributionTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/aot/BeanRegistrationsAotContributionTests.java @@ -39,7 +39,7 @@ import org.springframework.beans.factory.support.RegisteredBean; import org.springframework.beans.factory.support.RootBeanDefinition; import org.springframework.beans.testfixture.beans.TestBean; import org.springframework.beans.testfixture.beans.factory.aot.MockBeanFactoryInitializationCode; -import org.springframework.core.mock.MockSpringFactoriesLoader; +import org.springframework.core.test.io.support.MockSpringFactoriesLoader; import org.springframework.core.test.tools.Compiled; import org.springframework.core.test.tools.SourceFile; import org.springframework.core.test.tools.TestCompiler; diff --git a/spring-core-test/src/main/java/org/springframework/core/mock/MockSpringFactoriesLoader.java b/spring-core-test/src/main/java/org/springframework/core/test/io/support/MockSpringFactoriesLoader.java similarity index 98% rename from spring-core-test/src/main/java/org/springframework/core/mock/MockSpringFactoriesLoader.java rename to spring-core-test/src/main/java/org/springframework/core/test/io/support/MockSpringFactoriesLoader.java index c4b1a6f42fa..2eb96c2a8cf 100644 --- a/spring-core-test/src/main/java/org/springframework/core/mock/MockSpringFactoriesLoader.java +++ b/spring-core-test/src/main/java/org/springframework/core/test/io/support/MockSpringFactoriesLoader.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.core.mock; +package org.springframework.core.test.io.support; import java.util.ArrayList; import java.util.HashMap; diff --git a/spring-core-test/src/main/java/org/springframework/core/test/io/support/package-info.java b/spring-core-test/src/main/java/org/springframework/core/test/io/support/package-info.java new file mode 100644 index 00000000000..99ef4641716 --- /dev/null +++ b/spring-core-test/src/main/java/org/springframework/core/test/io/support/package-info.java @@ -0,0 +1,9 @@ +/** + * Test support classes for Spring's I/O support. + */ +@NonNullApi +@NonNullFields +package org.springframework.core.test.io.support; + +import org.springframework.lang.NonNullApi; +import org.springframework.lang.NonNullFields; diff --git a/spring-core-test/src/test/java/org/springframework/core/mock/MockSpringFactoriesLoaderTests.java b/spring-core-test/src/test/java/org/springframework/core/test/io/support/MockSpringFactoriesLoaderTests.java similarity index 95% rename from spring-core-test/src/test/java/org/springframework/core/mock/MockSpringFactoriesLoaderTests.java rename to spring-core-test/src/test/java/org/springframework/core/test/io/support/MockSpringFactoriesLoaderTests.java index db46e5e2242..d201ca41338 100644 --- a/spring-core-test/src/test/java/org/springframework/core/mock/MockSpringFactoriesLoaderTests.java +++ b/spring-core-test/src/test/java/org/springframework/core/test/io/support/MockSpringFactoriesLoaderTests.java @@ -14,13 +14,14 @@ * limitations under the License. */ -package org.springframework.core.mock; +package org.springframework.core.test.io.support; import java.util.List; import org.junit.jupiter.api.Test; import org.springframework.core.annotation.Order; +import org.springframework.core.test.io.support.MockSpringFactoriesLoader; import static org.assertj.core.api.Assertions.assertThat;