Author: bodewig
Date: Tue Jul 25 21:58:57 2006
New Revision: 425623
URL: http://svn.apache.org/viewvc?rev=425623&view=rev
Log:
'test' is not an AntUnit test target
Modified:
ant/antlibs/antunit/trunk/docs/antunit.html
ant/antlibs/antunit/trunk/src/etc/testcases/antunit.xml
ant/antlibs/antunit/trunk/src/etc/testcases/antunit/base.xml
ant/antlibs/antunit/trunk/src/main/org/apache/ant/antunit/AntUnit.java
Modified: ant/antlibs/antunit/trunk/docs/antunit.html
URL:
http://svn.apache.org/viewvc/ant/antlibs/antunit/trunk/docs/antunit.html?rev=425623&r1=425622&r2=425623&view=diff
==============================================================================
--- ant/antlibs/antunit/trunk/docs/antunit.html (original)
+++ ant/antlibs/antunit/trunk/docs/antunit.html Tue Jul 25 21:58:57 2006
@@ -35,10 +35,10 @@
considered a failure. If Ant completes the target without any
exception, consider it a passed test.</p>
- <p>Tests are specified via filesets (to become ResourceCollection
- soon).</p>
+ <p>Tests are specified via ResourceCollections soon.</p>
- <p>All targets whose name starts with "test" are considered test
+ <p>All targets whose name starts with "test" (but not if the name
+ is "test" exactly) are considered test
cases. If a test build file contains a target named setUp, this
gets executed before each test target. If it contains a target
named tearDown this gets executed after each test target. Each
Modified: ant/antlibs/antunit/trunk/src/etc/testcases/antunit.xml
URL:
http://svn.apache.org/viewvc/ant/antlibs/antunit/trunk/src/etc/testcases/antunit.xml?rev=425623&r1=425622&r2=425623&view=diff
==============================================================================
--- ant/antlibs/antunit/trunk/src/etc/testcases/antunit.xml (original)
+++ ant/antlibs/antunit/trunk/src/etc/testcases/antunit.xml Tue Jul 25 21:58:57
2006
@@ -1,5 +1,4 @@
<?xml version="1.0"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
Modified: ant/antlibs/antunit/trunk/src/etc/testcases/antunit/base.xml
URL:
http://svn.apache.org/viewvc/ant/antlibs/antunit/trunk/src/etc/testcases/antunit/base.xml?rev=425623&r1=425622&r2=425623&view=diff
==============================================================================
--- ant/antlibs/antunit/trunk/src/etc/testcases/antunit/base.xml (original)
+++ ant/antlibs/antunit/trunk/src/etc/testcases/antunit/base.xml Tue Jul 25
21:58:57 2006
@@ -60,6 +60,10 @@
<au:assertReferenceSet refid="ant.antunit.log"/>
</target>
+ <target name="test">
+ <fail>should be ignored</fail>
+ </target>
+
<target name="tearDown">
<echo>tearDown</echo>
</target>
Modified: ant/antlibs/antunit/trunk/src/main/org/apache/ant/antunit/AntUnit.java
URL:
http://svn.apache.org/viewvc/ant/antlibs/antunit/trunk/src/main/org/apache/ant/antunit/AntUnit.java?rev=425623&r1=425622&r2=425623&view=diff
==============================================================================
--- ant/antlibs/antunit/trunk/src/main/org/apache/ant/antunit/AntUnit.java
(original)
+++ ant/antlibs/antunit/trunk/src/main/org/apache/ant/antunit/AntUnit.java Tue
Jul 25 21:58:57 2006
@@ -192,7 +192,7 @@
Iterator iter = targets.keySet().iterator();
while (iter.hasNext()) {
String name = (String) iter.next();
- if (name.startsWith(TEST)) {
+ if (name.startsWith(TEST) && !name.equals(TEST)) {
Vector v = new Vector();
if (setUp != null) {
v.add(SETUP);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
