Polishing

Author: sbrannen

spring-test/src/main/java/org/springframework/test/context/aot/TestContextAotGenerator.java

@@ -204,7 +204,7 @@ private GenericApplicationContext loadContextForAotProcessing(
 					contextLoader.getClass().getName()));
 	}
 
-	MergedContextConfiguration buildMergedContextConfiguration(Class<?> testClass) {
+	private MergedContextConfiguration buildMergedContextConfiguration(Class<?> testClass) {
 		TestContextBootstrapper testContextBootstrapper =
 				BootstrapUtils.resolveTestContextBootstrapper(testClass);
 		// @BootstrapWith

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

@@ -37,7 +37,9 @@
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.core.env.Profiles;
 import org.springframework.javapoet.ClassName;
+import org.springframework.test.context.BootstrapUtils;
 import org.springframework.test.context.MergedContextConfiguration;
+import org.springframework.test.context.TestContextBootstrapper;
 import org.springframework.test.context.aot.samples.basic.BasicSpringJupiterSharedConfigTests;
 import org.springframework.test.context.aot.samples.basic.BasicSpringJupiterTests;
 import org.springframework.test.context.aot.samples.basic.BasicSpringTestNGTests;
@@ -103,7 +105,7 @@ void processAheadOfTimeAndGenerateAotTestMappings() {
 		TestCompiler.forSystem().withFiles(generatedFiles).compile(ThrowingConsumer.of(compiled -> {
 			AotTestMappings aotTestMappings = new AotTestMappings();
 			for (Class<?> testClass : testClasses) {
-				MergedContextConfiguration mergedConfig = generator.buildMergedContextConfiguration(testClass);
+				MergedContextConfiguration mergedConfig = buildMergedContextConfiguration(testClass);
 				ApplicationContextInitializer<ConfigurableApplicationContext> contextInitializer =
 						aotTestMappings.getContextInitializer(testClass);
 				assertThat(contextInitializer).isNotNull();
@@ -291,7 +293,7 @@ private List<Mapping> processAheadOfTime(TestContextAotGenerator generator, Set<
 		List<Mapping> mappings = new ArrayList<>();
 		testClasses.forEach(testClass -> {
 			DefaultGenerationContext generationContext = generator.createGenerationContext(testClass);
-			MergedContextConfiguration mergedConfig = generator.buildMergedContextConfiguration(testClass);
+			MergedContextConfiguration mergedConfig = buildMergedContextConfiguration(testClass);
 			ClassName className = generator.processAheadOfTime(mergedConfig, generationContext);
 			assertThat(className).isNotNull();
 			mappings.add(new Mapping(mergedConfig, className));
@@ -301,6 +303,11 @@ private List<Mapping> processAheadOfTime(TestContextAotGenerator generator, Set<
 	}
 
 
+	private static MergedContextConfiguration buildMergedContextConfiguration(Class<?> testClass) {
+		TestContextBootstrapper testContextBootstrapper = BootstrapUtils.resolveTestContextBootstrapper(testClass);
+		return testContextBootstrapper.buildMergedContextConfiguration();
+	}
+
 	record Mapping(MergedContextConfiguration mergedConfig, ClassName className) {
 	}