Add testcase for untar, improve testcases for zip/unzip/tar

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@269978 13f79535-47bb-0310-9956-ffa450edef68

src/etc/testcases/taskdefs/tar.xml

@@ -30,6 +30,14 @@
   <target name="cleanup"> 
     <delete file="test4.tar"/>
     <delete file="test5.tar"/>
+    <delete file="asf-logo.gif.tar"/>
     <delete dir="test5dir"/>
   </target>
+
+  <target name="feather">
+    <tar tarfile="asf-logo.gif.tar" 
+         basedir=".."
+         includes="asf-logo.gif" />
+  </target>
+
 </project>

src/etc/testcases/taskdefs/untar.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+
+<project basedir="." default="cleanup">
+
+  <target name="cleanup">
+    <delete file="asf-logo.gif" />
+  </target>
+
+  <target name="testTarTask">
+    <ant antfile="tar.xml" target="feather" />
+    <untar src="asf-logo.gif.tar" dest="." />
+    <ant antfile="tar.xml" target="cleanup" />
+  </target>
+
+  <target name="realTest">
+    <untar src="expected/asf-logo.gif.tar" dest="." />
+  </target>
+
+</project>

src/etc/testcases/taskdefs/unzip.xml

@@ -2,6 +2,10 @@
 
 <project name="xxx-test" basedir="." default="test1">
 
+  <target name="cleanup">
+    <delete file="asf-logo.gif" />
+  </target>
+
   <target name="test1">
     <unzip/>
   </target>
@@ -14,4 +18,14 @@
     <unzip dest=""/>
   </target>
 
+  <target name="testZipTask">
+    <ant antfile="zip.xml" target="feather" />
+    <unzip src="asf-logo.gif.zip" dest="." />
+    <ant antfile="zip.xml" target="cleanup" />
+  </target>
+
+  <target name="realTest">
+    <unzip src="expected/asf-logo.gif.zip" dest="." />
+  </target>
+
 </project>

src/etc/testcases/taskdefs/zip.xml

@@ -48,7 +48,11 @@
     </zip>
   </target>
 
-
+  <target name="feather">
+    <zip zipfile="asf-logo.gif.zip" 
+         basedir=".."
+         includes="asf-logo.gif" />
+  </target>
 
   <target name="cleanup">
     <delete file="test3.zip"/>
@@ -57,5 +61,6 @@
     <delete file="test6.zip"/>
     <delete file="inner7.zip"/>
     <delete file="test7.zip"/>
+    <delete file="asf-logo.gif.zip"/>
   </target>
 </project>

src/testcases/org/apache/tools/ant/taskdefs/UntarTest.java

@@ -0,0 +1,92 @@
+/*
+ * 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 java.io.File;
+import org.apache.tools.ant.BuildFileTest;
+import org.apache.tools.ant.util.FileUtils;
+
+/**
+ * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
+ * @version $Revision$
+ */
+public class UntarTest extends BuildFileTest { 
+    
+    public UntarTest(String name) { 
+        super(name);
+    }    
+    
+    public void setUp() { 
+        configureProject("src/etc/testcases/taskdefs/untar.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")));
+    }
+    
+    public void testTestTarTask() throws java.io.IOException {
+        FileUtils fileUtils = FileUtils.newFileUtils();
+        executeTarget("testTarTask");
+        assertTrue(fileUtils.contentEquals(project.resolveFile("../asf-logo.gif"),
+                                           project.resolveFile("asf-logo.gif")));
+    }
+    
+}

src/testcases/org/apache/tools/ant/taskdefs/UnzipTest.java

@@ -54,9 +54,11 @@
 
 package org.apache.tools.ant.taskdefs;
 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>
  */
 public class UnzipTest extends BuildFileTest { 
     
@@ -68,6 +70,10 @@ public class UnzipTest extends BuildFileTest {
         configureProject("src/etc/testcases/taskdefs/unzip.xml");
     }
     
+    public void tearDown() {
+        executeTarget("cleanup");
+    }
+
     public void test1() { 
         expectBuildException("test1", "required argument not specified");
     }
@@ -80,4 +86,19 @@ public class UnzipTest extends BuildFileTest {
         expectBuildException("test3", "required argument not specified");
     }
 
+
+    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 testTestZipTask() throws java.io.IOException {
+        FileUtils fileUtils = FileUtils.newFileUtils();
+        executeTarget("testZipTask");
+        assertTrue(fileUtils.contentEquals(project.resolveFile("../asf-logo.gif"),
+                                           project.resolveFile("asf-logo.gif")));
+    }
+    
 }