===================================================================
RCS file: /home/cvspublic/jakarta-ant/src/testcases/org/apache/tools/ant/util/FileUtilsTest.java,v
retrieving revision 1.6
diff -u -r1.6 FileUtilsTest.java
--- FileUtilsTest.java	19 Nov 2001 13:58:52 -0000	1.6
+++ FileUtilsTest.java	26 Feb 2002 21:36:25 -0000
@@ -165,6 +165,27 @@
                      fu.resolveFile(null, driveSpec + "\\\\\\\\\\\\").getPath());
 
         /*
+         * throw in NetWare volume names
+         */
+        driveSpec = "SYS:";
+        assertEquals(driveSpec, 
+                     fu.resolveFile(null, driveSpec + "/").getPath());
+        assertEquals(driveSpec, 
+                     fu.resolveFile(null, driveSpec + "\\").getPath());
+        driveSpecLower = "sys:";
+        assertEquals(driveSpec, 
+                     fu.resolveFile(null, driveSpecLower + "/").getPath());
+        assertEquals(driveSpec, 
+                     fu.resolveFile(null, driveSpecLower + "\\").getPath());
+        /*
+         * promised to eliminate consecutive slashes after drive letter.
+         */
+        assertEquals(driveSpec, 
+                     fu.resolveFile(null, driveSpec + "/////").getPath());
+        assertEquals(driveSpec, 
+                     fu.resolveFile(null, driveSpec + "\\\\\\\\\\\\").getPath());
+
+        /*
          * Now test some relative file name magic.
          */
         assertEquals(localize("/1/2/3/4"),
@@ -206,6 +227,8 @@
          * throw in drive letters
          */
         String driveSpec = "C:";
+        assertEquals(driveSpec, 
+                     fu.normalize(driveSpec).getPath());
         assertEquals(driveSpec + "\\", 
                      fu.normalize(driveSpec + "/").getPath());
         assertEquals(driveSpec + "\\", 
@@ -221,6 +244,33 @@
         assertEquals(driveSpec + "\\", 
                      fu.normalize(driveSpec + "/////").getPath());
         assertEquals(driveSpec + "\\", 
+                     fu.normalize(driveSpec + "\\\\\\\\\\\\").getPath());
+
+        /*
+         * throw in NetWare volume names 
+         */
+        driveSpec = "SYS:";
+        assertEquals(driveSpec, 
+                     fu.normalize(driveSpec).getPath());
+        assertEquals(driveSpec, 
+                     fu.normalize(driveSpec + "/").getPath());
+        assertEquals(driveSpec, 
+                     fu.normalize(driveSpec + "\\").getPath());
+        driveSpecLower = "sys:";
+        assertEquals(driveSpec, 
+                     fu.normalize(driveSpecLower).getPath());
+        assertEquals(driveSpec, 
+                     fu.normalize(driveSpecLower + "/").getPath());
+        assertEquals(driveSpec, 
+                     fu.normalize(driveSpecLower + "\\").getPath());
+        assertEquals(driveSpec + "\\junk", 
+                     fu.normalize(driveSpecLower + "\\junk").getPath());
+        /*
+         * promised to eliminate consecutive slashes after drive letter.
+         */
+        assertEquals(driveSpec, 
+                     fu.normalize(driveSpec + "/////").getPath());
+        assertEquals(driveSpec, 
                      fu.normalize(driveSpec + "\\\\\\\\\\\\").getPath());
 
         /*