cvs commit: jakarta-ant/src/testcases/org/apache/tools/ant IntrospectionHelperTest.java

[bodewig]

bodewig     01/10/18 01:25:16

  Modified:    .        WHATSNEW
               src/main/org/apache/tools/ant/util FileUtils.java
               src/testcases/org/apache/tools/ant
                        IntrospectionHelperTest.java
  Log:
  remove redundant code from FileUtils, handle Netware case in
  IntrospectionHelper's testcase.
  
  Submitted by: Jeff Tulley <[EMAIL PROTECTED]>
  
  Revision  Changes    Path
  1.155     +3 -0      jakarta-ant/WHATSNEW
  
  Index: WHATSNEW
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/WHATSNEW,v
  retrieving revision 1.154
  retrieving revision 1.155
  diff -u -r1.154 -r1.155
  --- WHATSNEW  2001/09/30 13:21:53     1.154
  +++ WHATSNEW  2001/10/18 08:25:16     1.155
  @@ -14,6 +14,9 @@
   * The attribute zipfile in GZip has been deprecated and superseded 
     by "tofile" attribute.
   
  +* Added a new condition <isset> that test for the existence of a
  +  property to the condition task.
  +
   Fixed bugs:
   -----------
   
  
  
  
  1.6       +0 -6      
jakarta-ant/src/main/org/apache/tools/ant/util/FileUtils.java
  
  Index: FileUtils.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/util/FileUtils.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- FileUtils.java    2001/10/01 13:32:36     1.5
  +++ FileUtils.java    2001/10/18 08:25:16     1.6
  @@ -323,12 +323,6 @@
               return normalize(filename);
           }
   
  -        if (filename.length() >= 2 &&
  -            Character.isLetter(filename.charAt(0)) &&
  -            filename.charAt(1) == ':') {
  -            return normalize(filename);
  -        }
  -
           if (file == null) {
               return new File(filename);
           }
  
  
  
  1.8       +3 -1      
jakarta-ant/src/testcases/org/apache/tools/ant/IntrospectionHelperTest.java
  
  Index: IntrospectionHelperTest.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-ant/src/testcases/org/apache/tools/ant/IntrospectionHelperTest.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- IntrospectionHelperTest.java      2001/07/05 12:03:47     1.7
  +++ IntrospectionHelperTest.java      2001/10/18 08:25:16     1.8
  @@ -162,7 +162,7 @@
           }
           try {
               ih.getElementType("eleven");
  -            fail("addTen takes primitive argument");
  +            fail("addEleven takes primitive argument");
           } catch (BuildException be) {
           }
           try {
  @@ -424,6 +424,8 @@
       public void setTen(File f) {
           if (isUnixStyle) { 
               assertEquals("/tmp/2", f.getAbsolutePath());
  +        } else if 
(System.getProperty("os.name").toLowerCase().equals("netware")) {
  +            assertEquals("\\tmp\\2", f.getAbsolutePath().toLowerCase());
           } else {
               assertEquals(":\\tmp\\2", 
f.getAbsolutePath().toLowerCase().substring(1));
           }