From 1942efc11892bf7de6479bf1d34aa941fbfe69ab Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Mon, 19 Nov 2001 15:53:14 +0000
Subject: [PATCH] add real tests fro the gzip and bzip2 tasks.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@269964 13f79535-47bb-0310-9956-ffa450edef68
---
 build.xml                                     |   6 --
 src/etc/testcases/taskdefs/bunzip2.xml        |  13 +++
 src/etc/testcases/taskdefs/bzip2.xml          |  13 +++
 .../taskdefs/expected/asf-logo.gif.bz2        | Bin 0 -> 7435 bytes
 .../taskdefs/expected/asf-logo.gif.gz         | Bin 0 -> 6996 bytes
 src/etc/testcases/taskdefs/gunzip.xml         |  15 ++-
 src/etc/testcases/taskdefs/gzip.xml           |   8 +-
 .../tools/ant/taskdefs/BUnzip2Test.java       |  86 ++++++++++++++++++
 .../apache/tools/ant/taskdefs/BZip2Test.java  |  86 ++++++++++++++++++
 .../apache/tools/ant/taskdefs/GUnzipTest.java |  29 ++++--
 .../apache/tools/ant/taskdefs/GzipTest.java   |   9 --
 11 files changed, 235 insertions(+), 30 deletions(-)
 create mode 100644 src/etc/testcases/taskdefs/bunzip2.xml
 create mode 100644 src/etc/testcases/taskdefs/bzip2.xml
 create mode 100644 src/etc/testcases/taskdefs/expected/asf-logo.gif.bz2
 create mode 100644 src/etc/testcases/taskdefs/expected/asf-logo.gif.gz
 create mode 100644 src/testcases/org/apache/tools/ant/taskdefs/BUnzip2Test.java
 create mode 100644 src/testcases/org/apache/tools/ant/taskdefs/BZip2Test.java

diff --git a/build.xml b/build.xml
index dd507fac4..0b16ff6fb 100644
--- a/build.xml
+++ b/build.xml
@@ -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 -->
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 @@
+<?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>
\ 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 @@
+<?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>
\ 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 0000000000000000000000000000000000000000..0e73d25205baf0930da679a3a46cb65c49e36ff5
GIT binary patch
literal 7435
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
JNG;%`GXO#8oOA#H

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..decc918777d61a13cabb2947da0b5231942650a1
GIT binary patch
literal 6996
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

literal 0
HcmV?d00001

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 @@
     <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>
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 @@
     <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>
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
+ * <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$
+ */
+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
+ * <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$
+ */
+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 <nico@seessle.de> 
+ * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
+ * @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
-    }
-    
 }