Relocate MockSpringFactoriesLoader

Closes gh-29176

Author: philwebb

spring-beans/src/test/java/org/springframework/beans/factory/aot/AotServicesTests.java

@@ -27,7 +27,7 @@
 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;

spring-beans/src/test/java/org/springframework/beans/factory/aot/BeanDefinitionMethodGeneratorFactoryTests.java

@@ -23,7 +23,7 @@
 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;

spring-beans/src/test/java/org/springframework/beans/factory/aot/BeanDefinitionMethodGeneratorTests.java

@@ -44,7 +44,7 @@
 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;

spring-beans/src/test/java/org/springframework/beans/factory/aot/BeanRegistrationsAotContributionTests.java

@@ -39,7 +39,7 @@
 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;

spring-core-test/src/main/java/org/springframework/core/mock/MockSpringFactoriesLoader.java renamed to 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;

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;

spring-core-test/src/test/java/org/springframework/core/mock/MockSpringFactoriesLoaderTests.java renamed to 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;