mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Merge branch '2.7.x'
This commit is contained in:
commit
836b08f49d
@ -30,7 +30,7 @@ import static org.assertj.core.api.Assertions.assertThat;
|
|||||||
class InheritanceMetadataGenerationTests extends AbstractMetadataGenerationTests {
|
class InheritanceMetadataGenerationTests extends AbstractMetadataGenerationTests {
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void childProperties() throws Exception {
|
void childProperties() {
|
||||||
ConfigurationMetadata metadata = compile(ChildPropertiesConfig.class);
|
ConfigurationMetadata metadata = compile(ChildPropertiesConfig.class);
|
||||||
assertThat(metadata).has(Metadata.withGroup("inheritance").fromSource(ChildPropertiesConfig.class));
|
assertThat(metadata).has(Metadata.withGroup("inheritance").fromSource(ChildPropertiesConfig.class));
|
||||||
assertThat(metadata).has(Metadata.withGroup("inheritance.nest").fromSource(ChildProperties.class));
|
assertThat(metadata).has(Metadata.withGroup("inheritance.nest").fromSource(ChildProperties.class));
|
||||||
@ -45,7 +45,7 @@ class InheritanceMetadataGenerationTests extends AbstractMetadataGenerationTests
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void overrideChildProperties() throws Exception {
|
void overrideChildProperties() {
|
||||||
ConfigurationMetadata metadata = compile(OverrideChildPropertiesConfig.class);
|
ConfigurationMetadata metadata = compile(OverrideChildPropertiesConfig.class);
|
||||||
assertThat(metadata).has(Metadata.withGroup("inheritance").fromSource(OverrideChildPropertiesConfig.class));
|
assertThat(metadata).has(Metadata.withGroup("inheritance").fromSource(OverrideChildPropertiesConfig.class));
|
||||||
assertThat(metadata).has(Metadata.withGroup("inheritance.nest").fromSource(OverrideChildProperties.class));
|
assertThat(metadata).has(Metadata.withGroup("inheritance.nest").fromSource(OverrideChildProperties.class));
|
||||||
|
Loading…
Reference in New Issue
Block a user