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

Merge branch '5.3.x'

Browse Source
This commit is contained in:
Sam Brannen
2022-07-03 18:05:36 +02:00
parent 94e3738a94 d1d6eb095e
commit ce5076ffe8
7 changed files with 8 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-context/src/test/java/org/springframework/context/support/GenericApplicationContextTests.java
View File

@@ -262,9 +262,13 @@ class GenericApplicationContextTests {
resource = context.getResource(fileLocation);
assertThat(resource).isInstanceOf(FileUrlResource.class);
if (OS.WINDOWS.isCurrentOs()) {
// On Windows we expect an error similar to the following.
// java.nio.file.InvalidPathException: Illegal char <:> at index 4: ping:foo
// If we are using a FileSystemResourceLoader on Windows, we expect an error
// similar to the following since "ping:foo" is not a valid file name in the
// Windows file system and since the PingPongProtocolResolver has not yet been
// registered.
//
// java.nio.file.InvalidPathException: Illegal char <:> at index 4: ping:foo
if (resourceLoader instanceof FileSystemResourceLoader && OS.WINDOWS.isCurrentOs()) {
assertThatExceptionOfType(InvalidPathException.class)
.isThrownBy(() -> context.getResource(pingLocation))
.withMessageContaining(pingLocation);