Browse Source

Add (disabled) tests for 12651

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@273821 13f79535-47bb-0310-9956-ffa450edef68
master
Stefan Bodewig 22 years ago
parent
commit
a6dc398196
2 changed files with 31 additions and 1 deletions
  1. +17
    -1
      src/etc/testcases/taskdefs/jar.xml
  2. +14
    -0
      src/testcases/org/apache/tools/ant/taskdefs/JarTest.java

+ 17
- 1
src/etc/testcases/taskdefs/jar.xml View File

@@ -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>

+ 14
- 0
src/testcases/org/apache/tools/ant/taskdefs/JarTest.java View File

@@ -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);
}
}

Loading…
Cancel
Save