You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by di...@apache.org on 2003/01/19 11:47:08 UTC
cvs commit: jakarta-turbine-maven/src/plugins-build/junit-report junit.jsl
dion 2003/01/19 02:47:07
Modified: src/plugins-build/junit-report junit.jsl
Log:
junit.jsl changes from MAVEN-208 by Ben Walding
Revision Changes Path
1.2 +60 -34 jakarta-turbine-maven/src/plugins-build/junit-report/junit.jsl
Index: junit.jsl
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/junit-report/junit.jsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- junit.jsl 31 Dec 2002 07:19:44 -0000 1.1
+++ junit.jsl 19 Jan 2003 10:47:07 -0000 1.2
@@ -19,6 +19,7 @@
<j:useBean var="fileutil" class="org.apache.velocity.texen.util.FileUtil"/>
<j:useBean var="pathtool" class="org.apache.maven.DVSLPathTool"/>
+
<define:taglib uri="junit">
<define:tag name="nav">
<p>
@@ -44,14 +45,13 @@
<th>Name</th>
<th>Status</th>
<th>Type</th>
-
<th>Time(s)</th>
</tr>
</define:tag>
<define:tag name="displayFailure">
<j:choose>
<j:when test="${current.attribute('message') != null}">
- ${htmlescape.getTest(current.attributes('message'))}
+ ${htmlescape.getText(current.attribute('message').getValue())}
</j:when>
<j:otherwise>
N/A
@@ -78,9 +78,14 @@
<x:set var="errorCount" select="sum(testsuite/@errors)"/>
<x:set var="failureCount" select="sum(testsuite/@failures)"/>
<x:set var="timeCount" select="sum(testsuite/@time)"/>
- <!--
- #set ($successRate = $node.valueOf("($testCount - ($failureCount + $errorCount)) div $testCount"))
- -->
+ <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>
+
<table>
<tr>
<th>Tests</th>
@@ -103,7 +108,7 @@
<doc:formatAsNumber string="${successRate}" pattern="0.00%"/>
</td>
<td>
- <doc:formatAsNumber string="${timeCount}" pattern="0.000"/>
+ <doc:formatAsNumber string="${timeCount}" pattern="0.00"/>
</td>
</tr>
</table>
@@ -122,13 +127,20 @@
<junit:testSuiteHeader/>
-->
<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')}"/>
- <j:set var="quotedPackage" value='"${package}"'/>
+ <j:forEach var="testsuite" items="${testsuites}">
+ <j:set var="package" value="${testsuite.attribute('package').getValue()}"/>
+ <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>
+
+
<tr>
<td>
<a href="#${package}">${package}</a>
@@ -143,7 +155,7 @@
<doc:formatAsNumber string="${errorCount}" pattern="0"/>
</td>
<td>
- <doc:formatAsNumber string="${timeCount}" pattern="0.000"/>
+ <doc:formatAsNumber string="${timeCount}" pattern="0.00"/>
</td>
</tr>
</j:forEach>
@@ -155,15 +167,15 @@
<j:forEach var="testsuite" items="${testsuites}">
<j:set var="package" value="${testsuite.attribute('package').getValue()}"/>
- <j:set var="quotedPackage" value='"${package}"'/>
+ <x:set var="quotedPackage" select='"${package}"'/>
+ <a name="${package}"></a>
<subsection name="${package}">
<table>
<!--
<junit:testSuiteHeader/>
-->
- <x:set var="tests" select="/testsuites/testsuite[./@package = $quotedPackage]"/>
- <j:forEach var="test" items="$tests}">
+ <x:forEach var="test" select="/testsuites/testsuite[./@package = $quotedPackage]">
<tr>
<td>
<a href="#${test.attribute('name').getValue()}">${test.attribute('name').getValue()}</a>
@@ -181,7 +193,7 @@
<doc:formatAsNumber string="${test.attribute('time').getValue()}" pattern="0.000"/>
</td>
</tr>
- </j:forEach>
+ </x:forEach>
</table>
</subsection>
</j:forEach>
@@ -189,8 +201,10 @@
<section name="Test Cases">
<junit:nav/>
+
<x:set var="testsuites" select="./testsuite"/>
<j:forEach var="testsuite" items="${testsuites}">
+ <a name="${testsuite.attribute('name').getValue()}"></a>
<subsection name="${testsuite.attribute('name').getValue()}">
<table>
<!--
@@ -209,40 +223,53 @@
</td>
</tr>
</j:forEach>
-
+
+
+
<x:set var="testcases" select="$testsuite/testcase"/>
- <j:forEach var="error" items="${errors}">
+ <j:forEach var="testcase" items="${testcases}">
+ <j:set var="failure" value="${testcase.selectSingleNode('failure')}"/>
+ <j:set var="error" value="${testcase.selectSingleNode('error')}"/>
<tr>
- <td>${testcase.attribute("name")}</td>
+ <td>${testcase.attribute("name").getValue()}</td>
<j:choose>
- <j:when test="${testcase.get('failure') != null}">
- <td>Failure</td>
- <td>
- <junit:displayFailure current="{$testcase.selectSingleNode('failure')}"/>
- </td>
+ <j:when test="${failure != null}">
+ <td style="width: 60px; color: red; font-weight: bold">Failure</td>
</j:when>
- <j:when test="${testcase.get('error') != null}">
- <td>Error</td>
- <td>
- <junit:displayFailure current="{$testcase.selectSingleNode('error')}"/>
- </td>
+ <j:when test="${error != null}">
+ <td style="width: 60px; color: red; font-weight: bold">Error</td>
</j:when>
<j:otherwise>
- <td>Success</td>
- <td></td>
+ <td style="width: 60px;">Success</td>
</j:otherwise>
</j:choose>
<j:choose>
- <j:when test="${testcase.get('time') != null}">
- <td>
- <doc:formatAsNumber string="${testcase.attribute('time')}" pattern="0.000"/>
+ <j:when test="${testcase.attribute('time') != null}">
+ <td width="60px">
+ <doc:formatAsNumber string="${testcase.attribute('time').getValue()}" pattern="0.00"/>
</td>
</j:when>
<j:otherwise>
- <td></td>
+ <td width="60px"></td>
</j:otherwise>
</j:choose>
</tr>
+ <j:choose>
+ <j:when test="${failure != null}">
+ <tr>
+ <td colspan="3" style="padding-left: 50px">
+ <junit:displayFailure current="${failure}"/>
+ </td>
+ </tr>
+ </j:when>
+ <j:when test="${error != null}">
+ <tr>
+ <td colspan="3" style="padding-left: 50px">
+ <junit:displayFailure current="${error}"/>
+ </td>
+ </tr>
+ </j:when>
+ </j:choose>
</j:forEach>
</table>
</subsection>
@@ -252,4 +279,3 @@
</document>
</jsl:template>
</jsl:stylesheet>
-