You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by ka...@apache.org on 2003/01/25 05:43:18 UTC
cvs commit: jakarta-turbine-maven/src/plugins-build/junit-report/src/plugin-resources junit.jsl
kaz 2003/01/24 20:43:17
Modified: src/plugins-build/junit-report/src/plugin-resources
junit.jsl
Log:
Switching to a different idiom to deal with the weirdo issues with
jelly's xml:set tag. Next stop is looking at the Jelly code to see what
this issue is all about ....
Revision Changes Path
1.2 +9 -22 jakarta-turbine-maven/src/plugins-build/junit-report/src/plugin-resources/junit.jsl
Index: junit.jsl
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/junit-report/src/plugin-resources/junit.jsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- junit.jsl 24 Jan 2003 03:45:38 -0000 1.1
+++ junit.jsl 25 Jan 2003 04:43:17 -0000 1.2
@@ -77,18 +77,11 @@
<body>
<section name="Summary">
<junit:nav/>
- <x:set var="testCount" select="sum(testsuite/@tests)"/>
- <x:set var="errorCount" select="sum(testsuite/@errors)"/>
- <x:set var="failureCount" select="sum(testsuite/@failures)"/>
- <x:set var="timeCount" select="sum(testsuite/@time)"/>
- <x:set var="successRate" select="($testCount - ($failureCount + $errorCount)) div $testCount"/>
-
- <j:set var="testCount">${testCount}</j:set>
- <j:set var="errorCount">${errorCount}</j:set>
- <j:set var="failureCount">${failureCount}</j:set>
- <j:set var="timeCount">${timeCount}</j:set>
- <j:set var="successRate">${successRate}</j:set>
-
+ <j:set var="testCount"><x:expr select="sum(testsuite/@tests)"/></j:set>
+ <j:set var="errorCount"><x:expr select="sum(testsuite/@errors)"/></j:set>
+ <j:set var="failureCount"><x:expr select="sum(testsuite/@failures)"/></j:set>
+ <j:set var="timeCount"><x:expr select="sum(testsuite/@time)"/></j:set>
+ <j:set var="successRate"><x:expr select="($testCount - ($failureCount + $errorCount)) div $testCount"/></j:set>
<table>
<tr>
<th>Tests</th>
@@ -133,16 +126,10 @@
<j:forEach var="testsuite" items="${testsuites}">
<j:set var="package" value="${testsuite.attribute('package').value}"/>
<x:set var="quotedPackage" select='"${package}"'/>
- <x:set var="testCount" select="sum(./testsuite[./@package = $quotedPackage]/@tests)"/>
- <x:set var="errorCount" select="sum(./testsuite[./@package = $quotedPackage]/@errors)"/>
- <x:set var="failureCount" select="sum(./testsuite[./@package = $quotedPackage]/@failures)"/>
- <x:set var="timeCount" select="sum(./testsuite[./@package = $quotedPackage]/@time)"/>
-
- <j:set var="testCount">${testCount}</j:set>
- <j:set var="errorCount">${errorCount}</j:set>
- <j:set var="failureCount">${failureCount}</j:set>
- <j:set var="timeCount">${timeCount}</j:set>
-
+ <j:set var="testCount"><x:expr select="sum(./testsuite[./@package = $quotedPackage]/@tests)"/></j:set>
+ <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>
<tr>
<td>