Author: bodewig
Date: Fri Feb 19 12:07:01 2010
New Revision: 911790
URL: http://svn.apache.org/viewvc?rev=911790&view=rev
Log:
fix tests now that cpio archive has been renamed
Modified:
ant/antlibs/compress/trunk/src/tests/antunit/ar-test.xml
ant/antlibs/compress/trunk/src/tests/antunit/bzip2-test.xml
ant/antlibs/compress/trunk/src/tests/antunit/cpio-test.xml
ant/antlibs/compress/trunk/src/tests/antunit/cpioentry-test.xml
ant/antlibs/compress/trunk/src/tests/antunit/cpiofileset-test.xml
ant/antlibs/compress/trunk/src/tests/antunit/gzip-test.xml
ant/antlibs/compress/trunk/src/tests/antunit/tar-test.xml
ant/antlibs/compress/trunk/src/tests/antunit/zip-test.xml
Modified: ant/antlibs/compress/trunk/src/tests/antunit/ar-test.xml
URL:
http://svn.apache.org/viewvc/ant/antlibs/compress/trunk/src/tests/antunit/ar-test.xml?rev=911790&r1=911789&r2=911790&view=diff
==============================================================================
--- ant/antlibs/compress/trunk/src/tests/antunit/ar-test.xml (original)
+++ ant/antlibs/compress/trunk/src/tests/antunit/ar-test.xml Fri Feb 19
12:07:01 2010
@@ -128,7 +128,7 @@
<target name="testCpioFileSet" depends="setUp">
<cmp:ar destfile="${dest}">
- <cmp:cpiofileset src="../resources/asf-logo.gif.cpio"
+ <cmp:cpiofileset src="../resources/asf-logo.gif.bin.cpio"
includes="asf-logo.gif"/>
</cmp:ar>
<checkProperties dateTime="2009-07-31-20:11:13 +0200" mode="644"
Modified: ant/antlibs/compress/trunk/src/tests/antunit/bzip2-test.xml
URL:
http://svn.apache.org/viewvc/ant/antlibs/compress/trunk/src/tests/antunit/bzip2-test.xml?rev=911790&r1=911789&r2=911790&view=diff
==============================================================================
--- ant/antlibs/compress/trunk/src/tests/antunit/bzip2-test.xml (original)
+++ ant/antlibs/compress/trunk/src/tests/antunit/bzip2-test.xml Fri Feb 19
12:07:01 2010
@@ -99,7 +99,7 @@
<target name="testNestedTask" depends="setUp">
<cmp:bzip2 destfile="${output}/asf-logo.tar.bz2">
<cmp:tar>
- <cmp:cpiofileset src="../resources/asf-logo.gif.cpio"
+ <cmp:cpiofileset src="../resources/asf-logo.gif.bin.cpio"
includes="asf-logo.gif"/>
</cmp:tar>
</cmp:bzip2>
Modified: ant/antlibs/compress/trunk/src/tests/antunit/cpio-test.xml
URL:
http://svn.apache.org/viewvc/ant/antlibs/compress/trunk/src/tests/antunit/cpio-test.xml?rev=911790&r1=911789&r2=911790&view=diff
==============================================================================
--- ant/antlibs/compress/trunk/src/tests/antunit/cpio-test.xml (original)
+++ ant/antlibs/compress/trunk/src/tests/antunit/cpio-test.xml Fri Feb 19
12:07:01 2010
@@ -128,7 +128,7 @@
<target name="testCpioFileSet" depends="setUp">
<cmp:cpio destfile="${dest}">
- <cmp:cpiofileset src="../resources/asf-logo.gif.cpio"
+ <cmp:cpiofileset src="../resources/asf-logo.gif.bin.cpio"
includes="asf-logo.gif"/>
</cmp:cpio>
<checkProperties dateTime="2009-07-31-20:11:13 +0200" mode="644"
Modified: ant/antlibs/compress/trunk/src/tests/antunit/cpioentry-test.xml
URL:
http://svn.apache.org/viewvc/ant/antlibs/compress/trunk/src/tests/antunit/cpioentry-test.xml?rev=911790&r1=911789&r2=911790&view=diff
==============================================================================
--- ant/antlibs/compress/trunk/src/tests/antunit/cpioentry-test.xml (original)
+++ ant/antlibs/compress/trunk/src/tests/antunit/cpioentry-test.xml Fri Feb 19
12:07:01 2010
@@ -29,7 +29,7 @@
<target name="testCpioSource" depends="setUp">
<copy todir="${output}">
<cmp:cpioentry name="asf-logo.gif">
- <file file="../resources/asf-logo.gif.cpio"/>
+ <file file="../resources/asf-logo.gif.bin.cpio"/>
</cmp:cpioentry>
</copy>
<au:assertFilesMatch
@@ -43,28 +43,28 @@
<cond:islastmodified datetime="2009-07-31-20:11:13 +0200"
pattern="yyyy-MM-dd-HH:mm:ss Z">
<cmp:cpioentry name="asf-logo.gif">
- <file file="../resources/asf-logo.gif.cpio"/>
+ <file file="../resources/asf-logo.gif.bin.cpio"/>
</cmp:cpioentry>
</cond:islastmodified>
</au:assertTrue>
<au:assertTrue>
<cmp:hasuserid id="1000">
<cmp:cpioentry name="asf-logo.gif">
- <file file="../resources/asf-logo.gif.cpio"/>
+ <file file="../resources/asf-logo.gif.bin.cpio"/>
</cmp:cpioentry>
</cmp:hasuserid>
</au:assertTrue>
<au:assertTrue>
<cmp:hasgroupid id="1000">
<cmp:cpioentry name="asf-logo.gif">
- <file file="../resources/asf-logo.gif.cpio"/>
+ <file file="../resources/asf-logo.gif.bin.cpio"/>
</cmp:cpioentry>
</cmp:hasgroupid>
</au:assertTrue>
<au:assertTrue>
<cmp:hasmode mode="644">
<cmp:cpioentry name="asf-logo.gif">
- <file file="../resources/asf-logo.gif.cpio"/>
+ <file file="../resources/asf-logo.gif.bin.cpio"/>
</cmp:cpioentry>
</cmp:hasmode>
</au:assertTrue>
Modified: ant/antlibs/compress/trunk/src/tests/antunit/cpiofileset-test.xml
URL:
http://svn.apache.org/viewvc/ant/antlibs/compress/trunk/src/tests/antunit/cpiofileset-test.xml?rev=911790&r1=911789&r2=911790&view=diff
==============================================================================
--- ant/antlibs/compress/trunk/src/tests/antunit/cpiofileset-test.xml (original)
+++ ant/antlibs/compress/trunk/src/tests/antunit/cpiofileset-test.xml Fri Feb
19 12:07:01 2010
@@ -43,7 +43,7 @@
<target name="testCpioSource" depends="setUp">
<copy todir="${output}">
- <cmp:cpiofileset src="../resources/asf-logo.gif.cpio"
+ <cmp:cpiofileset src="../resources/asf-logo.gif.bin.cpio"
includes="*.gif"/>
</copy>
<au:assertFilesMatch
@@ -53,12 +53,12 @@
</target>
<target name="testUncompressSource" depends="setUp">
- <gzip destfile="${input}/asf-logo.gif.cpio.gz"
- src="../resources/asf-logo.gif.cpio"/>
+ <gzip destfile="${input}/asf-logo.gif.bin.cpio.gz"
+ src="../resources/asf-logo.gif.bin.cpio"/>
<copy todir="${output}">
<cmp:cpiofileset includes="*.gif">
<gzipresource>
- <file file="${input}/asf-logo.gif.cpio.gz"/>
+ <file file="${input}/asf-logo.gif.bin.cpio.gz"/>
</gzipresource>
</cmp:cpiofileset>
</copy>
Modified: ant/antlibs/compress/trunk/src/tests/antunit/gzip-test.xml
URL:
http://svn.apache.org/viewvc/ant/antlibs/compress/trunk/src/tests/antunit/gzip-test.xml?rev=911790&r1=911789&r2=911790&view=diff
==============================================================================
--- ant/antlibs/compress/trunk/src/tests/antunit/gzip-test.xml (original)
+++ ant/antlibs/compress/trunk/src/tests/antunit/gzip-test.xml Fri Feb 19
12:07:01 2010
@@ -90,7 +90,7 @@
<target name="testNestedTask" depends="setUp">
<cmp:gzip destfile="${output}/asf-logo.tar.gz">
<cmp:tar>
- <cmp:cpiofileset src="../resources/asf-logo.gif.cpio"
+ <cmp:cpiofileset src="../resources/asf-logo.gif.bin.cpio"
includes="asf-logo.gif"/>
</cmp:tar>
</cmp:gzip>
Modified: ant/antlibs/compress/trunk/src/tests/antunit/tar-test.xml
URL:
http://svn.apache.org/viewvc/ant/antlibs/compress/trunk/src/tests/antunit/tar-test.xml?rev=911790&r1=911789&r2=911790&view=diff
==============================================================================
--- ant/antlibs/compress/trunk/src/tests/antunit/tar-test.xml (original)
+++ ant/antlibs/compress/trunk/src/tests/antunit/tar-test.xml Fri Feb 19
12:07:01 2010
@@ -144,7 +144,7 @@
<target name="testCpioFileSet" depends="setUp">
<cmp:tar destfile="${dest}">
- <cmp:cpiofileset src="../resources/asf-logo.gif.cpio"
+ <cmp:cpiofileset src="../resources/asf-logo.gif.bin.cpio"
includes="asf-logo.gif"/>
</cmp:tar>
<checkProperties dateTime="2009-07-31-20:11:13 +0200" mode="644"
Modified: ant/antlibs/compress/trunk/src/tests/antunit/zip-test.xml
URL:
http://svn.apache.org/viewvc/ant/antlibs/compress/trunk/src/tests/antunit/zip-test.xml?rev=911790&r1=911789&r2=911790&view=diff
==============================================================================
--- ant/antlibs/compress/trunk/src/tests/antunit/zip-test.xml (original)
+++ ant/antlibs/compress/trunk/src/tests/antunit/zip-test.xml Fri Feb 19
12:07:01 2010
@@ -112,7 +112,7 @@
<target name="testCpioFileSet" depends="setUp">
<cmp:zip destfile="${dest}">
- <cmp:cpiofileset src="../resources/asf-logo.gif.cpio"
+ <cmp:cpiofileset src="../resources/asf-logo.gif.bin.cpio"
includes="asf-logo.gif"/>
</cmp:zip>
<checkProperties dateTime="2009-07-31-20:11:14 +0200" mode="644"
