Modified: trunk/hudson/dtkit/dtkit-default/junit-output/dtkit-default-junit/pom.xml (40795 => 40796)
--- trunk/hudson/dtkit/dtkit-default/junit-output/dtkit-default-junit/pom.xml 2012-12-25 18:55:49 UTC (rev 40795)
+++ trunk/hudson/dtkit/dtkit-default/junit-output/dtkit-default-junit/pom.xml 2012-12-25 18:56:43 UTC (rev 40796)
@@ -13,7 +13,7 @@
<dependencies>
<dependency>
- <groupId>com.thalesgroup.dtkit</groupId>
+ <groupId>org.jenkins-ci.lib.dtkit</groupId>
<artifactId>dtkit-junit-model</artifactId>
</dependency>
Modified: trunk/hudson/dtkit/dtkit-default/junit-output/dtkit-default-junit/src/main/java/com/thalesgroup/dtkit/junit/NUnit.java (40795 => 40796)
--- trunk/hudson/dtkit/dtkit-default/junit-output/dtkit-default-junit/src/main/java/com/thalesgroup/dtkit/junit/NUnit.java 2012-12-25 18:55:49 UTC (rev 40795)
+++ trunk/hudson/dtkit/dtkit-default/junit-output/dtkit-default-junit/src/main/java/com/thalesgroup/dtkit/junit/NUnit.java 2012-12-25 18:56:43 UTC (rev 40796)
@@ -67,6 +67,6 @@
}
public OutputMetric getOutputFormatType() {
- return JUnitModel.OUTPUT_JUNIT_2;
+ return JUnitModel.OUTPUT_JUNIT_5;
}
}
\ No newline at end of file
Modified: trunk/hudson/dtkit/dtkit-default/junit-output/dtkit-default-junit/src/main/resources/com/thalesgroup/dtkit/junit/nunit-1.0-to-junit-2.xsl (40795 => 40796)
--- trunk/hudson/dtkit/dtkit-default/junit-output/dtkit-default-junit/src/main/resources/com/thalesgroup/dtkit/junit/nunit-1.0-to-junit-2.xsl 2012-12-25 18:55:49 UTC (rev 40795)
+++ trunk/hudson/dtkit/dtkit-default/junit-output/dtkit-default-junit/src/main/resources/com/thalesgroup/dtkit/junit/nunit-1.0-to-junit-2.xsl 2012-12-25 18:56:43 UTC (rev 40796)
@@ -1,97 +1,91 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*******************************************************************************
-* Copyright (c) 2011 Thales Corporate Services SAS *
-* Author : Gregory Boissinot *
-* *
-* Permission is hereby granted, free of charge, to any person obtaining a copy *
-* of this software and associated documentation files (the "Software"), to deal*
-* in the Software without restriction, including without limitation the rights *
-* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell *
-* copies of the Software, and to permit persons to whom the Software is *
-* furnished to do so, subject to the following conditions: *
-* *
-* The above copyright notice and this permission notice shall be included in *
-* all copies or substantial portions of the Software. *
-* *
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR *
-* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, *
-* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE *
-* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER *
-* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,*
-* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN *
-* THE SOFTWARE. *
-*******************************************************************************/
--->
<xsl:stylesheet version="1.0"
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
- <xsl:output method="xml" indent="yes"/>
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+ <xsl:output method="xml" indent="yes" />
+
+ <xsl:template match="/test-results">
+ <testsuites>
+ <xsl:for-each select="test-suite//results//test-case[1]">
+
+ <xsl:for-each select="../..">
+ <xsl:variable name="firstTestName"
+ select="results//test-case[1]//@name" />
+
+ <xsl:variable name="assembly">
+ <xsl:choose>
+ <xsl:when test="substring($firstTestName, string-length($firstTestName)) = ')'">
+ <xsl:value-of select="substring-before($firstTestName, concat('.', @name))"></xsl:value-of>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="concat(substring-before($firstTestName, @name), @name)" />
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+ <!--
+ <xsl:variable name="assembly"
+ select="concat(substring-before($firstTestName, @name), @name)" />
+ -->
- <xsl:template match="/test-results">
- <testsuites>
- <xsl:for-each select="test-suite//results//test-case[1]">
+ <!-- <redirect:write file="{$outputpath}/TEST-{$assembly}.xml">-->
- <xsl:for-each select="../..">
- <xsl:variable name="firstTestName"
- select="results//test-case[1]//@name"/>
- <xsl:variable name="assembly"
- select="concat(substring-before($firstTestName, @name), @name)"/>
+ <testsuite name="{$assembly}"
+ tests="{count(*/test-case)}" time="{@time}"
+ failures="{count(*/test-case/failure)}" errors="0"
+ skipped="{count(*/test-case[@executed='False'])}">
+ <xsl:for-each select="*/test-case">
+ <xsl:variable name="testcaseName">
+ <xsl:choose>
+ <xsl:when test="contains(./@name, concat($assembly,'.'))">
+ <xsl:value-of select="substring-after(./@name, concat($assembly,'.'))"/><!-- We either instantiate a "15" -->
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="./@name"/><!-- ...or a "20" -->
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+
+ <testcase classname="{$assembly}"
+ name="{$testcaseName}">
+ <xsl:if test="@time!=''">
+ <xsl:attribute name="time"><xsl:value-of select="@time" /></xsl:attribute>
+ </xsl:if>
- <!-- <redirect:write file="{$outputpath}/TEST-{$assembly}.xml">-->
+ <xsl:variable name="generalfailure"
+ select="./failure" />
- <testsuite name="{$assembly}"
- tests="{count(*/test-case)}" time="{@time}"
- failures="{count(*/test-case/failure)}" errors="0"
- skipped="{count(*/test-case[@executed='False'])}">
- <xsl:for-each select="*/test-case[@time!='']">
- <xsl:variable name="testcaseName">
- <xsl:choose>
- <xsl:when test="contains(./@name, $assembly)">
- <xsl:value-of select="substring-after(./@name, concat($assembly,'.'))"/>
- <!-- We either instantiate a "15" -->
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="./@name"/>
- <!-- ...or a "20" -->
- </xsl:otherwise>
- </xsl:choose>
- </xsl:variable>
-
- <testcase classname="{$assembly}"
- name="{$testcaseName}"
- time="{@time}">
-
- <xsl:variable name="generalfailure"
- select="./failure"/>
-
- <xsl:if test="./failure">
- <xsl:variable name="failstack"
- select="count(./failure/stack-trace/*) + count(./failure/stack-trace/text())"/>
- <failure>
- <xsl:choose>
- <xsl:when test="$failstack > 0 or not($generalfailure)">
- MESSAGE:
- <xsl:value-of select="./failure/message"/>
- +++++++++++++++++++
- STACK TRACE:
- <xsl:value-of select="./failure/stack-trace"/>
- </xsl:when>
- <xsl:otherwise>
- MESSAGE:
- <xsl:value-of select="$generalfailure/message"/>
- +++++++++++++++++++
- STACK TRACE:
- <xsl:value-of select="$generalfailure/stack-trace"/>
- </xsl:otherwise>
- </xsl:choose>
- </failure>
+ <xsl:if test="./failure">
+ <xsl:variable name="failstack"
+ select="count(./failure/stack-trace/*) + count(./failure/stack-trace/text())" />
+ <failure>
+ <xsl:choose>
+ <xsl:when test="$failstack > 0 or not($generalfailure)">
+MESSAGE:
+<xsl:value-of select="./failure/message" />
++++++++++++++++++++
+STACK TRACE:
+<xsl:value-of select="./failure/stack-trace" />
+ </xsl:when>
+ <xsl:otherwise>
+MESSAGE:
+<xsl:value-of select="$generalfailure/message" />
++++++++++++++++++++
+STACK TRACE:
+<xsl:value-of select="$generalfailure/stack-trace" />
+ </xsl:otherwise>
+ </xsl:choose>
+ </failure>
+ </xsl:if>
+ <xsl:if test="@executed='False'">
+ <skipped>
+ <xsl:attribute name="message"><xsl:value-of select="./reason/message"/></xsl:attribute>
+ </skipped>
</xsl:if>
- </testcase>
- </xsl:for-each>
- </testsuite>
- <!-- </redirect:write>-->
- </xsl:for-each>
- </xsl:for-each>
- </testsuites>
- </xsl:template>
-</xsl:stylesheet>
+ </testcase>
+ </xsl:for-each>
+ </testsuite>
+ <!-- </redirect:write>-->
+ </xsl:for-each>
+ </xsl:for-each>
+ </testsuites>
+ </xsl:template>
+</xsl:stylesheet>
\ No newline at end of file
Modified: trunk/hudson/dtkit/dtkit-default/junit-output/dtkit-default-junit/src/test/resources/com/thalesgroup/dtkit/junit/nunit/JUnit-ignored.xml (40795 => 40796)
--- trunk/hudson/dtkit/dtkit-default/junit-output/dtkit-default-junit/src/test/resources/com/thalesgroup/dtkit/junit/nunit/JUnit-ignored.xml 2012-12-25 18:55:49 UTC (rev 40795)
+++ trunk/hudson/dtkit/dtkit-default/junit-output/dtkit-default-junit/src/test/resources/com/thalesgroup/dtkit/junit/nunit/JUnit-ignored.xml 2012-12-25 18:56:43 UTC (rev 40796)
@@ -1,6 +1,14 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8"?>
<testsuites>
- <testsuite failures="0" time="0.001" errors="0" skipped="2" tests="3" name="UnitTests.OtherMainClassTest">
- <testcase time="0.001" name="TestPropertyValue" classname="UnitTests.OtherMainClassTest"/>
- </testsuite>
-</testsuites>
\ No newline at end of file
+ <testsuite name="UnitTests.OtherMainClassTest" tests="3" time="0.001" failures="0"
+ errors="0"
+ skipped="2">
+ <testcase classname="UnitTests.OtherMainClassTest" name="TestIgnored">
+ <skipped message=""/>
+ </testcase>
+ <testcase classname="UnitTests.OtherMainClassTest" name="TestIgnoredWithText">
+ <skipped message="Dont do this"/>
+ </testcase>
+ <testcase classname="UnitTests.OtherMainClassTest" name="TestPropertyValue" time="0.001"/>
+ </testsuite>
+</testsuites>
Modified: trunk/hudson/dtkit/dtkit-default/junit-output/dtkit-default-junit-jenkins/pom.xml (40795 => 40796)
--- trunk/hudson/dtkit/dtkit-default/junit-output/dtkit-default-junit-jenkins/pom.xml 2012-12-25 18:55:49 UTC (rev 40795)
+++ trunk/hudson/dtkit/dtkit-default/junit-output/dtkit-default-junit-jenkins/pom.xml 2012-12-25 18:56:43 UTC (rev 40796)
@@ -24,7 +24,7 @@
</dependency>
<dependency>
- <groupId>com.thalesgroup.dtkit</groupId>
+ <groupId>org.jenkins-ci.lib.dtkit</groupId>
<artifactId>dtkit-junit-model</artifactId>
</dependency>
Modified: trunk/hudson/dtkit/dtkit-default/junit-output/pom.xml (40795 => 40796)
--- trunk/hudson/dtkit/dtkit-default/junit-output/pom.xml 2012-12-25 18:55:49 UTC (rev 40795)
+++ trunk/hudson/dtkit/dtkit-default/junit-output/pom.xml 2012-12-25 18:56:43 UTC (rev 40796)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jenkins-ci.lib.dtkit</groupId>
<artifactId>dtkit-metrics-default-parent</artifactId>
- <version>18</version>
+ <version>19</version>
</parent>
<groupId>org.jenkins-ci.lib.dtkit</groupId>
@@ -66,7 +66,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-18/dtkit-default-junit-parent</url>
</scm>
<build>
