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

Fix build

Browse Source 
Commit 29f085bd1a690ff7281e00b3a925e1160850ffbb in Spring Framework
automatically registers hints for enclosing directories. This fixes the
tests to expect hints for those directories as well.
This commit is contained in:
Moritz Halbritter
2022-10-31 13:34:14 +01:00
parent 5bf088d88b
commit ec0d598ba4
1 changed files with 5 additions and 9 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/ConfigDataLocationRuntimeHintsTests.java
View File

@@ -45,7 +45,7 @@ class ConfigDataLocationRuntimeHintsTests {
RuntimeHints hints = new RuntimeHints();
new TestConfigDataLocationRuntimeHints().registerHints(hints, null);
assertThat(hints.resources().resourcePatternHints()).singleElement()
.satisfies(includes("application*.properties", "application*.xml", "application*.yaml",
.satisfies(includes("/", "config", "application*.properties", "application*.xml", "application*.yaml",
"application*.yml", "config/application*.properties", "config/application*.xml",
"config/application*.yaml", "config/application*.yml"));
}
@@ -61,7 +61,7 @@ class ConfigDataLocationRuntimeHintsTests {
}.registerHints(hints, null);
assertThat(hints.resources().resourcePatternHints()).singleElement()
.satisfies(includes("test*.properties", "test*.xml", "test*.yaml", "test*.yml",
.satisfies(includes("/", "config", "test*.properties", "test*.xml", "test*.yaml", "test*.yml",
"config/test*.properties", "config/test*.xml", "config/test*.yaml", "config/test*.yml"));
}
@@ -75,7 +75,7 @@ class ConfigDataLocationRuntimeHintsTests {
}
}.registerHints(hints, null);
assertThat(hints.resources().resourcePatternHints()).singleElement()
.satisfies(includes("config/application*.properties", "config/application*.xml",
.satisfies(includes("config", "config/application*.properties", "config/application*.xml",
"config/application*.yaml", "config/application*.yml"));
}
@@ -89,7 +89,7 @@ class ConfigDataLocationRuntimeHintsTests {
}
}.registerHints(hints, null);
assertThat(hints.resources().resourcePatternHints()).singleElement()
.satisfies(includes("application*.conf", "config/application*.conf"));
.satisfies(includes("/", "config", "application*.conf", "config/application*.conf"));
}
@Test
@@ -116,12 +116,8 @@ class ConfigDataLocationRuntimeHintsTests {
private final MockSpringFactoriesLoader springFactoriesLoader;
TestConfigDataLocationRuntimeHints(MockSpringFactoriesLoader springFactoriesLoader) {
this.springFactoriesLoader = springFactoriesLoader;
}
TestConfigDataLocationRuntimeHints() {
this(springFactoriesLoader());
this.springFactoriesLoader = springFactoriesLoader();
}
private static MockSpringFactoriesLoader springFactoriesLoader() {