From ee7a81d646ed1ec151553fd88ced1eb08096a75e Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Wed, 21 Nov 2001 15:45:26 +0000 Subject: [PATCH] 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 --- .../taskdefs/expected/asf-logo.gif.tar | Bin 0 -> 10240 bytes .../taskdefs/expected/asf-logo.gif.zip | Bin 0 -> 7121 bytes src/etc/testcases/taskdefs/tar.xml | 8 ++ src/etc/testcases/taskdefs/untar.xml | 19 ++++ src/etc/testcases/taskdefs/unzip.xml | 14 +++ src/etc/testcases/taskdefs/zip.xml | 7 +- .../apache/tools/ant/taskdefs/UntarTest.java | 92 ++++++++++++++++++ .../apache/tools/ant/taskdefs/UnzipTest.java | 21 ++++ 8 files changed, 160 insertions(+), 1 deletion(-) create mode 100644 src/etc/testcases/taskdefs/expected/asf-logo.gif.tar create mode 100644 src/etc/testcases/taskdefs/expected/asf-logo.gif.zip create mode 100644 src/etc/testcases/taskdefs/untar.xml create mode 100644 src/testcases/org/apache/tools/ant/taskdefs/UntarTest.java 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 0000000000000000000000000000000000000000..fc0f7902539716584c9802f0a49d69bac74d54aa GIT binary patch literal 10240 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..5f970d59d3ee4f08dad532f94273bdadb6303232 GIT binary patch literal 7121 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 H000001}^Nq literal 0 HcmV?d00001 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"))); + } + }