From c18d49c605b021d5db3d0dcceb3ba90efd951b1b Mon Sep 17 00:00:00 2001
From: Peter Reilly <peterreilly@apache.org>
Date: Wed, 17 Sep 2003 16:17:56 +0000
Subject: [PATCH] Update antlib testcases to reflect restrictions in tasks
 allowd in an antlib

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@275253 13f79535-47bb-0310-9956-ffa450edef68
---
 src/etc/testcases/taskdefs/antlib.current-test.xml          | 5 ++++-
 src/etc/testcases/taskdefs/antlib.xml                       | 2 ++
 src/testcases/org/apache/tools/ant/taskdefs/AntlibTest.java | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/etc/testcases/taskdefs/antlib.current-test.xml b/src/etc/testcases/taskdefs/antlib.current-test.xml
index 3efe95d5d..4ac46661c 100644
--- a/src/etc/testcases/taskdefs/antlib.current-test.xml
+++ b/src/etc/testcases/taskdefs/antlib.current-test.xml
@@ -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>
diff --git a/src/etc/testcases/taskdefs/antlib.xml b/src/etc/testcases/taskdefs/antlib.xml
index 4e9514303..cc41acadb 100644
--- a/src/etc/testcases/taskdefs/antlib.xml
+++ b/src/etc/testcases/taskdefs/antlib.xml
@@ -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>
\ No newline at end of file
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/AntlibTest.java b/src/testcases/org/apache/tools/ant/taskdefs/AntlibTest.java
index 7a912bba8..0679ead52 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/AntlibTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/AntlibTest.java
@@ -75,7 +75,7 @@ public class AntlibTest extends BuildFileTest {
     }
 
     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 {