[486722] Rel2Core trace packages work

2 files changed, 11 insertions, 151 deletions

diff --git a/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/rel2core/RelToCore.qvtr b/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/rel2core/RelToCore.qvtr
index d7f06204a..0df3d3986 100644
--- a/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/rel2core/RelToCore.qvtr
+++ b/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/rel2core/RelToCore.qvtr
@@ -39,7 +39,7 @@ transformation org::eclipse::qvtd::xtext::qvtrelation2::tests::rel2core::relToCo
             };
     }
     
-     top relation NestedPackageToTracePackage
+    top relation NestedPackageToTracePackage
     {
         packageName:String;
         domain relations
diff --git a/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/rel2core/samples/Rel2Core_expected.oclas b/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/rel2core/samples/Rel2Core_expected.oclas
index a6c937c2d..3acab41ac 100644
--- a/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/rel2core/samples/Rel2Core_expected.oclas
+++ b/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/rel2core/samples/Rel2Core_expected.oclas
@@ -1,154 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:pivot="http://www.eclipse.org/ocl/2015/Pivot"
     xsi:schemaLocation="http://www.eclipse.org/ocl/2015/Pivot java://org.eclipse.ocl.pivot.PivotPackage">
-  <pivot:Class name="TRDomainPatternExprToMappingDomainAssignment"/>
-  <pivot:Class name="TRSimplePatternToMPattern"/>
-  <pivot:Class name="TRVarToMVar"/>
-  <pivot:Class name="TInvokedRelationToMappingForEnforcement"/>
-  <pivot:Class name="TROppositeDomainVarsToTraceClassProps"/>
-  <pivot:Class name="TRDomainToMDBottomForEnforcementOfNonIdentityPropPrimitive"/>
-  <pivot:Class name="TRDomainPatternExprToMappingDomainTemplateVarAssignment"/>
-  <pivot:Class name="TRDomainPatternToMDBottomPatternSimpleSharedVarExpr"/>
-  <pivot:Class name="TRDomainPatternToMDBottomPatternComposite"/>
-  <pivot:Class name="TRDomainPatternToMDBottomPattern"/>
-  <pivot:Class name="TRDomainToMDBottomForEnforcementOfNonIdentityPropObject"/>
-  <pivot:Class name="TRelationDomainToTraceClassVar"/>
-  <pivot:Class name="TTopLevelRelationToMappingForChecking"/>
-  <pivot:Class name="TRVarSetToDGVarSet"/>
-  <pivot:Class name="TTROppositeDomainsToMappingForEnforcement"/>
-  <pivot:Class name="TIROppositeDomainsToMappingForEnforcement"/>
-  <pivot:Class name="TRVarSetToDGVarSet"/>
-  <pivot:Class name="TRRelDomainsToMOpCallArg"/>
-  <pivot:Class name="TInvokedRelationToMappingForChecking"/>
-  <pivot:Class name="TRDomainPatternExprToMappingBottomVarAssignment"/>
-  <pivot:Class name="TRRelImplToMBottomEnforcementOperation"/>
-  <pivot:Class name="TROppositeDomainVarsToTraceClassProps"/>
-  <pivot:Class name="TRDomainToMBottomPredicateForEnforcement"/>
-  <pivot:Class name="TRDomainPatternExprToMappingDomainTemplateVarAssignment"/>
-  <pivot:Class name="TRDomainToMDomainForChecking"/>
-  <pivot:Class name="TRPredicateSetToMBPredicateSet"/>
-  <pivot:Class name="TRDomainToMDBottomForEnforcement"/>
-  <pivot:Class name="TIROppositeDomainsToMappingForEnforcement"/>
-  <pivot:Class name="TTopLevelRelationToMappingForEnforcement"/>
-  <pivot:Class name="TRDomainPatternToMDBottomPatternComposite"/>
-  <pivot:Class name="TIROppositeDomainsToMappingForEnforcement"/>
-  <pivot:Class name="TRPredicateSetToMBPredicateSet"/>
-  <pivot:Class name="TRDomainPatternToMDBottomPatternSimpleSharedVarExpr"/>
-  <pivot:Class name="TRDomainToMComposedMappingGuard"/>
-  <pivot:Class name="TRDomainPatternExprToMappingBottomVarAssignment"/>
-  <pivot:Class name="TRDomainToMDBottomForEnforcementOfNonIdentityPropObject"/>
-  <pivot:Class name="TRDomainPatternExprToMappingDomainTemplateVarAssignment"/>
-  <pivot:Class name="TRDomainPatternExprToMappingDomainTemplateVarAssignment"/>
-  <pivot:Class name="TRInvokerToMGuardPredicate"/>
-  <pivot:Class name="TRDomainVarToMDBottomAssignmnetForEnforcement"/>
-  <pivot:Class name="TRelationDomainToTraceClassVar"/>
-  <pivot:Class name="TRDomainPatternExprToMappingDomainVarAssignment"/>
-  <pivot:Class name="TRDomainPatternToMDBottomPatternComposite"/>
-  <pivot:Class name="TRWhenRelCallArgToMGuardPredicate"/>
-  <pivot:Class name="TROppositeDomainVarsToTraceClassProps"/>
-  <pivot:Class name="TRDomainToMDBottomForEnforcementOfIdentityPropObject"/>
-  <pivot:Class name="TRVarSetToMBVarSet"/>
-  <pivot:Class name="TRDomainToMDomainForChecking"/>
-  <pivot:Class name="TRInvokerToMGuard"/>
-  <pivot:Class name="TRVarToMRealizedVar"/>
-  <pivot:Class name="TRDomainToMDBottomForEnforcementOfNonIdentityPropObject"/>
-  <pivot:Class name="TRDomainPatternExprToMappingDomainAssignment"/>
-  <pivot:Class name="TRDomainToMDBottomForEnforcementOfNonIdentityPropObject"/>
-  <pivot:Class name="TRWhenRelCallArgToMGuardPredicate"/>
-  <pivot:Class name="TRVarToMVar"/>
-  <pivot:Class name="TSubTemplateToTraceClassProps"/>
-  <pivot:Class name="TRDomainPatternToMDBottomPattern"/>
-  <pivot:Class name="TRVarSetToMVarSet"/>
-  <pivot:Class name="TRDomainPatternExprToMappingBottomVarAssignment"/>
-  <pivot:Class name="TRDomainToMBottomPredicateForEnforcement"/>
-  <pivot:Class name="TRDomainToMDBottomForEnforcementOfNonIdentityPropObject"/>
-  <pivot:Class name="TRInvokerToMGuardPredicate"/>
-  <pivot:Class name="TTROppositeDomainsToMappingForEnforcement"/>
-  <pivot:Class name="TRDomainToMDBottomForEnforcementOfIdentityPropObject"/>
-  <pivot:Class name="TRWhenRelCallToMGuard"/>
-  <pivot:Class name="TRDomainPatternToMDBottomPatternSimpleSharedVarExpr"/>
-  <pivot:Class name="TRelationalTransformationToMappingTransformation"/>
-  <pivot:Class name="TIROppositeDomainsToMappingForEnforcement"/>
-  <pivot:Class name="TRDomainPatternToMDBottomPatternSimpleUnSharedVarExpr"/>
-  <pivot:Class name="TRDomainToMDBottomForEnforcement"/>
-  <pivot:Class name="TRDomainVarToMDBottomAssignmnetForEnforcement"/>
-  <pivot:Class name="TRDomainVarsToTraceClassProps"/>
-  <pivot:Class name="TInvokedRelationToMappingForChecking"/>
-  <pivot:Class name="TRDomainPatternToMDBottomPatternSimpleNonVarExpr"/>
-  <pivot:Class name="TRDomainToMDBottomForEnforcementOfNonIdentityPropPrimitive"/>
-  <pivot:Class name="TRDomainToMDBottomForEnforcement"/>
-  <pivot:Class name="TRWhenPatternToMGuardPattern"/>
-  <pivot:Class name="TRDomainToMDBottomForEnforcementOfIdentityProp"/>
-  <pivot:Class name="TDomainBottomUnSharedVarsToDbVars"/>
-  <pivot:Class name="TRDomainPatternExprToMappingDomainVarAssignment"/>
-  <pivot:Class name="TDomainVarsSharedWithWhenToDgVars"/>
-  <pivot:Class name="TRWherePatternToMPattern"/>
-  <pivot:Class name="TRDomainToMBottomPredicateForEnforcement"/>
-  <pivot:Class name="TRRelImplToMBottomEnforcementOperation"/>
-  <pivot:Class name="TRDomainToMDBottomForEnforcementOfIdentityPropObject"/>
-  <pivot:Class name="TRDomainVarToMDBottomAssignmnetForEnforcement"/>
-  <pivot:Class name="TRDomainToMComposedMappingGuard"/>
-  <pivot:Class name="TRDomainToMComposedMappingGuard"/>
-  <pivot:Class name="TRDomainPatternExprToMappingDomainVarAssignment"/>
-  <pivot:Class name="TRInvokerToMGuard"/>
-  <pivot:Class name="TRelationalTransformationToMappingTransformation"/>
-  <pivot:Class name="TRDomainToMDBottomForEnforcement"/>
-  <pivot:Class name="TRDomainToMDBottomForEnforcementOfNonIdentityPropPrimitive"/>
-  <pivot:Class name="TRDomainPatternExprToMappingBottomVarAssignment"/>
-  <pivot:Class name="TRSimplePatternToMPattern"/>
-  <pivot:Class name="TRExpToMExp"/>
-  <pivot:Class name="TRDomainVarsToTraceClassProps"/>
-  <pivot:Class name="TRWhenRelCallArgToMGuardPredicate"/>
-  <pivot:Class name="TRDomainVarToMDBottomAssignmnetForEnforcement"/>
-  <pivot:Class name="TRDomainPatternExprToMappingDomainVarAssignment"/>
-  <pivot:Class name="TRDomainPatternExprToMappingDomainAssignment"/>
-  <pivot:Class name="TRDomainPatternToMDBottomPatternSimpleUnSharedVarExpr"/>
-  <pivot:Class name="TRExpToMExp"/>
-  <pivot:Class name="TRDomainPatternToMDBottomPattern"/>
-  <pivot:Class name="TRDomainToMDBottomForEnforcementOfNonIdentityPropPrimitive"/>
-  <pivot:Class name="TRVarToMRealizedVar"/>
-  <pivot:Class name="TRDomainToMDBottomForEnforcementOfIdentityProp"/>
-  <pivot:Class name="TRDomainToMDBottomForEnforcement"/>
-  <pivot:Class name="TRelationToTraceClassVar"/>
-  <pivot:Class name="TRDomainToMDBottomForEnforcement"/>
-  <pivot:Class name="TRRelImplToMBottomEnforcementOperation"/>
-  <pivot:Class name="TRWhenRelCallToMGuard"/>
-  <pivot:Class name="TRelationToTraceClass"/>
-  <pivot:Class name="TRWherePatternToMPattern"/>
-  <pivot:Class name="TRelationToTraceClassVar"/>
-  <pivot:Class name="TRDomainToMBottomPredicateForEnforcement"/>
-  <pivot:Class name="TRDomainPatternExprToMappingBottomVarAssignment"/>
-  <pivot:Class name="TRDomainToMDBottomForEnforcementOfIdentityProp"/>
-  <pivot:Class name="TRDomainPatternExprToMappingDomainAssignment"/>
-  <pivot:Class name="TRRelDomainsToMOpCallArg"/>
-  <pivot:Class name="TRDomainPatternToMDBottomPatternSimpleNonVarExpr"/>
-  <pivot:Class name="TRelationToTraceClass"/>
-  <pivot:Class name="TRWhenRelCallArgToMGuardPredicate"/>
-  <pivot:Class name="TRInvokerToMGuardPredicate"/>
-  <pivot:Class name="TRelationDomainToTraceClassVar"/>
-  <pivot:Class name="TRDomainToMBottomPredicateForEnforcement"/>
-  <pivot:Class name="TRDomainToMComposedMappingGuard"/>
-  <pivot:Class name="TTopLevelRelationToMappingForChecking"/>
-  <pivot:Class name="TDomainVarsSharedWithWhenToDgVars"/>
-  <pivot:Class name="TRVarSetToMBVarSet"/>
-  <pivot:Class name="TRDomainPatternExprToMappingDomainVarAssignment"/>
-  <pivot:Class name="TUnsharedWhenVarsToMgVars"/>
-  <pivot:Class name="TRWhenPatternToMGuardPattern"/>
-  <pivot:Class name="TUnsharedWhenVarsToMgVars"/>
-  <pivot:Class name="TROppositeDomainVarsToTraceClassProps"/>
-  <pivot:Class name="TRInvokerToMGuard"/>
-  <pivot:Class name="TRDomainPatternExprToMappingDomainTemplateVarAssignment"/>
-  <pivot:Class name="TRDomainToMComposedMappingGuard"/>
-  <pivot:Class name="TDomainBottomUnSharedVarsToDbVars"/>
-  <pivot:Class name="TRVarSetToMVarSet"/>
-  <pivot:Class name="TRDomainToMDBottomForEnforcementOfNonIdentityPropObject"/>
-  <pivot:Class name="TTROppositeDomainsToMappingForEnforcement"/>
-  <pivot:Class name="TTopLevelRelationToMappingForEnforcement"/>
-  <pivot:Class name="TRInvokerToMGuard"/>
-  <pivot:Class name="TInvokedRelationToMappingForEnforcement"/>
-  <pivot:Class name="TRDomainToMBottomPredicateForEnforcement"/>
-  <pivot:Class name="TRDomainPatternToMDBottomPatternSimpleUnSharedVarExpr"/>
-  <pivot:Class name="TRDomainToMDBottomForEnforcementOfIdentityPropObject"/>
-  <pivot:Class name="TSubTemplateToTraceClassProps"/>
-  <pivot:Class name="TRInvokerToMGuardPredicate"/>
+  <pivot:Package xmi:id="P.$$" name="$$"/>
+  <pivot:Package xmi:id="P.org" name="org">
+    <ownedPackages xmi:id="P.org.eclipse" name="eclipse">
+      <ownedPackages xmi:id="P.org.eclipse.qvtd" name="qvtd">
+        <ownedPackages xmi:id="P.org.eclipse.qvtd.compiler" name="compiler">
+          <ownedPackages xmi:id="P.org.eclipse.qvtd.compiler.qvtr" name="qvtr"/>
+        </ownedPackages>
+      </ownedPackages>
+    </ownedPackages>
+  </pivot:Package>
 </xmi:XMI>