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

Fix PathResourceTests on Windows 

Fix PathResourceTests so that paths are accessed in a platform
independent manor.

Issue: SPR-10770
This commit is contained in:
Nick Williams 2013-07-23 08:56:06 -05:00 committed by Phillip Webb
parent 9eb596a7e5
commit e59c821603
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
spring-core/src/test/java/org/springframework/core/io/PathResourceTests.java
View File

@ -22,6 +22,7 @@ import java.net.URI;
import java.nio.file.Path; import java.nio.file.Path;
import java.nio.file.Paths; import java.nio.file.Paths;
import org.hamcrest.Matchers;
import org.junit.Rule; import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
import org.junit.rules.ExpectedException; import org.junit.rules.ExpectedException;
@ -37,14 +38,23 @@ import static org.mockito.BDDMockito.*;
* *
* @author Philippe Marschall * @author Philippe Marschall
* @author Phillip Webb * @author Phillip Webb
* @author Nicholas Williams
*/ */
public class PathResourceTests { public class PathResourceTests {
private static final String TEST_DIR = "src/test/java/org/springframework/core/io"; private static final String TEST_DIR = platformPath("src/test/java/org/"
+ "springframework/core/io");
private static final String TEST_FILE = "src/test/java/org/springframework/core/io/example.properties"; private static final String TEST_FILE = platformPath("src/test/java/org/"
+ "springframework/core/io/example.properties");
private static final String NON_EXISTING_FILE = "src/test/java/org/springframework/core/io/doesnotexist.properties"; private static final String NON_EXISTING_FILE = platformPath("src/test/java/org/"
+ "springframework/core/io/doesnotexist.properties");
private static String platformPath(String string) {
return string.replace('/', File.separatorChar);
}
@Rule @Rule
@ -167,13 +177,13 @@ public class PathResourceTests {
@Test @Test
public void getUrl() throws Exception { public void getUrl() throws Exception {
PathResource resource = new PathResource(TEST_FILE); PathResource resource = new PathResource(TEST_FILE);
assertTrue(resource.getURL().toString().endsWith(TEST_FILE)); assertThat(resource.getURL().toString(), Matchers.endsWith("core/io/example.properties"));
} }
@Test @Test
public void getUri() throws Exception { public void getUri() throws Exception {
PathResource resource = new PathResource(TEST_FILE); PathResource resource = new PathResource(TEST_FILE);
assertTrue(resource.getURI().toString().endsWith(TEST_FILE)); assertThat(resource.getURI().toString(), Matchers.endsWith("core/io/example.properties"));
} }
@Test @Test