Bug 544839 - [etunit] added test case skip

Change-Id: I0d8d69d780c732fb7c12d2906c2da6346b58448d

5 files changed, 470 insertions, 195 deletions

diff --git a/plugins/org.eclipse.etrice.etunit.converter/model/etunit.ecore b/plugins/org.eclipse.etrice.etunit.converter/model/etunit.ecore
index 2107cb03f..6768e021e 100644
--- a/plugins/org.eclipse.etrice.etunit.converter/model/etunit.ecore
+++ b/plugins/org.eclipse.etrice.etunit.converter/model/etunit.ecore
@@ -1,12 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="Etunit"
-    nsURI="platform:/resource/org.eclipse.etrice.etunit.converter/model/etunit.xsd"
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="Etunit" nsURI="http://www.eclipse.org/etrice/etunit/converter/etunit"
     nsPrefix="Etunit">
-  <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-    <details key="documentation" value="etUnit test result schema.&#xA;    "/>
-  </eAnnotations>
   <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
     <details key="qualified" value="false"/>
   </eAnnotations>
@@ -38,8 +33,80 @@
         <details key="name" value="xsi:schemaLocation"/>
       </eAnnotations>
     </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="error" upperBound="-2"
+        eType="#//ErrorType" volatile="true" transient="true" derived="true" containment="true"
+        resolveProxies="false">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="element"/>
+        <details key="name" value="error"/>
+        <details key="namespace" value="##targetNamespace"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="failure" upperBound="-2"
+        eType="#//FailureType" volatile="true" transient="true" derived="true" containment="true"
+        resolveProxies="false">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="element"/>
+        <details key="name" value="failure"/>
+        <details key="namespace" value="##targetNamespace"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="properties" upperBound="-2"
+        eType="#//PropertiesType" volatile="true" transient="true" derived="true"
+        containment="true" resolveProxies="false">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="element"/>
+        <details key="name" value="properties"/>
+        <details key="namespace" value="##targetNamespace"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="property" upperBound="-2"
+        eType="#//PropertyType" volatile="true" transient="true" derived="true" containment="true"
+        resolveProxies="false">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="element"/>
+        <details key="name" value="property"/>
+        <details key="namespace" value="##targetNamespace"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="skipped" upperBound="-2"
+        eType="#//SkippedType" volatile="true" transient="true" derived="true" containment="true"
+        resolveProxies="false">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="element"/>
+        <details key="name" value="skipped"/>
+        <details key="namespace" value="##targetNamespace"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="systemErr" unique="false"
+        upperBound="-2" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"
+        volatile="true" transient="true" derived="true">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="element"/>
+        <details key="name" value="system-err"/>
+        <details key="namespace" value="##targetNamespace"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="systemOut" unique="false"
+        upperBound="-2" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"
+        volatile="true" transient="true" derived="true">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="element"/>
+        <details key="name" value="system-out"/>
+        <details key="namespace" value="##targetNamespace"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="testcase" upperBound="-2"
+        eType="#//TestcaseType" volatile="true" transient="true" derived="true" containment="true"
+        resolveProxies="false">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="element"/>
+        <details key="name" value="testcase"/>
+        <details key="namespace" value="##targetNamespace"/>
+      </eAnnotations>
+    </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EReference" name="testsuite" upperBound="-2"
-        eType="#//Testsuite" volatile="true" transient="true" derived="true" containment="true"
+        eType="#//TestsuiteType" volatile="true" transient="true" derived="true" containment="true"
         resolveProxies="false">
       <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
         <details key="kind" value="element"/>
@@ -69,21 +136,17 @@
         <details key="name" value=":mixed"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="expected" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String" volatile="true"
-        transient="true" derived="true">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="message" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
       <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="expected"/>
+        <details key="kind" value="attribute"/>
+        <details key="name" value="message"/>
         <details key="namespace" value="##targetNamespace"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="actual" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String" volatile="true"
-        transient="true" derived="true">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
       <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="actual"/>
+        <details key="kind" value="attribute"/>
+        <details key="name" value="type"/>
         <details key="namespace" value="##targetNamespace"/>
       </eAnnotations>
     </eStructuralFeatures>
@@ -100,83 +163,149 @@
         <details key="name" value=":mixed"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="expected" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String" volatile="true"
-        transient="true" derived="true">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="message" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
       <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="expected"/>
+        <details key="kind" value="attribute"/>
+        <details key="name" value="message"/>
         <details key="namespace" value="##targetNamespace"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="actual" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String" volatile="true"
-        transient="true" derived="true">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
       <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="actual"/>
+        <details key="kind" value="attribute"/>
+        <details key="name" value="type"/>
         <details key="namespace" value="##targetNamespace"/>
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="ISO8601DATETIMEPATTERN" instanceClassName="javax.xml.datatype.XMLGregorianCalendar">
+  <eClassifiers xsi:type="ecore:EClass" name="PropertiesType">
     <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="ISO8601_DATETIME_PATTERN"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#dateTime"/>
-      <details key="pattern" value="[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}"/>
+      <details key="name" value="properties_._type"/>
+      <details key="kind" value="elementOnly"/>
     </eAnnotations>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="property" lowerBound="1"
+        upperBound="-1" eType="#//PropertyType" containment="true" resolveProxies="false">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="element"/>
+        <details key="name" value="property"/>
+        <details key="namespace" value="##targetNamespace"/>
+      </eAnnotations>
+    </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="NameType" instanceClassName="java.lang.String">
+  <eClassifiers xsi:type="ecore:EClass" name="PropertyType">
     <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="name_._type"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#token"/>
-      <details key="minLength" value="1"/>
+      <details key="name" value="property_._type"/>
+      <details key="kind" value="empty"/>
     </eAnnotations>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="attribute"/>
+        <details key="name" value="name"/>
+        <details key="namespace" value="##targetNamespace"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="attribute"/>
+        <details key="name" value="value"/>
+        <details key="namespace" value="##targetNamespace"/>
+      </eAnnotations>
+    </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="PreString" instanceClassName="java.lang.String">
+  <eClassifiers xsi:type="ecore:EClass" name="SkippedType">
     <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="pre-string"/>
-      <details key="baseType" value="http://www.eclipse.org/emf/2003/XMLType#string"/>
-      <details key="whiteSpace" value="preserve"/>
+      <details key="name" value="skipped_._type"/>
+      <details key="kind" value="mixed"/>
     </eAnnotations>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="mixed" unique="false" upperBound="-1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFeatureMapEntry">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="elementWildcard"/>
+        <details key="name" value=":mixed"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="message" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="attribute"/>
+        <details key="name" value="message"/>
+        <details key="namespace" value="##targetNamespace"/>
+      </eAnnotations>
+    </eStructuralFeatures>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="TestcaseType">
     <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
       <details key="name" value="testcase_._type"/>
       <details key="kind" value="elementOnly"/>
     </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="error" eType="#//ErrorType"
+    <eStructuralFeatures xsi:type="ecore:EReference" name="skipped" eType="#//SkippedType"
         containment="true" resolveProxies="false">
       <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
         <details key="kind" value="element"/>
+        <details key="name" value="skipped"/>
+        <details key="namespace" value="##targetNamespace"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="error" upperBound="-1"
+        eType="#//ErrorType" containment="true" resolveProxies="false">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="element"/>
         <details key="name" value="error"/>
         <details key="namespace" value="##targetNamespace"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="failure" eType="#//FailureType"
-        containment="true" resolveProxies="false">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="failure" upperBound="-1"
+        eType="#//FailureType" containment="true" resolveProxies="false">
       <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
         <details key="kind" value="element"/>
         <details key="name" value="failure"/>
         <details key="namespace" value="##targetNamespace"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="classname" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Token">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="systemOut" unique="false"
+        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="element"/>
+        <details key="name" value="system-out"/>
+        <details key="namespace" value="##targetNamespace"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="systemErr" unique="false"
+        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="element"/>
+        <details key="name" value="system-err"/>
+        <details key="namespace" value="##targetNamespace"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="assertions" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="attribute"/>
+        <details key="name" value="assertions"/>
+        <details key="namespace" value="##targetNamespace"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="classname" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
       <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
         <details key="kind" value="attribute"/>
         <details key="name" value="classname"/>
         <details key="namespace" value="##targetNamespace"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Token">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
       <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
         <details key="kind" value="attribute"/>
         <details key="name" value="name"/>
         <details key="namespace" value="##targetNamespace"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="time" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Decimal">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="status" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="attribute"/>
+        <details key="name" value="status"/>
+        <details key="namespace" value="##targetNamespace"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="time" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
       <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
         <details key="kind" value="attribute"/>
         <details key="name" value="time"/>
@@ -184,11 +313,75 @@
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Testsuite">
+  <eClassifiers xsi:type="ecore:EClass" name="TestsuitesType">
     <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="testsuite"/>
+      <details key="name" value="testsuites_._type"/>
+      <details key="kind" value="elementOnly"/>
+    </eAnnotations>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="testsuite" upperBound="-1"
+        eType="#//TestsuiteType" containment="true" resolveProxies="false">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="element"/>
+        <details key="name" value="testsuite"/>
+        <details key="namespace" value="##targetNamespace"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="disabled" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="attribute"/>
+        <details key="name" value="disabled"/>
+        <details key="namespace" value="##targetNamespace"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="errors" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="attribute"/>
+        <details key="name" value="errors"/>
+        <details key="namespace" value="##targetNamespace"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="failures" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="attribute"/>
+        <details key="name" value="failures"/>
+        <details key="namespace" value="##targetNamespace"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="attribute"/>
+        <details key="name" value="name"/>
+        <details key="namespace" value="##targetNamespace"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="tests" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="attribute"/>
+        <details key="name" value="tests"/>
+        <details key="namespace" value="##targetNamespace"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="time" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="attribute"/>
+        <details key="name" value="time"/>
+        <details key="namespace" value="##targetNamespace"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="TestsuiteType">
+    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+      <details key="name" value="testsuite_._type"/>
       <details key="kind" value="elementOnly"/>
     </eAnnotations>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="properties" eType="#//PropertiesType"
+        containment="true" resolveProxies="false">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="element"/>
+        <details key="name" value="properties"/>
+        <details key="namespace" value="##targetNamespace"/>
+      </eAnnotations>
+    </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EReference" name="testcase" upperBound="-1"
         eType="#//TestcaseType" containment="true" resolveProxies="false">
       <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
@@ -197,79 +390,96 @@
         <details key="namespace" value="##targetNamespace"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="errors" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Int" unsettable="true">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="systemOut" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="element"/>
+        <details key="name" value="system-out"/>
+        <details key="namespace" value="##targetNamespace"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="systemErr" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="element"/>
+        <details key="name" value="system-err"/>
+        <details key="namespace" value="##targetNamespace"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="disabled" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="attribute"/>
+        <details key="name" value="disabled"/>
+        <details key="namespace" value="##targetNamespace"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="errors" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
       <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
         <details key="kind" value="attribute"/>
         <details key="name" value="errors"/>
         <details key="namespace" value="##targetNamespace"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="failures" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Int" unsettable="true">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="failures" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
       <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
         <details key="kind" value="attribute"/>
         <details key="name" value="failures"/>
         <details key="namespace" value="##targetNamespace"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="#//NameType">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="hostname" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="attribute"/>
+        <details key="name" value="hostname"/>
+        <details key="namespace" value="##targetNamespace"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="attribute"/>
+        <details key="name" value="id"/>
+        <details key="namespace" value="##targetNamespace"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
       <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
         <details key="kind" value="attribute"/>
         <details key="name" value="name"/>
         <details key="namespace" value="##targetNamespace"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="skipped" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Int"
-        unsettable="true">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="package" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
       <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
         <details key="kind" value="attribute"/>
-        <details key="name" value="skipped"/>
+        <details key="name" value="package"/>
         <details key="namespace" value="##targetNamespace"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="tests" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Int"
-        unsettable="true">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="skipped" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
       <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
         <details key="kind" value="attribute"/>
-        <details key="name" value="tests"/>
+        <details key="name" value="skipped"/>
         <details key="namespace" value="##targetNamespace"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="time" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Decimal">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="tests" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
       <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
         <details key="kind" value="attribute"/>
-        <details key="name" value="time"/>
+        <details key="name" value="tests"/>
         <details key="namespace" value="##targetNamespace"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="timestamp" lowerBound="1"
-        eType="#//ISO8601DATETIMEPATTERN">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="time" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
       <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
         <details key="kind" value="attribute"/>
-        <details key="name" value="timestamp"/>
+        <details key="name" value="time"/>
         <details key="namespace" value="##targetNamespace"/>
       </eAnnotations>
     </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="TestsuitesType">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="testsuites_._type"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="testsuite" upperBound="-1"
-        eType="#//TestsuiteType" containment="true" resolveProxies="false">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="timestamp" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
       <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="testsuite"/>
+        <details key="kind" value="attribute"/>
+        <details key="name" value="timestamp"/>
         <details key="namespace" value="##targetNamespace"/>
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="TestsuiteType" eSuperTypes="#//Testsuite">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="name" value="testsuite_._type"/>
-      <details key="kind" value="elementOnly"/>
-    </eAnnotations>
-  </eClassifiers>
 </ecore:EPackage>
diff --git a/plugins/org.eclipse.etrice.etunit.converter/model/etunit.genmodel b/plugins/org.eclipse.etrice.etunit.converter/model/etunit.genmodel
index 7a2ad0083..4c43b13fc 100644
--- a/plugins/org.eclipse.etrice.etunit.converter/model/etunit.genmodel
+++ b/plugins/org.eclipse.etrice.etunit.converter/model/etunit.genmodel
@@ -1,52 +1,85 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.etrice.etunit.converter/src"
-    modelPluginID="org.eclipse.etrice.etunit.converter" modelName="Etunit" importerID="org.eclipse.xsd.ecore.importer"
-    complianceLevel="6.0" copyrightFields="false">
-  <foreignModel>etunit.xsd</foreignModel>
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.etrice.etunit.converter/src" modelPluginID="org.eclipse.etrice.etunit.converter"
+    modelName="Etunit" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
+    importerID="org.eclipse.emf.importer.ecore" complianceLevel="8.0" copyrightFields="false"
+    operationReflection="true" importOrganizing="true">
+  <foreignModel>etunit.ecore</foreignModel>
   <genPackages prefix="Etunit" basePackage="org.eclipse.etrice.etunit.converter" resource="XML"
       disposableProviderFactory="true" ecorePackage="etunit.ecore#/">
-    <genDataTypes ecoreDataType="etunit.ecore#//ISO8601DATETIMEPATTERN"/>
-    <genDataTypes ecoreDataType="etunit.ecore#//NameType"/>
-    <genDataTypes ecoreDataType="etunit.ecore#//PreString"/>
     <genClasses ecoreClass="etunit.ecore#//DocumentRoot">
       <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EAttribute etunit.ecore#//DocumentRoot/mixed"/>
       <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference etunit.ecore#//DocumentRoot/xMLNSPrefixMap"/>
       <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference etunit.ecore#//DocumentRoot/xSISchemaLocation"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference etunit.ecore#//DocumentRoot/error"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference etunit.ecore#//DocumentRoot/failure"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference etunit.ecore#//DocumentRoot/properties"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference etunit.ecore#//DocumentRoot/property"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference etunit.ecore#//DocumentRoot/skipped"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute etunit.ecore#//DocumentRoot/systemErr"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute etunit.ecore#//DocumentRoot/systemOut"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference etunit.ecore#//DocumentRoot/testcase"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference etunit.ecore#//DocumentRoot/testsuite"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference etunit.ecore#//DocumentRoot/testsuites"/>
     </genClasses>
     <genClasses ecoreClass="etunit.ecore#//ErrorType">
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute etunit.ecore#//ErrorType/mixed"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute etunit.ecore#//ErrorType/expected"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute etunit.ecore#//ErrorType/actual"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute etunit.ecore#//ErrorType/message"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute etunit.ecore#//ErrorType/type"/>
     </genClasses>
     <genClasses ecoreClass="etunit.ecore#//FailureType">
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute etunit.ecore#//FailureType/mixed"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute etunit.ecore#//FailureType/expected"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute etunit.ecore#//FailureType/actual"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute etunit.ecore#//FailureType/message"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute etunit.ecore#//FailureType/type"/>
+    </genClasses>
+    <genClasses ecoreClass="etunit.ecore#//PropertiesType">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference etunit.ecore#//PropertiesType/property"/>
+    </genClasses>
+    <genClasses ecoreClass="etunit.ecore#//PropertyType">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute etunit.ecore#//PropertyType/name"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute etunit.ecore#//PropertyType/value"/>
+    </genClasses>
+    <genClasses ecoreClass="etunit.ecore#//SkippedType">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute etunit.ecore#//SkippedType/mixed"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute etunit.ecore#//SkippedType/message"/>
     </genClasses>
     <genClasses ecoreClass="etunit.ecore#//TestcaseType">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference etunit.ecore#//TestcaseType/skipped"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference etunit.ecore#//TestcaseType/error"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference etunit.ecore#//TestcaseType/failure"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute etunit.ecore#//TestcaseType/systemOut"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute etunit.ecore#//TestcaseType/systemErr"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute etunit.ecore#//TestcaseType/assertions"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute etunit.ecore#//TestcaseType/classname"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute etunit.ecore#//TestcaseType/name"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute etunit.ecore#//TestcaseType/status"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute etunit.ecore#//TestcaseType/time"/>
     </genClasses>
-    <genClasses ecoreClass="etunit.ecore#//Testsuite">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference etunit.ecore#//Testsuite/testcase"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute etunit.ecore#//Testsuite/errors"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute etunit.ecore#//Testsuite/failures"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute etunit.ecore#//Testsuite/name"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute etunit.ecore#//Testsuite/skipped"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute etunit.ecore#//Testsuite/tests"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute etunit.ecore#//Testsuite/time"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute etunit.ecore#//Testsuite/timestamp"/>
-    </genClasses>
     <genClasses ecoreClass="etunit.ecore#//TestsuitesType">
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference etunit.ecore#//TestsuitesType/testsuite"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute etunit.ecore#//TestsuitesType/disabled"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute etunit.ecore#//TestsuitesType/errors"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute etunit.ecore#//TestsuitesType/failures"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute etunit.ecore#//TestsuitesType/name"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute etunit.ecore#//TestsuitesType/tests"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute etunit.ecore#//TestsuitesType/time"/>
+    </genClasses>
+    <genClasses ecoreClass="etunit.ecore#//TestsuiteType">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference etunit.ecore#//TestsuiteType/properties"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference etunit.ecore#//TestsuiteType/testcase"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute etunit.ecore#//TestsuiteType/systemOut"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute etunit.ecore#//TestsuiteType/systemErr"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute etunit.ecore#//TestsuiteType/disabled"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute etunit.ecore#//TestsuiteType/errors"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute etunit.ecore#//TestsuiteType/failures"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute etunit.ecore#//TestsuiteType/hostname"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute etunit.ecore#//TestsuiteType/id"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute etunit.ecore#//TestsuiteType/name"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute etunit.ecore#//TestsuiteType/package"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute etunit.ecore#//TestsuiteType/skipped"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute etunit.ecore#//TestsuiteType/tests"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute etunit.ecore#//TestsuiteType/time"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute etunit.ecore#//TestsuiteType/timestamp"/>
     </genClasses>
-    <genClasses ecoreClass="etunit.ecore#//TestsuiteType"/>
   </genPackages>
 </genmodel:GenModel>
diff --git a/plugins/org.eclipse.etrice.etunit.converter/model/etunit.xsd b/plugins/org.eclipse.etrice.etunit.converter/model/etunit.xsd
deleted file mode 100644
index 813914cb4..000000000
--- a/plugins/org.eclipse.etrice.etunit.converter/model/etunit.xsd
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" attributeFormDefault="unqualified" elementFormDefault="qualified">
-  <xs:annotation>
-    <xs:documentation xml:lang="en">etUnit test result schema.
-    </xs:documentation>
-  </xs:annotation>
-  <xs:element name="testsuite" type="testsuite"/>
-  <xs:simpleType name="ISO8601_DATETIME_PATTERN">
-    <xs:restriction base="xs:dateTime">
-      <xs:pattern value="[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:element name="testsuites">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element maxOccurs="unbounded" minOccurs="0" name="testsuite">
-          <xs:complexType>
-            <xs:complexContent>
-              <xs:extension base="testsuite">
-              </xs:extension>
-            </xs:complexContent>
-          </xs:complexType>
-        </xs:element>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:complexType name="testsuite">
-    <xs:sequence>
-      <xs:element maxOccurs="unbounded" minOccurs="0" name="testcase">
-        <xs:complexType>
-          <xs:choice minOccurs="0">
-            <xs:element name="error">
-                <xs:complexType mixed="true">
-			        <xs:sequence>
-			            <xs:element name="expected" type="xs:string"/>
-			            <xs:element name="actual" type="xs:string"/>
-			        </xs:sequence>
-			     </xs:complexType> 
-            </xs:element>
-            <xs:element name="failure">
-                <xs:complexType mixed="true">
-			        <xs:sequence>
-			            <xs:element name="expected" type="xs:string"/>
-			            <xs:element name="actual" type="xs:string"/>
-			        </xs:sequence>
-			     </xs:complexType> 
-            </xs:element>
-          </xs:choice>
-          <xs:attribute name="name" type="xs:token" use="required">
-          </xs:attribute>
-          <xs:attribute name="classname" type="xs:token" use="required">
-          </xs:attribute>
-          <xs:attribute name="time" type="xs:decimal" use="required">
-          </xs:attribute>
-        </xs:complexType>
-      </xs:element>
-    </xs:sequence>
-    <xs:attribute name="name" use="required">
-      <xs:simpleType>
-        <xs:restriction base="xs:token">
-          <xs:minLength value="1"/>
-        </xs:restriction>
-      </xs:simpleType>
-    </xs:attribute>
-    <xs:attribute name="timestamp" type="ISO8601_DATETIME_PATTERN" use="required">
-    </xs:attribute>
-    <xs:attribute name="tests" type="xs:int" use="required">
-    </xs:attribute>
-    <xs:attribute name="failures" type="xs:int" use="required">
-    </xs:attribute>
-    <xs:attribute name="errors" type="xs:int" use="required">
-    </xs:attribute>
-    <xs:attribute name="skipped" type="xs:int">
-    </xs:attribute>
-    <xs:attribute name="time" type="xs:decimal" use="required">
-    </xs:attribute>
-  </xs:complexType>
-  <xs:simpleType name="pre-string">
-    <xs:restriction base="xs:string">
-      <xs:whiteSpace value="preserve"/>
-    </xs:restriction>
-  </xs:simpleType>
-</xs:schema>
diff --git a/plugins/org.eclipse.etrice.etunit.converter/model/junit-4.xsd b/plugins/org.eclipse.etrice.etunit.converter/model/junit-4.xsd
new file mode 100644
index 000000000..89a94a39f
--- /dev/null
+++ b/plugins/org.eclipse.etrice.etunit.converter/model/junit-4.xsd
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Source: https://svn.jenkins-ci.org/trunk/hudson/dtkit/dtkit-format/dtkit-junit-model/src/main/resources/com/thalesgroup/dtkit/junit/model/xsd/junit-4.xsd
+ 
+ This file available under the terms of the MIT License as follows:
+ 
+ *******************************************************************************
+ * Copyright (c) 2010 Thales Corporate Services SAS                             *
+ *                                                                              *
+ * 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.                                                                *
+ ********************************************************************************
+ -->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:element name="failure">
+        <xs:complexType mixed="true">
+            <xs:attribute name="type" type="xs:string" use="optional"/>
+            <xs:attribute name="message" type="xs:string" use="optional"/>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:element name="error">
+        <xs:complexType mixed="true">
+            <xs:attribute name="type" type="xs:string" use="optional"/>
+            <xs:attribute name="message" type="xs:string" use="optional"/>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:element name="properties">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element ref="property" maxOccurs="unbounded"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:element name="property">
+        <xs:complexType>
+            <xs:attribute name="name" type="xs:string" use="required"/>
+            <xs:attribute name="value" type="xs:string" use="required"/>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:element name="skipped">
+        <xs:complexType mixed="true">
+            <xs:attribute name="message" type="xs:string" use="optional"/>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:element name="system-err" type="xs:string"/>
+    <xs:element name="system-out" type="xs:string"/>
+
+    <xs:element name="testcase">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element ref="skipped" minOccurs="0" maxOccurs="1"/>
+                <xs:element ref="error" minOccurs="0" maxOccurs="unbounded"/>
+                <xs:element ref="failure" minOccurs="0" maxOccurs="unbounded"/>
+                <xs:element ref="system-out" minOccurs="0" maxOccurs="unbounded"/>
+                <xs:element ref="system-err" minOccurs="0" maxOccurs="unbounded"/>
+            </xs:sequence>
+            <xs:attribute name="name" type="xs:string" use="required"/>
+            <xs:attribute name="assertions" type="xs:string" use="optional"/>
+            <xs:attribute name="time" type="xs:string" use="optional"/>
+            <xs:attribute name="classname" type="xs:string" use="optional"/>
+            <xs:attribute name="status" type="xs:string" use="optional"/>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:element name="testsuite">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element ref="properties" minOccurs="0" maxOccurs="1"/>
+                <xs:element ref="testcase" minOccurs="0" maxOccurs="unbounded"/>
+                <xs:element ref="system-out" minOccurs="0" maxOccurs="1"/>
+                <xs:element ref="system-err" minOccurs="0" maxOccurs="1"/>
+            </xs:sequence>
+            <xs:attribute name="name" type="xs:string" use="required"/>
+            <xs:attribute name="tests" type="xs:string" use="required"/>
+            <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="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:complexType>
+    </xs:element>
+
+    <xs:element name="testsuites">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element ref="testsuite" minOccurs="0" maxOccurs="unbounded"/>
+            </xs:sequence>
+            <xs:attribute name="name" type="xs:string" use="optional"/>
+            <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>
+
+</xs:schema>
diff --git a/plugins/org.eclipse.etrice.etunit.converter/model/readme.md b/plugins/org.eclipse.etrice.etunit.converter/model/readme.md
deleted file mode 100644
index f7e6a7f18..000000000
--- a/plugins/org.eclipse.etrice.etunit.converter/model/readme.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# XML Schema for XUnit
-
-There seems to be a "more official" XML schema:
-[stackoverflow on Spec. for JUnit XML output](https://stackoverflow.com/questions/442556/spec-for-junit-xml-output)
-mentions
-[a github project for the JUnit schema used by Apache Ant](https://github.com/windyroad/JUnit-Schema).
-The [schema file](https://github.com/windyroad/JUnit-Schema/blob/master/JUnit.xsd) has Apache License Version 2.0.
\ No newline at end of file