Repository: jena Updated Branches: refs/heads/master cdb2c9c63 -> b06ed1956
On Windows, canonical cwd for URLs should use /. Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/fc079025 Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/fc079025 Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/fc079025 Branch: refs/heads/master Commit: fc079025dde72b3ef8432d0192f7d58c79879a93 Parents: cdb2c9c Author: Andy Seaborne <[email protected]> Authored: Wed Apr 29 12:02:05 2015 +0100 Committer: Andy Seaborne <[email protected]> Committed: Wed Apr 29 12:02:05 2015 +0100 ---------------------------------------------------------------------- .../jena/atlas/lib/TestFilenameProcessing.java | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/fc079025/jena-base/src/test/java/org/apache/jena/atlas/lib/TestFilenameProcessing.java ---------------------------------------------------------------------- diff --git a/jena-base/src/test/java/org/apache/jena/atlas/lib/TestFilenameProcessing.java b/jena-base/src/test/java/org/apache/jena/atlas/lib/TestFilenameProcessing.java index 7782c55..bf5d910 100644 --- a/jena-base/src/test/java/org/apache/jena/atlas/lib/TestFilenameProcessing.java +++ b/jena-base/src/test/java/org/apache/jena/atlas/lib/TestFilenameProcessing.java @@ -21,6 +21,7 @@ package org.apache.jena.atlas.lib; import java.io.File ; import org.apache.jena.atlas.junit.BaseTest ; +import org.apache.jena.base.Sys ; import org.junit.Test ; public class TestFilenameProcessing extends BaseTest @@ -34,6 +35,11 @@ public class TestFilenameProcessing extends BaseTest // Portablility private static String cwd = new File(".").getAbsolutePath() ; + static { + if ( Sys.isWindows ) + // Canonical + cwd = cwd.replace('\\', '/') ; + } // Without trailing slash. static { cwd = cwd.substring(0, cwd.length()-2) ; } @@ -72,9 +78,17 @@ public class TestFilenameProcessing extends BaseTest } - @Test public void fileURL_1() { assertNotEquals(cwd, "") ; assertNotNull(cwd) ; filenameToIRI("abc", "file://"+cwd+"/abc" ) ; } - - @Test public void fileURL_2() { filenameToIRI("/abc", "file:///abc" ) ; } + @Test + public void fileURL_1() { + assertNotEquals(cwd, "") ; + assertNotNull(cwd) ; + filenameToIRI("abc", "file://" + cwd + "/abc") ; + } + + @Test + public void fileURL_2() { + filenameToIRI("/abc", "file:///abc") ; + } static boolean isWindows = File.pathSeparator.equals(";") ;
