Skip to content

Commit

Permalink
Fix JENKINS-21883
Browse files Browse the repository at this point in the history
  • Loading branch information
@gboissinot
gboissinot committed Feb 24, 2014
1 parent 0e91c1a commit fad0e95
Show file tree
Hide file tree
Showing 4 changed files with 181 additions and 3 deletions.
4 changes: 2 additions & 2 deletions src/main/java/org/jenkinsci/plugins/xunit/types/QTestLibInputMetric.java
View file
Expand Up @@ -32,7 +32,7 @@ public boolean isDefault() {

@Override
public String getXslName() {
return "qtestlib-to-junit-4.xsl";
return "qtestlib-to-junit-5.xsl";
}

@Override
Expand All @@ -42,6 +42,6 @@ public String[] getInputXsdNameList() {

@Override
public OutputMetric getOutputFormatType() {
return JUnitModel.OUTPUT_JUNIT_4;
return JUnitModel.OUTPUT_JUNIT_5;
}
}
173 changes: 173 additions & 0 deletions src/main/resources/org/jenkinsci/plugins/xunit/types/qtestlib-to-junit-5.xsl
View file
@@ -0,0 +1,173 @@
<?xml version="1.0" encoding="utf-8"?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
<!-- for details interpreting unit test results http://qt-project.org/wiki/Writing_Unit_Tests -->
<xsl:output method="xml" indent="yes" />
<xsl:decimal-format decimal-separator="." grouping-separator="," />

<!-- misc variables -->
<xsl:variable name="classname" select="/TestCase/@name" />
<xsl:variable name="total-tests" select="count(/TestCase/TestFunction)" />
<xsl:variable name="total-failures" select="count(/TestCase/TestFunction/Incident[@type='fail'])+count(/TestCase/TestFunction/Incident[@type='xpass'])" />

<!-- main template call -->
<xsl:template match="/">
<xsl:apply-templates select="TestCase"/>
</xsl:template>

<xsl:template match="TestCase">
<xsl:variable name="msecsTest">
<xsl:choose>
<xsl:when test="Duration"><xsl:value-of select="Duration/@msecs" /></xsl:when>
<xsl:otherwise>0</xsl:otherwise>
</xsl:choose>
</xsl:variable>
<testsuite name="{$classname}" tests="{$total-tests}" failures="{$total-failures}" errors="0" time="{format-number($msecsTest div 1000,'0.000')}">
<xsl:apply-templates select="Environment"/>
<xsl:apply-templates select="TestFunction" />
<xsl:call-template name="display-system-out" />
<xsl:call-template name="display-system-err" />
</testsuite>
</xsl:template>

<xsl:template match="Environment">
<properties>
<xsl:for-each select="*">
<property name="{name()}" value="{text()}" />
</xsl:for-each>
</properties>
</xsl:template>

<xsl:template match="TestFunction">
<xsl:variable name="msecsFunction">
<xsl:choose>
<xsl:when test="Duration"><xsl:value-of select="Duration/@msecs" /></xsl:when>
<xsl:otherwise>0</xsl:otherwise>
</xsl:choose>
</xsl:variable>
<testcase classname="{$classname}" name="{@name}" time="{format-number($msecsFunction div 1000,'0.000')}">
<!-- we need to use choose here, because jenkins cannot not handle fail and afterwards skip -->
<xsl:choose>
<!-- handle fail -->
<xsl:when test="Incident/@type = 'fail'">
<!-- will be used to generate "nice" error message -->
<xsl:variable name="file" select="Incident[@type='fail']/@file" />
<xsl:variable name="line" select="Incident[@type='fail']/@line" />
<xsl:variable name="description">
<xsl:value-of select="Incident[@type='fail']/Description" />
</xsl:variable>
<xsl:variable name="datatag">
<xsl:value-of select="Incident[@type='fail']/DataTag" />
</xsl:variable>
<!-- display a reasonable error message -->
<xsl:element name="failure">
<xsl:attribute name="type">failure</xsl:attribute>
<xsl:attribute name="message">
<xsl:value-of select="concat($file,':',$line,' :: [',$datatag,'] ',$description)" />
</xsl:attribute>
</xsl:element>
</xsl:when>
<!-- handle skip -->
<xsl:when test="Message/@type = 'skip'">
<!-- will be used to generate "nice" error message -->
<xsl:variable name="file" select="Message[@type='skip']/@file"/>
<xsl:variable name="line" select="Message[@type='skip']/@line"/>
<xsl:variable name="description">
<xsl:value-of select="Message[@type='skip']/Description"/>
</xsl:variable>
<xsl:variable name="datatag">
<xsl:value-of select="Message[@type='skip']/DataTag"/>
</xsl:variable>
<!-- display a reasonable skipped message -->
<xsl:element name="skipped">
<xsl:attribute name="message">
<xsl:value-of select="concat($file,':',$line,' :: [',$datatag,'] ',$description)"/>
</xsl:attribute>
</xsl:element>
</xsl:when>
</xsl:choose>

<!-- handle xfail -->
<xsl:if test="Incident/@type = 'xfail'">
<system-out>
<xsl:for-each select="Incident[@type='xfail']">
<!-- will be used to generate "nice" error message -->
<xsl:variable name="file" select="@file" />
<xsl:variable name="line" select="@line" />
<xsl:variable name="description">
<xsl:value-of select="Description" />
</xsl:variable>
<xsl:variable name="datatag">
<xsl:value-of select="DataTag"/>
</xsl:variable>

<!-- display a reasonable error message -->
<xsl:text>&#10;</xsl:text>
<xsl:text disable-output-escaping="yes">&lt;![CDATA[XFAIL : </xsl:text>
<xsl:value-of select="concat($file,':',$line,' :: ',$description)" disable-output-escaping="yes"/>
<xsl:text disable-output-escaping="yes">]]&gt;</xsl:text>
</xsl:for-each>
</system-out>
</xsl:if>

<!-- handle xpass -->
<xsl:if test="Incident/@type = 'xpass'">
<system-out>
<xsl:for-each select="Incident[@type='xpass']">
<!-- will be used to generate "nice" error message -->
<xsl:variable name="file" select="@file" />
<xsl:variable name="line" select="@line" />
<xsl:variable name="description">
<xsl:value-of select="Description" />
</xsl:variable>

<!-- display a reasonable error message -->
<xsl:text>&#10;</xsl:text>
<xsl:text disable-output-escaping="yes">&lt;![CDATA[XPASS : </xsl:text>
<xsl:value-of select="concat($file,':',$line,' :: ',$description)" disable-output-escaping="yes"/>
<xsl:text disable-output-escaping="yes">]]&gt;</xsl:text>
</xsl:for-each>
</system-out>
</xsl:if>

<!-- handle pass -->
<xsl:if test="Incident/@type = 'pass'">
<xsl:if test="Message[@type='qdebug'] | Message[@type='qwarn'] | Message[@type='warn']">
<system-err>
<xsl:for-each select="Message[@type='qdebug'] | Message[@type='qwarn'] | Message[@type='warn']">
<xsl:choose>
<xsl:when test="@type='qdebug'">
<xsl:text>&#10;</xsl:text>
<xsl:text disable-output-escaping="yes">&lt;![CDATA[QDEBUG : </xsl:text>
<xsl:value-of select="Description" disable-output-escaping="yes"/>
<xsl:text disable-output-escaping="yes">]]&gt;</xsl:text>
</xsl:when>
<xsl:when test="@type='qwarn'">
<xsl:text>&#10;</xsl:text>
<xsl:text disable-output-escaping="yes">&lt;![CDATA[QWARN : </xsl:text>
<xsl:value-of select="Description" disable-output-escaping="yes"/>
<xsl:text disable-output-escaping="yes">]]&gt;</xsl:text>
</xsl:when>
<xsl:when test="@type='warn'">
<xsl:text>&#10;</xsl:text>
<xsl:text disable-output-escaping="yes">&lt;![CDATA[WARNING : </xsl:text>
<xsl:value-of select="Description" disable-output-escaping="yes"/>
<xsl:text disable-output-escaping="yes">]]&gt;</xsl:text>
</xsl:when>
</xsl:choose>
</xsl:for-each>
</system-err>
</xsl:if>
</xsl:if>
</testcase>

</xsl:template>

<xsl:template name="display-system-out">
<system-out/>
</xsl:template>

<xsl:template name="display-system-err">
<system-err/>
</xsl:template>

</xsl:stylesheet>
5 changes: 5 additions & 0 deletions src/test/java/org/jenkinsci/plugins/xunit/types/QTestlibTypeTest.java
View file
Expand Up @@ -10,6 +10,11 @@ public class QTestlibTypeTest extends AbstractTest {
@Test
public void testTestCase1() throws Exception {
convertAndValidate(QTestLibInputMetric.class, "qtestlib/testcase1/input.xml", "qtestlib/testcase1/result.xml");
}

@Test
public void testTestCase2() throws Exception {
convertAndValidate(QTestLibInputMetric.class, "qtestlib/testcase2/input.xml", "qtestlib/testcase2/result.xml");
}

}
2 changes: 1 addition & 1 deletion src/test/resources/org/jenkinsci/plugins/xunit/types/qtestlib/testcase2/result.xml
View file
Expand Up @@ -80,7 +80,7 @@
<testcase classname="tst_QString" name="constructorQByteArray" time="0.000"/>
<testcase classname="tst_QString" name="STL" time="0.000"/>
<testcase classname="tst_QString" name="macTypes" time="0.000">
<skipped>/home/frederik/dev/qt/qt-src-stable/qtbase/tests/auto/corelib/tools/qstring/tst_qstring.cpp:946 :: This is a Mac-only test</skipped>
<skipped message="/home/frederik/dev/qt/qt-src-stable/qtbase/tests/auto/corelib/tools/qstring/tst_qstring.cpp:946 :: [] This is a Mac-only test"/>
</testcase>
<testcase classname="tst_QString" name="isEmpty" time="0.000"/>
<testcase classname="tst_QString" name="isNull" time="0.000"/>
Expand Down

0 comments on commit fad0e95

Please sign in to comment.