Browse Source

test for Bug 37237

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

+ 15
- 0
src/etc/testcases/taskdefs/jar.xml View File

@@ -166,6 +166,7 @@


<target name="cleanup"> <target name="cleanup">
<delete file="${tmp.jar}" /> <delete file="${tmp.jar}" />
<delete file="${tmp.jar}2" />
<delete dir="${tmp.dir}"/> <delete dir="${tmp.dir}"/>
<delete file="${tmp.zip}" /> <delete file="${tmp.zip}" />
<delete dir="${tmp1.dir}"/> <delete dir="${tmp1.dir}"/>
@@ -222,4 +223,18 @@
<unzip src="${tmp.jar}" dest="${tmp.dir}"/> <unzip src="${tmp.jar}" dest="${tmp.dir}"/>


</target> </target>

<!-- bug 37237 -->
<target name="testIndexJarsPlusJarMarker">
<mkdir dir="${tmp.dir}/a/b/c"/>
<jar destfile="${tmp.jar}" basedir="${tmp.dir}"/>
<delete dir="${tmp.dir}/a" quiet="true"/>
<mkdir dir="${tmp.dir}/d/e/f"/>
<jar destfile="${tmp.jar}2" basedir="${tmp.dir}" index="true">
<indexjars>
<fileset file="${tmp.jar}"/>
</indexjars>
</jar>
</target>

</project> </project>

+ 5
- 1
src/testcases/org/apache/tools/ant/taskdefs/JarTest.java View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2000-2005 The Apache Software Foundation
* Copyright 2000-2006 The Apache Software Foundation
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -262,4 +262,8 @@ public class JarTest extends BuildFileTest {
File manifestFile = getProject().resolveFile(tempDir + "META-INF" + File.separator + "MANIFEST.MF"); File manifestFile = getProject().resolveFile(tempDir + "META-INF" + File.separator + "MANIFEST.MF");
assertTrue(manifestFile.exists()); assertTrue(manifestFile.exists());
} }

public void testIndexJarsPlusJarMarker() {
executeTarget("testIndexJarsPlusJarMarker");
}
} }

Loading…
Cancel
Save