[JENKINS-42031] xUnit Plugin Does Not Parse Some Boost 1.63 Test Reports

Change the boosttest-1.5.0.xsd validation file to accept some test reports generated by the test framework of Boost 1.63 where these reports may contain a "Message" element as child of a "TestSuite" element.
jenkinsci · Apr 17, 2018 · ce609d4 · ce609d4
1 parent 332b96c
commit ce609d4
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 0 deletions.
diff --git a/src/main/resources/org/jenkinsci/plugins/xunit/types/boosttest-1.5.0.xsd b/src/main/resources/org/jenkinsci/plugins/xunit/types/boosttest-1.5.0.xsd
@@ -157,6 +157,7 @@ THE SOFTWARE.
             <xs:choice minOccurs="0" maxOccurs="unbounded">
                 <xs:element ref="TestCase" minOccurs="0" maxOccurs="unbounded"/>
                 <xs:element ref="TestSuite" minOccurs="0" maxOccurs="unbounded"/>
+                <xs:element ref="Message" minOccurs="0" maxOccurs="unbounded"/>
             </xs:choice>
             <xs:attribute name="name" type="xs:string" use="required"/>
             <xs:attribute name="result" type="xs:string" use="optional"/>

diff --git a/src/test/java/org/jenkinsci/plugins/xunit/types/BoostTestTest.java b/src/test/java/org/jenkinsci/plugins/xunit/types/BoostTestTest.java
@@ -98,4 +98,9 @@ public void testTestCase16() throws Exception {
     public void testTestCase17() throws Exception {
         convertAndValidate(BoostTest.class, "boosttest/testcase17/testlog.xml", "boosttest/testcase17/junit-result.xml");
     }
+
+    @Test
+    public void testTestCase19() throws Exception {
+        convertAndValidate(BoostTest.class, "boosttest/testcase19/testlog.xml", "boosttest/testcase19/junit-result.xml");
+    }
 }
diff --git a/src/test/resources/org/jenkinsci/plugins/xunit/types/boosttest/testcase19/junit-result.xml b/src/test/resources/org/jenkinsci/plugins/xunit/types/boosttest/testcase19/junit-result.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<testsuite tests="1" errors="1" failures="0" name="MergedTestSuite" skipped="0">
+   <testcase classname="TestProject.TestSuite.sources/coreinitialisation" name="test"
+             time="4.504">
+      <error>&#xD;[Exception] - 
+          memory access violation
+        "test0" entry.&#xD; == [File] - testsuite.cpp&#xD; == [Line] - 29&#xD;</error>
+      <system-out>&#xD;[Message] - setRandomSeed(2618930540);&#xD; == [File] - sources/coreinitialisation.cpp&#xD; == [Line] - 52&#xD;&#xD;[Message] - Test is aborted&#xD; == [File] - ./boost/test/impl/unit_test_log.ipp&#xD; == [Line] - 198&#xD;</system-out>
+      <system-err>&#xD;[Exception] - 
+          memory access violation
+        "test0" entry.&#xD; == [File] - testsuite.cpp&#xD; == [Line] - 29&#xD;</system-err>
+   </testcase>
+</testsuite>
diff --git a/src/test/resources/org/jenkinsci/plugins/xunit/types/boosttest/testcase19/testlog.xml b/src/test/resources/org/jenkinsci/plugins/xunit/types/boosttest/testcase19/testlog.xml
@@ -0,0 +1,16 @@
+<TestLog>
+  <TestSuite name="TestProject">
+    <TestSuite name="TestSuite" file="testsuite.cpp" line="10">
+      <TestCase name="test" file="testsuite.cpp" line="29">
+        <Message file="sources/coreinitialisation.cpp" line="52"><![CDATA[setRandomSeed(2618930540);]]></Message>
+        <Exception file="unknown location" line="0">
+          <![CDATA[memory access violation]]><LastCheckpoint file="testsuite.cpp" line="29"><![CDATA["test0" entry.]]></LastCheckpoint>
+        </Exception>
+        <Message file="./boost/test/impl/unit_test_log.ipp" line="198"><![CDATA[Test is aborted]]></Message>
+        <TestingTime>4504000</TestingTime>
+      </TestCase>
+      <Message file="./boost/test/impl/unit_test_log.ipp" line="198"><![CDATA[Test is aborted]]></Message>
+    </TestSuite>
+    <Message file="./boost/test/impl/unit_test_log.ipp" line="198"><![CDATA[Test is aborted]]></Message>
+  </TestSuite>
+</TestLog>