ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject cvs commit: jakarta-ant/src/testcases/org/apache/tools/ant/types FilterSetTest.java
Date Wed, 22 Aug 2001 05:57:23 GMT
bodewig     01/08/21 22:57:23

  Modified:    src/etc/testcases/types Tag: ANT_14_BRANCH filterset.xml
               src/testcases/org/apache/tools/ant/types Tag: ANT_14_BRANCH
                        FilterSetTest.java
  Log:
  clean up after filterset tests, remove some stray ^M characters.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.2   +43 -37    jakarta-ant/src/etc/testcases/types/filterset.xml
  
  Index: filterset.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/etc/testcases/types/filterset.xml,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- filterset.xml	2001/08/17 15:08:46	1.1.2.1
  +++ filterset.xml	2001/08/22 05:57:23	1.1.2.2
  @@ -1,37 +1,43 @@
  -<project name="test" default="new" basedir=".">
  -  <filterset id="testset.one">
  -    <filter token="aaaa" value="1111"/>
  -    <filter token="bbbb" value="2222"/>
  -  </filterset>
  -  
  -  <filterset id="testset.two" beginToken="%" endToken="^">
  -    <filter token="cccc" value="3333"/>
  -    <filter token="dddd" value="4444"/>
  -  </filterset>
  -  
  -  <target name="test1">
  -    <delete file="dest1.txt"/>
  -    <copy file="filterseta.txt" tofile="dest1.txt">
  -        <filterset refid="testset.one"/> 
  -    </copy>
  -    <fixcrlf eol="lf" srcdir="." includes="dest1.txt"/>
  -  </target>
  -
  -  <target name="test2">
  -    <delete file="dest2.txt"/>
  -    <copy file="filtersetb.txt" tofile="dest2.txt">
  -        <filterset refid="testset.two"/> 
  -    </copy>
  -    <fixcrlf eol="lf" srcdir="." includes="dest2.txt"/>
  -  </target>
  -
  -  <target name="test3">
  -    <delete file="dest3.txt"/>
  -    <copy file="filtersetc.txt" tofile="dest3.txt">
  -        <filterset refid="testset.one"/> 
  -        <filterset refid="testset.two"/> 
  -    </copy>
  -    <fixcrlf eol="lf" srcdir="." includes="dest3.txt"/>
  -  </target>
  -  
  -</project>
  +<project name="test" default="new" basedir=".">
  +  <filterset id="testset.one">
  +    <filter token="aaaa" value="1111"/>
  +    <filter token="bbbb" value="2222"/>
  +  </filterset>
  +  
  +  <filterset id="testset.two" beginToken="%" endToken="^">
  +    <filter token="cccc" value="3333"/>
  +    <filter token="dddd" value="4444"/>
  +  </filterset>
  +  
  +  <target name="test1">
  +    <delete file="dest1.txt"/>
  +    <copy file="filterseta.txt" tofile="dest1.txt">
  +        <filterset refid="testset.one"/> 
  +    </copy>
  +    <fixcrlf eol="lf" srcdir="." includes="dest1.txt"/>
  +  </target>
  +
  +  <target name="test2">
  +    <delete file="dest2.txt"/>
  +    <copy file="filtersetb.txt" tofile="dest2.txt">
  +        <filterset refid="testset.two"/> 
  +    </copy>
  +    <fixcrlf eol="lf" srcdir="." includes="dest2.txt"/>
  +  </target>
  +
  +  <target name="test3">
  +    <delete file="dest3.txt"/>
  +    <copy file="filtersetc.txt" tofile="dest3.txt">
  +        <filterset refid="testset.one"/> 
  +        <filterset refid="testset.two"/> 
  +    </copy>
  +    <fixcrlf eol="lf" srcdir="." includes="dest3.txt"/>
  +  </target>
  +  
  +  <target name="cleanup">
  +    <delete file="dest1.txt" quiet="true" />
  +    <delete file="dest2.txt" quiet="true" />
  +    <delete file="dest3.txt" quiet="true" />
  +  </target>
  +
  +</project>
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.2   +4 -0      jakarta-ant/src/testcases/org/apache/tools/ant/types/FilterSetTest.java
  
  Index: FilterSetTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/testcases/org/apache/tools/ant/types/FilterSetTest.java,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- FilterSetTest.java	2001/08/17 15:10:22	1.1.2.1
  +++ FilterSetTest.java	2001/08/22 05:57:23	1.1.2.2
  @@ -82,6 +82,10 @@
           configureProject("src/etc/testcases/types/filterset.xml");
       }
   
  +    public void tearDown() {
  +        executeTarget("cleanup");
  +    }
  +
       public void test1() { 
           executeTarget("test1");
           assertTrue("Filterset 1 failed", compareFiles("src/etc/testcases/types/gold/filterset1.txt",
  
  
  

Mime
View raw message