Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
e083be7d
Commit
e083be7d
authored
Dec 18, 2020
by
Andy Wilkinson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix ConfigDataEnvironmentPostProcessorIntegrationTests in Windows
parent
abd0b484
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
6 deletions
+8
-6
ConfigDataEnvironmentPostProcessorIntegrationTests.java
...g/ConfigDataEnvironmentPostProcessorIntegrationTests.java
+8
-6
No files found.
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigDataEnvironmentPostProcessorIntegrationTests.java
View file @
e083be7d
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment