ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From peterrei...@apache.org
Subject cvs commit: ant/src/etc/testcases/taskdefs antlib.xml antlib.current-test.xml
Date Wed, 17 Sep 2003 16:17:57 GMT
peterreilly    2003/09/17 09:17:56

  Modified:    src/testcases/org/apache/tools/ant/taskdefs AntlibTest.java
               src/etc/testcases/taskdefs antlib.xml
                        antlib.current-test.xml
  Log:
  Update antlib testcases to reflect restrictions in
  tasks allowd in an antlib
  
  Revision  Changes    Path
  1.3       +1 -1      ant/src/testcases/org/apache/tools/ant/taskdefs/AntlibTest.java
  
  Index: AntlibTest.java
  ===================================================================
  RCS file: /home/cvs/ant/src/testcases/org/apache/tools/ant/taskdefs/AntlibTest.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AntlibTest.java	10 Sep 2003 10:37:14 -0000	1.2
  +++ AntlibTest.java	17 Sep 2003 16:17:56 -0000	1.3
  @@ -75,7 +75,7 @@
       }
   
       public void testNsCurrent() {
  -        expectLog("ns.current", "Echo2 calledEcho2 inside a macro");
  +        expectLog("ns.current", "Echo2 inside a macroHello from x:p");
       }
   
       public static class MyTask extends Task {
  
  
  
  1.3       +2 -0      ant/src/etc/testcases/taskdefs/antlib.xml
  
  Index: antlib.xml
  ===================================================================
  RCS file: /home/cvs/ant/src/etc/testcases/taskdefs/antlib.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- antlib.xml	10 Sep 2003 10:37:13 -0000	1.2
  +++ antlib.xml	17 Sep 2003 16:17:56 -0000	1.3
  @@ -17,5 +17,7 @@
     <target name="ns.current">
       <typedef file="antlib.current-test.xml" uri="abc"/>
       <x:useecho2 xmlns:x="abc"/>
  +    <x:preset.echo xmlns:x="abc" name="p"/>
  +    <x:p xmlns:x="abc">Hello from x:p</x:p>
     </target>
   </project>
  
  
  
  1.2       +4 -1      ant/src/etc/testcases/taskdefs/antlib.current-test.xml
  
  Index: antlib.current-test.xml
  ===================================================================
  RCS file: /home/cvs/ant/src/etc/testcases/taskdefs/antlib.current-test.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- antlib.current-test.xml	10 Sep 2003 10:37:13 -0000	1.1
  +++ antlib.current-test.xml	17 Sep 2003 16:17:56 -0000	1.2
  @@ -1,7 +1,10 @@
   <?xml version="1.0"?>
   <antlib xmlns:c="ant:current">
     <typedef name="echo2" classname="org.apache.tools.ant.taskdefs.Echo"/>
  -  <c:echo2>Echo2 called</c:echo2>
  +  <presetdef name="preset.echo">
  +    <typedef classname="org.apache.tools.ant.taskdefs.Echo"/>
  +  </presetdef>
  +  <c:preset.echo name="p"/>
     <macrodef name="useecho2">
       <sequential>
         <c:echo2>Echo2 inside a macro</c:echo2>
  
  
  

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


Mime
View raw message