Return-Path: 
 <dev-return-63894-apmail-ant-dev-archive=ant.apache.org@ant.apache.org>
Delivered-To: apmail-ant-dev-archive@www.apache.org
Received: (qmail 76826 invoked from network); 18 Feb 2005 12:19:40 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur-2.apache.org with SMTP; 18 Feb 2005 12:19:40 -0000
Received: (qmail 76659 invoked by uid 500); 18 Feb 2005 12:19:39 -0000
Delivered-To: apmail-ant-dev-archive@ant.apache.org
Received: (qmail 76602 invoked by uid 500); 18 Feb 2005 12:19:38 -0000
Mailing-List: contact dev-help@ant.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:dev-unsubscribe@ant.apache.org>
List-Subscribe: <mailto:dev-subscribe@ant.apache.org>
List-Help: <mailto:dev-help@ant.apache.org>
List-Post: <mailto:dev@ant.apache.org>
List-Id: "Ant Developers List" <dev.ant.apache.org>
Reply-To: "Ant Developers List" <dev@ant.apache.org>
Delivered-To: mailing list dev@ant.apache.org
Received: (qmail 76589 invoked by uid 500); 18 Feb 2005 12:19:38 -0000
Received: (qmail 76586 invoked by uid 99); 18 Feb 2005 12:19:38 -0000
X-ASF-Spam-Status: No, hits=-9.8 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from minotaur.apache.org (HELO minotaur.apache.org)
 (209.237.227.194)
  by apache.org (qpsmtpd/0.28) with SMTP; Fri, 18 Feb 2005 04:19:38 -0800
Received: (qmail 76803 invoked by uid 1146); 18 Feb 2005 12:19:37 -0000
Date: 18 Feb 2005 12:19:37 -0000
Message-ID: <20050218121937.76802.qmail@minotaur.apache.org>
From: bodewig@apache.org
To: ant-cvs@apache.org
Subject: cvs commit: ant/src/testcases/org/apache/tools/ant/taskdefs
 ZipTest.java
X-Virus-Checked: Checked
X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N

bodewig     2005/02/18 04:19:37

  Modified:    src/etc/testcases/taskdefs zip.xml
               src/testcases/org/apache/tools/ant/taskdefs ZipTest.java
  Log:
  Test for PR 33412
  
  Revision  Changes    Path
  1.18      +11 -0     ant/src/etc/testcases/taskdefs/zip.xml
  
  Index: zip.xml
  ===================================================================
  RCS file: /home/cvs/ant/src/etc/testcases/taskdefs/zip.xml,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- zip.xml	2 Feb 2005 23:55:51 -0000	1.17
  +++ zip.xml	18 Feb 2005 12:19:37 -0000	1.18
  @@ -156,6 +156,17 @@
       </fail>
     </target>
   
  +  <!-- Bugzilla Report 33412 -->
  +  <target name="testDefaultExcludesAndUpdate">
  +    <mkdir dir="ziptest"/>
  +    <touch file="ziptest/ziptest~"/>
  +    <zip destfile="test3.zip" basedir="ziptest" defaultexcludes="false"/>
  +    <touch file="ziptest/ziptest2"/>
  +    <zip destfile="test3.zip" basedir="ziptest"
  +      defaultexcludes="false"
  +      update="true"/>
  +  </target>
  +
     <target name="cleanup">
       <delete file="test3.zip"/>
       <delete file="test4.zip"/>
  
  
  
  1.26      +20 -3     ant/src/testcases/org/apache/tools/ant/taskdefs/ZipTest.java
  
  Index: ZipTest.java
  ===================================================================
  RCS file: /home/cvs/ant/src/testcases/org/apache/tools/ant/taskdefs/ZipTest.java,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- ZipTest.java	4 Feb 2005 08:02:59 -0000	1.25
  +++ ZipTest.java	18 Feb 2005 12:19:37 -0000	1.26
  @@ -21,6 +21,7 @@
   import java.io.File;
   import java.io.IOException;
   import java.util.zip.ZipEntry;
  +import java.util.zip.ZipException;
   import java.util.zip.ZipFile;
   import java.util.Enumeration;
   
  @@ -49,9 +50,9 @@
           expectBuildException("test3", "zip cannot include itself");
       }
   
  -//    public void test4() {
  -//        expectBuildException("test4", "zip cannot include itself");
  -//    }
  +    //    public void test4() {
  +    //        expectBuildException("test4", "zip cannot include itself");
  +    //    }
   
       public void tearDown() {
           try {
  @@ -148,4 +149,20 @@
       public void testCompressionLevel() {
           executeTarget("testCompressionLevel");
       }
  +
  +    // Bugzilla Report 33412
  +    public void testDefaultExcludesAndUpdate() 
  +        throws ZipException, IOException {
  +        executeTarget("testDefaultExcludesAndUpdate");
  +        ZipFile f = null;
  +        try {
  +            f = new ZipFile(getProject().resolveFile("test3.zip"));
  +            assertNotNull("ziptest~ should be included",
  +                          f.getEntry("ziptest~"));
  +        } finally {
  +            if (f != null) {
  +                f.close();
  +            }
  +        }
  +    }
   }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org