Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLucas Bullen2018-08-15 15:07:22 +0000
committerLucas Bullen2018-08-15 15:07:28 +0000
commit5e1ff1b531a3c47039431ad78fd54c7941d02f88 (patch)
tree83d54ad633f812ccd08a882df6edb741efc508d3 /eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests
parent2d1743b8953df948aa3d6fb2bb5e5142638ad073 (diff)
downloadeclipse.platform.releng.aggregator-5e1ff1b531a3c47039431ad78fd54c7941d02f88.tar.gz
eclipse.platform.releng.aggregator-5e1ff1b531a3c47039431ad78fd54c7941d02f88.tar.xz
eclipse.platform.releng.aggregator-5e1ff1b531a3c47039431ad78fd54c7941d02f88.zip
Revert "Bug 531057 - Add JUnit 5 support for automated tests"
- Misunderstanding of the aborted test result type caused grouping with errors - Reverting to ignore aborted tests - Will in near future show aborts in own category This reverts commit 7bf8f655b574cf88e2a83562f5b3b7d01039c773. Change-Id: I4d83b54a51513b6cf8de9fa4f303ced7f936fe3b
Diffstat (limited to 'eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests')
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/JUNIT.XSL21
1 files changed, 4 insertions, 17 deletions
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/JUNIT.XSL b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/JUNIT.XSL
index 648477ffb..4478aeb72 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/JUNIT.XSL
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/JUNIT.XSL
@@ -253,7 +253,7 @@
<xsl:sort select="@package"/>
<xsl:variable name="testsuites-in-package" select="/testsuites/testsuite[./@package = current()/@package]"/>
<xsl:variable name="testCount" select="sum($testsuites-in-package/@tests)"/>
- <xsl:variable name="errorCount" select="sum($testsuites-in-package/@aborted|$testsuites-in-package/@errors)"/>
+ <xsl:variable name="errorCount" select="sum($testsuites-in-package/@errors)"/>
<xsl:variable name="failureCount" select="sum($testsuites-in-package/@failures)"/>
<xsl:variable name="timeCount" select="sum($testsuites-in-package/@time)"/>
@@ -325,11 +325,6 @@
<td colspan="4"><xsl:apply-templates select="./error"/></td>
</tr>
</xsl:if>
- <xsl:if test="./aborted">
- <tr class="Error">
- <td colspan="4"><xsl:apply-templates select="./aborted"/></td>
- </tr>
- </xsl:if>
<xsl:apply-templates select="./testcase" mode="print.test"/>
</table>
<div class="Properties">
@@ -347,7 +342,7 @@
<xsl:template name="summary">
<h2>Summary</h2>
<xsl:variable name="testCount" select="sum(testsuite/@tests)"/>
- <xsl:variable name="errorCount" select="sum(testsuite/@aborted|testsuite/@errors)"/>
+ <xsl:variable name="errorCount" select="sum(testsuite/@errors)"/>
<xsl:variable name="failureCount" select="sum(testsuite/@failures)"/>
<xsl:variable name="timeCount" select="sum(testsuite/@time)"/>
<xsl:variable name="successRate" select="($testCount - $failureCount - $errorCount) div $testCount"/>
@@ -465,7 +460,6 @@
<xsl:attribute name="class">
<xsl:choose>
<xsl:when test="@failures[.&gt; 0]">Failure</xsl:when>
- <xsl:when test="@aborted[.&gt; 0]">Error</xsl:when>
<xsl:when test="@errors[.&gt; 0]">Error</xsl:when>
</xsl:choose>
</xsl:attribute>
@@ -473,7 +467,7 @@
<!-- print testsuite information -->
<td><a href="#{@name}"><xsl:value-of select="@name"/></a></td>
<td><xsl:value-of select="@tests"/></td>
- <td><xsl:value-of select="@aborted|@errors"/></td>
+ <td><xsl:value-of select="@errors"/></td>
<td><xsl:value-of select="@failures"/></td>
<td>
<xsl:call-template name="display-time">
@@ -489,7 +483,7 @@
<tr valign="top">
<xsl:attribute name="class">
<xsl:choose>
- <xsl:when test="failure | error | aborted">Error</xsl:when>
+ <xsl:when test="failure | error">Error</xsl:when>
</xsl:choose>
</xsl:attribute>
<td>
@@ -505,10 +499,6 @@
<td>Error</td>
<td><xsl:apply-templates select="error"/></td>
</xsl:when>
- <xsl:when test="aborted">
- <td>Error</td>
- <td><xsl:apply-templates select="aborted"/></td>
- </xsl:when>
<xsl:otherwise>
<td>Success</td>
<td></td>
@@ -530,9 +520,6 @@
<xsl:template match="error">
<xsl:call-template name="display-failures"/>
</xsl:template>
-<xsl:template match="aborted">
- <xsl:call-template name="display-failures"/>
-</xsl:template>
<!-- Style for the error and failure in the tescase template -->
<xsl:template name="display-failures">

Back to the top