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

Revert "Fix ApplicationResourceLoaderTests on Windows"

Browse Source 
This reverts commit 09ac085a6a.
This commit is contained in:
Moritz Halbritter
2025-02-17 18:08:06 +01:00
parent af51660f40
commit 5883fc210f
1 changed files with 7 additions and 9 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,13 +73,12 @@ 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), workingDirectory)
.getResource("/file.txt");
.get(classLoader, SpringFactoriesLoader.forDefaultResourceLocation(classLoader),
Path.of("/working-directory"))
.getResource("/root/file.txt");
assertThat(resource.isFile()).isTrue();
assertThat(resource.getFile()).hasName("file.txt")
.satisfies((file) -> assertThat(file.getParentFile()).isNotEqualTo(workingDirectory));
assertThat(resource.getFile()).hasParent("/root").hasName("file.txt");
}
@Test
@@ -171,13 +170,12 @@ 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), workingDirectory)
.get(classLoader, SpringFactoriesLoader.forDefaultResourceLocation(classLoader),
Path.of("/working-directory"))
.getResource("file:/file.txt");
assertThat(resource.isFile()).isTrue();
assertThat(resource.getFile()).hasName("file.txt")
.satisfies((file) -> assertThat(file.getParentFile()).isNotEqualTo(workingDirectory));
assertThat(resource.getFile()).hasParent("/").hasName("file.txt");
}
@Test