dion 2003/08/04 19:34:22
Modified: src/plugins-build/junit-report/src/plugin-resources
junit.jsl
Log:
Apply fixes for MAVEN-649
Revision Changes Path
1.6 +23 -7
maven/src/plugins-build/junit-report/src/plugin-resources/junit.jsl
Index: junit.jsl
===================================================================
RCS file:
/home/cvs/maven/src/plugins-build/junit-report/src/plugin-resources/junit.jsl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- junit.jsl 4 Aug 2003 12:10:50 -0000 1.5
+++ junit.jsl 5 Aug 2003 02:34:22 -0000 1.6
@@ -117,7 +117,9 @@
<section name="Package List">
<junit:nav/>
<table>
- <junit:testSuiteHeader/>
+ <tr>
+
<th>Package</th><th>Tests</th><th>Errors</th><th>Failures</th><th>Success
Rate</th><th>Time</th>
+ </tr>
<x:set var="testsuites" select="./testsuite[not(./@package =
preceding-sibling::testsuite/@package)]"/>
<j:forEach var="testsuite" items="${testsuites}">
<j:set var="package" value="${testsuite.attribute('package').value}"/>
@@ -126,7 +128,7 @@
<j:set var="errorCount"><x:expr select="sum(./testsuite[./@package =
$quotedPackage]/@errors)"/></j:set>
<j:set var="failureCount"><x:expr select="sum(./testsuite[./@package
= $quotedPackage]/@failures)"/></j:set>
<j:set var="timeCount"><x:expr select="sum(./testsuite[./@package =
$quotedPackage]/@time)"/></j:set>
-
+ <j:set var="successRate"><x:expr select="($testCount - ($failureCount
+ $errorCount)) div $testCount"/></j:set>
<tr>
<td>
<a href="#${package}">${package}</a>
@@ -135,10 +137,13 @@
<doc:formatAsNumber string="${testCount}" pattern="0"/>
</td>
<td>
+ <doc:formatAsNumber string="${errorCount}" pattern="0"/>
+ </td>
+ <td>
<doc:formatAsNumber string="${failureCount}" pattern="0"/>
</td>
<td>
- <doc:formatAsNumber string="${errorCount}" pattern="0"/>
+ <doc:formatAsNumber string="${successRate}" pattern="0.00%"/>
</td>
<td>
<doc:formatAsNumber string="${timeCount}" pattern="0.00"/>
@@ -158,20 +163,29 @@
<a name="${package}"></a>
<subsection name="${package}">
<table>
- <junit:testSuiteHeader/>
+ <tr>
+
<th>Class</th><th>Tests</th><th>Errors</th><th>Failures</th><th>Success
Rate</th><th>Time</th>
+ </tr>
<x:forEach var="test" select="/testsuites/testsuite[./@package =
$quotedPackage]">
+ <j:set var="testCount"><x:expr
select="${test.attribute('tests').value}" /></j:set>
+ <j:set var="errorCount"><x:expr
select="${test.attribute('errors').value}" /></j:set>
+ <j:set var="failureCount"><x:expr
select="${test.attribute('failures').value}" /></j:set>
+ <j:set var="successRate"><x:expr select="($testCount -
($failureCount + $errorCount)) div $testCount"/></j:set>
<tr>
<td>
<a
href="#${test.attribute('name').value}">${test.attribute('name').value}</a>
</td>
<td>
- <doc:formatAsNumber string="${test.attribute('tests').value}"
pattern="0"/>
+ <doc:formatAsNumber string="${testCount}" pattern="0"/>
+ </td>
+ <td>
+ <doc:formatAsNumber string="${errorCount}" pattern="0"/>
</td>
<td>
- <doc:formatAsNumber
string="${test.attribute('errors').value}" pattern="0"/>
+ <doc:formatAsNumber string="${failureCount}" pattern="0"/>
</td>
<td>
- <doc:formatAsNumber
string="${test.attribute('failures').value}" pattern="0"/>
+ <doc:formatAsNumber string="${successRate}" pattern="0.00%"/>
</td>
<td>
<doc:formatAsNumber string="${test.attribute('time').value}"
pattern="0.000"/>
@@ -191,7 +205,9 @@
<a name="${testsuite.attribute('name').value}"></a>
<subsection name="${testsuite.attribute('name').value}">
<table>
+ <!--
<junit:testCaseHeader/>
+ -->
## test can even not be started at all (failure to load the class)
## so report the error directly
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
