Return-Path: 
 <ant-dev-return-41321-qmlist-jakarta-archive-ant-dev=jakarta.apache.org@jakarta.apache.org>
Delivered-To: apmail-jakarta-ant-dev-archive@apache.org
Received: (qmail 39893 invoked from network); 17 Jan 2003 15:06:00 -0000
Received: from exchange.sun.com (192.18.33.10)
  by daedalus.apache.org with SMTP; 17 Jan 2003 15:06:00 -0000
Received: (qmail 15273 invoked by uid 97); 17 Jan 2003 13:55:50 -0000
Delivered-To: qmlist-jakarta-archive-ant-dev@jakarta.apache.org
Received: (qmail 13731 invoked by uid 97); 17 Jan 2003 13:54:59 -0000
Mailing-List: contact ant-dev-help@jakarta.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:ant-dev-unsubscribe@jakarta.apache.org>
List-Subscribe: <mailto:ant-dev-subscribe@jakarta.apache.org>
List-Help: <mailto:ant-dev-help@jakarta.apache.org>
List-Post: <mailto:ant-dev@jakarta.apache.org>
List-Id: "Ant Developers List" <ant-dev.jakarta.apache.org>
Reply-To: "Ant Developers List" <ant-dev@jakarta.apache.org>
Delivered-To: mailing list ant-dev@jakarta.apache.org
Received: (qmail 7581 invoked by uid 97); 17 Jan 2003 13:52:04 -0000
X-Antivirus: nagoya (v4218 created Aug 14 2002)
Date: 17 Jan 2003 10:50:57 -0000
Message-ID: <20030117105057.30358.qmail@icarus.apache.org>
From: bodewig@apache.org
To: jakarta-ant-cvs@apache.org
Subject: cvs commit: jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs
 JarTest.java
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

bodewig     2003/01/17 02:50:57

  Modified:    src/etc/testcases/taskdefs jar.xml
               src/testcases/org/apache/tools/ant/taskdefs JarTest.java
  Log:
  Add (disabled) tests for 12651
  
  Revision  Changes    Path
  1.6       +17 -1     jakarta-ant/src/etc/testcases/taskdefs/jar.xml
  
  Index: jar.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/etc/testcases/taskdefs/jar.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- jar.xml	17 Jan 2003 10:35:09 -0000	1.5
  +++ jar.xml	17 Jan 2003 10:50:57 -0000	1.6
  @@ -3,6 +3,7 @@
   <project name="jar-test" basedir="." default="test1">
   
     <property name="tmp.jar" location="tmp.jar"/>
  +  <property name="tmp.dir" location="jartmp"/>
   
     <target name="test1">
       <jar/>
  @@ -41,7 +42,7 @@
   
     <target name="testRecreateNewerFileSetup" depends="test4">
       <touch file="jar.xml"/>
  -    <sleep seconds="2"/>
  +    <sleep seconds="3"/>
       <touch file="${tmp.jar}"/>
     </target>
   
  @@ -79,8 +80,23 @@
       />
     </target>
   
  +  <target name="testManifestStaysIntact">
  +    <mkdir dir="${tmp.dir}"/>
  +    <manifest file="${tmp.dir}/manifest">
  +      <attribute name="Foo" value="bar"/>
  +    </manifest>
  +    <jar destfile="${tmp.jar}" basedir="." includes="jar.xml"
  +         manifest="${tmp.dir}/manifest"/>
  +    <sleep seconds="3"/>
  +    <touch file="jar.xml"/>
  +    <jar destfile="${tmp.jar}" basedir="." includes="jar.xml"
  +         update="true"/>
  +    <unjar src="${tmp.jar}" dest="${tmp.dir}"/>
  +  </target>    
  +
     <target name="cleanup">
       <delete file="${tmp.jar}" />
  +    <delete dir="${tmp.dir}"/>
     </target>
   
   </project>
  
  
  
  1.10      +14 -0     jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/JarTest.java
  
  Index: JarTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/JarTest.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- JarTest.java	17 Jan 2003 10:35:10 -0000	1.9
  +++ JarTest.java	17 Jan 2003 10:50:57 -0000	1.10
  @@ -55,6 +55,8 @@
   package org.apache.tools.ant.taskdefs;
   
   import java.io.File;
  +import java.io.FileReader;
  +import java.io.IOException;
   import java.util.Date;
   import org.apache.tools.ant.BuildFileTest;
   
  @@ -148,5 +150,17 @@
           jarFile = new File(getProjectDir(), tempJar);
           assertTrue("jar has been recreated in " + secondTarget,
                      jarModifiedDate < jarFile.lastModified());
  +    }
  +
  +    public void XtestManifestStaysIntact() 
  +        throws IOException, ManifestException {
  +        executeTarget("testManifestStaysIntact");
  +        Manifest mf1 = 
  +            new Manifest(new FileReader(getProject()
  +                                        .resolveFile("jartmp/manifest")));
  +        Manifest mf2 = 
  +            new Manifest(new FileReader(getProject()
  +                                        .resolveFile("jartmp/META-INF/MANIFEST.MF")));
  +        assertEquals(mf1, mf2);
       }
   }
  
  
  

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