Relocate testfixtures

spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostProcessorAotContributionTests.java

@@ -42,11 +42,11 @@ import org.springframework.beans.testfixture.beans.factory.aot.MockBeanFactoryIn
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.context.support.GenericApplicationContext;
+import org.springframework.context.testfixture.context.annotation.CglibConfiguration;
+import org.springframework.context.testfixture.context.annotation.ImportAwareConfiguration;
+import org.springframework.context.testfixture.context.annotation.ImportConfiguration;
+import org.springframework.context.testfixture.context.annotation.SimpleConfiguration;
 import org.springframework.context.testfixture.context.generator.SimpleComponent;
-import org.springframework.context.testfixture.context.generator.annotation.CglibConfiguration;
-import org.springframework.context.testfixture.context.generator.annotation.ImportAwareConfiguration;
-import org.springframework.context.testfixture.context.generator.annotation.ImportConfiguration;
-import org.springframework.context.testfixture.context.generator.annotation.SimpleConfiguration;
 import org.springframework.core.Ordered;
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.core.io.ResourceLoader;
@@ -149,8 +149,7 @@ class ConfigurationClassPostProcessorAotContributionTests {
 					.singleElement()
 					.satisfies(resourceHint -> assertThat(resourceHint.getIncludes())
 							.map(ResourcePatternHint::getPattern)
-							.containsOnly("org/springframework/context/testfixture/context/generator/annotation/"
-									+ "ImportConfiguration.class"));
+							.containsOnly("org/springframework/context/testfixture/context/annotation/ImportConfiguration.class"));
 		}
 
 		@SuppressWarnings("unchecked")

spring-context/src/test/java/org/springframework/context/aot/ApplicationContextAotGeneratorTests.java

@@ -52,16 +52,16 @@ import org.springframework.context.annotation.AnnotationConfigUtils;
 import org.springframework.context.annotation.CommonAnnotationBeanPostProcessor;
 import org.springframework.context.annotation.ContextAnnotationAutowireCandidateResolver;
 import org.springframework.context.support.GenericApplicationContext;
+import org.springframework.context.testfixture.context.annotation.AutowiredComponent;
+import org.springframework.context.testfixture.context.annotation.CglibConfiguration;
+import org.springframework.context.testfixture.context.annotation.ConfigurableCglibConfiguration;
+import org.springframework.context.testfixture.context.annotation.InitDestroyComponent;
+import org.springframework.context.testfixture.context.annotation.LazyAutowiredFieldComponent;
+import org.springframework.context.testfixture.context.annotation.LazyAutowiredMethodComponent;
+import org.springframework.context.testfixture.context.annotation.LazyConstructorArgumentComponent;
+import org.springframework.context.testfixture.context.annotation.LazyFactoryMethodArgumentComponent;
+import org.springframework.context.testfixture.context.annotation.PropertySourceConfiguration;
 import org.springframework.context.testfixture.context.generator.SimpleComponent;
-import org.springframework.context.testfixture.context.generator.annotation.AutowiredComponent;
-import org.springframework.context.testfixture.context.generator.annotation.CglibConfiguration;
-import org.springframework.context.testfixture.context.generator.annotation.ConfigurableCglibConfiguration;
-import org.springframework.context.testfixture.context.generator.annotation.InitDestroyComponent;
-import org.springframework.context.testfixture.context.generator.annotation.LazyAutowiredFieldComponent;
-import org.springframework.context.testfixture.context.generator.annotation.LazyAutowiredMethodComponent;
-import org.springframework.context.testfixture.context.generator.annotation.LazyConstructorArgumentComponent;
-import org.springframework.context.testfixture.context.generator.annotation.LazyFactoryMethodArgumentComponent;
-import org.springframework.context.testfixture.context.generator.annotation.PropertySourceConfiguration;
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.core.env.Environment;
 import org.springframework.core.env.PropertySource;

spring-context/src/test/java/org/springframework/context/generator/ApplicationContextAotGeneratorRuntimeHintsTests.java

@@ -32,9 +32,9 @@ import org.springframework.context.ApplicationContextInitializer;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.aot.ApplicationContextAotGenerator;
 import org.springframework.context.support.GenericApplicationContext;
+import org.springframework.context.testfixture.context.annotation.AutowiredComponent;
+import org.springframework.context.testfixture.context.annotation.InitDestroyComponent;
 import org.springframework.context.testfixture.context.generator.SimpleComponent;
-import org.springframework.context.testfixture.context.generator.annotation.AutowiredComponent;
-import org.springframework.context.testfixture.context.generator.annotation.InitDestroyComponent;
 import org.springframework.core.test.tools.TestCompiler;
 
 import static org.assertj.core.api.Assertions.assertThat;

spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/annotation/AutowiredComponent.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.context.testfixture.context.generator.annotation;
+package org.springframework.context.testfixture.context.annotation;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;

spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/annotation/CglibConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.context.testfixture.context.generator.annotation;
+package org.springframework.context.testfixture.context.annotation;
 
 import java.util.concurrent.atomic.AtomicInteger;
 

spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/annotation/ConfigurableCglibConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.context.testfixture.context.generator.annotation;
+package org.springframework.context.testfixture.context.annotation;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.env.Environment;

spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/annotation/ImportAwareConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.context.testfixture.context.generator.annotation;
+package org.springframework.context.testfixture.context.annotation;
 
 import org.springframework.context.EnvironmentAware;
 import org.springframework.context.annotation.Configuration;

spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/annotation/ImportConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.context.testfixture.context.generator.annotation;
+package org.springframework.context.testfixture.context.annotation;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;

spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/annotation/InitDestroyComponent.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.context.testfixture.context.generator.annotation;
+package org.springframework.context.testfixture.context.annotation;
 
 import java.util.ArrayList;
 import java.util.List;

spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/annotation/LazyAutowiredFieldComponent.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.context.testfixture.context.generator.annotation;
+package org.springframework.context.testfixture.context.annotation;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;

spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/annotation/LazyAutowiredMethodComponent.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.context.testfixture.context.generator.annotation;
+package org.springframework.context.testfixture.context.annotation;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;

spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/annotation/LazyConstructorArgumentComponent.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.context.testfixture.context.generator.annotation;
+package org.springframework.context.testfixture.context.annotation;
 
 import org.springframework.context.annotation.Lazy;
 import org.springframework.core.env.Environment;

spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/annotation/LazyFactoryMethodArgumentComponent.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.context.testfixture.context.generator.annotation;
+package org.springframework.context.testfixture.context.annotation;
 
 import org.springframework.context.annotation.Lazy;
 import org.springframework.core.env.Environment;

spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/annotation/PropertySourceConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.context.testfixture.context.generator.annotation;
+package org.springframework.context.testfixture.context.annotation;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;

spring-context/src/testFixtures/java/org/springframework/context/testfixture/context/annotation/SimpleConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.context.testfixture.context.generator.annotation;
+package org.springframework.context.testfixture.context.annotation;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;