bodewig 2004/06/07 05:17:26
Modified: src/etc/testcases/taskdefs zip.xml
src/testcases/org/apache/tools/ant/taskdefs ZipTest.java
Log:
Test for 22865
Revision Changes Path
1.14 +6 -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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- zip.xml 4 Aug 2003 12:11:37 -0000 1.13
+++ zip.xml 7 Jun 2004 12:17:25 -0000 1.14
@@ -122,6 +122,12 @@
includes="ziptest/**" filesonly="true"/>
</target>
+ <!-- Bugzilla Report 22865 -->
+ <target name="testEmptySkip">
+ <mkdir dir="ziptest"/>
+ <zip destfile="test3.zip" basedir="ziptest" whenempty="skip"/>
+ </target>
+
<target name="cleanup">
<delete file="test3.zip"/>
<delete file="test4.zip"/>
1.20 +7 -0
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.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ZipTest.java 9 Mar 2004 16:48:57 -0000 1.19
+++ ZipTest.java 7 Jun 2004 12:17:25 -0000 1.20
@@ -126,4 +126,11 @@
executeTarget("testFilesOnlyDoesntCauseRecreate");
assertEquals(l,
getProject().resolveFile("test3.zip").lastModified());
}
+
+ // Bugzilla Report 22865
+ public void testEmptySkip() {
+ executeTarget("testEmptySkip");
+ assertTrue("archive should get skipped",
+ !getProject().resolveFile("test3.zip").exists());
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
