From 09ac085a6a3824a8da5a6b2ca62b2e3f42f16705 Mon Sep 17 00:00:00 2001 From: Moritz Halbritter Date: Mon, 17 Feb 2025 17:11:19 +0100 Subject: [PATCH] Fix ApplicationResourceLoaderTests on Windows --- .../boot/io/ApplicationResourceLoaderTests.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/io/ApplicationResourceLoaderTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/io/ApplicationResourceLoaderTests.java index c7e863cf41..4ffd034eaa 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/io/ApplicationResourceLoaderTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/io/ApplicationResourceLoaderTests.java @@ -73,12 +73,13 @@ class ApplicationResourceLoaderTests { @Test void shouldLoadAbsolutePathWithWorkingDirectory() throws IOException { ClassLoader classLoader = getClass().getClassLoader(); + Path workingDirectory = Path.of("/working-directory"); Resource resource = ApplicationResourceLoader - .get(classLoader, SpringFactoriesLoader.forDefaultResourceLocation(classLoader), - Path.of("/working-directory")) - .getResource("/root/file.txt"); + .get(classLoader, SpringFactoriesLoader.forDefaultResourceLocation(classLoader), workingDirectory) + .getResource("/file.txt"); assertThat(resource.isFile()).isTrue(); - assertThat(resource.getFile()).hasParent("/root").hasName("file.txt"); + assertThat(resource.getFile()).hasName("file.txt") + .satisfies((file) -> assertThat(file.getParentFile()).isNotEqualTo(workingDirectory)); } @Test @@ -170,12 +171,13 @@ class ApplicationResourceLoaderTests { @Test void shouldLoadAbsoluteFileUrisWithWorkingDirectory() throws IOException { ClassLoader classLoader = getClass().getClassLoader(); + Path workingDirectory = Path.of("/working-directory"); Resource resource = ApplicationResourceLoader - .get(classLoader, SpringFactoriesLoader.forDefaultResourceLocation(classLoader), - Path.of("/working-directory")) + .get(classLoader, SpringFactoriesLoader.forDefaultResourceLocation(classLoader), workingDirectory) .getResource("file:/file.txt"); assertThat(resource.isFile()).isTrue(); - assertThat(resource.getFile()).hasParent("/").hasName("file.txt"); + assertThat(resource.getFile()).hasName("file.txt") + .satisfies((file) -> assertThat(file.getParentFile()).isNotEqualTo(workingDirectory)); } @Test