bodewig     02/02/27 02:54:18

  Modified:    src/etc/testcases/taskdefs bzip2.xml
               src/main/org/apache/tools/ant/taskdefs Pack.java
               src/testcases/org/apache/tools/ant/taskdefs BZip2Test.java
                        GzipTest.java
  Log:
  assert that gzip's new uptodate check also affects bzip2.
  
  2002
  
  Revision  Changes    Path
  1.3       +6 -0      jakarta-ant/src/etc/testcases/taskdefs/bzip2.xml
  
  Index: bzip2.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/etc/testcases/taskdefs/bzip2.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- bzip2.xml 29 Nov 2001 16:51:23 -0000      1.2
  +++ bzip2.xml 27 Feb 2002 10:54:18 -0000      1.3
  @@ -6,8 +6,14 @@
       <bzip2 src="expected/asf-logo-huge.tar" zipfile="asf-logo-huge.tar.bz2" 
/>
     </target>
   
  +  <target name="testDateCheck">
  +    <touch file="asf-logo.gif.bz2"/>
  +    <bzip2 src="../asf-logo.gif" zipfile="asf-logo.gif.bz2" />
  +  </target>
  +
     <target name="cleanup">
       <delete file="asf-logo-huge.tar.bz2" />
  +    <delete file="asf-logo.gif.bz2" />
     </target>
   
   </project>
  
  
  
  1.4       +1 -1      
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Pack.java
  
  Index: Pack.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Pack.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Pack.java 27 Feb 2002 09:00:18 -0000      1.3
  +++ Pack.java 27 Feb 2002 10:54:18 -0000      1.4
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2001 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001-2002 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  
  1.3       +11 -2     
jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/BZip2Test.java
  
  Index: BZip2Test.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/BZip2Test.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- BZip2Test.java    29 Nov 2001 16:51:24 -0000      1.2
  +++ BZip2Test.java    27 Feb 2002 10:54:18 -0000      1.3
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2001 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001-2002 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -61,7 +61,7 @@
   
   /**
    * @author <a href="mailto:[EMAIL PROTECTED]">Stefan Bodewig</a>
  - * @version $Revision: 1.2 $
  + * @version $Revision: 1.3 $
    */
   public class BZip2Test extends BuildFileTest {
   
  @@ -83,4 +83,13 @@
           
assertTrue(fileUtils.contentEquals(project.resolveFile("expected/asf-logo-huge.tar.bz2"),
                                              
project.resolveFile("asf-logo-huge.tar.bz2")));
       }
  +
  +    public void testDateCheck(){
  +        executeTarget("testDateCheck");
  +        String log = getLog();
  +        assertTrue(
  +            "Expecting message ending with 'asf-logo.gif.bz2 is up to date.' 
but got '" + log + "'",
  +            log.endsWith("asf-logo.gif.bz2 is up to date."));
  +    }
  +
   }
  
  
  
  1.8       +1 -1      
jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/GzipTest.java
  
  Index: GzipTest.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/GzipTest.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- GzipTest.java     27 Feb 2002 09:00:18 -0000      1.7
  +++ GzipTest.java     27 Feb 2002 10:54:18 -0000      1.8
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2002 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to