From ec0d598ba43fa235c8022aa4c782916b031b5a70 Mon Sep 17 00:00:00 2001 From: Moritz Halbritter Date: Mon, 31 Oct 2022 13:34:14 +0100 Subject: [PATCH] Fix build Commit 29f085bd1a690ff7281e00b3a925e1160850ffbb in Spring Framework automatically registers hints for enclosing directories. This fixes the tests to expect hints for those directories as well. --- .../ConfigDataLocationRuntimeHintsTests.java | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigDataLocationRuntimeHintsTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigDataLocationRuntimeHintsTests.java index cafd8ec02c..5f32b91cd3 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigDataLocationRuntimeHintsTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigDataLocationRuntimeHintsTests.java @@ -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() {