From ffb0aedaeec7800b77e8efd6b2f4badad94ae1b5 Mon Sep 17 00:00:00 2001
From: dion <dion@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 5 Aug 2003 02:34:22 +0000
Subject: [PATCH] Apply fixes for MAVEN-649

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@113790 13f79535-47bb-0310-9956-ffa450edef68
---
 junit-report/src/plugin-resources/junit.jsl | 30 ++++++++++++++++-----
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/junit-report/src/plugin-resources/junit.jsl b/junit-report/src/plugin-resources/junit.jsl
index 7fc33dcc..fe0bcd93 100644
--- a/junit-report/src/plugin-resources/junit.jsl
+++ b/junit-report/src/plugin-resources/junit.jsl
@@ -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>
@@ -134,11 +136,14 @@
                 <td>
                   <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="${test.attribute('errors').value}" pattern="0"/>
+                      <doc:formatAsNumber string="${errorCount}" pattern="0"/>
                     </td>
                     <td>
-                      <doc:formatAsNumber string="${test.attribute('failures').value}" pattern="0"/>
+                      <doc:formatAsNumber string="${failureCount}" pattern="0"/>
+                    </td>
+                    <td>
+                      <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