diff --git a/src/etc/testcases/taskdefs/expected/asf-logo.gif.tar b/src/etc/testcases/taskdefs/expected/asf-logo.gif.tar
new file mode 100644
index 000000000..fc0f79025
Binary files /dev/null and b/src/etc/testcases/taskdefs/expected/asf-logo.gif.tar differ
diff --git a/src/etc/testcases/taskdefs/expected/asf-logo.gif.zip b/src/etc/testcases/taskdefs/expected/asf-logo.gif.zip
new file mode 100644
index 000000000..5f970d59d
Binary files /dev/null and b/src/etc/testcases/taskdefs/expected/asf-logo.gif.zip differ
diff --git a/src/etc/testcases/taskdefs/tar.xml b/src/etc/testcases/taskdefs/tar.xml
index 28046926c..3fbfd935f 100644
--- a/src/etc/testcases/taskdefs/tar.xml
+++ b/src/etc/testcases/taskdefs/tar.xml
@@ -30,6 +30,14 @@
+
+
+
+
+
+
diff --git a/src/etc/testcases/taskdefs/untar.xml b/src/etc/testcases/taskdefs/untar.xml
new file mode 100644
index 000000000..6fe693c5c
--- /dev/null
+++ b/src/etc/testcases/taskdefs/untar.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/etc/testcases/taskdefs/unzip.xml b/src/etc/testcases/taskdefs/unzip.xml
index 0e462db95..61e42c92c 100644
--- a/src/etc/testcases/taskdefs/unzip.xml
+++ b/src/etc/testcases/taskdefs/unzip.xml
@@ -2,6 +2,10 @@
+
+
+
+
@@ -14,4 +18,14 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/src/etc/testcases/taskdefs/zip.xml b/src/etc/testcases/taskdefs/zip.xml
index e1ed9a5b5..66bd77e71 100644
--- a/src/etc/testcases/taskdefs/zip.xml
+++ b/src/etc/testcases/taskdefs/zip.xml
@@ -48,7 +48,11 @@
-
+
+
+
@@ -57,5 +61,6 @@
+
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/UntarTest.java b/src/testcases/org/apache/tools/ant/taskdefs/UntarTest.java
new file mode 100644
index 000000000..b05452b2c
--- /dev/null
+++ b/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
+ * .
+ */
+package org.apache.tools.ant.taskdefs;
+
+import java.io.File;
+import org.apache.tools.ant.BuildFileTest;
+import org.apache.tools.ant.util.FileUtils;
+
+/**
+ * @author Stefan Bodewig
+ * @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")));
+ }
+
+}
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/UnzipTest.java b/src/testcases/org/apache/tools/ant/taskdefs/UnzipTest.java
index 50e8282c3..b3a145a71 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/UnzipTest.java
+++ b/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
+ * @author Stefan Bodewig
*/
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")));
+ }
+
}