You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2009/09/23 09:52:37 UTC
svn commit: r817994 - in /camel/trunk/camel-core/src:
main/java/org/apache/camel/util/FileUtil.java
test/java/org/apache/camel/util/FileUtilTest.java
Author: davsclaus
Date: Wed Sep 23 07:52:36 2009
New Revision: 817994
URL: http://svn.apache.org/viewvc?rev=817994&view=rev
Log:
Fixed test on Windows.
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/util/FileUtil.java
camel/trunk/camel-core/src/test/java/org/apache/camel/util/FileUtilTest.java
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/util/FileUtil.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/FileUtil.java?rev=817994&r1=817993&r2=817994&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/util/FileUtil.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/util/FileUtil.java Wed Sep 23 07:52:36 2009
@@ -157,6 +157,11 @@
return path;
}
+ // only normalize if contains a path separator
+ if (path.indexOf(File.separator) == -1) {
+ return path;
+ }
+
Stack<String> stack = new Stack<String>();
String[] parts = path.split(File.separator);
for (String part : parts) {
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/util/FileUtilTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/util/FileUtilTest.java?rev=817994&r1=817993&r2=817994&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/util/FileUtilTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/util/FileUtilTest.java Wed Sep 23 07:52:36 2009
@@ -76,13 +76,23 @@
public void testCompactPath() {
assertEquals(null, FileUtil.compactPath(null));
- assertEquals("foo", FileUtil.compactPath("foo"));
- assertEquals("bar", FileUtil.compactPath("foo/../bar"));
- assertEquals("bar/baz", FileUtil.compactPath("foo/../bar/baz"));
- assertEquals("foo/baz", FileUtil.compactPath("foo/bar/../baz"));
- assertEquals("baz", FileUtil.compactPath("foo/bar/../../baz"));
- assertEquals("../baz", FileUtil.compactPath("foo/bar/../../../baz"));
- assertEquals("../foo/bar", FileUtil.compactPath("../foo/bar"));
+ if (FileUtil.isWindows()) {
+ assertEquals("foo", FileUtil.compactPath("foo"));
+ assertEquals("bar", FileUtil.compactPath("foo\\..\\bar"));
+ assertEquals("bar\\baz", FileUtil.compactPath("foo\\..\\bar\\baz"));
+ assertEquals("foo\\baz", FileUtil.compactPath("foo\\bar\\..\\baz"));
+ assertEquals("baz", FileUtil.compactPath("foo\\bar\\..\\..\\baz"));
+ assertEquals("..\\baz", FileUtil.compactPath("foo\\bar\\..\\..\\..\\baz"));
+ assertEquals("..\\foo\\bar", FileUtil.compactPath("..\\foo\\bar"));
+ } else {
+ assertEquals("foo", FileUtil.compactPath("foo"));
+ assertEquals("bar", FileUtil.compactPath("foo/../bar"));
+ assertEquals("bar/baz", FileUtil.compactPath("foo/../bar/baz"));
+ assertEquals("foo/baz", FileUtil.compactPath("foo/bar/../baz"));
+ assertEquals("baz", FileUtil.compactPath("foo/bar/../../baz"));
+ assertEquals("../baz", FileUtil.compactPath("foo/bar/../../../baz"));
+ assertEquals("../foo/bar", FileUtil.compactPath("../foo/bar"));
+ }
}
public void testDefaultTempFileSuffixAndPrefix() throws Exception {