Fix zip-test

apache · Sep 28, 2017 · 2c5430b · 2c5430b
1 parent a0cb1fa
commit 2c5430b
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/src/tests/antunit/taskdefs/zip-test.xml b/src/tests/antunit/taskdefs/zip-test.xml
@@ -185,19 +185,19 @@
 
     <target name="testSetZipModTime">
       <mkdir dir="${input}/"/>
+      <mkdir dir="${input}/subdir"/>
       <touch file="${input}/test1.txt"/>
+      <touch file="${input}/subdir/test2.txt"/>
       <mkdir dir="${output}"/>
-      <zip destfile="${output}/test.zip" basedir="${input}" modificationtime="2016-01-01 00:00">
-        <fileset dir="${input}"/>
-      </zip>
+      <zip destfile="${output}/test.zip" basedir="${input}" modificationtime="2016-01-01 00:00" />
       <checksum file="${output}/test.zip" property="testSetZipModTime_hash" />
       <delete file="${output}/test.zip" />
 
+      <sleep seconds="4" /> <!-- Necessary to ensure zips would have normally differed in timestamp -->
       <touch file="${input}/test1.txt"/>
-      <zip destfile="${output}/test.zip" basedir="${input}" modificationtime="2016-01-01 00:00">
-        <fileset dir="${input}"/>
-      </zip>
-      <checksum file="${output}/test.zip" property="testSetZipModTime_hash" verifyproperty="testSetZipModTime_okay" />
+      <touch file="${input}/subdir/test2.txt"/>
+      <zip destfile="${output}/test.zip" basedir="${input}" modificationtime="2016-01-01 00:00" />
+      <checksum file="${output}/test.zip" property="${testSetZipModTime_hash}" verifyproperty="testSetZipModTime_okay" />
       <au:assertTrue>
         <equals arg1="${testSetZipModTime_okay}" arg2="true" />
       </au:assertTrue>