From 2854630bca527d8a3f59fca0163b0467ad2e5dba Mon Sep 17 00:00:00 2001
From: Eibwen <rejk0rz+gh@gmail.com>
Date: Fri, 9 Aug 2013 17:51:06 -0500
Subject: [PATCH] Hacked together fixes for html generation to be more
 userfriendly and accurate

--HG--
extra : amend_source : db8db157b4e5279da5c29b008b80226d50713f50
---
 .../xsl/NUnit-NoFrame.xsl                     | 51 ++++++++++++++-----
 src/NUnit2Report.Console/xsl/toolkit.xsl      | 31 +++++++++--
 2 files changed, 65 insertions(+), 17 deletions(-)

diff --git a/src/NUnit2Report.Console/xsl/NUnit-NoFrame.xsl b/src/NUnit2Report.Console/xsl/NUnit-NoFrame.xsl
index db7b0d5..9ed91a7 100644
--- a/src/NUnit2Report.Console/xsl/NUnit-NoFrame.xsl
+++ b/src/NUnit2Report.Console/xsl/NUnit-NoFrame.xsl
@@ -33,18 +33,27 @@
 			span.covered {
 				background: #00df00; 
 				border:#9c9c9c 1px solid;
+				display:block;
+				height:14px;
+				float:left;
 			}
 			span.uncovered {
 				background: #df0000; 
 				border-top:#9c9c9c 1px solid;
 				border-bottom:#9c9c9c 1px solid;
 				border-right:#9c9c9c 1px solid;
+				display:block;
+				height:14px;
+				float:left;
 				}
 			span.ignored {
 				background: #ffff00;
 				border-top:#9c9c9c 1px solid;
 				border-bottom:#9c9c9c 1px solid;
 				border-right:#9c9c9c 1px solid;
+				display:block;
+				height:14px;
+				float:left;
 			}
 
 			td {
@@ -248,9 +257,10 @@
 			<xsl:for-each select="//test-suite[(child::results/test-case)]">
 				<xsl:sort select="@name"/>
 				<xsl:variable name="testCount" select="count(child::results/test-case)"/>
-				<xsl:variable name="errorCount" select="count(child::results/test-case[@executed='False'])"/>
+				<xsl:variable name="errorCount" select="count(child::results/test-case[@executed='False' and @result!='Ignored'])"/>
 				<xsl:variable name="failureCount" select="count(child::results/test-case[@success='False'])"/>
-				<xsl:variable name="runCount" select="$testCount - $errorCount - $failureCount"/>
+				<xsl:variable name="ignoreCount" select="count(child::results/test-case[@result='Ignored'])"/>
+				<xsl:variable name="runCount" select="$testCount - $ignoreCount - $errorCount - $failureCount"/>
 				<xsl:variable name="timeCount" select="translate(@time,',','.')"/>
 		
 				<!-- write a summary for the package -->
@@ -260,16 +270,17 @@
 						<xsl:choose>
 						    <xsl:when test="$failureCount &gt; 0">Failure</xsl:when>
 							<xsl:when test="$errorCount &gt; 0"> Error</xsl:when>
+							<xsl:when test="$ignoreCount &gt; 0">Ignored</xsl:when>
 							<xsl:otherwise>Pass</xsl:otherwise>
 						</xsl:choose>
-					</xsl:attribute> 	
+					</xsl:attribute>
 					<td width="25%">
 						<a href="#{generate-id(@name)}">
 						<xsl:attribute name="class">
 							<xsl:choose>
 								<xsl:when test="$failureCount &gt; 0">Failure</xsl:when>
 							</xsl:choose>
-						</xsl:attribute> 	
+						</xsl:attribute>
 						<xsl:value-of select="@name"/>
 						</a>
 					</td>
@@ -282,33 +293,47 @@
 						</b>
 					</td>
 					<td width="20%" height="9px">
+						<xsl:text> </xsl:text>
 						<xsl:if test="round($runCount * 200 div $testCount )!=0">
-							<span class="covered">
-								<xsl:attribute name="style">width:<xsl:value-of select="round($runCount * 200 div $testCount )"/>px</xsl:attribute>
-							</span>
+						<span class="covered">
+							<xsl:attribute name="style">width:<xsl:value-of select="round($runCount * 200 div $testCount )"/>px</xsl:attribute>
+							<xsl:attribute name="title">
+								<xsl:text>Success</xsl:text>
+							</xsl:attribute>
+							<xsl:text> </xsl:text>
+						</span>
 						</xsl:if>
 						<xsl:if test="round($errorCount * 200 div $testCount )!=0">
 						<span class="ignored">
 							<xsl:attribute name="style">width:<xsl:value-of select="round($errorCount * 200 div $testCount )"/>px</xsl:attribute>
+							<xsl:attribute name="title">
+								<xsl:text>Errors</xsl:text>
+							</xsl:attribute>
+							<xsl:text> </xsl:text>
 						</span>
 						</xsl:if>
 						<xsl:if test="round($failureCount * 200 div $testCount )!=0">
-							<span class="uncovered">
-								<xsl:attribute name="style">width:<xsl:value-of select="round($failureCount * 200 div $testCount )"/>px</xsl:attribute>
-							</span>
+						<span class="uncovered">
+							<xsl:attribute name="style">width:<xsl:value-of select="round($failureCount * 200 div $testCount )"/>px</xsl:attribute>
+							<xsl:attribute name="title">
+								<xsl:text>Failures</xsl:text>
+							</xsl:attribute>
+							<xsl:text> </xsl:text>
+						</span>
 						</xsl:if>
 					</td>
 					<td><xsl:value-of select="$runCount"/></td>
 					<td><xsl:value-of select="$errorCount"/></td>
 					<td><xsl:value-of select="$failureCount"/></td>
+					<td><xsl:value-of select="$ignoreCount"/></td>
 					<td>
                        <xsl:call-template name="display-time">
                         	<xsl:with-param name="value" select="$timeCount"/>
-                        </xsl:call-template>				
-					</td>					
+                        </xsl:call-template>
+					</td>
 				</tr>
 			</xsl:for-each>
-		</table>		
+		</table>
 	</xsl:template>
 	
 
diff --git a/src/NUnit2Report.Console/xsl/toolkit.xsl b/src/NUnit2Report.Console/xsl/toolkit.xsl
index e7d5f9c..802c21f 100644
--- a/src/NUnit2Report.Console/xsl/toolkit.xsl
+++ b/src/NUnit2Report.Console/xsl/toolkit.xsl
@@ -121,6 +121,9 @@
       <td width="70px">
         <b id=":i18n:Errors">Errors</b>
       </td>
+      <td width="70px">
+        <b id=":i18n:Errors">Ignored</b>
+      </td>
       <td colspan="2">
         <b id=":i18n:SuccessRate">Success Rate</b>
       </td>
@@ -149,6 +152,9 @@
       <td width="5%">
         <b id=":i18n:Failures">Failures</b>
       </td>
+      <td width="5%">
+        <b id=":i18n:Ignored">Ignored</b>
+      </td>
       <td width="10%" nowrap="nowrap">
         <b id=":i18n:Time">Time(s)</b>
       </td>
@@ -186,8 +192,9 @@
     <h2 id=":i18n:Summary">Summary</h2>
     <xsl:variable name="runCount" select="@total"/>
     <xsl:variable name="failureCount" select="@failures"/>
+    <xsl:variable name="errorCount" select="@errors"/>
     <xsl:variable name="ignoreCount" select="@not-run"/>
-    <xsl:variable name="total" select="$runCount + $ignoreCount + $failureCount"/>
+    <xsl:variable name="total" select="$runCount + $errorCount + $failureCount"/>
 
     <xsl:variable name="timeCount" select="translate(test-suite/@time,',','.')"/>
 
@@ -198,7 +205,8 @@
         <xsl:attribute name="class">
           <xsl:choose>
             <xsl:when test="$failureCount &gt; 0">Failure</xsl:when>
-            <xsl:when test="$ignoreCount &gt; 0">Error</xsl:when>
+            <xsl:when test="$errorCount &gt; 0">Error</xsl:when>
+            <xsl:when test="$ignoreCount &gt; 0">Ignored</xsl:when>
             <xsl:otherwise>Pass</xsl:otherwise>
           </xsl:choose>
         </xsl:attribute>
@@ -208,6 +216,9 @@
         <td>
           <xsl:value-of select="$failureCount"/>
         </td>
+        <td>
+          <xsl:value-of select="$errorCount"/>
+        </td>
         <td>
           <xsl:value-of select="$ignoreCount"/>
         </td>
@@ -222,19 +233,27 @@
               <xsl:attribute name="style">
                 width:<xsl:value-of select="round($runCount * 200 div $total )"/>px
               </xsl:attribute>
+              <xsl:attribute name="title">
+                <xsl:text>Success</xsl:text>
+              </xsl:attribute>
               <xsl:call-template name="for.loop">
                 <xsl:with-param name="i">1</xsl:with-param>
                 <xsl:with-param name="count">
                   <xsl:value-of select="round($runCount * 10 div $total )"/>
                 </xsl:with-param>
               </xsl:call-template>
+              <xsl:text> </xsl:text>
             </span>
           </xsl:if>
-          <xsl:if test="round($ignoreCount * 200 div $total )!=0">
+          <xsl:if test="round($errorCount * 200 div $total )!=0">
             <span class="ignored">
               <xsl:attribute name="style">
-                width:<xsl:value-of select="round($ignoreCount * 200 div $total )"/>px
+                width:<xsl:value-of select="round($errorCount * 200 div $total )"/>px
               </xsl:attribute>
+              <xsl:attribute name="title">
+                <xsl:text>Errors</xsl:text>
+              </xsl:attribute>
+              <xsl:text> </xsl:text>
             </span>
           </xsl:if>
           <xsl:if test="round($failureCount * 200 div $total )!=0">
@@ -242,12 +261,16 @@
               <xsl:attribute name="style">
                 width:<xsl:value-of select="round($failureCount * 200 div $total )"/>px
               </xsl:attribute>
+              <xsl:attribute name="title">
+                <xsl:text>Failures</xsl:text>
+              </xsl:attribute>
               <xsl:call-template name="for.loop">
                 <xsl:with-param name="i">1</xsl:with-param>
                 <xsl:with-param name="count">
                   <xsl:value-of select="round($runCount * 10 div $total )"/>
                 </xsl:with-param>
               </xsl:call-template>
+              <xsl:text> </xsl:text>
             </span>
           </xsl:if>
         </td>