diff --git a/build.xml b/build.xml
index dd507fac4..0b16ff6fb 100644
--- a/build.xml
+++ b/build.xml
@@ -826,10 +826,6 @@
-
-
-
-
@@ -875,8 +871,6 @@
-
-
diff --git a/src/etc/testcases/taskdefs/bunzip2.xml b/src/etc/testcases/taskdefs/bunzip2.xml
new file mode 100644
index 000000000..69f0156d9
--- /dev/null
+++ b/src/etc/testcases/taskdefs/bunzip2.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/etc/testcases/taskdefs/bzip2.xml b/src/etc/testcases/taskdefs/bzip2.xml
new file mode 100644
index 000000000..c079e5456
--- /dev/null
+++ b/src/etc/testcases/taskdefs/bzip2.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/etc/testcases/taskdefs/expected/asf-logo.gif.bz2 b/src/etc/testcases/taskdefs/expected/asf-logo.gif.bz2
new file mode 100644
index 000000000..0e73d2520
Binary files /dev/null and b/src/etc/testcases/taskdefs/expected/asf-logo.gif.bz2 differ
diff --git a/src/etc/testcases/taskdefs/expected/asf-logo.gif.gz b/src/etc/testcases/taskdefs/expected/asf-logo.gif.gz
new file mode 100644
index 000000000..decc91877
Binary files /dev/null and b/src/etc/testcases/taskdefs/expected/asf-logo.gif.gz differ
diff --git a/src/etc/testcases/taskdefs/gunzip.xml b/src/etc/testcases/taskdefs/gunzip.xml
index f4e755635..84d559892 100644
--- a/src/etc/testcases/taskdefs/gunzip.xml
+++ b/src/etc/testcases/taskdefs/gunzip.xml
@@ -10,9 +10,18 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/etc/testcases/taskdefs/gzip.xml b/src/etc/testcases/taskdefs/gzip.xml
index 8a2f45595..c62e0577c 100644
--- a/src/etc/testcases/taskdefs/gzip.xml
+++ b/src/etc/testcases/taskdefs/gzip.xml
@@ -18,8 +18,12 @@
-
-
+
+
+
+
+
+
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/BUnzip2Test.java b/src/testcases/org/apache/tools/ant/taskdefs/BUnzip2Test.java
new file mode 100644
index 000000000..9cb391352
--- /dev/null
+++ b/src/testcases/org/apache/tools/ant/taskdefs/BUnzip2Test.java
@@ -0,0 +1,86 @@
+/*
+ * 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 org.apache.tools.ant.BuildFileTest;
+import org.apache.tools.ant.util.FileUtils;
+
+import java.io.IOException;
+
+/**
+ * @author Stefan Bodewig
+ * @version $Revision$
+ */
+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")));
+ }
+}
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/BZip2Test.java b/src/testcases/org/apache/tools/ant/taskdefs/BZip2Test.java
new file mode 100644
index 000000000..5b2ebc078
--- /dev/null
+++ b/src/testcases/org/apache/tools/ant/taskdefs/BZip2Test.java
@@ -0,0 +1,86 @@
+/*
+ * 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 org.apache.tools.ant.BuildFileTest;
+import org.apache.tools.ant.util.FileUtils;
+
+import java.io.IOException;
+
+/**
+ * @author Stefan Bodewig
+ * @version $Revision$
+ */
+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")));
+ }
+}
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/GUnzipTest.java b/src/testcases/org/apache/tools/ant/taskdefs/GUnzipTest.java
index 715eeecd4..f918b50ac 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/GUnzipTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/GUnzipTest.java
@@ -55,9 +55,12 @@ package org.apache.tools.ant.taskdefs;
import java.io.File;
import org.apache.tools.ant.BuildFileTest;
+import org.apache.tools.ant.util.FileUtils;
/**
* @author Nico Seessle
+ * @author Stefan Bodewig
+ * @version $Revision$
*/
public class GUnzipTest extends BuildFileTest {
@@ -69,6 +72,10 @@ public class GUnzipTest extends BuildFileTest {
configureProject("src/etc/testcases/taskdefs/gunzip.xml");
}
+ public void tearDown() {
+ executeTarget("cleanup");
+ }
+
public void test1() {
expectBuildException("test1", "required argument missing");
}
@@ -77,16 +84,18 @@ public class GUnzipTest extends BuildFileTest {
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")));
}
}
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/GzipTest.java b/src/testcases/org/apache/tools/ant/taskdefs/GzipTest.java
index 1c28cb570..a15530974 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/GzipTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/GzipTest.java
@@ -86,13 +86,4 @@ public class GzipTest extends BuildFileTest {
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
- }
-
}