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

Merge branch 'main' into 4.0.x

Browse Source
This commit is contained in:
Andy Wilkinson
2025-06-13 18:49:07 +01:00
parent cdb727b7a3 302a6e823f
commit 229cca83d5
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesTests.java
View File

@@ -302,9 +302,12 @@ class ConfigurationPropertiesTests {
@Test
void loadWhenBindingWithParentContextShouldBind() {
AnnotationConfigApplicationContext parent = load(BasicConfiguration.class, "name=parent");
assertThat(parent.getEnvironment().getProperty("name")).isEqualTo("parent");
this.context = new AnnotationConfigApplicationContext();
this.context.setParent(parent);
removeSystemProperties();
load(new Class<?>[] { BasicConfiguration.class, BasicPropertiesConsumer.class }, "name=child");
assertThat(this.context.getEnvironment().getProperty("name")).isEqualTo("child");
assertThat(this.context.getBean(BasicProperties.class)).isNotNull();
assertThat(parent.getBean(BasicProperties.class)).isNotNull();
assertThat(this.context.getBean(BasicPropertiesConsumer.class).getName()).isEqualTo("child");