ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mben...@apache.org
Subject svn commit: r477941 - in /ant/core/trunk/src/tests/junit/org/apache/tools/ant: types/PathTest.java util/FileUtilsTest.java
Date Tue, 21 Nov 2006 22:40:44 GMT
Author: mbenson
Date: Tue Nov 21 14:40:43 2006
New Revision: 477941

URL: http://svn.apache.org/viewvc?view=rev&rev=477941
Log:
fix failures on cygwin since recent drive letter casing changes

Modified:
    ant/core/trunk/src/tests/junit/org/apache/tools/ant/types/PathTest.java
    ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/FileUtilsTest.java

Modified: ant/core/trunk/src/tests/junit/org/apache/tools/ant/types/PathTest.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/ant/types/PathTest.java?view=diff&rev=477941&r1=477940&r2=477941
==============================================================================
--- ant/core/trunk/src/tests/junit/org/apache/tools/ant/types/PathTest.java (original)
+++ ant/core/trunk/src/tests/junit/org/apache/tools/ant/types/PathTest.java Tue Nov 21 14:40:43
2006
@@ -60,7 +60,7 @@
             assertEquals("\\a", l[0]);
             assertEquals("\\b", l[1]);
         } else {
-            String base = new File(File.separator).getAbsolutePath().toUpperCase();
+            String base = new File(File.separator).getAbsolutePath();
             assertEquals(base + "a", l[0]);
             assertEquals(base + "b", l[1]);
         }
@@ -100,7 +100,7 @@
             assertEquals("\\a", l[0]);
             assertEquals("\\b", l[1]);
         } else {
-            String base = new File(File.separator).getAbsolutePath().toUpperCase();
+            String base = new File(File.separator).getAbsolutePath();
             assertEquals(base + "a", l[0]);
             assertEquals(base + "b", l[1]);
         }
@@ -309,7 +309,7 @@
             assertEquals("\\b", l[1]);
             assertEquals("\\c", l[2]);
         } else {
-            String base = new File(File.separator).getAbsolutePath().toUpperCase();
+            String base = new File(File.separator).getAbsolutePath();
             assertEquals(base + "a", l[0]);
             assertEquals(base + "b", l[1]);
             assertEquals(base + "c", l[2]);
@@ -369,7 +369,7 @@
         Path p = new Path(project, "/a:/a");
         String[] l = p.list();
         assertEquals("1 after construction", 1, l.length);
-        String base = new File(File.separator).getAbsolutePath().toUpperCase();
+        String base = new File(File.separator).getAbsolutePath();
         p.setLocation(new File(base, "a"));
         l = p.list();
         assertEquals("1 after setLocation", 1, l.length);

Modified: ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/FileUtilsTest.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/FileUtilsTest.java?view=diff&rev=477941&r1=477940&r2=477941
==============================================================================
--- ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/FileUtilsTest.java (original)
+++ ant/core/trunk/src/tests/junit/org/apache/tools/ant/util/FileUtilsTest.java Tue Nov 21
14:40:43 2006
@@ -505,11 +505,8 @@
     public void testFromURI() {
         String dosRoot = null;
         if (Os.isFamily("dos") || Os.isFamily("netware")) {
-            dosRoot = Character.toUpperCase(
-                System.getProperty("user.dir").charAt(0)) + ":";
-        }
-        else
-        {
+            dosRoot = System.getProperty("user.dir").substring(0, 2);
+        } else {
             dosRoot = "";
         }
         if (Os.isFamily("netware")) {



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org


Mime
View raw message