Browse Source

failing testcase for a combination of location and macrodef

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@442301 13f79535-47bb-0310-9956-ffa450edef68
master
Stefan Bodewig 19 years ago
parent
commit
cfce0c42ef
2 changed files with 41 additions and 1 deletions
  1. +25
    -0
      src/etc/testcases/core/location.xml
  2. +16
    -1
      src/testcases/org/apache/tools/ant/LocationTest.java

+ 25
- 0
src/etc/testcases/core/location.xml View File

@@ -35,4 +35,29 @@
</condition>
</target>

<target name="define">
<property name="testclasses"
location="../../../../build/testcases" />
<taskdef name="echoloc"
classname="org.apache.tools.ant.LocationTest$EchoLocation">
<classpath>
<pathelement location="${testclasses}" />
<pathelement path="${java.class.path}"/>
</classpath>
</taskdef>
</target>

<target name="macrodef" depends="define">
<macrodef name="echoloc2" backtrace="false">
<sequential>
<echoloc/>
</sequential>
</macrodef>
</target>

<target name="testMacrodefWrappedTask" depends="macrodef">
<echo id="echo3">Hello</echo>
<echoloc2/>
</target>

</project>

+ 16
- 1
src/testcases/org/apache/tools/ant/LocationTest.java View File

@@ -51,4 +51,19 @@ public class LocationTest extends BuildFileTest {
assertFalse(c.getLocation() == Location.UNKNOWN_LOCATION);
assertFalse(c.getLocation().getLineNumber() == 0);
}
}

public void XtestMacrodefWrappedTask() {
executeTarget("testMacrodefWrappedTask");
Echo e = (Echo) getProject().getReference("echo3");
assertTrue(getLog().indexOf("Line: "
+ (e.getLocation().getLineNumber() + 1))
> -1);
}

public static class EchoLocation extends Task {
public void execute() {
log("Line: " + getLocation().getLineNumber(), Project.MSG_INFO);
}
}
}


Loading…
Cancel
Save