Browse Source

Merge branch '1.9.x'

master
Stefan Bodewig 7 years ago
parent
commit
1ab929e749
3 changed files with 36 additions and 0 deletions
  1. +4
    -0
      WHATSNEW
  2. +16
    -0
      src/etc/junit-frames-saxon.xsl
  3. +16
    -0
      src/etc/junit-frames.xsl

+ 4
- 0
WHATSNEW View File

@@ -41,6 +41,10 @@ Fixed bugs:
end of the inout stream (usually System.in or System.console) are
reached before a valid input has been read.

* junitreport does not list testsuites that fail to start any tests
because of an exception inside the all-tests and alltests-errors frames.
Bugzilla Report 62443

Other changes:
--------------



+ 16
- 0
src/etc/junit-frames-saxon.xsl View File

@@ -295,6 +295,7 @@
</xsl:apply-templates>
</xsl:when>
<xsl:when test="$type = 'errors'">
<xsl:apply-templates select=".//testsuite[error]" mode="alltests.error.row"/>
<xsl:apply-templates select=".//testcase[error]" mode="print.test">
<xsl:with-param name="show.class" select="'yes'"/>
</xsl:apply-templates>
@@ -305,6 +306,7 @@
</xsl:apply-templates>
</xsl:when>
<xsl:otherwise>
<xsl:apply-templates select=".//testsuite[error]" mode="alltests.error.row"/>
<xsl:apply-templates select=".//testcase" mode="print.test">
<xsl:with-param name="show.class" select="'yes'"/>
</xsl:apply-templates>
@@ -968,4 +970,18 @@
<xsl:param name="value"/>
<xsl:value-of select="format-number($value,'0.00%')"/>
</xsl:template>

<xsl:template match="testsuite" mode="alltests.error.row">
<xsl:variable name="package.dir">
<xsl:if test="not(@package = '')"><xsl:value-of select="translate(@package,'.','/')"/><xsl:text>/</xsl:text></xsl:if>
</xsl:variable>
<xsl:variable name="class.href">
<xsl:value-of select="concat($package.dir, @id, '_', @name, '.html')"/>
</xsl:variable>
<tr class="Error">
<td><a href="{$class.href}"><xsl:value-of select="@name"/></a></td>
<td colspan="3"><xsl:apply-templates select="./error"/></td>
</tr>
</xsl:template>

</xsl:stylesheet>

+ 16
- 0
src/etc/junit-frames.xsl View File

@@ -296,6 +296,7 @@ h6 {
</xsl:apply-templates>
</xsl:when>
<xsl:when test="$type = 'errors'">
<xsl:apply-templates select=".//testsuite[error]" mode="alltests.error.row"/>
<xsl:apply-templates select=".//testcase[error]" mode="print.test">
<xsl:with-param name="show.class" select="'yes'"/>
</xsl:apply-templates>
@@ -306,6 +307,7 @@ h6 {
</xsl:apply-templates>
</xsl:when>
<xsl:otherwise>
<xsl:apply-templates select=".//testsuite[error]" mode="alltests.error.row"/>
<xsl:apply-templates select=".//testcase" mode="print.test">
<xsl:with-param name="show.class" select="'yes'"/>
</xsl:apply-templates>
@@ -969,4 +971,18 @@ h6 {
<xsl:param name="value"/>
<xsl:value-of select="format-number($value,'0.00%')"/>
</xsl:template>

<xsl:template match="testsuite" mode="alltests.error.row">
<xsl:variable name="package.dir">
<xsl:if test="not(@package = '')"><xsl:value-of select="translate(@package,'.','/')"/><xsl:text>/</xsl:text></xsl:if>
</xsl:variable>
<xsl:variable name="class.href">
<xsl:value-of select="concat($package.dir, @id, '_', @name, '.html')"/>
</xsl:variable>
<tr class="Error">
<td><a href="{$class.href}"><xsl:value-of select="@name"/></a></td>
<td colspan="3"><xsl:apply-templates select="./error"/></td>
</tr>
</xsl:template>

</xsl:stylesheet>

Loading…
Cancel
Save