From ff61b8e19361e8229947961660a3ff07fc5f711f Mon Sep 17 00:00:00 2001
From: Nikolas Falco <nfalco79@hotmail.com>
Date: Sun, 20 May 2018 14:40:47 +0200
Subject: [PATCH] [JENKINS-28871] CppTest 9.5 report file seems not valid for
 xUnit when no tests was executed

Improve CppTest XSL to better handle 7.x and 9.x reports. Cover also the case no test was run.
---
 .../types/{CppTestUnit.java => CppTest.java}  |   2 +-
 .../types/CppTestJunitHudsonTestType.java     |   2 +-
 .../types/cpptestunit-2.0-to-junit-1.0.xsl    | 218 +++++----
 .../xunit/types/model/xsd/junit-10.xsd        |  10 -
 .../plugins/xunit/types/AbstractTest.java     |   2 +-
 .../plugins/xunit/types/CppTestTest.java      |  55 +++
 .../plugins/xunit/types/CppTestUnitTest.java  |  39 --
 .../xunit/types/ValidInputMetricXSLTest.java  |   2 +-
 .../testcase1/input.xml}                      |  71 +--
 .../xunit/types/cpptest/testcase1/result.xml  |   7 +
 .../testcase2/input.xml}                      |   7 +-
 .../xunit/types/cpptest/testcase2/result.xml  | 202 ++++++++
 .../xunit/types/cpptest/testcase3/input.xml   | 258 +++++++++++
 .../xunit/types/cpptest/testcase3/result.xml  |   4 +
 .../cpptestunit/testcase1/junit-result.xml    |   7 -
 .../cpptestunit/testcase2/result-junit.xml    | 435 ------------------
 16 files changed, 695 insertions(+), 626 deletions(-)
 rename src/main/java/org/jenkinsci/plugins/xunit/types/{CppTestUnit.java => CppTest.java} (98%)
 create mode 100644 src/test/java/org/jenkinsci/plugins/xunit/types/CppTestTest.java
 delete mode 100644 src/test/java/org/jenkinsci/plugins/xunit/types/CppTestUnitTest.java
 rename src/test/resources/org/jenkinsci/plugins/xunit/types/{cpptestunit/testcase1/inputcpptest.xml => cpptest/testcase1/input.xml} (57%)
 create mode 100644 src/test/resources/org/jenkinsci/plugins/xunit/types/cpptest/testcase1/result.xml
 rename src/test/resources/org/jenkinsci/plugins/xunit/types/{cpptestunit/testcase2/report-cpptest-tests.xml => cpptest/testcase2/input.xml} (99%)
 create mode 100644 src/test/resources/org/jenkinsci/plugins/xunit/types/cpptest/testcase2/result.xml
 create mode 100644 src/test/resources/org/jenkinsci/plugins/xunit/types/cpptest/testcase3/input.xml
 create mode 100644 src/test/resources/org/jenkinsci/plugins/xunit/types/cpptest/testcase3/result.xml
 delete mode 100644 src/test/resources/org/jenkinsci/plugins/xunit/types/cpptestunit/testcase1/junit-result.xml
 delete mode 100644 src/test/resources/org/jenkinsci/plugins/xunit/types/cpptestunit/testcase2/result-junit.xml

diff --git a/src/main/java/org/jenkinsci/plugins/xunit/types/CppTestUnit.java b/src/main/java/org/jenkinsci/plugins/xunit/types/CppTest.java
similarity index 98%
rename from src/main/java/org/jenkinsci/plugins/xunit/types/CppTestUnit.java
rename to src/main/java/org/jenkinsci/plugins/xunit/types/CppTest.java
index 45f28e71..4e61275d 100644
--- a/src/main/java/org/jenkinsci/plugins/xunit/types/CppTestUnit.java
+++ b/src/main/java/org/jenkinsci/plugins/xunit/types/CppTest.java
@@ -28,7 +28,7 @@
 import org.jenkinsci.lib.dtkit.model.OutputMetric;
 import org.jenkinsci.plugins.xunit.types.model.JUnitModel;
 
-public class CppTestUnit extends InputMetricXSL {
+public class CppTest extends InputMetricXSL {
 
     @Override
     public InputType getToolType() {
diff --git a/src/main/java/org/jenkinsci/plugins/xunit/types/CppTestJunitHudsonTestType.java b/src/main/java/org/jenkinsci/plugins/xunit/types/CppTestJunitHudsonTestType.java
index c4608a53..543707f5 100644
--- a/src/main/java/org/jenkinsci/plugins/xunit/types/CppTestJunitHudsonTestType.java
+++ b/src/main/java/org/jenkinsci/plugins/xunit/types/CppTestJunitHudsonTestType.java
@@ -48,7 +48,7 @@ public CppTestJunitHudsonTestType(String pattern, boolean skipNoTestFiles, boole
     public static class DescriptorImpl extends TestTypeDescriptor<CppTestJunitHudsonTestType> {
 
         public DescriptorImpl() {
-            super(CppTestJunitHudsonTestType.class, CppTestUnit.class);
+            super(CppTestJunitHudsonTestType.class, CppTest.class);
         }
 
     }
diff --git a/src/main/resources/org/jenkinsci/plugins/xunit/types/cpptestunit-2.0-to-junit-1.0.xsl b/src/main/resources/org/jenkinsci/plugins/xunit/types/cpptestunit-2.0-to-junit-1.0.xsl
index d8eeed50..0a23133c 100644
--- a/src/main/resources/org/jenkinsci/plugins/xunit/types/cpptestunit-2.0-to-junit-1.0.xsl
+++ b/src/main/resources/org/jenkinsci/plugins/xunit/types/cpptestunit-2.0-to-junit-1.0.xsl
@@ -1,65 +1,156 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-/*******************************************************************************
-* Copyright (c) 2011 Thales Corporate Services SAS                             *
-* Author : Gregory Boissinot, Aravindan Mahendran                              *
-*                                                                              *
-* 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.                                                                *
-*******************************************************************************/
+The MIT License (MIT)
+
+Copyright (c) 2011, Gregory Boissinot, Aravindan Mahendran
+
+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="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xunit="http://www.xunit.org">
+    <xsl:output method="xml" indent="yes" encoding="UTF-8" cdata-section-elements="system-out system-err failure"/>
+    <xsl:decimal-format decimal-separator="." grouping-separator=","/>
 
-    <xsl:output method="xml" encoding="UTF-8" indent="yes"/>
+    <xsl:function name="xunit:junit-time" as="xs:string">
+        <xsl:param name="value" as="xs:double?" />
+
+        <xsl:variable name="time" as="xs:double">
+            <xsl:value-of select="translate(string($value),',','.')" />
+        </xsl:variable>
+        <xsl:value-of select="format-number($time, '0.000')" />
+    </xsl:function>
+
+    <xsl:function name="xunit:millis-from-time" as="xs:double">
+        <xsl:param name="value" as="xs:string?" />
+
+        <xsl:variable name="formattedTime" select="xunit:if-empty(replace(translate($value,',','.'), '^(\d:.+)', '0$1'), '00:00:00')" />
+        <xsl:variable name="time" select="xs:time($formattedTime)" />
+        <xsl:value-of select="hours-from-time($time)*3600 + minutes-from-time($time)*60 + seconds-from-time($time)" />
+    </xsl:function>
+
+    <xsl:function name="xunit:if-empty" as="xs:string">
+        <xsl:param name="value" as="xs:string?" />
+        <xsl:param name="default" as="xs:anyAtomicType?" />
+        <xsl:value-of select="if (string($value) != '') then string($value) else $default" />
+    </xsl:function>
+
+    <xsl:function name="xunit:is-empty" as="xs:boolean">
+        <xsl:param name="value" as="xs:string?" />
+        <xsl:value-of select="string($value) != ''" />
+    </xsl:function>
 
     <xsl:template match="/">
-        <testsuite name="{ResultsSession/Exec/Summary/Projects/Project/@name}" time="0"
-                   tests="{Summary/Projects/Project/@testCases}"
-                   failures="{ResultsSession/Exec/Summary/Projects/Project/@fail}">
-            <xsl:apply-templates select="ResultsSession/Exec"></xsl:apply-templates>
-            <xsl:apply-templates select="ResultsSession/ExecutedTestsDetails"></xsl:apply-templates>
-        </testsuite>
+        <xsl:variable name="testCount" select="ResultsSession/Exec/Summary/Projects/Project/@testCases" />
+        <xsl:variable name="failureCount" select="ResultsSession/Exec/Summary/Projects/Project/@fail" />
+        <xsl:variable name="suiteName" select="ResultsSession/Exec/Summary/Projects/Project/@name" />
+        <xsl:variable name="totalTime" select="xunit:junit-time(xunit:millis-from-time(ResultsSession/Exec/@time))" />
+
+        <xsl:choose>
+            <xsl:when test="ResultsSession/Exec/TestingProcessProblems">
+                <!-- No tests was run -->
+                <testsuite name="{ResultsSession/TestConfig/@name}"
+                            time="{$totalTime}"
+                            tests="0"
+                            failures="0">
+                    <xsl:element name="system-err">
+                        <xsl:value-of select="ResultsSession/Exec/TestingProcessProblems/CppAnalysisProblem/ErrorList/Error/@val"/>
+                    </xsl:element>
+                </testsuite>
+            </xsl:when>
+            <xsl:when test="ResultsSession/ExecutedTestsDetails">
+                <!-- CppTest 9.x -->
+                <testsuites name="{$suiteName}"
+                            time="{$totalTime}"
+                            tests="{$testCount}"
+                            failures="{$failureCount}">
+                    <xsl:apply-templates select="ResultsSession/ExecutedTestsDetails/Total/Project/TestSuite">
+                        <xsl:with-param name="suiteName" select="$suiteName" />
+                    </xsl:apply-templates>
+                </testsuites>
+            </xsl:when>
+            <xsl:otherwise>
+                <!-- CppTest 7.x -->
+                <testsuite name="{$suiteName}"
+                            time="{$totalTime}"
+                            tests="{$testCount}"
+                            failures="{$failureCount}">
+                    <xsl:call-template name="TestCase_7x">
+                        <xsl:with-param name="violations" select="ResultsSession/Exec/ExecViols"/>
+                    </xsl:call-template>
+                </testsuite>
+            </xsl:otherwise>
+        </xsl:choose>
     </xsl:template>
 
-    <xsl:template match="Exec">
-        <xsl:apply-templates select="*"/>
-    </xsl:template>
+    <xsl:template name="TestCase_7x">
+        <xsl:param name="violations" />
 
-    <xsl:template match="Goals">
-        <properties>
-            <xsl:apply-templates select="Goal"/>
-        </properties>
+        <xsl:for-each select="$violations/ExecViol">
+            <xsl:variable name="suiteName" select="substring-before(@testName, '::')" />
+            <xsl:variable name="testName" select="substring-after(@testName, '::')" />
+
+            <testcase classname="{$suiteName}" name="{$testName}" time="{xunit:junit-time(0)}">
+                <xsl:apply-templates select="Thr" />
+            </testcase>
+        </xsl:for-each>
     </xsl:template>
 
-    <xsl:template match="Goal">
-        <property name="{@name}" value="{@type}"/>
+    <xsl:template match="TestSuite">
+        <xsl:param name="suiteName" as="xs:string?" />
+
+        <xsl:variable name="suiteName" select="concat($suiteName, '.', @name)" />
+        <xsl:choose>
+            <xsl:when test="count(TestSuite) > 0">
+                <xsl:apply-templates select="TestSuite">
+                    <xsl:with-param name="suiteName" select="$suiteName" />
+                </xsl:apply-templates>
+            </xsl:when>
+            <xsl:otherwise>
+                <testsuite name="{$suiteName}"
+                           time="{xunit:junit-time(0)}"
+                           tests="{@pass + @fail}"
+                           failures="{@fail}">
+                    <xsl:apply-templates select="Test">
+                        <xsl:with-param name="fullSuiteName" select="$suiteName" />
+                        <xsl:with-param name="suiteName" select="@name" />
+                    </xsl:apply-templates>
+                </testsuite>
+            </xsl:otherwise>
+        </xsl:choose>
     </xsl:template>
 
-    <xsl:template match="ExecViols">
-        <xsl:apply-templates select="ExecViol"/>
+    <xsl:template match="Test">
+        <xsl:param name="suiteName" as="xs:string?" />
+        <xsl:param name="fullSuiteName" as="xs:string?" />
+
+        <xsl:variable name="testName" select="if (starts-with(@name, $suiteName)) then substring(@name, string-length($suiteName) + 3) else @name" />
+        <xsl:variable name="testId" select="@id" />
+        <testcase name="{$testName}"
+                  classname="{xunit:if-empty($fullSuiteName, $suiteName)}"
+                  time="{xunit:junit-time(xunit:millis-from-time(@time))}">
+            <xsl:if test="@pass != 1">
+                <xsl:apply-templates select="//Exec/ExecViols/ExecViol[@testId = $testId]" />
+            </xsl:if>
+        </testcase>
     </xsl:template>
 
     <xsl:template match="ExecViol">
-        <xsl:if test="@cat!=6">
-            <testcase classname="{@locFile}" name="{@testName}" time="0">
-                <xsl:apply-templates select="Thr"/>
-            </testcase>
-        </xsl:if>
+        <xsl:apply-templates select="Thr"/>
     </xsl:template>
 
     <xsl:template match="Thr">
@@ -67,42 +158,13 @@
     </xsl:template>
 
     <xsl:template match="ThrPart">
-        <failure type="{@clName}" message="{@detMsg}"/>
-        <system-err>
-            <xsl:text>Trace </xsl:text>
+        <failure type="{@clName}" message="{@detMsg}">
             <xsl:apply-templates select="Trace"/>
-        </system-err>
+        </failure>
     </xsl:template>
 
     <xsl:template match="Trace">
-        <xsl:text>Line :</xsl:text>
-        <xsl:value-of select="@ln"/>
-        <xsl:text>    File :</xsl:text>
-        <xsl:value-of select="@fileName"/>
-    </xsl:template>
-
-    <xsl:template match="ExecutedTestsDetails">
-        <xsl:apply-templates select="Total"/>
-    </xsl:template>
-
-    <xsl:template match="Total">
-        <xsl:apply-templates select="Project"/>
-    </xsl:template>
-
-    <xsl:template match="Project">
-        <xsl:apply-templates select="TestSuite"/>
-    </xsl:template>
-
-    <xsl:template match="TestSuite">
-        <xsl:apply-templates select="*"/>
-    </xsl:template>
-
-    <xsl:template match="Test">
-        <xsl:variable name="fullTestName"><xsl:value-of select="/ResultsSession/Exec/Summary/Projects/Project/@name"/>JUnitTestSuite
-        </xsl:variable>
-        <xsl:if test="@pass=1">
-            <testcase name="{@name}" classname="{$fullTestName}" time="0"/>
-        </xsl:if>
+	at <xsl:value-of select="@fileName"/>:<xsl:value-of select="@ln"/>
     </xsl:template>
 
 </xsl:stylesheet>
\ No newline at end of file
diff --git a/src/main/resources/org/jenkinsci/plugins/xunit/types/model/xsd/junit-10.xsd b/src/main/resources/org/jenkinsci/plugins/xunit/types/model/xsd/junit-10.xsd
index 9bcea697..442ab6bd 100644
--- a/src/main/resources/org/jenkinsci/plugins/xunit/types/model/xsd/junit-10.xsd
+++ b/src/main/resources/org/jenkinsci/plugins/xunit/types/model/xsd/junit-10.xsd
@@ -104,14 +104,8 @@ THE SOFTWARE.
             </xs:sequence>
             <xs:attribute name="name" type="xs:string" use="required"/>
             <xs:attribute name="time" type="xs:string" use="optional"/>
-            <xs:attribute name="timestamp" type="xs:string" use="optional"/>
             <xs:attribute name="classname" type="xs:string" use="optional"/>
-            <xs:attribute name="status" type="xs:string" use="optional"/>
-            <xs:attribute name="class" type="xs:string" use="optional"/>
-            <xs:attribute name="file" type="xs:string" use="optional"/>
-            <xs:attribute name="log" type="xs:string" use="optional"/>
             <xs:attribute name="group" type="xs:string" use="optional"/>
-            <xs:attribute name="url" type="xs:string" use="optional"/>
         </xs:complexType>
     </xs:element>
 
@@ -129,15 +123,12 @@ THE SOFTWARE.
             <xs:attribute name="failures" type="xs:string" use="optional"/>
             <xs:attribute name="errors" type="xs:string" use="optional"/>
             <xs:attribute name="time" type="xs:string" use="optional"/>
-            <xs:attribute name="disabled" type="xs:string" use="optional"/>
             <xs:attribute name="skipped" type="xs:string" use="optional"/>
-            <xs:attribute name="skips" type="xs:string" use="optional"/>
             <xs:attribute name="timestamp" type="xs:string" use="optional"/>
             <xs:attribute name="hostname" type="xs:string" use="optional"/>
             <xs:attribute name="id" type="xs:string" use="optional"/>
             <xs:attribute name="package" type="xs:string" use="optional"/>
             <xs:attribute name="file" type="xs:string" use="optional"/>
-            <xs:attribute name="skip" type="xs:string" use="optional"/>
             <xs:attribute name="log" type="xs:string" use="optional"/>
             <xs:attribute name="url" type="xs:string" use="optional"/>
         </xs:complexType>
@@ -152,7 +143,6 @@ THE SOFTWARE.
             <xs:attribute name="time" type="xs:string" use="optional"/>
             <xs:attribute name="tests" type="xs:string" use="optional"/>
             <xs:attribute name="failures" type="xs:string" use="optional"/>
-            <xs:attribute name="disabled" type="xs:string" use="optional"/>
             <xs:attribute name="errors" type="xs:string" use="optional"/>
         </xs:complexType>
     </xs:element>
diff --git a/src/test/java/org/jenkinsci/plugins/xunit/types/AbstractTest.java b/src/test/java/org/jenkinsci/plugins/xunit/types/AbstractTest.java
index 318f51f6..4cd96fa1 100644
--- a/src/test/java/org/jenkinsci/plugins/xunit/types/AbstractTest.java
+++ b/src/test/java/org/jenkinsci/plugins/xunit/types/AbstractTest.java
@@ -101,7 +101,7 @@ protected void convertAndValidate(Class<? extends InputMetric> metricClass, Stri
 
         inputMetric.convert(inputXMLFile, outputXMLFile);
         XMLUnit.setIgnoreWhitespace(true);
-        Diff myDiff = new Diff(readXmlAsString(outputXMLFile), readXmlAsString(new File(this.getClass().getResource(expectedResultPath).toURI())));
+        Diff myDiff = new Diff(readXmlAsString(new File(this.getClass().getResource(expectedResultPath).toURI())), readXmlAsString(outputXMLFile));
         Assert.assertTrue("XSL transformation did not work " + myDiff, myDiff.similar());
 
         //The generated output file must be valid
diff --git a/src/test/java/org/jenkinsci/plugins/xunit/types/CppTestTest.java b/src/test/java/org/jenkinsci/plugins/xunit/types/CppTestTest.java
new file mode 100644
index 00000000..fa33a229
--- /dev/null
+++ b/src/test/java/org/jenkinsci/plugins/xunit/types/CppTestTest.java
@@ -0,0 +1,55 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2017, Gregory Boissinot, Falco Nikolas
+ *
+ * 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 org.jenkinsci.plugins.xunit.types;
+
+import java.util.Arrays;
+import java.util.Collection;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+@RunWith(Parameterized.class)
+public class CppTestTest extends AbstractTest {
+
+    @Parameters(name = "testcase{1}: {0}")
+    public static Collection<Object[]> data() {
+        return Arrays.asList(new Object[][] { { "testcase1", 1 }, //
+                                              { "mix execution of pass and fail tests", 2 }, //
+                                              { "testcase3", 3 } //
+        });
+    }
+
+    public CppTestTest(String testName, int testNumber) {
+        super(CppTest.class, resolveInput("cpptest", testNumber), resolveOutput("cpptest", testNumber));
+    }
+
+    @Override
+    @Test
+    public void verifyXSLT() throws Exception {
+        super.verifyXSLT();
+    }
+
+}
\ No newline at end of file
diff --git a/src/test/java/org/jenkinsci/plugins/xunit/types/CppTestUnitTest.java b/src/test/java/org/jenkinsci/plugins/xunit/types/CppTestUnitTest.java
deleted file mode 100644
index 56b04285..00000000
--- a/src/test/java/org/jenkinsci/plugins/xunit/types/CppTestUnitTest.java
+++ /dev/null
@@ -1,39 +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 org.jenkinsci.plugins.xunit.types;
-
-import org.junit.Test;
-
-public class CppTestUnitTest extends AbstractTest {
-
-    @Test
-    public void cpptestTestcase1() throws Exception {
-        convertAndValidate(CppTestUnit.class, "cpptestunit/testcase1/inputcpptest.xml", "cpptestunit/testcase1/junit-result.xml");
-    }
-
-    @Test
-    public void cpptestTestcase2() throws Exception {
-        convertAndValidate(CppTestUnit.class, "cpptestunit/testcase2/report-cpptest-tests.xml", "cpptestunit/testcase2/result-junit.xml");
-    }
-}
diff --git a/src/test/java/org/jenkinsci/plugins/xunit/types/ValidInputMetricXSLTest.java b/src/test/java/org/jenkinsci/plugins/xunit/types/ValidInputMetricXSLTest.java
index 9b59e8e0..4454ce49 100644
--- a/src/test/java/org/jenkinsci/plugins/xunit/types/ValidInputMetricXSLTest.java
+++ b/src/test/java/org/jenkinsci/plugins/xunit/types/ValidInputMetricXSLTest.java
@@ -42,7 +42,7 @@ public class ValidInputMetricXSLTest {
     public static void loadList() {
         listInputMetric.add(AUnit.class);
         listInputMetric.add(BoostTest.class);
-        listInputMetric.add(CppTestUnit.class);
+        listInputMetric.add(CppTest.class);
         listInputMetric.add(CppUnit.class);
         listInputMetric.add(FPCUnit.class);
         listInputMetric.add(MSTest.class);
diff --git a/src/test/resources/org/jenkinsci/plugins/xunit/types/cpptestunit/testcase1/inputcpptest.xml b/src/test/resources/org/jenkinsci/plugins/xunit/types/cpptest/testcase1/input.xml
similarity index 57%
rename from src/test/resources/org/jenkinsci/plugins/xunit/types/cpptestunit/testcase1/inputcpptest.xml
rename to src/test/resources/org/jenkinsci/plugins/xunit/types/cpptest/testcase1/input.xml
index 26ddfc35..e1dd890a 100644
--- a/src/test/resources/org/jenkinsci/plugins/xunit/types/cpptestunit/testcase1/inputcpptest.xml
+++ b/src/test/resources/org/jenkinsci/plugins/xunit/types/cpptest/testcase1/input.xml
@@ -4,26 +4,16 @@
         <Author id="dev1" name="gbois"></Author>
     </Authors>
     <VersionInfos>
-        <StorageInfo ownerId="com.parasoft.xtest.checkers.api.generation" resultId="IGenerationProjectInfo"
-                     ver="2"></StorageInfo>
-        <StorageInfo ownerId="com.parasoft.xtest.checkers.api.generation" resultId="IGenerationInfo"
-                     ver="2"></StorageInfo>
-        <StorageInfo ownerId="com.parasoft.xtest.checkers.api.codereview" resultId="ICodeReviewScannerInfo"
-                     ver="2"></StorageInfo>
-        <StorageInfo ownerId="com.parasoft.xtest.checkers.api.codereview" resultId="ICodeReviewUndefinedAuthorsInfo"
-                     ver="1"></StorageInfo>
-        <StorageInfo ownerId="com.parasoft.xtest.checkers.api.execution" resultId="IExecutionViolation"
-                     ver="2"></StorageInfo>
-        <StorageInfo ownerId="com.parasoft.xtest.checkers.api.standards" resultId="IFlowAnalysisViolation"
-                     ver="2"></StorageInfo>
-        <StorageInfo ownerId="com.parasoft.xtest.checkers.api.standards" resultId="IMetricEstimationInfo"
-                     ver="2"></StorageInfo>
-        <StorageInfo ownerId="com.parasoft.xtest.checkers.api.standards" resultId="IMetricsViolation"
-                     ver="2"></StorageInfo>
-        <StorageInfo ownerId="com.parasoft.xtest.checkers.api.standards" resultId="IDupCodeViolation"
-                     ver="2"></StorageInfo>
-        <StorageInfo ownerId="com.parasoft.xtest.checkers.api.standards" resultId="ICodingStandardsViolation"
-                     ver="2"></StorageInfo>
+        <StorageInfo ownerId="com.parasoft.xtest.checkers.api.generation" resultId="IGenerationProjectInfo" ver="2"></StorageInfo>
+        <StorageInfo ownerId="com.parasoft.xtest.checkers.api.generation" resultId="IGenerationInfo" ver="2"></StorageInfo>
+        <StorageInfo ownerId="com.parasoft.xtest.checkers.api.codereview" resultId="ICodeReviewScannerInfo" ver="2"></StorageInfo>
+        <StorageInfo ownerId="com.parasoft.xtest.checkers.api.codereview" resultId="ICodeReviewUndefinedAuthorsInfo" ver="1"></StorageInfo>
+        <StorageInfo ownerId="com.parasoft.xtest.checkers.api.execution" resultId="IExecutionViolation" ver="2"></StorageInfo>
+        <StorageInfo ownerId="com.parasoft.xtest.checkers.api.standards" resultId="IFlowAnalysisViolation" ver="2"></StorageInfo>
+        <StorageInfo ownerId="com.parasoft.xtest.checkers.api.standards" resultId="IMetricEstimationInfo" ver="2"></StorageInfo>
+        <StorageInfo ownerId="com.parasoft.xtest.checkers.api.standards" resultId="IMetricsViolation" ver="2"></StorageInfo>
+        <StorageInfo ownerId="com.parasoft.xtest.checkers.api.standards" resultId="IDupCodeViolation" ver="2"></StorageInfo>
+        <StorageInfo ownerId="com.parasoft.xtest.checkers.api.standards" resultId="ICodingStandardsViolation" ver="2"></StorageInfo>
         <StorageInfo ownerId="com.parasoft.xtest.checkers.api.scope" resultId="IScopeProjectInfo" ver="3"></StorageInfo>
     </VersionInfos>
     <Scope>
@@ -37,16 +27,12 @@
             <Goal mode="1" name="Unit Testing Problems" type="0"></Goal>
         </Goals>
         <ExecViols>
-            <ExecViol actVal="" auth="s0019742" cat="6" expectVal="" hash="709259309" lang="cpp" ln="32" locEndLn="32"
-                      locEndPos="1" locFile="/hello/tests/autogenerated/srce/TestSuite_helloworld_c.c" locStartPos="0"
-                      locStartln="32" locType="sr" sev="3" sym="/hello/srce/helloworld.c"
-                      testCaseId="3899938045764677113" testCaseOrig="1"
-                      testName="TestSuite_helloworld_c_85db5268::TestSuite_helloworld_c_85db5268_test_main_1"
-                      urgent="true" verifBy="">
+            <ExecViol actVal="" auth="s0019742" cat="6" expectVal="" hash="709259309" lang="cpp" ln="32" locEndLn="32" locEndPos="1" locFile="/hello/tests/autogenerated/srce/TestSuite_helloworld_c.c"
+                locStartPos="0" locStartln="32" locType="sr" sev="3" sym="/hello/srce/helloworld.c" testCaseId="3899938045764677113" testCaseOrig="1"
+                testName="TestSuite_helloworld_c_85db5268::TestSuite_helloworld_c_85db5268_test_main_1" urgent="true" verifBy="">
                 <Thr lang="cpp">
                     <ThrPart clName="Outcome" detMsg="Outcome: int _return=0" prnMsg="Outcome: int _return=0">
-                        <Trace clName="" fhash="0" fileName="/hello/tests/autogenerated/srce/TestSuite_helloworld_c.c"
-                               ln="32" metName=""></Trace>
+                        <Trace clName="" fhash="0" fileName="/hello/tests/autogenerated/srce/TestSuite_helloworld_c.c" ln="32" metName=""></Trace>
                     </ThrPart>
                 </Thr>
             </ExecViol>
@@ -68,33 +54,22 @@
         </Summary>
         <Coverage>
             <Types>
-                <CvgType cvgDecor="marker" dispCvg="executable lines" dispId="LC" dispName="Line Coverage"
-                         dispNoCvg="no executable lines" id="LC"></CvgType>
-                <CvgType cvgDecor="marker" dispCvg="blocks" dispId="BCC" dispName="Block Coverage" dispNoCvg="no blocks"
-                         id="BCC"></CvgType>
-                <CvgType cvgDecor="marker" dispCvg="paths" dispId="PC" dispName="Path Coverage" dispNoCvg="no paths"
-                         id="PC"></CvgType>
-                <CvgType cvgDecor="marker" dispCvg="decisions" dispId="DC" dispName="Decision Coverage"
-                         dispNoCvg="no decisions" id="DC"></CvgType>
-                <CvgType cvgDecor="marker" dispCvg="condition outcomes" dispId="SCC"
-                         dispName="Simple Condition Coverage" dispNoCvg="no condition outcomes" id="SCC"></CvgType>
-                <CvgType cvgDecor="marker" dispCvg="conditions" dispId="MCDC"
-                         dispName="Modified Condition/Decision Coverage" dispNoCvg="no conditions" id="MCDC"></CvgType>
+                <CvgType cvgDecor="marker" dispCvg="executable lines" dispId="LC" dispName="Line Coverage" dispNoCvg="no executable lines" id="LC"></CvgType>
+                <CvgType cvgDecor="marker" dispCvg="blocks" dispId="BCC" dispName="Block Coverage" dispNoCvg="no blocks" id="BCC"></CvgType>
+                <CvgType cvgDecor="marker" dispCvg="paths" dispId="PC" dispName="Path Coverage" dispNoCvg="no paths" id="PC"></CvgType>
+                <CvgType cvgDecor="marker" dispCvg="decisions" dispId="DC" dispName="Decision Coverage" dispNoCvg="no decisions" id="DC"></CvgType>
+                <CvgType cvgDecor="marker" dispCvg="condition outcomes" dispId="SCC" dispName="Simple Condition Coverage" dispNoCvg="no condition outcomes" id="SCC"></CvgType>
+                <CvgType cvgDecor="marker" dispCvg="conditions" dispId="MCDC" dispName="Modified Condition/Decision Coverage" dispNoCvg="no conditions" id="MCDC"></CvgType>
             </Types>
             <CvgStats>
                 <CvgInfo elem="Total" num="1;1;1;0;0;0" total="1;1;1;0;0;0" val="100;100;100;N/A;N/A;N/A">
-                    <CvgInfo elem="hello" num="1;1;1;N/A;N/A;N/A" total="1;1;1;N/A;N/A;N/A"
-                             val="100;100;100;N/A;N/A;N/A">
-                        <CvgInfo elem="helloworld.c" loc="/hello/srce/helloworld.c" num="1;1;1;N/A;N/A;N/A"
-                                 total="1;1;1;N/A;N/A;N/A" val="100;100;100;N/A;N/A;N/A">
-                            <CvgInfo elem="main" num="1;1;1;N/A;N/A;N/A" total="1;1;1;N/A;N/A;N/A"
-                                     val="100;100;100;N/A;N/A;N/A"></CvgInfo>
+                    <CvgInfo elem="hello" num="1;1;1;N/A;N/A;N/A" total="1;1;1;N/A;N/A;N/A" val="100;100;100;N/A;N/A;N/A">
+                        <CvgInfo elem="helloworld.c" loc="/hello/srce/helloworld.c" num="1;1;1;N/A;N/A;N/A" total="1;1;1;N/A;N/A;N/A" val="100;100;100;N/A;N/A;N/A">
+                            <CvgInfo elem="main" num="1;1;1;N/A;N/A;N/A" total="1;1;1;N/A;N/A;N/A" val="100;100;100;N/A;N/A;N/A"></CvgInfo>
                         </CvgInfo>
                     </CvgInfo>
                 </CvgInfo>
             </CvgStats>
-
-
         </Coverage>
     </Exec>
 </ResultsSession>
diff --git a/src/test/resources/org/jenkinsci/plugins/xunit/types/cpptest/testcase1/result.xml b/src/test/resources/org/jenkinsci/plugins/xunit/types/cpptest/testcase1/result.xml
new file mode 100644
index 00000000..3760ee37
--- /dev/null
+++ b/src/test/resources/org/jenkinsci/plugins/xunit/types/cpptest/testcase1/result.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite name="hello" time="8.000" tests="1" failures="0">
+    <testcase classname="TestSuite_helloworld_c_85db5268" name="TestSuite_helloworld_c_85db5268_test_main_1" time="0.000">
+        <failure type="Outcome" message="Outcome: int _return=0"><![CDATA[
+	at /hello/tests/autogenerated/srce/TestSuite_helloworld_c.c:32]]></failure>
+    </testcase>
+</testsuite>
\ No newline at end of file
diff --git a/src/test/resources/org/jenkinsci/plugins/xunit/types/cpptestunit/testcase2/report-cpptest-tests.xml b/src/test/resources/org/jenkinsci/plugins/xunit/types/cpptest/testcase2/input.xml
similarity index 99%
rename from src/test/resources/org/jenkinsci/plugins/xunit/types/cpptestunit/testcase2/report-cpptest-tests.xml
rename to src/test/resources/org/jenkinsci/plugins/xunit/types/cpptest/testcase2/input.xml
index ce5985f3..c80c78ec 100644
--- a/src/test/resources/org/jenkinsci/plugins/xunit/types/cpptestunit/testcase2/report-cpptest-tests.xml
+++ b/src/test/resources/org/jenkinsci/plugins/xunit/types/cpptest/testcase2/input.xml
@@ -6,8 +6,7 @@
     <VersionInfos>
         <StorageInfo ownerId="com.parasoft.xtest.checkers.api.execution" resultId="IExecutionViolation" ver="2"/>
         <StorageInfo ownerId="com.parasoft.xtest.checkers.api.execution" resultId="InsureViolation" ver="3"/>
-        <StorageInfo ownerId="com.parasoft.xtest.checkers.api.codereview" resultId="ICodeReviewUndefinedAuthorsInfo"
-                     ver="1"/>
+        <StorageInfo ownerId="com.parasoft.xtest.checkers.api.codereview" resultId="ICodeReviewUndefinedAuthorsInfo" ver="1"/>
         <StorageInfo ownerId="com.parasoft.xtest.checkers.api.codereview" resultId="ICodeReviewScannerInfo" ver="2"/>
         <StorageInfo ownerId="com.parasoft.xtest.checkers.api.generation" resultId="IGenerationInfo" ver="2"/>
         <StorageInfo ownerId="com.parasoft.xtest.checkers.api.generation" resultId="IGenerationProjectInfo" ver="2"/>
@@ -6425,10 +6424,8 @@
             </ExecViol>
         </ExecViols>
 
-
         <Categories>
-            <Category desc="" id="5" label="Fix Runtime Error Detection Violations" label0="Fix Runtime Error Detection"
-                      label1="Violations" name="Runtime Error Detection Violations">
+            <Category desc="" id="5" label="Fix Runtime Error Detection Violations" label0="Fix Runtime Error Detection" label1="Violations" name="Runtime Error Detection Violations">
                 <SubCategory id="9" name="Runtime Violations" short="runtime violation"/>
                 <SubCategory id="17" name="Portability" short="Portability"/>
                 <SubCategory id="16" name="Database" short="Database"/>
diff --git a/src/test/resources/org/jenkinsci/plugins/xunit/types/cpptest/testcase2/result.xml b/src/test/resources/org/jenkinsci/plugins/xunit/types/cpptest/testcase2/result.xml
new file mode 100644
index 00000000..42a8d330
--- /dev/null
+++ b/src/test/resources/org/jenkinsci/plugins/xunit/types/cpptest/testcase2/result.xml
@@ -0,0 +1,202 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuites name="ATM" time="9.000" tests="122" failures="10">
+    <testsuite name="ATM.tests.autogenerated.include.TestSuite_Account_hxx_65a1b62c" time="0.000" tests="52" failures="2">
+        <testcase name="test_setAccountNumber_3" classname="ATM.tests.autogenerated.include.TestSuite_Account_hxx_65a1b62c" time="0.000" />
+        <testcase name="test_getBalance_6" classname="ATM.tests.autogenerated.include.TestSuite_Account_hxx_65a1b62c" time="0.000" />
+        <testcase name="test_setPassword_5" classname="ATM.tests.autogenerated.include.TestSuite_Account_hxx_65a1b62c" time="0.000" />
+        <testcase name="test_getAccountNumber_1" classname="ATM.tests.autogenerated.include.TestSuite_Account_hxx_65a1b62c" time="0.000" />
+        <testcase name="test_setAccountNumber_9" classname="ATM.tests.autogenerated.include.TestSuite_Account_hxx_65a1b62c" time="0.000" />
+        <testcase name="test_getAccountNumber_7" classname="ATM.tests.autogenerated.include.TestSuite_Account_hxx_65a1b62c" time="0.000" />
+        <testcase name="test_getPassword_2" classname="ATM.tests.autogenerated.include.TestSuite_Account_hxx_65a1b62c" time="0.000" />
+        <testcase name="test_setAccountNumber_5" classname="ATM.tests.autogenerated.include.TestSuite_Account_hxx_65a1b62c" time="0.000" />
+        <testcase name="test_Account_4" classname="ATM.tests.autogenerated.include.TestSuite_Account_hxx_65a1b62c" time="0.000" />
+        <testcase name="test_setPassword_9" classname="ATM.tests.autogenerated.include.TestSuite_Account_hxx_65a1b62c" time="0.000">
+            <failure type="Uncaught structured exception" message="Access violation exception [CPPTEST_ACCESS_VIOLATION]"><![CDATA[
+	at /ATM/include/Account.hxx:37
+	at /ATM/tests/autogenerated/include/TestSuite_Account_hxx.cpp:1097
+	at /ATM/tests/autogenerated/include/TestSuite_Account_hxx.cpp:61
+	at /ATM/tests/autogenerated/include/TestSuite_Account_hxx.cpp:9]]></failure>
+        </testcase>
+        <testcase name="test_setPassword_2" classname="ATM.tests.autogenerated.include.TestSuite_Account_hxx_65a1b62c" time="0.000" />
+        <testcase name="test_getAccountNumber_5" classname="ATM.tests.autogenerated.include.TestSuite_Account_hxx_65a1b62c" time="0.000" />
+        <testcase name="test_getPassword_3" classname="ATM.tests.autogenerated.include.TestSuite_Account_hxx_65a1b62c" time="0.000" />
+        <testcase name="test_getAccountNumber_8" classname="ATM.tests.autogenerated.include.TestSuite_Account_hxx_65a1b62c" time="0.000" />
+        <testcase name="test_getAccountNumber_2" classname="ATM.tests.autogenerated.include.TestSuite_Account_hxx_65a1b62c" time="0.000" />
+        <testcase name="test_Account_9" classname="ATM.tests.autogenerated.include.TestSuite_Account_hxx_65a1b62c" time="0.000" />
+        <testcase name="test_setPassword_3" classname="ATM.tests.autogenerated.include.TestSuite_Account_hxx_65a1b62c" time="0.000" />
+        <testcase name="test_getBalance_4" classname="ATM.tests.autogenerated.include.TestSuite_Account_hxx_65a1b62c" time="0.000" />
+        <testcase name="test_getPassword_5" classname="ATM.tests.autogenerated.include.TestSuite_Account_hxx_65a1b62c" time="0.000" />
+        <testcase name="test_getBalance_7" classname="ATM.tests.autogenerated.include.TestSuite_Account_hxx_65a1b62c" time="0.000" />
+        <testcase name="test_setPassword_6" classname="ATM.tests.autogenerated.include.TestSuite_Account_hxx_65a1b62c" time="0.000" />
+        <testcase name="test_Account_5" classname="ATM.tests.autogenerated.include.TestSuite_Account_hxx_65a1b62c" time="0.000" />
+        <testcase name="test_setPassword_7" classname="ATM.tests.autogenerated.include.TestSuite_Account_hxx_65a1b62c" time="0.000" />
+        <testcase name="test_Account_3" classname="ATM.tests.autogenerated.include.TestSuite_Account_hxx_65a1b62c" time="0.000" />
+        <testcase name="test_getAccountNumber_4" classname="ATM.tests.autogenerated.include.TestSuite_Account_hxx_65a1b62c" time="0.000" />
+        <testcase name="test_getBalance_3" classname="ATM.tests.autogenerated.include.TestSuite_Account_hxx_65a1b62c" time="0.000" />
+        <testcase name="test_getBalance_8" classname="ATM.tests.autogenerated.include.TestSuite_Account_hxx_65a1b62c" time="0.000" />
+        <testcase name="test_getPassword_1" classname="ATM.tests.autogenerated.include.TestSuite_Account_hxx_65a1b62c" time="0.000" />
+        <testcase name="test_setAccountNumber_6" classname="ATM.tests.autogenerated.include.TestSuite_Account_hxx_65a1b62c" time="0.000" />
+        <testcase name="test_getAccountNumber_6" classname="ATM.tests.autogenerated.include.TestSuite_Account_hxx_65a1b62c" time="0.000" />
+        <testcase name="test_getPassword_7" classname="ATM.tests.autogenerated.include.TestSuite_Account_hxx_65a1b62c" time="0.000" />
+        <testcase name="test_setPassword_8" classname="ATM.tests.autogenerated.include.TestSuite_Account_hxx_65a1b62c" time="0.000" />
+        <testcase name="test_getBalance_1" classname="ATM.tests.autogenerated.include.TestSuite_Account_hxx_65a1b62c" time="0.000" />
+        <testcase name="test_setAccountNumber_8" classname="ATM.tests.autogenerated.include.TestSuite_Account_hxx_65a1b62c" time="0.000" />
+        <testcase name="test_Account_7" classname="ATM.tests.autogenerated.include.TestSuite_Account_hxx_65a1b62c" time="0.000" />
+        <testcase name="test_setAccountNumber_2" classname="ATM.tests.autogenerated.include.TestSuite_Account_hxx_65a1b62c" time="0.000" />
+        <testcase name="test_setPassword_1" classname="ATM.tests.autogenerated.include.TestSuite_Account_hxx_65a1b62c" time="0.000" />
+        <testcase name="test_setPassword_4" classname="ATM.tests.autogenerated.include.TestSuite_Account_hxx_65a1b62c" time="0.000" />
+        <testcase name="test_Account_1" classname="ATM.tests.autogenerated.include.TestSuite_Account_hxx_65a1b62c" time="0.000" />
+        <testcase name="test_getPassword_8" classname="ATM.tests.autogenerated.include.TestSuite_Account_hxx_65a1b62c" time="0.000" />
+        <testcase name="test_setAccountNumber_4" classname="ATM.tests.autogenerated.include.TestSuite_Account_hxx_65a1b62c" time="0.000" />
+        <testcase name="test_setAccountNumber_7" classname="ATM.tests.autogenerated.include.TestSuite_Account_hxx_65a1b62c" time="0.000" />
+        <testcase name="test_Account_6" classname="ATM.tests.autogenerated.include.TestSuite_Account_hxx_65a1b62c" time="0.000" />
+        <testcase name="test_setAccountNumber_1" classname="ATM.tests.autogenerated.include.TestSuite_Account_hxx_65a1b62c" time="0.000" />
+        <testcase name="test_getBalance_2" classname="ATM.tests.autogenerated.include.TestSuite_Account_hxx_65a1b62c" time="0.000" />
+        <testcase name="test_getPassword_4" classname="ATM.tests.autogenerated.include.TestSuite_Account_hxx_65a1b62c" time="0.000" />
+        <testcase name="test_Account_8" classname="ATM.tests.autogenerated.include.TestSuite_Account_hxx_65a1b62c" time="0.000" />
+        <testcase name="test_getAccountNumber_3" classname="ATM.tests.autogenerated.include.TestSuite_Account_hxx_65a1b62c" time="0.000" />
+        <testcase name="test_getBalance_5" classname="ATM.tests.autogenerated.include.TestSuite_Account_hxx_65a1b62c" time="0.000" />
+        <testcase name="test_setAccountNumber_10" classname="ATM.tests.autogenerated.include.TestSuite_Account_hxx_65a1b62c" time="0.000" />
+        <testcase name="test_setPassword_10" classname="ATM.tests.autogenerated.include.TestSuite_Account_hxx_65a1b62c" time="0.000">
+            <failure type="Uncaught structured exception" message="Access violation exception [CPPTEST_ACCESS_VIOLATION]"><![CDATA[
+	at /ATM/include/Account.hxx:37
+	at /ATM/tests/autogenerated/include/TestSuite_Account_hxx.cpp:939
+	at /ATM/tests/autogenerated/include/TestSuite_Account_hxx.cpp:53
+	at /ATM/tests/autogenerated/include/TestSuite_Account_hxx.cpp:9]]></failure>
+        </testcase>
+        <testcase name="test_getPassword_6" classname="ATM.tests.autogenerated.include.TestSuite_Account_hxx_65a1b62c" time="0.000" />
+    </testsuite>
+    <testsuite name="ATM.tests.autogenerated.include.TestSuite_BaseDisplay_hxx_e7444e97" time="0.000" tests="2" failures="0">
+        <testcase name="test_x7eBaseDisplay_1" classname="ATM.tests.autogenerated.include.TestSuite_BaseDisplay_hxx_e7444e97" time="0.000" />
+        <testcase name="test_BaseDisplay_1" classname="ATM.tests.autogenerated.include.TestSuite_BaseDisplay_hxx_e7444e97" time="0.000" />
+    </testsuite>
+    <testsuite name="ATM.tests.autogenerated.TestSuite_Account_cxx_1ec0549d" time="0.000" tests="20" failures="0">
+        <testcase name="test_debit_1" classname="ATM.tests.autogenerated.TestSuite_Account_cxx_1ec0549d" time="0.000" />
+        <testcase name="test_debit_5" classname="ATM.tests.autogenerated.TestSuite_Account_cxx_1ec0549d" time="0.000" />
+        <testcase name="test_deposit_7" classname="ATM.tests.autogenerated.TestSuite_Account_cxx_1ec0549d" time="0.000" />
+        <testcase name="test_debit_2" classname="ATM.tests.autogenerated.TestSuite_Account_cxx_1ec0549d" time="0.000" />
+        <testcase name="test_deposit_2" classname="ATM.tests.autogenerated.TestSuite_Account_cxx_1ec0549d" time="0.000" />
+        <testcase name="test_deposit_10" classname="ATM.tests.autogenerated.TestSuite_Account_cxx_1ec0549d" time="0.000" />
+        <testcase name="test_deposit_3" classname="ATM.tests.autogenerated.TestSuite_Account_cxx_1ec0549d" time="0.000" />
+        <testcase name="test_deposit_9" classname="ATM.tests.autogenerated.TestSuite_Account_cxx_1ec0549d" time="0.000" />
+        <testcase name="test_debit_7" classname="ATM.tests.autogenerated.TestSuite_Account_cxx_1ec0549d" time="0.000" />
+        <testcase name="test_deposit_6" classname="ATM.tests.autogenerated.TestSuite_Account_cxx_1ec0549d" time="0.000" />
+        <testcase name="test_debit_3" classname="ATM.tests.autogenerated.TestSuite_Account_cxx_1ec0549d" time="0.000" />
+        <testcase name="test_deposit_1" classname="ATM.tests.autogenerated.TestSuite_Account_cxx_1ec0549d" time="0.000" />
+        <testcase name="test_debit_10" classname="ATM.tests.autogenerated.TestSuite_Account_cxx_1ec0549d" time="0.000" />
+        <testcase name="test_debit_4" classname="ATM.tests.autogenerated.TestSuite_Account_cxx_1ec0549d" time="0.000" />
+        <testcase name="test_deposit_5" classname="ATM.tests.autogenerated.TestSuite_Account_cxx_1ec0549d" time="0.000" />
+        <testcase name="test_debit_9" classname="ATM.tests.autogenerated.TestSuite_Account_cxx_1ec0549d" time="0.000" />
+        <testcase name="test_debit_6" classname="ATM.tests.autogenerated.TestSuite_Account_cxx_1ec0549d" time="0.000" />
+        <testcase name="test_debit_8" classname="ATM.tests.autogenerated.TestSuite_Account_cxx_1ec0549d" time="0.000" />
+        <testcase name="test_deposit_8" classname="ATM.tests.autogenerated.TestSuite_Account_cxx_1ec0549d" time="0.000" />
+        <testcase name="test_deposit_4" classname="ATM.tests.autogenerated.TestSuite_Account_cxx_1ec0549d" time="0.000" />
+    </testsuite>
+    <testsuite name="ATM.tests.autogenerated.TestSuite_ATM_cxx_2c58b92b" time="0.000" tests="24" failures="8">
+        <testcase name="test_fillUserRequest_4" classname="ATM.tests.autogenerated.TestSuite_ATM_cxx_2c58b92b" time="0.000" />
+        <testcase name="test_fillUserRequest_7" classname="ATM.tests.autogenerated.TestSuite_ATM_cxx_2c58b92b" time="0.000" />
+        <testcase name="test_viewAccount_2" classname="ATM.tests.autogenerated.TestSuite_ATM_cxx_2c58b92b" time="0.000">
+            <failure type="Uncaught structured exception" message="Access violation exception [CPPTEST_ACCESS_VIOLATION]"><![CDATA[
+	at /ATM/ATM.cxx:14
+	at /ATM/tests/autogenerated/TestSuite_ATM_cxx.cpp:476
+	at /ATM/tests/autogenerated/TestSuite_ATM_cxx.cpp:26
+	at /ATM/tests/autogenerated/TestSuite_ATM_cxx.cpp:9]]></failure>
+        </testcase>
+        <testcase name="test_fillUserRequest_8" classname="ATM.tests.autogenerated.TestSuite_ATM_cxx_2c58b92b" time="0.000" />
+        <testcase name="test_ATM_4" classname="ATM.tests.autogenerated.TestSuite_ATM_cxx_2c58b92b" time="0.000" />
+        <testcase name="test_viewAccount_8" classname="ATM.tests.autogenerated.TestSuite_ATM_cxx_2c58b92b" time="0.000">
+            <failure type="Uncaught structured exception" message="Access violation exception [CPPTEST_ACCESS_VIOLATION]"><![CDATA[
+	at /ATM/ATM.cxx:14
+	at /ATM/tests/autogenerated/TestSuite_ATM_cxx.cpp:626
+	at /ATM/tests/autogenerated/TestSuite_ATM_cxx.cpp:32
+	at /ATM/tests/autogenerated/TestSuite_ATM_cxx.cpp:9]]></failure>
+        </testcase>
+        <testcase name="test_ATM_2" classname="ATM.tests.autogenerated.TestSuite_ATM_cxx_2c58b92b" time="0.000" />
+        <testcase name="test_viewAccount_7" classname="ATM.tests.autogenerated.TestSuite_ATM_cxx_2c58b92b" time="0.000">
+            <failure type="Uncaught structured exception" message="Access violation exception [CPPTEST_ACCESS_VIOLATION]"><![CDATA[
+	at /ATM/Bank.cxx:18
+	at /ATM/ATM.cxx:12
+	at /ATM/tests/autogenerated/TestSuite_ATM_cxx.cpp:601
+	at /ATM/tests/autogenerated/TestSuite_ATM_cxx.cpp:31
+	at /ATM/tests/autogenerated/TestSuite_ATM_cxx.cpp:9]]></failure>
+        </testcase>
+        <testcase name="test_fillUserRequest_5" classname="ATM.tests.autogenerated.TestSuite_ATM_cxx_2c58b92b" time="0.000" />
+        <testcase name="test_fillUserRequest_2" classname="ATM.tests.autogenerated.TestSuite_ATM_cxx_2c58b92b" time="0.000" />
+        <testcase name="test_viewAccount_6" classname="ATM.tests.autogenerated.TestSuite_ATM_cxx_2c58b92b" time="0.000" />
+        <testcase name="test_viewAccount_3" classname="ATM.tests.autogenerated.TestSuite_ATM_cxx_2c58b92b" time="0.000">
+            <failure type="Uncaught structured exception" message="Access violation exception [CPPTEST_ACCESS_VIOLATION]"><![CDATA[
+	at /ATM/ATM.cxx:14
+	at /ATM/tests/autogenerated/TestSuite_ATM_cxx.cpp:501
+	at /ATM/tests/autogenerated/TestSuite_ATM_cxx.cpp:27
+	at /ATM/tests/autogenerated/TestSuite_ATM_cxx.cpp:9]]></failure>
+        </testcase>
+        <testcase name="test_fillUserRequest_3" classname="ATM.tests.autogenerated.TestSuite_ATM_cxx_2c58b92b" time="0.000" />
+        <testcase name="test_fillUserRequest_9" classname="ATM.tests.autogenerated.TestSuite_ATM_cxx_2c58b92b" time="0.000" />
+        <testcase name="test_viewAccount_9" classname="ATM.tests.autogenerated.TestSuite_ATM_cxx_2c58b92b" time="0.000">
+            <failure type="Uncaught structured exception" message="Access violation exception [CPPTEST_ACCESS_VIOLATION]"><![CDATA[
+	at /ATM/Bank.cxx:18
+	at /ATM/ATM.cxx:12
+	at /ATM/tests/autogenerated/TestSuite_ATM_cxx.cpp:651
+	at /ATM/tests/autogenerated/TestSuite_ATM_cxx.cpp:33
+	at /ATM/tests/autogenerated/TestSuite_ATM_cxx.cpp:9]]></failure>
+        </testcase>
+        <testcase name="test_ATM_1" classname="ATM.tests.autogenerated.TestSuite_ATM_cxx_2c58b92b" time="0.000" />
+        <testcase name="test_viewAccount_5" classname="ATM.tests.autogenerated.TestSuite_ATM_cxx_2c58b92b" time="0.000">
+            <failure type="Uncaught structured exception" message="Access violation exception [CPPTEST_ACCESS_VIOLATION]"><![CDATA[
+	at /ATM/Bank.cxx:18
+	at /ATM/ATM.cxx:12
+	at /ATM/tests/autogenerated/TestSuite_ATM_cxx.cpp:551
+	at /ATM/tests/autogenerated/TestSuite_ATM_cxx.cpp:29
+	at /ATM/tests/autogenerated/TestSuite_ATM_cxx.cpp:9]]></failure>
+        </testcase>
+        <testcase name="test_viewAccount_1" classname="ATM.tests.autogenerated.TestSuite_ATM_cxx_2c58b92b" time="0.000">
+            <failure type="Uncaught structured exception" message="Access violation exception [CPPTEST_ACCESS_VIOLATION]"><![CDATA[
+	at /ATM/Bank.cxx:18
+	at /ATM/ATM.cxx:12
+	at /ATM/tests/autogenerated/TestSuite_ATM_cxx.cpp:425
+	at /ATM/tests/autogenerated/TestSuite_ATM_cxx.cpp:24
+	at /ATM/tests/autogenerated/TestSuite_ATM_cxx.cpp:9]]></failure>
+        </testcase>
+        <testcase name="test_ATM_3" classname="ATM.tests.autogenerated.TestSuite_ATM_cxx_2c58b92b" time="0.000" />
+        <testcase name="test_fillUserRequest_10" classname="ATM.tests.autogenerated.TestSuite_ATM_cxx_2c58b92b" time="0.000" />
+        <testcase name="test_fillUserRequest_1" classname="ATM.tests.autogenerated.TestSuite_ATM_cxx_2c58b92b" time="0.000" />
+        <testcase name="test_viewAccount_10" classname="ATM.tests.autogenerated.TestSuite_ATM_cxx_2c58b92b" time="0.000" />
+        <testcase name="test_fillUserRequest_6" classname="ATM.tests.autogenerated.TestSuite_ATM_cxx_2c58b92b" time="0.000" />
+        <testcase name="test_viewAccount_4" classname="ATM.tests.autogenerated.TestSuite_ATM_cxx_2c58b92b" time="0.000">
+            <failure type="Uncaught structured exception" message="Access violation exception [CPPTEST_ACCESS_VIOLATION]"><![CDATA[
+	at /ATM/ATM.cxx:14
+	at /ATM/tests/autogenerated/TestSuite_ATM_cxx.cpp:526
+	at /ATM/tests/autogenerated/TestSuite_ATM_cxx.cpp:28
+	at /ATM/tests/autogenerated/TestSuite_ATM_cxx.cpp:9]]></failure>
+        </testcase>
+    </testsuite>
+    <testsuite name="ATM.tests.autogenerated.TestSuite_Bank_cxx_9ae1ea36" time="0.000" tests="13" failures="0">
+        <testcase name="test_getAccount_9" classname="ATM.tests.autogenerated.TestSuite_Bank_cxx_9ae1ea36" time="0.000" />
+        <testcase name="test_x7eBank_1" classname="ATM.tests.autogenerated.TestSuite_Bank_cxx_9ae1ea36" time="0.000" />
+        <testcase name="test_addAccount_1" classname="ATM.tests.autogenerated.TestSuite_Bank_cxx_9ae1ea36" time="0.000" />
+        <testcase name="test_Bank_1" classname="ATM.tests.autogenerated.TestSuite_Bank_cxx_9ae1ea36" time="0.000" />
+        <testcase name="test_getAccount_2" classname="ATM.tests.autogenerated.TestSuite_Bank_cxx_9ae1ea36" time="0.000" />
+        <testcase name="test_getAccount_10" classname="ATM.tests.autogenerated.TestSuite_Bank_cxx_9ae1ea36" time="0.000" />
+        <testcase name="test_getAccount_6" classname="ATM.tests.autogenerated.TestSuite_Bank_cxx_9ae1ea36" time="0.000" />
+        <testcase name="test_getAccount_4" classname="ATM.tests.autogenerated.TestSuite_Bank_cxx_9ae1ea36" time="0.000" />
+        <testcase name="test_getAccount_7" classname="ATM.tests.autogenerated.TestSuite_Bank_cxx_9ae1ea36" time="0.000" />
+        <testcase name="test_getAccount_8" classname="ATM.tests.autogenerated.TestSuite_Bank_cxx_9ae1ea36" time="0.000" />
+        <testcase name="test_getAccount_1" classname="ATM.tests.autogenerated.TestSuite_Bank_cxx_9ae1ea36" time="0.000" />
+        <testcase name="test_getAccount_3" classname="ATM.tests.autogenerated.TestSuite_Bank_cxx_9ae1ea36" time="0.000" />
+        <testcase name="test_getAccount_5" classname="ATM.tests.autogenerated.TestSuite_Bank_cxx_9ae1ea36" time="0.000" />
+    </testsuite>
+    <testsuite name="ATM.tests.autogenerated.TestSuite_BaseDisplay_cxx_90b94c01" time="0.000" tests="11" failures="0">
+        <testcase name="test_showBalance_2" classname="ATM.tests.autogenerated.TestSuite_BaseDisplay_cxx_90b94c01" time="0.000" />
+        <testcase name="test_showBalance_5" classname="ATM.tests.autogenerated.TestSuite_BaseDisplay_cxx_90b94c01" time="0.000" />
+        <testcase name="test_showInfoToUser_2" classname="ATM.tests.autogenerated.TestSuite_BaseDisplay_cxx_90b94c01" time="0.000" />
+        <testcase name="test_showBalance_7" classname="ATM.tests.autogenerated.TestSuite_BaseDisplay_cxx_90b94c01" time="0.000" />
+        <testcase name="test_showBalance_3" classname="ATM.tests.autogenerated.TestSuite_BaseDisplay_cxx_90b94c01" time="0.000" />
+        <testcase name="test_showBalance_1" classname="ATM.tests.autogenerated.TestSuite_BaseDisplay_cxx_90b94c01" time="0.000" />
+        <testcase name="test_showInfoToUser_3" classname="ATM.tests.autogenerated.TestSuite_BaseDisplay_cxx_90b94c01" time="0.000" />
+        <testcase name="test_showBalance_4" classname="ATM.tests.autogenerated.TestSuite_BaseDisplay_cxx_90b94c01" time="0.000" />
+        <testcase name="test_showInfoToUser_1" classname="ATM.tests.autogenerated.TestSuite_BaseDisplay_cxx_90b94c01" time="0.000" />
+        <testcase name="test_showInfoToUser_4" classname="ATM.tests.autogenerated.TestSuite_BaseDisplay_cxx_90b94c01" time="0.000" />
+        <testcase name="test_showBalance_6" classname="ATM.tests.autogenerated.TestSuite_BaseDisplay_cxx_90b94c01" time="0.000" />
+    </testsuite>
+</testsuites>
+
diff --git a/src/test/resources/org/jenkinsci/plugins/xunit/types/cpptest/testcase3/input.xml b/src/test/resources/org/jenkinsci/plugins/xunit/types/cpptest/testcase3/input.xml
new file mode 100644
index 00000000..c211ba25
--- /dev/null
+++ b/src/test/resources/org/jenkinsci/plugins/xunit/types/cpptest/testcase3/input.xml
@@ -0,0 +1,258 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<ResultsSession time="06/09/15 15:53:58" toolName="C++test" toolVer="9.5.3.61">
+    <TestConfig name="Run Unit Tests with Memory Monitoring (1)" pseudoUrl="c++test.file:/D:/Parasoft/config/RunUnitTestswithMemoryMonitoring.properties" />
+    <Authors />
+    <VersionInfos>
+        <StorageInfo ownerId="com.parasoft.xtest.checkers.api.execution" resultId="IExecutionViolation" ver="2" />
+        <StorageInfo ownerId="com.parasoft.xtest.checkers.api.execution" resultId="InsureViolation" ver="3" />
+        <StorageInfo ownerId="com.parasoft.xtest.checkers.api.codereview" resultId="ICodeReviewUndefinedAuthorsInfo" ver="1" />
+        <StorageInfo ownerId="com.parasoft.xtest.checkers.api.codereview" resultId="ICodeReviewScannerInfo" ver="2" />
+        <StorageInfo ownerId="com.parasoft.xtest.checkers.api.generation" resultId="IGenerationInfo" ver="2" />
+        <StorageInfo ownerId="com.parasoft.xtest.checkers.api.generation" resultId="IGenerationProjectInfo" ver="2" />
+        <StorageInfo ownerId="com.parasoft.xtest.checkers.api.scope" resultId="IScopeProjectInfo" ver="3" />
+        <StorageInfo ownerId="com.parasoft.xtest.checkers.api.standards" resultId="IMetricsViolation" ver="2" />
+        <StorageInfo ownerId="com.parasoft.xtest.checkers.api.standards" resultId="IFlowAnalysisViolation" ver="2" />
+        <StorageInfo ownerId="com.parasoft.xtest.checkers.api.standards" resultId="ICodingStandardsViolation" ver="2" />
+        <StorageInfo ownerId="com.parasoft.xtest.checkers.api.standards" resultId="IMetricEstimationInfo" ver="2" />
+        <StorageInfo ownerId="com.parasoft.xtest.checkers.api.standards" resultId="IDupCodeViolation" ver="2" />
+    </VersionInfos>
+
+    <Scope>
+        <ProjectInformations>
+            <ScopeProjectInfo fltFiles="32" fltLns="11910" project="amcctip/amcctip" totFiles="32" totLns="11910" />
+        </ProjectInformations>
+    </Scope>
+
+    <Exec ownerId="com.parasoft.xtest.checkers.api.execution" time="0:00:22">
+        <Goals>
+            <Goal mode="1" name="Unit Test Problems" type="0" />
+            <Goal mode="1" name="Unit Test Outcomes" type="3" />
+            <Goal mode="1" name="Runtime Error Detection Violations" type="5" />
+        </Goals>
+
+        <ExecViols />
+
+        <History>
+            <Graph id="tsks">
+                <Categories>
+                    <Category authPos="3" color="orange" name="Fix Runtime Error Detection Violations" pos="3" />
+                    <Category authPos="2" color="red" name="Fix Unit Test Problems" pos="2" />
+                    <Category authPos="4" color="blue" name="Review Unit Test Outcomes" pos="4" />
+                </Categories>
+                <Total secSer="1" title="" xTitle="Date" yTitle="Tasks" yTitle2="Review Unit Test Outcomes">
+                    <X>06-09-15,</X>
+                    <Y>0,0,0,</Y>
+                    <Delta>0,0,0,</Delta>
+                </Total>
+            </Graph>
+            <Graph id="tc">
+                <Categories>
+                    <Category color="gray" name="Total" pos="0" />
+                    <Category color="green" name="Passed" pos="1" />
+                    <Category color="red" name="Failed" pos="2" />
+                </Categories>
+                <Total secSer="1" title="" xTitle="Date" yTitle="Total" yTitle2="Failed">
+                    <X>06-09-15,</X>
+                    <Y>0,0,0,</Y>
+                    <Delta>0,0,0,</Delta>
+                </Total>
+            </Graph>
+        </History>
+
+        <Categories>
+            <Category desc="" id="5" label="Fix Runtime Error Detection Violations" label0="Fix Runtime Error Detection" label1="Violations" name="Runtime Error Detection Violations">
+                <SubCategory id="9" name="Runtime Violations" short="runtime violation" />
+                <SubCategory id="17" name="Memory" short="Memory" />
+            </Category>
+            <Category
+                desc="This represents the tasks arising from tests that have already been reviewed. This includes exceptions that have been marked as expected, assertion failures from previously reviewed tests, and any other kind of unexpected behavior that needs to be looked at (such as timeouts)."
+                id="0" label="Fix Unit Test Problems" label0="Fix Unit Test" label1="Problems" name="Unit Test Problems">
+                <SubCategory id="0" name="Runtime Exceptions" short="exception" />
+                <SubCategory id="1" name="Assertion Failures" short="failure" />
+                <SubCategory id="14" name="Execution Problems" short="execution problem" />
+                <SubCategory id="15" name="Test Problems" short="test problem" />
+            </Category>
+            <Category
+                desc="These are outcomes from automatically generated tests that did not result in exceptions or assertion failures. The user just has to review and ensure that the outcome is appropriate (and convert them to assertions if they are not already represented as assertions)."
+                id="3" label="Review Unit Test Outcomes" label0="Review Unit Test" label1="Outcomes" name="Unit Test Outcomes">
+                <SubCategory id="6" name="Unverified Outcomes" short="unverified outcome" />
+            </Category>
+        </Categories>
+        <Summary>
+            <Total>
+                <CategoryErrors authCount="" authUrgCount="" cat="5" count="0">
+                    <SubCategoryErrors authCount="" authUrgCount="" count="0" subCat="9" />
+                    <SubCategoryErrors authCount="" authUrgCount="" count="0" subCat="17" />
+                </CategoryErrors>
+                <CategoryErrors authCount="" authUrgCount="" cat="0" count="0">
+                    <SubCategoryErrors authCount="" authUrgCount="" count="0" subCat="0" />
+                    <SubCategoryErrors authCount="" authUrgCount="" count="0" subCat="1" />
+                    <SubCategoryErrors authCount="" authUrgCount="" count="0" subCat="14" />
+                    <SubCategoryErrors authCount="" authUrgCount="" count="0" subCat="15" />
+                </CategoryErrors>
+                <CategoryErrors authCount="" authUrgCount="" cat="3" count="0">
+                    <SubCategoryErrors authCount="" authUrgCount="" count="0" subCat="6" />
+                </CategoryErrors>
+            </Total>
+            <Projects />
+        </Summary>
+        <Coverage>
+            <Types>
+                <CvgType cvgDecor="marker" dispCvg="executable lines" dispId="LC" dispName="Line Coverage" dispNoCvg="no executable lines" id="LC" />
+            </Types>
+            <CvgStats>
+                <CvgInfo elem="Total" exp="1" num="0" total="2583" val="0">
+                    <CvgInfo elem="amcctip" exp="1" num="0" total="2583" val="0">
+                        <CvgInfo elem="Source Files" exp="1" num="0" total="2583" val="0">
+                            <CvgInfo elem="8assist.c" loc="amcctip/amcctip/Source Files/8assist.c" num="0" total="25" val="0">
+                                <CvgInfo elem="usSTS8_RestituerListeFormule" num="0" total="25" val="0" />
+                            </CvgInfo>
+                            <CvgInfo elem="8bacte.c" loc="amcctip/amcctip/Source Files/8bacte.c" num="0" total="160" val="0">
+                                <CvgInfo elem="pstSTS8_InitActe" num="0" total="31" val="0" />
+                                <CvgInfo elem="usSTS8_CalculerMontantAMC" num="0" total="100" val="0" />
+                                <CvgInfo elem="usSTS8_ControlerDonneesActe" num="0" total="18" val="0" />
+                                <CvgInfo elem="usSTS8_LibererActe" num="0" total="11" val="0" />
+                            </CvgInfo>
+                            <CvgInfo elem="8bdonex.c" loc="amcctip/amcctip/Source Files/8bdonex.c" num="0" total="353" val="0">
+                                <CvgInfo elem="usSTS8_LectureParamDansTable" num="0" total="77" val="0" />
+                                <CvgInfo elem="usSTS8_PrechargeTableGarantie" num="0" total="27" val="0" />
+                                <CvgInfo elem="usSTS8_RechercheGarantie" num="0" total="139" val="0" />
+                                <CvgInfo elem="usSTS8_SoumettreDiagnostic" num="0" total="110" val="0" />
+                            </CvgInfo>
+                            <CvgInfo elem="8bfactu.c" loc="amcctip/amcctip/Source Files/8bfactu.c" num="0" total="704" val="0">
+                                <CvgInfo elem="usSTS8_AnalyserFacture" num="0" total="82" val="0" />
+                                <CvgInfo elem="usSTS8_CalculerTotalAMC" num="0" total="33" val="0" />
+                                <CvgInfo elem="usSTS8_ControlerDiagnostic" num="0" total="15" val="0" />
+                                <CvgInfo elem="usSTS8_ControlerPresenceFormule" num="0" total="23" val="0" />
+                                <CvgInfo elem="usSTS8_DecodageZCC" num="0" total="204" val="0" />
+                                <CvgInfo elem="usSTS8_FormaterZout" num="0" total="39" val="0" />
+                                <CvgInfo elem="usSTS8_GarderActeUnique" num="0" total="22" val="0" />
+                                <CvgInfo elem="usSTS8_InitFacture" num="0" total="41" val="0" />
+                                <CvgInfo elem="usSTS8_LectureParamDansRUF" num="0" total="86" val="0" />
+                                <CvgInfo elem="usSTS8_LibererFacture" num="0" total="8" val="0" />
+                                <CvgInfo elem="usSTS8_TraiterActes" num="0" total="55" val="0" />
+                                <CvgInfo elem="usSTS8_VerifCompatibiliteTableCarte" num="0" total="39" val="0" />
+                                <CvgInfo elem="usSTS8_VerifGarantiesEnCarte" num="0" total="13" val="0" />
+                                <CvgInfo elem="usSTS8_VerifPieceJustificativeAMC" num="0" total="20" val="0" />
+                                <CvgInfo elem="usSTS8_VerifTiersPayant" num="0" total="14" val="0" />
+                                <CvgInfo elem="usSTS8_VerifZoneMutuelle" num="0" total="10" val="0" />
+                            </CvgInfo>
+                            <CvgInfo elem="8bgroupe.c" loc="amcctip/amcctip/Source Files/8bgroupe.c" num="0" total="730" val="0">
+                                <CvgInfo elem="usSTS8_Analyse109" num="0" total="37" val="0" />
+                                <CvgInfo elem="usSTS8_Analyse111" num="0" total="43" val="0" />
+                                <CvgInfo elem="usSTS8_Analyse1120" num="0" total="14" val="0" />
+                                <CvgInfo elem="usSTS8_Analyse1180" num="0" total="19" val="0" />
+                                <CvgInfo elem="usSTS8_Analyse1321" num="0" total="16" val="0" />
+                                <CvgInfo elem="usSTS8_Analyse1610" num="0" total="42" val="0" />
+                                <CvgInfo elem="usSTS8_Analyse1620" num="0" total="42" val="0" />
+                                <CvgInfo elem="usSTS8_Analyse1630" num="0" total="42" val="0" />
+                                <CvgInfo elem="usSTS8_Analyse2020" num="0" total="11" val="0" />
+                                <CvgInfo elem="usSTS8_Analyse3710" num="0" total="64" val="0" />
+                                <CvgInfo elem="usSTS8_Analyse3730" num="0" total="11" val="0" />
+                                <CvgInfo elem="usSTS8_Analyse3731" num="0" total="11" val="0" />
+                                <CvgInfo elem="usSTS8_Analyse3800" num="0" total="11" val="0" />
+                                <CvgInfo elem="usSTS8_EcrireDescFormule" num="0" total="34" val="0" />
+                                <CvgInfo elem="usSTS8_Formate1321" num="0" total="12" val="0" />
+                                <CvgInfo elem="usSTS8_Formate1450" num="0" total="17" val="0" />
+                                <CvgInfo elem="usSTS8_Formate1610" num="0" total="16" val="0" />
+                                <CvgInfo elem="usSTS8_Formate1620" num="0" total="16" val="0" />
+                                <CvgInfo elem="usSTS8_Formate1630" num="0" total="16" val="0" />
+                                <CvgInfo elem="usSTS8_Formate1910" num="0" total="17" val="0" />
+                                <CvgInfo elem="usSTS8_Formate2010" num="0" total="14" val="0" />
+                                <CvgInfo elem="usSTS8_Formate3710" num="0" total="31" val="0" />
+                                <CvgInfo elem="usSTS8_Formate3715" num="0" total="35" val="0" />
+                                <CvgInfo elem="usSTS8_Formate3760" num="0" total="44" val="0" />
+                                <CvgInfo elem="usSTS8_FormateDiagnostic" num="0" total="21" val="0" />
+                                <CvgInfo elem="usSTS8_InitDescFormule" num="0" total="11" val="0" />
+                                <CvgInfo elem="usSTS8_InitDiagnostic" num="0" total="6" val="0" />
+                                <CvgInfo elem="usSTS8_InitParametreC" num="0" total="3" val="0" />
+                                <CvgInfo elem="usSTS8_InitParametreD" num="0" total="5" val="0" />
+                                <CvgInfo elem="usSTS8_InitParametreL" num="0" total="3" val="0" />
+                                <CvgInfo elem="usSTS8_InitParametreS" num="0" total="3" val="0" />
+                                <CvgInfo elem="usSTS8_InitParametreU" num="0" total="3" val="0" />
+                                <CvgInfo elem="usSTS8_InitVersion" num="0" total="4" val="0" />
+                                <CvgInfo elem="usSTS8_LectureL" num="0" total="9" val="0" />
+                                <CvgInfo elem="usSTS8_LectureU" num="0" total="9" val="0" />
+                                <CvgInfo elem="usSTS8_LibererDescFormule" num="0" total="9" val="0" />
+                                <CvgInfo elem="usSTS8_LibererDiagnostic" num="0" total="6" val="0" />
+                                <CvgInfo elem="usSTS8_LireChaineEtendue" num="0" total="23" val="0" />
+                            </CvgInfo>
+                            <CvgInfo elem="8lib.c" loc="amcctip/amcctip/Source Files/8lib.c" num="0" total="211" val="0">
+                                <CvgInfo elem="usSTS8_GenererADM" num="0" total="43" val="0" />
+                                <CvgInfo elem="usSTS8_InitLIB" num="0" total="68" val="0" />
+                                <CvgInfo elem="usSTS8_TermLIB" num="0" total="18" val="0" />
+                                <CvgInfo elem="usSTS8_VerifierPackage" num="0" total="28" val="0" />
+                                <CvgInfo elem="vSTS8_LireIni" num="0" total="54" val="0" />
+                            </CvgInfo>
+                            <CvgInfo elem="8libraryextern.c" loc="amcctip/amcctip/Source Files/8libraryextern.c" num="0" total="44" val="0">
+                                <CvgInfo elem="usSTS8_ChargementDesLibrairiesExterne" num="0" total="10" val="0" />
+                                <CvgInfo elem="usSTS8_CloseLibrary" num="0" total="7" val="0" />
+                                <CvgInfo elem="usSTS8_DeChargementDesLibrairiesExtern" num="0" total="5" val="0" />
+                                <CvgInfo elem="usSTS8_GetStatuslibrairieExtern" num="0" total="6" val="0" />
+                                <CvgInfo elem="usSTS8_OpenLibrary" num="0" total="16" val="0" />
+                            </CvgInfo>
+                            <CvgInfo elem="8main.c" loc="amcctip/amcctip/Source Files/8main.c" num="0" total="44" val="0">
+                                <CvgInfo elem="DllMain" num="0" total="12" val="0" />
+                                <CvgInfo elem="STS8_AllouerZoneMem" num="0" total="4" val="0" />
+                                <CvgInfo elem="STS8_Assistance" num="0" total="4" val="0" />
+                                <CvgInfo elem="STS8_InitLIB" num="0" total="4" val="0" />
+                                <CvgInfo elem="STS8_InitTrace" num="0" total="4" val="0" />
+                                <CvgInfo elem="STS8_LibererZoneMem" num="0" total="3" val="0" />
+                                <CvgInfo elem="STS8_LireVersion" num="0" total="4" val="0" />
+                                <CvgInfo elem="STS8_Tarification" num="0" total="4" val="0" />
+                                <CvgInfo elem="STS8_TermLIB" num="0" total="5" val="0" />
+                            </CvgInfo>
+                            <CvgInfo elem="8mem.c" loc="amcctip/amcctip/Source Files/8mem.c" num="0" total="52" val="0">
+                                <CvgInfo elem="pvSTS8_malloc" num="0" total="6" val="0" />
+                                <CvgInfo elem="pvSTS8_realloc" num="0" total="7" val="0" />
+                                <CvgInfo elem="usSTS8_AllouerReAllouerZoneMem" num="0" total="15" val="0" />
+                                <CvgInfo elem="usSTS8_AllouerZoneMem" num="0" total="12" val="0" />
+                                <CvgInfo elem="vSTS8_free" num="0" total="4" val="0" />
+                                <CvgInfo elem="vSTS8_LibererZoneMem" num="0" total="8" val="0" />
+                            </CvgInfo>
+                            <CvgInfo elem="8tarifi.c" loc="amcctip/amcctip/Source Files/8tarifi.c" num="0" total="73" val="0">
+                                <CvgInfo elem="usSTS8_Tarification" num="0" total="73" val="0" />
+                            </CvgInfo>
+                            <CvgInfo elem="8trace.c" loc="amcctip/amcctip/Source Files/8trace.c" num="0" total="42" val="0">
+                                <CvgInfo elem="usSTS8_InitTrace" num="0" total="42" val="0" />
+                            </CvgInfo>
+                            <CvgInfo elem="8utile.c" loc="amcctip/amcctip/Source Files/8utile.c" num="0" total="76" val="0">
+                                <CvgInfo elem="usSTS8_ascii2hexa" num="0" total="56" val="0" />
+                                <CvgInfo elem="usSTS8_TranscodeRuf" num="0" total="11" val="0" />
+                                <CvgInfo elem="usSTS8_TranscrireCRSI" num="0" total="9" val="0" />
+                            </CvgInfo>
+                            <CvgInfo elem="8version.c" loc="amcctip/amcctip/Source Files/8version.c" num="0" total="69" val="0">
+                                <CvgInfo elem="usSTS8_LireVersion" num="0" total="69" val="0" />
+                            </CvgInfo>
+                        </CvgInfo>
+                    </CvgInfo>
+                </CvgInfo>
+            </CvgStats>
+
+            <History>
+                <Graph id="cvg">
+                    <Categories>
+                        <Category color="red" name="Executable Total Lines" pos="0" />
+                        <Category color="green" name="Executable Covered Lines" pos="1" />
+                        <Category color="blue" name="Percentage" pos="2" />
+                    </Categories>
+                    <Total secSer="1" title="" xTitle="Date" yTitle="Lines" yTitle2="Percentage">
+                        <X>06-09-15,</X>
+                        <Y>2583,0,0,</Y>
+                        <Delta>2583,0,0,</Delta>
+                    </Total>
+                </Graph>
+            </History>
+
+
+        </Coverage>
+        <TestingProcessProblems>
+            <CppAnalysisProblem tested="amcctip/amcctip">
+                <ErrorList>
+                    <Error val="Test execution: error linking test executable for Test unit for selected sources." />
+                </ErrorList>
+            </CppAnalysisProblem>
+        </TestingProcessProblems>
+    </Exec>
+    <AssocUrls />
+</ResultsSession>
diff --git a/src/test/resources/org/jenkinsci/plugins/xunit/types/cpptest/testcase3/result.xml b/src/test/resources/org/jenkinsci/plugins/xunit/types/cpptest/testcase3/result.xml
new file mode 100644
index 00000000..2d315e2d
--- /dev/null
+++ b/src/test/resources/org/jenkinsci/plugins/xunit/types/cpptest/testcase3/result.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite name="Run Unit Tests with Memory Monitoring (1)" time="22.000" tests="0" failures="0">
+    <system-err><![CDATA[Test execution: error linking test executable for Test unit for selected sources.]]></system-err>
+</testsuite>
\ No newline at end of file
diff --git a/src/test/resources/org/jenkinsci/plugins/xunit/types/cpptestunit/testcase1/junit-result.xml b/src/test/resources/org/jenkinsci/plugins/xunit/types/cpptestunit/testcase1/junit-result.xml
deleted file mode 100644
index bdbbb829..00000000
--- a/src/test/resources/org/jenkinsci/plugins/xunit/types/cpptestunit/testcase1/junit-result.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<testsuite name="hello" time="0" tests="" failures="0">
-    <properties>
-        <property name="Unverified Outcomes" value="3"/>
-        <property name="Unit Testing Problems" value="0"/>
-    </properties>
-</testsuite>
\ No newline at end of file
diff --git a/src/test/resources/org/jenkinsci/plugins/xunit/types/cpptestunit/testcase2/result-junit.xml b/src/test/resources/org/jenkinsci/plugins/xunit/types/cpptestunit/testcase2/result-junit.xml
deleted file mode 100644
index 9d0fbbe7..00000000
--- a/src/test/resources/org/jenkinsci/plugins/xunit/types/cpptestunit/testcase2/result-junit.xml
+++ /dev/null
@@ -1,435 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<testsuite name="ATM" time="0" tests="" failures="10">
-    <properties>
-        <property name="Unit Test Problems" value="0"/>
-        <property name="Unit Test Outcomes" value="3"/>
-        <property name="Runtime Error Detection Violations" value="5"/>
-    </properties>
-    <testcase classname="/ATM/ATM.cxx" name="TestSuite_ATM_cxx_2c58b92b::test_viewAccount_2"
-              time="0">
-        <failure type="Uncaught structured exception"
-                 message="Access violation exception [CPPTEST_ACCESS_VIOLATION]"/>
-        <system-err>Trace Line :14 File :/ATM/ATM.cxxLine :476 File :/ATM/tests/autogenerated/TestSuite_ATM_cxx.cppLine
-            :26 File :/ATM/tests/autogenerated/TestSuite_ATM_cxx.cppLine :9 File
-            :/ATM/tests/autogenerated/TestSuite_ATM_cxx.cpp
-        </system-err>
-    </testcase>
-    <testcase classname="/ATM/ATM.cxx" name="TestSuite_ATM_cxx_2c58b92b::test_viewAccount_3"
-              time="0">
-        <failure type="Uncaught structured exception"
-                 message="Access violation exception [CPPTEST_ACCESS_VIOLATION]"/>
-        <system-err>Trace Line :14 File :/ATM/ATM.cxxLine :501 File :/ATM/tests/autogenerated/TestSuite_ATM_cxx.cppLine
-            :27 File :/ATM/tests/autogenerated/TestSuite_ATM_cxx.cppLine :9 File
-            :/ATM/tests/autogenerated/TestSuite_ATM_cxx.cpp
-        </system-err>
-    </testcase>
-    <testcase classname="/ATM/ATM.cxx" name="TestSuite_ATM_cxx_2c58b92b::test_viewAccount_4"
-              time="0">
-        <failure type="Uncaught structured exception"
-                 message="Access violation exception [CPPTEST_ACCESS_VIOLATION]"/>
-        <system-err>Trace Line :14 File :/ATM/ATM.cxxLine :526 File :/ATM/tests/autogenerated/TestSuite_ATM_cxx.cppLine
-            :28 File :/ATM/tests/autogenerated/TestSuite_ATM_cxx.cppLine :9 File
-            :/ATM/tests/autogenerated/TestSuite_ATM_cxx.cpp
-        </system-err>
-    </testcase>
-    <testcase classname="/ATM/ATM.cxx" name="TestSuite_ATM_cxx_2c58b92b::test_viewAccount_8"
-              time="0">
-        <failure type="Uncaught structured exception"
-                 message="Access violation exception [CPPTEST_ACCESS_VIOLATION]"/>
-        <system-err>Trace Line :14 File :/ATM/ATM.cxxLine :626 File :/ATM/tests/autogenerated/TestSuite_ATM_cxx.cppLine
-            :32 File :/ATM/tests/autogenerated/TestSuite_ATM_cxx.cppLine :9 File
-            :/ATM/tests/autogenerated/TestSuite_ATM_cxx.cpp
-        </system-err>
-    </testcase>
-    <testcase classname="/ATM/Bank.cxx" name="TestSuite_ATM_cxx_2c58b92b::test_viewAccount_1"
-              time="0">
-        <failure type="Uncaught structured exception"
-                 message="Access violation exception [CPPTEST_ACCESS_VIOLATION]"/>
-        <system-err>Trace Line :18 File :/ATM/Bank.cxxLine :12 File :/ATM/ATM.cxxLine :425 File
-            :/ATM/tests/autogenerated/TestSuite_ATM_cxx.cppLine :24 File
-            :/ATM/tests/autogenerated/TestSuite_ATM_cxx.cppLine :9 File :/ATM/tests/autogenerated/TestSuite_ATM_cxx.cpp
-        </system-err>
-    </testcase>
-    <testcase classname="/ATM/Bank.cxx" name="TestSuite_ATM_cxx_2c58b92b::test_viewAccount_5"
-              time="0">
-        <failure type="Uncaught structured exception"
-                 message="Access violation exception [CPPTEST_ACCESS_VIOLATION]"/>
-        <system-err>Trace Line :18 File :/ATM/Bank.cxxLine :12 File :/ATM/ATM.cxxLine :551 File
-            :/ATM/tests/autogenerated/TestSuite_ATM_cxx.cppLine :29 File
-            :/ATM/tests/autogenerated/TestSuite_ATM_cxx.cppLine :9 File :/ATM/tests/autogenerated/TestSuite_ATM_cxx.cpp
-        </system-err>
-    </testcase>
-    <testcase classname="/ATM/Bank.cxx" name="TestSuite_ATM_cxx_2c58b92b::test_viewAccount_7"
-              time="0">
-        <failure type="Uncaught structured exception"
-                 message="Access violation exception [CPPTEST_ACCESS_VIOLATION]"/>
-        <system-err>Trace Line :18 File :/ATM/Bank.cxxLine :12 File :/ATM/ATM.cxxLine :601 File
-            :/ATM/tests/autogenerated/TestSuite_ATM_cxx.cppLine :31 File
-            :/ATM/tests/autogenerated/TestSuite_ATM_cxx.cppLine :9 File :/ATM/tests/autogenerated/TestSuite_ATM_cxx.cpp
-        </system-err>
-    </testcase>
-    <testcase classname="/ATM/Bank.cxx" name="TestSuite_ATM_cxx_2c58b92b::test_viewAccount_9"
-              time="0">
-        <failure type="Uncaught structured exception"
-                 message="Access violation exception [CPPTEST_ACCESS_VIOLATION]"/>
-        <system-err>Trace Line :18 File :/ATM/Bank.cxxLine :12 File :/ATM/ATM.cxxLine :651 File
-            :/ATM/tests/autogenerated/TestSuite_ATM_cxx.cppLine :33 File
-            :/ATM/tests/autogenerated/TestSuite_ATM_cxx.cppLine :9 File :/ATM/tests/autogenerated/TestSuite_ATM_cxx.cpp
-        </system-err>
-    </testcase>
-    <testcase classname="/ATM/include/Account.hxx"
-              name="TestSuite_Account_hxx_65a1b62c::test_setPassword_10"
-              time="0">
-        <failure type="Uncaught structured exception"
-                 message="Access violation exception [CPPTEST_ACCESS_VIOLATION]"/>
-        <system-err>Trace Line :37 File :/ATM/include/Account.hxxLine :939 File
-            :/ATM/tests/autogenerated/include/TestSuite_Account_hxx.cppLine :53 File
-            :/ATM/tests/autogenerated/include/TestSuite_Account_hxx.cppLine :9 File
-            :/ATM/tests/autogenerated/include/TestSuite_Account_hxx.cpp
-        </system-err>
-    </testcase>
-    <testcase classname="/ATM/include/Account.hxx"
-              name="TestSuite_Account_hxx_65a1b62c::test_setPassword_9"
-              time="0">
-        <failure type="Uncaught structured exception"
-                 message="Access violation exception [CPPTEST_ACCESS_VIOLATION]"/>
-        <system-err>Trace Line :37 File :/ATM/include/Account.hxxLine :1097 File
-            :/ATM/tests/autogenerated/include/TestSuite_Account_hxx.cppLine :61 File
-            :/ATM/tests/autogenerated/include/TestSuite_Account_hxx.cppLine :9 File
-            :/ATM/tests/autogenerated/include/TestSuite_Account_hxx.cpp
-        </system-err>
-    </testcase>
-
-
-    <testcase name="TestSuite_Account_hxx_65a1b62c::test_setAccountNumber_3"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_Account_hxx_65a1b62c::test_getBalance_6"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_Account_hxx_65a1b62c::test_setPassword_5"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_Account_hxx_65a1b62c::test_getAccountNumber_1"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_Account_hxx_65a1b62c::test_setAccountNumber_9"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_Account_hxx_65a1b62c::test_getAccountNumber_7"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_Account_hxx_65a1b62c::test_getPassword_2"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_Account_hxx_65a1b62c::test_setAccountNumber_5"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_Account_hxx_65a1b62c::test_Account_4"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_Account_hxx_65a1b62c::test_setPassword_2"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_Account_hxx_65a1b62c::test_getAccountNumber_5"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_Account_hxx_65a1b62c::test_getPassword_3"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_Account_hxx_65a1b62c::test_getAccountNumber_8"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_Account_hxx_65a1b62c::test_getAccountNumber_2"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_Account_hxx_65a1b62c::test_Account_9"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_Account_hxx_65a1b62c::test_setPassword_3"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_Account_hxx_65a1b62c::test_getBalance_4"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_Account_hxx_65a1b62c::test_getPassword_5"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_Account_hxx_65a1b62c::test_getBalance_7"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_Account_hxx_65a1b62c::test_setPassword_6"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_Account_hxx_65a1b62c::test_Account_5"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_Account_hxx_65a1b62c::test_setPassword_7"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_Account_hxx_65a1b62c::test_Account_3"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_Account_hxx_65a1b62c::test_getAccountNumber_4"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_Account_hxx_65a1b62c::test_getBalance_3"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_Account_hxx_65a1b62c::test_getBalance_8"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_Account_hxx_65a1b62c::test_getPassword_1"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_Account_hxx_65a1b62c::test_setAccountNumber_6"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_Account_hxx_65a1b62c::test_getAccountNumber_6"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_Account_hxx_65a1b62c::test_getPassword_7"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_Account_hxx_65a1b62c::test_setPassword_8"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_Account_hxx_65a1b62c::test_getBalance_1"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_Account_hxx_65a1b62c::test_setAccountNumber_8"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_Account_hxx_65a1b62c::test_Account_7"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_Account_hxx_65a1b62c::test_setAccountNumber_2"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_Account_hxx_65a1b62c::test_setPassword_1"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_Account_hxx_65a1b62c::test_setPassword_4"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_Account_hxx_65a1b62c::test_Account_1"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_Account_hxx_65a1b62c::test_getPassword_8"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_Account_hxx_65a1b62c::test_setAccountNumber_4"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_Account_hxx_65a1b62c::test_setAccountNumber_7"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_Account_hxx_65a1b62c::test_Account_6"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_Account_hxx_65a1b62c::test_setAccountNumber_1"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_Account_hxx_65a1b62c::test_getBalance_2"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_Account_hxx_65a1b62c::test_getPassword_4"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_Account_hxx_65a1b62c::test_Account_8"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_Account_hxx_65a1b62c::test_getAccountNumber_3"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_Account_hxx_65a1b62c::test_getBalance_5"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_Account_hxx_65a1b62c::test_setAccountNumber_10"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_Account_hxx_65a1b62c::test_getPassword_6"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_BaseDisplay_hxx_e7444e97::test_x7eBaseDisplay_1"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_BaseDisplay_hxx_e7444e97::test_BaseDisplay_1"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_Account_cxx_1ec0549d::test_debit_1"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_Account_cxx_1ec0549d::test_debit_5"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_Account_cxx_1ec0549d::test_deposit_7"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_Account_cxx_1ec0549d::test_debit_2"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_Account_cxx_1ec0549d::test_deposit_2"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_Account_cxx_1ec0549d::test_deposit_10"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_Account_cxx_1ec0549d::test_deposit_3"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_Account_cxx_1ec0549d::test_deposit_9"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_Account_cxx_1ec0549d::test_debit_7"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_Account_cxx_1ec0549d::test_deposit_6"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_Account_cxx_1ec0549d::test_debit_3"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_Account_cxx_1ec0549d::test_deposit_1"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_Account_cxx_1ec0549d::test_debit_10"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_Account_cxx_1ec0549d::test_debit_4"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_Account_cxx_1ec0549d::test_deposit_5"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_Account_cxx_1ec0549d::test_debit_9"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_Account_cxx_1ec0549d::test_debit_6"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_Account_cxx_1ec0549d::test_debit_8"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_Account_cxx_1ec0549d::test_deposit_8"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_Account_cxx_1ec0549d::test_deposit_4"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_ATM_cxx_2c58b92b::test_fillUserRequest_4"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_ATM_cxx_2c58b92b::test_fillUserRequest_7"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_ATM_cxx_2c58b92b::test_fillUserRequest_8"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_ATM_cxx_2c58b92b::test_ATM_4" classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_ATM_cxx_2c58b92b::test_ATM_2" classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_ATM_cxx_2c58b92b::test_fillUserRequest_5"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_ATM_cxx_2c58b92b::test_fillUserRequest_2"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_ATM_cxx_2c58b92b::test_viewAccount_6"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_ATM_cxx_2c58b92b::test_fillUserRequest_3"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_ATM_cxx_2c58b92b::test_fillUserRequest_9"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_ATM_cxx_2c58b92b::test_ATM_1" classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_ATM_cxx_2c58b92b::test_ATM_3" classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_ATM_cxx_2c58b92b::test_fillUserRequest_10"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_ATM_cxx_2c58b92b::test_fillUserRequest_1"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_ATM_cxx_2c58b92b::test_viewAccount_10"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_ATM_cxx_2c58b92b::test_fillUserRequest_6"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_Bank_cxx_9ae1ea36::test_getAccount_9"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_Bank_cxx_9ae1ea36::test_x7eBank_1"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_Bank_cxx_9ae1ea36::test_addAccount_1"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_Bank_cxx_9ae1ea36::test_Bank_1" classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_Bank_cxx_9ae1ea36::test_getAccount_2"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_Bank_cxx_9ae1ea36::test_getAccount_10"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_Bank_cxx_9ae1ea36::test_getAccount_6"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_Bank_cxx_9ae1ea36::test_getAccount_4"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_Bank_cxx_9ae1ea36::test_getAccount_7"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_Bank_cxx_9ae1ea36::test_getAccount_8"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_Bank_cxx_9ae1ea36::test_getAccount_1"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_Bank_cxx_9ae1ea36::test_getAccount_3"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_Bank_cxx_9ae1ea36::test_getAccount_5"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_BaseDisplay_cxx_90b94c01::test_showBalance_2"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_BaseDisplay_cxx_90b94c01::test_showBalance_5"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_BaseDisplay_cxx_90b94c01::test_showInfoToUser_2"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_BaseDisplay_cxx_90b94c01::test_showBalance_7"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_BaseDisplay_cxx_90b94c01::test_showBalance_3"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_BaseDisplay_cxx_90b94c01::test_showBalance_1"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_BaseDisplay_cxx_90b94c01::test_showInfoToUser_3"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_BaseDisplay_cxx_90b94c01::test_showBalance_4"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_BaseDisplay_cxx_90b94c01::test_showInfoToUser_1"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_BaseDisplay_cxx_90b94c01::test_showInfoToUser_4"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-    <testcase name="TestSuite_BaseDisplay_cxx_90b94c01::test_showBalance_6"
-              classname="ATMJUnitTestSuite"
-              time="0"/>
-</testsuite>