bodewig 01/11/21 07:45:26
Modified: src/etc/testcases/taskdefs tar.xml unzip.xml zip.xml
src/testcases/org/apache/tools/ant/taskdefs UnzipTest.java
Added: src/etc/testcases/taskdefs untar.xml
src/etc/testcases/taskdefs/expected asf-logo.gif.tar
asf-logo.gif.zip
src/testcases/org/apache/tools/ant/taskdefs UntarTest.java
Log:
Add testcase for untar, improve testcases for zip/unzip/tar
Revision Changes Path
1.5 +8 -0 jakarta-ant/src/etc/testcases/taskdefs/tar.xml
Index: tar.xml
===================================================================
RCS file: /home/cvs/jakarta-ant/src/etc/testcases/taskdefs/tar.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tar.xml 2001/03/19 12:44:33 1.4
+++ tar.xml 2001/11/21 15:45:26 1.5
@@ -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>
1.3 +14 -0 jakarta-ant/src/etc/testcases/taskdefs/unzip.xml
Index: unzip.xml
===================================================================
RCS file: /home/cvs/jakarta-ant/src/etc/testcases/taskdefs/unzip.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- unzip.xml 2000/12/18 15:44:00 1.2
+++ unzip.xml 2001/11/21 15:45:26 1.3
@@ -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>
@@ -12,6 +16,16 @@
<target name="test3">
<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>
1.5 +6 -1 jakarta-ant/src/etc/testcases/taskdefs/zip.xml
Index: zip.xml
===================================================================
RCS file: /home/cvs/jakarta-ant/src/etc/testcases/taskdefs/zip.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- zip.xml 2001/03/08 11:03:38 1.4
+++ zip.xml 2001/11/21 15:45:26 1.5
@@ -48,8 +48,12 @@
</zip>
</target>
+ <target name="feather">
+ <zip zipfile="asf-logo.gif.zip"
+ basedir=".."
+ includes="asf-logo.gif" />
+ </target>
-
<target name="cleanup">
<delete file="test3.zip"/>
<delete file="test4.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>
1.1 jakarta-ant/src/etc/testcases/taskdefs/untar.xml
Index: untar.xml
===================================================================
<?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>
1.1
jakarta-ant/src/etc/testcases/taskdefs/expected/asf-logo.gif.tar
<<Binary file>>
1.1
jakarta-ant/src/etc/testcases/taskdefs/expected/asf-logo.gif.zip
<<Binary file>>
1.4 +21 -0
jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/UnzipTest.java
Index: UnzipTest.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/UnzipTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- UnzipTest.java 2001/11/14 12:25:30 1.3
+++ UnzipTest.java 2001/11/21 15:45:26 1.4
@@ -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 <[EMAIL PROTECTED]>
+ * @author <a href="mailto:[EMAIL PROTECTED]">Stefan Bodewig</a>
*/
public class UnzipTest extends BuildFileTest {
@@ -68,6 +70,10 @@
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 @@
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")));
+ }
+
}
1.1
jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/UntarTest.java
Index: UntarTest.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 [EMAIL PROTECTED]
*
* 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:[EMAIL PROTECTED]">Stefan Bodewig</a>
* @version $Revision: 1.1 $
*/
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")));
}
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
