Browse Source

Make <bunzip2> really work with non-filesystem resources

master
Stefan Bodewig 9 years ago
parent
commit
3c2ed1374f
2 changed files with 26 additions and 4 deletions
  1. +2
    -2
      src/main/org/apache/tools/ant/taskdefs/BUnzip2.java
  2. +24
    -2
      src/tests/antunit/taskdefs/bunzip2-test.xml

+ 2
- 2
src/main/org/apache/tools/ant/taskdefs/BUnzip2.java View File

@@ -56,8 +56,8 @@ public class BUnzip2 extends Unpack {
* Do the unbzipping.
*/
protected void extract() {
if (source.lastModified() > dest.lastModified()) {
log("Expanding " + source.getAbsolutePath() + " to "
if (srcResource.getLastModified() > dest.lastModified()) {
log("Expanding " + srcResource.getName() + " to "
+ dest.getAbsolutePath());

FileOutputStream out = null;


+ 24
- 2
src/tests/antunit/taskdefs/bunzip2-test.xml View File

@@ -18,11 +18,33 @@
<project default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
<import file="../antunit-base.xml" />

<target name="testExpandArchiveWithMultipleStreams">
<target name="setup">
<mkdir dir="${output}"/>
</target>

<target name="testExpandArchiveWithMultipleStreams" depends="setup">
<bunzip2 src="bzip2/multiple.bz2" dest="${output}"/>
<au:assertFilesMatch expected="bzip2/expected"
actual="${output}/multiple"/>
</target>

</project>
<target name="testWithNonFileResourceToFile" depends="setup">
<bunzip2 dest="${output}/greeting.txt">
<url url="http://ant.apache.org/webtest/bunzip2/greeting.txt.bz2"/>
</bunzip2>
<get src="http://ant.apache.org/webtest/gunzip/greeting.txt"
dest="${output}/orig.greeting.txt"/>
<au:assertFilesMatch expected="${output}/orig.greeting.txt"
actual="${output}/greeting.txt"/>
</target>

<target name="testWithNonFileResourceToDir" depends="setup">
<bunzip2 dest="${output}">
<url url="http://ant.apache.org/webtest/bunzip2/greeting.txt.bz2"/>
</bunzip2>
<get src="http://ant.apache.org/webtest/gunzip/greeting.txt"
dest="${output}/orig.greeting.txt"/>
<au:assertFilesMatch expected="${output}/orig.greeting.txt"
actual="${output}/greeting.txt"/>
</target>
</project>

Loading…
Cancel
Save