darrell 2002/06/10 20:52:58
Modified: antlib project.xml
site/src/xdocs project-descriptor.xml
tools/xsl build.xsl
Log:
Can now specify Unit tests which are known to fail in project.xml. A
<failing> element
within <unitTest> indicates that the test is known to fail, and the build
will not halt on
failure of these tests.
o.a.m.antlib.core.test.CopyFilesTaskTestCase is currently failing (for me),
and so gives a good example.
Revision Changes Path
1.10 +3 -1 jakarta-ant-myrmidon/antlib/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-ant-myrmidon/antlib/project.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- project.xml 22 May 2002 07:36:21 -0000 1.9
+++ project.xml 11 Jun 2002 03:52:58 -0000 1.10
@@ -100,5 +100,7 @@
<path location="../container/build/test/classes"/>
<path location="../framework/build/test/classes"/>
</classpath>
+
+ <failing>**/CopyFilesTaskTestCase.class</failing>
</unitTest>
-</project>
\ No newline at end of file
+</project>
1.5 +10 -1
jakarta-ant-myrmidon/site/src/xdocs/project-descriptor.xml
Index: project-descriptor.xml
===================================================================
RCS file:
/home/cvs/jakarta-ant-myrmidon/site/src/xdocs/project-descriptor.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- project-descriptor.xml 16 May 2002 01:28:28 -0000 1.4
+++ project-descriptor.xml 11 Jun 2002 03:52:58 -0000 1.5
@@ -227,6 +227,15 @@
<td>no</td>
</tr>
+ <tr>
+ <td>failing</td>
+ <td>Each failing element contains a pattern that matches
a unit test(s)
+ which is known to fail. These tests are run, but do not
abort the
+ build when they fail. This allows tests to be added
prior to implementing
+ the test solutions.</td>
+ <td>no</td>
+ </tr>
+
</table>
</subsection>
@@ -304,4 +313,4 @@
</body>
-</document>
\ No newline at end of file
+</document>
1.25 +18 -2 jakarta-ant-myrmidon/tools/xsl/build.xsl
Index: build.xsl
===================================================================
RCS file: /home/cvs/jakarta-ant-myrmidon/tools/xsl/build.xsl,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- build.xsl 1 Jun 2002 06:46:29 -0000 1.24
+++ build.xsl 11 Jun 2002 03:52:58 -0000 1.25
@@ -203,7 +203,6 @@
<junit fork="${{junit.fork}}"
haltonfailure="${{junit.failonerror}}"
- failureProperty="tests.failed"
printsummary="yes" >
<classpath>
@@ -219,13 +218,30 @@
<formatter type="xml"/> <!-- xml reports for
junitreport -->
<formatter type="plain"/> <!-- text reports for
humans -->
- <batchtest todir="${{build.tests}}">
+ <!-- Tests which should succeed -->
+ <batchtest todir="${{build.tests}}"
+ failureProperty="tests.failed">
+
<fileset dir="${{test.classes}}">
<include
name="**/${{single.test}}TestCase.class"/>
<exclude name="**/Abstract*"/>
<xsl:copy-of
select="unitTest/unitTestPatterns/*"/>
+ <xsl:for-each select="unitTest/failing">
+ <exclude name="{.}"/>
+ </xsl:for-each>
+ </fileset>
+ </batchtest>
+
+ <xsl:if test="unitTest/failing">
+ <batchtest todir="${{build.tests}}">
+ <fileset dir="${{test.classes}}">
+ <xsl:copy-of
select="unitTest/unitTestPatterns/*"/>
+ <xsl:for-each select="unitTest/failing">
+ <include name="{.}"/>
+ </xsl:for-each>
</fileset>
</batchtest>
+ </xsl:if>
</junit>
</target>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
