Log Message
Fix JENKINS-16131
Modified Paths
- trunk/hudson/dtkit/dtkit-default/junit-output/dtkit-default-junit/src/main/resources/com/thalesgroup/dtkit/junit/boosttest-1.2-to-junit-4.xsl
- trunk/hudson/dtkit/dtkit-default/junit-output/dtkit-default-junit/src/test/java/com/thalesgroup/dtkit/junit/BoostTestTest.java
- trunk/hudson/dtkit/dtkit-default/junit-output/dtkit-default-junit/src/test/java/com/thalesgroup/dtkit/junit/ValidInputMetricXSLTest.java
Added Paths
- trunk/hudson/dtkit/dtkit-default/junit-output/dtkit-default-junit/src/test/resources/com/thalesgroup/dtkit/junit/boosttest/testcase16/
- trunk/hudson/dtkit/dtkit-default/junit-output/dtkit-default-junit/src/test/resources/com/thalesgroup/dtkit/junit/boosttest/testcase16/junit-result.xml
- trunk/hudson/dtkit/dtkit-default/junit-output/dtkit-default-junit/src/test/resources/com/thalesgroup/dtkit/junit/boosttest/testcase16/testlog.xml
- trunk/hudson/dtkit/dtkit-default/junit-output/dtkit-default-junit/src/test/resources/com/thalesgroup/dtkit/junit/boosttest/testcase17/
- trunk/hudson/dtkit/dtkit-default/junit-output/dtkit-default-junit/src/test/resources/com/thalesgroup/dtkit/junit/boosttest/testcase17/junit-result2.xml
Removed Paths
Diff
Deleted: trunk/hudson/dtkit/dtkit-default/junit-output/dtkit-default-junit/src/main/java/com/thalesgroup/dtkit/junit/Tusar.java (41060 => 41061)
--- trunk/hudson/dtkit/dtkit-default/junit-output/dtkit-default-junit/src/main/java/com/thalesgroup/dtkit/junit/Tusar.java 2013-12-30 21:55:19 UTC (rev 41060)
+++ trunk/hudson/dtkit/dtkit-default/junit-output/dtkit-default-junit/src/main/java/com/thalesgroup/dtkit/junit/Tusar.java 2013-12-30 21:56:48 UTC (rev 41061)
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 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. *
- *******************************************************************************/
-
-package com.thalesgroup.dtkit.junit;
-
-import com.thalesgroup.dtkit.junit.model.JUnitModel;
-import com.thalesgroup.dtkit.metrics.model.InputMetricXSL;
-import com.thalesgroup.dtkit.metrics.model.InputType;
-import com.thalesgroup.dtkit.metrics.model.OutputMetric;
-import com.thalesgroup.dtkit.processor.InputMetric;
-import com.thalesgroup.dtkit.tusar.model.TusarModel;
-import com.thalesgroup.dtkit.util.validator.ValidationError;
-import com.thalesgroup.dtkit.util.validator.ValidationException;
-
-import javax.xml.bind.annotation.XmlType;
-import java.io.File;
-import java.util.List;
-
-
-@XmlType(name = "tusar", namespace = "junit")
-@InputMetric
-public class Tusar extends InputMetricXSL {
-
- @Override
- public InputType getToolType() {
- return InputType.TEST;
- }
-
- @Override
- public String getToolName() {
- return "TUSAR";
- }
-
- @Override
- public String getToolVersion() {
- return "1.0";
- }
-
- @Override
- public boolean isDefault() {
- return true;
- }
-
- @Override
- public String getXslName() {
- return "tusar-1.0-to-junit-1.0.xsl";
- }
-
- @Override
- public boolean validateInputFile(File inputXMLFile) throws ValidationException {
- List<ValidationError> errors = TusarModel.OUTPUT_TUSAR_1_0.validate(inputXMLFile);
- this.setInputValidationErrors(errors);
- return errors.isEmpty();
- }
-
-
- @Override
- public OutputMetric getOutputFormatType() {
- return JUnitModel.OUTPUT_JUNIT_1_0;
- }
-}
Modified: trunk/hudson/dtkit/dtkit-default/junit-output/dtkit-default-junit/src/main/resources/com/thalesgroup/dtkit/junit/boosttest-1.2-to-junit-4.xsl (41060 => 41061)
--- trunk/hudson/dtkit/dtkit-default/junit-output/dtkit-default-junit/src/main/resources/com/thalesgroup/dtkit/junit/boosttest-1.2-to-junit-4.xsl 2013-12-30 21:55:19 UTC (rev 41060)
+++ trunk/hudson/dtkit/dtkit-default/junit-output/dtkit-default-junit/src/main/resources/com/thalesgroup/dtkit/junit/boosttest-1.2-to-junit-4.xsl 2013-12-30 21:56:48 UTC (rev 41061)
@@ -56,11 +56,12 @@
<xsl:when test="$currEltName='Error'">
<xsl:text> </xsl:text>
<xsl:text>[Error] - </xsl:text>
- <xsl:call-template name="processQuote">
- <xsl:with-param name="string">
- <xsl:value-of select="$currElt"/>
- </xsl:with-param>
- </xsl:call-template>
+ <!--<xsl:call-template name="processQuote">-->
+ <!--<xsl:with-param name="string">-->
+ <!--<xsl:value-of select="$currElt"/>-->
+ <!--</xsl:with-param>-->
+ <!--</xsl:call-template>-->
+ <xsl:value-of select="$currElt"/>
<xsl:text> </xsl:text>
<xsl:text> == [File] - </xsl:text><xsl:value-of select="($currElt)/@file"/>
<xsl:text> </xsl:text>
@@ -110,6 +111,8 @@
</xsl:choose>
</xsl:when>
+ <xsl:when test="$currEltName='Info'"></xsl:when>
+
</xsl:choose>
</xsl:for-each>
</xsl:template>
Modified: trunk/hudson/dtkit/dtkit-default/junit-output/dtkit-default-junit/src/test/java/com/thalesgroup/dtkit/junit/BoostTestTest.java (41060 => 41061)
--- trunk/hudson/dtkit/dtkit-default/junit-output/dtkit-default-junit/src/test/java/com/thalesgroup/dtkit/junit/BoostTestTest.java 2013-12-30 21:55:19 UTC (rev 41060)
+++ trunk/hudson/dtkit/dtkit-default/junit-output/dtkit-default-junit/src/test/java/com/thalesgroup/dtkit/junit/BoostTestTest.java 2013-12-30 21:56:48 UTC (rev 41061)
@@ -88,4 +88,14 @@
public void testTestCase15() throws Exception {
convertAndValidate(BoostTest.class, "boosttest/testcase15/testlog.xml", "boosttest/testcase15/junit-result.xml");
}
+
+ @Test
+ public void testTestCase16() throws Exception {
+ convertAndValidate(BoostTest.class, "boosttest/testcase16/testlog.xml", "boosttest/testcase16/junit-result.xml");
+ }
+
+ @Test
+ public void testTestCase17() throws Exception {
+ convertAndValidate(BoostTest.class, "boosttest/testcase17/testlog.xml", "boosttest/testcase17/junit-result.xml");
+ }
}
Deleted: trunk/hudson/dtkit/dtkit-default/junit-output/dtkit-default-junit/src/test/java/com/thalesgroup/dtkit/junit/TusarTest.java (41060 => 41061)
--- trunk/hudson/dtkit/dtkit-default/junit-output/dtkit-default-junit/src/test/java/com/thalesgroup/dtkit/junit/TusarTest.java 2013-12-30 21:55:19 UTC (rev 41060)
+++ trunk/hudson/dtkit/dtkit-default/junit-output/dtkit-default-junit/src/test/java/com/thalesgroup/dtkit/junit/TusarTest.java 2013-12-30 21:56:48 UTC (rev 41061)
@@ -1,13 +0,0 @@
-package com.thalesgroup.dtkit.junit;
-
-import org.junit.Test;
-
-public class TusarTest extends AbstractTest {
-
-
- @Test
- public void testTransformation() throws Exception {
- convertAndValidate(Tusar.class, "tusar/testcase1/input.xml", "tusar/testcase1/junit-result.xml");
- }
-
-}
Modified: trunk/hudson/dtkit/dtkit-default/junit-output/dtkit-default-junit/src/test/java/com/thalesgroup/dtkit/junit/ValidInputMetricXSLTest.java (41060 => 41061)
--- trunk/hudson/dtkit/dtkit-default/junit-output/dtkit-default-junit/src/test/java/com/thalesgroup/dtkit/junit/ValidInputMetricXSLTest.java 2013-12-30 21:55:19 UTC (rev 41060)
+++ trunk/hudson/dtkit/dtkit-default/junit-output/dtkit-default-junit/src/test/java/com/thalesgroup/dtkit/junit/ValidInputMetricXSLTest.java 2013-12-30 21:56:48 UTC (rev 41061)
@@ -47,7 +47,6 @@
listInputMetric.add(MSTest.class);
listInputMetric.add(NUnit.class);
listInputMetric.add(PHPUnit.class);
- listInputMetric.add(Tusar.class);
listInputMetric.add(UnitTest.class);
}
Added: trunk/hudson/dtkit/dtkit-default/junit-output/dtkit-default-junit/src/test/resources/com/thalesgroup/dtkit/junit/boosttest/testcase16/junit-result.xml (0 => 41061)
--- trunk/hudson/dtkit/dtkit-default/junit-output/dtkit-default-junit/src/test/resources/com/thalesgroup/dtkit/junit/boosttest/testcase16/junit-result.xml (rev 0)
+++ trunk/hudson/dtkit/dtkit-default/junit-output/dtkit-default-junit/src/test/resources/com/thalesgroup/dtkit/junit/boosttest/testcase16/junit-result.xml 2013-12-30 21:56:48 UTC (rev 41061)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<testsuite tests="1" errors="0" failures="0" name="MergedTestSuite" skipped="0">
+ <testcase classname="Master.Test.Suite.testSuite1.foo" name="start_ok" time="0">
+ <system-out>
[Info] - check init() passed
 == [File] - foo.cpp
 == [Line] - 83
</system-out>
+ </testcase>
+</testsuite>
\ No newline at end of file
Added: trunk/hudson/dtkit/dtkit-default/junit-output/dtkit-default-junit/src/test/resources/com/thalesgroup/dtkit/junit/boosttest/testcase16/testlog.xml (0 => 41061)
--- trunk/hudson/dtkit/dtkit-default/junit-output/dtkit-default-junit/src/test/resources/com/thalesgroup/dtkit/junit/boosttest/testcase16/testlog.xml (rev 0)
+++ trunk/hudson/dtkit/dtkit-default/junit-output/dtkit-default-junit/src/test/resources/com/thalesgroup/dtkit/junit/boosttest/testcase16/testlog.xml 2013-12-30 21:56:48 UTC (rev 41061)
@@ -0,0 +1,12 @@
+<TestLog>
+ <BuildInfo platform="linux" compiler="GNU C++ version 4.4.6 20120305 (Red Hat 4.4.6-4)" stl="GNU libstdc++ version 20120305" boost="1.53.0"/>
+ <Message file="./boost/test/impl/framework.ipp" line="432"><![CDATA[Test cases order is shuffled using seed: 1371107205]]></Message>
+ <TestSuite name="Master Test Suite">
+ <TestSuite name="testSuite1">
+ <TestCase name="start_ok">
+ <Info file="foo.cpp" line="83"><![CDATA[check init() passed]]></Info>
+ <TestingTime>0</TestingTime>
+ </TestCase>
+ </TestSuite>
+ </TestSuite>
+</TestLog>
\ No newline at end of file
Added: trunk/hudson/dtkit/dtkit-default/junit-output/dtkit-default-junit/src/test/resources/com/thalesgroup/dtkit/junit/boosttest/testcase17/junit-result2.xml (0 => 41061)
--- trunk/hudson/dtkit/dtkit-default/junit-output/dtkit-default-junit/src/test/resources/com/thalesgroup/dtkit/junit/boosttest/testcase17/junit-result2.xml (rev 0)
+++ trunk/hudson/dtkit/dtkit-default/junit-output/dtkit-default-junit/src/test/resources/com/thalesgroup/dtkit/junit/boosttest/testcase17/junit-result2.xml 2013-12-30 21:56:48 UTC (rev 41061)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<testsuite tests="4" errors="0" failures="0" name="MergedTestSuite" skipped="0">
+ <testcase classname="ModuleInfoTest.DLLInfoTest.source/TS_DeploymentTest"
+ name="VersionInfoTest"
+ time="7.375">
+ <system-out>
[Info] - check boost::ifind_first(strProcessPath, L"ReleaseU") || boost::ifind_first(strProcessPath, L"DebugU") passed
 == [File] - source/TS_DeploymentTest.cpp
 == [Line] - 366

[Info] - check binaryFullList.size() > 0 passed
 == [File] - source/TS_DeploymentTest.cpp
 == [Line] - 375

[Info] - check GetLastError()==0 passed
 == [File] - source/TS_DeploymentTest.cpp
 == [Line] - 331

[Info] - check hFile!=((HANDLE)(LONG_PTR)-1) passed
 == [File] - source/TS_DeploymentTest.cpp
 == [Line] - 332

[Info] - check GetFileTime(hFile, &ftCreate, &ftLastAccess, &ftLastWrite) passed
 == [File] - source/TS_DeploymentTest.cpp
 == [Line] - 335

[Info] - check creationTime.dwHighDateTime > 0 && creationTime.dwLowDateTime > 0 passed
 == [File] - source/TS_DeploymentTest.cpp
 == [Line] - 338
</system-out>
+ </testcase>
+ <testcase classname="ModuleInfoTest.DLLInfoTest.source/TS_DeploymentTest"
+ name="CompanyNameTest"
+ time="1.547">
+ <system-out>
[Info] - check boost::ifind_first(strProcessPath, L"ReleaseU") || boost::ifind_first(strProcessPath, L"DebugU") passed
 == [File] - source/TS_DeploymentTest.cpp
 == [Line] - 366

[Info] - check binaryFullList.size() > 0 passed
 == [File] - source/TS_DeploymentTest.cpp
 == [Line] - 375

[Info] - check GetLastError()==0 passed
 == [File] - source/TS_DeploymentTest.cpp
 == [Line] - 331

[Info] - check hFile!=((HANDLE)(LONG_PTR)-1) passed
 == [File] - source/TS_DeploymentTest.cpp
 == [Line] - 332

[Info] - check GetFileTime(hFile, &ftCreate, &ftLastAccess, &ftLastWrite) passed
 == [File] - source/TS_DeploymentTest.cpp
 == [Line] - 335

[Info] - check creationTime.dwHighDateTime > 0 && creationTime.dwLowDateTime > 0 passed
 == [File] - source/TS_DeploymentTest.cpp
 == [Line] - 338
</system-out>
+ </testcase>
+ <testcase classname="ModuleInfoTest.DLLInfoTest.source/TS_DeploymentTest"
+ name="CopyrightTest"
+ time="1.375">
+ <system-out>
[Info] - check boost::ifind_first(strProcessPath, L"ReleaseU") || boost::ifind_first(strProcessPath, L"DebugU") passed
 == [File] - source/TS_DeploymentTest.cpp
 == [Line] - 366

[Info] - check binaryFullList.size() > 0 passed
 == [File] - source/TS_DeploymentTest.cpp
 == [Line] - 375

[Info] - check GetLastError()==0 passed
 == [File] - source/TS_DeploymentTest.cpp
 == [Line] - 331

[Info] - check hFile!=((HANDLE)(LONG_PTR)-1) passed
 == [File] - source/TS_DeploymentTest.cpp
 == [Line] - 332

[Info] - check GetFileTime(hFile, &ftCreate, &ftLastAccess, &ftLastWrite) passed
 == [File] - source/TS_DeploymentTest.cpp
 == [Line] - 335

[Info] - check creationTime.dwHighDateTime > 0 && creationTime.dwLowDateTime > 0 passed
 == [File] - source/TS_DeploymentTest.cpp
 == [Line] - 338
</system-out>
+ </testcase>
+ <testcase classname="ModuleInfoTest.DLLInfoTest.source/TS_DeploymentTest" name="DateTest"
+ time="0.078">
+ <system-out>
[Info] - check boost::ifind_first(strProcessPath, L"ReleaseU") || boost::ifind_first(strProcessPath, L"DebugU") passed
 == [File] - source/TS_DeploymentTest.cpp
 == [Line] - 366

[Info] - check binaryFullList.size() > 0 passed
 == [File] - source/TS_DeploymentTest.cpp
 == [Line] - 375

[Info] - check GetLastError()==0 passed
 == [File] - source/TS_DeploymentTest.cpp
 == [Line] - 331

[Info] - check hFile!=((HANDLE)(LONG_PTR)-1) passed
 == [File] - source/TS_DeploymentTest.cpp
 == [Line] - 332

[Info] - check GetFileTime(hFile, &ftCreate, &ftLastAccess, &ftLastWrite) passed
 == [File] - source/TS_DeploymentTest.cpp
 == [Line] - 335

[Info] - check creationTime.dwHighDateTime > 0 && creationTime.dwLowDateTime > 0 passed
 == [File] - source/TS_DeploymentTest.cpp
 == [Line] - 338

[Info] - check boost::ifind_first(strProcessPath, L"ReleaseU") || boost::ifind_first(strProcessPath, L"DebugU") passed
 == [File] - source/TS_DeploymentTest.cpp
 == [Line] - 366

[Info] - check binaryFullList.size() > 0 passed
 == [File] - source/TS_DeploymentTest.cpp
 == [Line] - 375
</system-out>
+ </testcase>
+</testsuite>
\ No newline at end of file
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 jenkinsci-commits+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.
