diff options
| author | Juergen Haug | 2019-03-05 17:33:59 +0000 |
|---|---|---|
| committer | Juergen Haug | 2019-03-08 11:40:38 +0000 |
| commit | f0a2d5f112c244eb73c885e2e57120963d6749bc (patch) | |
| tree | 8225b9006b9bf591e6fbec1a1b82056bba7e3576 /plugins/org.eclipse.etrice.etunit.converter | |
| parent | 01e36600bef3e370720870d7bf5f51289227a810 (diff) | |
| download | org.eclipse.etrice-f0a2d5f112c244eb73c885e2e57120963d6749bc.tar.gz org.eclipse.etrice-f0a2d5f112c244eb73c885e2e57120963d6749bc.tar.xz org.eclipse.etrice-f0a2d5f112c244eb73c885e2e57120963d6749bc.zip | |
Bug 544839 - [etunit] added test case skip
Change-Id: I0d8d69d780c732fb7c12d2906c2da6346b58448d
Diffstat (limited to 'plugins/org.eclipse.etrice.etunit.converter')
38 files changed, 6542 insertions, 2488 deletions
diff --git a/plugins/org.eclipse.etrice.etunit.converter/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.etrice.etunit.converter/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 45d047df4..000000000 --- a/plugins/org.eclipse.etrice.etunit.converter/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Tue Apr 17 09:38:18 CEST 2012 -eclipse.preferences.version=1 -encoding//model/etunit.xsd=UTF8 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.
 "/> - </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 diff --git a/plugins/org.eclipse.etrice.etunit.converter/release/not_uptodate.txt b/plugins/org.eclipse.etrice.etunit.converter/release/not_uptodate.txt new file mode 100644 index 000000000..9baca962a --- /dev/null +++ b/plugins/org.eclipse.etrice.etunit.converter/release/not_uptodate.txt @@ -0,0 +1 @@ +this .jar is an older version
\ No newline at end of file diff --git a/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/EtUnitReportConverter.java b/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/EtUnitReportConverter.java index c31e4854e..c0b8d80e7 100644 --- a/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/EtUnitReportConverter.java +++ b/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/EtUnitReportConverter.java @@ -40,6 +40,7 @@ import org.eclipse.etrice.etunit.converter.Etunit.DocumentRoot; import org.eclipse.etrice.etunit.converter.Etunit.EtunitFactory; import org.eclipse.etrice.etunit.converter.Etunit.EtunitPackage; import org.eclipse.etrice.etunit.converter.Etunit.FailureType; +import org.eclipse.etrice.etunit.converter.Etunit.SkippedType; import org.eclipse.etrice.etunit.converter.Etunit.TestcaseType; import org.eclipse.etrice.etunit.converter.Etunit.TestsuiteType; import org.eclipse.etrice.etunit.converter.Etunit.TestsuitesType; @@ -223,6 +224,7 @@ public class EtUnitReportConverter { private static final String TC_END = "tc end"; private static final String TC_FAIL = "tc fail"; + private static final String TC_SKIP = "tc skip"; private static final String TC_START = "tc start"; private static final String TS_START = "ts start: "; public static final String ETU_EXTENSION = ".etu"; @@ -491,12 +493,12 @@ public class EtUnitReportConverter { FailureType fail = EtunitFactory.eINSTANCE.createFailureType(); pos = line.indexOf('#')+1; int end = line.indexOf('#', pos); - if (end>pos) - fail.setExpected(line.substring(pos, end)); + String expectedMsg = (end>pos) ? "expected=" + line.substring(pos, end) : ""; pos = end+1; end = line.indexOf('#', pos); - if (end>pos) - fail.setActual(line.substring(pos, end)); + String actualMsg = (end>pos) ? " actual=" + line.substring(pos, end) : ""; + if(!(expectedMsg+actualMsg).isEmpty()) + fail.setMessage(expectedMsg + actualMsg); pos = end+1; end = line.indexOf('#', pos); String loc = (end>pos)? line.substring(pos, end) : null; @@ -505,7 +507,7 @@ public class EtUnitReportConverter { if (loc!=null) trace += "\n at "+loc; FeatureMapUtil.addText(fail.getMixed(), trace); - tc.setFailure(fail); + tc.getFailure().add(fail); } else if (line.startsWith(TC_END)) { int pos = line.indexOf(':'); @@ -517,7 +519,21 @@ public class EtUnitReportConverter { return null; } // time was measured in ms. Convert to s - tc.setTime(BigDecimal.valueOf(time/1000.0)); + tc.setTime(BigDecimal.valueOf(time/1000.0).toString()); + } + else if (line.startsWith(TC_SKIP)) { + int pos = line.indexOf(':'); + int id = Integer.parseInt(line.substring(8, pos)); + TestcaseType tc = id2case.get(id); + if (tc==null) { + System.err.println("Error: in etUnit report line "+count+" - unknown test case id"); + return null; + } + SkippedType skip = EtunitFactory.eINSTANCE.createSkippedType(); + String msg = line.substring(pos+1).trim(); + if(!msg.isEmpty()) + skip.setMessage(msg); + tc.setSkipped(skip); } line = bufRead.readLine(); ++count; @@ -538,13 +554,12 @@ public class EtUnitReportConverter { BigDecimal time = new BigDecimal(0); for (TestcaseType tc : ts.getTestcase()) { if (tc.getTime()!=null) - time = time.add(tc.getTime()); - if (tc.getFailure()!=null) - ++failures; + time = time.add(new BigDecimal(tc.getTime())); + failures += tc.getFailure().size(); } - ts.setTests(ts.getTestcase().size()); - ts.setFailures(failures); - ts.setTime(time); + ts.setTests(Integer.toString(ts.getTestcase().size())); + ts.setFailures(Integer.toString(failures)); + ts.setTime(time.toString()); } } diff --git a/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/DocumentRoot.java b/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/DocumentRoot.java index bf98af692..e1072804f 100644 --- a/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/DocumentRoot.java +++ b/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/DocumentRoot.java @@ -1,8 +1,4 @@ /** - * <copyright> - * </copyright> - * - * $Id$ */ package org.eclipse.etrice.etunit.converter.Etunit; @@ -19,14 +15,22 @@ import org.eclipse.emf.ecore.util.FeatureMap; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.DocumentRoot#getMixed <em>Mixed</em>}</li> * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.DocumentRoot#getXMLNSPrefixMap <em>XMLNS Prefix Map</em>}</li> * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.DocumentRoot#getXSISchemaLocation <em>XSI Schema Location</em>}</li> + * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.DocumentRoot#getError <em>Error</em>}</li> + * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.DocumentRoot#getFailure <em>Failure</em>}</li> + * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.DocumentRoot#getProperties <em>Properties</em>}</li> + * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.DocumentRoot#getProperty <em>Property</em>}</li> + * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.DocumentRoot#getSkipped <em>Skipped</em>}</li> + * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.DocumentRoot#getSystemErr <em>System Err</em>}</li> + * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.DocumentRoot#getSystemOut <em>System Out</em>}</li> + * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.DocumentRoot#getTestcase <em>Testcase</em>}</li> * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.DocumentRoot#getTestsuite <em>Testsuite</em>}</li> * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.DocumentRoot#getTestsuites <em>Testsuites</em>}</li> * </ul> - * </p> * * @see org.eclipse.etrice.etunit.converter.Etunit.EtunitPackage#getDocumentRoot() * @model extendedMetaData="name='' kind='mixed'" @@ -62,7 +66,7 @@ public interface DocumentRoot extends EObject { * <!-- end-user-doc --> * @return the value of the '<em>XMLNS Prefix Map</em>' map. * @see org.eclipse.etrice.etunit.converter.Etunit.EtunitPackage#getDocumentRoot_XMLNSPrefixMap() - * @model mapType="org.eclipse.emf.ecore.EStringToStringMapEntry<org.eclipse.emf.ecore.EString, org.eclipse.emf.ecore.EString>" transient="true" + * @model mapType="org.eclipse.emf.ecore.EStringToStringMapEntry<org.eclipse.emf.ecore.EString, org.eclipse.emf.ecore.EString>" transient="true" * extendedMetaData="kind='attribute' name='xmlns:prefix'" * @generated */ @@ -80,13 +84,229 @@ public interface DocumentRoot extends EObject { * <!-- end-user-doc --> * @return the value of the '<em>XSI Schema Location</em>' map. * @see org.eclipse.etrice.etunit.converter.Etunit.EtunitPackage#getDocumentRoot_XSISchemaLocation() - * @model mapType="org.eclipse.emf.ecore.EStringToStringMapEntry<org.eclipse.emf.ecore.EString, org.eclipse.emf.ecore.EString>" transient="true" + * @model mapType="org.eclipse.emf.ecore.EStringToStringMapEntry<org.eclipse.emf.ecore.EString, org.eclipse.emf.ecore.EString>" transient="true" * extendedMetaData="kind='attribute' name='xsi:schemaLocation'" * @generated */ EMap<String, String> getXSISchemaLocation(); /** + * Returns the value of the '<em><b>Error</b></em>' containment reference. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Error</em>' containment reference isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Error</em>' containment reference. + * @see #setError(ErrorType) + * @see org.eclipse.etrice.etunit.converter.Etunit.EtunitPackage#getDocumentRoot_Error() + * @model containment="true" upper="-2" transient="true" volatile="true" derived="true" + * extendedMetaData="kind='element' name='error' namespace='##targetNamespace'" + * @generated + */ + ErrorType getError(); + + /** + * Sets the value of the '{@link org.eclipse.etrice.etunit.converter.Etunit.DocumentRoot#getError <em>Error</em>}' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Error</em>' containment reference. + * @see #getError() + * @generated + */ + void setError(ErrorType value); + + /** + * Returns the value of the '<em><b>Failure</b></em>' containment reference. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Failure</em>' containment reference isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Failure</em>' containment reference. + * @see #setFailure(FailureType) + * @see org.eclipse.etrice.etunit.converter.Etunit.EtunitPackage#getDocumentRoot_Failure() + * @model containment="true" upper="-2" transient="true" volatile="true" derived="true" + * extendedMetaData="kind='element' name='failure' namespace='##targetNamespace'" + * @generated + */ + FailureType getFailure(); + + /** + * Sets the value of the '{@link org.eclipse.etrice.etunit.converter.Etunit.DocumentRoot#getFailure <em>Failure</em>}' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Failure</em>' containment reference. + * @see #getFailure() + * @generated + */ + void setFailure(FailureType value); + + /** + * Returns the value of the '<em><b>Properties</b></em>' containment reference. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Properties</em>' containment reference isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Properties</em>' containment reference. + * @see #setProperties(PropertiesType) + * @see org.eclipse.etrice.etunit.converter.Etunit.EtunitPackage#getDocumentRoot_Properties() + * @model containment="true" upper="-2" transient="true" volatile="true" derived="true" + * extendedMetaData="kind='element' name='properties' namespace='##targetNamespace'" + * @generated + */ + PropertiesType getProperties(); + + /** + * Sets the value of the '{@link org.eclipse.etrice.etunit.converter.Etunit.DocumentRoot#getProperties <em>Properties</em>}' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Properties</em>' containment reference. + * @see #getProperties() + * @generated + */ + void setProperties(PropertiesType value); + + /** + * Returns the value of the '<em><b>Property</b></em>' containment reference. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Property</em>' containment reference isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Property</em>' containment reference. + * @see #setProperty(PropertyType) + * @see org.eclipse.etrice.etunit.converter.Etunit.EtunitPackage#getDocumentRoot_Property() + * @model containment="true" upper="-2" transient="true" volatile="true" derived="true" + * extendedMetaData="kind='element' name='property' namespace='##targetNamespace'" + * @generated + */ + PropertyType getProperty(); + + /** + * Sets the value of the '{@link org.eclipse.etrice.etunit.converter.Etunit.DocumentRoot#getProperty <em>Property</em>}' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Property</em>' containment reference. + * @see #getProperty() + * @generated + */ + void setProperty(PropertyType value); + + /** + * Returns the value of the '<em><b>Skipped</b></em>' containment reference. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Skipped</em>' containment reference isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Skipped</em>' containment reference. + * @see #setSkipped(SkippedType) + * @see org.eclipse.etrice.etunit.converter.Etunit.EtunitPackage#getDocumentRoot_Skipped() + * @model containment="true" upper="-2" transient="true" volatile="true" derived="true" + * extendedMetaData="kind='element' name='skipped' namespace='##targetNamespace'" + * @generated + */ + SkippedType getSkipped(); + + /** + * Sets the value of the '{@link org.eclipse.etrice.etunit.converter.Etunit.DocumentRoot#getSkipped <em>Skipped</em>}' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Skipped</em>' containment reference. + * @see #getSkipped() + * @generated + */ + void setSkipped(SkippedType value); + + /** + * Returns the value of the '<em><b>System Err</b></em>' attribute. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>System Err</em>' attribute isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>System Err</em>' attribute. + * @see #setSystemErr(String) + * @see org.eclipse.etrice.etunit.converter.Etunit.EtunitPackage#getDocumentRoot_SystemErr() + * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" upper="-2" transient="true" volatile="true" derived="true" + * extendedMetaData="kind='element' name='system-err' namespace='##targetNamespace'" + * @generated + */ + String getSystemErr(); + + /** + * Sets the value of the '{@link org.eclipse.etrice.etunit.converter.Etunit.DocumentRoot#getSystemErr <em>System Err</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>System Err</em>' attribute. + * @see #getSystemErr() + * @generated + */ + void setSystemErr(String value); + + /** + * Returns the value of the '<em><b>System Out</b></em>' attribute. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>System Out</em>' attribute isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>System Out</em>' attribute. + * @see #setSystemOut(String) + * @see org.eclipse.etrice.etunit.converter.Etunit.EtunitPackage#getDocumentRoot_SystemOut() + * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" upper="-2" transient="true" volatile="true" derived="true" + * extendedMetaData="kind='element' name='system-out' namespace='##targetNamespace'" + * @generated + */ + String getSystemOut(); + + /** + * Sets the value of the '{@link org.eclipse.etrice.etunit.converter.Etunit.DocumentRoot#getSystemOut <em>System Out</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>System Out</em>' attribute. + * @see #getSystemOut() + * @generated + */ + void setSystemOut(String value); + + /** + * Returns the value of the '<em><b>Testcase</b></em>' containment reference. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Testcase</em>' containment reference isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Testcase</em>' containment reference. + * @see #setTestcase(TestcaseType) + * @see org.eclipse.etrice.etunit.converter.Etunit.EtunitPackage#getDocumentRoot_Testcase() + * @model containment="true" upper="-2" transient="true" volatile="true" derived="true" + * extendedMetaData="kind='element' name='testcase' namespace='##targetNamespace'" + * @generated + */ + TestcaseType getTestcase(); + + /** + * Sets the value of the '{@link org.eclipse.etrice.etunit.converter.Etunit.DocumentRoot#getTestcase <em>Testcase</em>}' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Testcase</em>' containment reference. + * @see #getTestcase() + * @generated + */ + void setTestcase(TestcaseType value); + + /** * Returns the value of the '<em><b>Testsuite</b></em>' containment reference. * <!-- begin-user-doc --> * <p> @@ -95,13 +315,13 @@ public interface DocumentRoot extends EObject { * </p> * <!-- end-user-doc --> * @return the value of the '<em>Testsuite</em>' containment reference. - * @see #setTestsuite(Testsuite) + * @see #setTestsuite(TestsuiteType) * @see org.eclipse.etrice.etunit.converter.Etunit.EtunitPackage#getDocumentRoot_Testsuite() * @model containment="true" upper="-2" transient="true" volatile="true" derived="true" * extendedMetaData="kind='element' name='testsuite' namespace='##targetNamespace'" * @generated */ - Testsuite getTestsuite(); + TestsuiteType getTestsuite(); /** * Sets the value of the '{@link org.eclipse.etrice.etunit.converter.Etunit.DocumentRoot#getTestsuite <em>Testsuite</em>}' containment reference. @@ -111,11 +331,15 @@ public interface DocumentRoot extends EObject { * @see #getTestsuite() * @generated */ - void setTestsuite(Testsuite value); + void setTestsuite(TestsuiteType value); /** * Returns the value of the '<em><b>Testsuites</b></em>' containment reference. * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Testsuites</em>' containment reference isn't clear, + * there really should be more of a description here... + * </p> * <!-- end-user-doc --> * @return the value of the '<em>Testsuites</em>' containment reference. * @see #setTestsuites(TestsuitesType) diff --git a/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/ErrorType.java b/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/ErrorType.java index f0a43ad22..dcee516df 100644 --- a/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/ErrorType.java +++ b/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/ErrorType.java @@ -1,12 +1,9 @@ /** - * <copyright> - * </copyright> - * - * $Id$ */ package org.eclipse.etrice.etunit.converter.Etunit; import org.eclipse.emf.ecore.EObject; + import org.eclipse.emf.ecore.util.FeatureMap; /** @@ -16,12 +13,12 @@ import org.eclipse.emf.ecore.util.FeatureMap; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.ErrorType#getMixed <em>Mixed</em>}</li> - * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.ErrorType#getExpected <em>Expected</em>}</li> - * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.ErrorType#getActual <em>Actual</em>}</li> + * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.ErrorType#getMessage <em>Message</em>}</li> + * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.ErrorType#getType <em>Type</em>}</li> * </ul> - * </p> * * @see org.eclipse.etrice.etunit.converter.Etunit.EtunitPackage#getErrorType() * @model extendedMetaData="name='error_._type' kind='mixed'" @@ -46,57 +43,57 @@ public interface ErrorType extends EObject { FeatureMap getMixed(); /** - * Returns the value of the '<em><b>Expected</b></em>' attribute. + * Returns the value of the '<em><b>Message</b></em>' attribute. * <!-- begin-user-doc --> * <p> - * If the meaning of the '<em>Expected</em>' attribute isn't clear, + * If the meaning of the '<em>Message</em>' attribute isn't clear, * there really should be more of a description here... * </p> * <!-- end-user-doc --> - * @return the value of the '<em>Expected</em>' attribute. - * @see #setExpected(String) - * @see org.eclipse.etrice.etunit.converter.Etunit.EtunitPackage#getErrorType_Expected() - * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true" transient="true" volatile="true" derived="true" - * extendedMetaData="kind='element' name='expected' namespace='##targetNamespace'" + * @return the value of the '<em>Message</em>' attribute. + * @see #setMessage(String) + * @see org.eclipse.etrice.etunit.converter.Etunit.EtunitPackage#getErrorType_Message() + * @model dataType="org.eclipse.emf.ecore.xml.type.String" + * extendedMetaData="kind='attribute' name='message' namespace='##targetNamespace'" * @generated */ - String getExpected(); + String getMessage(); /** - * Sets the value of the '{@link org.eclipse.etrice.etunit.converter.Etunit.ErrorType#getExpected <em>Expected</em>}' attribute. + * Sets the value of the '{@link org.eclipse.etrice.etunit.converter.Etunit.ErrorType#getMessage <em>Message</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @param value the new value of the '<em>Expected</em>' attribute. - * @see #getExpected() + * @param value the new value of the '<em>Message</em>' attribute. + * @see #getMessage() * @generated */ - void setExpected(String value); + void setMessage(String value); /** - * Returns the value of the '<em><b>Actual</b></em>' attribute. + * Returns the value of the '<em><b>Type</b></em>' attribute. * <!-- begin-user-doc --> * <p> - * If the meaning of the '<em>Actual</em>' attribute isn't clear, + * If the meaning of the '<em>Type</em>' attribute isn't clear, * there really should be more of a description here... * </p> * <!-- end-user-doc --> - * @return the value of the '<em>Actual</em>' attribute. - * @see #setActual(String) - * @see org.eclipse.etrice.etunit.converter.Etunit.EtunitPackage#getErrorType_Actual() - * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true" transient="true" volatile="true" derived="true" - * extendedMetaData="kind='element' name='actual' namespace='##targetNamespace'" + * @return the value of the '<em>Type</em>' attribute. + * @see #setType(String) + * @see org.eclipse.etrice.etunit.converter.Etunit.EtunitPackage#getErrorType_Type() + * @model dataType="org.eclipse.emf.ecore.xml.type.String" + * extendedMetaData="kind='attribute' name='type' namespace='##targetNamespace'" * @generated */ - String getActual(); + String getType(); /** - * Sets the value of the '{@link org.eclipse.etrice.etunit.converter.Etunit.ErrorType#getActual <em>Actual</em>}' attribute. + * Sets the value of the '{@link org.eclipse.etrice.etunit.converter.Etunit.ErrorType#getType <em>Type</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @param value the new value of the '<em>Actual</em>' attribute. - * @see #getActual() + * @param value the new value of the '<em>Type</em>' attribute. + * @see #getType() * @generated */ - void setActual(String value); + void setType(String value); } // ErrorType diff --git a/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/EtunitFactory.java b/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/EtunitFactory.java index 245400135..efc037996 100644 --- a/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/EtunitFactory.java +++ b/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/EtunitFactory.java @@ -1,8 +1,4 @@ /** - * <copyright> - * </copyright> - * - * $Id$ */ package org.eclipse.etrice.etunit.converter.Etunit; @@ -53,22 +49,40 @@ public interface EtunitFactory extends EFactory { FailureType createFailureType(); /** - * Returns a new object of class '<em>Testcase Type</em>'. + * Returns a new object of class '<em>Properties Type</em>'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return a new object of class '<em>Testcase Type</em>'. + * @return a new object of class '<em>Properties Type</em>'. * @generated */ - TestcaseType createTestcaseType(); + PropertiesType createPropertiesType(); + + /** + * Returns a new object of class '<em>Property Type</em>'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return a new object of class '<em>Property Type</em>'. + * @generated + */ + PropertyType createPropertyType(); /** - * Returns a new object of class '<em>Testsuite</em>'. + * Returns a new object of class '<em>Skipped Type</em>'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return a new object of class '<em>Testsuite</em>'. + * @return a new object of class '<em>Skipped Type</em>'. * @generated */ - Testsuite createTestsuite(); + SkippedType createSkippedType(); + + /** + * Returns a new object of class '<em>Testcase Type</em>'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return a new object of class '<em>Testcase Type</em>'. + * @generated + */ + TestcaseType createTestcaseType(); /** * Returns a new object of class '<em>Testsuites Type</em>'. diff --git a/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/EtunitPackage.java b/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/EtunitPackage.java index aa123122f..07d909b71 100644 --- a/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/EtunitPackage.java +++ b/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/EtunitPackage.java @@ -1,14 +1,9 @@ /** - * <copyright> - * </copyright> - * - * $Id$ */ package org.eclipse.etrice.etunit.converter.Etunit; import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.EDataType; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.EReference; @@ -19,14 +14,11 @@ import org.eclipse.emf.ecore.EReference; * <ul> * <li>each class,</li> * <li>each feature of each class,</li> + * <li>each operation of each class,</li> * <li>each enum,</li> * <li>and each data type</li> * </ul> * <!-- end-user-doc --> - * <!-- begin-model-doc --> - * etUnit test result schema. - * - * <!-- end-model-doc --> * @see org.eclipse.etrice.etunit.converter.Etunit.EtunitFactory * @model kind="package" * extendedMetaData="qualified='false'" @@ -47,7 +39,7 @@ public interface EtunitPackage extends EPackage { * <!-- end-user-doc --> * @generated */ - String eNS_URI = "platform:/resource/org.eclipse.etrice.etunit.converter/model/etunit.xsd"; + String eNS_URI = "http://www.eclipse.org/etrice/etunit/converter/etunit"; /** * The package namespace name. @@ -103,13 +95,85 @@ public interface EtunitPackage extends EPackage { int DOCUMENT_ROOT__XSI_SCHEMA_LOCATION = 2; /** + * The feature id for the '<em><b>Error</b></em>' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int DOCUMENT_ROOT__ERROR = 3; + + /** + * The feature id for the '<em><b>Failure</b></em>' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int DOCUMENT_ROOT__FAILURE = 4; + + /** + * The feature id for the '<em><b>Properties</b></em>' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int DOCUMENT_ROOT__PROPERTIES = 5; + + /** + * The feature id for the '<em><b>Property</b></em>' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int DOCUMENT_ROOT__PROPERTY = 6; + + /** + * The feature id for the '<em><b>Skipped</b></em>' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int DOCUMENT_ROOT__SKIPPED = 7; + + /** + * The feature id for the '<em><b>System Err</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int DOCUMENT_ROOT__SYSTEM_ERR = 8; + + /** + * The feature id for the '<em><b>System Out</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int DOCUMENT_ROOT__SYSTEM_OUT = 9; + + /** + * The feature id for the '<em><b>Testcase</b></em>' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int DOCUMENT_ROOT__TESTCASE = 10; + + /** * The feature id for the '<em><b>Testsuite</b></em>' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int DOCUMENT_ROOT__TESTSUITE = 3; + int DOCUMENT_ROOT__TESTSUITE = 11; /** * The feature id for the '<em><b>Testsuites</b></em>' containment reference. @@ -118,7 +182,7 @@ public interface EtunitPackage extends EPackage { * @generated * @ordered */ - int DOCUMENT_ROOT__TESTSUITES = 4; + int DOCUMENT_ROOT__TESTSUITES = 12; /** * The number of structural features of the '<em>Document Root</em>' class. @@ -127,7 +191,16 @@ public interface EtunitPackage extends EPackage { * @generated * @ordered */ - int DOCUMENT_ROOT_FEATURE_COUNT = 5; + int DOCUMENT_ROOT_FEATURE_COUNT = 13; + + /** + * The number of operations of the '<em>Document Root</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int DOCUMENT_ROOT_OPERATION_COUNT = 0; /** * The meta object id for the '{@link org.eclipse.etrice.etunit.converter.Etunit.impl.ErrorTypeImpl <em>Error Type</em>}' class. @@ -149,22 +222,22 @@ public interface EtunitPackage extends EPackage { int ERROR_TYPE__MIXED = 0; /** - * The feature id for the '<em><b>Expected</b></em>' attribute. + * The feature id for the '<em><b>Message</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int ERROR_TYPE__EXPECTED = 1; + int ERROR_TYPE__MESSAGE = 1; /** - * The feature id for the '<em><b>Actual</b></em>' attribute. + * The feature id for the '<em><b>Type</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int ERROR_TYPE__ACTUAL = 2; + int ERROR_TYPE__TYPE = 2; /** * The number of structural features of the '<em>Error Type</em>' class. @@ -176,6 +249,15 @@ public interface EtunitPackage extends EPackage { int ERROR_TYPE_FEATURE_COUNT = 3; /** + * The number of operations of the '<em>Error Type</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int ERROR_TYPE_OPERATION_COUNT = 0; + + /** * The meta object id for the '{@link org.eclipse.etrice.etunit.converter.Etunit.impl.FailureTypeImpl <em>Failure Type</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -195,22 +277,22 @@ public interface EtunitPackage extends EPackage { int FAILURE_TYPE__MIXED = 0; /** - * The feature id for the '<em><b>Expected</b></em>' attribute. + * The feature id for the '<em><b>Message</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int FAILURE_TYPE__EXPECTED = 1; + int FAILURE_TYPE__MESSAGE = 1; /** - * The feature id for the '<em><b>Actual</b></em>' attribute. + * The feature id for the '<em><b>Type</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int FAILURE_TYPE__ACTUAL = 2; + int FAILURE_TYPE__TYPE = 2; /** * The number of structural features of the '<em>Failure Type</em>' class. @@ -222,41 +304,60 @@ public interface EtunitPackage extends EPackage { int FAILURE_TYPE_FEATURE_COUNT = 3; /** - * The meta object id for the '{@link org.eclipse.etrice.etunit.converter.Etunit.impl.TestcaseTypeImpl <em>Testcase Type</em>}' class. + * The number of operations of the '<em>Failure Type</em>' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.etrice.etunit.converter.Etunit.impl.TestcaseTypeImpl - * @see org.eclipse.etrice.etunit.converter.Etunit.impl.EtunitPackageImpl#getTestcaseType() * @generated + * @ordered */ - int TESTCASE_TYPE = 3; + int FAILURE_TYPE_OPERATION_COUNT = 0; /** - * The feature id for the '<em><b>Error</b></em>' containment reference. + * The meta object id for the '{@link org.eclipse.etrice.etunit.converter.Etunit.impl.PropertiesTypeImpl <em>Properties Type</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.etrice.etunit.converter.Etunit.impl.PropertiesTypeImpl + * @see org.eclipse.etrice.etunit.converter.Etunit.impl.EtunitPackageImpl#getPropertiesType() + * @generated + */ + int PROPERTIES_TYPE = 3; + + /** + * The feature id for the '<em><b>Property</b></em>' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int TESTCASE_TYPE__ERROR = 0; + int PROPERTIES_TYPE__PROPERTY = 0; /** - * The feature id for the '<em><b>Failure</b></em>' containment reference. + * The number of structural features of the '<em>Properties Type</em>' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int TESTCASE_TYPE__FAILURE = 1; + int PROPERTIES_TYPE_FEATURE_COUNT = 1; /** - * The feature id for the '<em><b>Classname</b></em>' attribute. + * The number of operations of the '<em>Properties Type</em>' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int TESTCASE_TYPE__CLASSNAME = 2; + int PROPERTIES_TYPE_OPERATION_COUNT = 0; + + /** + * The meta object id for the '{@link org.eclipse.etrice.etunit.converter.Etunit.impl.PropertyTypeImpl <em>Property Type</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.etrice.etunit.converter.Etunit.impl.PropertyTypeImpl + * @see org.eclipse.etrice.etunit.converter.Etunit.impl.EtunitPackageImpl#getPropertyType() + * @generated + */ + int PROPERTY_TYPE = 4; /** * The feature id for the '<em><b>Name</b></em>' attribute. @@ -265,89 +366,171 @@ public interface EtunitPackage extends EPackage { * @generated * @ordered */ - int TESTCASE_TYPE__NAME = 3; + int PROPERTY_TYPE__NAME = 0; /** - * The feature id for the '<em><b>Time</b></em>' attribute. + * The feature id for the '<em><b>Value</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int TESTCASE_TYPE__TIME = 4; + int PROPERTY_TYPE__VALUE = 1; /** - * The number of structural features of the '<em>Testcase Type</em>' class. + * The number of structural features of the '<em>Property Type</em>' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int TESTCASE_TYPE_FEATURE_COUNT = 5; + int PROPERTY_TYPE_FEATURE_COUNT = 2; /** - * The meta object id for the '{@link org.eclipse.etrice.etunit.converter.Etunit.impl.TestsuiteImpl <em>Testsuite</em>}' class. + * The number of operations of the '<em>Property Type</em>' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.etrice.etunit.converter.Etunit.impl.TestsuiteImpl - * @see org.eclipse.etrice.etunit.converter.Etunit.impl.EtunitPackageImpl#getTestsuite() * @generated + * @ordered */ - int TESTSUITE = 4; + int PROPERTY_TYPE_OPERATION_COUNT = 0; /** - * The feature id for the '<em><b>Testcase</b></em>' containment reference list. + * The meta object id for the '{@link org.eclipse.etrice.etunit.converter.Etunit.impl.SkippedTypeImpl <em>Skipped Type</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.etrice.etunit.converter.Etunit.impl.SkippedTypeImpl + * @see org.eclipse.etrice.etunit.converter.Etunit.impl.EtunitPackageImpl#getSkippedType() + * @generated + */ + int SKIPPED_TYPE = 5; + + /** + * The feature id for the '<em><b>Mixed</b></em>' attribute list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int TESTSUITE__TESTCASE = 0; + int SKIPPED_TYPE__MIXED = 0; /** - * The feature id for the '<em><b>Errors</b></em>' attribute. + * The feature id for the '<em><b>Message</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int TESTSUITE__ERRORS = 1; + int SKIPPED_TYPE__MESSAGE = 1; /** - * The feature id for the '<em><b>Failures</b></em>' attribute. + * The number of structural features of the '<em>Skipped Type</em>' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int TESTSUITE__FAILURES = 2; + int SKIPPED_TYPE_FEATURE_COUNT = 2; /** - * The feature id for the '<em><b>Name</b></em>' attribute. + * The number of operations of the '<em>Skipped Type</em>' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int TESTSUITE__NAME = 3; + int SKIPPED_TYPE_OPERATION_COUNT = 0; /** - * The feature id for the '<em><b>Skipped</b></em>' attribute. + * The meta object id for the '{@link org.eclipse.etrice.etunit.converter.Etunit.impl.TestcaseTypeImpl <em>Testcase Type</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.etrice.etunit.converter.Etunit.impl.TestcaseTypeImpl + * @see org.eclipse.etrice.etunit.converter.Etunit.impl.EtunitPackageImpl#getTestcaseType() + * @generated + */ + int TESTCASE_TYPE = 6; + + /** + * The feature id for the '<em><b>Skipped</b></em>' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int TESTSUITE__SKIPPED = 4; + int TESTCASE_TYPE__SKIPPED = 0; /** - * The feature id for the '<em><b>Tests</b></em>' attribute. + * The feature id for the '<em><b>Error</b></em>' containment reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int TESTCASE_TYPE__ERROR = 1; + + /** + * The feature id for the '<em><b>Failure</b></em>' containment reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int TESTCASE_TYPE__FAILURE = 2; + + /** + * The feature id for the '<em><b>System Out</b></em>' attribute list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int TESTCASE_TYPE__SYSTEM_OUT = 3; + + /** + * The feature id for the '<em><b>System Err</b></em>' attribute list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int TESTCASE_TYPE__SYSTEM_ERR = 4; + + /** + * The feature id for the '<em><b>Assertions</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int TESTCASE_TYPE__ASSERTIONS = 5; + + /** + * The feature id for the '<em><b>Classname</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int TESTCASE_TYPE__CLASSNAME = 6; + + /** + * The feature id for the '<em><b>Name</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int TESTCASE_TYPE__NAME = 7; + + /** + * The feature id for the '<em><b>Status</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int TESTSUITE__TESTS = 5; + int TESTCASE_TYPE__STATUS = 8; /** * The feature id for the '<em><b>Time</b></em>' attribute. @@ -356,25 +539,25 @@ public interface EtunitPackage extends EPackage { * @generated * @ordered */ - int TESTSUITE__TIME = 6; + int TESTCASE_TYPE__TIME = 9; /** - * The feature id for the '<em><b>Timestamp</b></em>' attribute. + * The number of structural features of the '<em>Testcase Type</em>' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int TESTSUITE__TIMESTAMP = 7; + int TESTCASE_TYPE_FEATURE_COUNT = 10; /** - * The number of structural features of the '<em>Testsuite</em>' class. + * The number of operations of the '<em>Testcase Type</em>' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int TESTSUITE_FEATURE_COUNT = 8; + int TESTCASE_TYPE_OPERATION_COUNT = 0; /** * The meta object id for the '{@link org.eclipse.etrice.etunit.converter.Etunit.impl.TestsuitesTypeImpl <em>Testsuites Type</em>}' class. @@ -384,7 +567,7 @@ public interface EtunitPackage extends EPackage { * @see org.eclipse.etrice.etunit.converter.Etunit.impl.EtunitPackageImpl#getTestsuitesType() * @generated */ - int TESTSUITES_TYPE = 5; + int TESTSUITES_TYPE = 7; /** * The feature id for the '<em><b>Testsuite</b></em>' containment reference list. @@ -396,13 +579,76 @@ public interface EtunitPackage extends EPackage { int TESTSUITES_TYPE__TESTSUITE = 0; /** + * The feature id for the '<em><b>Disabled</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int TESTSUITES_TYPE__DISABLED = 1; + + /** + * The feature id for the '<em><b>Errors</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int TESTSUITES_TYPE__ERRORS = 2; + + /** + * The feature id for the '<em><b>Failures</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int TESTSUITES_TYPE__FAILURES = 3; + + /** + * The feature id for the '<em><b>Name</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int TESTSUITES_TYPE__NAME = 4; + + /** + * The feature id for the '<em><b>Tests</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int TESTSUITES_TYPE__TESTS = 5; + + /** + * The feature id for the '<em><b>Time</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int TESTSUITES_TYPE__TIME = 6; + + /** * The number of structural features of the '<em>Testsuites Type</em>' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int TESTSUITES_TYPE_FEATURE_COUNT = 1; + int TESTSUITES_TYPE_FEATURE_COUNT = 7; + + /** + * The number of operations of the '<em>Testsuites Type</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int TESTSUITES_TYPE_OPERATION_COUNT = 0; /** * The meta object id for the '{@link org.eclipse.etrice.etunit.converter.Etunit.impl.TestsuiteTypeImpl <em>Testsuite Type</em>}' class. @@ -412,7 +658,16 @@ public interface EtunitPackage extends EPackage { * @see org.eclipse.etrice.etunit.converter.Etunit.impl.EtunitPackageImpl#getTestsuiteType() * @generated */ - int TESTSUITE_TYPE = 6; + int TESTSUITE_TYPE = 8; + + /** + * The feature id for the '<em><b>Properties</b></em>' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int TESTSUITE_TYPE__PROPERTIES = 0; /** * The feature id for the '<em><b>Testcase</b></em>' containment reference list. @@ -421,7 +676,34 @@ public interface EtunitPackage extends EPackage { * @generated * @ordered */ - int TESTSUITE_TYPE__TESTCASE = TESTSUITE__TESTCASE; + int TESTSUITE_TYPE__TESTCASE = 1; + + /** + * The feature id for the '<em><b>System Out</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int TESTSUITE_TYPE__SYSTEM_OUT = 2; + + /** + * The feature id for the '<em><b>System Err</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int TESTSUITE_TYPE__SYSTEM_ERR = 3; + + /** + * The feature id for the '<em><b>Disabled</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int TESTSUITE_TYPE__DISABLED = 4; /** * The feature id for the '<em><b>Errors</b></em>' attribute. @@ -430,7 +712,7 @@ public interface EtunitPackage extends EPackage { * @generated * @ordered */ - int TESTSUITE_TYPE__ERRORS = TESTSUITE__ERRORS; + int TESTSUITE_TYPE__ERRORS = 5; /** * The feature id for the '<em><b>Failures</b></em>' attribute. @@ -439,91 +721,97 @@ public interface EtunitPackage extends EPackage { * @generated * @ordered */ - int TESTSUITE_TYPE__FAILURES = TESTSUITE__FAILURES; + int TESTSUITE_TYPE__FAILURES = 6; /** - * The feature id for the '<em><b>Name</b></em>' attribute. + * The feature id for the '<em><b>Hostname</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int TESTSUITE_TYPE__NAME = TESTSUITE__NAME; + int TESTSUITE_TYPE__HOSTNAME = 7; /** - * The feature id for the '<em><b>Skipped</b></em>' attribute. + * The feature id for the '<em><b>Id</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int TESTSUITE_TYPE__SKIPPED = TESTSUITE__SKIPPED; + int TESTSUITE_TYPE__ID = 8; /** - * The feature id for the '<em><b>Tests</b></em>' attribute. + * The feature id for the '<em><b>Name</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int TESTSUITE_TYPE__TESTS = TESTSUITE__TESTS; + int TESTSUITE_TYPE__NAME = 9; /** - * The feature id for the '<em><b>Time</b></em>' attribute. + * The feature id for the '<em><b>Package</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int TESTSUITE_TYPE__TIME = TESTSUITE__TIME; + int TESTSUITE_TYPE__PACKAGE = 10; /** - * The feature id for the '<em><b>Timestamp</b></em>' attribute. + * The feature id for the '<em><b>Skipped</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int TESTSUITE_TYPE__TIMESTAMP = TESTSUITE__TIMESTAMP; + int TESTSUITE_TYPE__SKIPPED = 11; /** - * The number of structural features of the '<em>Testsuite Type</em>' class. + * The feature id for the '<em><b>Tests</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int TESTSUITE_TYPE_FEATURE_COUNT = TESTSUITE_FEATURE_COUNT + 0; + int TESTSUITE_TYPE__TESTS = 12; /** - * The meta object id for the '<em>ISO8601DATETIMEPATTERN</em>' data type. + * The feature id for the '<em><b>Time</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see javax.xml.datatype.XMLGregorianCalendar - * @see org.eclipse.etrice.etunit.converter.Etunit.impl.EtunitPackageImpl#getISO8601DATETIMEPATTERN() * @generated + * @ordered */ - int ISO8601DATETIMEPATTERN = 7; + int TESTSUITE_TYPE__TIME = 13; /** - * The meta object id for the '<em>Name Type</em>' data type. + * The feature id for the '<em><b>Timestamp</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see java.lang.String - * @see org.eclipse.etrice.etunit.converter.Etunit.impl.EtunitPackageImpl#getNameType() * @generated + * @ordered */ - int NAME_TYPE = 8; + int TESTSUITE_TYPE__TIMESTAMP = 14; /** - * The meta object id for the '<em>Pre String</em>' data type. + * The number of structural features of the '<em>Testsuite Type</em>' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see java.lang.String - * @see org.eclipse.etrice.etunit.converter.Etunit.impl.EtunitPackageImpl#getPreString() * @generated + * @ordered */ - int PRE_STRING = 9; + int TESTSUITE_TYPE_FEATURE_COUNT = 15; + + /** + * The number of operations of the '<em>Testsuite Type</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int TESTSUITE_TYPE_OPERATION_COUNT = 0; /** @@ -570,6 +858,94 @@ public interface EtunitPackage extends EPackage { EReference getDocumentRoot_XSISchemaLocation(); /** + * Returns the meta object for the containment reference '{@link org.eclipse.etrice.etunit.converter.Etunit.DocumentRoot#getError <em>Error</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the containment reference '<em>Error</em>'. + * @see org.eclipse.etrice.etunit.converter.Etunit.DocumentRoot#getError() + * @see #getDocumentRoot() + * @generated + */ + EReference getDocumentRoot_Error(); + + /** + * Returns the meta object for the containment reference '{@link org.eclipse.etrice.etunit.converter.Etunit.DocumentRoot#getFailure <em>Failure</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the containment reference '<em>Failure</em>'. + * @see org.eclipse.etrice.etunit.converter.Etunit.DocumentRoot#getFailure() + * @see #getDocumentRoot() + * @generated + */ + EReference getDocumentRoot_Failure(); + + /** + * Returns the meta object for the containment reference '{@link org.eclipse.etrice.etunit.converter.Etunit.DocumentRoot#getProperties <em>Properties</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the containment reference '<em>Properties</em>'. + * @see org.eclipse.etrice.etunit.converter.Etunit.DocumentRoot#getProperties() + * @see #getDocumentRoot() + * @generated + */ + EReference getDocumentRoot_Properties(); + + /** + * Returns the meta object for the containment reference '{@link org.eclipse.etrice.etunit.converter.Etunit.DocumentRoot#getProperty <em>Property</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the containment reference '<em>Property</em>'. + * @see org.eclipse.etrice.etunit.converter.Etunit.DocumentRoot#getProperty() + * @see #getDocumentRoot() + * @generated + */ + EReference getDocumentRoot_Property(); + + /** + * Returns the meta object for the containment reference '{@link org.eclipse.etrice.etunit.converter.Etunit.DocumentRoot#getSkipped <em>Skipped</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the containment reference '<em>Skipped</em>'. + * @see org.eclipse.etrice.etunit.converter.Etunit.DocumentRoot#getSkipped() + * @see #getDocumentRoot() + * @generated + */ + EReference getDocumentRoot_Skipped(); + + /** + * Returns the meta object for the attribute '{@link org.eclipse.etrice.etunit.converter.Etunit.DocumentRoot#getSystemErr <em>System Err</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the attribute '<em>System Err</em>'. + * @see org.eclipse.etrice.etunit.converter.Etunit.DocumentRoot#getSystemErr() + * @see #getDocumentRoot() + * @generated + */ + EAttribute getDocumentRoot_SystemErr(); + + /** + * Returns the meta object for the attribute '{@link org.eclipse.etrice.etunit.converter.Etunit.DocumentRoot#getSystemOut <em>System Out</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the attribute '<em>System Out</em>'. + * @see org.eclipse.etrice.etunit.converter.Etunit.DocumentRoot#getSystemOut() + * @see #getDocumentRoot() + * @generated + */ + EAttribute getDocumentRoot_SystemOut(); + + /** + * Returns the meta object for the containment reference '{@link org.eclipse.etrice.etunit.converter.Etunit.DocumentRoot#getTestcase <em>Testcase</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the containment reference '<em>Testcase</em>'. + * @see org.eclipse.etrice.etunit.converter.Etunit.DocumentRoot#getTestcase() + * @see #getDocumentRoot() + * @generated + */ + EReference getDocumentRoot_Testcase(); + + /** * Returns the meta object for the containment reference '{@link org.eclipse.etrice.etunit.converter.Etunit.DocumentRoot#getTestsuite <em>Testsuite</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -613,26 +989,26 @@ public interface EtunitPackage extends EPackage { EAttribute getErrorType_Mixed(); /** - * Returns the meta object for the attribute '{@link org.eclipse.etrice.etunit.converter.Etunit.ErrorType#getExpected <em>Expected</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.etrice.etunit.converter.Etunit.ErrorType#getMessage <em>Message</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for the attribute '<em>Expected</em>'. - * @see org.eclipse.etrice.etunit.converter.Etunit.ErrorType#getExpected() + * @return the meta object for the attribute '<em>Message</em>'. + * @see org.eclipse.etrice.etunit.converter.Etunit.ErrorType#getMessage() * @see #getErrorType() * @generated */ - EAttribute getErrorType_Expected(); + EAttribute getErrorType_Message(); /** - * Returns the meta object for the attribute '{@link org.eclipse.etrice.etunit.converter.Etunit.ErrorType#getActual <em>Actual</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.etrice.etunit.converter.Etunit.ErrorType#getType <em>Type</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for the attribute '<em>Actual</em>'. - * @see org.eclipse.etrice.etunit.converter.Etunit.ErrorType#getActual() + * @return the meta object for the attribute '<em>Type</em>'. + * @see org.eclipse.etrice.etunit.converter.Etunit.ErrorType#getType() * @see #getErrorType() * @generated */ - EAttribute getErrorType_Actual(); + EAttribute getErrorType_Type(); /** * Returns the meta object for class '{@link org.eclipse.etrice.etunit.converter.Etunit.FailureType <em>Failure Type</em>}'. @@ -656,26 +1032,111 @@ public interface EtunitPackage extends EPackage { EAttribute getFailureType_Mixed(); /** - * Returns the meta object for the attribute '{@link org.eclipse.etrice.etunit.converter.Etunit.FailureType#getExpected <em>Expected</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.etrice.etunit.converter.Etunit.FailureType#getMessage <em>Message</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for the attribute '<em>Expected</em>'. - * @see org.eclipse.etrice.etunit.converter.Etunit.FailureType#getExpected() + * @return the meta object for the attribute '<em>Message</em>'. + * @see org.eclipse.etrice.etunit.converter.Etunit.FailureType#getMessage() * @see #getFailureType() * @generated */ - EAttribute getFailureType_Expected(); + EAttribute getFailureType_Message(); /** - * Returns the meta object for the attribute '{@link org.eclipse.etrice.etunit.converter.Etunit.FailureType#getActual <em>Actual</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.etrice.etunit.converter.Etunit.FailureType#getType <em>Type</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for the attribute '<em>Actual</em>'. - * @see org.eclipse.etrice.etunit.converter.Etunit.FailureType#getActual() + * @return the meta object for the attribute '<em>Type</em>'. + * @see org.eclipse.etrice.etunit.converter.Etunit.FailureType#getType() * @see #getFailureType() * @generated */ - EAttribute getFailureType_Actual(); + EAttribute getFailureType_Type(); + + /** + * Returns the meta object for class '{@link org.eclipse.etrice.etunit.converter.Etunit.PropertiesType <em>Properties Type</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for class '<em>Properties Type</em>'. + * @see org.eclipse.etrice.etunit.converter.Etunit.PropertiesType + * @generated + */ + EClass getPropertiesType(); + + /** + * Returns the meta object for the containment reference list '{@link org.eclipse.etrice.etunit.converter.Etunit.PropertiesType#getProperty <em>Property</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the containment reference list '<em>Property</em>'. + * @see org.eclipse.etrice.etunit.converter.Etunit.PropertiesType#getProperty() + * @see #getPropertiesType() + * @generated + */ + EReference getPropertiesType_Property(); + + /** + * Returns the meta object for class '{@link org.eclipse.etrice.etunit.converter.Etunit.PropertyType <em>Property Type</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for class '<em>Property Type</em>'. + * @see org.eclipse.etrice.etunit.converter.Etunit.PropertyType + * @generated + */ + EClass getPropertyType(); + + /** + * Returns the meta object for the attribute '{@link org.eclipse.etrice.etunit.converter.Etunit.PropertyType#getName <em>Name</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the attribute '<em>Name</em>'. + * @see org.eclipse.etrice.etunit.converter.Etunit.PropertyType#getName() + * @see #getPropertyType() + * @generated + */ + EAttribute getPropertyType_Name(); + + /** + * Returns the meta object for the attribute '{@link org.eclipse.etrice.etunit.converter.Etunit.PropertyType#getValue <em>Value</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the attribute '<em>Value</em>'. + * @see org.eclipse.etrice.etunit.converter.Etunit.PropertyType#getValue() + * @see #getPropertyType() + * @generated + */ + EAttribute getPropertyType_Value(); + + /** + * Returns the meta object for class '{@link org.eclipse.etrice.etunit.converter.Etunit.SkippedType <em>Skipped Type</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for class '<em>Skipped Type</em>'. + * @see org.eclipse.etrice.etunit.converter.Etunit.SkippedType + * @generated + */ + EClass getSkippedType(); + + /** + * Returns the meta object for the attribute list '{@link org.eclipse.etrice.etunit.converter.Etunit.SkippedType#getMixed <em>Mixed</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the attribute list '<em>Mixed</em>'. + * @see org.eclipse.etrice.etunit.converter.Etunit.SkippedType#getMixed() + * @see #getSkippedType() + * @generated + */ + EAttribute getSkippedType_Mixed(); + + /** + * Returns the meta object for the attribute '{@link org.eclipse.etrice.etunit.converter.Etunit.SkippedType#getMessage <em>Message</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the attribute '<em>Message</em>'. + * @see org.eclipse.etrice.etunit.converter.Etunit.SkippedType#getMessage() + * @see #getSkippedType() + * @generated + */ + EAttribute getSkippedType_Message(); /** * Returns the meta object for class '{@link org.eclipse.etrice.etunit.converter.Etunit.TestcaseType <em>Testcase Type</em>}'. @@ -688,10 +1149,21 @@ public interface EtunitPackage extends EPackage { EClass getTestcaseType(); /** - * Returns the meta object for the containment reference '{@link org.eclipse.etrice.etunit.converter.Etunit.TestcaseType#getError <em>Error</em>}'. + * Returns the meta object for the containment reference '{@link org.eclipse.etrice.etunit.converter.Etunit.TestcaseType#getSkipped <em>Skipped</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for the containment reference '<em>Error</em>'. + * @return the meta object for the containment reference '<em>Skipped</em>'. + * @see org.eclipse.etrice.etunit.converter.Etunit.TestcaseType#getSkipped() + * @see #getTestcaseType() + * @generated + */ + EReference getTestcaseType_Skipped(); + + /** + * Returns the meta object for the containment reference list '{@link org.eclipse.etrice.etunit.converter.Etunit.TestcaseType#getError <em>Error</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the containment reference list '<em>Error</em>'. * @see org.eclipse.etrice.etunit.converter.Etunit.TestcaseType#getError() * @see #getTestcaseType() * @generated @@ -699,10 +1171,10 @@ public interface EtunitPackage extends EPackage { EReference getTestcaseType_Error(); /** - * Returns the meta object for the containment reference '{@link org.eclipse.etrice.etunit.converter.Etunit.TestcaseType#getFailure <em>Failure</em>}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.etrice.etunit.converter.Etunit.TestcaseType#getFailure <em>Failure</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for the containment reference '<em>Failure</em>'. + * @return the meta object for the containment reference list '<em>Failure</em>'. * @see org.eclipse.etrice.etunit.converter.Etunit.TestcaseType#getFailure() * @see #getTestcaseType() * @generated @@ -710,6 +1182,39 @@ public interface EtunitPackage extends EPackage { EReference getTestcaseType_Failure(); /** + * Returns the meta object for the attribute list '{@link org.eclipse.etrice.etunit.converter.Etunit.TestcaseType#getSystemOut <em>System Out</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the attribute list '<em>System Out</em>'. + * @see org.eclipse.etrice.etunit.converter.Etunit.TestcaseType#getSystemOut() + * @see #getTestcaseType() + * @generated + */ + EAttribute getTestcaseType_SystemOut(); + + /** + * Returns the meta object for the attribute list '{@link org.eclipse.etrice.etunit.converter.Etunit.TestcaseType#getSystemErr <em>System Err</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the attribute list '<em>System Err</em>'. + * @see org.eclipse.etrice.etunit.converter.Etunit.TestcaseType#getSystemErr() + * @see #getTestcaseType() + * @generated + */ + EAttribute getTestcaseType_SystemErr(); + + /** + * Returns the meta object for the attribute '{@link org.eclipse.etrice.etunit.converter.Etunit.TestcaseType#getAssertions <em>Assertions</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the attribute '<em>Assertions</em>'. + * @see org.eclipse.etrice.etunit.converter.Etunit.TestcaseType#getAssertions() + * @see #getTestcaseType() + * @generated + */ + EAttribute getTestcaseType_Assertions(); + + /** * Returns the meta object for the attribute '{@link org.eclipse.etrice.etunit.converter.Etunit.TestcaseType#getClassname <em>Classname</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -732,6 +1237,17 @@ public interface EtunitPackage extends EPackage { EAttribute getTestcaseType_Name(); /** + * Returns the meta object for the attribute '{@link org.eclipse.etrice.etunit.converter.Etunit.TestcaseType#getStatus <em>Status</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the attribute '<em>Status</em>'. + * @see org.eclipse.etrice.etunit.converter.Etunit.TestcaseType#getStatus() + * @see #getTestcaseType() + * @generated + */ + EAttribute getTestcaseType_Status(); + + /** * Returns the meta object for the attribute '{@link org.eclipse.etrice.etunit.converter.Etunit.TestcaseType#getTime <em>Time</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -743,169 +1259,266 @@ public interface EtunitPackage extends EPackage { EAttribute getTestcaseType_Time(); /** - * Returns the meta object for class '{@link org.eclipse.etrice.etunit.converter.Etunit.Testsuite <em>Testsuite</em>}'. + * Returns the meta object for class '{@link org.eclipse.etrice.etunit.converter.Etunit.TestsuitesType <em>Testsuites Type</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for class '<em>Testsuite</em>'. - * @see org.eclipse.etrice.etunit.converter.Etunit.Testsuite + * @return the meta object for class '<em>Testsuites Type</em>'. + * @see org.eclipse.etrice.etunit.converter.Etunit.TestsuitesType * @generated */ - EClass getTestsuite(); + EClass getTestsuitesType(); /** - * Returns the meta object for the containment reference list '{@link org.eclipse.etrice.etunit.converter.Etunit.Testsuite#getTestcase <em>Testcase</em>}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.etrice.etunit.converter.Etunit.TestsuitesType#getTestsuite <em>Testsuite</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for the containment reference list '<em>Testcase</em>'. - * @see org.eclipse.etrice.etunit.converter.Etunit.Testsuite#getTestcase() - * @see #getTestsuite() + * @return the meta object for the containment reference list '<em>Testsuite</em>'. + * @see org.eclipse.etrice.etunit.converter.Etunit.TestsuitesType#getTestsuite() + * @see #getTestsuitesType() * @generated */ - EReference getTestsuite_Testcase(); + EReference getTestsuitesType_Testsuite(); /** - * Returns the meta object for the attribute '{@link org.eclipse.etrice.etunit.converter.Etunit.Testsuite#getErrors <em>Errors</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.etrice.etunit.converter.Etunit.TestsuitesType#getDisabled <em>Disabled</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the attribute '<em>Disabled</em>'. + * @see org.eclipse.etrice.etunit.converter.Etunit.TestsuitesType#getDisabled() + * @see #getTestsuitesType() + * @generated + */ + EAttribute getTestsuitesType_Disabled(); + + /** + * Returns the meta object for the attribute '{@link org.eclipse.etrice.etunit.converter.Etunit.TestsuitesType#getErrors <em>Errors</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Errors</em>'. - * @see org.eclipse.etrice.etunit.converter.Etunit.Testsuite#getErrors() - * @see #getTestsuite() + * @see org.eclipse.etrice.etunit.converter.Etunit.TestsuitesType#getErrors() + * @see #getTestsuitesType() * @generated */ - EAttribute getTestsuite_Errors(); + EAttribute getTestsuitesType_Errors(); /** - * Returns the meta object for the attribute '{@link org.eclipse.etrice.etunit.converter.Etunit.Testsuite#getFailures <em>Failures</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.etrice.etunit.converter.Etunit.TestsuitesType#getFailures <em>Failures</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Failures</em>'. - * @see org.eclipse.etrice.etunit.converter.Etunit.Testsuite#getFailures() - * @see #getTestsuite() + * @see org.eclipse.etrice.etunit.converter.Etunit.TestsuitesType#getFailures() + * @see #getTestsuitesType() * @generated */ - EAttribute getTestsuite_Failures(); + EAttribute getTestsuitesType_Failures(); /** - * Returns the meta object for the attribute '{@link org.eclipse.etrice.etunit.converter.Etunit.Testsuite#getName <em>Name</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.etrice.etunit.converter.Etunit.TestsuitesType#getName <em>Name</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Name</em>'. - * @see org.eclipse.etrice.etunit.converter.Etunit.Testsuite#getName() - * @see #getTestsuite() + * @see org.eclipse.etrice.etunit.converter.Etunit.TestsuitesType#getName() + * @see #getTestsuitesType() * @generated */ - EAttribute getTestsuite_Name(); + EAttribute getTestsuitesType_Name(); /** - * Returns the meta object for the attribute '{@link org.eclipse.etrice.etunit.converter.Etunit.Testsuite#getSkipped <em>Skipped</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.etrice.etunit.converter.Etunit.TestsuitesType#getTests <em>Tests</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for the attribute '<em>Skipped</em>'. - * @see org.eclipse.etrice.etunit.converter.Etunit.Testsuite#getSkipped() - * @see #getTestsuite() + * @return the meta object for the attribute '<em>Tests</em>'. + * @see org.eclipse.etrice.etunit.converter.Etunit.TestsuitesType#getTests() + * @see #getTestsuitesType() * @generated */ - EAttribute getTestsuite_Skipped(); + EAttribute getTestsuitesType_Tests(); /** - * Returns the meta object for the attribute '{@link org.eclipse.etrice.etunit.converter.Etunit.Testsuite#getTests <em>Tests</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.etrice.etunit.converter.Etunit.TestsuitesType#getTime <em>Time</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for the attribute '<em>Tests</em>'. - * @see org.eclipse.etrice.etunit.converter.Etunit.Testsuite#getTests() - * @see #getTestsuite() + * @return the meta object for the attribute '<em>Time</em>'. + * @see org.eclipse.etrice.etunit.converter.Etunit.TestsuitesType#getTime() + * @see #getTestsuitesType() * @generated */ - EAttribute getTestsuite_Tests(); + EAttribute getTestsuitesType_Time(); /** - * Returns the meta object for the attribute '{@link org.eclipse.etrice.etunit.converter.Etunit.Testsuite#getTime <em>Time</em>}'. + * Returns the meta object for class '{@link org.eclipse.etrice.etunit.converter.Etunit.TestsuiteType <em>Testsuite Type</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for the attribute '<em>Time</em>'. - * @see org.eclipse.etrice.etunit.converter.Etunit.Testsuite#getTime() - * @see #getTestsuite() + * @return the meta object for class '<em>Testsuite Type</em>'. + * @see org.eclipse.etrice.etunit.converter.Etunit.TestsuiteType * @generated */ - EAttribute getTestsuite_Time(); + EClass getTestsuiteType(); /** - * Returns the meta object for the attribute '{@link org.eclipse.etrice.etunit.converter.Etunit.Testsuite#getTimestamp <em>Timestamp</em>}'. + * Returns the meta object for the containment reference '{@link org.eclipse.etrice.etunit.converter.Etunit.TestsuiteType#getProperties <em>Properties</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for the attribute '<em>Timestamp</em>'. - * @see org.eclipse.etrice.etunit.converter.Etunit.Testsuite#getTimestamp() - * @see #getTestsuite() + * @return the meta object for the containment reference '<em>Properties</em>'. + * @see org.eclipse.etrice.etunit.converter.Etunit.TestsuiteType#getProperties() + * @see #getTestsuiteType() * @generated */ - EAttribute getTestsuite_Timestamp(); + EReference getTestsuiteType_Properties(); /** - * Returns the meta object for class '{@link org.eclipse.etrice.etunit.converter.Etunit.TestsuitesType <em>Testsuites Type</em>}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.etrice.etunit.converter.Etunit.TestsuiteType#getTestcase <em>Testcase</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for class '<em>Testsuites Type</em>'. - * @see org.eclipse.etrice.etunit.converter.Etunit.TestsuitesType + * @return the meta object for the containment reference list '<em>Testcase</em>'. + * @see org.eclipse.etrice.etunit.converter.Etunit.TestsuiteType#getTestcase() + * @see #getTestsuiteType() * @generated */ - EClass getTestsuitesType(); + EReference getTestsuiteType_Testcase(); /** - * Returns the meta object for the containment reference list '{@link org.eclipse.etrice.etunit.converter.Etunit.TestsuitesType#getTestsuite <em>Testsuite</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.etrice.etunit.converter.Etunit.TestsuiteType#getSystemOut <em>System Out</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for the containment reference list '<em>Testsuite</em>'. - * @see org.eclipse.etrice.etunit.converter.Etunit.TestsuitesType#getTestsuite() - * @see #getTestsuitesType() + * @return the meta object for the attribute '<em>System Out</em>'. + * @see org.eclipse.etrice.etunit.converter.Etunit.TestsuiteType#getSystemOut() + * @see #getTestsuiteType() * @generated */ - EReference getTestsuitesType_Testsuite(); + EAttribute getTestsuiteType_SystemOut(); /** - * Returns the meta object for class '{@link org.eclipse.etrice.etunit.converter.Etunit.TestsuiteType <em>Testsuite Type</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.etrice.etunit.converter.Etunit.TestsuiteType#getSystemErr <em>System Err</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for class '<em>Testsuite Type</em>'. - * @see org.eclipse.etrice.etunit.converter.Etunit.TestsuiteType + * @return the meta object for the attribute '<em>System Err</em>'. + * @see org.eclipse.etrice.etunit.converter.Etunit.TestsuiteType#getSystemErr() + * @see #getTestsuiteType() * @generated */ - EClass getTestsuiteType(); + EAttribute getTestsuiteType_SystemErr(); + + /** + * Returns the meta object for the attribute '{@link org.eclipse.etrice.etunit.converter.Etunit.TestsuiteType#getDisabled <em>Disabled</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the attribute '<em>Disabled</em>'. + * @see org.eclipse.etrice.etunit.converter.Etunit.TestsuiteType#getDisabled() + * @see #getTestsuiteType() + * @generated + */ + EAttribute getTestsuiteType_Disabled(); + + /** + * Returns the meta object for the attribute '{@link org.eclipse.etrice.etunit.converter.Etunit.TestsuiteType#getErrors <em>Errors</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the attribute '<em>Errors</em>'. + * @see org.eclipse.etrice.etunit.converter.Etunit.TestsuiteType#getErrors() + * @see #getTestsuiteType() + * @generated + */ + EAttribute getTestsuiteType_Errors(); + + /** + * Returns the meta object for the attribute '{@link org.eclipse.etrice.etunit.converter.Etunit.TestsuiteType#getFailures <em>Failures</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the attribute '<em>Failures</em>'. + * @see org.eclipse.etrice.etunit.converter.Etunit.TestsuiteType#getFailures() + * @see #getTestsuiteType() + * @generated + */ + EAttribute getTestsuiteType_Failures(); + + /** + * Returns the meta object for the attribute '{@link org.eclipse.etrice.etunit.converter.Etunit.TestsuiteType#getHostname <em>Hostname</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the attribute '<em>Hostname</em>'. + * @see org.eclipse.etrice.etunit.converter.Etunit.TestsuiteType#getHostname() + * @see #getTestsuiteType() + * @generated + */ + EAttribute getTestsuiteType_Hostname(); + + /** + * Returns the meta object for the attribute '{@link org.eclipse.etrice.etunit.converter.Etunit.TestsuiteType#getId <em>Id</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the attribute '<em>Id</em>'. + * @see org.eclipse.etrice.etunit.converter.Etunit.TestsuiteType#getId() + * @see #getTestsuiteType() + * @generated + */ + EAttribute getTestsuiteType_Id(); + + /** + * Returns the meta object for the attribute '{@link org.eclipse.etrice.etunit.converter.Etunit.TestsuiteType#getName <em>Name</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the attribute '<em>Name</em>'. + * @see org.eclipse.etrice.etunit.converter.Etunit.TestsuiteType#getName() + * @see #getTestsuiteType() + * @generated + */ + EAttribute getTestsuiteType_Name(); + + /** + * Returns the meta object for the attribute '{@link org.eclipse.etrice.etunit.converter.Etunit.TestsuiteType#getPackage <em>Package</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the attribute '<em>Package</em>'. + * @see org.eclipse.etrice.etunit.converter.Etunit.TestsuiteType#getPackage() + * @see #getTestsuiteType() + * @generated + */ + EAttribute getTestsuiteType_Package(); /** - * Returns the meta object for data type '{@link javax.xml.datatype.XMLGregorianCalendar <em>ISO8601DATETIMEPATTERN</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.etrice.etunit.converter.Etunit.TestsuiteType#getSkipped <em>Skipped</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for data type '<em>ISO8601DATETIMEPATTERN</em>'. - * @see javax.xml.datatype.XMLGregorianCalendar - * @model instanceClass="javax.xml.datatype.XMLGregorianCalendar" - * extendedMetaData="name='ISO8601_DATETIME_PATTERN' baseType='http://www.eclipse.org/emf/2003/XMLType#dateTime' pattern='[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}'" + * @return the meta object for the attribute '<em>Skipped</em>'. + * @see org.eclipse.etrice.etunit.converter.Etunit.TestsuiteType#getSkipped() + * @see #getTestsuiteType() + * @generated + */ + EAttribute getTestsuiteType_Skipped(); + + /** + * Returns the meta object for the attribute '{@link org.eclipse.etrice.etunit.converter.Etunit.TestsuiteType#getTests <em>Tests</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the attribute '<em>Tests</em>'. + * @see org.eclipse.etrice.etunit.converter.Etunit.TestsuiteType#getTests() + * @see #getTestsuiteType() * @generated */ - EDataType getISO8601DATETIMEPATTERN(); + EAttribute getTestsuiteType_Tests(); /** - * Returns the meta object for data type '{@link java.lang.String <em>Name Type</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.etrice.etunit.converter.Etunit.TestsuiteType#getTime <em>Time</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for data type '<em>Name Type</em>'. - * @see java.lang.String - * @model instanceClass="java.lang.String" - * extendedMetaData="name='name_._type' baseType='http://www.eclipse.org/emf/2003/XMLType#token' minLength='1'" + * @return the meta object for the attribute '<em>Time</em>'. + * @see org.eclipse.etrice.etunit.converter.Etunit.TestsuiteType#getTime() + * @see #getTestsuiteType() * @generated */ - EDataType getNameType(); + EAttribute getTestsuiteType_Time(); /** - * Returns the meta object for data type '{@link java.lang.String <em>Pre String</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.etrice.etunit.converter.Etunit.TestsuiteType#getTimestamp <em>Timestamp</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for data type '<em>Pre String</em>'. - * @see java.lang.String - * @model instanceClass="java.lang.String" - * extendedMetaData="name='pre-string' baseType='http://www.eclipse.org/emf/2003/XMLType#string' whiteSpace='preserve'" + * @return the meta object for the attribute '<em>Timestamp</em>'. + * @see org.eclipse.etrice.etunit.converter.Etunit.TestsuiteType#getTimestamp() + * @see #getTestsuiteType() * @generated */ - EDataType getPreString(); + EAttribute getTestsuiteType_Timestamp(); /** * Returns the factory that creates the instances of the model. @@ -922,6 +1535,7 @@ public interface EtunitPackage extends EPackage { * <ul> * <li>each class,</li> * <li>each feature of each class,</li> + * <li>each operation of each class,</li> * <li>each enum,</li> * <li>and each data type</li> * </ul> @@ -964,6 +1578,70 @@ public interface EtunitPackage extends EPackage { EReference DOCUMENT_ROOT__XSI_SCHEMA_LOCATION = eINSTANCE.getDocumentRoot_XSISchemaLocation(); /** + * The meta object literal for the '<em><b>Error</b></em>' containment reference feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + EReference DOCUMENT_ROOT__ERROR = eINSTANCE.getDocumentRoot_Error(); + + /** + * The meta object literal for the '<em><b>Failure</b></em>' containment reference feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + EReference DOCUMENT_ROOT__FAILURE = eINSTANCE.getDocumentRoot_Failure(); + + /** + * The meta object literal for the '<em><b>Properties</b></em>' containment reference feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + EReference DOCUMENT_ROOT__PROPERTIES = eINSTANCE.getDocumentRoot_Properties(); + + /** + * The meta object literal for the '<em><b>Property</b></em>' containment reference feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + EReference DOCUMENT_ROOT__PROPERTY = eINSTANCE.getDocumentRoot_Property(); + + /** + * The meta object literal for the '<em><b>Skipped</b></em>' containment reference feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + EReference DOCUMENT_ROOT__SKIPPED = eINSTANCE.getDocumentRoot_Skipped(); + + /** + * The meta object literal for the '<em><b>System Err</b></em>' attribute feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + EAttribute DOCUMENT_ROOT__SYSTEM_ERR = eINSTANCE.getDocumentRoot_SystemErr(); + + /** + * The meta object literal for the '<em><b>System Out</b></em>' attribute feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + EAttribute DOCUMENT_ROOT__SYSTEM_OUT = eINSTANCE.getDocumentRoot_SystemOut(); + + /** + * The meta object literal for the '<em><b>Testcase</b></em>' containment reference feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + EReference DOCUMENT_ROOT__TESTCASE = eINSTANCE.getDocumentRoot_Testcase(); + + /** * The meta object literal for the '<em><b>Testsuite</b></em>' containment reference feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -998,20 +1676,20 @@ public interface EtunitPackage extends EPackage { EAttribute ERROR_TYPE__MIXED = eINSTANCE.getErrorType_Mixed(); /** - * The meta object literal for the '<em><b>Expected</b></em>' attribute feature. + * The meta object literal for the '<em><b>Message</b></em>' attribute feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - EAttribute ERROR_TYPE__EXPECTED = eINSTANCE.getErrorType_Expected(); + EAttribute ERROR_TYPE__MESSAGE = eINSTANCE.getErrorType_Message(); /** - * The meta object literal for the '<em><b>Actual</b></em>' attribute feature. + * The meta object literal for the '<em><b>Type</b></em>' attribute feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - EAttribute ERROR_TYPE__ACTUAL = eINSTANCE.getErrorType_Actual(); + EAttribute ERROR_TYPE__TYPE = eINSTANCE.getErrorType_Type(); /** * The meta object literal for the '{@link org.eclipse.etrice.etunit.converter.Etunit.impl.FailureTypeImpl <em>Failure Type</em>}' class. @@ -1032,20 +1710,90 @@ public interface EtunitPackage extends EPackage { EAttribute FAILURE_TYPE__MIXED = eINSTANCE.getFailureType_Mixed(); /** - * The meta object literal for the '<em><b>Expected</b></em>' attribute feature. + * The meta object literal for the '<em><b>Message</b></em>' attribute feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + EAttribute FAILURE_TYPE__MESSAGE = eINSTANCE.getFailureType_Message(); + + /** + * The meta object literal for the '<em><b>Type</b></em>' attribute feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - EAttribute FAILURE_TYPE__EXPECTED = eINSTANCE.getFailureType_Expected(); + EAttribute FAILURE_TYPE__TYPE = eINSTANCE.getFailureType_Type(); /** - * The meta object literal for the '<em><b>Actual</b></em>' attribute feature. + * The meta object literal for the '{@link org.eclipse.etrice.etunit.converter.Etunit.impl.PropertiesTypeImpl <em>Properties Type</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * @see org.eclipse.etrice.etunit.converter.Etunit.impl.PropertiesTypeImpl + * @see org.eclipse.etrice.etunit.converter.Etunit.impl.EtunitPackageImpl#getPropertiesType() * @generated */ - EAttribute FAILURE_TYPE__ACTUAL = eINSTANCE.getFailureType_Actual(); + EClass PROPERTIES_TYPE = eINSTANCE.getPropertiesType(); + + /** + * The meta object literal for the '<em><b>Property</b></em>' containment reference list feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + EReference PROPERTIES_TYPE__PROPERTY = eINSTANCE.getPropertiesType_Property(); + + /** + * The meta object literal for the '{@link org.eclipse.etrice.etunit.converter.Etunit.impl.PropertyTypeImpl <em>Property Type</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.etrice.etunit.converter.Etunit.impl.PropertyTypeImpl + * @see org.eclipse.etrice.etunit.converter.Etunit.impl.EtunitPackageImpl#getPropertyType() + * @generated + */ + EClass PROPERTY_TYPE = eINSTANCE.getPropertyType(); + + /** + * The meta object literal for the '<em><b>Name</b></em>' attribute feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + EAttribute PROPERTY_TYPE__NAME = eINSTANCE.getPropertyType_Name(); + + /** + * The meta object literal for the '<em><b>Value</b></em>' attribute feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + EAttribute PROPERTY_TYPE__VALUE = eINSTANCE.getPropertyType_Value(); + + /** + * The meta object literal for the '{@link org.eclipse.etrice.etunit.converter.Etunit.impl.SkippedTypeImpl <em>Skipped Type</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.etrice.etunit.converter.Etunit.impl.SkippedTypeImpl + * @see org.eclipse.etrice.etunit.converter.Etunit.impl.EtunitPackageImpl#getSkippedType() + * @generated + */ + EClass SKIPPED_TYPE = eINSTANCE.getSkippedType(); + + /** + * The meta object literal for the '<em><b>Mixed</b></em>' attribute list feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + EAttribute SKIPPED_TYPE__MIXED = eINSTANCE.getSkippedType_Mixed(); + + /** + * The meta object literal for the '<em><b>Message</b></em>' attribute feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + EAttribute SKIPPED_TYPE__MESSAGE = eINSTANCE.getSkippedType_Message(); /** * The meta object literal for the '{@link org.eclipse.etrice.etunit.converter.Etunit.impl.TestcaseTypeImpl <em>Testcase Type</em>}' class. @@ -1058,7 +1806,15 @@ public interface EtunitPackage extends EPackage { EClass TESTCASE_TYPE = eINSTANCE.getTestcaseType(); /** - * The meta object literal for the '<em><b>Error</b></em>' containment reference feature. + * The meta object literal for the '<em><b>Skipped</b></em>' containment reference feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + EReference TESTCASE_TYPE__SKIPPED = eINSTANCE.getTestcaseType_Skipped(); + + /** + * The meta object literal for the '<em><b>Error</b></em>' containment reference list feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated @@ -1066,7 +1822,7 @@ public interface EtunitPackage extends EPackage { EReference TESTCASE_TYPE__ERROR = eINSTANCE.getTestcaseType_Error(); /** - * The meta object literal for the '<em><b>Failure</b></em>' containment reference feature. + * The meta object literal for the '<em><b>Failure</b></em>' containment reference list feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated @@ -1074,6 +1830,30 @@ public interface EtunitPackage extends EPackage { EReference TESTCASE_TYPE__FAILURE = eINSTANCE.getTestcaseType_Failure(); /** + * The meta object literal for the '<em><b>System Out</b></em>' attribute list feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + EAttribute TESTCASE_TYPE__SYSTEM_OUT = eINSTANCE.getTestcaseType_SystemOut(); + + /** + * The meta object literal for the '<em><b>System Err</b></em>' attribute list feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + EAttribute TESTCASE_TYPE__SYSTEM_ERR = eINSTANCE.getTestcaseType_SystemErr(); + + /** + * The meta object literal for the '<em><b>Assertions</b></em>' attribute feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + EAttribute TESTCASE_TYPE__ASSERTIONS = eINSTANCE.getTestcaseType_Assertions(); + + /** * The meta object literal for the '<em><b>Classname</b></em>' attribute feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -1090,6 +1870,14 @@ public interface EtunitPackage extends EPackage { EAttribute TESTCASE_TYPE__NAME = eINSTANCE.getTestcaseType_Name(); /** + * The meta object literal for the '<em><b>Status</b></em>' attribute feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + EAttribute TESTCASE_TYPE__STATUS = eINSTANCE.getTestcaseType_Status(); + + /** * The meta object literal for the '<em><b>Time</b></em>' attribute feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -1098,22 +1886,30 @@ public interface EtunitPackage extends EPackage { EAttribute TESTCASE_TYPE__TIME = eINSTANCE.getTestcaseType_Time(); /** - * The meta object literal for the '{@link org.eclipse.etrice.etunit.converter.Etunit.impl.TestsuiteImpl <em>Testsuite</em>}' class. + * The meta object literal for the '{@link org.eclipse.etrice.etunit.converter.Etunit.impl.TestsuitesTypeImpl <em>Testsuites Type</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.etrice.etunit.converter.Etunit.impl.TestsuiteImpl - * @see org.eclipse.etrice.etunit.converter.Etunit.impl.EtunitPackageImpl#getTestsuite() + * @see org.eclipse.etrice.etunit.converter.Etunit.impl.TestsuitesTypeImpl + * @see org.eclipse.etrice.etunit.converter.Etunit.impl.EtunitPackageImpl#getTestsuitesType() * @generated */ - EClass TESTSUITE = eINSTANCE.getTestsuite(); + EClass TESTSUITES_TYPE = eINSTANCE.getTestsuitesType(); /** - * The meta object literal for the '<em><b>Testcase</b></em>' containment reference list feature. + * The meta object literal for the '<em><b>Testsuite</b></em>' containment reference list feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - EReference TESTSUITE__TESTCASE = eINSTANCE.getTestsuite_Testcase(); + EReference TESTSUITES_TYPE__TESTSUITE = eINSTANCE.getTestsuitesType_Testsuite(); + + /** + * The meta object literal for the '<em><b>Disabled</b></em>' attribute feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + EAttribute TESTSUITES_TYPE__DISABLED = eINSTANCE.getTestsuitesType_Disabled(); /** * The meta object literal for the '<em><b>Errors</b></em>' attribute feature. @@ -1121,7 +1917,7 @@ public interface EtunitPackage extends EPackage { * <!-- end-user-doc --> * @generated */ - EAttribute TESTSUITE__ERRORS = eINSTANCE.getTestsuite_Errors(); + EAttribute TESTSUITES_TYPE__ERRORS = eINSTANCE.getTestsuitesType_Errors(); /** * The meta object literal for the '<em><b>Failures</b></em>' attribute feature. @@ -1129,7 +1925,7 @@ public interface EtunitPackage extends EPackage { * <!-- end-user-doc --> * @generated */ - EAttribute TESTSUITE__FAILURES = eINSTANCE.getTestsuite_Failures(); + EAttribute TESTSUITES_TYPE__FAILURES = eINSTANCE.getTestsuitesType_Failures(); /** * The meta object literal for the '<em><b>Name</b></em>' attribute feature. @@ -1137,97 +1933,153 @@ public interface EtunitPackage extends EPackage { * <!-- end-user-doc --> * @generated */ - EAttribute TESTSUITE__NAME = eINSTANCE.getTestsuite_Name(); + EAttribute TESTSUITES_TYPE__NAME = eINSTANCE.getTestsuitesType_Name(); /** - * The meta object literal for the '<em><b>Skipped</b></em>' attribute feature. + * The meta object literal for the '<em><b>Tests</b></em>' attribute feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - EAttribute TESTSUITE__SKIPPED = eINSTANCE.getTestsuite_Skipped(); + EAttribute TESTSUITES_TYPE__TESTS = eINSTANCE.getTestsuitesType_Tests(); /** - * The meta object literal for the '<em><b>Tests</b></em>' attribute feature. + * The meta object literal for the '<em><b>Time</b></em>' attribute feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - EAttribute TESTSUITE__TESTS = eINSTANCE.getTestsuite_Tests(); + EAttribute TESTSUITES_TYPE__TIME = eINSTANCE.getTestsuitesType_Time(); /** - * The meta object literal for the '<em><b>Time</b></em>' attribute feature. + * The meta object literal for the '{@link org.eclipse.etrice.etunit.converter.Etunit.impl.TestsuiteTypeImpl <em>Testsuite Type</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.etrice.etunit.converter.Etunit.impl.TestsuiteTypeImpl + * @see org.eclipse.etrice.etunit.converter.Etunit.impl.EtunitPackageImpl#getTestsuiteType() + * @generated + */ + EClass TESTSUITE_TYPE = eINSTANCE.getTestsuiteType(); + + /** + * The meta object literal for the '<em><b>Properties</b></em>' containment reference feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - EAttribute TESTSUITE__TIME = eINSTANCE.getTestsuite_Time(); + EReference TESTSUITE_TYPE__PROPERTIES = eINSTANCE.getTestsuiteType_Properties(); /** - * The meta object literal for the '<em><b>Timestamp</b></em>' attribute feature. + * The meta object literal for the '<em><b>Testcase</b></em>' containment reference list feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - EAttribute TESTSUITE__TIMESTAMP = eINSTANCE.getTestsuite_Timestamp(); + EReference TESTSUITE_TYPE__TESTCASE = eINSTANCE.getTestsuiteType_Testcase(); /** - * The meta object literal for the '{@link org.eclipse.etrice.etunit.converter.Etunit.impl.TestsuitesTypeImpl <em>Testsuites Type</em>}' class. + * The meta object literal for the '<em><b>System Out</b></em>' attribute feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.etrice.etunit.converter.Etunit.impl.TestsuitesTypeImpl - * @see org.eclipse.etrice.etunit.converter.Etunit.impl.EtunitPackageImpl#getTestsuitesType() * @generated */ - EClass TESTSUITES_TYPE = eINSTANCE.getTestsuitesType(); + EAttribute TESTSUITE_TYPE__SYSTEM_OUT = eINSTANCE.getTestsuiteType_SystemOut(); /** - * The meta object literal for the '<em><b>Testsuite</b></em>' containment reference list feature. + * The meta object literal for the '<em><b>System Err</b></em>' attribute feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - EReference TESTSUITES_TYPE__TESTSUITE = eINSTANCE.getTestsuitesType_Testsuite(); + EAttribute TESTSUITE_TYPE__SYSTEM_ERR = eINSTANCE.getTestsuiteType_SystemErr(); /** - * The meta object literal for the '{@link org.eclipse.etrice.etunit.converter.Etunit.impl.TestsuiteTypeImpl <em>Testsuite Type</em>}' class. + * The meta object literal for the '<em><b>Disabled</b></em>' attribute feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.etrice.etunit.converter.Etunit.impl.TestsuiteTypeImpl - * @see org.eclipse.etrice.etunit.converter.Etunit.impl.EtunitPackageImpl#getTestsuiteType() * @generated */ - EClass TESTSUITE_TYPE = eINSTANCE.getTestsuiteType(); + EAttribute TESTSUITE_TYPE__DISABLED = eINSTANCE.getTestsuiteType_Disabled(); + + /** + * The meta object literal for the '<em><b>Errors</b></em>' attribute feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + EAttribute TESTSUITE_TYPE__ERRORS = eINSTANCE.getTestsuiteType_Errors(); + + /** + * The meta object literal for the '<em><b>Failures</b></em>' attribute feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + EAttribute TESTSUITE_TYPE__FAILURES = eINSTANCE.getTestsuiteType_Failures(); + + /** + * The meta object literal for the '<em><b>Hostname</b></em>' attribute feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + EAttribute TESTSUITE_TYPE__HOSTNAME = eINSTANCE.getTestsuiteType_Hostname(); + + /** + * The meta object literal for the '<em><b>Id</b></em>' attribute feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + EAttribute TESTSUITE_TYPE__ID = eINSTANCE.getTestsuiteType_Id(); /** - * The meta object literal for the '<em>ISO8601DATETIMEPATTERN</em>' data type. + * The meta object literal for the '<em><b>Name</b></em>' attribute feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + EAttribute TESTSUITE_TYPE__NAME = eINSTANCE.getTestsuiteType_Name(); + + /** + * The meta object literal for the '<em><b>Package</b></em>' attribute feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see javax.xml.datatype.XMLGregorianCalendar - * @see org.eclipse.etrice.etunit.converter.Etunit.impl.EtunitPackageImpl#getISO8601DATETIMEPATTERN() * @generated */ - EDataType ISO8601DATETIMEPATTERN = eINSTANCE.getISO8601DATETIMEPATTERN(); + EAttribute TESTSUITE_TYPE__PACKAGE = eINSTANCE.getTestsuiteType_Package(); /** - * The meta object literal for the '<em>Name Type</em>' data type. + * The meta object literal for the '<em><b>Skipped</b></em>' attribute feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see java.lang.String - * @see org.eclipse.etrice.etunit.converter.Etunit.impl.EtunitPackageImpl#getNameType() * @generated */ - EDataType NAME_TYPE = eINSTANCE.getNameType(); + EAttribute TESTSUITE_TYPE__SKIPPED = eINSTANCE.getTestsuiteType_Skipped(); /** - * The meta object literal for the '<em>Pre String</em>' data type. + * The meta object literal for the '<em><b>Tests</b></em>' attribute feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + EAttribute TESTSUITE_TYPE__TESTS = eINSTANCE.getTestsuiteType_Tests(); + + /** + * The meta object literal for the '<em><b>Time</b></em>' attribute feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + EAttribute TESTSUITE_TYPE__TIME = eINSTANCE.getTestsuiteType_Time(); + + /** + * The meta object literal for the '<em><b>Timestamp</b></em>' attribute feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see java.lang.String - * @see org.eclipse.etrice.etunit.converter.Etunit.impl.EtunitPackageImpl#getPreString() * @generated */ - EDataType PRE_STRING = eINSTANCE.getPreString(); + EAttribute TESTSUITE_TYPE__TIMESTAMP = eINSTANCE.getTestsuiteType_Timestamp(); } diff --git a/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/FailureType.java b/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/FailureType.java index 3135f71bc..9aaa54f2c 100644 --- a/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/FailureType.java +++ b/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/FailureType.java @@ -1,12 +1,9 @@ /** - * <copyright> - * </copyright> - * - * $Id$ */ package org.eclipse.etrice.etunit.converter.Etunit; import org.eclipse.emf.ecore.EObject; + import org.eclipse.emf.ecore.util.FeatureMap; /** @@ -16,12 +13,12 @@ import org.eclipse.emf.ecore.util.FeatureMap; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.FailureType#getMixed <em>Mixed</em>}</li> - * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.FailureType#getExpected <em>Expected</em>}</li> - * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.FailureType#getActual <em>Actual</em>}</li> + * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.FailureType#getMessage <em>Message</em>}</li> + * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.FailureType#getType <em>Type</em>}</li> * </ul> - * </p> * * @see org.eclipse.etrice.etunit.converter.Etunit.EtunitPackage#getFailureType() * @model extendedMetaData="name='failure_._type' kind='mixed'" @@ -46,57 +43,57 @@ public interface FailureType extends EObject { FeatureMap getMixed(); /** - * Returns the value of the '<em><b>Expected</b></em>' attribute. + * Returns the value of the '<em><b>Message</b></em>' attribute. * <!-- begin-user-doc --> * <p> - * If the meaning of the '<em>Expected</em>' attribute isn't clear, + * If the meaning of the '<em>Message</em>' attribute isn't clear, * there really should be more of a description here... * </p> * <!-- end-user-doc --> - * @return the value of the '<em>Expected</em>' attribute. - * @see #setExpected(String) - * @see org.eclipse.etrice.etunit.converter.Etunit.EtunitPackage#getFailureType_Expected() - * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true" transient="true" volatile="true" derived="true" - * extendedMetaData="kind='element' name='expected' namespace='##targetNamespace'" + * @return the value of the '<em>Message</em>' attribute. + * @see #setMessage(String) + * @see org.eclipse.etrice.etunit.converter.Etunit.EtunitPackage#getFailureType_Message() + * @model dataType="org.eclipse.emf.ecore.xml.type.String" + * extendedMetaData="kind='attribute' name='message' namespace='##targetNamespace'" * @generated */ - String getExpected(); + String getMessage(); /** - * Sets the value of the '{@link org.eclipse.etrice.etunit.converter.Etunit.FailureType#getExpected <em>Expected</em>}' attribute. + * Sets the value of the '{@link org.eclipse.etrice.etunit.converter.Etunit.FailureType#getMessage <em>Message</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @param value the new value of the '<em>Expected</em>' attribute. - * @see #getExpected() + * @param value the new value of the '<em>Message</em>' attribute. + * @see #getMessage() * @generated */ - void setExpected(String value); + void setMessage(String value); /** - * Returns the value of the '<em><b>Actual</b></em>' attribute. + * Returns the value of the '<em><b>Type</b></em>' attribute. * <!-- begin-user-doc --> * <p> - * If the meaning of the '<em>Actual</em>' attribute isn't clear, + * If the meaning of the '<em>Type</em>' attribute isn't clear, * there really should be more of a description here... * </p> * <!-- end-user-doc --> - * @return the value of the '<em>Actual</em>' attribute. - * @see #setActual(String) - * @see org.eclipse.etrice.etunit.converter.Etunit.EtunitPackage#getFailureType_Actual() - * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true" transient="true" volatile="true" derived="true" - * extendedMetaData="kind='element' name='actual' namespace='##targetNamespace'" + * @return the value of the '<em>Type</em>' attribute. + * @see #setType(String) + * @see org.eclipse.etrice.etunit.converter.Etunit.EtunitPackage#getFailureType_Type() + * @model dataType="org.eclipse.emf.ecore.xml.type.String" + * extendedMetaData="kind='attribute' name='type' namespace='##targetNamespace'" * @generated */ - String getActual(); + String getType(); /** - * Sets the value of the '{@link org.eclipse.etrice.etunit.converter.Etunit.FailureType#getActual <em>Actual</em>}' attribute. + * Sets the value of the '{@link org.eclipse.etrice.etunit.converter.Etunit.FailureType#getType <em>Type</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @param value the new value of the '<em>Actual</em>' attribute. - * @see #getActual() + * @param value the new value of the '<em>Type</em>' attribute. + * @see #getType() * @generated */ - void setActual(String value); + void setType(String value); } // FailureType diff --git a/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/PropertiesType.java b/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/PropertiesType.java new file mode 100644 index 000000000..3c4821296 --- /dev/null +++ b/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/PropertiesType.java @@ -0,0 +1,43 @@ +/** + */ +package org.eclipse.etrice.etunit.converter.Etunit; + +import org.eclipse.emf.common.util.EList; + +import org.eclipse.emf.ecore.EObject; + +/** + * <!-- begin-user-doc --> + * A representation of the model object '<em><b>Properties Type</b></em>'. + * <!-- end-user-doc --> + * + * <p> + * The following features are supported: + * </p> + * <ul> + * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.PropertiesType#getProperty <em>Property</em>}</li> + * </ul> + * + * @see org.eclipse.etrice.etunit.converter.Etunit.EtunitPackage#getPropertiesType() + * @model extendedMetaData="name='properties_._type' kind='elementOnly'" + * @generated + */ +public interface PropertiesType extends EObject { + /** + * Returns the value of the '<em><b>Property</b></em>' containment reference list. + * The list contents are of type {@link org.eclipse.etrice.etunit.converter.Etunit.PropertyType}. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Property</em>' containment reference list isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Property</em>' containment reference list. + * @see org.eclipse.etrice.etunit.converter.Etunit.EtunitPackage#getPropertiesType_Property() + * @model containment="true" required="true" + * extendedMetaData="kind='element' name='property' namespace='##targetNamespace'" + * @generated + */ + EList<PropertyType> getProperty(); + +} // PropertiesType diff --git a/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/PropertyType.java b/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/PropertyType.java new file mode 100644 index 000000000..ab5ccfc53 --- /dev/null +++ b/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/PropertyType.java @@ -0,0 +1,79 @@ +/** + */ +package org.eclipse.etrice.etunit.converter.Etunit; + +import org.eclipse.emf.ecore.EObject; + +/** + * <!-- begin-user-doc --> + * A representation of the model object '<em><b>Property Type</b></em>'. + * <!-- end-user-doc --> + * + * <p> + * The following features are supported: + * </p> + * <ul> + * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.PropertyType#getName <em>Name</em>}</li> + * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.PropertyType#getValue <em>Value</em>}</li> + * </ul> + * + * @see org.eclipse.etrice.etunit.converter.Etunit.EtunitPackage#getPropertyType() + * @model extendedMetaData="name='property_._type' kind='empty'" + * @generated + */ +public interface PropertyType extends EObject { + /** + * Returns the value of the '<em><b>Name</b></em>' attribute. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Name</em>' attribute isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Name</em>' attribute. + * @see #setName(String) + * @see org.eclipse.etrice.etunit.converter.Etunit.EtunitPackage#getPropertyType_Name() + * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true" + * extendedMetaData="kind='attribute' name='name' namespace='##targetNamespace'" + * @generated + */ + String getName(); + + /** + * Sets the value of the '{@link org.eclipse.etrice.etunit.converter.Etunit.PropertyType#getName <em>Name</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Name</em>' attribute. + * @see #getName() + * @generated + */ + void setName(String value); + + /** + * Returns the value of the '<em><b>Value</b></em>' attribute. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Value</em>' attribute isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Value</em>' attribute. + * @see #setValue(String) + * @see org.eclipse.etrice.etunit.converter.Etunit.EtunitPackage#getPropertyType_Value() + * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true" + * extendedMetaData="kind='attribute' name='value' namespace='##targetNamespace'" + * @generated + */ + String getValue(); + + /** + * Sets the value of the '{@link org.eclipse.etrice.etunit.converter.Etunit.PropertyType#getValue <em>Value</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Value</em>' attribute. + * @see #getValue() + * @generated + */ + void setValue(String value); + +} // PropertyType diff --git a/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/SkippedType.java b/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/SkippedType.java new file mode 100644 index 000000000..fc52f31c9 --- /dev/null +++ b/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/SkippedType.java @@ -0,0 +1,71 @@ +/** + */ +package org.eclipse.etrice.etunit.converter.Etunit; + +import org.eclipse.emf.ecore.EObject; + +import org.eclipse.emf.ecore.util.FeatureMap; + +/** + * <!-- begin-user-doc --> + * A representation of the model object '<em><b>Skipped Type</b></em>'. + * <!-- end-user-doc --> + * + * <p> + * The following features are supported: + * </p> + * <ul> + * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.SkippedType#getMixed <em>Mixed</em>}</li> + * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.SkippedType#getMessage <em>Message</em>}</li> + * </ul> + * + * @see org.eclipse.etrice.etunit.converter.Etunit.EtunitPackage#getSkippedType() + * @model extendedMetaData="name='skipped_._type' kind='mixed'" + * @generated + */ +public interface SkippedType extends EObject { + /** + * Returns the value of the '<em><b>Mixed</b></em>' attribute list. + * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Mixed</em>' attribute list isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Mixed</em>' attribute list. + * @see org.eclipse.etrice.etunit.converter.Etunit.EtunitPackage#getSkippedType_Mixed() + * @model unique="false" dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true" + * extendedMetaData="kind='elementWildcard' name=':mixed'" + * @generated + */ + FeatureMap getMixed(); + + /** + * Returns the value of the '<em><b>Message</b></em>' attribute. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Message</em>' attribute isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Message</em>' attribute. + * @see #setMessage(String) + * @see org.eclipse.etrice.etunit.converter.Etunit.EtunitPackage#getSkippedType_Message() + * @model dataType="org.eclipse.emf.ecore.xml.type.String" + * extendedMetaData="kind='attribute' name='message' namespace='##targetNamespace'" + * @generated + */ + String getMessage(); + + /** + * Sets the value of the '{@link org.eclipse.etrice.etunit.converter.Etunit.SkippedType#getMessage <em>Message</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Message</em>' attribute. + * @see #getMessage() + * @generated + */ + void setMessage(String value); + +} // SkippedType diff --git a/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/TestcaseType.java b/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/TestcaseType.java index 8d504f9d5..84e927487 100644 --- a/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/TestcaseType.java +++ b/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/TestcaseType.java @@ -1,12 +1,8 @@ /** - * <copyright> - * </copyright> - * - * $Id$ */ package org.eclipse.etrice.etunit.converter.Etunit; -import java.math.BigDecimal; +import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EObject; @@ -17,14 +13,19 @@ import org.eclipse.emf.ecore.EObject; * * <p> * The following features are supported: + * </p> * <ul> + * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.TestcaseType#getSkipped <em>Skipped</em>}</li> * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.TestcaseType#getError <em>Error</em>}</li> * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.TestcaseType#getFailure <em>Failure</em>}</li> + * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.TestcaseType#getSystemOut <em>System Out</em>}</li> + * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.TestcaseType#getSystemErr <em>System Err</em>}</li> + * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.TestcaseType#getAssertions <em>Assertions</em>}</li> * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.TestcaseType#getClassname <em>Classname</em>}</li> * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.TestcaseType#getName <em>Name</em>}</li> + * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.TestcaseType#getStatus <em>Status</em>}</li> * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.TestcaseType#getTime <em>Time</em>}</li> * </ul> - * </p> * * @see org.eclipse.etrice.etunit.converter.Etunit.EtunitPackage#getTestcaseType() * @model extendedMetaData="name='testcase_._type' kind='elementOnly'" @@ -32,59 +33,139 @@ import org.eclipse.emf.ecore.EObject; */ public interface TestcaseType extends EObject { /** - * Returns the value of the '<em><b>Error</b></em>' containment reference. + * Returns the value of the '<em><b>Skipped</b></em>' containment reference. * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Skipped</em>' containment reference isn't clear, + * there really should be more of a description here... + * </p> * <!-- end-user-doc --> - * @return the value of the '<em>Error</em>' containment reference. - * @see #setError(ErrorType) - * @see org.eclipse.etrice.etunit.converter.Etunit.EtunitPackage#getTestcaseType_Error() + * @return the value of the '<em>Skipped</em>' containment reference. + * @see #setSkipped(SkippedType) + * @see org.eclipse.etrice.etunit.converter.Etunit.EtunitPackage#getTestcaseType_Skipped() * @model containment="true" - * extendedMetaData="kind='element' name='error' namespace='##targetNamespace'" + * extendedMetaData="kind='element' name='skipped' namespace='##targetNamespace'" + * @generated + */ + SkippedType getSkipped(); + + /** + * Sets the value of the '{@link org.eclipse.etrice.etunit.converter.Etunit.TestcaseType#getSkipped <em>Skipped</em>}' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Skipped</em>' containment reference. + * @see #getSkipped() * @generated */ - ErrorType getError(); + void setSkipped(SkippedType value); /** - * Sets the value of the '{@link org.eclipse.etrice.etunit.converter.Etunit.TestcaseType#getError <em>Error</em>}' containment reference. + * Returns the value of the '<em><b>Error</b></em>' containment reference list. + * The list contents are of type {@link org.eclipse.etrice.etunit.converter.Etunit.ErrorType}. * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Error</em>' containment reference list isn't clear, + * there really should be more of a description here... + * </p> * <!-- end-user-doc --> - * @param value the new value of the '<em>Error</em>' containment reference. - * @see #getError() + * @return the value of the '<em>Error</em>' containment reference list. + * @see org.eclipse.etrice.etunit.converter.Etunit.EtunitPackage#getTestcaseType_Error() + * @model containment="true" + * extendedMetaData="kind='element' name='error' namespace='##targetNamespace'" * @generated */ - void setError(ErrorType value); + EList<ErrorType> getError(); /** - * Returns the value of the '<em><b>Failure</b></em>' containment reference. + * Returns the value of the '<em><b>Failure</b></em>' containment reference list. + * The list contents are of type {@link org.eclipse.etrice.etunit.converter.Etunit.FailureType}. * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Failure</em>' containment reference list isn't clear, + * there really should be more of a description here... + * </p> * <!-- end-user-doc --> - * @return the value of the '<em>Failure</em>' containment reference. - * @see #setFailure(FailureType) + * @return the value of the '<em>Failure</em>' containment reference list. * @see org.eclipse.etrice.etunit.converter.Etunit.EtunitPackage#getTestcaseType_Failure() * @model containment="true" * extendedMetaData="kind='element' name='failure' namespace='##targetNamespace'" * @generated */ - FailureType getFailure(); + EList<FailureType> getFailure(); + + /** + * Returns the value of the '<em><b>System Out</b></em>' attribute list. + * The list contents are of type {@link java.lang.String}. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>System Out</em>' attribute list isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>System Out</em>' attribute list. + * @see org.eclipse.etrice.etunit.converter.Etunit.EtunitPackage#getTestcaseType_SystemOut() + * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" + * extendedMetaData="kind='element' name='system-out' namespace='##targetNamespace'" + * @generated + */ + EList<String> getSystemOut(); + + /** + * Returns the value of the '<em><b>System Err</b></em>' attribute list. + * The list contents are of type {@link java.lang.String}. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>System Err</em>' attribute list isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>System Err</em>' attribute list. + * @see org.eclipse.etrice.etunit.converter.Etunit.EtunitPackage#getTestcaseType_SystemErr() + * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" + * extendedMetaData="kind='element' name='system-err' namespace='##targetNamespace'" + * @generated + */ + EList<String> getSystemErr(); /** - * Sets the value of the '{@link org.eclipse.etrice.etunit.converter.Etunit.TestcaseType#getFailure <em>Failure</em>}' containment reference. + * Returns the value of the '<em><b>Assertions</b></em>' attribute. * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Assertions</em>' attribute isn't clear, + * there really should be more of a description here... + * </p> * <!-- end-user-doc --> - * @param value the new value of the '<em>Failure</em>' containment reference. - * @see #getFailure() + * @return the value of the '<em>Assertions</em>' attribute. + * @see #setAssertions(String) + * @see org.eclipse.etrice.etunit.converter.Etunit.EtunitPackage#getTestcaseType_Assertions() + * @model dataType="org.eclipse.emf.ecore.xml.type.String" + * extendedMetaData="kind='attribute' name='assertions' namespace='##targetNamespace'" * @generated */ - void setFailure(FailureType value); + String getAssertions(); + + /** + * Sets the value of the '{@link org.eclipse.etrice.etunit.converter.Etunit.TestcaseType#getAssertions <em>Assertions</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Assertions</em>' attribute. + * @see #getAssertions() + * @generated + */ + void setAssertions(String value); /** * Returns the value of the '<em><b>Classname</b></em>' attribute. * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Classname</em>' attribute isn't clear, + * there really should be more of a description here... + * </p> * <!-- end-user-doc --> * @return the value of the '<em>Classname</em>' attribute. * @see #setClassname(String) * @see org.eclipse.etrice.etunit.converter.Etunit.EtunitPackage#getTestcaseType_Classname() - * @model dataType="org.eclipse.emf.ecore.xml.type.Token" required="true" + * @model dataType="org.eclipse.emf.ecore.xml.type.String" * extendedMetaData="kind='attribute' name='classname' namespace='##targetNamespace'" * @generated */ @@ -103,11 +184,15 @@ public interface TestcaseType extends EObject { /** * Returns the value of the '<em><b>Name</b></em>' attribute. * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Name</em>' attribute isn't clear, + * there really should be more of a description here... + * </p> * <!-- end-user-doc --> * @return the value of the '<em>Name</em>' attribute. * @see #setName(String) * @see org.eclipse.etrice.etunit.converter.Etunit.EtunitPackage#getTestcaseType_Name() - * @model dataType="org.eclipse.emf.ecore.xml.type.Token" required="true" + * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true" * extendedMetaData="kind='attribute' name='name' namespace='##targetNamespace'" * @generated */ @@ -124,17 +209,48 @@ public interface TestcaseType extends EObject { void setName(String value); /** + * Returns the value of the '<em><b>Status</b></em>' attribute. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Status</em>' attribute isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Status</em>' attribute. + * @see #setStatus(String) + * @see org.eclipse.etrice.etunit.converter.Etunit.EtunitPackage#getTestcaseType_Status() + * @model dataType="org.eclipse.emf.ecore.xml.type.String" + * extendedMetaData="kind='attribute' name='status' namespace='##targetNamespace'" + * @generated + */ + String getStatus(); + + /** + * Sets the value of the '{@link org.eclipse.etrice.etunit.converter.Etunit.TestcaseType#getStatus <em>Status</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Status</em>' attribute. + * @see #getStatus() + * @generated + */ + void setStatus(String value); + + /** * Returns the value of the '<em><b>Time</b></em>' attribute. * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Time</em>' attribute isn't clear, + * there really should be more of a description here... + * </p> * <!-- end-user-doc --> * @return the value of the '<em>Time</em>' attribute. - * @see #setTime(BigDecimal) + * @see #setTime(String) * @see org.eclipse.etrice.etunit.converter.Etunit.EtunitPackage#getTestcaseType_Time() - * @model dataType="org.eclipse.emf.ecore.xml.type.Decimal" required="true" + * @model dataType="org.eclipse.emf.ecore.xml.type.String" * extendedMetaData="kind='attribute' name='time' namespace='##targetNamespace'" * @generated */ - BigDecimal getTime(); + String getTime(); /** * Sets the value of the '{@link org.eclipse.etrice.etunit.converter.Etunit.TestcaseType#getTime <em>Time</em>}' attribute. @@ -144,6 +260,6 @@ public interface TestcaseType extends EObject { * @see #getTime() * @generated */ - void setTime(BigDecimal value); + void setTime(String value); } // TestcaseType diff --git a/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/Testsuite.java b/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/Testsuite.java deleted file mode 100644 index 66b8969a1..000000000 --- a/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/Testsuite.java +++ /dev/null @@ -1,327 +0,0 @@ -/** - * <copyright> - * </copyright> - * - * $Id$ - */ -package org.eclipse.etrice.etunit.converter.Etunit; - -import java.math.BigDecimal; - -import javax.xml.datatype.XMLGregorianCalendar; - -import org.eclipse.emf.common.util.EList; - -import org.eclipse.emf.ecore.EObject; - -/** - * <!-- begin-user-doc --> - * A representation of the model object '<em><b>Testsuite</b></em>'. - * <!-- end-user-doc --> - * - * <p> - * The following features are supported: - * <ul> - * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.Testsuite#getTestcase <em>Testcase</em>}</li> - * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.Testsuite#getErrors <em>Errors</em>}</li> - * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.Testsuite#getFailures <em>Failures</em>}</li> - * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.Testsuite#getName <em>Name</em>}</li> - * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.Testsuite#getSkipped <em>Skipped</em>}</li> - * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.Testsuite#getTests <em>Tests</em>}</li> - * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.Testsuite#getTime <em>Time</em>}</li> - * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.Testsuite#getTimestamp <em>Timestamp</em>}</li> - * </ul> - * </p> - * - * @see org.eclipse.etrice.etunit.converter.Etunit.EtunitPackage#getTestsuite() - * @model extendedMetaData="name='testsuite' kind='elementOnly'" - * @generated - */ -public interface Testsuite extends EObject { - /** - * Returns the value of the '<em><b>Testcase</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.etrice.etunit.converter.Etunit.TestcaseType}. - * <!-- begin-user-doc --> - * <p> - * If the meaning of the '<em>Testcase</em>' containment reference list isn't clear, - * there really should be more of a description here... - * </p> - * <!-- end-user-doc --> - * @return the value of the '<em>Testcase</em>' containment reference list. - * @see org.eclipse.etrice.etunit.converter.Etunit.EtunitPackage#getTestsuite_Testcase() - * @model containment="true" - * extendedMetaData="kind='element' name='testcase' namespace='##targetNamespace'" - * @generated - */ - EList<TestcaseType> getTestcase(); - - /** - * Returns the value of the '<em><b>Errors</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the value of the '<em>Errors</em>' attribute. - * @see #isSetErrors() - * @see #unsetErrors() - * @see #setErrors(int) - * @see org.eclipse.etrice.etunit.converter.Etunit.EtunitPackage#getTestsuite_Errors() - * @model unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Int" required="true" - * extendedMetaData="kind='attribute' name='errors' namespace='##targetNamespace'" - * @generated - */ - int getErrors(); - - /** - * Sets the value of the '{@link org.eclipse.etrice.etunit.converter.Etunit.Testsuite#getErrors <em>Errors</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @param value the new value of the '<em>Errors</em>' attribute. - * @see #isSetErrors() - * @see #unsetErrors() - * @see #getErrors() - * @generated - */ - void setErrors(int value); - - /** - * Unsets the value of the '{@link org.eclipse.etrice.etunit.converter.Etunit.Testsuite#getErrors <em>Errors</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #isSetErrors() - * @see #getErrors() - * @see #setErrors(int) - * @generated - */ - void unsetErrors(); - - /** - * Returns whether the value of the '{@link org.eclipse.etrice.etunit.converter.Etunit.Testsuite#getErrors <em>Errors</em>}' attribute is set. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return whether the value of the '<em>Errors</em>' attribute is set. - * @see #unsetErrors() - * @see #getErrors() - * @see #setErrors(int) - * @generated - */ - boolean isSetErrors(); - - /** - * Returns the value of the '<em><b>Failures</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the value of the '<em>Failures</em>' attribute. - * @see #isSetFailures() - * @see #unsetFailures() - * @see #setFailures(int) - * @see org.eclipse.etrice.etunit.converter.Etunit.EtunitPackage#getTestsuite_Failures() - * @model unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Int" required="true" - * extendedMetaData="kind='attribute' name='failures' namespace='##targetNamespace'" - * @generated - */ - int getFailures(); - - /** - * Sets the value of the '{@link org.eclipse.etrice.etunit.converter.Etunit.Testsuite#getFailures <em>Failures</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @param value the new value of the '<em>Failures</em>' attribute. - * @see #isSetFailures() - * @see #unsetFailures() - * @see #getFailures() - * @generated - */ - void setFailures(int value); - - /** - * Unsets the value of the '{@link org.eclipse.etrice.etunit.converter.Etunit.Testsuite#getFailures <em>Failures</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #isSetFailures() - * @see #getFailures() - * @see #setFailures(int) - * @generated - */ - void unsetFailures(); - - /** - * Returns whether the value of the '{@link org.eclipse.etrice.etunit.converter.Etunit.Testsuite#getFailures <em>Failures</em>}' attribute is set. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return whether the value of the '<em>Failures</em>' attribute is set. - * @see #unsetFailures() - * @see #getFailures() - * @see #setFailures(int) - * @generated - */ - boolean isSetFailures(); - - /** - * Returns the value of the '<em><b>Name</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the value of the '<em>Name</em>' attribute. - * @see #setName(String) - * @see org.eclipse.etrice.etunit.converter.Etunit.EtunitPackage#getTestsuite_Name() - * @model dataType="org.eclipse.etrice.etunit.converter.Etunit.NameType" required="true" - * extendedMetaData="kind='attribute' name='name' namespace='##targetNamespace'" - * @generated - */ - String getName(); - - /** - * Sets the value of the '{@link org.eclipse.etrice.etunit.converter.Etunit.Testsuite#getName <em>Name</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @param value the new value of the '<em>Name</em>' attribute. - * @see #getName() - * @generated - */ - void setName(String value); - - /** - * Returns the value of the '<em><b>Skipped</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the value of the '<em>Skipped</em>' attribute. - * @see #isSetSkipped() - * @see #unsetSkipped() - * @see #setSkipped(int) - * @see org.eclipse.etrice.etunit.converter.Etunit.EtunitPackage#getTestsuite_Skipped() - * @model unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Int" - * extendedMetaData="kind='attribute' name='skipped' namespace='##targetNamespace'" - * @generated - */ - int getSkipped(); - - /** - * Sets the value of the '{@link org.eclipse.etrice.etunit.converter.Etunit.Testsuite#getSkipped <em>Skipped</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @param value the new value of the '<em>Skipped</em>' attribute. - * @see #isSetSkipped() - * @see #unsetSkipped() - * @see #getSkipped() - * @generated - */ - void setSkipped(int value); - - /** - * Unsets the value of the '{@link org.eclipse.etrice.etunit.converter.Etunit.Testsuite#getSkipped <em>Skipped</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #isSetSkipped() - * @see #getSkipped() - * @see #setSkipped(int) - * @generated - */ - void unsetSkipped(); - - /** - * Returns whether the value of the '{@link org.eclipse.etrice.etunit.converter.Etunit.Testsuite#getSkipped <em>Skipped</em>}' attribute is set. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return whether the value of the '<em>Skipped</em>' attribute is set. - * @see #unsetSkipped() - * @see #getSkipped() - * @see #setSkipped(int) - * @generated - */ - boolean isSetSkipped(); - - /** - * Returns the value of the '<em><b>Tests</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the value of the '<em>Tests</em>' attribute. - * @see #isSetTests() - * @see #unsetTests() - * @see #setTests(int) - * @see org.eclipse.etrice.etunit.converter.Etunit.EtunitPackage#getTestsuite_Tests() - * @model unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Int" required="true" - * extendedMetaData="kind='attribute' name='tests' namespace='##targetNamespace'" - * @generated - */ - int getTests(); - - /** - * Sets the value of the '{@link org.eclipse.etrice.etunit.converter.Etunit.Testsuite#getTests <em>Tests</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @param value the new value of the '<em>Tests</em>' attribute. - * @see #isSetTests() - * @see #unsetTests() - * @see #getTests() - * @generated - */ - void setTests(int value); - - /** - * Unsets the value of the '{@link org.eclipse.etrice.etunit.converter.Etunit.Testsuite#getTests <em>Tests</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #isSetTests() - * @see #getTests() - * @see #setTests(int) - * @generated - */ - void unsetTests(); - - /** - * Returns whether the value of the '{@link org.eclipse.etrice.etunit.converter.Etunit.Testsuite#getTests <em>Tests</em>}' attribute is set. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return whether the value of the '<em>Tests</em>' attribute is set. - * @see #unsetTests() - * @see #getTests() - * @see #setTests(int) - * @generated - */ - boolean isSetTests(); - - /** - * Returns the value of the '<em><b>Time</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the value of the '<em>Time</em>' attribute. - * @see #setTime(BigDecimal) - * @see org.eclipse.etrice.etunit.converter.Etunit.EtunitPackage#getTestsuite_Time() - * @model dataType="org.eclipse.emf.ecore.xml.type.Decimal" required="true" - * extendedMetaData="kind='attribute' name='time' namespace='##targetNamespace'" - * @generated - */ - BigDecimal getTime(); - - /** - * Sets the value of the '{@link org.eclipse.etrice.etunit.converter.Etunit.Testsuite#getTime <em>Time</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @param value the new value of the '<em>Time</em>' attribute. - * @see #getTime() - * @generated - */ - void setTime(BigDecimal value); - - /** - * Returns the value of the '<em><b>Timestamp</b></em>' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the value of the '<em>Timestamp</em>' attribute. - * @see #setTimestamp(XMLGregorianCalendar) - * @see org.eclipse.etrice.etunit.converter.Etunit.EtunitPackage#getTestsuite_Timestamp() - * @model dataType="org.eclipse.etrice.etunit.converter.Etunit.ISO8601DATETIMEPATTERN" required="true" - * extendedMetaData="kind='attribute' name='timestamp' namespace='##targetNamespace'" - * @generated - */ - XMLGregorianCalendar getTimestamp(); - - /** - * Sets the value of the '{@link org.eclipse.etrice.etunit.converter.Etunit.Testsuite#getTimestamp <em>Timestamp</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @param value the new value of the '<em>Timestamp</em>' attribute. - * @see #getTimestamp() - * @generated - */ - void setTimestamp(XMLGregorianCalendar value); - -} // Testsuite diff --git a/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/TestsuiteType.java b/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/TestsuiteType.java index 9e25f9eec..eea20c7e0 100644 --- a/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/TestsuiteType.java +++ b/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/TestsuiteType.java @@ -1,22 +1,435 @@ /** - * <copyright> - * </copyright> - * - * $Id$ */ package org.eclipse.etrice.etunit.converter.Etunit; +import org.eclipse.emf.common.util.EList; + +import org.eclipse.emf.ecore.EObject; /** * <!-- begin-user-doc --> * A representation of the model object '<em><b>Testsuite Type</b></em>'. * <!-- end-user-doc --> * + * <p> + * The following features are supported: + * </p> + * <ul> + * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.TestsuiteType#getProperties <em>Properties</em>}</li> + * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.TestsuiteType#getTestcase <em>Testcase</em>}</li> + * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.TestsuiteType#getSystemOut <em>System Out</em>}</li> + * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.TestsuiteType#getSystemErr <em>System Err</em>}</li> + * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.TestsuiteType#getDisabled <em>Disabled</em>}</li> + * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.TestsuiteType#getErrors <em>Errors</em>}</li> + * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.TestsuiteType#getFailures <em>Failures</em>}</li> + * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.TestsuiteType#getHostname <em>Hostname</em>}</li> + * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.TestsuiteType#getId <em>Id</em>}</li> + * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.TestsuiteType#getName <em>Name</em>}</li> + * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.TestsuiteType#getPackage <em>Package</em>}</li> + * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.TestsuiteType#getSkipped <em>Skipped</em>}</li> + * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.TestsuiteType#getTests <em>Tests</em>}</li> + * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.TestsuiteType#getTime <em>Time</em>}</li> + * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.TestsuiteType#getTimestamp <em>Timestamp</em>}</li> + * </ul> * * @see org.eclipse.etrice.etunit.converter.Etunit.EtunitPackage#getTestsuiteType() * @model extendedMetaData="name='testsuite_._type' kind='elementOnly'" * @generated */ -public interface TestsuiteType extends Testsuite { +public interface TestsuiteType extends EObject { + /** + * Returns the value of the '<em><b>Properties</b></em>' containment reference. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Properties</em>' containment reference isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Properties</em>' containment reference. + * @see #setProperties(PropertiesType) + * @see org.eclipse.etrice.etunit.converter.Etunit.EtunitPackage#getTestsuiteType_Properties() + * @model containment="true" + * extendedMetaData="kind='element' name='properties' namespace='##targetNamespace'" + * @generated + */ + PropertiesType getProperties(); + + /** + * Sets the value of the '{@link org.eclipse.etrice.etunit.converter.Etunit.TestsuiteType#getProperties <em>Properties</em>}' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Properties</em>' containment reference. + * @see #getProperties() + * @generated + */ + void setProperties(PropertiesType value); + + /** + * Returns the value of the '<em><b>Testcase</b></em>' containment reference list. + * The list contents are of type {@link org.eclipse.etrice.etunit.converter.Etunit.TestcaseType}. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Testcase</em>' containment reference list isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Testcase</em>' containment reference list. + * @see org.eclipse.etrice.etunit.converter.Etunit.EtunitPackage#getTestsuiteType_Testcase() + * @model containment="true" + * extendedMetaData="kind='element' name='testcase' namespace='##targetNamespace'" + * @generated + */ + EList<TestcaseType> getTestcase(); + + /** + * Returns the value of the '<em><b>System Out</b></em>' attribute. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>System Out</em>' attribute isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>System Out</em>' attribute. + * @see #setSystemOut(String) + * @see org.eclipse.etrice.etunit.converter.Etunit.EtunitPackage#getTestsuiteType_SystemOut() + * @model dataType="org.eclipse.emf.ecore.xml.type.String" + * extendedMetaData="kind='element' name='system-out' namespace='##targetNamespace'" + * @generated + */ + String getSystemOut(); + + /** + * Sets the value of the '{@link org.eclipse.etrice.etunit.converter.Etunit.TestsuiteType#getSystemOut <em>System Out</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>System Out</em>' attribute. + * @see #getSystemOut() + * @generated + */ + void setSystemOut(String value); + + /** + * Returns the value of the '<em><b>System Err</b></em>' attribute. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>System Err</em>' attribute isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>System Err</em>' attribute. + * @see #setSystemErr(String) + * @see org.eclipse.etrice.etunit.converter.Etunit.EtunitPackage#getTestsuiteType_SystemErr() + * @model dataType="org.eclipse.emf.ecore.xml.type.String" + * extendedMetaData="kind='element' name='system-err' namespace='##targetNamespace'" + * @generated + */ + String getSystemErr(); + + /** + * Sets the value of the '{@link org.eclipse.etrice.etunit.converter.Etunit.TestsuiteType#getSystemErr <em>System Err</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>System Err</em>' attribute. + * @see #getSystemErr() + * @generated + */ + void setSystemErr(String value); + + /** + * Returns the value of the '<em><b>Disabled</b></em>' attribute. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Disabled</em>' attribute isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Disabled</em>' attribute. + * @see #setDisabled(String) + * @see org.eclipse.etrice.etunit.converter.Etunit.EtunitPackage#getTestsuiteType_Disabled() + * @model dataType="org.eclipse.emf.ecore.xml.type.String" + * extendedMetaData="kind='attribute' name='disabled' namespace='##targetNamespace'" + * @generated + */ + String getDisabled(); + + /** + * Sets the value of the '{@link org.eclipse.etrice.etunit.converter.Etunit.TestsuiteType#getDisabled <em>Disabled</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Disabled</em>' attribute. + * @see #getDisabled() + * @generated + */ + void setDisabled(String value); + + /** + * Returns the value of the '<em><b>Errors</b></em>' attribute. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Errors</em>' attribute isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Errors</em>' attribute. + * @see #setErrors(String) + * @see org.eclipse.etrice.etunit.converter.Etunit.EtunitPackage#getTestsuiteType_Errors() + * @model dataType="org.eclipse.emf.ecore.xml.type.String" + * extendedMetaData="kind='attribute' name='errors' namespace='##targetNamespace'" + * @generated + */ + String getErrors(); + + /** + * Sets the value of the '{@link org.eclipse.etrice.etunit.converter.Etunit.TestsuiteType#getErrors <em>Errors</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Errors</em>' attribute. + * @see #getErrors() + * @generated + */ + void setErrors(String value); + + /** + * Returns the value of the '<em><b>Failures</b></em>' attribute. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Failures</em>' attribute isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Failures</em>' attribute. + * @see #setFailures(String) + * @see org.eclipse.etrice.etunit.converter.Etunit.EtunitPackage#getTestsuiteType_Failures() + * @model dataType="org.eclipse.emf.ecore.xml.type.String" + * extendedMetaData="kind='attribute' name='failures' namespace='##targetNamespace'" + * @generated + */ + String getFailures(); + + /** + * Sets the value of the '{@link org.eclipse.etrice.etunit.converter.Etunit.TestsuiteType#getFailures <em>Failures</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Failures</em>' attribute. + * @see #getFailures() + * @generated + */ + void setFailures(String value); + + /** + * Returns the value of the '<em><b>Hostname</b></em>' attribute. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Hostname</em>' attribute isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Hostname</em>' attribute. + * @see #setHostname(String) + * @see org.eclipse.etrice.etunit.converter.Etunit.EtunitPackage#getTestsuiteType_Hostname() + * @model dataType="org.eclipse.emf.ecore.xml.type.String" + * extendedMetaData="kind='attribute' name='hostname' namespace='##targetNamespace'" + * @generated + */ + String getHostname(); + + /** + * Sets the value of the '{@link org.eclipse.etrice.etunit.converter.Etunit.TestsuiteType#getHostname <em>Hostname</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Hostname</em>' attribute. + * @see #getHostname() + * @generated + */ + void setHostname(String value); + + /** + * Returns the value of the '<em><b>Id</b></em>' attribute. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Id</em>' attribute isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Id</em>' attribute. + * @see #setId(String) + * @see org.eclipse.etrice.etunit.converter.Etunit.EtunitPackage#getTestsuiteType_Id() + * @model dataType="org.eclipse.emf.ecore.xml.type.String" + * extendedMetaData="kind='attribute' name='id' namespace='##targetNamespace'" + * @generated + */ + String getId(); + + /** + * Sets the value of the '{@link org.eclipse.etrice.etunit.converter.Etunit.TestsuiteType#getId <em>Id</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Id</em>' attribute. + * @see #getId() + * @generated + */ + void setId(String value); + + /** + * Returns the value of the '<em><b>Name</b></em>' attribute. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Name</em>' attribute isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Name</em>' attribute. + * @see #setName(String) + * @see org.eclipse.etrice.etunit.converter.Etunit.EtunitPackage#getTestsuiteType_Name() + * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true" + * extendedMetaData="kind='attribute' name='name' namespace='##targetNamespace'" + * @generated + */ + String getName(); + + /** + * Sets the value of the '{@link org.eclipse.etrice.etunit.converter.Etunit.TestsuiteType#getName <em>Name</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Name</em>' attribute. + * @see #getName() + * @generated + */ + void setName(String value); + + /** + * Returns the value of the '<em><b>Package</b></em>' attribute. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Package</em>' attribute isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Package</em>' attribute. + * @see #setPackage(String) + * @see org.eclipse.etrice.etunit.converter.Etunit.EtunitPackage#getTestsuiteType_Package() + * @model dataType="org.eclipse.emf.ecore.xml.type.String" + * extendedMetaData="kind='attribute' name='package' namespace='##targetNamespace'" + * @generated + */ + String getPackage(); + + /** + * Sets the value of the '{@link org.eclipse.etrice.etunit.converter.Etunit.TestsuiteType#getPackage <em>Package</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Package</em>' attribute. + * @see #getPackage() + * @generated + */ + void setPackage(String value); + + /** + * Returns the value of the '<em><b>Skipped</b></em>' attribute. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Skipped</em>' attribute isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Skipped</em>' attribute. + * @see #setSkipped(String) + * @see org.eclipse.etrice.etunit.converter.Etunit.EtunitPackage#getTestsuiteType_Skipped() + * @model dataType="org.eclipse.emf.ecore.xml.type.String" + * extendedMetaData="kind='attribute' name='skipped' namespace='##targetNamespace'" + * @generated + */ + String getSkipped(); + + /** + * Sets the value of the '{@link org.eclipse.etrice.etunit.converter.Etunit.TestsuiteType#getSkipped <em>Skipped</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Skipped</em>' attribute. + * @see #getSkipped() + * @generated + */ + void setSkipped(String value); + + /** + * Returns the value of the '<em><b>Tests</b></em>' attribute. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Tests</em>' attribute isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Tests</em>' attribute. + * @see #setTests(String) + * @see org.eclipse.etrice.etunit.converter.Etunit.EtunitPackage#getTestsuiteType_Tests() + * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true" + * extendedMetaData="kind='attribute' name='tests' namespace='##targetNamespace'" + * @generated + */ + String getTests(); + + /** + * Sets the value of the '{@link org.eclipse.etrice.etunit.converter.Etunit.TestsuiteType#getTests <em>Tests</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Tests</em>' attribute. + * @see #getTests() + * @generated + */ + void setTests(String value); + + /** + * Returns the value of the '<em><b>Time</b></em>' attribute. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Time</em>' attribute isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Time</em>' attribute. + * @see #setTime(String) + * @see org.eclipse.etrice.etunit.converter.Etunit.EtunitPackage#getTestsuiteType_Time() + * @model dataType="org.eclipse.emf.ecore.xml.type.String" + * extendedMetaData="kind='attribute' name='time' namespace='##targetNamespace'" + * @generated + */ + String getTime(); + + /** + * Sets the value of the '{@link org.eclipse.etrice.etunit.converter.Etunit.TestsuiteType#getTime <em>Time</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Time</em>' attribute. + * @see #getTime() + * @generated + */ + void setTime(String value); + + /** + * Returns the value of the '<em><b>Timestamp</b></em>' attribute. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Timestamp</em>' attribute isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Timestamp</em>' attribute. + * @see #setTimestamp(String) + * @see org.eclipse.etrice.etunit.converter.Etunit.EtunitPackage#getTestsuiteType_Timestamp() + * @model dataType="org.eclipse.emf.ecore.xml.type.String" + * extendedMetaData="kind='attribute' name='timestamp' namespace='##targetNamespace'" + * @generated + */ + String getTimestamp(); + + /** + * Sets the value of the '{@link org.eclipse.etrice.etunit.converter.Etunit.TestsuiteType#getTimestamp <em>Timestamp</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Timestamp</em>' attribute. + * @see #getTimestamp() + * @generated + */ + void setTimestamp(String value); } // TestsuiteType diff --git a/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/TestsuitesType.java b/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/TestsuitesType.java index 47592ff8b..6bf33d76e 100644 --- a/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/TestsuitesType.java +++ b/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/TestsuitesType.java @@ -1,8 +1,4 @@ /** - * <copyright> - * </copyright> - * - * $Id$ */ package org.eclipse.etrice.etunit.converter.Etunit; @@ -17,10 +13,16 @@ import org.eclipse.emf.ecore.EObject; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.TestsuitesType#getTestsuite <em>Testsuite</em>}</li> + * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.TestsuitesType#getDisabled <em>Disabled</em>}</li> + * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.TestsuitesType#getErrors <em>Errors</em>}</li> + * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.TestsuitesType#getFailures <em>Failures</em>}</li> + * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.TestsuitesType#getName <em>Name</em>}</li> + * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.TestsuitesType#getTests <em>Tests</em>}</li> + * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.TestsuitesType#getTime <em>Time</em>}</li> * </ul> - * </p> * * @see org.eclipse.etrice.etunit.converter.Etunit.EtunitPackage#getTestsuitesType() * @model extendedMetaData="name='testsuites_._type' kind='elementOnly'" @@ -44,4 +46,166 @@ public interface TestsuitesType extends EObject { */ EList<TestsuiteType> getTestsuite(); + /** + * Returns the value of the '<em><b>Disabled</b></em>' attribute. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Disabled</em>' attribute isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Disabled</em>' attribute. + * @see #setDisabled(String) + * @see org.eclipse.etrice.etunit.converter.Etunit.EtunitPackage#getTestsuitesType_Disabled() + * @model dataType="org.eclipse.emf.ecore.xml.type.String" + * extendedMetaData="kind='attribute' name='disabled' namespace='##targetNamespace'" + * @generated + */ + String getDisabled(); + + /** + * Sets the value of the '{@link org.eclipse.etrice.etunit.converter.Etunit.TestsuitesType#getDisabled <em>Disabled</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Disabled</em>' attribute. + * @see #getDisabled() + * @generated + */ + void setDisabled(String value); + + /** + * Returns the value of the '<em><b>Errors</b></em>' attribute. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Errors</em>' attribute isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Errors</em>' attribute. + * @see #setErrors(String) + * @see org.eclipse.etrice.etunit.converter.Etunit.EtunitPackage#getTestsuitesType_Errors() + * @model dataType="org.eclipse.emf.ecore.xml.type.String" + * extendedMetaData="kind='attribute' name='errors' namespace='##targetNamespace'" + * @generated + */ + String getErrors(); + + /** + * Sets the value of the '{@link org.eclipse.etrice.etunit.converter.Etunit.TestsuitesType#getErrors <em>Errors</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Errors</em>' attribute. + * @see #getErrors() + * @generated + */ + void setErrors(String value); + + /** + * Returns the value of the '<em><b>Failures</b></em>' attribute. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Failures</em>' attribute isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Failures</em>' attribute. + * @see #setFailures(String) + * @see org.eclipse.etrice.etunit.converter.Etunit.EtunitPackage#getTestsuitesType_Failures() + * @model dataType="org.eclipse.emf.ecore.xml.type.String" + * extendedMetaData="kind='attribute' name='failures' namespace='##targetNamespace'" + * @generated + */ + String getFailures(); + + /** + * Sets the value of the '{@link org.eclipse.etrice.etunit.converter.Etunit.TestsuitesType#getFailures <em>Failures</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Failures</em>' attribute. + * @see #getFailures() + * @generated + */ + void setFailures(String value); + + /** + * Returns the value of the '<em><b>Name</b></em>' attribute. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Name</em>' attribute isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Name</em>' attribute. + * @see #setName(String) + * @see org.eclipse.etrice.etunit.converter.Etunit.EtunitPackage#getTestsuitesType_Name() + * @model dataType="org.eclipse.emf.ecore.xml.type.String" + * extendedMetaData="kind='attribute' name='name' namespace='##targetNamespace'" + * @generated + */ + String getName(); + + /** + * Sets the value of the '{@link org.eclipse.etrice.etunit.converter.Etunit.TestsuitesType#getName <em>Name</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Name</em>' attribute. + * @see #getName() + * @generated + */ + void setName(String value); + + /** + * Returns the value of the '<em><b>Tests</b></em>' attribute. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Tests</em>' attribute isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Tests</em>' attribute. + * @see #setTests(String) + * @see org.eclipse.etrice.etunit.converter.Etunit.EtunitPackage#getTestsuitesType_Tests() + * @model dataType="org.eclipse.emf.ecore.xml.type.String" + * extendedMetaData="kind='attribute' name='tests' namespace='##targetNamespace'" + * @generated + */ + String getTests(); + + /** + * Sets the value of the '{@link org.eclipse.etrice.etunit.converter.Etunit.TestsuitesType#getTests <em>Tests</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Tests</em>' attribute. + * @see #getTests() + * @generated + */ + void setTests(String value); + + /** + * Returns the value of the '<em><b>Time</b></em>' attribute. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Time</em>' attribute isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Time</em>' attribute. + * @see #setTime(String) + * @see org.eclipse.etrice.etunit.converter.Etunit.EtunitPackage#getTestsuitesType_Time() + * @model dataType="org.eclipse.emf.ecore.xml.type.String" + * extendedMetaData="kind='attribute' name='time' namespace='##targetNamespace'" + * @generated + */ + String getTime(); + + /** + * Sets the value of the '{@link org.eclipse.etrice.etunit.converter.Etunit.TestsuitesType#getTime <em>Time</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Time</em>' attribute. + * @see #getTime() + * @generated + */ + void setTime(String value); + } // TestsuitesType diff --git a/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/impl/DocumentRootImpl.java b/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/impl/DocumentRootImpl.java index ebbda860f..71d41b570 100644 --- a/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/impl/DocumentRootImpl.java +++ b/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/impl/DocumentRootImpl.java @@ -1,8 +1,4 @@ /** - * <copyright> - * </copyright> - * - * $Id$ */ package org.eclipse.etrice.etunit.converter.Etunit.impl; @@ -15,8 +11,8 @@ import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.ecore.EcorePackage; import org.eclipse.emf.ecore.InternalEObject; -import org.eclipse.emf.ecore.impl.EObjectImpl; import org.eclipse.emf.ecore.impl.EStringToStringMapEntryImpl; +import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; import org.eclipse.emf.ecore.util.BasicFeatureMap; import org.eclipse.emf.ecore.util.EcoreEMap; @@ -24,8 +20,14 @@ import org.eclipse.emf.ecore.util.FeatureMap; import org.eclipse.emf.ecore.util.InternalEList; import org.eclipse.etrice.etunit.converter.Etunit.DocumentRoot; +import org.eclipse.etrice.etunit.converter.Etunit.ErrorType; import org.eclipse.etrice.etunit.converter.Etunit.EtunitPackage; -import org.eclipse.etrice.etunit.converter.Etunit.Testsuite; +import org.eclipse.etrice.etunit.converter.Etunit.FailureType; +import org.eclipse.etrice.etunit.converter.Etunit.PropertiesType; +import org.eclipse.etrice.etunit.converter.Etunit.PropertyType; +import org.eclipse.etrice.etunit.converter.Etunit.SkippedType; +import org.eclipse.etrice.etunit.converter.Etunit.TestcaseType; +import org.eclipse.etrice.etunit.converter.Etunit.TestsuiteType; import org.eclipse.etrice.etunit.converter.Etunit.TestsuitesType; /** @@ -34,18 +36,26 @@ import org.eclipse.etrice.etunit.converter.Etunit.TestsuitesType; * <!-- end-user-doc --> * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.impl.DocumentRootImpl#getMixed <em>Mixed</em>}</li> * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.impl.DocumentRootImpl#getXMLNSPrefixMap <em>XMLNS Prefix Map</em>}</li> * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.impl.DocumentRootImpl#getXSISchemaLocation <em>XSI Schema Location</em>}</li> + * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.impl.DocumentRootImpl#getError <em>Error</em>}</li> + * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.impl.DocumentRootImpl#getFailure <em>Failure</em>}</li> + * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.impl.DocumentRootImpl#getProperties <em>Properties</em>}</li> + * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.impl.DocumentRootImpl#getProperty <em>Property</em>}</li> + * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.impl.DocumentRootImpl#getSkipped <em>Skipped</em>}</li> + * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.impl.DocumentRootImpl#getSystemErr <em>System Err</em>}</li> + * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.impl.DocumentRootImpl#getSystemOut <em>System Out</em>}</li> + * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.impl.DocumentRootImpl#getTestcase <em>Testcase</em>}</li> * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.impl.DocumentRootImpl#getTestsuite <em>Testsuite</em>}</li> * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.impl.DocumentRootImpl#getTestsuites <em>Testsuites</em>}</li> * </ul> - * </p> * * @generated */ -public class DocumentRootImpl extends EObjectImpl implements DocumentRoot { +public class DocumentRootImpl extends MinimalEObjectImpl.Container implements DocumentRoot { /** * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list. * <!-- begin-user-doc --> @@ -77,6 +87,26 @@ public class DocumentRootImpl extends EObjectImpl implements DocumentRoot { protected EMap<String, String> xSISchemaLocation; /** + * The default value of the '{@link #getSystemErr() <em>System Err</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getSystemErr() + * @generated + * @ordered + */ + protected static final String SYSTEM_ERR_EDEFAULT = null; + + /** + * The default value of the '{@link #getSystemOut() <em>System Out</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getSystemOut() + * @generated + * @ordered + */ + protected static final String SYSTEM_OUT_EDEFAULT = null; + + /** * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated @@ -100,6 +130,7 @@ public class DocumentRootImpl extends EObjectImpl implements DocumentRoot { * <!-- end-user-doc --> * @generated */ + @Override public FeatureMap getMixed() { if (mixed == null) { mixed = new BasicFeatureMap(this, EtunitPackage.DOCUMENT_ROOT__MIXED); @@ -112,6 +143,7 @@ public class DocumentRootImpl extends EObjectImpl implements DocumentRoot { * <!-- end-user-doc --> * @generated */ + @Override public EMap<String, String> getXMLNSPrefixMap() { if (xMLNSPrefixMap == null) { xMLNSPrefixMap = new EcoreEMap<String,String>(EcorePackage.Literals.ESTRING_TO_STRING_MAP_ENTRY, EStringToStringMapEntryImpl.class, this, EtunitPackage.DOCUMENT_ROOT__XMLNS_PREFIX_MAP); @@ -124,6 +156,7 @@ public class DocumentRootImpl extends EObjectImpl implements DocumentRoot { * <!-- end-user-doc --> * @generated */ + @Override public EMap<String, String> getXSISchemaLocation() { if (xSISchemaLocation == null) { xSISchemaLocation = new EcoreEMap<String,String>(EcorePackage.Literals.ESTRING_TO_STRING_MAP_ENTRY, EStringToStringMapEntryImpl.class, this, EtunitPackage.DOCUMENT_ROOT__XSI_SCHEMA_LOCATION); @@ -136,8 +169,125 @@ public class DocumentRootImpl extends EObjectImpl implements DocumentRoot { * <!-- end-user-doc --> * @generated */ - public Testsuite getTestsuite() { - return (Testsuite)getMixed().get(EtunitPackage.Literals.DOCUMENT_ROOT__TESTSUITE, true); + @Override + public ErrorType getError() { + return (ErrorType)getMixed().get(EtunitPackage.Literals.DOCUMENT_ROOT__ERROR, true); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public NotificationChain basicSetError(ErrorType newError, NotificationChain msgs) { + return ((FeatureMap.Internal)getMixed()).basicAdd(EtunitPackage.Literals.DOCUMENT_ROOT__ERROR, newError, msgs); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void setError(ErrorType newError) { + ((FeatureMap.Internal)getMixed()).set(EtunitPackage.Literals.DOCUMENT_ROOT__ERROR, newError); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public FailureType getFailure() { + return (FailureType)getMixed().get(EtunitPackage.Literals.DOCUMENT_ROOT__FAILURE, true); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public NotificationChain basicSetFailure(FailureType newFailure, NotificationChain msgs) { + return ((FeatureMap.Internal)getMixed()).basicAdd(EtunitPackage.Literals.DOCUMENT_ROOT__FAILURE, newFailure, msgs); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void setFailure(FailureType newFailure) { + ((FeatureMap.Internal)getMixed()).set(EtunitPackage.Literals.DOCUMENT_ROOT__FAILURE, newFailure); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public PropertiesType getProperties() { + return (PropertiesType)getMixed().get(EtunitPackage.Literals.DOCUMENT_ROOT__PROPERTIES, true); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public NotificationChain basicSetProperties(PropertiesType newProperties, NotificationChain msgs) { + return ((FeatureMap.Internal)getMixed()).basicAdd(EtunitPackage.Literals.DOCUMENT_ROOT__PROPERTIES, newProperties, msgs); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void setProperties(PropertiesType newProperties) { + ((FeatureMap.Internal)getMixed()).set(EtunitPackage.Literals.DOCUMENT_ROOT__PROPERTIES, newProperties); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public PropertyType getProperty() { + return (PropertyType)getMixed().get(EtunitPackage.Literals.DOCUMENT_ROOT__PROPERTY, true); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public NotificationChain basicSetProperty(PropertyType newProperty, NotificationChain msgs) { + return ((FeatureMap.Internal)getMixed()).basicAdd(EtunitPackage.Literals.DOCUMENT_ROOT__PROPERTY, newProperty, msgs); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void setProperty(PropertyType newProperty) { + ((FeatureMap.Internal)getMixed()).set(EtunitPackage.Literals.DOCUMENT_ROOT__PROPERTY, newProperty); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public SkippedType getSkipped() { + return (SkippedType)getMixed().get(EtunitPackage.Literals.DOCUMENT_ROOT__SKIPPED, true); } /** @@ -145,7 +295,105 @@ public class DocumentRootImpl extends EObjectImpl implements DocumentRoot { * <!-- end-user-doc --> * @generated */ - public NotificationChain basicSetTestsuite(Testsuite newTestsuite, NotificationChain msgs) { + public NotificationChain basicSetSkipped(SkippedType newSkipped, NotificationChain msgs) { + return ((FeatureMap.Internal)getMixed()).basicAdd(EtunitPackage.Literals.DOCUMENT_ROOT__SKIPPED, newSkipped, msgs); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void setSkipped(SkippedType newSkipped) { + ((FeatureMap.Internal)getMixed()).set(EtunitPackage.Literals.DOCUMENT_ROOT__SKIPPED, newSkipped); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public String getSystemErr() { + return (String)getMixed().get(EtunitPackage.Literals.DOCUMENT_ROOT__SYSTEM_ERR, true); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void setSystemErr(String newSystemErr) { + ((FeatureMap.Internal)getMixed()).set(EtunitPackage.Literals.DOCUMENT_ROOT__SYSTEM_ERR, newSystemErr); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public String getSystemOut() { + return (String)getMixed().get(EtunitPackage.Literals.DOCUMENT_ROOT__SYSTEM_OUT, true); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void setSystemOut(String newSystemOut) { + ((FeatureMap.Internal)getMixed()).set(EtunitPackage.Literals.DOCUMENT_ROOT__SYSTEM_OUT, newSystemOut); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public TestcaseType getTestcase() { + return (TestcaseType)getMixed().get(EtunitPackage.Literals.DOCUMENT_ROOT__TESTCASE, true); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public NotificationChain basicSetTestcase(TestcaseType newTestcase, NotificationChain msgs) { + return ((FeatureMap.Internal)getMixed()).basicAdd(EtunitPackage.Literals.DOCUMENT_ROOT__TESTCASE, newTestcase, msgs); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void setTestcase(TestcaseType newTestcase) { + ((FeatureMap.Internal)getMixed()).set(EtunitPackage.Literals.DOCUMENT_ROOT__TESTCASE, newTestcase); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public TestsuiteType getTestsuite() { + return (TestsuiteType)getMixed().get(EtunitPackage.Literals.DOCUMENT_ROOT__TESTSUITE, true); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public NotificationChain basicSetTestsuite(TestsuiteType newTestsuite, NotificationChain msgs) { return ((FeatureMap.Internal)getMixed()).basicAdd(EtunitPackage.Literals.DOCUMENT_ROOT__TESTSUITE, newTestsuite, msgs); } @@ -154,7 +402,8 @@ public class DocumentRootImpl extends EObjectImpl implements DocumentRoot { * <!-- end-user-doc --> * @generated */ - public void setTestsuite(Testsuite newTestsuite) { + @Override + public void setTestsuite(TestsuiteType newTestsuite) { ((FeatureMap.Internal)getMixed()).set(EtunitPackage.Literals.DOCUMENT_ROOT__TESTSUITE, newTestsuite); } @@ -163,6 +412,7 @@ public class DocumentRootImpl extends EObjectImpl implements DocumentRoot { * <!-- end-user-doc --> * @generated */ + @Override public TestsuitesType getTestsuites() { return (TestsuitesType)getMixed().get(EtunitPackage.Literals.DOCUMENT_ROOT__TESTSUITES, true); } @@ -181,6 +431,7 @@ public class DocumentRootImpl extends EObjectImpl implements DocumentRoot { * <!-- end-user-doc --> * @generated */ + @Override public void setTestsuites(TestsuitesType newTestsuites) { ((FeatureMap.Internal)getMixed()).set(EtunitPackage.Literals.DOCUMENT_ROOT__TESTSUITES, newTestsuites); } @@ -199,6 +450,18 @@ public class DocumentRootImpl extends EObjectImpl implements DocumentRoot { return ((InternalEList<?>)getXMLNSPrefixMap()).basicRemove(otherEnd, msgs); case EtunitPackage.DOCUMENT_ROOT__XSI_SCHEMA_LOCATION: return ((InternalEList<?>)getXSISchemaLocation()).basicRemove(otherEnd, msgs); + case EtunitPackage.DOCUMENT_ROOT__ERROR: + return basicSetError(null, msgs); + case EtunitPackage.DOCUMENT_ROOT__FAILURE: + return basicSetFailure(null, msgs); + case EtunitPackage.DOCUMENT_ROOT__PROPERTIES: + return basicSetProperties(null, msgs); + case EtunitPackage.DOCUMENT_ROOT__PROPERTY: + return basicSetProperty(null, msgs); + case EtunitPackage.DOCUMENT_ROOT__SKIPPED: + return basicSetSkipped(null, msgs); + case EtunitPackage.DOCUMENT_ROOT__TESTCASE: + return basicSetTestcase(null, msgs); case EtunitPackage.DOCUMENT_ROOT__TESTSUITE: return basicSetTestsuite(null, msgs); case EtunitPackage.DOCUMENT_ROOT__TESTSUITES: @@ -224,6 +487,22 @@ public class DocumentRootImpl extends EObjectImpl implements DocumentRoot { case EtunitPackage.DOCUMENT_ROOT__XSI_SCHEMA_LOCATION: if (coreType) return getXSISchemaLocation(); else return getXSISchemaLocation().map(); + case EtunitPackage.DOCUMENT_ROOT__ERROR: + return getError(); + case EtunitPackage.DOCUMENT_ROOT__FAILURE: + return getFailure(); + case EtunitPackage.DOCUMENT_ROOT__PROPERTIES: + return getProperties(); + case EtunitPackage.DOCUMENT_ROOT__PROPERTY: + return getProperty(); + case EtunitPackage.DOCUMENT_ROOT__SKIPPED: + return getSkipped(); + case EtunitPackage.DOCUMENT_ROOT__SYSTEM_ERR: + return getSystemErr(); + case EtunitPackage.DOCUMENT_ROOT__SYSTEM_OUT: + return getSystemOut(); + case EtunitPackage.DOCUMENT_ROOT__TESTCASE: + return getTestcase(); case EtunitPackage.DOCUMENT_ROOT__TESTSUITE: return getTestsuite(); case EtunitPackage.DOCUMENT_ROOT__TESTSUITES: @@ -249,8 +528,32 @@ public class DocumentRootImpl extends EObjectImpl implements DocumentRoot { case EtunitPackage.DOCUMENT_ROOT__XSI_SCHEMA_LOCATION: ((EStructuralFeature.Setting)getXSISchemaLocation()).set(newValue); return; + case EtunitPackage.DOCUMENT_ROOT__ERROR: + setError((ErrorType)newValue); + return; + case EtunitPackage.DOCUMENT_ROOT__FAILURE: + setFailure((FailureType)newValue); + return; + case EtunitPackage.DOCUMENT_ROOT__PROPERTIES: + setProperties((PropertiesType)newValue); + return; + case EtunitPackage.DOCUMENT_ROOT__PROPERTY: + setProperty((PropertyType)newValue); + return; + case EtunitPackage.DOCUMENT_ROOT__SKIPPED: + setSkipped((SkippedType)newValue); + return; + case EtunitPackage.DOCUMENT_ROOT__SYSTEM_ERR: + setSystemErr((String)newValue); + return; + case EtunitPackage.DOCUMENT_ROOT__SYSTEM_OUT: + setSystemOut((String)newValue); + return; + case EtunitPackage.DOCUMENT_ROOT__TESTCASE: + setTestcase((TestcaseType)newValue); + return; case EtunitPackage.DOCUMENT_ROOT__TESTSUITE: - setTestsuite((Testsuite)newValue); + setTestsuite((TestsuiteType)newValue); return; case EtunitPackage.DOCUMENT_ROOT__TESTSUITES: setTestsuites((TestsuitesType)newValue); @@ -276,8 +579,32 @@ public class DocumentRootImpl extends EObjectImpl implements DocumentRoot { case EtunitPackage.DOCUMENT_ROOT__XSI_SCHEMA_LOCATION: getXSISchemaLocation().clear(); return; + case EtunitPackage.DOCUMENT_ROOT__ERROR: + setError((ErrorType)null); + return; + case EtunitPackage.DOCUMENT_ROOT__FAILURE: + setFailure((FailureType)null); + return; + case EtunitPackage.DOCUMENT_ROOT__PROPERTIES: + setProperties((PropertiesType)null); + return; + case EtunitPackage.DOCUMENT_ROOT__PROPERTY: + setProperty((PropertyType)null); + return; + case EtunitPackage.DOCUMENT_ROOT__SKIPPED: + setSkipped((SkippedType)null); + return; + case EtunitPackage.DOCUMENT_ROOT__SYSTEM_ERR: + setSystemErr(SYSTEM_ERR_EDEFAULT); + return; + case EtunitPackage.DOCUMENT_ROOT__SYSTEM_OUT: + setSystemOut(SYSTEM_OUT_EDEFAULT); + return; + case EtunitPackage.DOCUMENT_ROOT__TESTCASE: + setTestcase((TestcaseType)null); + return; case EtunitPackage.DOCUMENT_ROOT__TESTSUITE: - setTestsuite((Testsuite)null); + setTestsuite((TestsuiteType)null); return; case EtunitPackage.DOCUMENT_ROOT__TESTSUITES: setTestsuites((TestsuitesType)null); @@ -300,6 +627,22 @@ public class DocumentRootImpl extends EObjectImpl implements DocumentRoot { return xMLNSPrefixMap != null && !xMLNSPrefixMap.isEmpty(); case EtunitPackage.DOCUMENT_ROOT__XSI_SCHEMA_LOCATION: return xSISchemaLocation != null && !xSISchemaLocation.isEmpty(); + case EtunitPackage.DOCUMENT_ROOT__ERROR: + return getError() != null; + case EtunitPackage.DOCUMENT_ROOT__FAILURE: + return getFailure() != null; + case EtunitPackage.DOCUMENT_ROOT__PROPERTIES: + return getProperties() != null; + case EtunitPackage.DOCUMENT_ROOT__PROPERTY: + return getProperty() != null; + case EtunitPackage.DOCUMENT_ROOT__SKIPPED: + return getSkipped() != null; + case EtunitPackage.DOCUMENT_ROOT__SYSTEM_ERR: + return SYSTEM_ERR_EDEFAULT == null ? getSystemErr() != null : !SYSTEM_ERR_EDEFAULT.equals(getSystemErr()); + case EtunitPackage.DOCUMENT_ROOT__SYSTEM_OUT: + return SYSTEM_OUT_EDEFAULT == null ? getSystemOut() != null : !SYSTEM_OUT_EDEFAULT.equals(getSystemOut()); + case EtunitPackage.DOCUMENT_ROOT__TESTCASE: + return getTestcase() != null; case EtunitPackage.DOCUMENT_ROOT__TESTSUITE: return getTestsuite() != null; case EtunitPackage.DOCUMENT_ROOT__TESTSUITES: @@ -317,7 +660,7 @@ public class DocumentRootImpl extends EObjectImpl implements DocumentRoot { public String toString() { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (mixed: "); result.append(mixed); result.append(')'); diff --git a/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/impl/ErrorTypeImpl.java b/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/impl/ErrorTypeImpl.java index 387c9b3e3..271197c35 100644 --- a/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/impl/ErrorTypeImpl.java +++ b/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/impl/ErrorTypeImpl.java @@ -1,18 +1,20 @@ /** - * <copyright> - * </copyright> - * - * $Id$ */ package org.eclipse.etrice.etunit.converter.Etunit.impl; +import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; + import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; -import org.eclipse.emf.ecore.impl.EObjectImpl; + +import org.eclipse.emf.ecore.impl.ENotificationImpl; +import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; + import org.eclipse.emf.ecore.util.BasicFeatureMap; import org.eclipse.emf.ecore.util.FeatureMap; import org.eclipse.emf.ecore.util.InternalEList; + import org.eclipse.etrice.etunit.converter.Etunit.ErrorType; import org.eclipse.etrice.etunit.converter.Etunit.EtunitPackage; @@ -22,16 +24,16 @@ import org.eclipse.etrice.etunit.converter.Etunit.EtunitPackage; * <!-- end-user-doc --> * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.impl.ErrorTypeImpl#getMixed <em>Mixed</em>}</li> - * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.impl.ErrorTypeImpl#getExpected <em>Expected</em>}</li> - * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.impl.ErrorTypeImpl#getActual <em>Actual</em>}</li> + * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.impl.ErrorTypeImpl#getMessage <em>Message</em>}</li> + * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.impl.ErrorTypeImpl#getType <em>Type</em>}</li> * </ul> - * </p> * * @generated */ -public class ErrorTypeImpl extends EObjectImpl implements ErrorType { +public class ErrorTypeImpl extends MinimalEObjectImpl.Container implements ErrorType { /** * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list. * <!-- begin-user-doc --> @@ -43,24 +45,44 @@ public class ErrorTypeImpl extends EObjectImpl implements ErrorType { protected FeatureMap mixed; /** - * The default value of the '{@link #getExpected() <em>Expected</em>}' attribute. + * The default value of the '{@link #getMessage() <em>Message</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getMessage() + * @generated + * @ordered + */ + protected static final String MESSAGE_EDEFAULT = null; + + /** + * The cached value of the '{@link #getMessage() <em>Message</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getExpected() + * @see #getMessage() * @generated * @ordered */ - protected static final String EXPECTED_EDEFAULT = null; + protected String message = MESSAGE_EDEFAULT; /** - * The default value of the '{@link #getActual() <em>Actual</em>}' attribute. + * The default value of the '{@link #getType() <em>Type</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getActual() + * @see #getType() * @generated * @ordered */ - protected static final String ACTUAL_EDEFAULT = null; + protected static final String TYPE_EDEFAULT = null; + + /** + * The cached value of the '{@link #getType() <em>Type</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getType() + * @generated + * @ordered + */ + protected String type = TYPE_EDEFAULT; /** * <!-- begin-user-doc --> @@ -86,6 +108,7 @@ public class ErrorTypeImpl extends EObjectImpl implements ErrorType { * <!-- end-user-doc --> * @generated */ + @Override public FeatureMap getMixed() { if (mixed == null) { mixed = new BasicFeatureMap(this, EtunitPackage.ERROR_TYPE__MIXED); @@ -98,8 +121,9 @@ public class ErrorTypeImpl extends EObjectImpl implements ErrorType { * <!-- end-user-doc --> * @generated */ - public String getExpected() { - return (String)getMixed().get(EtunitPackage.Literals.ERROR_TYPE__EXPECTED, true); + @Override + public String getMessage() { + return message; } /** @@ -107,8 +131,12 @@ public class ErrorTypeImpl extends EObjectImpl implements ErrorType { * <!-- end-user-doc --> * @generated */ - public void setExpected(String newExpected) { - ((FeatureMap.Internal)getMixed()).set(EtunitPackage.Literals.ERROR_TYPE__EXPECTED, newExpected); + @Override + public void setMessage(String newMessage) { + String oldMessage = message; + message = newMessage; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EtunitPackage.ERROR_TYPE__MESSAGE, oldMessage, message)); } /** @@ -116,8 +144,9 @@ public class ErrorTypeImpl extends EObjectImpl implements ErrorType { * <!-- end-user-doc --> * @generated */ - public String getActual() { - return (String)getMixed().get(EtunitPackage.Literals.ERROR_TYPE__ACTUAL, true); + @Override + public String getType() { + return type; } /** @@ -125,8 +154,12 @@ public class ErrorTypeImpl extends EObjectImpl implements ErrorType { * <!-- end-user-doc --> * @generated */ - public void setActual(String newActual) { - ((FeatureMap.Internal)getMixed()).set(EtunitPackage.Literals.ERROR_TYPE__ACTUAL, newActual); + @Override + public void setType(String newType) { + String oldType = type; + type = newType; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EtunitPackage.ERROR_TYPE__TYPE, oldType, type)); } /** @@ -154,10 +187,10 @@ public class ErrorTypeImpl extends EObjectImpl implements ErrorType { case EtunitPackage.ERROR_TYPE__MIXED: if (coreType) return getMixed(); return ((FeatureMap.Internal)getMixed()).getWrapper(); - case EtunitPackage.ERROR_TYPE__EXPECTED: - return getExpected(); - case EtunitPackage.ERROR_TYPE__ACTUAL: - return getActual(); + case EtunitPackage.ERROR_TYPE__MESSAGE: + return getMessage(); + case EtunitPackage.ERROR_TYPE__TYPE: + return getType(); } return super.eGet(featureID, resolve, coreType); } @@ -173,11 +206,11 @@ public class ErrorTypeImpl extends EObjectImpl implements ErrorType { case EtunitPackage.ERROR_TYPE__MIXED: ((FeatureMap.Internal)getMixed()).set(newValue); return; - case EtunitPackage.ERROR_TYPE__EXPECTED: - setExpected((String)newValue); + case EtunitPackage.ERROR_TYPE__MESSAGE: + setMessage((String)newValue); return; - case EtunitPackage.ERROR_TYPE__ACTUAL: - setActual((String)newValue); + case EtunitPackage.ERROR_TYPE__TYPE: + setType((String)newValue); return; } super.eSet(featureID, newValue); @@ -194,11 +227,11 @@ public class ErrorTypeImpl extends EObjectImpl implements ErrorType { case EtunitPackage.ERROR_TYPE__MIXED: getMixed().clear(); return; - case EtunitPackage.ERROR_TYPE__EXPECTED: - setExpected(EXPECTED_EDEFAULT); + case EtunitPackage.ERROR_TYPE__MESSAGE: + setMessage(MESSAGE_EDEFAULT); return; - case EtunitPackage.ERROR_TYPE__ACTUAL: - setActual(ACTUAL_EDEFAULT); + case EtunitPackage.ERROR_TYPE__TYPE: + setType(TYPE_EDEFAULT); return; } super.eUnset(featureID); @@ -214,10 +247,10 @@ public class ErrorTypeImpl extends EObjectImpl implements ErrorType { switch (featureID) { case EtunitPackage.ERROR_TYPE__MIXED: return mixed != null && !mixed.isEmpty(); - case EtunitPackage.ERROR_TYPE__EXPECTED: - return EXPECTED_EDEFAULT == null ? getExpected() != null : !EXPECTED_EDEFAULT.equals(getExpected()); - case EtunitPackage.ERROR_TYPE__ACTUAL: - return ACTUAL_EDEFAULT == null ? getActual() != null : !ACTUAL_EDEFAULT.equals(getActual()); + case EtunitPackage.ERROR_TYPE__MESSAGE: + return MESSAGE_EDEFAULT == null ? message != null : !MESSAGE_EDEFAULT.equals(message); + case EtunitPackage.ERROR_TYPE__TYPE: + return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type); } return super.eIsSet(featureID); } @@ -231,9 +264,13 @@ public class ErrorTypeImpl extends EObjectImpl implements ErrorType { public String toString() { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (mixed: "); result.append(mixed); + result.append(", message: "); + result.append(message); + result.append(", type: "); + result.append(type); result.append(')'); return result.toString(); } diff --git a/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/impl/EtunitFactoryImpl.java b/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/impl/EtunitFactoryImpl.java index 408afb6d1..f75d32a1c 100644 --- a/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/impl/EtunitFactoryImpl.java +++ b/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/impl/EtunitFactoryImpl.java @@ -1,15 +1,8 @@ /** - * <copyright> - * </copyright> - * - * $Id$ */ package org.eclipse.etrice.etunit.converter.Etunit.impl; -import javax.xml.datatype.XMLGregorianCalendar; - import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.EDataType; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EPackage; @@ -17,9 +10,6 @@ import org.eclipse.emf.ecore.impl.EFactoryImpl; import org.eclipse.emf.ecore.plugin.EcorePlugin; -import org.eclipse.emf.ecore.xml.type.XMLTypeFactory; -import org.eclipse.emf.ecore.xml.type.XMLTypePackage; - import org.eclipse.etrice.etunit.converter.Etunit.*; /** @@ -37,7 +27,7 @@ public class EtunitFactoryImpl extends EFactoryImpl implements EtunitFactory { */ public static EtunitFactory init() { try { - EtunitFactory theEtunitFactory = (EtunitFactory)EPackage.Registry.INSTANCE.getEFactory("platform:/resource/org.eclipse.etrice.etunit.converter/model/etunit.xsd"); + EtunitFactory theEtunitFactory = (EtunitFactory)EPackage.Registry.INSTANCE.getEFactory(EtunitPackage.eNS_URI); if (theEtunitFactory != null) { return theEtunitFactory; } @@ -69,8 +59,10 @@ public class EtunitFactoryImpl extends EFactoryImpl implements EtunitFactory { case EtunitPackage.DOCUMENT_ROOT: return createDocumentRoot(); case EtunitPackage.ERROR_TYPE: return createErrorType(); case EtunitPackage.FAILURE_TYPE: return createFailureType(); + case EtunitPackage.PROPERTIES_TYPE: return createPropertiesType(); + case EtunitPackage.PROPERTY_TYPE: return createPropertyType(); + case EtunitPackage.SKIPPED_TYPE: return createSkippedType(); case EtunitPackage.TESTCASE_TYPE: return createTestcaseType(); - case EtunitPackage.TESTSUITE: return createTestsuite(); case EtunitPackage.TESTSUITES_TYPE: return createTestsuitesType(); case EtunitPackage.TESTSUITE_TYPE: return createTestsuiteType(); default: @@ -84,43 +76,6 @@ public class EtunitFactoryImpl extends EFactoryImpl implements EtunitFactory { * @generated */ @Override - public Object createFromString(EDataType eDataType, String initialValue) { - switch (eDataType.getClassifierID()) { - case EtunitPackage.ISO8601DATETIMEPATTERN: - return createISO8601DATETIMEPATTERNFromString(eDataType, initialValue); - case EtunitPackage.NAME_TYPE: - return createNameTypeFromString(eDataType, initialValue); - case EtunitPackage.PRE_STRING: - return createPreStringFromString(eDataType, initialValue); - default: - throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); - } - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public String convertToString(EDataType eDataType, Object instanceValue) { - switch (eDataType.getClassifierID()) { - case EtunitPackage.ISO8601DATETIMEPATTERN: - return convertISO8601DATETIMEPATTERNToString(eDataType, instanceValue); - case EtunitPackage.NAME_TYPE: - return convertNameTypeToString(eDataType, instanceValue); - case EtunitPackage.PRE_STRING: - return convertPreStringToString(eDataType, instanceValue); - default: - throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); - } - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ public DocumentRoot createDocumentRoot() { DocumentRootImpl documentRoot = new DocumentRootImpl(); return documentRoot; @@ -131,6 +86,7 @@ public class EtunitFactoryImpl extends EFactoryImpl implements EtunitFactory { * <!-- end-user-doc --> * @generated */ + @Override public ErrorType createErrorType() { ErrorTypeImpl errorType = new ErrorTypeImpl(); return errorType; @@ -141,6 +97,7 @@ public class EtunitFactoryImpl extends EFactoryImpl implements EtunitFactory { * <!-- end-user-doc --> * @generated */ + @Override public FailureType createFailureType() { FailureTypeImpl failureType = new FailureTypeImpl(); return failureType; @@ -151,48 +108,10 @@ public class EtunitFactoryImpl extends EFactoryImpl implements EtunitFactory { * <!-- end-user-doc --> * @generated */ - public TestcaseType createTestcaseType() { - TestcaseTypeImpl testcaseType = new TestcaseTypeImpl(); - return testcaseType; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public Testsuite createTestsuite() { - TestsuiteImpl testsuite = new TestsuiteImpl(); - return testsuite; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public TestsuitesType createTestsuitesType() { - TestsuitesTypeImpl testsuitesType = new TestsuitesTypeImpl(); - return testsuitesType; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public TestsuiteType createTestsuiteType() { - TestsuiteTypeImpl testsuiteType = new TestsuiteTypeImpl(); - return testsuiteType; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public XMLGregorianCalendar createISO8601DATETIMEPATTERNFromString(EDataType eDataType, String initialValue) { - return (XMLGregorianCalendar)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.DATE_TIME, initialValue); + @Override + public PropertiesType createPropertiesType() { + PropertiesTypeImpl propertiesType = new PropertiesTypeImpl(); + return propertiesType; } /** @@ -200,8 +119,10 @@ public class EtunitFactoryImpl extends EFactoryImpl implements EtunitFactory { * <!-- end-user-doc --> * @generated */ - public String convertISO8601DATETIMEPATTERNToString(EDataType eDataType, Object instanceValue) { - return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.Literals.DATE_TIME, instanceValue); + @Override + public PropertyType createPropertyType() { + PropertyTypeImpl propertyType = new PropertyTypeImpl(); + return propertyType; } /** @@ -209,8 +130,10 @@ public class EtunitFactoryImpl extends EFactoryImpl implements EtunitFactory { * <!-- end-user-doc --> * @generated */ - public String createNameTypeFromString(EDataType eDataType, String initialValue) { - return (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.TOKEN, initialValue); + @Override + public SkippedType createSkippedType() { + SkippedTypeImpl skippedType = new SkippedTypeImpl(); + return skippedType; } /** @@ -218,8 +141,10 @@ public class EtunitFactoryImpl extends EFactoryImpl implements EtunitFactory { * <!-- end-user-doc --> * @generated */ - public String convertNameTypeToString(EDataType eDataType, Object instanceValue) { - return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.Literals.TOKEN, instanceValue); + @Override + public TestcaseType createTestcaseType() { + TestcaseTypeImpl testcaseType = new TestcaseTypeImpl(); + return testcaseType; } /** @@ -227,8 +152,10 @@ public class EtunitFactoryImpl extends EFactoryImpl implements EtunitFactory { * <!-- end-user-doc --> * @generated */ - public String createPreStringFromString(EDataType eDataType, String initialValue) { - return (String)XMLTypeFactory.eINSTANCE.createFromString(XMLTypePackage.Literals.STRING, initialValue); + @Override + public TestsuitesType createTestsuitesType() { + TestsuitesTypeImpl testsuitesType = new TestsuitesTypeImpl(); + return testsuitesType; } /** @@ -236,8 +163,10 @@ public class EtunitFactoryImpl extends EFactoryImpl implements EtunitFactory { * <!-- end-user-doc --> * @generated */ - public String convertPreStringToString(EDataType eDataType, Object instanceValue) { - return XMLTypeFactory.eINSTANCE.convertToString(XMLTypePackage.Literals.STRING, instanceValue); + @Override + public TestsuiteType createTestsuiteType() { + TestsuiteTypeImpl testsuiteType = new TestsuiteTypeImpl(); + return testsuiteType; } /** @@ -245,6 +174,7 @@ public class EtunitFactoryImpl extends EFactoryImpl implements EtunitFactory { * <!-- end-user-doc --> * @generated */ + @Override public EtunitPackage getEtunitPackage() { return (EtunitPackage)getEPackage(); } diff --git a/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/impl/EtunitPackageImpl.java b/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/impl/EtunitPackageImpl.java index 32f59d34d..c3b36faee 100644 --- a/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/impl/EtunitPackageImpl.java +++ b/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/impl/EtunitPackageImpl.java @@ -1,19 +1,11 @@ /** - * <copyright> - * </copyright> - * - * $Id$ */ package org.eclipse.etrice.etunit.converter.Etunit.impl; -import javax.xml.datatype.XMLGregorianCalendar; - import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.EDataType; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.EReference; -import org.eclipse.emf.ecore.EValidator; import org.eclipse.emf.ecore.impl.EPackageImpl; @@ -24,13 +16,13 @@ import org.eclipse.etrice.etunit.converter.Etunit.ErrorType; import org.eclipse.etrice.etunit.converter.Etunit.EtunitFactory; import org.eclipse.etrice.etunit.converter.Etunit.EtunitPackage; import org.eclipse.etrice.etunit.converter.Etunit.FailureType; +import org.eclipse.etrice.etunit.converter.Etunit.PropertiesType; +import org.eclipse.etrice.etunit.converter.Etunit.PropertyType; +import org.eclipse.etrice.etunit.converter.Etunit.SkippedType; import org.eclipse.etrice.etunit.converter.Etunit.TestcaseType; -import org.eclipse.etrice.etunit.converter.Etunit.Testsuite; import org.eclipse.etrice.etunit.converter.Etunit.TestsuiteType; import org.eclipse.etrice.etunit.converter.Etunit.TestsuitesType; -import org.eclipse.etrice.etunit.converter.Etunit.util.EtunitValidator; - /** * <!-- begin-user-doc --> * An implementation of the model <b>Package</b>. @@ -64,49 +56,42 @@ public class EtunitPackageImpl extends EPackageImpl implements EtunitPackage { * <!-- end-user-doc --> * @generated */ - private EClass testcaseTypeEClass = null; - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - private EClass testsuiteEClass = null; + private EClass propertiesTypeEClass = null; /** * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - private EClass testsuitesTypeEClass = null; + private EClass propertyTypeEClass = null; /** * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - private EClass testsuiteTypeEClass = null; + private EClass skippedTypeEClass = null; /** * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - private EDataType iso8601DATETIMEPATTERNEDataType = null; + private EClass testcaseTypeEClass = null; /** * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - private EDataType nameTypeEDataType = null; + private EClass testsuitesTypeEClass = null; /** * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - private EDataType preStringEDataType = null; + private EClass testsuiteTypeEClass = null; /** * Creates an instance of the model <b>Package</b>, registered with @@ -136,7 +121,7 @@ public class EtunitPackageImpl extends EPackageImpl implements EtunitPackage { /** * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends. - * + * * <p>This method is used to initialize {@link EtunitPackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * <!-- begin-user-doc --> @@ -150,7 +135,8 @@ public class EtunitPackageImpl extends EPackageImpl implements EtunitPackage { if (isInited) return (EtunitPackage)EPackage.Registry.INSTANCE.getEPackage(EtunitPackage.eNS_URI); // Obtain or create and register package - EtunitPackageImpl theEtunitPackage = (EtunitPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof EtunitPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new EtunitPackageImpl()); + Object registeredEtunitPackage = EPackage.Registry.INSTANCE.get(eNS_URI); + EtunitPackageImpl theEtunitPackage = registeredEtunitPackage instanceof EtunitPackageImpl ? (EtunitPackageImpl)registeredEtunitPackage : new EtunitPackageImpl(); isInited = true; @@ -163,19 +149,9 @@ public class EtunitPackageImpl extends EPackageImpl implements EtunitPackage { // Initialize created meta-data theEtunitPackage.initializePackageContents(); - // Register package validator - EValidator.Registry.INSTANCE.put - (theEtunitPackage, - new EValidator.Descriptor() { - public EValidator getEValidator() { - return EtunitValidator.INSTANCE; - } - }); - // Mark meta-data to indicate it can't be changed theEtunitPackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(EtunitPackage.eNS_URI, theEtunitPackage); return theEtunitPackage; @@ -186,6 +162,7 @@ public class EtunitPackageImpl extends EPackageImpl implements EtunitPackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getDocumentRoot() { return documentRootEClass; } @@ -195,6 +172,7 @@ public class EtunitPackageImpl extends EPackageImpl implements EtunitPackage { * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getDocumentRoot_Mixed() { return (EAttribute)documentRootEClass.getEStructuralFeatures().get(0); } @@ -204,6 +182,7 @@ public class EtunitPackageImpl extends EPackageImpl implements EtunitPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getDocumentRoot_XMLNSPrefixMap() { return (EReference)documentRootEClass.getEStructuralFeatures().get(1); } @@ -213,6 +192,7 @@ public class EtunitPackageImpl extends EPackageImpl implements EtunitPackage { * <!-- end-user-doc --> * @generated */ + @Override public EReference getDocumentRoot_XSISchemaLocation() { return (EReference)documentRootEClass.getEStructuralFeatures().get(2); } @@ -222,7 +202,8 @@ public class EtunitPackageImpl extends EPackageImpl implements EtunitPackage { * <!-- end-user-doc --> * @generated */ - public EReference getDocumentRoot_Testsuite() { + @Override + public EReference getDocumentRoot_Error() { return (EReference)documentRootEClass.getEStructuralFeatures().get(3); } @@ -231,7 +212,8 @@ public class EtunitPackageImpl extends EPackageImpl implements EtunitPackage { * <!-- end-user-doc --> * @generated */ - public EReference getDocumentRoot_Testsuites() { + @Override + public EReference getDocumentRoot_Failure() { return (EReference)documentRootEClass.getEStructuralFeatures().get(4); } @@ -240,6 +222,87 @@ public class EtunitPackageImpl extends EPackageImpl implements EtunitPackage { * <!-- end-user-doc --> * @generated */ + @Override + public EReference getDocumentRoot_Properties() { + return (EReference)documentRootEClass.getEStructuralFeatures().get(5); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public EReference getDocumentRoot_Property() { + return (EReference)documentRootEClass.getEStructuralFeatures().get(6); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public EReference getDocumentRoot_Skipped() { + return (EReference)documentRootEClass.getEStructuralFeatures().get(7); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public EAttribute getDocumentRoot_SystemErr() { + return (EAttribute)documentRootEClass.getEStructuralFeatures().get(8); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public EAttribute getDocumentRoot_SystemOut() { + return (EAttribute)documentRootEClass.getEStructuralFeatures().get(9); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public EReference getDocumentRoot_Testcase() { + return (EReference)documentRootEClass.getEStructuralFeatures().get(10); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public EReference getDocumentRoot_Testsuite() { + return (EReference)documentRootEClass.getEStructuralFeatures().get(11); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public EReference getDocumentRoot_Testsuites() { + return (EReference)documentRootEClass.getEStructuralFeatures().get(12); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override public EClass getErrorType() { return errorTypeEClass; } @@ -249,6 +312,7 @@ public class EtunitPackageImpl extends EPackageImpl implements EtunitPackage { * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getErrorType_Mixed() { return (EAttribute)errorTypeEClass.getEStructuralFeatures().get(0); } @@ -258,7 +322,8 @@ public class EtunitPackageImpl extends EPackageImpl implements EtunitPackage { * <!-- end-user-doc --> * @generated */ - public EAttribute getErrorType_Expected() { + @Override + public EAttribute getErrorType_Message() { return (EAttribute)errorTypeEClass.getEStructuralFeatures().get(1); } @@ -267,7 +332,8 @@ public class EtunitPackageImpl extends EPackageImpl implements EtunitPackage { * <!-- end-user-doc --> * @generated */ - public EAttribute getErrorType_Actual() { + @Override + public EAttribute getErrorType_Type() { return (EAttribute)errorTypeEClass.getEStructuralFeatures().get(2); } @@ -276,6 +342,7 @@ public class EtunitPackageImpl extends EPackageImpl implements EtunitPackage { * <!-- end-user-doc --> * @generated */ + @Override public EClass getFailureType() { return failureTypeEClass; } @@ -285,6 +352,7 @@ public class EtunitPackageImpl extends EPackageImpl implements EtunitPackage { * <!-- end-user-doc --> * @generated */ + @Override public EAttribute getFailureType_Mixed() { return (EAttribute)failureTypeEClass.getEStructuralFeatures().get(0); } @@ -294,7 +362,8 @@ public class EtunitPackageImpl extends EPackageImpl implements EtunitPackage { * <!-- end-user-doc --> * @generated */ - public EAttribute getFailureType_Expected() { + @Override + public EAttribute getFailureType_Message() { return (EAttribute)failureTypeEClass.getEStructuralFeatures().get(1); } @@ -303,7 +372,8 @@ public class EtunitPackageImpl extends EPackageImpl implements EtunitPackage { * <!-- end-user-doc --> * @generated */ - public EAttribute getFailureType_Actual() { + @Override + public EAttribute getFailureType_Type() { return (EAttribute)failureTypeEClass.getEStructuralFeatures().get(2); } @@ -312,6 +382,87 @@ public class EtunitPackageImpl extends EPackageImpl implements EtunitPackage { * <!-- end-user-doc --> * @generated */ + @Override + public EClass getPropertiesType() { + return propertiesTypeEClass; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public EReference getPropertiesType_Property() { + return (EReference)propertiesTypeEClass.getEStructuralFeatures().get(0); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public EClass getPropertyType() { + return propertyTypeEClass; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public EAttribute getPropertyType_Name() { + return (EAttribute)propertyTypeEClass.getEStructuralFeatures().get(0); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public EAttribute getPropertyType_Value() { + return (EAttribute)propertyTypeEClass.getEStructuralFeatures().get(1); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public EClass getSkippedType() { + return skippedTypeEClass; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public EAttribute getSkippedType_Mixed() { + return (EAttribute)skippedTypeEClass.getEStructuralFeatures().get(0); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public EAttribute getSkippedType_Message() { + return (EAttribute)skippedTypeEClass.getEStructuralFeatures().get(1); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override public EClass getTestcaseType() { return testcaseTypeEClass; } @@ -321,7 +472,8 @@ public class EtunitPackageImpl extends EPackageImpl implements EtunitPackage { * <!-- end-user-doc --> * @generated */ - public EReference getTestcaseType_Error() { + @Override + public EReference getTestcaseType_Skipped() { return (EReference)testcaseTypeEClass.getEStructuralFeatures().get(0); } @@ -330,7 +482,8 @@ public class EtunitPackageImpl extends EPackageImpl implements EtunitPackage { * <!-- end-user-doc --> * @generated */ - public EReference getTestcaseType_Failure() { + @Override + public EReference getTestcaseType_Error() { return (EReference)testcaseTypeEClass.getEStructuralFeatures().get(1); } @@ -339,8 +492,9 @@ public class EtunitPackageImpl extends EPackageImpl implements EtunitPackage { * <!-- end-user-doc --> * @generated */ - public EAttribute getTestcaseType_Classname() { - return (EAttribute)testcaseTypeEClass.getEStructuralFeatures().get(2); + @Override + public EReference getTestcaseType_Failure() { + return (EReference)testcaseTypeEClass.getEStructuralFeatures().get(2); } /** @@ -348,7 +502,8 @@ public class EtunitPackageImpl extends EPackageImpl implements EtunitPackage { * <!-- end-user-doc --> * @generated */ - public EAttribute getTestcaseType_Name() { + @Override + public EAttribute getTestcaseType_SystemOut() { return (EAttribute)testcaseTypeEClass.getEStructuralFeatures().get(3); } @@ -357,7 +512,8 @@ public class EtunitPackageImpl extends EPackageImpl implements EtunitPackage { * <!-- end-user-doc --> * @generated */ - public EAttribute getTestcaseType_Time() { + @Override + public EAttribute getTestcaseType_SystemErr() { return (EAttribute)testcaseTypeEClass.getEStructuralFeatures().get(4); } @@ -366,8 +522,9 @@ public class EtunitPackageImpl extends EPackageImpl implements EtunitPackage { * <!-- end-user-doc --> * @generated */ - public EClass getTestsuite() { - return testsuiteEClass; + @Override + public EAttribute getTestcaseType_Assertions() { + return (EAttribute)testcaseTypeEClass.getEStructuralFeatures().get(5); } /** @@ -375,8 +532,9 @@ public class EtunitPackageImpl extends EPackageImpl implements EtunitPackage { * <!-- end-user-doc --> * @generated */ - public EReference getTestsuite_Testcase() { - return (EReference)testsuiteEClass.getEStructuralFeatures().get(0); + @Override + public EAttribute getTestcaseType_Classname() { + return (EAttribute)testcaseTypeEClass.getEStructuralFeatures().get(6); } /** @@ -384,8 +542,9 @@ public class EtunitPackageImpl extends EPackageImpl implements EtunitPackage { * <!-- end-user-doc --> * @generated */ - public EAttribute getTestsuite_Errors() { - return (EAttribute)testsuiteEClass.getEStructuralFeatures().get(1); + @Override + public EAttribute getTestcaseType_Name() { + return (EAttribute)testcaseTypeEClass.getEStructuralFeatures().get(7); } /** @@ -393,8 +552,9 @@ public class EtunitPackageImpl extends EPackageImpl implements EtunitPackage { * <!-- end-user-doc --> * @generated */ - public EAttribute getTestsuite_Failures() { - return (EAttribute)testsuiteEClass.getEStructuralFeatures().get(2); + @Override + public EAttribute getTestcaseType_Status() { + return (EAttribute)testcaseTypeEClass.getEStructuralFeatures().get(8); } /** @@ -402,8 +562,9 @@ public class EtunitPackageImpl extends EPackageImpl implements EtunitPackage { * <!-- end-user-doc --> * @generated */ - public EAttribute getTestsuite_Name() { - return (EAttribute)testsuiteEClass.getEStructuralFeatures().get(3); + @Override + public EAttribute getTestcaseType_Time() { + return (EAttribute)testcaseTypeEClass.getEStructuralFeatures().get(9); } /** @@ -411,8 +572,9 @@ public class EtunitPackageImpl extends EPackageImpl implements EtunitPackage { * <!-- end-user-doc --> * @generated */ - public EAttribute getTestsuite_Skipped() { - return (EAttribute)testsuiteEClass.getEStructuralFeatures().get(4); + @Override + public EClass getTestsuitesType() { + return testsuitesTypeEClass; } /** @@ -420,8 +582,9 @@ public class EtunitPackageImpl extends EPackageImpl implements EtunitPackage { * <!-- end-user-doc --> * @generated */ - public EAttribute getTestsuite_Tests() { - return (EAttribute)testsuiteEClass.getEStructuralFeatures().get(5); + @Override + public EReference getTestsuitesType_Testsuite() { + return (EReference)testsuitesTypeEClass.getEStructuralFeatures().get(0); } /** @@ -429,8 +592,9 @@ public class EtunitPackageImpl extends EPackageImpl implements EtunitPackage { * <!-- end-user-doc --> * @generated */ - public EAttribute getTestsuite_Time() { - return (EAttribute)testsuiteEClass.getEStructuralFeatures().get(6); + @Override + public EAttribute getTestsuitesType_Disabled() { + return (EAttribute)testsuitesTypeEClass.getEStructuralFeatures().get(1); } /** @@ -438,8 +602,9 @@ public class EtunitPackageImpl extends EPackageImpl implements EtunitPackage { * <!-- end-user-doc --> * @generated */ - public EAttribute getTestsuite_Timestamp() { - return (EAttribute)testsuiteEClass.getEStructuralFeatures().get(7); + @Override + public EAttribute getTestsuitesType_Errors() { + return (EAttribute)testsuitesTypeEClass.getEStructuralFeatures().get(2); } /** @@ -447,8 +612,9 @@ public class EtunitPackageImpl extends EPackageImpl implements EtunitPackage { * <!-- end-user-doc --> * @generated */ - public EClass getTestsuitesType() { - return testsuitesTypeEClass; + @Override + public EAttribute getTestsuitesType_Failures() { + return (EAttribute)testsuitesTypeEClass.getEStructuralFeatures().get(3); } /** @@ -456,8 +622,19 @@ public class EtunitPackageImpl extends EPackageImpl implements EtunitPackage { * <!-- end-user-doc --> * @generated */ - public EReference getTestsuitesType_Testsuite() { - return (EReference)testsuitesTypeEClass.getEStructuralFeatures().get(0); + @Override + public EAttribute getTestsuitesType_Name() { + return (EAttribute)testsuitesTypeEClass.getEStructuralFeatures().get(4); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public EAttribute getTestsuitesType_Tests() { + return (EAttribute)testsuitesTypeEClass.getEStructuralFeatures().get(5); } /** @@ -465,6 +642,17 @@ public class EtunitPackageImpl extends EPackageImpl implements EtunitPackage { * <!-- end-user-doc --> * @generated */ + @Override + public EAttribute getTestsuitesType_Time() { + return (EAttribute)testsuitesTypeEClass.getEStructuralFeatures().get(6); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override public EClass getTestsuiteType() { return testsuiteTypeEClass; } @@ -474,8 +662,49 @@ public class EtunitPackageImpl extends EPackageImpl implements EtunitPackage { * <!-- end-user-doc --> * @generated */ - public EDataType getISO8601DATETIMEPATTERN() { - return iso8601DATETIMEPATTERNEDataType; + @Override + public EReference getTestsuiteType_Properties() { + return (EReference)testsuiteTypeEClass.getEStructuralFeatures().get(0); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public EReference getTestsuiteType_Testcase() { + return (EReference)testsuiteTypeEClass.getEStructuralFeatures().get(1); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public EAttribute getTestsuiteType_SystemOut() { + return (EAttribute)testsuiteTypeEClass.getEStructuralFeatures().get(2); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public EAttribute getTestsuiteType_SystemErr() { + return (EAttribute)testsuiteTypeEClass.getEStructuralFeatures().get(3); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public EAttribute getTestsuiteType_Disabled() { + return (EAttribute)testsuiteTypeEClass.getEStructuralFeatures().get(4); } /** @@ -483,8 +712,9 @@ public class EtunitPackageImpl extends EPackageImpl implements EtunitPackage { * <!-- end-user-doc --> * @generated */ - public EDataType getNameType() { - return nameTypeEDataType; + @Override + public EAttribute getTestsuiteType_Errors() { + return (EAttribute)testsuiteTypeEClass.getEStructuralFeatures().get(5); } /** @@ -492,8 +722,9 @@ public class EtunitPackageImpl extends EPackageImpl implements EtunitPackage { * <!-- end-user-doc --> * @generated */ - public EDataType getPreString() { - return preStringEDataType; + @Override + public EAttribute getTestsuiteType_Failures() { + return (EAttribute)testsuiteTypeEClass.getEStructuralFeatures().get(6); } /** @@ -501,6 +732,87 @@ public class EtunitPackageImpl extends EPackageImpl implements EtunitPackage { * <!-- end-user-doc --> * @generated */ + @Override + public EAttribute getTestsuiteType_Hostname() { + return (EAttribute)testsuiteTypeEClass.getEStructuralFeatures().get(7); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public EAttribute getTestsuiteType_Id() { + return (EAttribute)testsuiteTypeEClass.getEStructuralFeatures().get(8); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public EAttribute getTestsuiteType_Name() { + return (EAttribute)testsuiteTypeEClass.getEStructuralFeatures().get(9); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public EAttribute getTestsuiteType_Package() { + return (EAttribute)testsuiteTypeEClass.getEStructuralFeatures().get(10); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public EAttribute getTestsuiteType_Skipped() { + return (EAttribute)testsuiteTypeEClass.getEStructuralFeatures().get(11); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public EAttribute getTestsuiteType_Tests() { + return (EAttribute)testsuiteTypeEClass.getEStructuralFeatures().get(12); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public EAttribute getTestsuiteType_Time() { + return (EAttribute)testsuiteTypeEClass.getEStructuralFeatures().get(13); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public EAttribute getTestsuiteType_Timestamp() { + return (EAttribute)testsuiteTypeEClass.getEStructuralFeatures().get(14); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override public EtunitFactory getEtunitFactory() { return (EtunitFactory)getEFactoryInstance(); } @@ -528,45 +840,75 @@ public class EtunitPackageImpl extends EPackageImpl implements EtunitPackage { createEAttribute(documentRootEClass, DOCUMENT_ROOT__MIXED); createEReference(documentRootEClass, DOCUMENT_ROOT__XMLNS_PREFIX_MAP); createEReference(documentRootEClass, DOCUMENT_ROOT__XSI_SCHEMA_LOCATION); + createEReference(documentRootEClass, DOCUMENT_ROOT__ERROR); + createEReference(documentRootEClass, DOCUMENT_ROOT__FAILURE); + createEReference(documentRootEClass, DOCUMENT_ROOT__PROPERTIES); + createEReference(documentRootEClass, DOCUMENT_ROOT__PROPERTY); + createEReference(documentRootEClass, DOCUMENT_ROOT__SKIPPED); + createEAttribute(documentRootEClass, DOCUMENT_ROOT__SYSTEM_ERR); + createEAttribute(documentRootEClass, DOCUMENT_ROOT__SYSTEM_OUT); + createEReference(documentRootEClass, DOCUMENT_ROOT__TESTCASE); createEReference(documentRootEClass, DOCUMENT_ROOT__TESTSUITE); createEReference(documentRootEClass, DOCUMENT_ROOT__TESTSUITES); errorTypeEClass = createEClass(ERROR_TYPE); createEAttribute(errorTypeEClass, ERROR_TYPE__MIXED); - createEAttribute(errorTypeEClass, ERROR_TYPE__EXPECTED); - createEAttribute(errorTypeEClass, ERROR_TYPE__ACTUAL); + createEAttribute(errorTypeEClass, ERROR_TYPE__MESSAGE); + createEAttribute(errorTypeEClass, ERROR_TYPE__TYPE); failureTypeEClass = createEClass(FAILURE_TYPE); createEAttribute(failureTypeEClass, FAILURE_TYPE__MIXED); - createEAttribute(failureTypeEClass, FAILURE_TYPE__EXPECTED); - createEAttribute(failureTypeEClass, FAILURE_TYPE__ACTUAL); + createEAttribute(failureTypeEClass, FAILURE_TYPE__MESSAGE); + createEAttribute(failureTypeEClass, FAILURE_TYPE__TYPE); + + propertiesTypeEClass = createEClass(PROPERTIES_TYPE); + createEReference(propertiesTypeEClass, PROPERTIES_TYPE__PROPERTY); + + propertyTypeEClass = createEClass(PROPERTY_TYPE); + createEAttribute(propertyTypeEClass, PROPERTY_TYPE__NAME); + createEAttribute(propertyTypeEClass, PROPERTY_TYPE__VALUE); + + skippedTypeEClass = createEClass(SKIPPED_TYPE); + createEAttribute(skippedTypeEClass, SKIPPED_TYPE__MIXED); + createEAttribute(skippedTypeEClass, SKIPPED_TYPE__MESSAGE); testcaseTypeEClass = createEClass(TESTCASE_TYPE); + createEReference(testcaseTypeEClass, TESTCASE_TYPE__SKIPPED); createEReference(testcaseTypeEClass, TESTCASE_TYPE__ERROR); createEReference(testcaseTypeEClass, TESTCASE_TYPE__FAILURE); + createEAttribute(testcaseTypeEClass, TESTCASE_TYPE__SYSTEM_OUT); + createEAttribute(testcaseTypeEClass, TESTCASE_TYPE__SYSTEM_ERR); + createEAttribute(testcaseTypeEClass, TESTCASE_TYPE__ASSERTIONS); createEAttribute(testcaseTypeEClass, TESTCASE_TYPE__CLASSNAME); createEAttribute(testcaseTypeEClass, TESTCASE_TYPE__NAME); + createEAttribute(testcaseTypeEClass, TESTCASE_TYPE__STATUS); createEAttribute(testcaseTypeEClass, TESTCASE_TYPE__TIME); - testsuiteEClass = createEClass(TESTSUITE); - createEReference(testsuiteEClass, TESTSUITE__TESTCASE); - createEAttribute(testsuiteEClass, TESTSUITE__ERRORS); - createEAttribute(testsuiteEClass, TESTSUITE__FAILURES); - createEAttribute(testsuiteEClass, TESTSUITE__NAME); - createEAttribute(testsuiteEClass, TESTSUITE__SKIPPED); - createEAttribute(testsuiteEClass, TESTSUITE__TESTS); - createEAttribute(testsuiteEClass, TESTSUITE__TIME); - createEAttribute(testsuiteEClass, TESTSUITE__TIMESTAMP); - testsuitesTypeEClass = createEClass(TESTSUITES_TYPE); createEReference(testsuitesTypeEClass, TESTSUITES_TYPE__TESTSUITE); + createEAttribute(testsuitesTypeEClass, TESTSUITES_TYPE__DISABLED); + createEAttribute(testsuitesTypeEClass, TESTSUITES_TYPE__ERRORS); + createEAttribute(testsuitesTypeEClass, TESTSUITES_TYPE__FAILURES); + createEAttribute(testsuitesTypeEClass, TESTSUITES_TYPE__NAME); + createEAttribute(testsuitesTypeEClass, TESTSUITES_TYPE__TESTS); + createEAttribute(testsuitesTypeEClass, TESTSUITES_TYPE__TIME); testsuiteTypeEClass = createEClass(TESTSUITE_TYPE); - - // Create data types - iso8601DATETIMEPATTERNEDataType = createEDataType(ISO8601DATETIMEPATTERN); - nameTypeEDataType = createEDataType(NAME_TYPE); - preStringEDataType = createEDataType(PRE_STRING); + createEReference(testsuiteTypeEClass, TESTSUITE_TYPE__PROPERTIES); + createEReference(testsuiteTypeEClass, TESTSUITE_TYPE__TESTCASE); + createEAttribute(testsuiteTypeEClass, TESTSUITE_TYPE__SYSTEM_OUT); + createEAttribute(testsuiteTypeEClass, TESTSUITE_TYPE__SYSTEM_ERR); + createEAttribute(testsuiteTypeEClass, TESTSUITE_TYPE__DISABLED); + createEAttribute(testsuiteTypeEClass, TESTSUITE_TYPE__ERRORS); + createEAttribute(testsuiteTypeEClass, TESTSUITE_TYPE__FAILURES); + createEAttribute(testsuiteTypeEClass, TESTSUITE_TYPE__HOSTNAME); + createEAttribute(testsuiteTypeEClass, TESTSUITE_TYPE__ID); + createEAttribute(testsuiteTypeEClass, TESTSUITE_TYPE__NAME); + createEAttribute(testsuiteTypeEClass, TESTSUITE_TYPE__PACKAGE); + createEAttribute(testsuiteTypeEClass, TESTSUITE_TYPE__SKIPPED); + createEAttribute(testsuiteTypeEClass, TESTSUITE_TYPE__TESTS); + createEAttribute(testsuiteTypeEClass, TESTSUITE_TYPE__TIME); + createEAttribute(testsuiteTypeEClass, TESTSUITE_TYPE__TIMESTAMP); } /** @@ -600,52 +942,81 @@ public class EtunitPackageImpl extends EPackageImpl implements EtunitPackage { // Set bounds for type parameters // Add supertypes to classes - testsuiteTypeEClass.getESuperTypes().add(this.getTestsuite()); - // Initialize classes and features; add operations and parameters + // Initialize classes, features, and operations; add parameters initEClass(documentRootEClass, DocumentRoot.class, "DocumentRoot", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getDocumentRoot_Mixed(), ecorePackage.getEFeatureMapEntry(), "mixed", null, 0, -1, null, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getDocumentRoot_XMLNSPrefixMap(), ecorePackage.getEStringToStringMapEntry(), null, "xMLNSPrefixMap", null, 0, -1, null, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getDocumentRoot_XSISchemaLocation(), ecorePackage.getEStringToStringMapEntry(), null, "xSISchemaLocation", null, 0, -1, null, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getDocumentRoot_Testsuite(), this.getTestsuite(), null, "testsuite", null, 0, -2, null, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); + initEReference(getDocumentRoot_Error(), this.getErrorType(), null, "error", null, 0, -2, null, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); + initEReference(getDocumentRoot_Failure(), this.getFailureType(), null, "failure", null, 0, -2, null, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); + initEReference(getDocumentRoot_Properties(), this.getPropertiesType(), null, "properties", null, 0, -2, null, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); + initEReference(getDocumentRoot_Property(), this.getPropertyType(), null, "property", null, 0, -2, null, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); + initEReference(getDocumentRoot_Skipped(), this.getSkippedType(), null, "skipped", null, 0, -2, null, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); + initEAttribute(getDocumentRoot_SystemErr(), theXMLTypePackage.getString(), "systemErr", null, 0, -2, null, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED); + initEAttribute(getDocumentRoot_SystemOut(), theXMLTypePackage.getString(), "systemOut", null, 0, -2, null, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED); + initEReference(getDocumentRoot_Testcase(), this.getTestcaseType(), null, "testcase", null, 0, -2, null, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); + initEReference(getDocumentRoot_Testsuite(), this.getTestsuiteType(), null, "testsuite", null, 0, -2, null, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); initEReference(getDocumentRoot_Testsuites(), this.getTestsuitesType(), null, "testsuites", null, 0, -2, null, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); initEClass(errorTypeEClass, ErrorType.class, "ErrorType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getErrorType_Mixed(), ecorePackage.getEFeatureMapEntry(), "mixed", null, 0, -1, ErrorType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getErrorType_Expected(), theXMLTypePackage.getString(), "expected", null, 1, 1, ErrorType.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED); - initEAttribute(getErrorType_Actual(), theXMLTypePackage.getString(), "actual", null, 1, 1, ErrorType.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED); + initEAttribute(getErrorType_Message(), theXMLTypePackage.getString(), "message", null, 0, 1, ErrorType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getErrorType_Type(), theXMLTypePackage.getString(), "type", null, 0, 1, ErrorType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(failureTypeEClass, FailureType.class, "FailureType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getFailureType_Mixed(), ecorePackage.getEFeatureMapEntry(), "mixed", null, 0, -1, FailureType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getFailureType_Expected(), theXMLTypePackage.getString(), "expected", null, 1, 1, FailureType.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED); - initEAttribute(getFailureType_Actual(), theXMLTypePackage.getString(), "actual", null, 1, 1, FailureType.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED); + initEAttribute(getFailureType_Message(), theXMLTypePackage.getString(), "message", null, 0, 1, FailureType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getFailureType_Type(), theXMLTypePackage.getString(), "type", null, 0, 1, FailureType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + initEClass(propertiesTypeEClass, PropertiesType.class, "PropertiesType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getPropertiesType_Property(), this.getPropertyType(), null, "property", null, 1, -1, PropertiesType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + initEClass(propertyTypeEClass, PropertyType.class, "PropertyType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getPropertyType_Name(), theXMLTypePackage.getString(), "name", null, 1, 1, PropertyType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getPropertyType_Value(), theXMLTypePackage.getString(), "value", null, 1, 1, PropertyType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + initEClass(skippedTypeEClass, SkippedType.class, "SkippedType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getSkippedType_Mixed(), ecorePackage.getEFeatureMapEntry(), "mixed", null, 0, -1, SkippedType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getSkippedType_Message(), theXMLTypePackage.getString(), "message", null, 0, 1, SkippedType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(testcaseTypeEClass, TestcaseType.class, "TestcaseType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getTestcaseType_Error(), this.getErrorType(), null, "error", null, 0, 1, TestcaseType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getTestcaseType_Failure(), this.getFailureType(), null, "failure", null, 0, 1, TestcaseType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getTestcaseType_Classname(), theXMLTypePackage.getToken(), "classname", null, 1, 1, TestcaseType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getTestcaseType_Name(), theXMLTypePackage.getToken(), "name", null, 1, 1, TestcaseType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getTestcaseType_Time(), theXMLTypePackage.getDecimal(), "time", null, 1, 1, TestcaseType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - - initEClass(testsuiteEClass, Testsuite.class, "Testsuite", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getTestsuite_Testcase(), this.getTestcaseType(), null, "testcase", null, 0, -1, Testsuite.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getTestsuite_Errors(), theXMLTypePackage.getInt(), "errors", null, 1, 1, Testsuite.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getTestsuite_Failures(), theXMLTypePackage.getInt(), "failures", null, 1, 1, Testsuite.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getTestsuite_Name(), this.getNameType(), "name", null, 1, 1, Testsuite.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getTestsuite_Skipped(), theXMLTypePackage.getInt(), "skipped", null, 0, 1, Testsuite.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getTestsuite_Tests(), theXMLTypePackage.getInt(), "tests", null, 1, 1, Testsuite.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getTestsuite_Time(), theXMLTypePackage.getDecimal(), "time", null, 1, 1, Testsuite.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getTestsuite_Timestamp(), this.getISO8601DATETIMEPATTERN(), "timestamp", null, 1, 1, Testsuite.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getTestcaseType_Skipped(), this.getSkippedType(), null, "skipped", null, 0, 1, TestcaseType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getTestcaseType_Error(), this.getErrorType(), null, "error", null, 0, -1, TestcaseType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getTestcaseType_Failure(), this.getFailureType(), null, "failure", null, 0, -1, TestcaseType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getTestcaseType_SystemOut(), theXMLTypePackage.getString(), "systemOut", null, 0, -1, TestcaseType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getTestcaseType_SystemErr(), theXMLTypePackage.getString(), "systemErr", null, 0, -1, TestcaseType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getTestcaseType_Assertions(), theXMLTypePackage.getString(), "assertions", null, 0, 1, TestcaseType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getTestcaseType_Classname(), theXMLTypePackage.getString(), "classname", null, 0, 1, TestcaseType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getTestcaseType_Name(), theXMLTypePackage.getString(), "name", null, 1, 1, TestcaseType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getTestcaseType_Status(), theXMLTypePackage.getString(), "status", null, 0, 1, TestcaseType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getTestcaseType_Time(), theXMLTypePackage.getString(), "time", null, 0, 1, TestcaseType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(testsuitesTypeEClass, TestsuitesType.class, "TestsuitesType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEReference(getTestsuitesType_Testsuite(), this.getTestsuiteType(), null, "testsuite", null, 0, -1, TestsuitesType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getTestsuitesType_Disabled(), theXMLTypePackage.getString(), "disabled", null, 0, 1, TestsuitesType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getTestsuitesType_Errors(), theXMLTypePackage.getString(), "errors", null, 0, 1, TestsuitesType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getTestsuitesType_Failures(), theXMLTypePackage.getString(), "failures", null, 0, 1, TestsuitesType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getTestsuitesType_Name(), theXMLTypePackage.getString(), "name", null, 0, 1, TestsuitesType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getTestsuitesType_Tests(), theXMLTypePackage.getString(), "tests", null, 0, 1, TestsuitesType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getTestsuitesType_Time(), theXMLTypePackage.getString(), "time", null, 0, 1, TestsuitesType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(testsuiteTypeEClass, TestsuiteType.class, "TestsuiteType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - - // Initialize data types - initEDataType(iso8601DATETIMEPATTERNEDataType, XMLGregorianCalendar.class, "ISO8601DATETIMEPATTERN", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); - initEDataType(nameTypeEDataType, String.class, "NameType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); - initEDataType(preStringEDataType, String.class, "PreString", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); + initEReference(getTestsuiteType_Properties(), this.getPropertiesType(), null, "properties", null, 0, 1, TestsuiteType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getTestsuiteType_Testcase(), this.getTestcaseType(), null, "testcase", null, 0, -1, TestsuiteType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getTestsuiteType_SystemOut(), theXMLTypePackage.getString(), "systemOut", null, 0, 1, TestsuiteType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getTestsuiteType_SystemErr(), theXMLTypePackage.getString(), "systemErr", null, 0, 1, TestsuiteType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getTestsuiteType_Disabled(), theXMLTypePackage.getString(), "disabled", null, 0, 1, TestsuiteType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getTestsuiteType_Errors(), theXMLTypePackage.getString(), "errors", null, 0, 1, TestsuiteType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getTestsuiteType_Failures(), theXMLTypePackage.getString(), "failures", null, 0, 1, TestsuiteType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getTestsuiteType_Hostname(), theXMLTypePackage.getString(), "hostname", null, 0, 1, TestsuiteType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getTestsuiteType_Id(), theXMLTypePackage.getString(), "id", null, 0, 1, TestsuiteType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getTestsuiteType_Name(), theXMLTypePackage.getString(), "name", null, 1, 1, TestsuiteType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getTestsuiteType_Package(), theXMLTypePackage.getString(), "package", null, 0, 1, TestsuiteType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getTestsuiteType_Skipped(), theXMLTypePackage.getString(), "skipped", null, 0, 1, TestsuiteType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getTestsuiteType_Tests(), theXMLTypePackage.getString(), "tests", null, 1, 1, TestsuiteType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getTestsuiteType_Time(), theXMLTypePackage.getString(), "time", null, 0, 1, TestsuiteType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getTestsuiteType_Timestamp(), theXMLTypePackage.getString(), "timestamp", null, 0, 1, TestsuiteType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); // Create resource createResource(eNS_URI); @@ -662,280 +1033,517 @@ public class EtunitPackageImpl extends EPackageImpl implements EtunitPackage { * @generated */ protected void createExtendedMetaDataAnnotations() { - String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; + String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; + addAnnotation + (this, + source, + new String[] { + "qualified", "false" + }); + addAnnotation + (documentRootEClass, + source, + new String[] { + "name", "", + "kind", "mixed" + }); + addAnnotation + (getDocumentRoot_Mixed(), + source, + new String[] { + "kind", "elementWildcard", + "name", ":mixed" + }); + addAnnotation + (getDocumentRoot_XMLNSPrefixMap(), + source, + new String[] { + "kind", "attribute", + "name", "xmlns:prefix" + }); + addAnnotation + (getDocumentRoot_XSISchemaLocation(), + source, + new String[] { + "kind", "attribute", + "name", "xsi:schemaLocation" + }); + addAnnotation + (getDocumentRoot_Error(), + source, + new String[] { + "kind", "element", + "name", "error", + "namespace", "##targetNamespace" + }); + addAnnotation + (getDocumentRoot_Failure(), + source, + new String[] { + "kind", "element", + "name", "failure", + "namespace", "##targetNamespace" + }); + addAnnotation + (getDocumentRoot_Properties(), + source, + new String[] { + "kind", "element", + "name", "properties", + "namespace", "##targetNamespace" + }); + addAnnotation + (getDocumentRoot_Property(), + source, + new String[] { + "kind", "element", + "name", "property", + "namespace", "##targetNamespace" + }); + addAnnotation + (getDocumentRoot_Skipped(), + source, + new String[] { + "kind", "element", + "name", "skipped", + "namespace", "##targetNamespace" + }); addAnnotation - (this, - source, + (getDocumentRoot_SystemErr(), + source, new String[] { - "qualified", "false" - }); + "kind", "element", + "name", "system-err", + "namespace", "##targetNamespace" + }); + addAnnotation + (getDocumentRoot_SystemOut(), + source, + new String[] { + "kind", "element", + "name", "system-out", + "namespace", "##targetNamespace" + }); + addAnnotation + (getDocumentRoot_Testcase(), + source, + new String[] { + "kind", "element", + "name", "testcase", + "namespace", "##targetNamespace" + }); + addAnnotation + (getDocumentRoot_Testsuite(), + source, + new String[] { + "kind", "element", + "name", "testsuite", + "namespace", "##targetNamespace" + }); + addAnnotation + (getDocumentRoot_Testsuites(), + source, + new String[] { + "kind", "element", + "name", "testsuites", + "namespace", "##targetNamespace" + }); addAnnotation - (documentRootEClass, - source, + (errorTypeEClass, + source, new String[] { - "name", "", - "kind", "mixed" - }); + "name", "error_._type", + "kind", "mixed" + }); addAnnotation - (getDocumentRoot_Mixed(), - source, + (getErrorType_Mixed(), + source, new String[] { - "kind", "elementWildcard", - "name", ":mixed" - }); + "kind", "elementWildcard", + "name", ":mixed" + }); addAnnotation - (getDocumentRoot_XMLNSPrefixMap(), - source, + (getErrorType_Message(), + source, new String[] { - "kind", "attribute", - "name", "xmlns:prefix" - }); + "kind", "attribute", + "name", "message", + "namespace", "##targetNamespace" + }); addAnnotation - (getDocumentRoot_XSISchemaLocation(), - source, + (getErrorType_Type(), + source, new String[] { - "kind", "attribute", - "name", "xsi:schemaLocation" - }); + "kind", "attribute", + "name", "type", + "namespace", "##targetNamespace" + }); addAnnotation - (getDocumentRoot_Testsuite(), - source, + (failureTypeEClass, + source, new String[] { - "kind", "element", - "name", "testsuite", - "namespace", "##targetNamespace" - }); + "name", "failure_._type", + "kind", "mixed" + }); addAnnotation - (getDocumentRoot_Testsuites(), - source, + (getFailureType_Mixed(), + source, new String[] { - "kind", "element", - "name", "testsuites", - "namespace", "##targetNamespace" - }); + "kind", "elementWildcard", + "name", ":mixed" + }); addAnnotation - (errorTypeEClass, - source, + (getFailureType_Message(), + source, new String[] { - "name", "error_._type", - "kind", "mixed" - }); + "kind", "attribute", + "name", "message", + "namespace", "##targetNamespace" + }); addAnnotation - (getErrorType_Mixed(), - source, + (getFailureType_Type(), + source, new String[] { - "kind", "elementWildcard", - "name", ":mixed" - }); + "kind", "attribute", + "name", "type", + "namespace", "##targetNamespace" + }); addAnnotation - (getErrorType_Expected(), - source, + (propertiesTypeEClass, + source, new String[] { - "kind", "element", - "name", "expected", - "namespace", "##targetNamespace" - }); + "name", "properties_._type", + "kind", "elementOnly" + }); addAnnotation - (getErrorType_Actual(), - source, + (getPropertiesType_Property(), + source, new String[] { - "kind", "element", - "name", "actual", - "namespace", "##targetNamespace" - }); + "kind", "element", + "name", "property", + "namespace", "##targetNamespace" + }); addAnnotation - (failureTypeEClass, - source, + (propertyTypeEClass, + source, new String[] { - "name", "failure_._type", - "kind", "mixed" - }); + "name", "property_._type", + "kind", "empty" + }); addAnnotation - (getFailureType_Mixed(), - source, + (getPropertyType_Name(), + source, new String[] { - "kind", "elementWildcard", - "name", ":mixed" - }); + "kind", "attribute", + "name", "name", + "namespace", "##targetNamespace" + }); addAnnotation - (getFailureType_Expected(), - source, + (getPropertyType_Value(), + source, new String[] { - "kind", "element", - "name", "expected", - "namespace", "##targetNamespace" - }); + "kind", "attribute", + "name", "value", + "namespace", "##targetNamespace" + }); addAnnotation - (getFailureType_Actual(), - source, + (skippedTypeEClass, + source, new String[] { - "kind", "element", - "name", "actual", - "namespace", "##targetNamespace" - }); + "name", "skipped_._type", + "kind", "mixed" + }); addAnnotation - (iso8601DATETIMEPATTERNEDataType, - source, + (getSkippedType_Mixed(), + source, new String[] { - "name", "ISO8601_DATETIME_PATTERN", - "baseType", "http://www.eclipse.org/emf/2003/XMLType#dateTime", - "pattern", "[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}" - }); + "kind", "elementWildcard", + "name", ":mixed" + }); addAnnotation - (nameTypeEDataType, - source, + (getSkippedType_Message(), + source, new String[] { - "name", "name_._type", - "baseType", "http://www.eclipse.org/emf/2003/XMLType#token", - "minLength", "1" - }); + "kind", "attribute", + "name", "message", + "namespace", "##targetNamespace" + }); addAnnotation - (preStringEDataType, - source, + (testcaseTypeEClass, + source, new String[] { - "name", "pre-string", - "baseType", "http://www.eclipse.org/emf/2003/XMLType#string", - "whiteSpace", "preserve" - }); + "name", "testcase_._type", + "kind", "elementOnly" + }); addAnnotation - (testcaseTypeEClass, - source, + (getTestcaseType_Skipped(), + source, new String[] { - "name", "testcase_._type", - "kind", "elementOnly" - }); + "kind", "element", + "name", "skipped", + "namespace", "##targetNamespace" + }); addAnnotation - (getTestcaseType_Error(), - source, + (getTestcaseType_Error(), + source, new String[] { - "kind", "element", - "name", "error", - "namespace", "##targetNamespace" - }); + "kind", "element", + "name", "error", + "namespace", "##targetNamespace" + }); addAnnotation - (getTestcaseType_Failure(), - source, + (getTestcaseType_Failure(), + source, new String[] { - "kind", "element", - "name", "failure", - "namespace", "##targetNamespace" - }); + "kind", "element", + "name", "failure", + "namespace", "##targetNamespace" + }); addAnnotation - (getTestcaseType_Classname(), - source, + (getTestcaseType_SystemOut(), + source, new String[] { - "kind", "attribute", - "name", "classname", - "namespace", "##targetNamespace" - }); + "kind", "element", + "name", "system-out", + "namespace", "##targetNamespace" + }); addAnnotation - (getTestcaseType_Name(), - source, + (getTestcaseType_SystemErr(), + source, new String[] { - "kind", "attribute", - "name", "name", - "namespace", "##targetNamespace" - }); + "kind", "element", + "name", "system-err", + "namespace", "##targetNamespace" + }); addAnnotation - (getTestcaseType_Time(), - source, + (getTestcaseType_Assertions(), + source, new String[] { - "kind", "attribute", - "name", "time", - "namespace", "##targetNamespace" - }); + "kind", "attribute", + "name", "assertions", + "namespace", "##targetNamespace" + }); addAnnotation - (testsuiteEClass, - source, + (getTestcaseType_Classname(), + source, new String[] { - "name", "testsuite", - "kind", "elementOnly" - }); + "kind", "attribute", + "name", "classname", + "namespace", "##targetNamespace" + }); addAnnotation - (getTestsuite_Testcase(), - source, + (getTestcaseType_Name(), + source, new String[] { - "kind", "element", - "name", "testcase", - "namespace", "##targetNamespace" - }); + "kind", "attribute", + "name", "name", + "namespace", "##targetNamespace" + }); addAnnotation - (getTestsuite_Errors(), - source, + (getTestcaseType_Status(), + source, new String[] { - "kind", "attribute", - "name", "errors", - "namespace", "##targetNamespace" - }); + "kind", "attribute", + "name", "status", + "namespace", "##targetNamespace" + }); addAnnotation - (getTestsuite_Failures(), - source, + (getTestcaseType_Time(), + source, new String[] { - "kind", "attribute", - "name", "failures", - "namespace", "##targetNamespace" - }); + "kind", "attribute", + "name", "time", + "namespace", "##targetNamespace" + }); addAnnotation - (getTestsuite_Name(), - source, + (testsuitesTypeEClass, + source, new String[] { - "kind", "attribute", - "name", "name", - "namespace", "##targetNamespace" - }); + "name", "testsuites_._type", + "kind", "elementOnly" + }); addAnnotation - (getTestsuite_Skipped(), - source, + (getTestsuitesType_Testsuite(), + source, new String[] { - "kind", "attribute", - "name", "skipped", - "namespace", "##targetNamespace" - }); + "kind", "element", + "name", "testsuite", + "namespace", "##targetNamespace" + }); addAnnotation - (getTestsuite_Tests(), - source, + (getTestsuitesType_Disabled(), + source, new String[] { - "kind", "attribute", - "name", "tests", - "namespace", "##targetNamespace" - }); + "kind", "attribute", + "name", "disabled", + "namespace", "##targetNamespace" + }); addAnnotation - (getTestsuite_Time(), - source, + (getTestsuitesType_Errors(), + source, new String[] { - "kind", "attribute", - "name", "time", - "namespace", "##targetNamespace" - }); + "kind", "attribute", + "name", "errors", + "namespace", "##targetNamespace" + }); addAnnotation - (getTestsuite_Timestamp(), - source, + (getTestsuitesType_Failures(), + source, new String[] { - "kind", "attribute", - "name", "timestamp", - "namespace", "##targetNamespace" - }); + "kind", "attribute", + "name", "failures", + "namespace", "##targetNamespace" + }); addAnnotation - (testsuitesTypeEClass, - source, + (getTestsuitesType_Name(), + source, new String[] { - "name", "testsuites_._type", - "kind", "elementOnly" - }); + "kind", "attribute", + "name", "name", + "namespace", "##targetNamespace" + }); addAnnotation - (getTestsuitesType_Testsuite(), - source, + (getTestsuitesType_Tests(), + source, new String[] { - "kind", "element", - "name", "testsuite", - "namespace", "##targetNamespace" - }); + "kind", "attribute", + "name", "tests", + "namespace", "##targetNamespace" + }); + addAnnotation + (getTestsuitesType_Time(), + source, + new String[] { + "kind", "attribute", + "name", "time", + "namespace", "##targetNamespace" + }); + addAnnotation + (testsuiteTypeEClass, + source, + new String[] { + "name", "testsuite_._type", + "kind", "elementOnly" + }); + addAnnotation + (getTestsuiteType_Properties(), + source, + new String[] { + "kind", "element", + "name", "properties", + "namespace", "##targetNamespace" + }); + addAnnotation + (getTestsuiteType_Testcase(), + source, + new String[] { + "kind", "element", + "name", "testcase", + "namespace", "##targetNamespace" + }); + addAnnotation + (getTestsuiteType_SystemOut(), + source, + new String[] { + "kind", "element", + "name", "system-out", + "namespace", "##targetNamespace" + }); + addAnnotation + (getTestsuiteType_SystemErr(), + source, + new String[] { + "kind", "element", + "name", "system-err", + "namespace", "##targetNamespace" + }); + addAnnotation + (getTestsuiteType_Disabled(), + source, + new String[] { + "kind", "attribute", + "name", "disabled", + "namespace", "##targetNamespace" + }); + addAnnotation + (getTestsuiteType_Errors(), + source, + new String[] { + "kind", "attribute", + "name", "errors", + "namespace", "##targetNamespace" + }); + addAnnotation + (getTestsuiteType_Failures(), + source, + new String[] { + "kind", "attribute", + "name", "failures", + "namespace", "##targetNamespace" + }); + addAnnotation + (getTestsuiteType_Hostname(), + source, + new String[] { + "kind", "attribute", + "name", "hostname", + "namespace", "##targetNamespace" + }); + addAnnotation + (getTestsuiteType_Id(), + source, + new String[] { + "kind", "attribute", + "name", "id", + "namespace", "##targetNamespace" + }); + addAnnotation + (getTestsuiteType_Name(), + source, + new String[] { + "kind", "attribute", + "name", "name", + "namespace", "##targetNamespace" + }); + addAnnotation + (getTestsuiteType_Package(), + source, + new String[] { + "kind", "attribute", + "name", "package", + "namespace", "##targetNamespace" + }); + addAnnotation + (getTestsuiteType_Skipped(), + source, + new String[] { + "kind", "attribute", + "name", "skipped", + "namespace", "##targetNamespace" + }); + addAnnotation + (getTestsuiteType_Tests(), + source, + new String[] { + "kind", "attribute", + "name", "tests", + "namespace", "##targetNamespace" + }); + addAnnotation + (getTestsuiteType_Time(), + source, + new String[] { + "kind", "attribute", + "name", "time", + "namespace", "##targetNamespace" + }); addAnnotation - (testsuiteTypeEClass, - source, + (getTestsuiteType_Timestamp(), + source, new String[] { - "name", "testsuite_._type", - "kind", "elementOnly" + "kind", "attribute", + "name", "timestamp", + "namespace", "##targetNamespace" }); } diff --git a/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/impl/FailureTypeImpl.java b/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/impl/FailureTypeImpl.java index 2130e522c..06c4afc41 100644 --- a/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/impl/FailureTypeImpl.java +++ b/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/impl/FailureTypeImpl.java @@ -1,18 +1,20 @@ /** - * <copyright> - * </copyright> - * - * $Id$ */ package org.eclipse.etrice.etunit.converter.Etunit.impl; +import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; + import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; -import org.eclipse.emf.ecore.impl.EObjectImpl; + +import org.eclipse.emf.ecore.impl.ENotificationImpl; +import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; + import org.eclipse.emf.ecore.util.BasicFeatureMap; import org.eclipse.emf.ecore.util.FeatureMap; import org.eclipse.emf.ecore.util.InternalEList; + import org.eclipse.etrice.etunit.converter.Etunit.EtunitPackage; import org.eclipse.etrice.etunit.converter.Etunit.FailureType; @@ -22,16 +24,16 @@ import org.eclipse.etrice.etunit.converter.Etunit.FailureType; * <!-- end-user-doc --> * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.impl.FailureTypeImpl#getMixed <em>Mixed</em>}</li> - * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.impl.FailureTypeImpl#getExpected <em>Expected</em>}</li> - * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.impl.FailureTypeImpl#getActual <em>Actual</em>}</li> + * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.impl.FailureTypeImpl#getMessage <em>Message</em>}</li> + * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.impl.FailureTypeImpl#getType <em>Type</em>}</li> * </ul> - * </p> * * @generated */ -public class FailureTypeImpl extends EObjectImpl implements FailureType { +public class FailureTypeImpl extends MinimalEObjectImpl.Container implements FailureType { /** * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list. * <!-- begin-user-doc --> @@ -43,24 +45,44 @@ public class FailureTypeImpl extends EObjectImpl implements FailureType { protected FeatureMap mixed; /** - * The default value of the '{@link #getExpected() <em>Expected</em>}' attribute. + * The default value of the '{@link #getMessage() <em>Message</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getMessage() + * @generated + * @ordered + */ + protected static final String MESSAGE_EDEFAULT = null; + + /** + * The cached value of the '{@link #getMessage() <em>Message</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getExpected() + * @see #getMessage() * @generated * @ordered */ - protected static final String EXPECTED_EDEFAULT = null; + protected String message = MESSAGE_EDEFAULT; /** - * The default value of the '{@link #getActual() <em>Actual</em>}' attribute. + * The default value of the '{@link #getType() <em>Type</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getActual() + * @see #getType() * @generated * @ordered */ - protected static final String ACTUAL_EDEFAULT = null; + protected static final String TYPE_EDEFAULT = null; + + /** + * The cached value of the '{@link #getType() <em>Type</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getType() + * @generated + * @ordered + */ + protected String type = TYPE_EDEFAULT; /** * <!-- begin-user-doc --> @@ -86,6 +108,7 @@ public class FailureTypeImpl extends EObjectImpl implements FailureType { * <!-- end-user-doc --> * @generated */ + @Override public FeatureMap getMixed() { if (mixed == null) { mixed = new BasicFeatureMap(this, EtunitPackage.FAILURE_TYPE__MIXED); @@ -98,8 +121,9 @@ public class FailureTypeImpl extends EObjectImpl implements FailureType { * <!-- end-user-doc --> * @generated */ - public String getExpected() { - return (String)getMixed().get(EtunitPackage.Literals.FAILURE_TYPE__EXPECTED, true); + @Override + public String getMessage() { + return message; } /** @@ -107,8 +131,12 @@ public class FailureTypeImpl extends EObjectImpl implements FailureType { * <!-- end-user-doc --> * @generated */ - public void setExpected(String newExpected) { - ((FeatureMap.Internal)getMixed()).set(EtunitPackage.Literals.FAILURE_TYPE__EXPECTED, newExpected); + @Override + public void setMessage(String newMessage) { + String oldMessage = message; + message = newMessage; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EtunitPackage.FAILURE_TYPE__MESSAGE, oldMessage, message)); } /** @@ -116,8 +144,9 @@ public class FailureTypeImpl extends EObjectImpl implements FailureType { * <!-- end-user-doc --> * @generated */ - public String getActual() { - return (String)getMixed().get(EtunitPackage.Literals.FAILURE_TYPE__ACTUAL, true); + @Override + public String getType() { + return type; } /** @@ -125,8 +154,12 @@ public class FailureTypeImpl extends EObjectImpl implements FailureType { * <!-- end-user-doc --> * @generated */ - public void setActual(String newActual) { - ((FeatureMap.Internal)getMixed()).set(EtunitPackage.Literals.FAILURE_TYPE__ACTUAL, newActual); + @Override + public void setType(String newType) { + String oldType = type; + type = newType; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EtunitPackage.FAILURE_TYPE__TYPE, oldType, type)); } /** @@ -154,10 +187,10 @@ public class FailureTypeImpl extends EObjectImpl implements FailureType { case EtunitPackage.FAILURE_TYPE__MIXED: if (coreType) return getMixed(); return ((FeatureMap.Internal)getMixed()).getWrapper(); - case EtunitPackage.FAILURE_TYPE__EXPECTED: - return getExpected(); - case EtunitPackage.FAILURE_TYPE__ACTUAL: - return getActual(); + case EtunitPackage.FAILURE_TYPE__MESSAGE: + return getMessage(); + case EtunitPackage.FAILURE_TYPE__TYPE: + return getType(); } return super.eGet(featureID, resolve, coreType); } @@ -173,11 +206,11 @@ public class FailureTypeImpl extends EObjectImpl implements FailureType { case EtunitPackage.FAILURE_TYPE__MIXED: ((FeatureMap.Internal)getMixed()).set(newValue); return; - case EtunitPackage.FAILURE_TYPE__EXPECTED: - setExpected((String)newValue); + case EtunitPackage.FAILURE_TYPE__MESSAGE: + setMessage((String)newValue); return; - case EtunitPackage.FAILURE_TYPE__ACTUAL: - setActual((String)newValue); + case EtunitPackage.FAILURE_TYPE__TYPE: + setType((String)newValue); return; } super.eSet(featureID, newValue); @@ -194,11 +227,11 @@ public class FailureTypeImpl extends EObjectImpl implements FailureType { case EtunitPackage.FAILURE_TYPE__MIXED: getMixed().clear(); return; - case EtunitPackage.FAILURE_TYPE__EXPECTED: - setExpected(EXPECTED_EDEFAULT); + case EtunitPackage.FAILURE_TYPE__MESSAGE: + setMessage(MESSAGE_EDEFAULT); return; - case EtunitPackage.FAILURE_TYPE__ACTUAL: - setActual(ACTUAL_EDEFAULT); + case EtunitPackage.FAILURE_TYPE__TYPE: + setType(TYPE_EDEFAULT); return; } super.eUnset(featureID); @@ -214,10 +247,10 @@ public class FailureTypeImpl extends EObjectImpl implements FailureType { switch (featureID) { case EtunitPackage.FAILURE_TYPE__MIXED: return mixed != null && !mixed.isEmpty(); - case EtunitPackage.FAILURE_TYPE__EXPECTED: - return EXPECTED_EDEFAULT == null ? getExpected() != null : !EXPECTED_EDEFAULT.equals(getExpected()); - case EtunitPackage.FAILURE_TYPE__ACTUAL: - return ACTUAL_EDEFAULT == null ? getActual() != null : !ACTUAL_EDEFAULT.equals(getActual()); + case EtunitPackage.FAILURE_TYPE__MESSAGE: + return MESSAGE_EDEFAULT == null ? message != null : !MESSAGE_EDEFAULT.equals(message); + case EtunitPackage.FAILURE_TYPE__TYPE: + return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type); } return super.eIsSet(featureID); } @@ -231,9 +264,13 @@ public class FailureTypeImpl extends EObjectImpl implements FailureType { public String toString() { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (mixed: "); result.append(mixed); + result.append(", message: "); + result.append(message); + result.append(", type: "); + result.append(type); result.append(')'); return result.toString(); } diff --git a/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/impl/PropertiesTypeImpl.java b/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/impl/PropertiesTypeImpl.java new file mode 100644 index 000000000..a3e3b49bc --- /dev/null +++ b/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/impl/PropertiesTypeImpl.java @@ -0,0 +1,153 @@ +/** + */ +package org.eclipse.etrice.etunit.converter.Etunit.impl; + +import java.util.Collection; + +import org.eclipse.emf.common.notify.NotificationChain; + +import org.eclipse.emf.common.util.EList; + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.InternalEObject; + +import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; + +import org.eclipse.emf.ecore.util.EObjectContainmentEList; +import org.eclipse.emf.ecore.util.InternalEList; + +import org.eclipse.etrice.etunit.converter.Etunit.EtunitPackage; +import org.eclipse.etrice.etunit.converter.Etunit.PropertiesType; +import org.eclipse.etrice.etunit.converter.Etunit.PropertyType; + +/** + * <!-- begin-user-doc --> + * An implementation of the model object '<em><b>Properties Type</b></em>'. + * <!-- end-user-doc --> + * <p> + * The following features are implemented: + * </p> + * <ul> + * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.impl.PropertiesTypeImpl#getProperty <em>Property</em>}</li> + * </ul> + * + * @generated + */ +public class PropertiesTypeImpl extends MinimalEObjectImpl.Container implements PropertiesType { + /** + * The cached value of the '{@link #getProperty() <em>Property</em>}' containment reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getProperty() + * @generated + * @ordered + */ + protected EList<PropertyType> property; + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + protected PropertiesTypeImpl() { + super(); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + protected EClass eStaticClass() { + return EtunitPackage.Literals.PROPERTIES_TYPE; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public EList<PropertyType> getProperty() { + if (property == null) { + property = new EObjectContainmentEList<PropertyType>(PropertyType.class, this, EtunitPackage.PROPERTIES_TYPE__PROPERTY); + } + return property; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { + switch (featureID) { + case EtunitPackage.PROPERTIES_TYPE__PROPERTY: + return ((InternalEList<?>)getProperty()).basicRemove(otherEnd, msgs); + } + return super.eInverseRemove(otherEnd, featureID, msgs); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case EtunitPackage.PROPERTIES_TYPE__PROPERTY: + return getProperty(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @SuppressWarnings("unchecked") + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case EtunitPackage.PROPERTIES_TYPE__PROPERTY: + getProperty().clear(); + getProperty().addAll((Collection<? extends PropertyType>)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case EtunitPackage.PROPERTIES_TYPE__PROPERTY: + getProperty().clear(); + return; + } + super.eUnset(featureID); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case EtunitPackage.PROPERTIES_TYPE__PROPERTY: + return property != null && !property.isEmpty(); + } + return super.eIsSet(featureID); + } + +} //PropertiesTypeImpl diff --git a/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/impl/PropertyTypeImpl.java b/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/impl/PropertyTypeImpl.java new file mode 100644 index 000000000..cd1f7c4c8 --- /dev/null +++ b/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/impl/PropertyTypeImpl.java @@ -0,0 +1,221 @@ +/** + */ +package org.eclipse.etrice.etunit.converter.Etunit.impl; + +import org.eclipse.emf.common.notify.Notification; + +import org.eclipse.emf.ecore.EClass; + +import org.eclipse.emf.ecore.impl.ENotificationImpl; +import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; + +import org.eclipse.etrice.etunit.converter.Etunit.EtunitPackage; +import org.eclipse.etrice.etunit.converter.Etunit.PropertyType; + +/** + * <!-- begin-user-doc --> + * An implementation of the model object '<em><b>Property Type</b></em>'. + * <!-- end-user-doc --> + * <p> + * The following features are implemented: + * </p> + * <ul> + * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.impl.PropertyTypeImpl#getName <em>Name</em>}</li> + * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.impl.PropertyTypeImpl#getValue <em>Value</em>}</li> + * </ul> + * + * @generated + */ +public class PropertyTypeImpl extends MinimalEObjectImpl.Container implements PropertyType { + /** + * The default value of the '{@link #getName() <em>Name</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getName() + * @generated + * @ordered + */ + protected static final String NAME_EDEFAULT = null; + + /** + * The cached value of the '{@link #getName() <em>Name</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getName() + * @generated + * @ordered + */ + protected String name = NAME_EDEFAULT; + + /** + * The default value of the '{@link #getValue() <em>Value</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getValue() + * @generated + * @ordered + */ + protected static final String VALUE_EDEFAULT = null; + + /** + * The cached value of the '{@link #getValue() <em>Value</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getValue() + * @generated + * @ordered + */ + protected String value = VALUE_EDEFAULT; + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + protected PropertyTypeImpl() { + super(); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + protected EClass eStaticClass() { + return EtunitPackage.Literals.PROPERTY_TYPE; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public String getName() { + return name; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void setName(String newName) { + String oldName = name; + name = newName; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EtunitPackage.PROPERTY_TYPE__NAME, oldName, name)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public String getValue() { + return value; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void setValue(String newValue) { + String oldValue = value; + value = newValue; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EtunitPackage.PROPERTY_TYPE__VALUE, oldValue, value)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case EtunitPackage.PROPERTY_TYPE__NAME: + return getName(); + case EtunitPackage.PROPERTY_TYPE__VALUE: + return getValue(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case EtunitPackage.PROPERTY_TYPE__NAME: + setName((String)newValue); + return; + case EtunitPackage.PROPERTY_TYPE__VALUE: + setValue((String)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case EtunitPackage.PROPERTY_TYPE__NAME: + setName(NAME_EDEFAULT); + return; + case EtunitPackage.PROPERTY_TYPE__VALUE: + setValue(VALUE_EDEFAULT); + return; + } + super.eUnset(featureID); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case EtunitPackage.PROPERTY_TYPE__NAME: + return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name); + case EtunitPackage.PROPERTY_TYPE__VALUE: + return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value); + } + return super.eIsSet(featureID); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public String toString() { + if (eIsProxy()) return super.toString(); + + StringBuilder result = new StringBuilder(super.toString()); + result.append(" (name: "); + result.append(name); + result.append(", value: "); + result.append(value); + result.append(')'); + return result.toString(); + } + +} //PropertyTypeImpl diff --git a/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/impl/SkippedTypeImpl.java b/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/impl/SkippedTypeImpl.java new file mode 100644 index 000000000..c879509c9 --- /dev/null +++ b/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/impl/SkippedTypeImpl.java @@ -0,0 +1,222 @@ +/** + */ +package org.eclipse.etrice.etunit.converter.Etunit.impl; + +import org.eclipse.emf.common.notify.Notification; +import org.eclipse.emf.common.notify.NotificationChain; + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.InternalEObject; + +import org.eclipse.emf.ecore.impl.ENotificationImpl; +import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; + +import org.eclipse.emf.ecore.util.BasicFeatureMap; +import org.eclipse.emf.ecore.util.FeatureMap; +import org.eclipse.emf.ecore.util.InternalEList; + +import org.eclipse.etrice.etunit.converter.Etunit.EtunitPackage; +import org.eclipse.etrice.etunit.converter.Etunit.SkippedType; + +/** + * <!-- begin-user-doc --> + * An implementation of the model object '<em><b>Skipped Type</b></em>'. + * <!-- end-user-doc --> + * <p> + * The following features are implemented: + * </p> + * <ul> + * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.impl.SkippedTypeImpl#getMixed <em>Mixed</em>}</li> + * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.impl.SkippedTypeImpl#getMessage <em>Message</em>}</li> + * </ul> + * + * @generated + */ +public class SkippedTypeImpl extends MinimalEObjectImpl.Container implements SkippedType { + /** + * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getMixed() + * @generated + * @ordered + */ + protected FeatureMap mixed; + + /** + * The default value of the '{@link #getMessage() <em>Message</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getMessage() + * @generated + * @ordered + */ + protected static final String MESSAGE_EDEFAULT = null; + + /** + * The cached value of the '{@link #getMessage() <em>Message</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getMessage() + * @generated + * @ordered + */ + protected String message = MESSAGE_EDEFAULT; + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + protected SkippedTypeImpl() { + super(); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + protected EClass eStaticClass() { + return EtunitPackage.Literals.SKIPPED_TYPE; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public FeatureMap getMixed() { + if (mixed == null) { + mixed = new BasicFeatureMap(this, EtunitPackage.SKIPPED_TYPE__MIXED); + } + return mixed; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public String getMessage() { + return message; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void setMessage(String newMessage) { + String oldMessage = message; + message = newMessage; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EtunitPackage.SKIPPED_TYPE__MESSAGE, oldMessage, message)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { + switch (featureID) { + case EtunitPackage.SKIPPED_TYPE__MIXED: + return ((InternalEList<?>)getMixed()).basicRemove(otherEnd, msgs); + } + return super.eInverseRemove(otherEnd, featureID, msgs); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case EtunitPackage.SKIPPED_TYPE__MIXED: + if (coreType) return getMixed(); + return ((FeatureMap.Internal)getMixed()).getWrapper(); + case EtunitPackage.SKIPPED_TYPE__MESSAGE: + return getMessage(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case EtunitPackage.SKIPPED_TYPE__MIXED: + ((FeatureMap.Internal)getMixed()).set(newValue); + return; + case EtunitPackage.SKIPPED_TYPE__MESSAGE: + setMessage((String)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case EtunitPackage.SKIPPED_TYPE__MIXED: + getMixed().clear(); + return; + case EtunitPackage.SKIPPED_TYPE__MESSAGE: + setMessage(MESSAGE_EDEFAULT); + return; + } + super.eUnset(featureID); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case EtunitPackage.SKIPPED_TYPE__MIXED: + return mixed != null && !mixed.isEmpty(); + case EtunitPackage.SKIPPED_TYPE__MESSAGE: + return MESSAGE_EDEFAULT == null ? message != null : !MESSAGE_EDEFAULT.equals(message); + } + return super.eIsSet(featureID); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public String toString() { + if (eIsProxy()) return super.toString(); + + StringBuilder result = new StringBuilder(super.toString()); + result.append(" (mixed: "); + result.append(mixed); + result.append(", message: "); + result.append(message); + result.append(')'); + return result.toString(); + } + +} //SkippedTypeImpl diff --git a/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/impl/TestcaseTypeImpl.java b/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/impl/TestcaseTypeImpl.java index bc26c7eb6..3287ce64f 100644 --- a/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/impl/TestcaseTypeImpl.java +++ b/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/impl/TestcaseTypeImpl.java @@ -1,25 +1,28 @@ /** - * <copyright> - * </copyright> - * - * $Id$ */ package org.eclipse.etrice.etunit.converter.Etunit.impl; -import java.math.BigDecimal; +import java.util.Collection; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; +import org.eclipse.emf.common.util.EList; + import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.emf.ecore.impl.EObjectImpl; +import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; + +import org.eclipse.emf.ecore.util.EDataTypeEList; +import org.eclipse.emf.ecore.util.EObjectContainmentEList; +import org.eclipse.emf.ecore.util.InternalEList; import org.eclipse.etrice.etunit.converter.Etunit.ErrorType; import org.eclipse.etrice.etunit.converter.Etunit.EtunitPackage; import org.eclipse.etrice.etunit.converter.Etunit.FailureType; +import org.eclipse.etrice.etunit.converter.Etunit.SkippedType; import org.eclipse.etrice.etunit.converter.Etunit.TestcaseType; /** @@ -28,37 +31,92 @@ import org.eclipse.etrice.etunit.converter.Etunit.TestcaseType; * <!-- end-user-doc --> * <p> * The following features are implemented: + * </p> * <ul> + * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.impl.TestcaseTypeImpl#getSkipped <em>Skipped</em>}</li> * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.impl.TestcaseTypeImpl#getError <em>Error</em>}</li> * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.impl.TestcaseTypeImpl#getFailure <em>Failure</em>}</li> + * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.impl.TestcaseTypeImpl#getSystemOut <em>System Out</em>}</li> + * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.impl.TestcaseTypeImpl#getSystemErr <em>System Err</em>}</li> + * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.impl.TestcaseTypeImpl#getAssertions <em>Assertions</em>}</li> * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.impl.TestcaseTypeImpl#getClassname <em>Classname</em>}</li> * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.impl.TestcaseTypeImpl#getName <em>Name</em>}</li> + * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.impl.TestcaseTypeImpl#getStatus <em>Status</em>}</li> * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.impl.TestcaseTypeImpl#getTime <em>Time</em>}</li> * </ul> - * </p> * * @generated */ -public class TestcaseTypeImpl extends EObjectImpl implements TestcaseType { +public class TestcaseTypeImpl extends MinimalEObjectImpl.Container implements TestcaseType { + /** + * The cached value of the '{@link #getSkipped() <em>Skipped</em>}' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getSkipped() + * @generated + * @ordered + */ + protected SkippedType skipped; + /** - * The cached value of the '{@link #getError() <em>Error</em>}' containment reference. + * The cached value of the '{@link #getError() <em>Error</em>}' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @see #getError() * @generated * @ordered */ - protected ErrorType error; + protected EList<ErrorType> error; /** - * The cached value of the '{@link #getFailure() <em>Failure</em>}' containment reference. + * The cached value of the '{@link #getFailure() <em>Failure</em>}' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @see #getFailure() * @generated * @ordered */ - protected FailureType failure; + protected EList<FailureType> failure; + + /** + * The cached value of the '{@link #getSystemOut() <em>System Out</em>}' attribute list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getSystemOut() + * @generated + * @ordered + */ + protected EList<String> systemOut; + + /** + * The cached value of the '{@link #getSystemErr() <em>System Err</em>}' attribute list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getSystemErr() + * @generated + * @ordered + */ + protected EList<String> systemErr; + + /** + * The default value of the '{@link #getAssertions() <em>Assertions</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getAssertions() + * @generated + * @ordered + */ + protected static final String ASSERTIONS_EDEFAULT = null; + + /** + * The cached value of the '{@link #getAssertions() <em>Assertions</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getAssertions() + * @generated + * @ordered + */ + protected String assertions = ASSERTIONS_EDEFAULT; /** * The default value of the '{@link #getClassname() <em>Classname</em>}' attribute. @@ -101,6 +159,26 @@ public class TestcaseTypeImpl extends EObjectImpl implements TestcaseType { protected String name = NAME_EDEFAULT; /** + * The default value of the '{@link #getStatus() <em>Status</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getStatus() + * @generated + * @ordered + */ + protected static final String STATUS_EDEFAULT = null; + + /** + * The cached value of the '{@link #getStatus() <em>Status</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getStatus() + * @generated + * @ordered + */ + protected String status = STATUS_EDEFAULT; + + /** * The default value of the '{@link #getTime() <em>Time</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -108,7 +186,7 @@ public class TestcaseTypeImpl extends EObjectImpl implements TestcaseType { * @generated * @ordered */ - protected static final BigDecimal TIME_EDEFAULT = null; + protected static final String TIME_EDEFAULT = null; /** * The cached value of the '{@link #getTime() <em>Time</em>}' attribute. @@ -118,7 +196,7 @@ public class TestcaseTypeImpl extends EObjectImpl implements TestcaseType { * @generated * @ordered */ - protected BigDecimal time = TIME_EDEFAULT; + protected String time = TIME_EDEFAULT; /** * <!-- begin-user-doc --> @@ -144,8 +222,9 @@ public class TestcaseTypeImpl extends EObjectImpl implements TestcaseType { * <!-- end-user-doc --> * @generated */ - public ErrorType getError() { - return error; + @Override + public SkippedType getSkipped() { + return skipped; } /** @@ -153,11 +232,11 @@ public class TestcaseTypeImpl extends EObjectImpl implements TestcaseType { * <!-- end-user-doc --> * @generated */ - public NotificationChain basicSetError(ErrorType newError, NotificationChain msgs) { - ErrorType oldError = error; - error = newError; + public NotificationChain basicSetSkipped(SkippedType newSkipped, NotificationChain msgs) { + SkippedType oldSkipped = skipped; + skipped = newSkipped; if (eNotificationRequired()) { - ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EtunitPackage.TESTCASE_TYPE__ERROR, oldError, newError); + ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EtunitPackage.TESTCASE_TYPE__SKIPPED, oldSkipped, newSkipped); if (msgs == null) msgs = notification; else msgs.add(notification); } return msgs; @@ -168,18 +247,19 @@ public class TestcaseTypeImpl extends EObjectImpl implements TestcaseType { * <!-- end-user-doc --> * @generated */ - public void setError(ErrorType newError) { - if (newError != error) { + @Override + public void setSkipped(SkippedType newSkipped) { + if (newSkipped != skipped) { NotificationChain msgs = null; - if (error != null) - msgs = ((InternalEObject)error).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EtunitPackage.TESTCASE_TYPE__ERROR, null, msgs); - if (newError != null) - msgs = ((InternalEObject)newError).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EtunitPackage.TESTCASE_TYPE__ERROR, null, msgs); - msgs = basicSetError(newError, msgs); + if (skipped != null) + msgs = ((InternalEObject)skipped).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EtunitPackage.TESTCASE_TYPE__SKIPPED, null, msgs); + if (newSkipped != null) + msgs = ((InternalEObject)newSkipped).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EtunitPackage.TESTCASE_TYPE__SKIPPED, null, msgs); + msgs = basicSetSkipped(newSkipped, msgs); if (msgs != null) msgs.dispatch(); } else if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, EtunitPackage.TESTCASE_TYPE__ERROR, newError, newError)); + eNotify(new ENotificationImpl(this, Notification.SET, EtunitPackage.TESTCASE_TYPE__SKIPPED, newSkipped, newSkipped)); } /** @@ -187,7 +267,24 @@ public class TestcaseTypeImpl extends EObjectImpl implements TestcaseType { * <!-- end-user-doc --> * @generated */ - public FailureType getFailure() { + @Override + public EList<ErrorType> getError() { + if (error == null) { + error = new EObjectContainmentEList<ErrorType>(ErrorType.class, this, EtunitPackage.TESTCASE_TYPE__ERROR); + } + return error; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public EList<FailureType> getFailure() { + if (failure == null) { + failure = new EObjectContainmentEList<FailureType>(FailureType.class, this, EtunitPackage.TESTCASE_TYPE__FAILURE); + } return failure; } @@ -196,14 +293,12 @@ public class TestcaseTypeImpl extends EObjectImpl implements TestcaseType { * <!-- end-user-doc --> * @generated */ - public NotificationChain basicSetFailure(FailureType newFailure, NotificationChain msgs) { - FailureType oldFailure = failure; - failure = newFailure; - if (eNotificationRequired()) { - ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EtunitPackage.TESTCASE_TYPE__FAILURE, oldFailure, newFailure); - if (msgs == null) msgs = notification; else msgs.add(notification); + @Override + public EList<String> getSystemOut() { + if (systemOut == null) { + systemOut = new EDataTypeEList<String>(String.class, this, EtunitPackage.TESTCASE_TYPE__SYSTEM_OUT); } - return msgs; + return systemOut; } /** @@ -211,18 +306,35 @@ public class TestcaseTypeImpl extends EObjectImpl implements TestcaseType { * <!-- end-user-doc --> * @generated */ - public void setFailure(FailureType newFailure) { - if (newFailure != failure) { - NotificationChain msgs = null; - if (failure != null) - msgs = ((InternalEObject)failure).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EtunitPackage.TESTCASE_TYPE__FAILURE, null, msgs); - if (newFailure != null) - msgs = ((InternalEObject)newFailure).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EtunitPackage.TESTCASE_TYPE__FAILURE, null, msgs); - msgs = basicSetFailure(newFailure, msgs); - if (msgs != null) msgs.dispatch(); + @Override + public EList<String> getSystemErr() { + if (systemErr == null) { + systemErr = new EDataTypeEList<String>(String.class, this, EtunitPackage.TESTCASE_TYPE__SYSTEM_ERR); } - else if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, EtunitPackage.TESTCASE_TYPE__FAILURE, newFailure, newFailure)); + return systemErr; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public String getAssertions() { + return assertions; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void setAssertions(String newAssertions) { + String oldAssertions = assertions; + assertions = newAssertions; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EtunitPackage.TESTCASE_TYPE__ASSERTIONS, oldAssertions, assertions)); } /** @@ -230,6 +342,7 @@ public class TestcaseTypeImpl extends EObjectImpl implements TestcaseType { * <!-- end-user-doc --> * @generated */ + @Override public String getClassname() { return classname; } @@ -239,6 +352,7 @@ public class TestcaseTypeImpl extends EObjectImpl implements TestcaseType { * <!-- end-user-doc --> * @generated */ + @Override public void setClassname(String newClassname) { String oldClassname = classname; classname = newClassname; @@ -251,6 +365,7 @@ public class TestcaseTypeImpl extends EObjectImpl implements TestcaseType { * <!-- end-user-doc --> * @generated */ + @Override public String getName() { return name; } @@ -260,6 +375,7 @@ public class TestcaseTypeImpl extends EObjectImpl implements TestcaseType { * <!-- end-user-doc --> * @generated */ + @Override public void setName(String newName) { String oldName = name; name = newName; @@ -272,7 +388,31 @@ public class TestcaseTypeImpl extends EObjectImpl implements TestcaseType { * <!-- end-user-doc --> * @generated */ - public BigDecimal getTime() { + @Override + public String getStatus() { + return status; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void setStatus(String newStatus) { + String oldStatus = status; + status = newStatus; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EtunitPackage.TESTCASE_TYPE__STATUS, oldStatus, status)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public String getTime() { return time; } @@ -281,8 +421,9 @@ public class TestcaseTypeImpl extends EObjectImpl implements TestcaseType { * <!-- end-user-doc --> * @generated */ - public void setTime(BigDecimal newTime) { - BigDecimal oldTime = time; + @Override + public void setTime(String newTime) { + String oldTime = time; time = newTime; if (eNotificationRequired()) eNotify(new ENotificationImpl(this, Notification.SET, EtunitPackage.TESTCASE_TYPE__TIME, oldTime, time)); @@ -296,10 +437,12 @@ public class TestcaseTypeImpl extends EObjectImpl implements TestcaseType { @Override public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { switch (featureID) { + case EtunitPackage.TESTCASE_TYPE__SKIPPED: + return basicSetSkipped(null, msgs); case EtunitPackage.TESTCASE_TYPE__ERROR: - return basicSetError(null, msgs); + return ((InternalEList<?>)getError()).basicRemove(otherEnd, msgs); case EtunitPackage.TESTCASE_TYPE__FAILURE: - return basicSetFailure(null, msgs); + return ((InternalEList<?>)getFailure()).basicRemove(otherEnd, msgs); } return super.eInverseRemove(otherEnd, featureID, msgs); } @@ -312,14 +455,24 @@ public class TestcaseTypeImpl extends EObjectImpl implements TestcaseType { @Override public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { + case EtunitPackage.TESTCASE_TYPE__SKIPPED: + return getSkipped(); case EtunitPackage.TESTCASE_TYPE__ERROR: return getError(); case EtunitPackage.TESTCASE_TYPE__FAILURE: return getFailure(); + case EtunitPackage.TESTCASE_TYPE__SYSTEM_OUT: + return getSystemOut(); + case EtunitPackage.TESTCASE_TYPE__SYSTEM_ERR: + return getSystemErr(); + case EtunitPackage.TESTCASE_TYPE__ASSERTIONS: + return getAssertions(); case EtunitPackage.TESTCASE_TYPE__CLASSNAME: return getClassname(); case EtunitPackage.TESTCASE_TYPE__NAME: return getName(); + case EtunitPackage.TESTCASE_TYPE__STATUS: + return getStatus(); case EtunitPackage.TESTCASE_TYPE__TIME: return getTime(); } @@ -331,14 +484,31 @@ public class TestcaseTypeImpl extends EObjectImpl implements TestcaseType { * <!-- end-user-doc --> * @generated */ + @SuppressWarnings("unchecked") @Override public void eSet(int featureID, Object newValue) { switch (featureID) { + case EtunitPackage.TESTCASE_TYPE__SKIPPED: + setSkipped((SkippedType)newValue); + return; case EtunitPackage.TESTCASE_TYPE__ERROR: - setError((ErrorType)newValue); + getError().clear(); + getError().addAll((Collection<? extends ErrorType>)newValue); return; case EtunitPackage.TESTCASE_TYPE__FAILURE: - setFailure((FailureType)newValue); + getFailure().clear(); + getFailure().addAll((Collection<? extends FailureType>)newValue); + return; + case EtunitPackage.TESTCASE_TYPE__SYSTEM_OUT: + getSystemOut().clear(); + getSystemOut().addAll((Collection<? extends String>)newValue); + return; + case EtunitPackage.TESTCASE_TYPE__SYSTEM_ERR: + getSystemErr().clear(); + getSystemErr().addAll((Collection<? extends String>)newValue); + return; + case EtunitPackage.TESTCASE_TYPE__ASSERTIONS: + setAssertions((String)newValue); return; case EtunitPackage.TESTCASE_TYPE__CLASSNAME: setClassname((String)newValue); @@ -346,8 +516,11 @@ public class TestcaseTypeImpl extends EObjectImpl implements TestcaseType { case EtunitPackage.TESTCASE_TYPE__NAME: setName((String)newValue); return; + case EtunitPackage.TESTCASE_TYPE__STATUS: + setStatus((String)newValue); + return; case EtunitPackage.TESTCASE_TYPE__TIME: - setTime((BigDecimal)newValue); + setTime((String)newValue); return; } super.eSet(featureID, newValue); @@ -361,11 +534,23 @@ public class TestcaseTypeImpl extends EObjectImpl implements TestcaseType { @Override public void eUnset(int featureID) { switch (featureID) { + case EtunitPackage.TESTCASE_TYPE__SKIPPED: + setSkipped((SkippedType)null); + return; case EtunitPackage.TESTCASE_TYPE__ERROR: - setError((ErrorType)null); + getError().clear(); return; case EtunitPackage.TESTCASE_TYPE__FAILURE: - setFailure((FailureType)null); + getFailure().clear(); + return; + case EtunitPackage.TESTCASE_TYPE__SYSTEM_OUT: + getSystemOut().clear(); + return; + case EtunitPackage.TESTCASE_TYPE__SYSTEM_ERR: + getSystemErr().clear(); + return; + case EtunitPackage.TESTCASE_TYPE__ASSERTIONS: + setAssertions(ASSERTIONS_EDEFAULT); return; case EtunitPackage.TESTCASE_TYPE__CLASSNAME: setClassname(CLASSNAME_EDEFAULT); @@ -373,6 +558,9 @@ public class TestcaseTypeImpl extends EObjectImpl implements TestcaseType { case EtunitPackage.TESTCASE_TYPE__NAME: setName(NAME_EDEFAULT); return; + case EtunitPackage.TESTCASE_TYPE__STATUS: + setStatus(STATUS_EDEFAULT); + return; case EtunitPackage.TESTCASE_TYPE__TIME: setTime(TIME_EDEFAULT); return; @@ -388,14 +576,24 @@ public class TestcaseTypeImpl extends EObjectImpl implements TestcaseType { @Override public boolean eIsSet(int featureID) { switch (featureID) { + case EtunitPackage.TESTCASE_TYPE__SKIPPED: + return skipped != null; case EtunitPackage.TESTCASE_TYPE__ERROR: - return error != null; + return error != null && !error.isEmpty(); case EtunitPackage.TESTCASE_TYPE__FAILURE: - return failure != null; + return failure != null && !failure.isEmpty(); + case EtunitPackage.TESTCASE_TYPE__SYSTEM_OUT: + return systemOut != null && !systemOut.isEmpty(); + case EtunitPackage.TESTCASE_TYPE__SYSTEM_ERR: + return systemErr != null && !systemErr.isEmpty(); + case EtunitPackage.TESTCASE_TYPE__ASSERTIONS: + return ASSERTIONS_EDEFAULT == null ? assertions != null : !ASSERTIONS_EDEFAULT.equals(assertions); case EtunitPackage.TESTCASE_TYPE__CLASSNAME: return CLASSNAME_EDEFAULT == null ? classname != null : !CLASSNAME_EDEFAULT.equals(classname); case EtunitPackage.TESTCASE_TYPE__NAME: return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name); + case EtunitPackage.TESTCASE_TYPE__STATUS: + return STATUS_EDEFAULT == null ? status != null : !STATUS_EDEFAULT.equals(status); case EtunitPackage.TESTCASE_TYPE__TIME: return TIME_EDEFAULT == null ? time != null : !TIME_EDEFAULT.equals(time); } @@ -411,11 +609,19 @@ public class TestcaseTypeImpl extends EObjectImpl implements TestcaseType { public String toString() { if (eIsProxy()) return super.toString(); - StringBuffer result = new StringBuffer(super.toString()); - result.append(" (classname: "); + StringBuilder result = new StringBuilder(super.toString()); + result.append(" (systemOut: "); + result.append(systemOut); + result.append(", systemErr: "); + result.append(systemErr); + result.append(", assertions: "); + result.append(assertions); + result.append(", classname: "); result.append(classname); result.append(", name: "); result.append(name); + result.append(", status: "); + result.append(status); result.append(", time: "); result.append(time); result.append(')'); diff --git a/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/impl/TestsuiteImpl.java b/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/impl/TestsuiteImpl.java deleted file mode 100644 index d088220fc..000000000 --- a/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/impl/TestsuiteImpl.java +++ /dev/null @@ -1,690 +0,0 @@ -/** - * <copyright> - * </copyright> - * - * $Id$ - */ -package org.eclipse.etrice.etunit.converter.Etunit.impl; - -import java.math.BigDecimal; - -import java.util.Collection; - -import javax.xml.datatype.XMLGregorianCalendar; - -import org.eclipse.emf.common.notify.Notification; -import org.eclipse.emf.common.notify.NotificationChain; - -import org.eclipse.emf.common.util.EList; - -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.InternalEObject; - -import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.emf.ecore.impl.EObjectImpl; - -import org.eclipse.emf.ecore.util.EObjectContainmentEList; -import org.eclipse.emf.ecore.util.InternalEList; - -import org.eclipse.etrice.etunit.converter.Etunit.EtunitPackage; -import org.eclipse.etrice.etunit.converter.Etunit.TestcaseType; -import org.eclipse.etrice.etunit.converter.Etunit.Testsuite; - -/** - * <!-- begin-user-doc --> - * An implementation of the model object '<em><b>Testsuite</b></em>'. - * <!-- end-user-doc --> - * <p> - * The following features are implemented: - * <ul> - * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.impl.TestsuiteImpl#getTestcase <em>Testcase</em>}</li> - * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.impl.TestsuiteImpl#getErrors <em>Errors</em>}</li> - * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.impl.TestsuiteImpl#getFailures <em>Failures</em>}</li> - * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.impl.TestsuiteImpl#getName <em>Name</em>}</li> - * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.impl.TestsuiteImpl#getSkipped <em>Skipped</em>}</li> - * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.impl.TestsuiteImpl#getTests <em>Tests</em>}</li> - * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.impl.TestsuiteImpl#getTime <em>Time</em>}</li> - * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.impl.TestsuiteImpl#getTimestamp <em>Timestamp</em>}</li> - * </ul> - * </p> - * - * @generated - */ -public class TestsuiteImpl extends EObjectImpl implements Testsuite { - /** - * The cached value of the '{@link #getTestcase() <em>Testcase</em>}' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getTestcase() - * @generated - * @ordered - */ - protected EList<TestcaseType> testcase; - - /** - * The default value of the '{@link #getErrors() <em>Errors</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getErrors() - * @generated - * @ordered - */ - protected static final int ERRORS_EDEFAULT = 0; - - /** - * The cached value of the '{@link #getErrors() <em>Errors</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getErrors() - * @generated - * @ordered - */ - protected int errors = ERRORS_EDEFAULT; - - /** - * This is true if the Errors attribute has been set. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - protected boolean errorsESet; - - /** - * The default value of the '{@link #getFailures() <em>Failures</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getFailures() - * @generated - * @ordered - */ - protected static final int FAILURES_EDEFAULT = 0; - - /** - * The cached value of the '{@link #getFailures() <em>Failures</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getFailures() - * @generated - * @ordered - */ - protected int failures = FAILURES_EDEFAULT; - - /** - * This is true if the Failures attribute has been set. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - protected boolean failuresESet; - - /** - * The default value of the '{@link #getName() <em>Name</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getName() - * @generated - * @ordered - */ - protected static final String NAME_EDEFAULT = null; - - /** - * The cached value of the '{@link #getName() <em>Name</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getName() - * @generated - * @ordered - */ - protected String name = NAME_EDEFAULT; - - /** - * The default value of the '{@link #getSkipped() <em>Skipped</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getSkipped() - * @generated - * @ordered - */ - protected static final int SKIPPED_EDEFAULT = 0; - - /** - * The cached value of the '{@link #getSkipped() <em>Skipped</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getSkipped() - * @generated - * @ordered - */ - protected int skipped = SKIPPED_EDEFAULT; - - /** - * This is true if the Skipped attribute has been set. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - protected boolean skippedESet; - - /** - * The default value of the '{@link #getTests() <em>Tests</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getTests() - * @generated - * @ordered - */ - protected static final int TESTS_EDEFAULT = 0; - - /** - * The cached value of the '{@link #getTests() <em>Tests</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getTests() - * @generated - * @ordered - */ - protected int tests = TESTS_EDEFAULT; - - /** - * This is true if the Tests attribute has been set. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @ordered - */ - protected boolean testsESet; - - /** - * The default value of the '{@link #getTime() <em>Time</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getTime() - * @generated - * @ordered - */ - protected static final BigDecimal TIME_EDEFAULT = null; - - /** - * The cached value of the '{@link #getTime() <em>Time</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getTime() - * @generated - * @ordered - */ - protected BigDecimal time = TIME_EDEFAULT; - - /** - * The default value of the '{@link #getTimestamp() <em>Timestamp</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getTimestamp() - * @generated - * @ordered - */ - protected static final XMLGregorianCalendar TIMESTAMP_EDEFAULT = null; - - /** - * The cached value of the '{@link #getTimestamp() <em>Timestamp</em>}' attribute. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getTimestamp() - * @generated - * @ordered - */ - protected XMLGregorianCalendar timestamp = TIMESTAMP_EDEFAULT; - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected TestsuiteImpl() { - super(); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - protected EClass eStaticClass() { - return EtunitPackage.Literals.TESTSUITE; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EList<TestcaseType> getTestcase() { - if (testcase == null) { - testcase = new EObjectContainmentEList<TestcaseType>(TestcaseType.class, this, EtunitPackage.TESTSUITE__TESTCASE); - } - return testcase; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public int getErrors() { - return errors; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public void setErrors(int newErrors) { - int oldErrors = errors; - errors = newErrors; - boolean oldErrorsESet = errorsESet; - errorsESet = true; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, EtunitPackage.TESTSUITE__ERRORS, oldErrors, errors, !oldErrorsESet)); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public void unsetErrors() { - int oldErrors = errors; - boolean oldErrorsESet = errorsESet; - errors = ERRORS_EDEFAULT; - errorsESet = false; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.UNSET, EtunitPackage.TESTSUITE__ERRORS, oldErrors, ERRORS_EDEFAULT, oldErrorsESet)); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public boolean isSetErrors() { - return errorsESet; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public int getFailures() { - return failures; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public void setFailures(int newFailures) { - int oldFailures = failures; - failures = newFailures; - boolean oldFailuresESet = failuresESet; - failuresESet = true; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, EtunitPackage.TESTSUITE__FAILURES, oldFailures, failures, !oldFailuresESet)); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public void unsetFailures() { - int oldFailures = failures; - boolean oldFailuresESet = failuresESet; - failures = FAILURES_EDEFAULT; - failuresESet = false; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.UNSET, EtunitPackage.TESTSUITE__FAILURES, oldFailures, FAILURES_EDEFAULT, oldFailuresESet)); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public boolean isSetFailures() { - return failuresESet; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public String getName() { - return name; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public void setName(String newName) { - String oldName = name; - name = newName; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, EtunitPackage.TESTSUITE__NAME, oldName, name)); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public int getSkipped() { - return skipped; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public void setSkipped(int newSkipped) { - int oldSkipped = skipped; - skipped = newSkipped; - boolean oldSkippedESet = skippedESet; - skippedESet = true; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, EtunitPackage.TESTSUITE__SKIPPED, oldSkipped, skipped, !oldSkippedESet)); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public void unsetSkipped() { - int oldSkipped = skipped; - boolean oldSkippedESet = skippedESet; - skipped = SKIPPED_EDEFAULT; - skippedESet = false; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.UNSET, EtunitPackage.TESTSUITE__SKIPPED, oldSkipped, SKIPPED_EDEFAULT, oldSkippedESet)); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public boolean isSetSkipped() { - return skippedESet; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public int getTests() { - return tests; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public void setTests(int newTests) { - int oldTests = tests; - tests = newTests; - boolean oldTestsESet = testsESet; - testsESet = true; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, EtunitPackage.TESTSUITE__TESTS, oldTests, tests, !oldTestsESet)); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public void unsetTests() { - int oldTests = tests; - boolean oldTestsESet = testsESet; - tests = TESTS_EDEFAULT; - testsESet = false; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.UNSET, EtunitPackage.TESTSUITE__TESTS, oldTests, TESTS_EDEFAULT, oldTestsESet)); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public boolean isSetTests() { - return testsESet; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public BigDecimal getTime() { - return time; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public void setTime(BigDecimal newTime) { - BigDecimal oldTime = time; - time = newTime; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, EtunitPackage.TESTSUITE__TIME, oldTime, time)); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public XMLGregorianCalendar getTimestamp() { - return timestamp; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public void setTimestamp(XMLGregorianCalendar newTimestamp) { - XMLGregorianCalendar oldTimestamp = timestamp; - timestamp = newTimestamp; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, EtunitPackage.TESTSUITE__TIMESTAMP, oldTimestamp, timestamp)); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { - switch (featureID) { - case EtunitPackage.TESTSUITE__TESTCASE: - return ((InternalEList<?>)getTestcase()).basicRemove(otherEnd, msgs); - } - return super.eInverseRemove(otherEnd, featureID, msgs); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public Object eGet(int featureID, boolean resolve, boolean coreType) { - switch (featureID) { - case EtunitPackage.TESTSUITE__TESTCASE: - return getTestcase(); - case EtunitPackage.TESTSUITE__ERRORS: - return getErrors(); - case EtunitPackage.TESTSUITE__FAILURES: - return getFailures(); - case EtunitPackage.TESTSUITE__NAME: - return getName(); - case EtunitPackage.TESTSUITE__SKIPPED: - return getSkipped(); - case EtunitPackage.TESTSUITE__TESTS: - return getTests(); - case EtunitPackage.TESTSUITE__TIME: - return getTime(); - case EtunitPackage.TESTSUITE__TIMESTAMP: - return getTimestamp(); - } - return super.eGet(featureID, resolve, coreType); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @SuppressWarnings("unchecked") - @Override - public void eSet(int featureID, Object newValue) { - switch (featureID) { - case EtunitPackage.TESTSUITE__TESTCASE: - getTestcase().clear(); - getTestcase().addAll((Collection<? extends TestcaseType>)newValue); - return; - case EtunitPackage.TESTSUITE__ERRORS: - setErrors((Integer)newValue); - return; - case EtunitPackage.TESTSUITE__FAILURES: - setFailures((Integer)newValue); - return; - case EtunitPackage.TESTSUITE__NAME: - setName((String)newValue); - return; - case EtunitPackage.TESTSUITE__SKIPPED: - setSkipped((Integer)newValue); - return; - case EtunitPackage.TESTSUITE__TESTS: - setTests((Integer)newValue); - return; - case EtunitPackage.TESTSUITE__TIME: - setTime((BigDecimal)newValue); - return; - case EtunitPackage.TESTSUITE__TIMESTAMP: - setTimestamp((XMLGregorianCalendar)newValue); - return; - } - super.eSet(featureID, newValue); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public void eUnset(int featureID) { - switch (featureID) { - case EtunitPackage.TESTSUITE__TESTCASE: - getTestcase().clear(); - return; - case EtunitPackage.TESTSUITE__ERRORS: - unsetErrors(); - return; - case EtunitPackage.TESTSUITE__FAILURES: - unsetFailures(); - return; - case EtunitPackage.TESTSUITE__NAME: - setName(NAME_EDEFAULT); - return; - case EtunitPackage.TESTSUITE__SKIPPED: - unsetSkipped(); - return; - case EtunitPackage.TESTSUITE__TESTS: - unsetTests(); - return; - case EtunitPackage.TESTSUITE__TIME: - setTime(TIME_EDEFAULT); - return; - case EtunitPackage.TESTSUITE__TIMESTAMP: - setTimestamp(TIMESTAMP_EDEFAULT); - return; - } - super.eUnset(featureID); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public boolean eIsSet(int featureID) { - switch (featureID) { - case EtunitPackage.TESTSUITE__TESTCASE: - return testcase != null && !testcase.isEmpty(); - case EtunitPackage.TESTSUITE__ERRORS: - return isSetErrors(); - case EtunitPackage.TESTSUITE__FAILURES: - return isSetFailures(); - case EtunitPackage.TESTSUITE__NAME: - return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name); - case EtunitPackage.TESTSUITE__SKIPPED: - return isSetSkipped(); - case EtunitPackage.TESTSUITE__TESTS: - return isSetTests(); - case EtunitPackage.TESTSUITE__TIME: - return TIME_EDEFAULT == null ? time != null : !TIME_EDEFAULT.equals(time); - case EtunitPackage.TESTSUITE__TIMESTAMP: - return TIMESTAMP_EDEFAULT == null ? timestamp != null : !TIMESTAMP_EDEFAULT.equals(timestamp); - } - return super.eIsSet(featureID); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public String toString() { - if (eIsProxy()) return super.toString(); - - StringBuffer result = new StringBuffer(super.toString()); - result.append(" (errors: "); - if (errorsESet) result.append(errors); else result.append("<unset>"); - result.append(", failures: "); - if (failuresESet) result.append(failures); else result.append("<unset>"); - result.append(", name: "); - result.append(name); - result.append(", skipped: "); - if (skippedESet) result.append(skipped); else result.append("<unset>"); - result.append(", tests: "); - if (testsESet) result.append(tests); else result.append("<unset>"); - result.append(", time: "); - result.append(time); - result.append(", timestamp: "); - result.append(timestamp); - result.append(')'); - return result.toString(); - } - -} //TestsuiteImpl diff --git a/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/impl/TestsuiteTypeImpl.java b/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/impl/TestsuiteTypeImpl.java index 6ca417e94..f3f6726c8 100644 --- a/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/impl/TestsuiteTypeImpl.java +++ b/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/impl/TestsuiteTypeImpl.java @@ -1,13 +1,26 @@ /** - * <copyright> - * </copyright> - * - * $Id$ */ package org.eclipse.etrice.etunit.converter.Etunit.impl; +import java.util.Collection; + +import org.eclipse.emf.common.notify.Notification; +import org.eclipse.emf.common.notify.NotificationChain; + +import org.eclipse.emf.common.util.EList; + import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.InternalEObject; + +import org.eclipse.emf.ecore.impl.ENotificationImpl; +import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; + +import org.eclipse.emf.ecore.util.EObjectContainmentEList; +import org.eclipse.emf.ecore.util.InternalEList; + import org.eclipse.etrice.etunit.converter.Etunit.EtunitPackage; +import org.eclipse.etrice.etunit.converter.Etunit.PropertiesType; +import org.eclipse.etrice.etunit.converter.Etunit.TestcaseType; import org.eclipse.etrice.etunit.converter.Etunit.TestsuiteType; /** @@ -15,11 +28,309 @@ import org.eclipse.etrice.etunit.converter.Etunit.TestsuiteType; * An implementation of the model object '<em><b>Testsuite Type</b></em>'. * <!-- end-user-doc --> * <p> + * The following features are implemented: * </p> + * <ul> + * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.impl.TestsuiteTypeImpl#getProperties <em>Properties</em>}</li> + * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.impl.TestsuiteTypeImpl#getTestcase <em>Testcase</em>}</li> + * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.impl.TestsuiteTypeImpl#getSystemOut <em>System Out</em>}</li> + * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.impl.TestsuiteTypeImpl#getSystemErr <em>System Err</em>}</li> + * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.impl.TestsuiteTypeImpl#getDisabled <em>Disabled</em>}</li> + * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.impl.TestsuiteTypeImpl#getErrors <em>Errors</em>}</li> + * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.impl.TestsuiteTypeImpl#getFailures <em>Failures</em>}</li> + * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.impl.TestsuiteTypeImpl#getHostname <em>Hostname</em>}</li> + * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.impl.TestsuiteTypeImpl#getId <em>Id</em>}</li> + * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.impl.TestsuiteTypeImpl#getName <em>Name</em>}</li> + * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.impl.TestsuiteTypeImpl#getPackage <em>Package</em>}</li> + * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.impl.TestsuiteTypeImpl#getSkipped <em>Skipped</em>}</li> + * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.impl.TestsuiteTypeImpl#getTests <em>Tests</em>}</li> + * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.impl.TestsuiteTypeImpl#getTime <em>Time</em>}</li> + * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.impl.TestsuiteTypeImpl#getTimestamp <em>Timestamp</em>}</li> + * </ul> * * @generated */ -public class TestsuiteTypeImpl extends TestsuiteImpl implements TestsuiteType { +public class TestsuiteTypeImpl extends MinimalEObjectImpl.Container implements TestsuiteType { + /** + * The cached value of the '{@link #getProperties() <em>Properties</em>}' containment reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getProperties() + * @generated + * @ordered + */ + protected PropertiesType properties; + + /** + * The cached value of the '{@link #getTestcase() <em>Testcase</em>}' containment reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getTestcase() + * @generated + * @ordered + */ + protected EList<TestcaseType> testcase; + + /** + * The default value of the '{@link #getSystemOut() <em>System Out</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getSystemOut() + * @generated + * @ordered + */ + protected static final String SYSTEM_OUT_EDEFAULT = null; + + /** + * The cached value of the '{@link #getSystemOut() <em>System Out</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getSystemOut() + * @generated + * @ordered + */ + protected String systemOut = SYSTEM_OUT_EDEFAULT; + + /** + * The default value of the '{@link #getSystemErr() <em>System Err</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getSystemErr() + * @generated + * @ordered + */ + protected static final String SYSTEM_ERR_EDEFAULT = null; + + /** + * The cached value of the '{@link #getSystemErr() <em>System Err</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getSystemErr() + * @generated + * @ordered + */ + protected String systemErr = SYSTEM_ERR_EDEFAULT; + + /** + * The default value of the '{@link #getDisabled() <em>Disabled</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getDisabled() + * @generated + * @ordered + */ + protected static final String DISABLED_EDEFAULT = null; + + /** + * The cached value of the '{@link #getDisabled() <em>Disabled</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getDisabled() + * @generated + * @ordered + */ + protected String disabled = DISABLED_EDEFAULT; + + /** + * The default value of the '{@link #getErrors() <em>Errors</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getErrors() + * @generated + * @ordered + */ + protected static final String ERRORS_EDEFAULT = null; + + /** + * The cached value of the '{@link #getErrors() <em>Errors</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getErrors() + * @generated + * @ordered + */ + protected String errors = ERRORS_EDEFAULT; + + /** + * The default value of the '{@link #getFailures() <em>Failures</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getFailures() + * @generated + * @ordered + */ + protected static final String FAILURES_EDEFAULT = null; + + /** + * The cached value of the '{@link #getFailures() <em>Failures</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getFailures() + * @generated + * @ordered + */ + protected String failures = FAILURES_EDEFAULT; + + /** + * The default value of the '{@link #getHostname() <em>Hostname</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getHostname() + * @generated + * @ordered + */ + protected static final String HOSTNAME_EDEFAULT = null; + + /** + * The cached value of the '{@link #getHostname() <em>Hostname</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getHostname() + * @generated + * @ordered + */ + protected String hostname = HOSTNAME_EDEFAULT; + + /** + * The default value of the '{@link #getId() <em>Id</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getId() + * @generated + * @ordered + */ + protected static final String ID_EDEFAULT = null; + + /** + * The cached value of the '{@link #getId() <em>Id</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getId() + * @generated + * @ordered + */ + protected String id = ID_EDEFAULT; + + /** + * The default value of the '{@link #getName() <em>Name</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getName() + * @generated + * @ordered + */ + protected static final String NAME_EDEFAULT = null; + + /** + * The cached value of the '{@link #getName() <em>Name</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getName() + * @generated + * @ordered + */ + protected String name = NAME_EDEFAULT; + + /** + * The default value of the '{@link #getPackage() <em>Package</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getPackage() + * @generated + * @ordered + */ + protected static final String PACKAGE_EDEFAULT = null; + + /** + * The cached value of the '{@link #getPackage() <em>Package</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getPackage() + * @generated + * @ordered + */ + protected String package_ = PACKAGE_EDEFAULT; + + /** + * The default value of the '{@link #getSkipped() <em>Skipped</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getSkipped() + * @generated + * @ordered + */ + protected static final String SKIPPED_EDEFAULT = null; + + /** + * The cached value of the '{@link #getSkipped() <em>Skipped</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getSkipped() + * @generated + * @ordered + */ + protected String skipped = SKIPPED_EDEFAULT; + + /** + * The default value of the '{@link #getTests() <em>Tests</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getTests() + * @generated + * @ordered + */ + protected static final String TESTS_EDEFAULT = null; + + /** + * The cached value of the '{@link #getTests() <em>Tests</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getTests() + * @generated + * @ordered + */ + protected String tests = TESTS_EDEFAULT; + + /** + * The default value of the '{@link #getTime() <em>Time</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getTime() + * @generated + * @ordered + */ + protected static final String TIME_EDEFAULT = null; + + /** + * The cached value of the '{@link #getTime() <em>Time</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getTime() + * @generated + * @ordered + */ + protected String time = TIME_EDEFAULT; + + /** + * The default value of the '{@link #getTimestamp() <em>Timestamp</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getTimestamp() + * @generated + * @ordered + */ + protected static final String TIMESTAMP_EDEFAULT = null; + + /** + * The cached value of the '{@link #getTimestamp() <em>Timestamp</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getTimestamp() + * @generated + * @ordered + */ + protected String timestamp = TIMESTAMP_EDEFAULT; + /** * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -39,4 +350,617 @@ public class TestsuiteTypeImpl extends TestsuiteImpl implements TestsuiteType { return EtunitPackage.Literals.TESTSUITE_TYPE; } + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public PropertiesType getProperties() { + return properties; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public NotificationChain basicSetProperties(PropertiesType newProperties, NotificationChain msgs) { + PropertiesType oldProperties = properties; + properties = newProperties; + if (eNotificationRequired()) { + ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, EtunitPackage.TESTSUITE_TYPE__PROPERTIES, oldProperties, newProperties); + if (msgs == null) msgs = notification; else msgs.add(notification); + } + return msgs; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void setProperties(PropertiesType newProperties) { + if (newProperties != properties) { + NotificationChain msgs = null; + if (properties != null) + msgs = ((InternalEObject)properties).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - EtunitPackage.TESTSUITE_TYPE__PROPERTIES, null, msgs); + if (newProperties != null) + msgs = ((InternalEObject)newProperties).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - EtunitPackage.TESTSUITE_TYPE__PROPERTIES, null, msgs); + msgs = basicSetProperties(newProperties, msgs); + if (msgs != null) msgs.dispatch(); + } + else if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EtunitPackage.TESTSUITE_TYPE__PROPERTIES, newProperties, newProperties)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public EList<TestcaseType> getTestcase() { + if (testcase == null) { + testcase = new EObjectContainmentEList<TestcaseType>(TestcaseType.class, this, EtunitPackage.TESTSUITE_TYPE__TESTCASE); + } + return testcase; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public String getSystemOut() { + return systemOut; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void setSystemOut(String newSystemOut) { + String oldSystemOut = systemOut; + systemOut = newSystemOut; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EtunitPackage.TESTSUITE_TYPE__SYSTEM_OUT, oldSystemOut, systemOut)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public String getSystemErr() { + return systemErr; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void setSystemErr(String newSystemErr) { + String oldSystemErr = systemErr; + systemErr = newSystemErr; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EtunitPackage.TESTSUITE_TYPE__SYSTEM_ERR, oldSystemErr, systemErr)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public String getDisabled() { + return disabled; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void setDisabled(String newDisabled) { + String oldDisabled = disabled; + disabled = newDisabled; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EtunitPackage.TESTSUITE_TYPE__DISABLED, oldDisabled, disabled)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public String getErrors() { + return errors; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void setErrors(String newErrors) { + String oldErrors = errors; + errors = newErrors; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EtunitPackage.TESTSUITE_TYPE__ERRORS, oldErrors, errors)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public String getFailures() { + return failures; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void setFailures(String newFailures) { + String oldFailures = failures; + failures = newFailures; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EtunitPackage.TESTSUITE_TYPE__FAILURES, oldFailures, failures)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public String getHostname() { + return hostname; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void setHostname(String newHostname) { + String oldHostname = hostname; + hostname = newHostname; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EtunitPackage.TESTSUITE_TYPE__HOSTNAME, oldHostname, hostname)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public String getId() { + return id; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void setId(String newId) { + String oldId = id; + id = newId; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EtunitPackage.TESTSUITE_TYPE__ID, oldId, id)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public String getName() { + return name; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void setName(String newName) { + String oldName = name; + name = newName; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EtunitPackage.TESTSUITE_TYPE__NAME, oldName, name)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public String getPackage() { + return package_; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void setPackage(String newPackage) { + String oldPackage = package_; + package_ = newPackage; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EtunitPackage.TESTSUITE_TYPE__PACKAGE, oldPackage, package_)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public String getSkipped() { + return skipped; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void setSkipped(String newSkipped) { + String oldSkipped = skipped; + skipped = newSkipped; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EtunitPackage.TESTSUITE_TYPE__SKIPPED, oldSkipped, skipped)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public String getTests() { + return tests; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void setTests(String newTests) { + String oldTests = tests; + tests = newTests; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EtunitPackage.TESTSUITE_TYPE__TESTS, oldTests, tests)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public String getTime() { + return time; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void setTime(String newTime) { + String oldTime = time; + time = newTime; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EtunitPackage.TESTSUITE_TYPE__TIME, oldTime, time)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public String getTimestamp() { + return timestamp; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void setTimestamp(String newTimestamp) { + String oldTimestamp = timestamp; + timestamp = newTimestamp; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EtunitPackage.TESTSUITE_TYPE__TIMESTAMP, oldTimestamp, timestamp)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { + switch (featureID) { + case EtunitPackage.TESTSUITE_TYPE__PROPERTIES: + return basicSetProperties(null, msgs); + case EtunitPackage.TESTSUITE_TYPE__TESTCASE: + return ((InternalEList<?>)getTestcase()).basicRemove(otherEnd, msgs); + } + return super.eInverseRemove(otherEnd, featureID, msgs); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case EtunitPackage.TESTSUITE_TYPE__PROPERTIES: + return getProperties(); + case EtunitPackage.TESTSUITE_TYPE__TESTCASE: + return getTestcase(); + case EtunitPackage.TESTSUITE_TYPE__SYSTEM_OUT: + return getSystemOut(); + case EtunitPackage.TESTSUITE_TYPE__SYSTEM_ERR: + return getSystemErr(); + case EtunitPackage.TESTSUITE_TYPE__DISABLED: + return getDisabled(); + case EtunitPackage.TESTSUITE_TYPE__ERRORS: + return getErrors(); + case EtunitPackage.TESTSUITE_TYPE__FAILURES: + return getFailures(); + case EtunitPackage.TESTSUITE_TYPE__HOSTNAME: + return getHostname(); + case EtunitPackage.TESTSUITE_TYPE__ID: + return getId(); + case EtunitPackage.TESTSUITE_TYPE__NAME: + return getName(); + case EtunitPackage.TESTSUITE_TYPE__PACKAGE: + return getPackage(); + case EtunitPackage.TESTSUITE_TYPE__SKIPPED: + return getSkipped(); + case EtunitPackage.TESTSUITE_TYPE__TESTS: + return getTests(); + case EtunitPackage.TESTSUITE_TYPE__TIME: + return getTime(); + case EtunitPackage.TESTSUITE_TYPE__TIMESTAMP: + return getTimestamp(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @SuppressWarnings("unchecked") + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case EtunitPackage.TESTSUITE_TYPE__PROPERTIES: + setProperties((PropertiesType)newValue); + return; + case EtunitPackage.TESTSUITE_TYPE__TESTCASE: + getTestcase().clear(); + getTestcase().addAll((Collection<? extends TestcaseType>)newValue); + return; + case EtunitPackage.TESTSUITE_TYPE__SYSTEM_OUT: + setSystemOut((String)newValue); + return; + case EtunitPackage.TESTSUITE_TYPE__SYSTEM_ERR: + setSystemErr((String)newValue); + return; + case EtunitPackage.TESTSUITE_TYPE__DISABLED: + setDisabled((String)newValue); + return; + case EtunitPackage.TESTSUITE_TYPE__ERRORS: + setErrors((String)newValue); + return; + case EtunitPackage.TESTSUITE_TYPE__FAILURES: + setFailures((String)newValue); + return; + case EtunitPackage.TESTSUITE_TYPE__HOSTNAME: + setHostname((String)newValue); + return; + case EtunitPackage.TESTSUITE_TYPE__ID: + setId((String)newValue); + return; + case EtunitPackage.TESTSUITE_TYPE__NAME: + setName((String)newValue); + return; + case EtunitPackage.TESTSUITE_TYPE__PACKAGE: + setPackage((String)newValue); + return; + case EtunitPackage.TESTSUITE_TYPE__SKIPPED: + setSkipped((String)newValue); + return; + case EtunitPackage.TESTSUITE_TYPE__TESTS: + setTests((String)newValue); + return; + case EtunitPackage.TESTSUITE_TYPE__TIME: + setTime((String)newValue); + return; + case EtunitPackage.TESTSUITE_TYPE__TIMESTAMP: + setTimestamp((String)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case EtunitPackage.TESTSUITE_TYPE__PROPERTIES: + setProperties((PropertiesType)null); + return; + case EtunitPackage.TESTSUITE_TYPE__TESTCASE: + getTestcase().clear(); + return; + case EtunitPackage.TESTSUITE_TYPE__SYSTEM_OUT: + setSystemOut(SYSTEM_OUT_EDEFAULT); + return; + case EtunitPackage.TESTSUITE_TYPE__SYSTEM_ERR: + setSystemErr(SYSTEM_ERR_EDEFAULT); + return; + case EtunitPackage.TESTSUITE_TYPE__DISABLED: + setDisabled(DISABLED_EDEFAULT); + return; + case EtunitPackage.TESTSUITE_TYPE__ERRORS: + setErrors(ERRORS_EDEFAULT); + return; + case EtunitPackage.TESTSUITE_TYPE__FAILURES: + setFailures(FAILURES_EDEFAULT); + return; + case EtunitPackage.TESTSUITE_TYPE__HOSTNAME: + setHostname(HOSTNAME_EDEFAULT); + return; + case EtunitPackage.TESTSUITE_TYPE__ID: + setId(ID_EDEFAULT); + return; + case EtunitPackage.TESTSUITE_TYPE__NAME: + setName(NAME_EDEFAULT); + return; + case EtunitPackage.TESTSUITE_TYPE__PACKAGE: + setPackage(PACKAGE_EDEFAULT); + return; + case EtunitPackage.TESTSUITE_TYPE__SKIPPED: + setSkipped(SKIPPED_EDEFAULT); + return; + case EtunitPackage.TESTSUITE_TYPE__TESTS: + setTests(TESTS_EDEFAULT); + return; + case EtunitPackage.TESTSUITE_TYPE__TIME: + setTime(TIME_EDEFAULT); + return; + case EtunitPackage.TESTSUITE_TYPE__TIMESTAMP: + setTimestamp(TIMESTAMP_EDEFAULT); + return; + } + super.eUnset(featureID); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case EtunitPackage.TESTSUITE_TYPE__PROPERTIES: + return properties != null; + case EtunitPackage.TESTSUITE_TYPE__TESTCASE: + return testcase != null && !testcase.isEmpty(); + case EtunitPackage.TESTSUITE_TYPE__SYSTEM_OUT: + return SYSTEM_OUT_EDEFAULT == null ? systemOut != null : !SYSTEM_OUT_EDEFAULT.equals(systemOut); + case EtunitPackage.TESTSUITE_TYPE__SYSTEM_ERR: + return SYSTEM_ERR_EDEFAULT == null ? systemErr != null : !SYSTEM_ERR_EDEFAULT.equals(systemErr); + case EtunitPackage.TESTSUITE_TYPE__DISABLED: + return DISABLED_EDEFAULT == null ? disabled != null : !DISABLED_EDEFAULT.equals(disabled); + case EtunitPackage.TESTSUITE_TYPE__ERRORS: + return ERRORS_EDEFAULT == null ? errors != null : !ERRORS_EDEFAULT.equals(errors); + case EtunitPackage.TESTSUITE_TYPE__FAILURES: + return FAILURES_EDEFAULT == null ? failures != null : !FAILURES_EDEFAULT.equals(failures); + case EtunitPackage.TESTSUITE_TYPE__HOSTNAME: + return HOSTNAME_EDEFAULT == null ? hostname != null : !HOSTNAME_EDEFAULT.equals(hostname); + case EtunitPackage.TESTSUITE_TYPE__ID: + return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id); + case EtunitPackage.TESTSUITE_TYPE__NAME: + return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name); + case EtunitPackage.TESTSUITE_TYPE__PACKAGE: + return PACKAGE_EDEFAULT == null ? package_ != null : !PACKAGE_EDEFAULT.equals(package_); + case EtunitPackage.TESTSUITE_TYPE__SKIPPED: + return SKIPPED_EDEFAULT == null ? skipped != null : !SKIPPED_EDEFAULT.equals(skipped); + case EtunitPackage.TESTSUITE_TYPE__TESTS: + return TESTS_EDEFAULT == null ? tests != null : !TESTS_EDEFAULT.equals(tests); + case EtunitPackage.TESTSUITE_TYPE__TIME: + return TIME_EDEFAULT == null ? time != null : !TIME_EDEFAULT.equals(time); + case EtunitPackage.TESTSUITE_TYPE__TIMESTAMP: + return TIMESTAMP_EDEFAULT == null ? timestamp != null : !TIMESTAMP_EDEFAULT.equals(timestamp); + } + return super.eIsSet(featureID); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public String toString() { + if (eIsProxy()) return super.toString(); + + StringBuilder result = new StringBuilder(super.toString()); + result.append(" (systemOut: "); + result.append(systemOut); + result.append(", systemErr: "); + result.append(systemErr); + result.append(", disabled: "); + result.append(disabled); + result.append(", errors: "); + result.append(errors); + result.append(", failures: "); + result.append(failures); + result.append(", hostname: "); + result.append(hostname); + result.append(", id: "); + result.append(id); + result.append(", name: "); + result.append(name); + result.append(", package: "); + result.append(package_); + result.append(", skipped: "); + result.append(skipped); + result.append(", tests: "); + result.append(tests); + result.append(", time: "); + result.append(time); + result.append(", timestamp: "); + result.append(timestamp); + result.append(')'); + return result.toString(); + } + } //TestsuiteTypeImpl diff --git a/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/impl/TestsuitesTypeImpl.java b/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/impl/TestsuitesTypeImpl.java index 54641ddcc..86ab90b83 100644 --- a/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/impl/TestsuitesTypeImpl.java +++ b/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/impl/TestsuitesTypeImpl.java @@ -1,13 +1,10 @@ /** - * <copyright> - * </copyright> - * - * $Id$ */ package org.eclipse.etrice.etunit.converter.Etunit.impl; import java.util.Collection; +import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; import org.eclipse.emf.common.util.EList; @@ -15,7 +12,8 @@ import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; -import org.eclipse.emf.ecore.impl.EObjectImpl; +import org.eclipse.emf.ecore.impl.ENotificationImpl; +import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.emf.ecore.util.InternalEList; @@ -30,14 +28,20 @@ import org.eclipse.etrice.etunit.converter.Etunit.TestsuitesType; * <!-- end-user-doc --> * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.impl.TestsuitesTypeImpl#getTestsuite <em>Testsuite</em>}</li> + * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.impl.TestsuitesTypeImpl#getDisabled <em>Disabled</em>}</li> + * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.impl.TestsuitesTypeImpl#getErrors <em>Errors</em>}</li> + * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.impl.TestsuitesTypeImpl#getFailures <em>Failures</em>}</li> + * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.impl.TestsuitesTypeImpl#getName <em>Name</em>}</li> + * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.impl.TestsuitesTypeImpl#getTests <em>Tests</em>}</li> + * <li>{@link org.eclipse.etrice.etunit.converter.Etunit.impl.TestsuitesTypeImpl#getTime <em>Time</em>}</li> * </ul> - * </p> * * @generated */ -public class TestsuitesTypeImpl extends EObjectImpl implements TestsuitesType { +public class TestsuitesTypeImpl extends MinimalEObjectImpl.Container implements TestsuitesType { /** * The cached value of the '{@link #getTestsuite() <em>Testsuite</em>}' containment reference list. * <!-- begin-user-doc --> @@ -49,6 +53,126 @@ public class TestsuitesTypeImpl extends EObjectImpl implements TestsuitesType { protected EList<TestsuiteType> testsuite; /** + * The default value of the '{@link #getDisabled() <em>Disabled</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getDisabled() + * @generated + * @ordered + */ + protected static final String DISABLED_EDEFAULT = null; + + /** + * The cached value of the '{@link #getDisabled() <em>Disabled</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getDisabled() + * @generated + * @ordered + */ + protected String disabled = DISABLED_EDEFAULT; + + /** + * The default value of the '{@link #getErrors() <em>Errors</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getErrors() + * @generated + * @ordered + */ + protected static final String ERRORS_EDEFAULT = null; + + /** + * The cached value of the '{@link #getErrors() <em>Errors</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getErrors() + * @generated + * @ordered + */ + protected String errors = ERRORS_EDEFAULT; + + /** + * The default value of the '{@link #getFailures() <em>Failures</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getFailures() + * @generated + * @ordered + */ + protected static final String FAILURES_EDEFAULT = null; + + /** + * The cached value of the '{@link #getFailures() <em>Failures</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getFailures() + * @generated + * @ordered + */ + protected String failures = FAILURES_EDEFAULT; + + /** + * The default value of the '{@link #getName() <em>Name</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getName() + * @generated + * @ordered + */ + protected static final String NAME_EDEFAULT = null; + + /** + * The cached value of the '{@link #getName() <em>Name</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getName() + * @generated + * @ordered + */ + protected String name = NAME_EDEFAULT; + + /** + * The default value of the '{@link #getTests() <em>Tests</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getTests() + * @generated + * @ordered + */ + protected static final String TESTS_EDEFAULT = null; + + /** + * The cached value of the '{@link #getTests() <em>Tests</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getTests() + * @generated + * @ordered + */ + protected String tests = TESTS_EDEFAULT; + + /** + * The default value of the '{@link #getTime() <em>Time</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getTime() + * @generated + * @ordered + */ + protected static final String TIME_EDEFAULT = null; + + /** + * The cached value of the '{@link #getTime() <em>Time</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getTime() + * @generated + * @ordered + */ + protected String time = TIME_EDEFAULT; + + /** * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated @@ -72,6 +196,7 @@ public class TestsuitesTypeImpl extends EObjectImpl implements TestsuitesType { * <!-- end-user-doc --> * @generated */ + @Override public EList<TestsuiteType> getTestsuite() { if (testsuite == null) { testsuite = new EObjectContainmentEList<TestsuiteType>(TestsuiteType.class, this, EtunitPackage.TESTSUITES_TYPE__TESTSUITE); @@ -85,6 +210,144 @@ public class TestsuitesTypeImpl extends EObjectImpl implements TestsuitesType { * @generated */ @Override + public String getDisabled() { + return disabled; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void setDisabled(String newDisabled) { + String oldDisabled = disabled; + disabled = newDisabled; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EtunitPackage.TESTSUITES_TYPE__DISABLED, oldDisabled, disabled)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public String getErrors() { + return errors; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void setErrors(String newErrors) { + String oldErrors = errors; + errors = newErrors; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EtunitPackage.TESTSUITES_TYPE__ERRORS, oldErrors, errors)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public String getFailures() { + return failures; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void setFailures(String newFailures) { + String oldFailures = failures; + failures = newFailures; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EtunitPackage.TESTSUITES_TYPE__FAILURES, oldFailures, failures)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public String getName() { + return name; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void setName(String newName) { + String oldName = name; + name = newName; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EtunitPackage.TESTSUITES_TYPE__NAME, oldName, name)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public String getTests() { + return tests; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void setTests(String newTests) { + String oldTests = tests; + tests = newTests; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EtunitPackage.TESTSUITES_TYPE__TESTS, oldTests, tests)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public String getTime() { + return time; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void setTime(String newTime) { + String oldTime = time; + time = newTime; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, EtunitPackage.TESTSUITES_TYPE__TIME, oldTime, time)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { switch (featureID) { case EtunitPackage.TESTSUITES_TYPE__TESTSUITE: @@ -103,6 +366,18 @@ public class TestsuitesTypeImpl extends EObjectImpl implements TestsuitesType { switch (featureID) { case EtunitPackage.TESTSUITES_TYPE__TESTSUITE: return getTestsuite(); + case EtunitPackage.TESTSUITES_TYPE__DISABLED: + return getDisabled(); + case EtunitPackage.TESTSUITES_TYPE__ERRORS: + return getErrors(); + case EtunitPackage.TESTSUITES_TYPE__FAILURES: + return getFailures(); + case EtunitPackage.TESTSUITES_TYPE__NAME: + return getName(); + case EtunitPackage.TESTSUITES_TYPE__TESTS: + return getTests(); + case EtunitPackage.TESTSUITES_TYPE__TIME: + return getTime(); } return super.eGet(featureID, resolve, coreType); } @@ -120,6 +395,24 @@ public class TestsuitesTypeImpl extends EObjectImpl implements TestsuitesType { getTestsuite().clear(); getTestsuite().addAll((Collection<? extends TestsuiteType>)newValue); return; + case EtunitPackage.TESTSUITES_TYPE__DISABLED: + setDisabled((String)newValue); + return; + case EtunitPackage.TESTSUITES_TYPE__ERRORS: + setErrors((String)newValue); + return; + case EtunitPackage.TESTSUITES_TYPE__FAILURES: + setFailures((String)newValue); + return; + case EtunitPackage.TESTSUITES_TYPE__NAME: + setName((String)newValue); + return; + case EtunitPackage.TESTSUITES_TYPE__TESTS: + setTests((String)newValue); + return; + case EtunitPackage.TESTSUITES_TYPE__TIME: + setTime((String)newValue); + return; } super.eSet(featureID, newValue); } @@ -135,6 +428,24 @@ public class TestsuitesTypeImpl extends EObjectImpl implements TestsuitesType { case EtunitPackage.TESTSUITES_TYPE__TESTSUITE: getTestsuite().clear(); return; + case EtunitPackage.TESTSUITES_TYPE__DISABLED: + setDisabled(DISABLED_EDEFAULT); + return; + case EtunitPackage.TESTSUITES_TYPE__ERRORS: + setErrors(ERRORS_EDEFAULT); + return; + case EtunitPackage.TESTSUITES_TYPE__FAILURES: + setFailures(FAILURES_EDEFAULT); + return; + case EtunitPackage.TESTSUITES_TYPE__NAME: + setName(NAME_EDEFAULT); + return; + case EtunitPackage.TESTSUITES_TYPE__TESTS: + setTests(TESTS_EDEFAULT); + return; + case EtunitPackage.TESTSUITES_TYPE__TIME: + setTime(TIME_EDEFAULT); + return; } super.eUnset(featureID); } @@ -149,8 +460,46 @@ public class TestsuitesTypeImpl extends EObjectImpl implements TestsuitesType { switch (featureID) { case EtunitPackage.TESTSUITES_TYPE__TESTSUITE: return testsuite != null && !testsuite.isEmpty(); + case EtunitPackage.TESTSUITES_TYPE__DISABLED: + return DISABLED_EDEFAULT == null ? disabled != null : !DISABLED_EDEFAULT.equals(disabled); + case EtunitPackage.TESTSUITES_TYPE__ERRORS: + return ERRORS_EDEFAULT == null ? errors != null : !ERRORS_EDEFAULT.equals(errors); + case EtunitPackage.TESTSUITES_TYPE__FAILURES: + return FAILURES_EDEFAULT == null ? failures != null : !FAILURES_EDEFAULT.equals(failures); + case EtunitPackage.TESTSUITES_TYPE__NAME: + return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name); + case EtunitPackage.TESTSUITES_TYPE__TESTS: + return TESTS_EDEFAULT == null ? tests != null : !TESTS_EDEFAULT.equals(tests); + case EtunitPackage.TESTSUITES_TYPE__TIME: + return TIME_EDEFAULT == null ? time != null : !TIME_EDEFAULT.equals(time); } return super.eIsSet(featureID); } + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public String toString() { + if (eIsProxy()) return super.toString(); + + StringBuilder result = new StringBuilder(super.toString()); + result.append(" (disabled: "); + result.append(disabled); + result.append(", errors: "); + result.append(errors); + result.append(", failures: "); + result.append(failures); + result.append(", name: "); + result.append(name); + result.append(", tests: "); + result.append(tests); + result.append(", time: "); + result.append(time); + result.append(')'); + return result.toString(); + } + } //TestsuitesTypeImpl diff --git a/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/util/EtunitAdapterFactory.java b/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/util/EtunitAdapterFactory.java index 642d18fdc..cf20ccec2 100644 --- a/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/util/EtunitAdapterFactory.java +++ b/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/util/EtunitAdapterFactory.java @@ -1,8 +1,4 @@ /** - * <copyright> - * </copyright> - * - * $Id$ */ package org.eclipse.etrice.etunit.converter.Etunit.util; @@ -84,12 +80,20 @@ public class EtunitAdapterFactory extends AdapterFactoryImpl { return createFailureTypeAdapter(); } @Override - public Adapter caseTestcaseType(TestcaseType object) { - return createTestcaseTypeAdapter(); + public Adapter casePropertiesType(PropertiesType object) { + return createPropertiesTypeAdapter(); } @Override - public Adapter caseTestsuite(Testsuite object) { - return createTestsuiteAdapter(); + public Adapter casePropertyType(PropertyType object) { + return createPropertyTypeAdapter(); + } + @Override + public Adapter caseSkippedType(SkippedType object) { + return createSkippedTypeAdapter(); + } + @Override + public Adapter caseTestcaseType(TestcaseType object) { + return createTestcaseTypeAdapter(); } @Override public Adapter caseTestsuitesType(TestsuitesType object) { @@ -162,30 +166,58 @@ public class EtunitAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.etrice.etunit.converter.Etunit.TestcaseType <em>Testcase Type</em>}'. + * Creates a new adapter for an object of class '{@link org.eclipse.etrice.etunit.converter.Etunit.PropertiesType <em>Properties Type</em>}'. * <!-- begin-user-doc --> * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * <!-- end-user-doc --> * @return the new adapter. - * @see org.eclipse.etrice.etunit.converter.Etunit.TestcaseType + * @see org.eclipse.etrice.etunit.converter.Etunit.PropertiesType * @generated */ - public Adapter createTestcaseTypeAdapter() { + public Adapter createPropertiesTypeAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link org.eclipse.etrice.etunit.converter.Etunit.PropertyType <em>Property Type</em>}'. + * <!-- begin-user-doc --> + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * <!-- end-user-doc --> + * @return the new adapter. + * @see org.eclipse.etrice.etunit.converter.Etunit.PropertyType + * @generated + */ + public Adapter createPropertyTypeAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link org.eclipse.etrice.etunit.converter.Etunit.SkippedType <em>Skipped Type</em>}'. + * <!-- begin-user-doc --> + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * <!-- end-user-doc --> + * @return the new adapter. + * @see org.eclipse.etrice.etunit.converter.Etunit.SkippedType + * @generated + */ + public Adapter createSkippedTypeAdapter() { return null; } /** - * Creates a new adapter for an object of class '{@link org.eclipse.etrice.etunit.converter.Etunit.Testsuite <em>Testsuite</em>}'. + * Creates a new adapter for an object of class '{@link org.eclipse.etrice.etunit.converter.Etunit.TestcaseType <em>Testcase Type</em>}'. * <!-- begin-user-doc --> * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * <!-- end-user-doc --> * @return the new adapter. - * @see org.eclipse.etrice.etunit.converter.Etunit.Testsuite + * @see org.eclipse.etrice.etunit.converter.Etunit.TestcaseType * @generated */ - public Adapter createTestsuiteAdapter() { + public Adapter createTestcaseTypeAdapter() { return null; } diff --git a/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/util/EtunitResourceFactoryImpl.java b/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/util/EtunitResourceFactoryImpl.java index cbf27fbf7..5593088e6 100644 --- a/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/util/EtunitResourceFactoryImpl.java +++ b/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/util/EtunitResourceFactoryImpl.java @@ -1,8 +1,4 @@ /** - * <copyright> - * </copyright> - * - * $Id$ */ package org.eclipse.etrice.etunit.converter.Etunit.util; diff --git a/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/util/EtunitResourceImpl.java b/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/util/EtunitResourceImpl.java index 9777bac9f..9f82a74a3 100644 --- a/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/util/EtunitResourceImpl.java +++ b/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/util/EtunitResourceImpl.java @@ -1,8 +1,4 @@ /** - * <copyright> - * </copyright> - * - * $Id$ */ package org.eclipse.etrice.etunit.converter.Etunit.util; diff --git a/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/util/EtunitSwitch.java b/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/util/EtunitSwitch.java index ebf776205..ba9133c4f 100644 --- a/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/util/EtunitSwitch.java +++ b/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/util/EtunitSwitch.java @@ -1,8 +1,4 @@ /** - * <copyright> - * </copyright> - * - * $Id$ */ package org.eclipse.etrice.etunit.converter.Etunit.util; @@ -51,7 +47,7 @@ public class EtunitSwitch<T> extends Switch<T> { * Checks whether this is a switch for the given package. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @parameter ePackage the package in question. + * @param ePackage the package in question. * @return whether this is a switch for the given package. * @generated */ @@ -88,15 +84,27 @@ public class EtunitSwitch<T> extends Switch<T> { if (result == null) result = defaultCase(theEObject); return result; } - case EtunitPackage.TESTCASE_TYPE: { - TestcaseType testcaseType = (TestcaseType)theEObject; - T result = caseTestcaseType(testcaseType); + case EtunitPackage.PROPERTIES_TYPE: { + PropertiesType propertiesType = (PropertiesType)theEObject; + T result = casePropertiesType(propertiesType); + if (result == null) result = defaultCase(theEObject); + return result; + } + case EtunitPackage.PROPERTY_TYPE: { + PropertyType propertyType = (PropertyType)theEObject; + T result = casePropertyType(propertyType); if (result == null) result = defaultCase(theEObject); return result; } - case EtunitPackage.TESTSUITE: { - Testsuite testsuite = (Testsuite)theEObject; - T result = caseTestsuite(testsuite); + case EtunitPackage.SKIPPED_TYPE: { + SkippedType skippedType = (SkippedType)theEObject; + T result = caseSkippedType(skippedType); + if (result == null) result = defaultCase(theEObject); + return result; + } + case EtunitPackage.TESTCASE_TYPE: { + TestcaseType testcaseType = (TestcaseType)theEObject; + T result = caseTestcaseType(testcaseType); if (result == null) result = defaultCase(theEObject); return result; } @@ -109,7 +117,6 @@ public class EtunitSwitch<T> extends Switch<T> { case EtunitPackage.TESTSUITE_TYPE: { TestsuiteType testsuiteType = (TestsuiteType)theEObject; T result = caseTestsuiteType(testsuiteType); - if (result == null) result = caseTestsuite(testsuiteType); if (result == null) result = defaultCase(theEObject); return result; } @@ -163,32 +170,62 @@ public class EtunitSwitch<T> extends Switch<T> { } /** - * Returns the result of interpreting the object as an instance of '<em>Testcase Type</em>'. + * Returns the result of interpreting the object as an instance of '<em>Properties Type</em>'. * <!-- begin-user-doc --> * This implementation returns null; * returning a non-null result will terminate the switch. * <!-- end-user-doc --> * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Testcase Type</em>'. + * @return the result of interpreting the object as an instance of '<em>Properties Type</em>'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ - public T caseTestcaseType(TestcaseType object) { + public T casePropertiesType(PropertiesType object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of '<em>Property Type</em>'. + * <!-- begin-user-doc --> + * This implementation returns null; + * returning a non-null result will terminate the switch. + * <!-- end-user-doc --> + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of '<em>Property Type</em>'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T casePropertyType(PropertyType object) { return null; } /** - * Returns the result of interpreting the object as an instance of '<em>Testsuite</em>'. + * Returns the result of interpreting the object as an instance of '<em>Skipped Type</em>'. * <!-- begin-user-doc --> * This implementation returns null; * returning a non-null result will terminate the switch. * <!-- end-user-doc --> * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Testsuite</em>'. + * @return the result of interpreting the object as an instance of '<em>Skipped Type</em>'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ - public T caseTestsuite(Testsuite object) { + public T caseSkippedType(SkippedType object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of '<em>Testcase Type</em>'. + * <!-- begin-user-doc --> + * This implementation returns null; + * returning a non-null result will terminate the switch. + * <!-- end-user-doc --> + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of '<em>Testcase Type</em>'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseTestcaseType(TestcaseType object) { return null; } diff --git a/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/util/EtunitValidator.java b/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/util/EtunitValidator.java deleted file mode 100644 index 22caade76..000000000 --- a/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/util/EtunitValidator.java +++ /dev/null @@ -1,274 +0,0 @@ -/** - * <copyright> - * </copyright> - * - * $Id$ - */ -package org.eclipse.etrice.etunit.converter.Etunit.util; - -import java.util.Map; - -import javax.xml.datatype.XMLGregorianCalendar; - -import org.eclipse.emf.common.util.DiagnosticChain; -import org.eclipse.emf.common.util.ResourceLocator; - -import org.eclipse.emf.ecore.EPackage; - -import org.eclipse.emf.ecore.util.EObjectValidator; - -import org.eclipse.emf.ecore.xml.type.util.XMLTypeUtil; -import org.eclipse.emf.ecore.xml.type.util.XMLTypeValidator; - -import org.eclipse.etrice.etunit.converter.Etunit.*; - -/** - * <!-- begin-user-doc --> - * The <b>Validator</b> for the model. - * <!-- end-user-doc --> - * @see org.eclipse.etrice.etunit.converter.Etunit.EtunitPackage - * @generated - */ -public class EtunitValidator extends EObjectValidator { - /** - * The cached model package - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public static final EtunitValidator INSTANCE = new EtunitValidator(); - - /** - * A constant for the {@link org.eclipse.emf.common.util.Diagnostic#getSource() source} of diagnostic {@link org.eclipse.emf.common.util.Diagnostic#getCode() codes} from this package. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see org.eclipse.emf.common.util.Diagnostic#getSource() - * @see org.eclipse.emf.common.util.Diagnostic#getCode() - * @generated - */ - public static final String DIAGNOSTIC_SOURCE = "org.eclipse.etrice.etunit.converter.Etunit"; - - /** - * A constant with a fixed name that can be used as the base value for additional hand written constants. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - private static final int GENERATED_DIAGNOSTIC_CODE_COUNT = 0; - - /** - * A constant with a fixed name that can be used as the base value for additional hand written constants in a derived class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected static final int DIAGNOSTIC_CODE_COUNT = GENERATED_DIAGNOSTIC_CODE_COUNT; - - /** - * The cached base package validator. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected XMLTypeValidator xmlTypeValidator; - - /** - * Creates an instance of the switch. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EtunitValidator() { - super(); - xmlTypeValidator = XMLTypeValidator.INSTANCE; - } - - /** - * Returns the package of this validator switch. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - protected EPackage getEPackage() { - return EtunitPackage.eINSTANCE; - } - - /** - * Calls <code>validateXXX</code> for the corresponding classifier of the model. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - protected boolean validate(int classifierID, Object value, DiagnosticChain diagnostics, Map<Object, Object> context) { - switch (classifierID) { - case EtunitPackage.DOCUMENT_ROOT: - return validateDocumentRoot((DocumentRoot)value, diagnostics, context); - case EtunitPackage.ERROR_TYPE: - return validateErrorType((ErrorType)value, diagnostics, context); - case EtunitPackage.FAILURE_TYPE: - return validateFailureType((FailureType)value, diagnostics, context); - case EtunitPackage.TESTCASE_TYPE: - return validateTestcaseType((TestcaseType)value, diagnostics, context); - case EtunitPackage.TESTSUITE: - return validateTestsuite((Testsuite)value, diagnostics, context); - case EtunitPackage.TESTSUITES_TYPE: - return validateTestsuitesType((TestsuitesType)value, diagnostics, context); - case EtunitPackage.TESTSUITE_TYPE: - return validateTestsuiteType((TestsuiteType)value, diagnostics, context); - case EtunitPackage.ISO8601DATETIMEPATTERN: - return validateISO8601DATETIMEPATTERN((XMLGregorianCalendar)value, diagnostics, context); - case EtunitPackage.NAME_TYPE: - return validateNameType((String)value, diagnostics, context); - case EtunitPackage.PRE_STRING: - return validatePreString((String)value, diagnostics, context); - default: - return true; - } - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public boolean validateDocumentRoot(DocumentRoot documentRoot, DiagnosticChain diagnostics, Map<Object, Object> context) { - return validate_EveryDefaultConstraint(documentRoot, diagnostics, context); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public boolean validateErrorType(ErrorType errorType, DiagnosticChain diagnostics, Map<Object, Object> context) { - return validate_EveryDefaultConstraint(errorType, diagnostics, context); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public boolean validateFailureType(FailureType failureType, DiagnosticChain diagnostics, Map<Object, Object> context) { - return validate_EveryDefaultConstraint(failureType, diagnostics, context); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public boolean validateTestcaseType(TestcaseType testcaseType, DiagnosticChain diagnostics, Map<Object, Object> context) { - return validate_EveryDefaultConstraint(testcaseType, diagnostics, context); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public boolean validateTestsuite(Testsuite testsuite, DiagnosticChain diagnostics, Map<Object, Object> context) { - return validate_EveryDefaultConstraint(testsuite, diagnostics, context); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public boolean validateTestsuitesType(TestsuitesType testsuitesType, DiagnosticChain diagnostics, Map<Object, Object> context) { - return validate_EveryDefaultConstraint(testsuitesType, diagnostics, context); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public boolean validateTestsuiteType(TestsuiteType testsuiteType, DiagnosticChain diagnostics, Map<Object, Object> context) { - return validate_EveryDefaultConstraint(testsuiteType, diagnostics, context); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public boolean validateISO8601DATETIMEPATTERN(XMLGregorianCalendar iso8601DATETIMEPATTERN, DiagnosticChain diagnostics, Map<Object, Object> context) { - boolean result = validateISO8601DATETIMEPATTERN_Pattern(iso8601DATETIMEPATTERN, diagnostics, context); - return result; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - * @see #validateISO8601DATETIMEPATTERN_Pattern - */ - public static final PatternMatcher [][] ISO8601DATETIMEPATTERN__PATTERN__VALUES = - new PatternMatcher [][] { - new PatternMatcher [] { - XMLTypeUtil.createPatternMatcher("[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}") - } - }; - - /** - * Validates the Pattern constraint of '<em>ISO8601DATETIMEPATTERN</em>'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public boolean validateISO8601DATETIMEPATTERN_Pattern(XMLGregorianCalendar iso8601DATETIMEPATTERN, DiagnosticChain diagnostics, Map<Object, Object> context) { - return validatePattern(EtunitPackage.Literals.ISO8601DATETIMEPATTERN, iso8601DATETIMEPATTERN, ISO8601DATETIMEPATTERN__PATTERN__VALUES, diagnostics, context); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public boolean validateNameType(String nameType, DiagnosticChain diagnostics, Map<Object, Object> context) { - boolean result = validateNameType_MinLength(nameType, diagnostics, context); - return result; - } - - /** - * Validates the MinLength constraint of '<em>Name Type</em>'. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public boolean validateNameType_MinLength(String nameType, DiagnosticChain diagnostics, Map<Object, Object> context) { - int length = nameType.length(); - boolean result = length >= 1; - if (!result && diagnostics != null) - reportMinLengthViolation(EtunitPackage.Literals.NAME_TYPE, nameType, length, 1, diagnostics, context); - return result; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public boolean validatePreString(String preString, DiagnosticChain diagnostics, Map<Object, Object> context) { - return true; - } - - /** - * Returns the resource locator that will be used to fetch messages for this validator's diagnostics. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public ResourceLocator getResourceLocator() { - // TODO - // Specialize this to return a resource locator for messages specific to this validator. - // Ensure that you remove @generated or mark it @generated NOT - return super.getResourceLocator(); - } - -} //EtunitValidator diff --git a/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/util/EtunitXMLProcessor.java b/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/util/EtunitXMLProcessor.java index f1d5da74d..fd7880361 100644 --- a/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/util/EtunitXMLProcessor.java +++ b/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/Etunit/util/EtunitXMLProcessor.java @@ -1,8 +1,4 @@ /** - * <copyright> - * </copyright> - * - * $Id$ */ package org.eclipse.etrice.etunit.converter.Etunit.util; |