From 4fef5291bf615e820425e157036c04ad93ea9e92 Mon Sep 17 00:00:00 2001 From: Moritz Halbritter Date: Mon, 31 Oct 2022 16:59:15 +0100 Subject: [PATCH] Fix build Commit 29f085bd1a690ff7281e00b3a925e1160850ffbb in Spring Framework automatically registers hints for enclosing directories. This fixes the tests to use a contains instead of exact match. --- .../boot/autoconfigure/web/WebResourcesRuntimeHintsTests.java | 2 +- .../context/config/ConfigDataLocationRuntimeHintsTests.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/WebResourcesRuntimeHintsTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/WebResourcesRuntimeHintsTests.java index cff3075fc6..960e91bf7e 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/WebResourcesRuntimeHintsTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/WebResourcesRuntimeHintsTests.java @@ -66,7 +66,7 @@ class WebResourcesRuntimeHintsTests { private Consumer include(String... patterns) { return (hint) -> { - assertThat(hint.getIncludes()).map(ResourcePatternHint::getPattern).containsExactly(patterns); + assertThat(hint.getIncludes()).map(ResourcePatternHint::getPattern).contains(patterns); assertThat(hint.getExcludes()).isEmpty(); }; } 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..0a0d7ba426 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 @@ -107,7 +107,7 @@ class ConfigDataLocationRuntimeHintsTests { private Consumer includes(String... patterns) { return (hint) -> { assertThat(hint.getIncludes().stream().map(ResourcePatternHint::getPattern)) - .containsExactlyInAnyOrder(patterns); + .contains(patterns); assertThat(hint.getExcludes()).isEmpty(); }; }