dion 2003/01/19 03:27:35
Modified: src/plugins-build/junit-report junit.jsl
Log:
clean up jelly syntax
Revision Changes Path
1.3 +15 -12 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- junit.jsl 19 Jan 2003 10:47:07 -0000 1.2
+++ junit.jsl 19 Jan 2003 11:27:35 -0000 1.3
@@ -31,6 +31,7 @@
<a href="#Test Cases">test cases</a>]
</p>
</define:tag>
+
<define:tag name="testSuiteHeader">
<tr>
<th>Name</th>
@@ -40,6 +41,7 @@
<th>Time(s)</th>
</tr>
</define:tag>
+
<define:tag name="testCaseHeader">
<tr>
<th>Name</th>
@@ -48,10 +50,11 @@
<th>Time(s)</th>
</tr>
</define:tag>
+
<define:tag name="displayFailure">
<j:choose>
<j:when test="${current.attribute('message') != null}">
- ${htmlescape.getText(current.attribute('message').getValue())}
+ ${htmlescape.getText(current.attribute('message').value)}
</j:when>
<j:otherwise>
N/A
@@ -128,7 +131,7 @@
-->
<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').getValue()}"/>
+ <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)"/>
@@ -166,7 +169,7 @@
</p>
<j:forEach var="testsuite" items="${testsuites}">
- <j:set var="package"
value="${testsuite.attribute('package').getValue()}"/>
+ <j:set var="package" value="${testsuite.attribute('package').value}"/>
<x:set var="quotedPackage" select='"${package}"'/>
<a name="${package}"></a>
@@ -178,19 +181,19 @@
<x:forEach var="test" select="/testsuites/testsuite[./@package =
$quotedPackage]">
<tr>
<td>
- <a
href="#${test.attribute('name').getValue()}">${test.attribute('name').getValue()}</a>
+ <a
href="#${test.attribute('name').value}">${test.attribute('name').value}</a>
</td>
<td>
- <doc:formatAsNumber
string="${test.attribute('tests').getValue()}" pattern="0"/>
+ <doc:formatAsNumber string="${test.attribute('tests').value}"
pattern="0"/>
</td>
<td>
- <doc:formatAsNumber
string="${test.attribute('errors').getValue()}" pattern="0"/>
+ <doc:formatAsNumber
string="${test.attribute('errors').value}" pattern="0"/>
</td>
<td>
- <doc:formatAsNumber
string="${test.attribute('failures').getValue()}" pattern="0"/>
+ <doc:formatAsNumber
string="${test.attribute('failures').value}" pattern="0"/>
</td>
<td>
- <doc:formatAsNumber
string="${test.attribute('time').getValue()}" pattern="0.000"/>
+ <doc:formatAsNumber string="${test.attribute('time').value}"
pattern="0.000"/>
</td>
</tr>
</x:forEach>
@@ -204,8 +207,8 @@
<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()}">
+ <a name="${testsuite.attribute('name').value}"></a>
+ <subsection name="${testsuite.attribute('name').value}">
<table>
<!--
<junit:testCaseHeader/>
@@ -231,7 +234,7 @@
<j:set var="failure"
value="${testcase.selectSingleNode('failure')}"/>
<j:set var="error" value="${testcase.selectSingleNode('error')}"/>
<tr>
- <td>${testcase.attribute("name").getValue()}</td>
+ <td>${testcase.attribute("name").value}</td>
<j:choose>
<j:when test="${failure != null}">
<td style="width: 60px; color: red; font-weight:
bold">Failure</td>
@@ -246,7 +249,7 @@
<j:choose>
<j:when test="${testcase.attribute('time') != null}">
<td width="60px">
- <doc:formatAsNumber
string="${testcase.attribute('time').getValue()}" pattern="0.00"/>
+ <doc:formatAsNumber
string="${testcase.attribute('time').value}" pattern="0.00"/>
</td>
</j:when>
<j:otherwise>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
