From a6dc39819623ef3910a4060a0331defa4445153f Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Fri, 17 Jan 2003 10:50:57 +0000
Subject: [PATCH] Add (disabled) tests for 12651

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@273821 13f79535-47bb-0310-9956-ffa450edef68
---
 src/etc/testcases/taskdefs/jar.xml             | 18 +++++++++++++++++-
 .../org/apache/tools/ant/taskdefs/JarTest.java | 14 ++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/src/etc/testcases/taskdefs/jar.xml b/src/etc/testcases/taskdefs/jar.xml
index 999dc92fd..cda4c26b2 100644
--- a/src/etc/testcases/taskdefs/jar.xml
+++ b/src/etc/testcases/taskdefs/jar.xml
@@ -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>
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/JarTest.java b/src/testcases/org/apache/tools/ant/taskdefs/JarTest.java
index bdebfda63..1ece1010e 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/JarTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/JarTest.java
@@ -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;
 
@@ -149,4 +151,16 @@ public class JarTest extends BuildFileTest {
         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);
+    }
 }