Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.3.x'

Browse Source 
Closes gh-41860
This commit is contained in:
Andy Wilkinson
2024-08-14 19:04:18 +01:00
parent 46150bae89 1bd9948485
commit d56dd741d0
2 changed files with 40 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
spring-boot-project/spring-boot-testcontainers/src/test/java/org/springframework/boot/testcontainers/lifecycle/TestcontainersLifecycleApplicationContextInitializerTests.java
View File

@@ -24,6 +24,7 @@ import org.testcontainers.containers.GenericContainer;
import org.testcontainers.lifecycle.Startable;
import org.testcontainers.utility.TestcontainersConfiguration;
import org.springframework.aot.hint.RuntimeHints;
import org.springframework.beans.factory.config.BeanPostProcessor;
import org.springframework.beans.factory.support.AbstractBeanFactory;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
@@ -143,6 +144,17 @@ class TestcontainersLifecycleApplicationContextInitializerTests {
applicationContext.refresh();
}
@Test
void doesNotStartContainersWhenAotProcessingIsInProgress() {
GenericContainer<?> container = mock(GenericContainer.class);
AnnotationConfigApplicationContext applicationContext = createApplicationContext(container);
then(container).shouldHaveNoInteractions();
withSystemProperty("spring.aot.processing", "true",
() -> applicationContext.refreshForAotProcessing(new RuntimeHints()));
then(container).shouldHaveNoInteractions();
applicationContext.close();
}
@Test
void setupStartupBasedOnEnvironmentProperty() {
AnnotationConfigApplicationContext applicationContext = new AnnotationConfigApplicationContext();
@@ -159,6 +171,22 @@ class TestcontainersLifecycleApplicationContextInitializerTests {
assertThat(beanPostProcessor).extracting("startup").isEqualTo(TestcontainersStartup.PARALLEL);
}
private void withSystemProperty(String name, String value, Runnable action) {
String previousValue = System.getProperty(name);
System.setProperty(name, value);
try {
action.run();
}
finally {
if (previousValue == null) {
System.clearProperty(name);
}
else {
System.setProperty(name, previousValue);
}
}
}
private AnnotationConfigApplicationContext createApplicationContext(Startable container) {
AnnotationConfigApplicationContext applicationContext = new AnnotationConfigApplicationContext();
new TestcontainersLifecycleApplicationContextInitializer().initialize(applicationContext);
@@ -166,6 +194,13 @@ class TestcontainersLifecycleApplicationContextInitializerTests {
return applicationContext;
}
private AnnotationConfigApplicationContext createApplicationContext(GenericContainer<?> container) {
AnnotationConfigApplicationContext applicationContext = new AnnotationConfigApplicationContext();
new TestcontainersLifecycleApplicationContextInitializer().initialize(applicationContext);
applicationContext.registerBean("container", GenericContainer.class, () -> container);
return applicationContext;
}
@Configuration
static class ReusableContainerConfiguration {