Skip to content

S
spring-boot
Commit 42865dac authored by Phillip Webb's avatar Phillip Webb
Browse files
Options

Merge branch '2.4.x'

parents 91eb37dd 8661f74f
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 6 deletions
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigDataEnvironmentPostProcessorIntegrationTests.java
View file @ 42865dac
...@@ -719,12 +719,6 @@ class ConfigDataEnvironmentPostProcessorIntegrationTests { ...@@ -719,12 +719,6 @@ class ConfigDataEnvironmentPostProcessorIntegrationTests {
"Config data location 'file:src/test/resources/config/0-empty/*/' contains no subdirectories"); "Config data location 'file:src/test/resources/config/0-empty/*/' contains no subdirectories");
} }
@Test
void runWhenOptionalWildcardLocationHasNoSubdirectories() {
assertThatNoException().isThrownBy(() -> this.application
.run("--spring.config.location=optional:file:src/test/resources/config/0-empty/*/"));
}
@Test @Test
void runWhenHasMandatoryWildcardLocationThatDoesNotExist() { void runWhenHasMandatoryWildcardLocationThatDoesNotExist() {
assertThatExceptionOfType(ConfigDataLocationNotFoundException.class) assertThatExceptionOfType(ConfigDataLocationNotFoundException.class)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment