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

Fix ConfigDataEnvironmentPostProcessorIntegrationTests in Windows

Browse Source
This commit is contained in:
Andy Wilkinson
2020-12-18 15:25:45 +00:00
parent abd0b484bc
commit e083be7de1
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigDataEnvironmentPostProcessorIntegrationTests.java
View File

@@ -21,6 +21,7 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
@@ -29,6 +30,7 @@ import java.util.Properties;
import java.util.stream.Collectors;
import java.util.stream.StreamSupport;
import org.apache.logging.log4j.util.Strings;
import org.assertj.core.api.Condition;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
@@ -413,18 +415,18 @@ class ConfigDataEnvironmentPostProcessorIntegrationTests {
void loadWhenHasConfigLocationAsFile() {
String location = "file:src/test/resources/specificlocation.properties";
ConfigurableApplicationContext context = this.application.run("--spring.config.location=" + location);
assertThat(context.getEnvironment()).has(matchingPropertySource(
"Config resource 'file [src/test/resources/specificlocation.properties]' via location '" + location
+ "'"));
assertThat(context.getEnvironment()).has(matchingPropertySource("Config resource 'file [" + Strings
.join(Arrays.asList("src", "test", "resources", "specificlocation.properties"), File.separatorChar)
+ "]' via location '" + location + "'"));
}
@Test
void loadWhenHasRelativeConfigLocationUsesFileLocation() {
String location = "src/test/resources/specificlocation.properties";
ConfigurableApplicationContext context = this.application.run("--spring.config.location=" + location);
assertThat(context.getEnvironment()).has(matchingPropertySource(
"Config resource 'file [src/test/resources/specificlocation.properties]' via location '" + location
+ "'"));
assertThat(context.getEnvironment()).has(matchingPropertySource("Config resource 'file [" + Strings
.join(Arrays.asList("src", "test", "resources", "specificlocation.properties"), File.separatorChar)
+ "]' via location '" + location + "'"));
}
@Test