diff --git a/docs/assertions.html b/docs/assertions.html index 4008844..a08bb40 100644 --- a/docs/assertions.html +++ b/docs/assertions.html @@ -440,11 +440,11 @@

Examples

-

Make the build fail if Ant's current Executor is not of type - org.apache.tools.ant.helper.DefaultExecutor:

+

Make the build fail if the reference classpath has not + been set or doesn't point to a <path>.

-      <assertReferenceIsType name="ant.executor" type="org.apache.tools.ant.helper.DefaultExecutor"/>
+      <assertReferenceIsType refid="classpath" type="path"/>
     

assertLogContains

diff --git a/src/etc/testcases/assert.xml b/src/etc/testcases/assert.xml index 4df83e6..e162728 100644 --- a/src/etc/testcases/assert.xml +++ b/src/etc/testcases/assert.xml @@ -167,15 +167,15 @@ - + - + - + diff --git a/src/testcases/org/apache/ant/antunit/AssertTest.java b/src/testcases/org/apache/ant/antunit/AssertTest.java index c293baf..9e4977f 100644 --- a/src/testcases/org/apache/ant/antunit/AssertTest.java +++ b/src/testcases/org/apache/ant/antunit/AssertTest.java @@ -71,8 +71,7 @@ public class AssertTest extends BuildFileTest { public void testReferenceSetPass() { testPass("assertReferenceSetPass"); } - // fails, probably due to classloader issues - public void NotestReferenceIsTypePass() { + public void testReferenceIsTypePass() { testPass("assertReferenceIsTypePass"); } @@ -133,7 +132,7 @@ public class AssertTest extends BuildFileTest { } public void testReferenceIsTypeFailWrongType() { testFail("assertReferenceIsTypeFailWrongType", - "Expected reference 'foo5' to be a 'org.apache.tools.ant.types.FileSet'"); + "Expected reference 'foo5' to be a 'fileset'"); } private void testPass(String target) {