ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject cvs commit: jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs BUnzip2Test.java BZip2Test.java GUnzipTest.java GzipTest.java
Date Mon, 19 Nov 2001 15:53:14 GMT
bodewig     01/11/19 07:53:14

  Modified:    .        build.xml
               src/etc/testcases/taskdefs gunzip.xml gzip.xml
               src/testcases/org/apache/tools/ant/taskdefs GUnzipTest.java
                        GzipTest.java
  Added:       src/etc/testcases/taskdefs bunzip2.xml bzip2.xml
               src/etc/testcases/taskdefs/expected asf-logo.gif.bz2
                        asf-logo.gif.gz
               src/testcases/org/apache/tools/ant/taskdefs BUnzip2Test.java
                        BZip2Test.java
  Log:
  add real tests fro the gzip and bzip2 tasks.
  
  Revision  Changes    Path
  1.207     +0 -6      jakarta-ant/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/build.xml,v
  retrieving revision 1.206
  retrieving revision 1.207
  diff -u -r1.206 -r1.207
  --- build.xml	2001/11/19 15:18:46	1.206
  +++ build.xml	2001/11/19 15:53:14	1.207
  @@ -826,10 +826,6 @@
             <!-- these tests need to be localised before being ran???? -->
             <exclude name="org/apache/tools/ant/taskdefs/optional/PvcsTest.java" />
   
  -          <!-- these depend on order -->
  -          <exclude name="org/apache/tools/ant/taskdefs/GUnzipTest.java" />
  -          <exclude name="org/apache/tools/ant/taskdefs/GzipTest.java" />
  -
             <!-- only run these tests if their required libraries are installed -->
             <exclude name="org/apache/tools/ant/taskdefs/optional/ANTLRTest.java" 
                      unless="antlr.present" />
  @@ -875,8 +871,6 @@
           </fileset>
         </batchtest>
   
  -      <test name="org.apache.tools.ant.taskdefs.GzipTest" />
  -      <test name="org.apache.tools.ant.taskdefs.GUnzipTest" />
       </junit>
   
       <!-- clean up again -->
  
  
  
  1.3       +12 -3     jakarta-ant/src/etc/testcases/taskdefs/gunzip.xml
  
  Index: gunzip.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/etc/testcases/taskdefs/gunzip.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- gunzip.xml	2000/12/18 15:43:55	1.2
  +++ gunzip.xml	2001/11/19 15:53:14	1.3
  @@ -10,9 +10,18 @@
       <gunzip src=""/>
     </target>
   
  -  <target name="test3">
  -    <gunzip src="gzip.tmp"
  -            dest="gzip.tmp2"/>
  +  <target name="cleanup">
  +    <delete file="asf-logo.gif" />
  +  </target>
  +
  +  <target name="testGzipTask">
  +    <ant antfile="gzip.xml" target="realTest" />
  +    <gunzip src="asf-logo.gif.gz" dest="asf-logo.gif" />
  +    <ant antfile="gzip.xml" target="cleanup" />
  +  </target>
  +
  +  <target name="realTest">
  +    <gunzip src="expected/asf-logo.gif.gz" dest="asf-logo.gif" />
     </target>
   
   </project>
  
  
  
  1.5       +6 -2      jakarta-ant/src/etc/testcases/taskdefs/gzip.xml
  
  Index: gzip.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/etc/testcases/taskdefs/gzip.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- gzip.xml	2001/11/19 07:59:46	1.4
  +++ gzip.xml	2001/11/19 15:53:14	1.5
  @@ -18,8 +18,12 @@
       <gzip src="gzip.xml" zipfile=""/>
     </target>
   
  -  <target name="test5">
  -    <gzip src="gzip.xml" zipfile="gzip.tmp"/>
  +  <target name="realTest">
  +    <gzip src="../asf-logo.gif" zipfile="asf-logo.gif.gz" />
  +  </target>
  +
  +  <target name="cleanup">
  +    <delete file="asf-logo.gif.gz" />
     </target>
   
   </project>
  
  
  
  1.1                  jakarta-ant/src/etc/testcases/taskdefs/bunzip2.xml
  
  Index: bunzip2.xml
  ===================================================================
  <?xml version="1.0"?>
  
  <project basedir="." default="cleanup">
  
    <target name="realTest">
      <bunzip2 src="expected/asf-logo.gif.bz2" dest="asf-logo.gif" />
    </target>
  
    <target name="cleanup">
      <delete file="asf-logo.gif" />
    </target>
  
  </project>
  
  
  1.1                  jakarta-ant/src/etc/testcases/taskdefs/bzip2.xml
  
  Index: bzip2.xml
  ===================================================================
  <?xml version="1.0"?>
  
  <project basedir="." default="cleanup">
  
    <target name="realTest">
      <bzip2 src="../asf-logo.gif" zipfile="asf-logo.gif.bz2" />
    </target>
  
    <target name="cleanup">
      <delete file="asf-logo.gif.bz2" />
    </target>
  
  </project>
  
  
  1.1                  jakarta-ant/src/etc/testcases/taskdefs/expected/asf-logo.gif.bz2
  
  	<<Binary file>>
  
  
  1.1                  jakarta-ant/src/etc/testcases/taskdefs/expected/asf-logo.gif.gz
  
  	<<Binary file>>
  
  
  1.5       +19 -10    jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/GUnzipTest.java
  
  Index: GUnzipTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/GUnzipTest.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- GUnzipTest.java	2001/11/14 12:25:30	1.4
  +++ GUnzipTest.java	2001/11/19 15:53:14	1.5
  @@ -55,9 +55,12 @@
    
   import java.io.File;
   import org.apache.tools.ant.BuildFileTest;
  +import org.apache.tools.ant.util.FileUtils;
   
   /**
    * @author Nico Seessle <nico@seessle.de> 
  + * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
  + * @version $Revision: 1.5 $
    */
   public class GUnzipTest extends BuildFileTest { 
       
  @@ -69,6 +72,10 @@
           configureProject("src/etc/testcases/taskdefs/gunzip.xml");
       }
   
  +    public void tearDown() {
  +        executeTarget("cleanup");
  +    }
  +
       public void test1() { 
           expectBuildException("test1", "required argument missing");
       }
  @@ -77,16 +84,18 @@
           expectBuildException("test2", "attribute src invalid");
       }
   
  -    public void test3() { 
  -        executeTarget("test3");
  -        java.io.File f = new File(getProjectDir(), "gzip.tmp2");
  -        if (!f.exists()) { 
  -            fail("gzip failed");
  -        } else {
  -            f.delete();
  -            f = new File(getProjectDir(), "gzip.tmp");
  -            if (f.exists()) f.delete();
  -        }
  +    public void testRealTest() throws java.io.IOException {
  +        FileUtils fileUtils = FileUtils.newFileUtils();
  +        executeTarget("realTest");
  +        assertTrue(fileUtils.contentEquals(project.resolveFile("../asf-logo.gif"),
  +                                           project.resolveFile("asf-logo.gif")));
  +    }
  +    
  +    public void testTestGzipTask() throws java.io.IOException {
  +        FileUtils fileUtils = FileUtils.newFileUtils();
  +        executeTarget("testGzipTask");
  +        assertTrue(fileUtils.contentEquals(project.resolveFile("../asf-logo.gif"),
  +                                           project.resolveFile("asf-logo.gif")));
       }
       
   }
  
  
  
  1.5       +0 -9      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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- GzipTest.java	2001/11/14 12:25:30	1.4
  +++ GzipTest.java	2001/11/19 15:53:14	1.5
  @@ -86,13 +86,4 @@
           expectBuildException("test4", "attribute zipfile invalid");
       }
   
  -    public void test5() { 
  -        executeTarget("test5");
  -        java.io.File f = new java.io.File(getProjectDir(), "gzip.tmp");
  -        if (!f.exists()) { 
  -            fail("gzip failed");
  -        }
  -        // Keep for unzip
  -    }
  -    
   }
  
  
  
  1.1                  jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/BUnzip2Test.java
  
  Index: BUnzip2Test.java
  ===================================================================
  /*
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2001 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *    notice, this list of conditions and the following disclaimer.
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in
   *    the documentation and/or other materials provided with the
   *    distribution.
   *
   * 3. The end-user documentation included with the redistribution, if
   *    any, must include the following acknowlegement:
   *       "This product includes software developed by the
   *        Apache Software Foundation (http://www.apache.org/)."
   *    Alternately, this acknowlegement may appear in the software itself,
   *    if and wherever such third-party acknowlegements normally appear.
   *
   * 4. The names "The Jakarta Project", "Ant", and "Apache Software
   *    Foundation" must not be used to endorse or promote products derived
   *    from this software without prior written permission. For written
   *    permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache"
   *    nor may "Apache" appear in their names without prior written
   *    permission of the Apache Group.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
   * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
   * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
   * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
   * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
   * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
   * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   * ====================================================================
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Software Foundation.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   */
  
  package org.apache.tools.ant.taskdefs;
  
  import org.apache.tools.ant.BuildFileTest;
  import org.apache.tools.ant.util.FileUtils;
  
  import java.io.IOException;
  
  /**
   * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
   * @version $Revision: 1.1 $
   */
  public class BUnzip2Test extends BuildFileTest {
  
      public BUnzip2Test(String name) {
          super(name);
      }
  
      public void setUp() { 
          configureProject("src/etc/testcases/taskdefs/bunzip2.xml");
      }
  
      public void tearDown() {
          executeTarget("cleanup");
      }
  
      public void testRealTest() throws java.io.IOException {
          FileUtils fileUtils = FileUtils.newFileUtils();
          executeTarget("realTest");
          assertTrue(fileUtils.contentEquals(project.resolveFile("../asf-logo.gif"),
                                             project.resolveFile("asf-logo.gif")));
      }
  }
  
  
  
  1.1                  jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/BZip2Test.java
  
  Index: BZip2Test.java
  ===================================================================
  /*
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2001 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *    notice, this list of conditions and the following disclaimer.
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in
   *    the documentation and/or other materials provided with the
   *    distribution.
   *
   * 3. The end-user documentation included with the redistribution, if
   *    any, must include the following acknowlegement:
   *       "This product includes software developed by the
   *        Apache Software Foundation (http://www.apache.org/)."
   *    Alternately, this acknowlegement may appear in the software itself,
   *    if and wherever such third-party acknowlegements normally appear.
   *
   * 4. The names "The Jakarta Project", "Ant", and "Apache Software
   *    Foundation" must not be used to endorse or promote products derived
   *    from this software without prior written permission. For written
   *    permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache"
   *    nor may "Apache" appear in their names without prior written
   *    permission of the Apache Group.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
   * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
   * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
   * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
   * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
   * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
   * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   * ====================================================================
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Software Foundation.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   */
  
  package org.apache.tools.ant.taskdefs;
  
  import org.apache.tools.ant.BuildFileTest;
  import org.apache.tools.ant.util.FileUtils;
  
  import java.io.IOException;
  
  /**
   * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
   * @version $Revision: 1.1 $
   */
  public class BZip2Test extends BuildFileTest {
  
      public BZip2Test(String name) {
          super(name);
      }
  
      public void setUp() { 
          configureProject("src/etc/testcases/taskdefs/bzip2.xml");
      }
  
      public void tearDown() {
          executeTarget("cleanup");
      }
  
      public void testRealTest() throws java.io.IOException {
          FileUtils fileUtils = FileUtils.newFileUtils();
          executeTarget("realTest");
          assertTrue(fileUtils.contentEquals(project.resolveFile("expected/asf-logo.gif.bz2"),
                                             project.resolveFile("asf-logo.gif.bz2")));
      }
  }
  
  
  

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


Mime
View raw message