diff --git a/src/etc/poms/ant/pom.xml b/src/etc/poms/ant/pom.xml
index 73d324d98..71b0e730d 100644
--- a/src/etc/poms/ant/pom.xml
+++ b/src/etc/poms/ant/pom.xml
@@ -106,6 +106,38 @@
+
+ create-antlib-test-jar
+ process-test-classes
+
+ run
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
delete-timestamp-file
clean
@@ -317,6 +349,7 @@
../../../../src/main
../../../../src/tests/junit
+ ../../../../src/etc
../../../../target/${project.artifactId}/classes
../../../../target/${project.artifactId}/testcases
diff --git a/src/etc/testcases/core/dispatch/dispatch.xml b/src/etc/testcases/core/dispatch/dispatch.xml
index 589c6e197..017171880 100644
--- a/src/etc/testcases/core/dispatch/dispatch.xml
+++ b/src/etc/testcases/core/dispatch/dispatch.xml
@@ -19,7 +19,6 @@
-
diff --git a/src/etc/testcases/core/location.xml b/src/etc/testcases/core/location.xml
index 7e8f63943..425a6d0d6 100644
--- a/src/etc/testcases/core/location.xml
+++ b/src/etc/testcases/core/location.xml
@@ -36,12 +36,9 @@
-
+ classname="org.apache.tools.ant.LocationTest$EchoLocation">
-
@@ -70,5 +67,4 @@
Hello
-
-
\ No newline at end of file
+
diff --git a/src/etc/testcases/core/unknownelement.xml b/src/etc/testcases/core/unknownelement.xml
index b6d89394c..561cc5ec4 100644
--- a/src/etc/testcases/core/unknownelement.xml
+++ b/src/etc/testcases/core/unknownelement.xml
@@ -21,7 +21,6 @@
classname="org.apache.tools.ant.UnknownElementTest$Parent"
loaderref="unknown.id">
-
@@ -33,6 +32,7 @@
+
diff --git a/src/etc/testcases/filters/dynamicfilter.xml b/src/etc/testcases/filters/dynamicfilter.xml
index cb52d2158..76aeed5ce 100644
--- a/src/etc/testcases/filters/dynamicfilter.xml
+++ b/src/etc/testcases/filters/dynamicfilter.xml
@@ -20,17 +20,15 @@
-
+
-
-
+
-
+
diff --git a/src/etc/testcases/filters/tokenfilter.xml b/src/etc/testcases/filters/tokenfilter.xml
index b1b5aef4e..f34023065 100644
--- a/src/etc/testcases/filters/tokenfilter.xml
+++ b/src/etc/testcases/filters/tokenfilter.xml
@@ -20,7 +20,7 @@
-
+
@@ -314,14 +314,11 @@
-
-
+
-
-
+
diff --git a/src/etc/testcases/taskdefs/antlib.xml b/src/etc/testcases/taskdefs/antlib.xml
index d1c4061e1..377ad0dd2 100644
--- a/src/etc/testcases/taskdefs/antlib.xml
+++ b/src/etc/testcases/taskdefs/antlib.xml
@@ -17,11 +17,8 @@
-->
-
-
-
-
+
@@ -32,14 +29,14 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-and-then-
@@ -59,7 +56,7 @@
-
+
@@ -69,4 +66,4 @@
-
\ No newline at end of file
+
diff --git a/src/etc/testcases/taskdefs/dynamictask.xml b/src/etc/testcases/taskdefs/dynamictask.xml
index 307181f29..af1bfef98 100644
--- a/src/etc/testcases/taskdefs/dynamictask.xml
+++ b/src/etc/testcases/taskdefs/dynamictask.xml
@@ -19,14 +19,13 @@
-
-
+
-
+
diff --git a/src/etc/testcases/taskdefs/multimap.xml b/src/etc/testcases/taskdefs/multimap.xml
index ce4b12185..deb913bd0 100644
--- a/src/etc/testcases/taskdefs/multimap.xml
+++ b/src/etc/testcases/taskdefs/multimap.xml
@@ -20,8 +20,7 @@
-
-
+
movewithempty failed
-
diff --git a/src/etc/testcases/taskdefs/presetdef.xml b/src/etc/testcases/taskdefs/presetdef.xml
index 695747eb7..bd44b2a73 100644
--- a/src/etc/testcases/taskdefs/presetdef.xml
+++ b/src/etc/testcases/taskdefs/presetdef.xml
@@ -17,8 +17,7 @@
-->
-
-
+
@@ -119,7 +118,7 @@
-
+
@@ -127,7 +126,7 @@
-
+
@@ -135,13 +134,12 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/src/etc/testcases/taskdefs/taskdef.xml b/src/etc/testcases/taskdefs/taskdef.xml
index 4b0658e40..d19d1b25b 100644
--- a/src/etc/testcases/taskdefs/taskdef.xml
+++ b/src/etc/testcases/taskdefs/taskdef.xml
@@ -19,13 +19,11 @@
-
-
+
-
-
+
+
@@ -45,41 +43,39 @@
-
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
+
-
+
In target
In TaskContainer
diff --git a/src/etc/testcases/taskdefs/typeadapter.xml b/src/etc/testcases/taskdefs/typeadapter.xml
index c2aa70e1c..3a5686951 100644
--- a/src/etc/testcases/taskdefs/typeadapter.xml
+++ b/src/etc/testcases/taskdefs/typeadapter.xml
@@ -17,10 +17,8 @@
-->
-
-
-
+
@@ -74,6 +72,5 @@
onerror="ignore"/>
-
diff --git a/src/etc/testcases/taskdefs/typedef.xml b/src/etc/testcases/taskdefs/typedef.xml
index 1c7922b99..137a69546 100644
--- a/src/etc/testcases/taskdefs/typedef.xml
+++ b/src/etc/testcases/taskdefs/typedef.xml
@@ -23,16 +23,16 @@
-
+
-
+
-
+
@@ -41,25 +41,24 @@
-
-
+
-
+
-
+
-
+
-
+
@@ -79,6 +78,7 @@
-
+
+
diff --git a/src/etc/testcases/taskdefs/xmlns.xml b/src/etc/testcases/taskdefs/xmlns.xml
index c5703b8eb..74c8962ce 100644
--- a/src/etc/testcases/taskdefs/xmlns.xml
+++ b/src/etc/testcases/taskdefs/xmlns.xml
@@ -17,10 +17,8 @@
-->
-
-
diff --git a/src/etc/testcases/types/addtype.xml b/src/etc/testcases/types/addtype.xml
index cc8ff24c8..ec55e23f7 100644
--- a/src/etc/testcases/types/addtype.xml
+++ b/src/etc/testcases/types/addtype.xml
@@ -57,38 +57,37 @@
-
-
+
@@ -160,4 +159,5 @@
+
diff --git a/src/etc/testcases/types/flexinteger.xml b/src/etc/testcases/types/flexinteger.xml
index aa10aa07a..11774c6b2 100644
--- a/src/etc/testcases/types/flexinteger.xml
+++ b/src/etc/testcases/types/flexinteger.xml
@@ -18,15 +18,13 @@
-
-
+
+ classpathref="testclasses"/>
diff --git a/src/etc/testcases/types/mappers/define.mapperresult.xml b/src/etc/testcases/types/mappers/define.mapperresult.xml
index d9152a1ca..2ecff9b7e 100644
--- a/src/etc/testcases/types/mappers/define.mapperresult.xml
+++ b/src/etc/testcases/types/mappers/define.mapperresult.xml
@@ -17,7 +17,7 @@
-->
diff --git a/src/etc/testcases/types/poly.xml b/src/etc/testcases/types/poly.xml
index cabf9ece6..070dc9e7a 100644
--- a/src/etc/testcases/types/poly.xml
+++ b/src/etc/testcases/types/poly.xml
@@ -20,19 +20,18 @@
-
-
+
-
+
+ name="mypath" classname="${c}$MyPath"/>
+ name="mytask" classname="${c}$MyTask"/>
diff --git a/src/tests/junit/org/apache/tools/ant/DispatchTaskTest.java b/src/tests/junit/org/apache/tools/ant/DispatchTaskTest.java
index 079e7ecbd..13b68ed12 100644
--- a/src/tests/junit/org/apache/tools/ant/DispatchTaskTest.java
+++ b/src/tests/junit/org/apache/tools/ant/DispatchTaskTest.java
@@ -23,8 +23,6 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
-import static org.junit.Assert.assertNotNull;
-
public class DispatchTaskTest {
@Rule
@@ -35,7 +33,6 @@ public class DispatchTaskTest {
@Before
public void setUp() {
- assertNotNull("build.tests.value not set", System.getProperty("build.tests.value"));
buildRule.configureProject("src/etc/testcases/core/dispatch/dispatch.xml");
}
diff --git a/src/tests/junit/org/apache/tools/ant/UnknownElementTest.java b/src/tests/junit/org/apache/tools/ant/UnknownElementTest.java
index ebca7e40b..59a6d90c7 100644
--- a/src/tests/junit/org/apache/tools/ant/UnknownElementTest.java
+++ b/src/tests/junit/org/apache/tools/ant/UnknownElementTest.java
@@ -54,40 +54,40 @@ public class UnknownElementTest {
*/
@Test
@Ignore("Previously disabled through naming convention")
- public void XtestTaskFinishedEvent() {
+ public void testTaskFinishedEvent() {
buildRule.getProject().addBuildListener(new BuildListener() {
- public void buildStarted(BuildEvent event) {
- }
-
- public void buildFinished(BuildEvent event) {
- }
-
- public void targetStarted(BuildEvent event) {
- }
-
- public void targetFinished(BuildEvent event) {
- }
-
- public void taskStarted(BuildEvent event) {
- assertTaskProperties(event.getTask());
- }
-
- public void taskFinished(BuildEvent event) {
- assertTaskProperties(event.getTask());
- }
-
- public void messageLogged(BuildEvent event) {
- }
-
- private void assertTaskProperties(Task ue) {
- assertNotNull(ue);
- assertThat(ue, instanceOf(UnknownElement.class));
- Task t = ((UnknownElement) ue).getTask();
- assertNotNull(t);
- assertEquals("org.apache.tools.ant.taskdefs.Echo",
- t.getClass().getName());
- }
- });
+ public void buildStarted(BuildEvent event) {
+ }
+
+ public void buildFinished(BuildEvent event) {
+ }
+
+ public void targetStarted(BuildEvent event) {
+ }
+
+ public void targetFinished(BuildEvent event) {
+ }
+
+ public void taskStarted(BuildEvent event) {
+ assertTaskProperties(event.getTask());
+ }
+
+ public void taskFinished(BuildEvent event) {
+ assertTaskProperties(event.getTask());
+ }
+
+ public void messageLogged(BuildEvent event) {
+ }
+
+ private void assertTaskProperties(Task ue) {
+ assertNotNull(ue);
+ assertThat(ue, instanceOf(UnknownElement.class));
+ Task t = ((UnknownElement) ue).getTask();
+ assertNotNull(t);
+ assertEquals("org.apache.tools.ant.taskdefs.Echo",
+ t.getClass().getName());
+ }
+ });
buildRule.executeTarget("echo");
}
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/AntlibTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/AntlibTest.java
index 9fc99f346..99fe0e849 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/AntlibTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/AntlibTest.java
@@ -26,6 +26,7 @@ import org.junit.Rule;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
import static org.junit.Assume.assumeTrue;
/**
@@ -62,6 +63,7 @@ public class AntlibTest {
*/
@Test
public void testAntlibResource() {
+ assertNotNull("build.tests.value not set", System.getProperty("build.tests.value"));
buildRule.executeTarget("antlib.resource");
assertEquals("MyTask called-and-then-MyTask2 called", buildRule.getLog());
}
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/TypedefTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/TypedefTest.java
index d8e58216b..64b7ee0ea 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/TypedefTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/TypedefTest.java
@@ -51,10 +51,11 @@ public class TypedefTest {
// TODO assert value
}
- @Test(expected = BuildException.class)
+ @Test
public void testNoName() {
+ thrown.expect(BuildException.class);
+ thrown.expectMessage("Only antlib URIs can be located from the URI alone, not the URI ''");
buildRule.executeTarget("noName");
- // TODO assert value
}
@Test(expected = BuildException.class)
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/XmlnsTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/XmlnsTest.java
index 667eb6450..4f3f65d1f 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/XmlnsTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/XmlnsTest.java
@@ -19,7 +19,6 @@
package org.apache.tools.ant.taskdefs;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.BuildFileRule;
@@ -40,7 +39,6 @@ public class XmlnsTest {
@Before
public void setUp() {
- assertNotNull("build.tests.value not set", System.getProperty("build.tests.value"));
buildRule.configureProject("src/etc/testcases/taskdefs/xmlns.xml");
}
diff --git a/src/tests/junit/org/apache/tools/ant/types/AddTypeTest.java b/src/tests/junit/org/apache/tools/ant/types/AddTypeTest.java
index 88a5572c7..bcef3cd28 100644
--- a/src/tests/junit/org/apache/tools/ant/types/AddTypeTest.java
+++ b/src/tests/junit/org/apache/tools/ant/types/AddTypeTest.java
@@ -73,7 +73,7 @@ public class AddTypeTest {
@Test
public void testNestedB() {
buildRule.executeTarget("nested.b");
- assertThat(buildRule.getLog(), containsString("add B called"));
+ assertThat(buildRule.getLog(), containsString("add B called"));
}
@Test
diff --git a/src/tests/junit/org/apache/tools/ant/types/FlexIntegerTest.java b/src/tests/junit/org/apache/tools/ant/types/FlexIntegerTest.java
index dd01ff7e9..e5ed4da71 100644
--- a/src/tests/junit/org/apache/tools/ant/types/FlexIntegerTest.java
+++ b/src/tests/junit/org/apache/tools/ant/types/FlexIntegerTest.java
@@ -47,10 +47,10 @@ public class FlexIntegerTest {
// This class acts as a custom Ant task also
// and uses these variables/methods in that mode
private Project taskProject;
- String propName;
- private FlexInteger value;
+ String propName;
+ private FlexInteger value;
public void setPropName(String propName) {
this.propName = propName;
diff --git a/src/tests/junit/org/apache/tools/ant/types/PathTest.java b/src/tests/junit/org/apache/tools/ant/types/PathTest.java
index 22587efe4..391242d62 100644
--- a/src/tests/junit/org/apache/tools/ant/types/PathTest.java
+++ b/src/tests/junit/org/apache/tools/ant/types/PathTest.java
@@ -19,6 +19,7 @@
package org.apache.tools.ant.types;
import java.io.File;
+import java.nio.file.Paths;
import java.util.Locale;
import org.apache.tools.ant.BuildException;
@@ -32,6 +33,7 @@ import org.junit.rules.ExpectedException;
import static org.hamcrest.Matchers.endsWith;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertThat;
/**
@@ -573,11 +575,14 @@ public class PathTest {
DirSet d = new DirSet();
d.setProject(project);
d.setDir(project.resolveFile("."));
- d.setIncludes("build");
+ String s = System.getProperty("build.tests.value");
+ assertNotNull("build.tests.value not set", s);
+ String n = Paths.get(s).getParent().equals("ant") ? "ant" : "build";
+ d.setIncludes(n);
p.addDirset(d);
String[] l = p.list();
assertEquals(1, l.length);
- assertEquals(project.resolveFile("build").getAbsolutePath(), l[0]);
+ assertEquals(project.resolveFile(n).getAbsolutePath(), l[0]);
}
@Test