Log Message
Fix JENKINS-13967
Modified Paths
- trunk/hudson/dtkit/dtkit-default/junit-output/dtkit-default-junit/src/main/java/com/thalesgroup/dtkit/junit/CppUnit.java
- trunk/hudson/dtkit/dtkit-default/junit-output/dtkit-default-junit/src/test/resources/com/thalesgroup/dtkit/junit/cppunit/testcase6/junit-result.xml
- trunk/hudson/dtkit/dtkit-default/junit-output/pom.xml
Added Paths
Diff
Modified: trunk/hudson/dtkit/dtkit-default/junit-output/dtkit-default-junit/src/main/java/com/thalesgroup/dtkit/junit/CppUnit.java (41072 => 41073)
--- trunk/hudson/dtkit/dtkit-default/junit-output/dtkit-default-junit/src/main/java/com/thalesgroup/dtkit/junit/CppUnit.java 2014-04-02 11:08:43 UTC (rev 41072)
+++ trunk/hudson/dtkit/dtkit-default/junit-output/dtkit-default-junit/src/main/java/com/thalesgroup/dtkit/junit/CppUnit.java 2014-05-02 06:51:36 UTC (rev 41073)
@@ -58,7 +58,7 @@
@Override
public String getXslName() {
- return "cppunit-1.0-to-junit-1.0.xsl";
+ return "cppunit-2.0-to-junit-1.0.xsl";
}
@Override
Added: trunk/hudson/dtkit/dtkit-default/junit-output/dtkit-default-junit/src/main/resources/com/thalesgroup/dtkit/junit/cppunit-2.0-to-junit-1.0.xsl (0 => 41073)
--- trunk/hudson/dtkit/dtkit-default/junit-output/dtkit-default-junit/src/main/resources/com/thalesgroup/dtkit/junit/cppunit-2.0-to-junit-1.0.xsl (rev 0)
+++ trunk/hudson/dtkit/dtkit-default/junit-output/dtkit-default-junit/src/main/resources/com/thalesgroup/dtkit/junit/cppunit-2.0-to-junit-1.0.xsl 2014-05-02 06:51:36 UTC (rev 41073)
@@ -0,0 +1,254 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+ <xsl:output method="xml" indent="yes"/>
+
+ <xsl:template match="/">
+ <xsl:element name="testsuite">
+ <xsl:attribute name="errors">
+ <xsl:value-of select="TestRun/Statistics/Errors"/>
+ </xsl:attribute>
+
+ <xsl:attribute name="failures">
+ <xsl:value-of select="TestRun/Statistics/Failures"/>
+ </xsl:attribute>
+
+ <xsl:attribute name="tests">
+ <xsl:value-of select="TestRun/Statistics/Tests"/>
+ </xsl:attribute>
+
+ <xsl:attribute name="name">cppunit</xsl:attribute>
+ <xsl:apply-templates/>
+ </xsl:element>
+ </xsl:template>
+
+ <xsl:template match="/TestRun/SuccessfulTests/Test">
+ <xsl:call-template name="successTestCase"/>
+ </xsl:template>
+
+ <xsl:template match="/TestRun/FailedTests/FailedTest">
+ <xsl:call-template name="failureOrErrorTestCase"/>
+ </xsl:template>
+
+ <xsl:template match="/TestRun/FailedTests/Test">
+ <xsl:call-template name="failureOrErrorTestCase"/>
+ </xsl:template>
+ <xsl:template match="/TestRun/SkippedTests/Test">
+ <xsl:call-template name="skippedTestCase"/>
+ </xsl:template>
+
+
+ <xsl:template name="skippedTestCase">
+
+ <xsl:element name="testcase">
+ <xsl:choose>
+ <xsl:when test="contains(Name, '::')">
+ <xsl:attribute name="classname">
+ <xsl:value-of select="substring-before(Name, '::')"/>
+ </xsl:attribute>
+ <xsl:attribute name="name">
+ <xsl:value-of select="substring-after(Name, '::')"/>
+ </xsl:attribute>
+ <xsl:choose>
+ <xsl:when test="not(Time)">
+ <xsl:attribute name="time">0</xsl:attribute>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:attribute name="time"><xsl:value-of select="Time"/></xsl:attribute>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:when>
+
+ <xsl:when test="contains(Name, '.')">
+ <xsl:attribute name="classname">
+ <xsl:value-of select="substring-before(Name, '.')"/>
+ </xsl:attribute>
+ <xsl:attribute name="name">
+ <xsl:value-of select="substring-after(Name, '.')"/>
+ </xsl:attribute>
+ <xsl:choose>
+ <xsl:when test="not(Time)">
+ <xsl:attribute name="time">0</xsl:attribute>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:attribute name="time"><xsl:value-of select="Time"/></xsl:attribute>
+ </xsl:otherwise>
+ </xsl:choose>
+
+ </xsl:when>
+
+ <xsl:otherwise>
+ <xsl:attribute name="classname">TestClass</xsl:attribute>
+ <xsl:attribute name="name">
+ <xsl:value-of select="Name"/>
+ </xsl:attribute>
+ <xsl:choose>
+ <xsl:when test="not(Time)">
+ <xsl:attribute name="time">0</xsl:attribute>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:attribute name="time"><xsl:value-of select="Time"/></xsl:attribute>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:otherwise>
+ </xsl:choose>
+
+ <xsl:element name="skipped"/>
+ </xsl:element>
+ </xsl:template>
+
+
+ <xsl:template name="successTestCase">
+
+ <xsl:element name="testcase">
+ <xsl:choose>
+ <xsl:when test="contains(Name, '::')">
+ <xsl:attribute name="classname">
+ <xsl:value-of select="substring-before(Name, '::')"/>
+ </xsl:attribute>
+ <xsl:attribute name="name">
+ <xsl:value-of select="substring-after(Name, '::')"/>
+ </xsl:attribute>
+ <xsl:choose>
+ <xsl:when test="not(Time)">
+ <xsl:attribute name="time">0</xsl:attribute>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:attribute name="time"><xsl:value-of select="Time"/></xsl:attribute>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:when>
+
+ <xsl:when test="contains(Name, '.')">
+ <xsl:attribute name="classname">
+ <xsl:value-of select="substring-before(Name, '.')"/>
+ </xsl:attribute>
+ <xsl:attribute name="name">
+ <xsl:value-of select="substring-after(Name, '.')"/>
+ </xsl:attribute>
+ <xsl:choose>
+ <xsl:when test="not(Time)">
+ <xsl:attribute name="time">0</xsl:attribute>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:attribute name="time"><xsl:value-of select="Time"/></xsl:attribute>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:when>
+
+ <xsl:otherwise>
+ <xsl:attribute name="classname">TestClass</xsl:attribute>
+ <xsl:attribute name="name">
+ <xsl:value-of select="Name"/>
+ </xsl:attribute>
+ <xsl:choose>
+ <xsl:when test="not(Time)">
+ <xsl:attribute name="time">0</xsl:attribute>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:attribute name="time"><xsl:value-of select="Time"/></xsl:attribute>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:element>
+ </xsl:template>
+
+
+ <xsl:template name="failureOrErrorTestCase">
+
+ <xsl:element name="testcase">
+ <xsl:choose>
+ <xsl:when test="contains(Name, '::')">
+ <xsl:attribute name="classname">
+ <xsl:value-of select="substring-before(Name, '::')"/>
+ </xsl:attribute>
+ <xsl:attribute name="name">
+ <xsl:value-of select="substring-after(Name, '::')"/>
+ </xsl:attribute>
+ <xsl:choose>
+ <xsl:when test="not(Time)">
+ <xsl:attribute name="time">0</xsl:attribute>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:attribute name="time"><xsl:value-of select="Time"/></xsl:attribute>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:when>
+
+ <xsl:when test="contains(Name, '.')">
+ <xsl:attribute name="classname">
+ <xsl:value-of select="substring-before(Name, '.')"/>
+ </xsl:attribute>
+ <xsl:attribute name="name">
+ <xsl:value-of select="substring-after(Name, '.')"/>
+ </xsl:attribute>
+ <xsl:choose>
+ <xsl:when test="not(Time)">
+ <xsl:attribute name="time">0</xsl:attribute>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:attribute name="time"><xsl:value-of select="Time"/></xsl:attribute>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:when>
+
+ <xsl:otherwise>
+ <xsl:attribute name="classname">TestClass</xsl:attribute>
+ <xsl:attribute name="name">
+ <xsl:value-of select="Name"/>
+ </xsl:attribute>
+ <xsl:choose>
+ <xsl:when test="not(Time)">
+ <xsl:attribute name="time">0</xsl:attribute>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:attribute name="time"><xsl:value-of select="Time"/></xsl:attribute>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:otherwise>
+ </xsl:choose>
+
+ <xsl:choose>
+ <xsl:when test="FailureType='Error'">
+ <xsl:element name="error">
+ <xsl:attribute name="message">
+ <xsl:value-of select=" normalize-space(Message)"/>
+ </xsl:attribute>
+ <xsl:attribute name="type">
+ <xsl:value-of select="FailureType"/>
+ </xsl:attribute>
+ <xsl:value-of select="normalize-space(Message)"/>
+ </xsl:element>
+
+ <xsl:element name="system-err">
+ <xsl:text> </xsl:text>
+ <xsl:text>[File] - </xsl:text><xsl:value-of select="Location/File"/>
+ <xsl:text> </xsl:text>
+ <xsl:text>[Line] - </xsl:text><xsl:value-of select="Location/Line"/>
+ <xsl:text> </xsl:text>
+ </xsl:element>
+ </xsl:when>
+
+ <xsl:otherwise>
+ <xsl:element name="failure">
+ <xsl:attribute name="message">
+ <xsl:value-of select=" normalize-space(Message)"/>
+ </xsl:attribute>
+ <xsl:attribute name="type">
+ <xsl:value-of select="FailureType"/>
+ </xsl:attribute>
+ </xsl:element>
+ <xsl:element name="system-err">
+ <xsl:text> </xsl:text>
+ <xsl:text>[File] - </xsl:text><xsl:value-of select="Location/File"/>
+ <xsl:text> </xsl:text>
+ <xsl:text>[Line] - </xsl:text><xsl:value-of select="Location/Line"/>
+ <xsl:text> </xsl:text>
+ </xsl:element>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:element>
+ </xsl:template>
+
+ <xsl:template match="text()|@*"/>
+</xsl:stylesheet>
Modified: trunk/hudson/dtkit/dtkit-default/junit-output/dtkit-default-junit/src/test/resources/com/thalesgroup/dtkit/junit/cppunit/testcase6/junit-result.xml (41072 => 41073)
--- trunk/hudson/dtkit/dtkit-default/junit-output/dtkit-default-junit/src/test/resources/com/thalesgroup/dtkit/junit/cppunit/testcase6/junit-result.xml 2014-04-02 11:08:43 UTC (rev 41072)
+++ trunk/hudson/dtkit/dtkit-default/junit-output/dtkit-default-junit/src/test/resources/com/thalesgroup/dtkit/junit/cppunit/testcase6/junit-result.xml 2014-05-02 06:51:36 UTC (rev 41073)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<testsuite errors="0" failures="0" tests="4" name="cppunit">
- <testcase classname="DeviceDataTest" name="testConstructor" time="0"/>
- <testcase classname="DeviceDataTest" name="testToJSON" time="0"/>
- <testcase classname="DeviceDataTest" name="testToObject" time="0"/>
- <testcase classname="DeviceDataTest" name="testToObjectException" time="0"/>
+ <testcase classname="DeviceDataTest" name="testConstructor" time="0.002"/>
+ <testcase classname="DeviceDataTest" name="testToJSON" time="0.001"/>
+ <testcase classname="DeviceDataTest" name="testToObject" time="0.000"/>
+ <testcase classname="DeviceDataTest" name="testToObjectException" time="0.005"/>
</testsuite>
\ No newline at end of file
Modified: trunk/hudson/dtkit/dtkit-default/junit-output/pom.xml (41072 => 41073)
--- trunk/hudson/dtkit/dtkit-default/junit-output/pom.xml 2014-04-02 11:08:43 UTC (rev 41072)
+++ trunk/hudson/dtkit/dtkit-default/junit-output/pom.xml 2014-05-02 06:51:36 UTC (rev 41073)
@@ -73,7 +73,6 @@
<connection>scm:svn:https://svn.jenkins-ci.org/trunk/hudson/dtkit/dtkit-default/junit-output</connection>
<developerConnection>scm:svn:https://svn.jenkins-ci.org/trunk/hudson/dtkit/dtkit-default/junit-output
</developerConnection>
- <url>https://github.com/jenkinsci/pom/dtkit-metrics-parent/tags/dtkit-metrics-default-parent-21/dtkit-default-junit-parent</url>
</scm>
<build>
You received this message because you are subscribed to the Google Groups "Jenkins Commits" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected].
For more options, visit https://groups.google.com/d/optout.
