Permalink
Browse files

Sync before branching

  • Loading branch information...
1 parent 67824b8 commit 583ffa209936d4ead3a8a6feb54300169ee5b15c Achim Loerke committed May 11, 2012
Showing with 343 additions and 111 deletions.
  1. +33 −5 org.eclipse.jubula/model/jubula.ecore
  2. +310 −106 org.eclipse.jubula/model/node_attr.ecorediag
@@ -40,7 +40,7 @@
</eOperations>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="Category" eSuperTypes="#//Node"/>
- <eClassifiers xsi:type="ecore:EClass" name="ParamNode" eSuperTypes="#//Node">
+ <eClassifiers xsi:type="ecore:EClass" name="ParamNode" abstract="true" eSuperTypes="#//Node">
<eStructuralFeatures xsi:type="ecore:EReference" name="ParameterInterface" eType="#//TestDataCube"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="RefTestSuite" eSuperTypes="#//Node">
@@ -74,9 +74,18 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="Properties" lowerBound="1"
eType="#//ProjectProperties" containment="true"/>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="TestCase" eSuperTypes="#//ParamNode"/>
- <eClassifiers xsi:type="ecore:EClass" name="ExecTestCase" eSuperTypes="#//TestCase"/>
- <eClassifiers xsi:type="ecore:EClass" name="SpecTestCase" eSuperTypes="#//TestCase"/>
+ <eClassifiers xsi:type="ecore:EClass" name="TestCase" abstract="true" eSuperTypes="#//ParamNode">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="EventExecTcMap" upperBound="-1"
+ eType="#//StringToEventExecTestCaseMap" containment="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="ExecTestCase" eSuperTypes="#//TestCase">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="HasReferencedTD" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="HbmCompNamesMap" upperBound="-1"
+ eType="#//StringToCompNamesPairMap" containment="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="SpecTestCase" eSuperTypes="#//TestCase">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="InterfaceLocked" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"/>
+ </eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="ObjectMapping" eSuperTypes="#//Timestamp"/>
<eClassifiers xsi:type="ecore:EClass" name="AbstractGUIDName" eSuperTypes="#//PersistentObject"/>
<eClassifiers xsi:type="ecore:EClass" name="ComponentName" eSuperTypes="#//AbstractGUIDName"/>
@@ -104,6 +113,17 @@
eType="#//CheckConfCont" containment="true"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="HbmDefaultLanguage" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="HbmToolkit" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="HbmUsedProjects" ordered="false"
+ upperBound="-1" eType="#//ReusedProject"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="Id" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//ELongObject"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="IsProtected" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="IsReuseable" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="MajorNumber" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EIntegerObject"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="MinorNumber" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EIntegerObject"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="ProjectLanguageList" ordered="false"
+ upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="TestResultCleanupInterval"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EIntegerObject"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="ReusedProject" eSuperTypes="#//PersistentObject"/>
<eClassifiers xsi:type="ecore:EClass" name="TestData" eSuperTypes="#//PersistentObject"/>
@@ -118,5 +138,13 @@
<eStructuralFeatures xsi:type="ecore:EAttribute" name="key" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EIntegerObject"/>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="ReusedProjectSet" instanceClassName="java.util.Set$Entry"/>
+ <eClassifiers xsi:type="ecore:EClass" name="StringToEventExecTestCaseMap" instanceClassName="java.util.Map$Entry">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="key" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="value" eType="#//EventExecTestCase"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="EventExecTestCase" eSuperTypes="#//ExecTestCase"/>
+ <eClassifiers xsi:type="ecore:EClass" name="StringToCompNamesPairMap" instanceClassName="java.util.Map$Entry">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="key" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="value" eType="#//CompNamesPair"/>
+ </eClassifiers>
</ecore:EPackage>
Oops, something went wrong.

0 comments on commit 583ffa2

Please sign in to comment.