From 83fffe4ff056b3d581f2db8d8568883054cf81db Mon Sep 17 00:00:00 2001
From: Ondrej Machulda <ondrej.machulda@lmc.eu>
Date: Thu, 28 May 2015 23:33:04 +0200
Subject: [PATCH 1/3] Do not calculate running time if the test failed with
 fatal error, also make the fatal status of the test more visible (fixes #6)

---
 CHANGELOG.md    |  1 +
 src/results.xsl | 67 +++++++++++++++++++++++++++++++------------------
 2 files changed, 43 insertions(+), 25 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 286a560a..af82baa5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@
 
 ### Fixed
 - Properly trigger PHPUnit colored (ANSI) mode when Steward itself is in ANSI mode.
+- Stop counting test's running time (shown in `results.xml`), if the test ended with fatal error (#6).
 
 ## 1.0.0 - 2015-05-09
 ### Added
diff --git a/src/results.xsl b/src/results.xsl
index f5a95abf..d7b32be6 100644
--- a/src/results.xsl
+++ b/src/results.xsl
@@ -159,34 +159,49 @@
                                                 <xsl:value-of select="@name"/>
                                             </td>
                                             <td>
-                                                <xsl:value-of select="@status"/>
+                                                <!-- If the parent testcase ended with "fatal" and this one is still in "started" status, that
+                                                this must be the one that "fatal"-ed, so we won't print its confusing "started" status -->
+                                                <xsl:if test="not(@status = 'started' and ../@result = 'fatal')">
+                                                    <xsl:value-of select="@status"/>
+                                                </xsl:if>
                                             </td>
                                             <td>
-                                                <xsl:attribute name="class">
-                                                    <xsl:choose>
-                                                        <xsl:when test="@result = 'passed'">success</xsl:when>
-                                                        <xsl:when test="@result = 'failed' or @result = 'broken'">danger</xsl:when>
-                                                        <xsl:when test="@result = 'skipped' or @result = 'incomplete'">info</xsl:when>
-                                                    </xsl:choose>
-                                                </xsl:attribute>
-                                                <span>
-                                                    <xsl:attribute name="class">
-                                                        glyphicon
-                                                        <xsl:choose>
-                                                            <xsl:when test="@result = 'passed'">glyphicon-ok</xsl:when>
-                                                            <xsl:when test="@result = 'failed' or @result = 'broken'">glyphicon-remove</xsl:when>
-                                                            <xsl:when test="@result = 'skipped' or @result = 'incomplete'">glyphicon-question-sign</xsl:when>
-                                                        </xsl:choose>
-                                                    </xsl:attribute>
-                                                </span>
-                                                <xsl:text>&#160;&#160;</xsl:text>
-                                                <xsl:value-of select="@result"/>
+                                                <xsl:choose>
+                                                    <xsl:when test="@status = 'started' and ../@result = 'fatal'">
+                                                        <xsl:attribute name="class">warning</xsl:attribute>
+                                                        <span class="glyphicon glyphicon-warning-sign"></span>&#160;&#160;fatal
+                                                    </xsl:when>
+                                                    <xsl:otherwise>
+                                                        <xsl:attribute name="class">
+                                                            <xsl:choose>
+                                                                <xsl:when test="@result = 'passed'">success</xsl:when>
+                                                                <xsl:when test="@result = 'failed' or @result = 'broken'">danger</xsl:when>
+                                                                <xsl:when test="@result = 'skipped' or @result = 'incomplete'">info</xsl:when>
+                                                            </xsl:choose>
+                                                        </xsl:attribute>
+                                                        <span>
+                                                            <xsl:attribute name="class">
+                                                                glyphicon
+                                                                <xsl:choose>
+                                                                    <xsl:when test="@result = 'passed'">glyphicon-ok</xsl:when>
+                                                                    <xsl:when test="@result = 'failed' or @result = 'broken'">glyphicon-remove</xsl:when>
+                                                                    <xsl:when test="@result = 'skipped' or @result = 'incomplete'">glyphicon-question-sign</xsl:when>
+                                                                </xsl:choose>
+                                                            </xsl:attribute>
+                                                        </span>
+                                                        <xsl:text>&#160;&#160;</xsl:text>
+                                                        <xsl:value-of select="@result"/>
+                                                    </xsl:otherwise>
+                                                </xsl:choose>
                                             </td>
                                             <td class="date date-start">
                                                 <xsl:value-of select="@start"/>
                                             </td>
                                             <td class="date date-end">
-                                                <xsl:value-of select="@end"/>
+                                                <xsl:choose>
+                                                    <xsl:when test="@status = 'started' and ../@result = 'fatal'">-</xsl:when>
+                                                    <xsl:otherwise><xsl:value-of select="@end"/></xsl:otherwise>
+                                                </xsl:choose>
                                             </td>
                                             <td class="duration">
                                             </td>
@@ -202,12 +217,13 @@
             <script>
                 <![CDATA[
                 $(function () {
-                    // caluclate and print test duration
+                    // calculate and print test duration
                     $('table tr.test-row').each(function() {
                         var startDate = moment($('td.date-start', this).text());
-                        var endDate = moment($('td.date-end', this).text());
+                        var endValue = $('td.date-end', this).text();
+                        var endDate = moment(endValue);
                         var isPending = false;
-                        if (startDate.isValid()) {
+                        if (startDate.isValid() && endValue != '-') { // do not calculate when test fatal-ed
                             if (!endDate.isValid()) { // still running, add current time
                                 isPending = true;
                                 endDate = moment();
@@ -220,9 +236,10 @@
                             );
                         }
                     });
+
                     // convert ISO-8601 dates to more readable ones
                     $("td.date").each(function () {
-                        if ($(this).text().length) {
+                        if ($(this).text().length && $(this).text() != '-') {
                             $(this).text(moment($(this).text()).format('YYYY-MM-DD H:mm:ss'));
                         }
                     });

From 02bfaa7fe46f82bba34ff2e506b377cbd5405ce3 Mon Sep 17 00:00:00 2001
From: Ondrej Machulda <ondrej.machulda@lmc.eu>
Date: Fri, 29 May 2015 00:24:24 +0200
Subject: [PATCH 2/3] Update Bootstrap, jQuery and Moment.js loaded in
 results.xml

---
 src/results.xsl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/results.xsl b/src/results.xsl
index d7b32be6..f9a8a584 100644
--- a/src/results.xsl
+++ b/src/results.xsl
@@ -6,7 +6,7 @@
         <html xmlns="http://www.w3.org/1999/xhtml">
             <head>
                 <title>Steward results</title>
-                <link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css" rel="stylesheet"/>
+                <link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/css/bootstrap.min.css" rel="stylesheet"/>
             </head>
             <body>
                 <div class="container">
@@ -212,8 +212,8 @@
                         </tbody>
                     </table>
                 </div>
-            <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
-            <script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.8.3/moment.min.js"></script>
+            <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script>
+            <script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.10.3/moment.min.js"></script>
             <script>
                 <![CDATA[
                 $(function () {

From 4812e999a4cc9110052c982c6b07226d2a217c0e Mon Sep 17 00:00:00 2001
From: Ondrej Machulda <ondrej.machulda@lmc.eu>
Date: Fri, 29 May 2015 00:33:48 +0200
Subject: [PATCH 3/3] Force long test names to break line, so they don't break
 the whole results table

---
 src/results.xsl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/results.xsl b/src/results.xsl
index f9a8a584..d3e81247 100644
--- a/src/results.xsl
+++ b/src/results.xsl
@@ -109,7 +109,7 @@
                         <tbody>
                             <xsl:for-each select="//testcases/testcase">
                                 <tr class="testcase-row">
-                                    <td colspan="2">
+                                    <td colspan="2" style="word-break: break-all;">
                                         <xsl:value-of select="@name"/>
                                     </td>
                                     <td>
@@ -155,7 +155,7 @@
                                     <xsl:for-each select="test">
                                         <tr class="test-row">
                                             <td></td>
-                                            <td>
+                                            <td style="word-break: break-all;">
                                                 <xsl:value-of select="@name"/>
                                             </td>
                                             <td>