The tests were using explicit Unix-style path separators, whereas the utils

themselves were using File.separator, so the tests failed on Windows. Now
the tests also use File.separator, and work on Windows. The one tricky part
is that paths for regex searches need to be escaped if the separator is a
backslash.


git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/io/trunk@140609 13f79535-47bb-0310-9956-ffa450edef68

Author: mfncooper

src/test/org/apache/commons/io/FilenameUtilsTestCase.java

@@ -29,7 +29,7 @@
  *
  * @author Peter Donald
  * @author Matthew Hawthorne
- * @version $Id: FilenameUtilsTestCase.java,v 1.8 2004/06/13 05:13:57 bayard Exp $
+ * @version $Id: FilenameUtilsTestCase.java,v 1.9 2004/10/24 00:10:05 martinc Exp $
  * @see FilenameUtils
  */
 public class FilenameUtilsTestCase extends FileBasedTestCase {
@@ -208,9 +208,9 @@ public void testGetExtension() {
                 { "README", "" }, 
                 { "domain.dot.com", "com" }, 
                 { "image.jpeg", "jpeg" },
-                { "a.b/c", "" },
-                { "a.b/c.txt", "txt" },
-                { "a/b/c", "" },
+                { "a.b" + File.separator + "c", "" },
+                { "a.b" + File.separator + "c.txt", "txt" },
+                { "a" + File.separator + "b" + File.separator + "c", "" },
         };
         for (int i = 0; i < tests.length; i++) {
             assertEquals(tests[i][1], FilenameUtils.getExtension(tests[i][0]));
@@ -244,9 +244,9 @@ public void testRemoveExtension() {
                 { "README", "README" }, 
                 { "domain.dot.com", "domain.dot" }, 
                 { "image.jpeg", "image" },
-                { "a.b/c", "a.b/c" },
-                { "a.b/c.txt", "a.b/c" },
-                { "a/b/c", "a/b/c" },
+                { "a.b" + File.separator + "c", "a.b" + File.separator + "c" },
+                { "a.b" + File.separator + "c.txt", "a.b" + File.separator + "c" },
+                { "a" + File.separator + "b" + File.separator + "c", "a" + File.separator + "b" + File.separator + "c" },
         };
 
         for (int i = 0; i < tests.length; i++) {

src/test/org/apache/commons/io/find/FileFinderTest.java

@@ -29,7 +29,7 @@ public class FileFinderTest extends TestCase {
 
     private HashMap options;
     private FileFinder finder;
-    private String dirStr = "src/test/find-data/";
+    private String dirStr = "src" + File.separator + "test" + File.separator + "find-data" + File.separator;
     private File dir = new File(dirStr);
 
     public FileFinderTest(String name) {
@@ -61,13 +61,13 @@ public void testFindIName() {
     }
 
     public void testFindPath() {
-        options.put(Finder.PATH, dirStr+"path/dir/file");
+        options.put(Finder.PATH, dirStr+"path" + File.separator + "dir" + File.separator + "file");
         File[] files = finder.find(new File(dir, "path"), options);
         assertEquals(1, files.length);
     }
 
     public void testFindIPath() {
-        options.put(Finder.IPATH, dirStr+"PAth/dIR/fILe");
+        options.put(Finder.IPATH, dirStr+"PAth" + File.separator + "dIR" + File.separator + "fILe");
         File[] files = finder.find(new File(dir, "path"), options);
         assertEquals(1, files.length);
     }
@@ -79,13 +79,13 @@ public void testFindNotPath() {
     }
 
     public void testFindRegex() {
-        options.put(Finder.REGEX, dirStr+"regex/f.*");
+        options.put(Finder.REGEX, escapePath(dirStr+"regex" + File.separator + "f.*"));
         File[] files = finder.find(new File(dir, "regex"), options);
         assertEquals(3, files.length);
     }
 
     public void testFindIRegex() {
-        options.put(Finder.IREGEX, dirStr+"REgeX/F.*");
+        options.put(Finder.IREGEX, escapePath(dirStr+"REgeX" + File.separator + "F.*"));
         File[] files = finder.find(new File(dir, "regex"), options);
         assertEquals(3, files.length);
     }
@@ -140,6 +140,20 @@ public void testCanWriteFalse() {
         assertEquals(0, files.length);
     }
 
+    private static String escapePath(String text) {
+        String repl = "\\";
+        String with = "\\\\";
+
+        StringBuffer buf = new StringBuffer(text.length());
+        int start = 0, end = 0;
+        while ((end = text.indexOf(repl, start)) != -1) {
+            buf.append(text.substring(start, end)).append(with);
+            start = end + repl.length();
+        }
+        buf.append(text.substring(start));
+        return buf.toString();
+    }
+
 }
 
 class DebugListener implements FindListener {