Index: FileUtilsTest.java
===================================================================
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	1 Mar 2002 22:15:01 -0000
@@ -59,6 +59,7 @@
 import junit.framework.TestCase;
 
 import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.taskdefs.condition.Os;
 
 /**
  * Tests for org.apache.tools.ant.util.FileUtils.
@@ -164,6 +165,29 @@
         assertEquals(driveSpec + "\\", 
                      fu.resolveFile(null, driveSpec + "\\\\\\\\\\\\").getPath());
 
+        if (Os.isFamily("netware")) {
+            /*
+             * 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.
          */
@@ -206,6 +230,8 @@
          * throw in drive letters
          */
         String driveSpec = "C:";
+        assertEquals(driveSpec, 
+                     fu.normalize(driveSpec).getPath());
         assertEquals(driveSpec + "\\", 
                      fu.normalize(driveSpec + "/").getPath());
         assertEquals(driveSpec + "\\", 
@@ -222,6 +248,35 @@
                      fu.normalize(driveSpec + "/////").getPath());
         assertEquals(driveSpec + "\\", 
                      fu.normalize(driveSpec + "\\\\\\\\\\\\").getPath());
+
+        if (Os.isFamily("netware")) {
+            /*
+             * 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());
+        }
 
         /*
          * Now test some relative file name magic.