You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by ug...@apache.org on 2004/04/19 01:06:11 UTC
cvs commit: cocoon-2.1/src/test/org/apache/cocoon/util/test IOUtilsTestCase.java
ugo 2004/04/18 16:06:11
Modified: src/java/org/apache/cocoon/util IOUtils.java
src/test/org/apache/cocoon/util/test IOUtilsTestCase.java
Log:
Make IOUtilsTestCase succeed.
Revision Changes Path
1.5 +4 -1 cocoon-2.1/src/java/org/apache/cocoon/util/IOUtils.java
Index: IOUtils.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/util/IOUtils.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- IOUtils.java 28 Mar 2004 14:28:04 -0000 1.4
+++ IOUtils.java 18 Apr 2004 23:06:11 -0000 1.5
@@ -195,6 +195,9 @@
* @return The transformed filename
*/
public static String normalizedFilename(String filename) {
+ if ("".equals(filename)) {
+ return "";
+ }
if(File.separatorChar == '\\')
filename = filename.replace('/','\\');
else
1.5 +3 -2 cocoon-2.1/src/test/org/apache/cocoon/util/test/IOUtilsTestCase.java
Index: IOUtilsTestCase.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/test/org/apache/cocoon/util/test/IOUtilsTestCase.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- IOUtilsTestCase.java 5 Mar 2004 13:03:03 -0000 1.4
+++ IOUtilsTestCase.java 18 Apr 2004 23:06:11 -0000 1.5
@@ -62,7 +62,8 @@
Object[] test_values = {
new String[]{".", "__"},
new String[]{"", ""},
- new String[]{"file://", "file_" + File.separator + "_" + File.separator + "_"},
+ new String[]{"file://", "file_"},
+ // was new String[]{"file://", "file_" + File.separator + "_" + File.separator + "_"},
new String[]{"/a/b/c", "a" + File.separator + "b" + File.separator + "c"},
new String[]{"\\a\\b\\c", "a" + File.separator + "b" + File.separator + "c"},
new String[]{"a/b/c", "a" + File.separator + "b" + File.separator + "c"},