From 59eaed0b28155b5e836fa1b5d6ef951d21a27e5c Mon Sep 17 00:00:00 2001
From: Sam Brannen <104798+sbrannen@users.noreply.github.com>
Date: Mon, 23 Sep 2024 16:18:37 +0200
Subject: [PATCH] Ensure integration tests are suitable for AOT processing

---
 .../convention/TestBeanForByTypeLookupIntegrationTests.java | 2 +-
 .../convention/TestBeanForInheritanceIntegrationTests.java  | 6 +++---
 .../mockito/MockitoBeanForBeanFactoryIntegrationTests.java  | 4 ++--
 .../mockito/MockitoBeanForByTypeLookupIntegrationTests.java | 2 +-
 .../context/jdbc/PropertyPlaceholderSqlScriptsTests.java    | 6 +++++-
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/spring-test/src/test/java/org/springframework/test/context/bean/override/convention/TestBeanForByTypeLookupIntegrationTests.java b/spring-test/src/test/java/org/springframework/test/context/bean/override/convention/TestBeanForByTypeLookupIntegrationTests.java
index 8f02888ea2..b35372460c 100644
--- a/spring-test/src/test/java/org/springframework/test/context/bean/override/convention/TestBeanForByTypeLookupIntegrationTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/bean/override/convention/TestBeanForByTypeLookupIntegrationTests.java
@@ -37,7 +37,7 @@ import static org.assertj.core.api.Assertions.assertThat;
  * @since 6.2
  */
 @SpringJUnitConfig
-class TestBeanForByTypeLookupIntegrationTests {
+public class TestBeanForByTypeLookupIntegrationTests {
 
 	@TestBean
 	ExampleService anyNameForService;
diff --git a/spring-test/src/test/java/org/springframework/test/context/bean/override/convention/TestBeanForInheritanceIntegrationTests.java b/spring-test/src/test/java/org/springframework/test/context/bean/override/convention/TestBeanForInheritanceIntegrationTests.java
index d7f326f144..e5836f6ff0 100644
--- a/spring-test/src/test/java/org/springframework/test/context/bean/override/convention/TestBeanForInheritanceIntegrationTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/bean/override/convention/TestBeanForInheritanceIntegrationTests.java
@@ -40,14 +40,14 @@ import static org.assertj.core.api.Assertions.assertThat;
  * @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 @@ class TestBeanForInheritanceIntegrationTests {
 			return new FakePojo("in superclass");
 		}
 
-		interface Pojo {
+		public interface Pojo {
 
 			default String getValue() {
 				return "Prod";
diff --git a/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanForBeanFactoryIntegrationTests.java b/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanForBeanFactoryIntegrationTests.java
index 7a72f7ecb6..1100788799 100644
--- a/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanForBeanFactoryIntegrationTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanForBeanFactoryIntegrationTests.java
@@ -40,7 +40,7 @@ import static org.mockito.BDDMockito.when;
  */
 @SpringJUnitConfig
 @TestMethodOrder(OrderAnnotation.class)
-class MockitoBeanForBeanFactoryIntegrationTests {
+public class MockitoBeanForBeanFactoryIntegrationTests {
 
 	@MockitoBean
 	private TestBean testBean;
@@ -98,7 +98,7 @@ class MockitoBeanForBeanFactoryIntegrationTests {
 
 	}
 
-	interface TestBean {
+	public interface TestBean {
 
 		String hello();
 
diff --git a/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanForByTypeLookupIntegrationTests.java b/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanForByTypeLookupIntegrationTests.java
index e5ff2181f9..0836b45718 100644
--- a/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanForByTypeLookupIntegrationTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanForByTypeLookupIntegrationTests.java
@@ -123,7 +123,7 @@ public class MockitoBeanForByTypeLookupIntegrationTests {
 	}
 
 
-	interface AnotherService {
+	public interface AnotherService {
 
 		String hello();
 
diff --git a/spring-test/src/test/java/org/springframework/test/context/jdbc/PropertyPlaceholderSqlScriptsTests.java b/spring-test/src/test/java/org/springframework/test/context/jdbc/PropertyPlaceholderSqlScriptsTests.java
index 8833de250c..b82a700f24 100644
--- a/spring-test/src/test/java/org/springframework/test/context/jdbc/PropertyPlaceholderSqlScriptsTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/jdbc/PropertyPlaceholderSqlScriptsTests.java
@@ -22,6 +22,7 @@ import org.junit.jupiter.api.Test;
 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.
@@ -29,14 +30,15 @@ import org.springframework.test.context.TestPropertySource;
  * @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 @@ class PropertyPlaceholderSqlScriptsTests {
 	}
 
 	@Nested
+	@ContextConfiguration(classes = PopulatedSchemaDatabaseConfig.class)
 	@TestPropertySource(properties = "vendor = db2")
 	@DirtiesContext
+	@DisabledInAotMode // ${vendor} does not get resolved during AOT processing
 	class DatabaseTwoTests extends AbstractTransactionalTests {
 
 		@Test