bodewig 2005/03/14 01:19:30
Modified: . Tag: ANT_16_BRANCH CONTRIBUTORS WHATSNEW
src/etc Tag: ANT_16_BRANCH junit-frames.xsl
src/main/org/apache/tools/ant/taskdefs/optional/junit Tag:
ANT_16_BRANCH XMLConstants.java
XMLResultAggregator.java
Log:
merge
Revision Changes Path
No revision
No revision
1.1.2.32 +1 -0 ant/CONTRIBUTORS
Index: CONTRIBUTORS
===================================================================
RCS file: /home/cvs/ant/CONTRIBUTORS,v
retrieving revision 1.1.2.31
retrieving revision 1.1.2.32
diff -u -r1.1.2.31 -r1.1.2.32
--- CONTRIBUTORS 7 Mar 2005 09:38:00 -0000 1.1.2.31
+++ CONTRIBUTORS 14 Mar 2005 09:19:29 -0000 1.1.2.32
@@ -216,4 +216,5 @@
Wolf Siberski
Yohann Roussel
Yuji Yamano
+Yves Martin
Zdenek Wagner
1.503.2.193 +3 -0 ant/WHATSNEW
Index: WHATSNEW
===================================================================
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.503.2.192
retrieving revision 1.503.2.193
diff -u -r1.503.2.192 -r1.503.2.193
--- WHATSNEW 11 Mar 2005 08:48:19 -0000 1.503.2.192
+++ WHATSNEW 14 Mar 2005 09:19:29 -0000 1.503.2.193
@@ -244,6 +244,9 @@
* Get with usetimestamp did not work when local timestamp roughly >= now.
+* The framed JUnit report now handles multiple reports for the same
+ testcase properly. Bugzilla Report 32745.
+
Changes from Ant 1.6.1 to Ant 1.6.2
===================================
No revision
No revision
1.16.2.6 +9 -9 ant/src/etc/junit-frames.xsl
Index: junit-frames.xsl
===================================================================
RCS file: /home/cvs/ant/src/etc/junit-frames.xsl,v
retrieving revision 1.16.2.5
retrieving revision 1.16.2.6
diff -u -r1.16.2.5 -r1.16.2.6
--- junit-frames.xsl 25 Jun 2004 13:50:16 -0000 1.16.2.5
+++ junit-frames.xsl 14 Mar 2005 09:19:29 -0000 1.16.2.6
@@ -6,7 +6,7 @@
<xsl:output method="html" indent="yes" encoding="US-ASCII"/>
<xsl:decimal-format decimal-separator="." grouping-separator=","/>
<!--
- Copyright 2001-2004 The Apache Software Foundation
+ Copyright 2001-2005 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -95,16 +95,16 @@
<!-- for each class, creates a @name.html -->
<!-- @bug there will be a problem with inner classes having the same
name, it will be overwritten -->
<xsl:for-each select="/testsuites/[EMAIL PROTECTED] = $name]">
- <redirect:write file="{$output.dir}/{$package.dir}/[EMAIL
PROTECTED]">
+ <redirect:write file="{$output.dir}/{$package.dir}/[EMAIL
PROTECTED]@name}.html">
<xsl:apply-templates select="." mode="class.details"/>
</redirect:write>
<xsl:if test="string-length(./system-out)!=0">
- <redirect:write file="{$output.dir}/{$package.dir}/[EMAIL
PROTECTED]">
+ <redirect:write file="{$output.dir}/{$package.dir}/[EMAIL
PROTECTED]@name}-out.txt">
<xsl:value-of select="./system-out" />
</redirect:write>
</xsl:if>
<xsl:if test="string-length(./system-err)!=0">
- <redirect:write file="{$output.dir}/{$package.dir}/[EMAIL
PROTECTED]">
+ <redirect:write file="{$output.dir}/{$package.dir}/[EMAIL
PROTECTED]@name}-err.txt">
<xsl:value-of select="./system-err" />
</redirect:write>
</xsl:if>
@@ -265,7 +265,7 @@
<xsl:if test="string-length(./system-out)!=0">
<div class="Properties">
<a>
- <xsl:attribute name="href">./<xsl:value-of
select="@name"/>-out.txt</xsl:attribute>
+ <xsl:attribute name="href">./<xsl:value-of
select="@id"/>_<xsl:value-of select="@name"/>-out.txt</xsl:attribute>
System.out »
</a>
</div>
@@ -273,7 +273,7 @@
<xsl:if test="string-length(./system-err)!=0">
<div class="Properties">
<a>
- <xsl:attribute name="href">./<xsl:value-of
select="@name"/>-err.txt</xsl:attribute>
+ <xsl:attribute name="href">./<xsl:value-of
select="@id"/>_<xsl:value-of select="@name"/>-err.txt</xsl:attribute>
System.err »
</a>
</div>
@@ -328,7 +328,7 @@
<xsl:sort select="@name"/>
<tr>
<td nowrap="nowrap">
- <a href="[EMAIL PROTECTED]"
target="classFrame"><xsl:value-of select="@name"/></a>
+ <a href="[EMAIL PROTECTED]@name}.html"
target="classFrame"><xsl:value-of select="@name"/></a>
</td>
</tr>
</xsl:for-each>
@@ -369,7 +369,7 @@
<xsl:attribute name="href">
<xsl:if test="not($package.name='')">
<xsl:value-of
select="translate($package.name,'.','/')"/><xsl:text>/</xsl:text>
- </xsl:if><xsl:value-of
select="@name"/><xsl:text>.html</xsl:text>
+ </xsl:if><xsl:value-of select="@id"/>_<xsl:value-of
select="@name"/><xsl:text>.html</xsl:text>
</xsl:attribute>
<xsl:value-of select="@name"/>
</a>
@@ -612,7 +612,7 @@
<xsl:otherwise>Pass</xsl:otherwise>
</xsl:choose>
</xsl:attribute>
- <td><a href="[EMAIL PROTECTED]"><xsl:value-of
select="@name"/></a></td>
+ <td><a href="[EMAIL PROTECTED]@name}.html"><xsl:value-of
select="@name"/></a></td>
<td><xsl:apply-templates select="@tests"/></td>
<td><xsl:apply-templates select="@errors"/></td>
<td><xsl:apply-templates select="@failures"/></td>
No revision
No revision
1.7.2.5 +3 -1
ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLConstants.java
Index: XMLConstants.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLConstants.java,v
retrieving revision 1.7.2.4
retrieving revision 1.7.2.5
diff -u -r1.7.2.4 -r1.7.2.5
--- XMLConstants.java 9 Mar 2004 17:01:50 -0000 1.7.2.4
+++ XMLConstants.java 14 Mar 2005 09:19:30 -0000 1.7.2.5
@@ -1,5 +1,5 @@
/*
- * Copyright 2001,2004 The Apache Software Foundation
+ * Copyright 2001,2004-2005 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -86,4 +86,6 @@
/** classname attribute for testcase elements */
String ATTR_CLASSNAME = "classname";
+ /** id attribute */
+ String ATTR_ID = "id";
}
1.25.2.6 +8 -1
ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java
Index: XMLResultAggregator.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java,v
retrieving revision 1.25.2.5
retrieving revision 1.25.2.6
diff -u -r1.25.2.5 -r1.25.2.6
--- XMLResultAggregator.java 1 Dec 2004 17:38:07 -0000 1.25.2.5
+++ XMLResultAggregator.java 14 Mar 2005 09:19:30 -0000 1.25.2.6
@@ -1,5 +1,5 @@
/*
- * Copyright 2001-2004 The Apache Software Foundation
+ * Copyright 2001-2005 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -73,6 +73,9 @@
/** the default file name: <tt>TESTS-TestSuites.xml</tt> */
public static final String DEFAULT_FILENAME = "TESTS-TestSuites.xml";
+ /** the current generated id */
+ protected int generatedId = 0;
+
/**
* Generate a report based on the document created by the merge.
* @return the report
@@ -225,6 +228,8 @@
Element rootElement = doc.createElement(TESTSUITES);
doc.appendChild(rootElement);
+ generatedId = 0;
+
// get all files and add them to the document
File[] files = getFiles();
for (int i = 0; i < files.length; i++) {
@@ -239,6 +244,7 @@
// make sure that this is REALLY a testsuite.
if (TESTSUITE.equals(elem.getNodeName())) {
addTestSuite(rootElement, elem);
+ generatedId++;
} else {
// issue a warning.
log("the file " + files[i]
@@ -283,6 +289,7 @@
// modify the name attribute and set the package
copy.setAttribute(ATTR_NAME, classname);
copy.setAttribute(ATTR_PACKAGE, pkgName);
+ copy.setAttribute(ATTR_ID, Integer.toString(generatedId));
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
