antoine 2003/09/23 15:15:32
Modified: src/etc/testcases/taskdefs Tag: ANT_16_BRANCH replace.xml
src/etc/testcases/taskdefs/replace Tag: ANT_16_BRANCH
result.txt
src/testcases/org/apache/tools/ant/taskdefs Tag:
ANT_16_BRANCH ReplaceTest.java
Log:
Merge from HEAD into ANT_16_BRANCH the fix for ReplaceTest
to make test9 pass under cygwin
Revision Changes Path
No revision
No revision
1.4.2.1 +16 -5 ant/src/etc/testcases/taskdefs/replace.xml
Index: replace.xml
===================================================================
RCS file: /home/cvs/ant/src/etc/testcases/taskdefs/replace.xml,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- replace.xml 28 Jul 2003 00:16:06 -0000 1.4
+++ replace.xml 23 Sep 2003 22:15:32 -0000 1.4.2.1
@@ -2,6 +2,8 @@
<project name="xxx-test" basedir="." default="test1">
+ <property name="tmp.dir" location="replace/tmp"/>
+
<target name="test1">
<replace/>
</target>
@@ -41,13 +43,22 @@
</replace>
</target>
- <target name="test9">
- <copy file="replace/source.txt" tofile="replace/output.txt"/>
- <loadfile srcFile="replace/value.txt" property="content"/>
- <replace file="replace/output.txt" token="@@@Replace this@@@"
value="${content}"/>
+ <target name="test9-setup">
+ <!-- this fixing of line endings is necessary because the replace task
is transforming the line endings -->
+ <!-- of the replacement tokens and values to the platform default -->
+ <!-- in certain cases (checkout done with cvs of cygwin, the line
endings of the various files do not match-->
+ <!-- the system property line.separator -->
+ <copy file="replace/source.txt" tofile="${tmp.dir}/output.txt"/>
+ <copy file="replace/value.txt" tofile="${tmp.dir}/value.txt" />
+ <copy file="replace/result.txt" tofile="${tmp.dir}/result.txt" />
+ <fixcrlf srcdir="${tmp.dir}" includes="*.txt"/>
+ </target>
+ <target name="test9" depends="test9-setup">
+ <loadfile srcFile="${tmp.dir}/value.txt" property="content"/>
+ <replace file="${tmp.dir}/output.txt" token="@@@Replace this@@@"
value="${content}"/>
</target>
<target name="cleanup">
- <delete file="replace/output.txt" quiet="true"/>
+ <delete dir="${tmp.dir}" quiet="true"/>
</target>
</project>
No revision
No revision
1.1.2.1 +1 -0 ant/src/etc/testcases/taskdefs/replace/result.txt
Index: result.txt
===================================================================
RCS file: /home/cvs/ant/src/etc/testcases/taskdefs/replace/result.txt,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- result.txt 28 Jul 2003 00:16:06 -0000 1.1
+++ result.txt 23 Sep 2003 22:15:32 -0000 1.1.2.1
@@ -4,3 +4,4 @@
This is line four
This is line five
This is line six
+
No revision
No revision
1.8.2.1 +3 -2
ant/src/testcases/org/apache/tools/ant/taskdefs/ReplaceTest.java
Index: ReplaceTest.java
===================================================================
RCS file:
/home/cvs/ant/src/testcases/org/apache/tools/ant/taskdefs/ReplaceTest.java,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -r1.8 -r1.8.2.1
--- ReplaceTest.java 28 Jul 2003 00:16:06 -0000 1.8
+++ ReplaceTest.java 23 Sep 2003 22:15:32 -0000 1.8.2.1
@@ -108,8 +108,9 @@
public void test9() throws IOException{
executeTarget("test9");
- assertEqualContent(new File(TEST_PATH + "result.txt"),
- new File(TEST_PATH + "output.txt"));
+ String tmpdir = project.getProperty("tmp.dir");
+ assertEqualContent(new File(tmpdir, "result.txt"),
+ new File(tmpdir, "output.txt"));
}
public void tearDown() {
executeTarget("cleanup");
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
