Browse Source

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
master
Peter Reilly 22 years ago
parent
commit
c18d49c605
3 changed files with 7 additions and 2 deletions
  1. +4
    -1
      src/etc/testcases/taskdefs/antlib.current-test.xml
  2. +2
    -0
      src/etc/testcases/taskdefs/antlib.xml
  3. +1
    -1
      src/testcases/org/apache/tools/ant/taskdefs/AntlibTest.java

+ 4
- 1
src/etc/testcases/taskdefs/antlib.current-test.xml View File

@@ -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>


+ 2
- 0
src/etc/testcases/taskdefs/antlib.xml View File

@@ -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
- 1
src/testcases/org/apache/tools/ant/taskdefs/AntlibTest.java View File

@@ -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 {


Loading…
Cancel
Save