Ensure integration tests are suitable for AOT processing

Author: sbrannen

spring-test/src/test/java/org/springframework/test/context/bean/override/convention/TestBeanForByTypeLookupIntegrationTests.java

@@ -37,7 +37,7 @@
  * @since 6.2
  */
 @SpringJUnitConfig
-class TestBeanForByTypeLookupIntegrationTests {
+public class TestBeanForByTypeLookupIntegrationTests {
 
 	@TestBean
 	ExampleService anyNameForService;

spring-test/src/test/java/org/springframework/test/context/bean/override/convention/TestBeanForInheritanceIntegrationTests.java

@@ -40,14 +40,14 @@
  * @author Sam Brannen
  * @since 6.2
  */
-class TestBeanForInheritanceIntegrationTests {
+public class TestBeanForInheritanceIntegrationTests {
 
 	static Pojo enclosingClassBeanOverride() {
 		return new FakePojo("in enclosing test class");
 	}
 
 	@SpringJUnitConfig
-	abstract static class AbstractTestBeanIntegrationTestCase {
+	public abstract static class AbstractTestBeanIntegrationTestCase {
 
 		@TestBean(name = "someBean")
 		Pojo someBean;
@@ -70,7 +70,7 @@ static Pojo commonBeanOverride() {
 			return new FakePojo("in superclass");
 		}
 
-		interface Pojo {
+		public interface Pojo {
 
 			default String getValue() {
 				return "Prod";

spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanForBeanFactoryIntegrationTests.java

@@ -40,7 +40,7 @@
  */
 @SpringJUnitConfig
 @TestMethodOrder(OrderAnnotation.class)
-class MockitoBeanForBeanFactoryIntegrationTests {
+public class MockitoBeanForBeanFactoryIntegrationTests {
 
 	@MockitoBean
 	private TestBean testBean;
@@ -98,7 +98,7 @@ public boolean isSingleton() {
 
 	}
 
-	interface TestBean {
+	public interface TestBean {
 
 		String hello();
 

spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanForByTypeLookupIntegrationTests.java

@@ -123,7 +123,7 @@ void overrideIsFoundByTypeAndDisambiguatedByMetaQualifier(ApplicationContext ctx
 	}
 
 
-	interface AnotherService {
+	public interface AnotherService {
 
 		String hello();
 

spring-test/src/test/java/org/springframework/test/context/jdbc/PropertyPlaceholderSqlScriptsTests.java

@@ -22,21 +22,23 @@
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.aot.DisabledInAotMode;
 
 /**
  * Integration tests that verify support for property placeholders in SQL script locations.
  *
  * @author Sam Brannen
  * @since 6.2
  */
-@ContextConfiguration(classes = PopulatedSchemaDatabaseConfig.class)
 class PropertyPlaceholderSqlScriptsTests {
 
 	private static final String SCRIPT_LOCATION = "classpath:org/springframework/test/context/jdbc/${vendor}/data.sql";
 
 	@Nested
+	@ContextConfiguration(classes = PopulatedSchemaDatabaseConfig.class)
 	@TestPropertySource(properties = "vendor = db1")
 	@DirtiesContext
+	@DisabledInAotMode // ${vendor} does not get resolved during AOT processing
 	class DatabaseOneTests extends AbstractTransactionalTests {
 
 		@Test
@@ -47,8 +49,10 @@ void placeholderIsResolvedInScriptLocation() {
 	}
 
 	@Nested
+	@ContextConfiguration(classes = PopulatedSchemaDatabaseConfig.class)
 	@TestPropertySource(properties = "vendor = db2")
 	@DirtiesContext
+	@DisabledInAotMode // ${vendor} does not get resolved during AOT processing
 	class DatabaseTwoTests extends AbstractTransactionalTests {
 
 		@Test