root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Ensure PathMatchingResourcePatternResolverTests run in native image 

See inline comments in commit for details.

See gh-29243
This commit is contained in:
Sam Brannen 2022-10-04 16:13:46 +02:00
parent dd814b6d30
commit 31d98bfd95
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
spring-core/src/test/java/org/springframework/core/io/support/PathMatchingResourcePatternResolverTests.java
View File

@ -26,6 +26,7 @@ import java.util.List;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.springframework.core.io.FileSystemResource;
import org.springframework.core.io.Resource;
import org.springframework.util.StringUtils;
@ -200,15 +201,15 @@ class PathMatchingResourcePatternResolverTests {
}
private String getPath(Resource resource) {
try {
// Tests fail if we use getURL(). They would also fail on Mac OS when using getURI()
// if the resource paths are not Unicode normalized.
// See: https://github.com/spring-projects/spring-framework/issues/29243
return resource.getFile().getPath();
}
catch (IOException ex) {
throw new UncheckedIOException(ex);
}
// Tests fail if we use resouce.getURL().getPath(). They would also fail on Mac OS when
// using resouce.getURI().getPath() if the resource paths are not Unicode normalized.
//
// On the JVM, all tests should pass when using resouce.getFile().getPath(); however,
// we use FileSystemResource#getPath since this test class is sometimes run within a
// GraalVM native image which cannot support Path#toFile.
//
// See: https://github.com/spring-projects/spring-framework/issues/29243
return ((FileSystemResource) resource).getPath();
}
}