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

Merge branch '5.3.x'

Browse Source 
# Conflicts:
#	spring-context/src/test/java/org/springframework/context/support/GenericApplicationContextTests.java
This commit is contained in:
Sam Brannen
2022-07-03 14:51:37 +02:00
parent b2998842af e608b36713
commit 94e3738a94
1 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,8 +16,11 @@
package org.springframework.context.support;
import java.nio.file.InvalidPathException;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.OS;
import org.mockito.ArgumentCaptor;
import org.springframework.beans.factory.NoUniqueBeanDefinitionException;
@@ -250,22 +253,37 @@ class GenericApplicationContextTests {
context.setResourceLoader(resourceLoader);
}
String pingLocation = "ping:foo";
String relativePathLocation = "foo";
String fileLocation = "file:foo";
String pingLocation = "ping:foo";
Resource resource = context.getResource(pingLocation);
Resource resource = context.getResource(relativePathLocation);
assertThat(resource).isInstanceOf(defaultResourceType);
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
assertThatExceptionOfType(InvalidPathException.class)
.isThrownBy(() -> context.getResource(pingLocation))
.withMessageContaining(pingLocation);
}
else {
resource = context.getResource(pingLocation);
assertThat(resource).isInstanceOf(defaultResourceType);
}
context.addProtocolResolver(new PingPongProtocolResolver());
resource = context.getResource(relativePathLocation);
assertThat(resource).isInstanceOf(defaultResourceType);
resource = context.getResource(fileLocation);
assertThat(resource).isInstanceOf(FileUrlResource.class);
resource = context.getResource(pingLocation);
assertThat(resource).asInstanceOf(type(ByteArrayResource.class))
.extracting(bar -> new String(bar.getByteArray(), UTF_8))
.isEqualTo("pong:foo");
resource = context.getResource(fileLocation);
assertThat(resource).isInstanceOf(FileUrlResource.class);
}
@Test