root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "Fix build" 

This reverts commit ec0d598ba4.
This commit is contained in:
Moritz Halbritter 2022-10-31 16:54:06 +01:00
parent dd2bec267c
commit 5e034eab59
1 changed files with 9 additions and 5 deletions
Show Stats 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("/", "config", "application*.properties", "application*.xml", "application*.yaml",
.satisfies(includes("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("/", "config", "test*.properties", "test*.xml", "test*.yaml", "test*.yml",
.satisfies(includes("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", "config/application*.properties", "config/application*.xml",
.satisfies(includes("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("/", "config", "application*.conf", "config/application*.conf"));
.satisfies(includes("application*.conf", "config/application*.conf"));
}
@Test
@ -116,8 +116,12 @@ class ConfigDataLocationRuntimeHintsTests {
private final MockSpringFactoriesLoader springFactoriesLoader;
TestConfigDataLocationRuntimeHints(MockSpringFactoriesLoader springFactoriesLoader) {
this.springFactoriesLoader = springFactoriesLoader;
}
TestConfigDataLocationRuntimeHints() {
this.springFactoriesLoader = springFactoriesLoader();
this(springFactoriesLoader());
}
private static MockSpringFactoriesLoader springFactoriesLoader() {