From 88c40c7306a8920dc569e3e3111ad42737cb0ecd Mon Sep 17 00:00:00 2001
From: Antoine Levy-Lambert <antoine@apache.org>
Date: Fri, 11 Jul 2003 14:53:05 +0000
Subject: [PATCH] Allow FileUtilsTest to run on DOS/Windows when current drive
 letter is not C: PR: 21383 Submitted by: Brad Clarke ( bclarke at booksys dot
 com)

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274809 13f79535-47bb-0310-9956-ffa450edef68
---
 .../org/apache/tools/ant/util/FileUtilsTest.java       | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/testcases/org/apache/tools/ant/util/FileUtilsTest.java b/src/testcases/org/apache/tools/ant/util/FileUtilsTest.java
index 076044b56..6b0b6cf7e 100644
--- a/src/testcases/org/apache/tools/ant/util/FileUtilsTest.java
+++ b/src/testcases/org/apache/tools/ant/util/FileUtilsTest.java
@@ -429,20 +429,14 @@ public class FileUtilsTest extends TestCase {
     public void testToURI() {
         String dosRoot = null;
         if (Os.isFamily("dos")) {
-            dosRoot = "C:/";
+            dosRoot = System.getProperty("user.dir").charAt(0) + ":/";
         }
         else
         {
             dosRoot = "";
         }
         if (Os.isFamily("dos")) {
-            assertEquals("file:///"+ dosRoot + "foo", fu.toURI("c:\\foo"));
-        }
-        if (Os.isFamily("dos")) {
-            // this amounts to : are we under cygwin ?
-            if (Character.isLowerCase(System.getProperty("user.dir").charAt(0))) {
-                dosRoot = "c:/";
-            }
+            assertEquals("file:///C:/foo", fu.toURI("c:\\foo"));
         }
         assertEquals("file:///" + dosRoot + "foo", fu.toURI("/foo"));
         assertEquals("file:./foo",  fu.toURI("./foo"));