From fb28169fe94e85625f329465030b5ab1e7d89afd Mon Sep 17 00:00:00 2001
From: Antoine Levy-Lambert <antoine@apache.org>
Date: Tue, 23 Sep 2003 21:51:14 +0000
Subject: [PATCH] Make replace tests pass on cygwin (test9 was failing)

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@275322 13f79535-47bb-0310-9956-ffa450edef68
---
 src/etc/testcases/taskdefs/replace.xml        | 21 ++++++++++++++-----
 src/etc/testcases/taskdefs/replace/result.txt |  1 +
 .../tools/ant/taskdefs/ReplaceTest.java       |  5 +++--
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/etc/testcases/taskdefs/replace.xml b/src/etc/testcases/taskdefs/replace.xml
index 079d34a9f..44eb0c18b 100644
--- a/src/etc/testcases/taskdefs/replace.xml
+++ b/src/etc/testcases/taskdefs/replace.xml
@@ -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>
diff --git a/src/etc/testcases/taskdefs/replace/result.txt b/src/etc/testcases/taskdefs/replace/result.txt
index 15b2d6961..a74e06ea3 100644
--- a/src/etc/testcases/taskdefs/replace/result.txt
+++ b/src/etc/testcases/taskdefs/replace/result.txt
@@ -4,3 +4,4 @@ This is line three
 This is line four
 This is line five
 This is line six
+
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/ReplaceTest.java b/src/testcases/org/apache/tools/ant/taskdefs/ReplaceTest.java
index 66c1008c4..c38b1c8e6 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/ReplaceTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/ReplaceTest.java
@@ -108,8 +108,9 @@ public class ReplaceTest extends BuildFileTest {
 
     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");