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
6c67c5d7
Commit
6c67c5d7
authored
Jul 31, 2020
by
Andy Wilkinson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Try to fix Windows-specific CI failures
parent
8b404274
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
25 additions
and
28 deletions
+25
-28
ResourceConfigDataLocationResolverTests.java
...ntext/config/ResourceConfigDataLocationResolverTests.java
+17
-11
VolumeMountConfigDataLocationResolverTests.java
...xt/config/VolumeMountConfigDataLocationResolverTests.java
+3
-1
VolumeMountConfigDataLocationTests.java
...ot/context/config/VolumeMountConfigDataLocationTests.java
+3
-1
LiquibaseChangelogMissingFailureAnalyzerTests.java
...uibase/LiquibaseChangelogMissingFailureAnalyzerTests.java
+2
-15
No files found.
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/ResourceConfigDataLocationResolverTests.java
View file @
6c67c5d7
...
...
@@ -16,6 +16,7 @@
package
org
.
springframework
.
boot
.
context
.
config
;
import
java.io.File
;
import
java.util.Collections
;
import
java.util.List
;
...
...
@@ -80,8 +81,8 @@ public class ResourceConfigDataLocationResolverTests {
String
location
=
"file:src/test/resources/configdata/properties/application.properties"
;
List
<
ResourceConfigDataLocation
>
locations
=
this
.
resolver
.
resolve
(
this
.
context
,
location
);
assertThat
(
locations
.
size
()).
isEqualTo
(
1
);
assertThat
(
locations
).
extracting
(
Object:
:
toString
)
.
containsExactly
(
"file [src/test/resources/configdata/properties/application.properties]"
);
assertThat
(
locations
).
extracting
(
Object:
:
toString
)
.
containsExactly
(
filePath
(
"src"
,
"test"
,
"resources"
,
"configdata"
,
"properties"
,
"application.properties"
)
);
}
@Test
...
...
@@ -131,9 +132,9 @@ public class ResourceConfigDataLocationResolverTests {
List
<
ResourceConfigDataLocation
>
locations
=
this
.
resolver
.
resolve
(
this
.
context
,
location
);
assertThat
(
locations
.
size
()).
isEqualTo
(
3
);
assertThat
(
locations
).
extracting
(
Object:
:
toString
)
.
contains
(
"file [src/test/resources/config/1-first/testproperties.properties]"
)
.
contains
(
"file [src/test/resources/config/2-second/testproperties.properties]"
)
.
doesNotContain
(
"file [src/test/resources/config/nested/3-third/testproperties.properties]"
);
.
contains
(
filePath
(
"src"
,
"test"
,
"resources"
,
"config"
,
"1-first"
,
"testproperties.properties"
)
)
.
contains
(
filePath
(
"src"
,
"test"
,
"resources"
,
"config"
,
"2-second"
,
"testproperties.properties"
)
)
.
doesNotContain
(
filePath
(
"src"
,
"test"
,
"resources"
,
"config"
,
"3-third"
,
"testproperties.properties"
)
);
}
@Test
...
...
@@ -143,9 +144,9 @@ public class ResourceConfigDataLocationResolverTests {
this
.
resolver
=
new
ResourceConfigDataLocationResolver
(
null
,
this
.
environmentBinder
,
this
.
resourceLoader
);
List
<
ResourceConfigDataLocation
>
locations
=
this
.
resolver
.
resolve
(
this
.
context
,
location
);
assertThat
(
locations
).
extracting
(
Object:
:
toString
).
containsExactly
(
"file [src/test/resources/config/0-empty/testproperties.properties]"
,
"file [src/test/resources/config/1-first/testproperties.properties]"
,
"file [src/test/resources/config/2-second/testproperties.properties]"
);
filePath
(
"src"
,
"test"
,
"resources"
,
"config"
,
"0-empty"
,
"testproperties.properties"
)
,
filePath
(
"src"
,
"test"
,
"resources"
,
"config"
,
"1-first"
,
"testproperties.properties"
)
,
filePath
(
"src"
,
"test"
,
"resources"
,
"config"
,
"2-second"
,
"testproperties.properties"
)
);
}
@Test
...
...
@@ -154,9 +155,10 @@ public class ResourceConfigDataLocationResolverTests {
List
<
ResourceConfigDataLocation
>
locations
=
this
.
resolver
.
resolve
(
this
.
context
,
location
);
assertThat
(
locations
.
size
()).
isEqualTo
(
3
);
assertThat
(
locations
).
extracting
(
Object:
:
toString
)
.
contains
(
"file [src/test/resources/config/1-first/testproperties.properties]"
)
.
contains
(
"file [src/test/resources/config/2-second/testproperties.properties]"
)
.
doesNotContain
(
"file [src/test/resources/config/nested/3-third/testproperties.properties]"
);
.
contains
(
filePath
(
"src"
,
"test"
,
"resources"
,
"config"
,
"1-first"
,
"testproperties.properties"
))
.
contains
(
filePath
(
"src"
,
"test"
,
"resources"
,
"config"
,
"2-second"
,
"testproperties.properties"
))
.
doesNotContain
(
filePath
(
"src"
,
"test"
,
"resources"
,
"config"
,
"nested"
,
"3-third"
,
"testproperties.properties"
));
}
@Test
...
...
@@ -227,4 +229,8 @@ public class ResourceConfigDataLocationResolverTests {
assertThat
(
locations
).
isEmpty
();
}
private
String
filePath
(
String
...
components
)
{
return
"file ["
+
String
.
join
(
File
.
separator
,
components
)
+
"]"
;
}
}
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/VolumeMountConfigDataLocationResolverTests.java
View file @
6c67c5d7
...
...
@@ -16,6 +16,7 @@
package
org
.
springframework
.
boot
.
context
.
config
;
import
java.io.File
;
import
java.util.List
;
import
org.junit.jupiter.api.Test
;
...
...
@@ -50,7 +51,8 @@ class VolumeMountConfigDataLocationResolverTests {
void
resolveReturnsConfigVolumeMountLocation
()
{
List
<
VolumeMountConfigDataLocation
>
locations
=
this
.
resolver
.
resolve
(
this
.
context
,
"volumemount:/etc/config"
);
assertThat
(
locations
.
size
()).
isEqualTo
(
1
);
assertThat
(
locations
).
extracting
(
Object:
:
toString
).
containsExactly
(
"volume mount [/etc/config]"
);
assertThat
(
locations
).
extracting
(
Object:
:
toString
)
.
containsExactly
(
"volume mount ["
+
new
File
(
"/etc/config"
).
getAbsolutePath
()
+
"]"
);
}
}
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/VolumeMountConfigDataLocationTests.java
View file @
6c67c5d7
...
...
@@ -16,6 +16,8 @@
package
org
.
springframework
.
boot
.
context
.
config
;
import
java.io.File
;
import
org.junit.jupiter.api.Test
;
import
static
org
.
assertj
.
core
.
api
.
Assertions
.
assertThat
;
...
...
@@ -52,7 +54,7 @@ public class VolumeMountConfigDataLocationTests {
@Test
void
toStringReturnsDescriptiveString
()
{
VolumeMountConfigDataLocation
location
=
new
VolumeMountConfigDataLocation
(
"/etc/config"
);
assertThat
(
location
.
toString
()).
isEqualTo
(
"volume mount [
/etc/config
]"
);
assertThat
(
location
.
toString
()).
isEqualTo
(
"volume mount [
"
+
new
File
(
"/etc/config"
).
getAbsolutePath
()
+
"
]"
);
}
}
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/liquibase/LiquibaseChangelogMissingFailureAnalyzerTests.java
View file @
6c67c5d7
...
...
@@ -16,19 +16,15 @@
package
org
.
springframework
.
boot
.
liquibase
;
import
java.io.File
;
import
javax.sql.DataSource
;
import
liquibase.integration.spring.SpringLiquibase
;
import
org.junit.jupiter.api.AfterAll
;
import
org.junit.jupiter.api.BeforeAll
;
import
org.junit.jupiter.api.Test
;
import
org.junit.jupiter.api.io.TempDir
;
import
org.springframework.beans.factory.BeanCreationException
;
import
org.springframework.boot.diagnostics.FailureAnalysis
;
import
org.springframework.boot.jdbc.DataSourceBuilder
;
import
org.springframework.boot.testsupport.classpath.ClassPathExclusions
;
import
org.springframework.context.annotation.AnnotationConfigApplicationContext
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Configuration
;
...
...
@@ -40,18 +36,9 @@ import static org.assertj.core.api.Assertions.assertThat;
*
* @author Sebastiaan Fernandez
*/
@ClassPathExclusions
(
"derby-*"
)
class
LiquibaseChangelogMissingFailureAnalyzerTests
{
@BeforeAll
static
void
configureDerbyLogLocation
(
@TempDir
File
temp
)
{
System
.
setProperty
(
"derby.stream.error.file"
,
new
File
(
temp
,
"derby.log"
).
getAbsolutePath
());
}
@AfterAll
static
void
clearDerbyLogLocation
()
{
System
.
clearProperty
(
"derby.stream.error.file"
);
}
@Test
void
changelogParseExceptionDueToChangelogNotPresent
()
{
FailureAnalysis
analysis
=
performAnalysis
();
...
...
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