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/taskdefs AbstractCvsTaskTest.java
Date Thu, 04 Apr 2002 10:20:20 GMT
bodewig     02/04/04 02:20:19

  Modified:    src/etc/testcases/taskdefs abstractcvstask.xml
               src/main/org/apache/tools/ant/taskdefs AbstractCvsTask.java
               src/testcases/org/apache/tools/ant BuildFileTest.java
               src/testcases/org/apache/tools/ant/taskdefs
                        AbstractCvsTaskTest.java
  Log:
  Make tag and date attributes of <cvs> work again as well.
  
  Revision  Changes    Path
  1.4       +13 -0     jakarta-ant/src/etc/testcases/taskdefs/abstractcvstask.xml
  
  Index: abstractcvstask.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/etc/testcases/taskdefs/abstractcvstask.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- abstractcvstask.xml	4 Apr 2002 07:43:35 -0000	1.3
  +++ abstractcvstask.xml	4 Apr 2002 10:20:19 -0000	1.4
  @@ -31,6 +31,19 @@
            quiet="true" />
     </target>
   
  +  <target name="tag-attribute">
  +    <mkdir dir="tmpdir" />
  +    <cvs cvsroot=":pserver:anoncvs@cvs.apache.org:/home/cvspublic"
  +         package="jakarta-ant/build.xml"
  +         dest="tmpdir"
  +         quiet="true"
  +         tag="ANT_141" />
  +    <cvs cvsroot=":pserver:anoncvs@cvs.apache.org:/home/cvspublic"
  +         package="jakarta-ant/build.xml"
  +         dest="tmpdir"
  +         command="status"/>
  +  </target>
  +
     <target name="cleanup">
       <delete dir="tmpdir" />
     </target>
  
  
  
  1.6       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java
  
  Index: AbstractCvsTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- AbstractCvsTask.java	4 Apr 2002 07:43:35 -0000	1.5
  +++ AbstractCvsTask.java	4 Apr 2002 10:20:19 -0000	1.6
  @@ -377,7 +377,7 @@
   
           String c = this.getCommand();
           if( c != null ) {
  -            this.cmd.createArgument().setLine(c);
  +            this.cmd.createArgument(true).setLine(c);
               this.addConfiguredCommandline( this.cmd, true );
           }
   
  
  
  
  1.13      +2 -1      jakarta-ant/src/testcases/org/apache/tools/ant/BuildFileTest.java
  
  Index: BuildFileTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/testcases/org/apache/tools/ant/BuildFileTest.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- BuildFileTest.java	4 Apr 2002 07:43:36 -0000	1.12
  +++ BuildFileTest.java	4 Apr 2002 10:20:19 -0000	1.13
  @@ -115,7 +115,8 @@
       protected void expectLogContaining(String target, String log) { 
           executeTarget(target);
           String realLog = getLog();
  -        assertTrue("expecting log to contain \""+log+"\"", 
  +        assertTrue("expecting log to contain \""+log+"\" log was \""
  +                   + realLog + "\"", 
                      realLog.indexOf(log) >= 0);
       }
   
  
  
  
  1.4       +8 -1      jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/AbstractCvsTaskTest.java
  
  Index: AbstractCvsTaskTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/AbstractCvsTaskTest.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- AbstractCvsTaskTest.java	4 Apr 2002 07:43:36 -0000	1.3
  +++ AbstractCvsTaskTest.java	4 Apr 2002 10:20:19 -0000	1.4
  @@ -60,7 +60,7 @@
   /**
    * @author stephan <stephan@wanderinghorse.net>
    * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
  - * @version $Revision: 1.3 $
  + * @version $Revision: 1.4 $
    */
   public class AbstractCvsTaskTest extends BuildFileTest {
   
  @@ -88,6 +88,13 @@
           File f = getProject().resolveFile("tmpdir/jakarta-ant/build.xml");
           assertTrue("starting empty", !f.exists());
           expectLogContaining("package-attribute", "U jakarta-ant/build.xml");
  +        assertTrue("now it is there", f.exists());
  +    }
  +
  +    public void testTagAttribute() {
  +        File f = getProject().resolveFile("tmpdir/jakarta-ant/build.xml");
  +        assertTrue("starting empty", !f.exists());
  +        expectLogContaining("tag-attribute", "ANT_141 (revision: 1.175.2.13)");
           assertTrue("now it is there", f.exists());
       }
   }
  
  
  

--
To unsubscribe, e-mail:   <mailto:ant-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:ant-dev-help@jakarta.apache.org>


Mime
View raw message