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

Improve GenericApplicationContextTests.getResource*() tests 

This commit updates the tests so that they test something meaningful on
MS Windows as well as on Linux/Mac.

See gh-28703, gh-28746
This commit is contained in:
Sam Brannen 2022-07-03 14:34:53 +02:00
parent 59180e76a7
commit e608b36713
1 changed files with 20 additions and 6 deletions
Show Stats 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; package org.springframework.context.support;
import java.nio.file.InvalidPathException;
import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.OS;
import org.springframework.beans.factory.NoUniqueBeanDefinitionException; import org.springframework.beans.factory.NoUniqueBeanDefinitionException;
import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.config.BeanDefinition;
@ -238,25 +241,36 @@ class GenericApplicationContextTests {
} }
String relativePathLocation = "foo"; String relativePathLocation = "foo";
String pingLocation = "ping:foo";
String fileLocation = "file:foo"; String fileLocation = "file:foo";
String pingLocation = "ping:foo";
Resource resource = context.getResource(relativePathLocation); Resource resource = context.getResource(relativePathLocation);
assertThat(resource).isInstanceOf(defaultResourceType); assertThat(resource).isInstanceOf(defaultResourceType);
resource = context.getResource(fileLocation); resource = context.getResource(fileLocation);
assertThat(resource).isInstanceOf(FileUrlResource.class); assertThat(resource).isInstanceOf(FileUrlResource.class);
context.addProtocolResolver(new PingPongProtocolResolver()); 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);
}
resource = context.getResource(pingLocation); context.addProtocolResolver(new PingPongProtocolResolver());
assertThat(resource).asInstanceOf(type(ByteArrayResource.class))
.extracting(bar -> new String(bar.getByteArray(), UTF_8))
.isEqualTo("pong:foo");
resource = context.getResource(relativePathLocation); resource = context.getResource(relativePathLocation);
assertThat(resource).isInstanceOf(defaultResourceType); assertThat(resource).isInstanceOf(defaultResourceType);
resource = context.getResource(fileLocation); resource = context.getResource(fileLocation);
assertThat(resource).isInstanceOf(FileUrlResource.class); 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");
} }