conor 2003/09/24 23:19:51
Modified: src/etc/testcases/filters Tag: ANT_16_BRANCH concat.xml
src/testcases/org/apache/tools/ant/filters Tag:
ANT_16_BRANCH ConcatFilterTest.java
Log:
merge
Revision Changes Path
No revision
No revision
1.2.2.2 +7 -7 ant/src/etc/testcases/filters/concat.xml
Index: concat.xml
===================================================================
RCS file: /home/cvs/ant/src/etc/testcases/filters/concat.xml,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -w -u -r1.2.2.1 -r1.2.2.2
--- concat.xml 23 Sep 2003 21:07:00 -0000 1.2.2.1
+++ concat.xml 25 Sep 2003 06:19:51 -0000 1.2.2.2
@@ -19,7 +19,7 @@
<target name="testFilterReaderNoArgs" depends="init">
<copy file="input/concatfilter.test"
- tofile="result/concat.filterReaderNoArgs.test">
+ tofile="result/concat.FilterReaderNoArgs.test">
<filterchain>
<filterreader classname="org.apache.tools.ant.filters.ConcatFilter"/>
</filterchain>
@@ -28,7 +28,7 @@
<target name="testFilterReaderPrepend" depends="init">
<copy file="input/concatfilter.test"
- tofile="result/concat.filterReaderPrepend.test">
+ tofile="result/concat.FilterReaderPrepend.test">
<filterchain>
<filterreader classname="org.apache.tools.ant.filters.ConcatFilter">
<param name="prepend" value="result/prepend.txt"/>
@@ -39,7 +39,7 @@
<target name="testFilterReaderAppend" depends="init">
<copy file="input/concatfilter.test"
- tofile="result/concat.filterReaderAppend.test">
+ tofile="result/concat.FilterReaderAppend.test">
<filterchain>
<filterreader classname="org.apache.tools.ant.filters.ConcatFilter">
<param name="append" value="result/append.txt"/>
@@ -50,7 +50,7 @@
<target name="testFilterReaderPrependAppend" depends="init">
<copy file="input/concatfilter.test"
- tofile="result/concat.filterReaderPrependAppend.test">
+ tofile="result/concat.FilterReaderPrependAppend.test">
<filterchain>
<filterreader classname="org.apache.tools.ant.filters.ConcatFilter">
<param name="prepend" value="result/prepend.txt"/>
@@ -63,7 +63,7 @@
<target name="testConcatFilter" depends="init">
<typedef name="concatfilter"
classname="org.apache.tools.ant.filters.ConcatFilter"/>
<copy file="input/concatfilter.test"
- tofile="result/concat.concatfilter.test">
+ tofile="result/concat.ConcatFilter.test">
<filterchain>
<concatfilter/>
</filterchain>
@@ -73,7 +73,7 @@
<target name="testConcatFilterPrepend" depends="init">
<typedef name="concatfilter"
classname="org.apache.tools.ant.filters.ConcatFilter"/>
<copy file="input/concatfilter.test"
- tofile="result/concat.concatfilterPrepend.test">
+ tofile="result/concat.ConcatFilterPrepend.test">
<filterchain>
<concatfilter prepend="result/prepend.txt"/>
</filterchain>
@@ -83,7 +83,7 @@
<target name="testConcatFilterAppend" depends="init">
<typedef name="concatfilter"
classname="org.apache.tools.ant.filters.ConcatFilter"/>
<copy file="input/concatfilter.test"
- tofile="result/concat.concatfilterAppend.test">
+ tofile="result/concat.ConcatFilterAppend.test">
<filterchain>
<concatfilter append="result/append.txt"/>
</filterchain>
No revision
No revision
1.2.2.2 +1 -1
ant/src/testcases/org/apache/tools/ant/filters/ConcatFilterTest.java
Index: ConcatFilterTest.java
===================================================================
RCS file:
/home/cvs/ant/src/testcases/org/apache/tools/ant/filters/ConcatFilterTest.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -w -u -r1.2.2.1 -r1.2.2.2
--- ConcatFilterTest.java 23 Sep 2003 21:07:00 -0000 1.2.2.1
+++ ConcatFilterTest.java 25 Sep 2003 06:19:51 -0000 1.2.2.2
@@ -117,7 +117,7 @@
public void testFilterReaderNoArgs() throws IOException {
executeTarget("testFilterReaderNoArgs");
File expected = getProject().resolveFile("input/concatfilter.test");
- File result =
getProject().resolveFile("result/concat.filterReaderNoArgs.test");
+ File result =
getProject().resolveFile("result/concat.FilterReaderNoArgs.test");
assertTrue("testFilterReaderNoArgs: Result not like expected",
fu.contentEquals(expected, result));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
