ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anto...@apache.org
Subject cvs commit: ant/src/testcases/org/apache/tools/ant/taskdefs ReplaceTest.java
Date Tue, 23 Sep 2003 21:51:14 GMT
antoine     2003/09/23 14:51:14

  Modified:    src/etc/testcases/taskdefs replace.xml
               src/etc/testcases/taskdefs/replace result.txt
               src/testcases/org/apache/tools/ant/taskdefs ReplaceTest.java
  Log:
  Make replace tests pass on cygwin (test9 was failing)
  
  Revision  Changes    Path
  1.5       +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.5
  diff -u -r1.4 -r1.5
  --- replace.xml	28 Jul 2003 00:16:06 -0000	1.4
  +++ replace.xml	23 Sep 2003 21:51:14 -0000	1.5
  @@ -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>
  
  
  
  1.2       +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.2
  diff -u -r1.1 -r1.2
  --- result.txt	28 Jul 2003 00:16:06 -0000	1.1
  +++ result.txt	23 Sep 2003 21:51:14 -0000	1.2
  @@ -4,3 +4,4 @@
   This is line four
   This is line five
   This is line six
  +
  
  
  
  1.9       +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.9
  diff -u -r1.8 -r1.9
  --- ReplaceTest.java	28 Jul 2003 00:16:06 -0000	1.8
  +++ ReplaceTest.java	23 Sep 2003 21:51:14 -0000	1.9
  @@ -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: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org


Mime
View raw message