diff options
| author | Alexander Kurtakov | 2018-08-14 12:28:24 +0000 |
|---|---|---|
| committer | Alexander Kurtakov | 2018-08-14 12:50:28 +0000 |
| commit | 7bf8f655b574cf88e2a83562f5b3b7d01039c773 (patch) | |
| tree | 2fd6f58cbe97aaf26df1dafee35d3364d48cdc25 | |
| parent | b569425c433707b286aa24f3579d7259644c687a (diff) | |
| download | eclipse.platform.releng.aggregator-7bf8f655b574cf88e2a83562f5b3b7d01039c773.tar.gz eclipse.platform.releng.aggregator-7bf8f655b574cf88e2a83562f5b3b7d01039c773.tar.xz eclipse.platform.releng.aggregator-7bf8f655b574cf88e2a83562f5b3b7d01039c773.zip | |
Bug 531057 - Add JUnit 5 support for automated tests
Supported abborted in xslt.
Change-Id: Ia01d1159961b63e2ca7d040f559be1621b1fb38a
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
| -rw-r--r-- | eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/JUNIT.XSL | 21 |
1 files changed, 17 insertions, 4 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 4478aeb72..648477ffb 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/@errors)"/> + <xsl:variable name="errorCount" select="sum($testsuites-in-package/@aborted|$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,6 +325,11 @@ <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"> @@ -342,7 +347,7 @@ <xsl:template name="summary"> <h2>Summary</h2> <xsl:variable name="testCount" select="sum(testsuite/@tests)"/> - <xsl:variable name="errorCount" select="sum(testsuite/@errors)"/> + <xsl:variable name="errorCount" select="sum(testsuite/@aborted|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"/> @@ -460,6 +465,7 @@ <xsl:attribute name="class"> <xsl:choose> <xsl:when test="@failures[.> 0]">Failure</xsl:when> + <xsl:when test="@aborted[.> 0]">Error</xsl:when> <xsl:when test="@errors[.> 0]">Error</xsl:when> </xsl:choose> </xsl:attribute> @@ -467,7 +473,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="@errors"/></td> + <td><xsl:value-of select="@aborted|@errors"/></td> <td><xsl:value-of select="@failures"/></td> <td> <xsl:call-template name="display-time"> @@ -483,7 +489,7 @@ <tr valign="top"> <xsl:attribute name="class"> <xsl:choose> - <xsl:when test="failure | error">Error</xsl:when> + <xsl:when test="failure | error | aborted">Error</xsl:when> </xsl:choose> </xsl:attribute> <td> @@ -499,6 +505,10 @@ <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> @@ -520,6 +530,9 @@ <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"> |