You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2015/04/29 15:03:16 UTC
jena git commit: Fix current working directory determination
Repository: jena
Updated Branches:
refs/heads/master b06ed1956 -> 3aed4b35c
Fix current working directory determination
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/3aed4b35
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/3aed4b35
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/3aed4b35
Branch: refs/heads/master
Commit: 3aed4b35c280ad302af086cc04da6a00c2dc3d99
Parents: b06ed19
Author: Andy Seaborne <an...@apache.org>
Authored: Wed Apr 29 14:03:07 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Wed Apr 29 14:03:07 2015 +0100
----------------------------------------------------------------------
.../jena/atlas/lib/TestFilenameProcessing.java | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/3aed4b35/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 bf5d910..43f9c2f 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
@@ -19,9 +19,9 @@
package org.apache.jena.atlas.lib;
import java.io.File ;
+import java.nio.file.Paths ;
import org.apache.jena.atlas.junit.BaseTest ;
-import org.apache.jena.base.Sys ;
import org.junit.Test ;
public class TestFilenameProcessing extends BaseTest
@@ -33,15 +33,21 @@ public class TestFilenameProcessing extends BaseTest
// ---- Main tests.
// Portablility
+
- private static String cwd = new File(".").getAbsolutePath() ;
+ private static String cwd = Paths.get(".").toAbsolutePath().normalize().toString() ;
+ // Sort out cwd.
+ // Must start "/", must not end "/"
+ // Must be /-style, not \
static {
- if ( Sys.isWindows )
+ if ( File.separatorChar != '/' ) {
// Canonical
- cwd = cwd.replace('\\', '/') ;
+ cwd = cwd.replace(File.separatorChar, '/') ;
+ }
+ // Drive letters.
+ if ( ! cwd.startsWith("/" ) )
+ cwd = "/" + cwd ;
}
- // Without trailing slash.
- static { cwd = cwd.substring(0, cwd.length()-2) ; }
@Test public void fileIRI_1()
{