Fix test

diverse-project · May 2, 2016 · 4337874 · 4337874
1 parent 38ff3d1
commit 4337874
Show file tree

Hide file tree

Showing 4 changed files with 95 additions and 60 deletions.
diff --git a/tests/fr.inria.diverse.melange.tests/tests-inputs/metamodels/merge/MM1.ecore b/tests/fr.inria.diverse.melange.tests/tests-inputs/metamodels/merge/MM1.ecore
@@ -1,21 +1,22 @@
 <?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="testmerge" nsURI="http://org.melange.test/" nsPrefix="testmerge">
-  <eClassifiers xsi:type="ecore:EClass" name="A" eSuperTypes="#//SuperA">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="toB" eType="#//B" eOpposite="#//B/toA"/>
+<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="testmerge" nsURI="http://org.melange.test/" nsPrefix="testmerge">
+  <eClassifiers xsi:type="ecore:EClass" name="A" eSuperTypes="//SuperA">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="toB" eType="//B" eOpposite="//B/toA"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="B">
-    <eOperations name="getA" eType="#//A">
-      <eParameters name="paramB" eType="#//B"/>
+    <eOperations name="getA" eType="//A">
+      <eParameters name="paramB" eType="//B"/>
     </eOperations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="toA" eType="#//A" eOpposite="#//A/toB"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="anAttribute" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//ELong"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="toA" eType="//A" eOpposite="//A/toB"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="anAttribute">
+      <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//ELong"/>
+    </eStructuralFeatures>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="C"/>
-  <eClassifiers xsi:type="ecore:EClass" name="AA" eSuperTypes="#//A"/>
-  <eClassifiers xsi:type="ecore:EClass" name="AAA" eSuperTypes="#//AA">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="toC" eType="#//C" containment="true"/>
+  <eClassifiers xsi:type="ecore:EClass" name="AA" eSuperTypes="//A"/>
+  <eClassifiers xsi:type="ecore:EClass" name="AAA" eSuperTypes="//AA">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="toC" eType="//C" containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="SuperA"/>
-  <eClassifiers xsi:type="ecore:EClass" name="SubB" eSuperTypes="#//B"/>
+  <eClassifiers xsi:type="ecore:EClass" name="SubB" eSuperTypes="//B"/>
 </ecore:EPackage>
diff --git a/tests/fr.inria.diverse.melange.tests/tests-inputs/metamodels/merge/MM1.genmodel b/tests/fr.inria.diverse.melange.tests/tests-inputs/metamodels/merge/MM1.genmodel
@@ -1,27 +1,46 @@
-<?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="/fr.inria.diverse.melange.tests/src/main/java"
-    modelPluginID="fr.inria.diverse.melange.tests" modelName="MM1" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    importerID="org.eclipse.emf.importer.ecore" complianceLevel="8.0" copyrightFields="false"
-    operationReflection="true" importOrganizing="true">
-  <foreignModel>tests-inputs/metamodels/merge/MM1.ecore</foreignModel>
+<?xml version="1.0" encoding="ASCII"?>
+<genmodel:GenModel 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" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/fr.inria.diverse.melange.tests/src/main/java" modelPluginID="fr.inria.diverse.melange.tests" modelName="MM1" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" importerID="org.eclipse.emf.importer.ecore" complianceLevel="8.0" copyrightFields="false" operationReflection="true" importOrganizing="true">
+  <foreignModel>MM1.ecore</foreignModel>
   <genPackages prefix="Testmerge" disposableProviderFactory="true">
     <ecorePackage href="tests-inputs/metamodels/merge/MM1.ecore#/"/>
-    <genClasses ecoreClass="MM1.ecore#//A">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference MM1.ecore#//A/toB"/>
+    <genClasses>
+      <ecoreClass href="tests-inputs/metamodels/merge/MM1.ecore#//A"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true">
+        <ecoreFeature xsi:type="ecore:EReference" href="tests-inputs/metamodels/merge/MM1.ecore#//A/toB"/>
+      </genFeatures>
     </genClasses>
-    <genClasses ecoreClass="MM1.ecore#//B">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference MM1.ecore#//B/toA"/>
-      <genOperations ecoreOperation="MM1.ecore#//B/getA">
-        <genParameters ecoreParameter="MM1.ecore#//B/getA/paramB"/>
+    <genClasses>
+      <ecoreClass href="tests-inputs/metamodels/merge/MM1.ecore#//B"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true">
+        <ecoreFeature xsi:type="ecore:EReference" href="tests-inputs/metamodels/merge/MM1.ecore#//B/toA"/>
+      </genFeatures>
+      <genFeatures createChild="false">
+        <ecoreFeature xsi:type="ecore:EAttribute" href="tests-inputs/metamodels/merge/MM1.ecore#//B/anAttribute"/>
+      </genFeatures>
+      <genOperations>
+        <ecoreOperation href="tests-inputs/metamodels/merge/MM1.ecore#//B/getA"/>
+        <genParameters>
+          <ecoreParameter href="tests-inputs/metamodels/merge/MM1.ecore#//B/getA/paramB"/>
+        </genParameters>
       </genOperations>
     </genClasses>
-    <genClasses ecoreClass="MM1.ecore#//C"/>
-    <genClasses ecoreClass="MM1.ecore#//AA"/>
-    <genClasses ecoreClass="MM1.ecore#//AAA">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference MM1.ecore#//AAA/toC"/>
+    <genClasses>
+      <ecoreClass href="tests-inputs/metamodels/merge/MM1.ecore#//C"/>
+    </genClasses>
+    <genClasses>
+      <ecoreClass href="tests-inputs/metamodels/merge/MM1.ecore#//AA"/>
+    </genClasses>
+    <genClasses>
+      <ecoreClass href="tests-inputs/metamodels/merge/MM1.ecore#//AAA"/>
+      <genFeatures property="None" children="true" createChild="true">
+        <ecoreFeature xsi:type="ecore:EReference" href="tests-inputs/metamodels/merge/MM1.ecore#//AAA/toC"/>
+      </genFeatures>
+    </genClasses>
+    <genClasses>
+      <ecoreClass href="tests-inputs/metamodels/merge/MM1.ecore#//SuperA"/>
+    </genClasses>
+    <genClasses>
+      <ecoreClass href="tests-inputs/metamodels/merge/MM1.ecore#//SubB"/>
     </genClasses>
-    <genClasses ecoreClass="MM1.ecore#//SuperA"/>
-    <genClasses ecoreClass="MM1.ecore#//SubB"/>
   </genPackages>
 </genmodel:GenModel>
diff --git a/tests/fr.inria.diverse.melange.tests/tests-inputs/metamodels/merge/MM2.ecore b/tests/fr.inria.diverse.melange.tests/tests-inputs/metamodels/merge/MM2.ecore
@@ -1,17 +1,16 @@
 <?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="testmerge" nsURI="http://org.melange.test/" nsPrefix="testmerge">
+<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="testmerge" nsURI="http://org.melange.test/" nsPrefix="testmerge">
   <eClassifiers xsi:type="ecore:EClass" name="D">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="toC" eType="#//C" eOpposite="#//C/toD"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="emfDataType" lowerBound="1"
-        upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="toC" eType="//C" eOpposite="//C/toD"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="emfDataType" lowerBound="1" upperBound="-1">
+      <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    </eStructuralFeatures>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="C">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="toD" eType="#//D" eOpposite="#//D/toC"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="dataType" eType="#//CustomDataType"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="toE" lowerBound="1" upperBound="42"
-        eType="#//E" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="toF" upperBound="-1" eType="#//F"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="toD" eType="//D" eOpposite="//D/toC"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="dataType" eType="//CustomDataType"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="toE" lowerBound="1" upperBound="42" eType="//E" containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="toF" upperBound="-1" eType="//F"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EDataType" name="CustomDataType" instanceClassName="java.lang.Object"/>
   <eClassifiers xsi:type="ecore:EClass" name="E"/>

diff --git a/tests/fr.inria.diverse.melange.tests/tests-inputs/metamodels/merge/MM2.genmodel b/tests/fr.inria.diverse.melange.tests/tests-inputs/metamodels/merge/MM2.genmodel
@@ -1,24 +1,40 @@
-<?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="/fr.inria.diverse.melange.tests/src" modelPluginID="fr.inria.diverse.melange.tests"
-    modelName="MM2" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    importerID="org.eclipse.emf.importer.ecore" complianceLevel="8.0" copyrightFields="false"
-    operationReflection="true" importOrganizing="true">
-  <foreignModel>tests-inputs/metamodels/merge/MM2.ecore</foreignModel>
-  <genPackages prefix="Testpackage" disposableProviderFactory="true">
+<?xml version="1.0" encoding="ASCII"?>
+<genmodel:GenModel 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" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/fr.inria.diverse.melange.tests/src" modelPluginID="fr.inria.diverse.melange.tests" modelName="MM2" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" importerID="org.eclipse.emf.importer.ecore" complianceLevel="8.0" copyrightFields="false" operationReflection="true" importOrganizing="true">
+  <foreignModel>MM2.ecore</foreignModel>
+  <genPackages prefix="Testmerge" disposableProviderFactory="true">
     <ecorePackage href="tests-inputs/metamodels/merge/MM2.ecore#/"/>
-    <genDataTypes ecoreDataType="MM2.ecore#//CustomDataType"/>
-    <genClasses ecoreClass="MM2.ecore#//D">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference MM2.ecore#//D/toC"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute MM2.ecore#//D/emfDataType"/>
+    <genDataTypes>
+      <ecoreDataType href="tests-inputs/metamodels/merge/MM2.ecore#//CustomDataType"/>
+    </genDataTypes>
+    <genClasses>
+      <ecoreClass href="tests-inputs/metamodels/merge/MM2.ecore#//D"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true">
+        <ecoreFeature xsi:type="ecore:EReference" href="tests-inputs/metamodels/merge/MM2.ecore#//D/toC"/>
+      </genFeatures>
+      <genFeatures createChild="false">
+        <ecoreFeature xsi:type="ecore:EAttribute" href="tests-inputs/metamodels/merge/MM2.ecore#//D/emfDataType"/>
+      </genFeatures>
     </genClasses>
-    <genClasses ecoreClass="MM2.ecore#//C">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference MM2.ecore#//C/toD"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute MM2.ecore#//C/dataType"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference MM2.ecore#//C/toE"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference MM2.ecore#//C/toF"/>
+    <genClasses>
+      <ecoreClass href="tests-inputs/metamodels/merge/MM2.ecore#//C"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true">
+        <ecoreFeature xsi:type="ecore:EReference" href="tests-inputs/metamodels/merge/MM2.ecore#//C/toD"/>
+      </genFeatures>
+      <genFeatures createChild="false">
+        <ecoreFeature xsi:type="ecore:EAttribute" href="tests-inputs/metamodels/merge/MM2.ecore#//C/dataType"/>
+      </genFeatures>
+      <genFeatures property="None" children="true" createChild="true">
+        <ecoreFeature xsi:type="ecore:EReference" href="tests-inputs/metamodels/merge/MM2.ecore#//C/toE"/>
+      </genFeatures>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true">
+        <ecoreFeature xsi:type="ecore:EReference" href="tests-inputs/metamodels/merge/MM2.ecore#//C/toF"/>
+      </genFeatures>
+    </genClasses>
+    <genClasses>
+      <ecoreClass href="tests-inputs/metamodels/merge/MM2.ecore#//E"/>
+    </genClasses>
+    <genClasses>
+      <ecoreClass href="tests-inputs/metamodels/merge/MM2.ecore#//F"/>
     </genClasses>
-    <genClasses ecoreClass="MM2.ecore#//E"/>
-    <genClasses ecoreClass="MM2.ecore#//F"/>
   </genPackages>
 </genmodel:GenModel>