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

Fix ApplicationResourceLoaderTests on Windows

Browse Source
This commit is contained in:
Moritz Halbritter
2025-02-17 17:11:19 +01:00
parent dc4dbd1bf2
commit 09ac085a6a
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/io/ApplicationResourceLoaderTests.java
View File

@@ -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