Merge branch '2.6.x' into 2.7.x

Closes gh-33262
pull/33648/head
Andy Wilkinson 2 years ago
commit 6bf35e3dd0

@ -22,6 +22,7 @@ import java.util.List;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.boot.ApplicationContextFactory; import org.springframework.boot.ApplicationContextFactory;
import org.springframework.boot.Banner.Mode;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.WebApplicationType; import org.springframework.boot.WebApplicationType;
import org.springframework.boot.context.event.ApplicationEnvironmentPreparedEvent; import org.springframework.boot.context.event.ApplicationEnvironmentPreparedEvent;
@ -119,6 +120,9 @@ public class SpringBootContextLoader extends AbstractContextLoader {
} }
return ApplicationContextFactory.DEFAULT.create(type); return ApplicationContextFactory.DEFAULT.create(type);
}); });
if (config.getParent() != null) {
application.setBannerMode(Mode.OFF);
}
application.setInitializers(initializers); application.setInitializers(initializers);
ConfigurableEnvironment environment = getEnvironment(); ConfigurableEnvironment environment = getEnvironment();
if (environment != null) { if (environment != null) {

@ -17,14 +17,19 @@
package org.springframework.boot.test.context; package org.springframework.boot.test.context;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.boot.test.context.SpringBootTestContextHierarchyTests.ChildConfiguration; import org.springframework.boot.test.context.SpringBootTestContextHierarchyTests.ChildConfiguration;
import org.springframework.boot.test.context.SpringBootTestContextHierarchyTests.ParentConfiguration; import org.springframework.boot.test.context.SpringBootTestContextHierarchyTests.ParentConfiguration;
import org.springframework.boot.test.system.CapturedOutput;
import org.springframework.boot.test.system.OutputCaptureExtension;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.ContextHierarchy; import org.springframework.test.context.ContextHierarchy;
import static org.assertj.core.api.Assertions.assertThat;
/** /**
* Tests for {@link SpringBootTest @SpringBootTest} and * Tests for {@link SpringBootTest @SpringBootTest} and
* {@link ContextHierarchy @ContextHierarchy}. * {@link ContextHierarchy @ContextHierarchy}.
@ -34,11 +39,12 @@ import org.springframework.test.context.ContextHierarchy;
@SpringBootTest @SpringBootTest
@ContextHierarchy({ @ContextConfiguration(classes = ParentConfiguration.class), @ContextHierarchy({ @ContextConfiguration(classes = ParentConfiguration.class),
@ContextConfiguration(classes = ChildConfiguration.class) }) @ContextConfiguration(classes = ChildConfiguration.class) })
@ExtendWith(OutputCaptureExtension.class)
class SpringBootTestContextHierarchyTests { class SpringBootTestContextHierarchyTests {
@Test @Test
void contextLoads() { void contextLoads(CapturedOutput capturedOutput) {
assertThat(capturedOutput).containsOnlyOnce(":: Spring Boot ::");
} }
@Configuration(proxyBeanMethods = false) @Configuration(proxyBeanMethods = false)

Loading…
Cancel
Save