330183: [Usability] Papyrus shall enable comparing/merging models.

https://bugs.eclipse.org/bugs/show_bug.cgi?id=330183

A save of my developement : complete the test suite

3 files changed, 94 insertions, 84 deletions

diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/resources/nested/modelElementChangeRightTarget_1/model.di b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/resources/nested/modelElementChangeRightTarget_1/model.di
index 203d0185d26..bdabed62b78 100644
--- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/resources/nested/modelElementChangeRightTarget_1/model.di
+++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/resources/nested/modelElementChangeRightTarget_1/model.di
@@ -2,14 +2,14 @@
 <di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">

   <pageList>

     <availablePage>

-      <emfPageIdentifier href="model.notation#_XSuDIInuEeGxdcQdAms8Gw"/>

+      <emfPageIdentifier href="model.notation#_sX-S0ru4EeGGxqg-2oDCrw"/>

     </availablePage>

   </pageList>

   <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

     <windows>

       <children xsi:type="di:TabFolder">

         <children>

-          <emfPageIdentifier href="model.notation#_XSuDIInuEeGxdcQdAms8Gw"/>

+          <emfPageIdentifier href="model.notation#_sX-S0ru4EeGGxqg-2oDCrw"/>

         </children>

       </children>

     </windows>

diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/resources/nested/modelElementChangeRightTarget_1/model.notation b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/resources/nested/modelElementChangeRightTarget_1/model.notation
index 5006eeedd7f..5a78b6cd4de 100644
--- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/resources/nested/modelElementChangeRightTarget_1/model.notation
+++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/resources/nested/modelElementChangeRightTarget_1/model.notation
@@ -1,91 +1,97 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_XSuDIInuEeGxdcQdAms8Gw" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">

-  <children xmi:type="notation:Shape" xmi:id="_pcns4Lt0EeGa2q-8wWMz3g" type="2008" fontName="Segoe UI" lineColor="0">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pcns4rt0EeGa2q-8wWMz3g" source="ShadowFigure">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pcoT8Lt0EeGa2q-8wWMz3g" key="ShadowFigure_Value" value="false"/>

+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_sX-S0ru4EeGGxqg-2oDCrw" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">

+  <children xmi:type="notation:Shape" xmi:id="_vCNEcLu4EeGGxqg-2oDCrw" type="2008" fontName="Segoe UI" lineColor="0">

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_vCNrgLu4EeGGxqg-2oDCrw" source="ShadowFigure">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_vCNrgbu4EeGGxqg-2oDCrw" key="ShadowFigure_Value" value="false"/>

     </eAnnotations>

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pcoT8bt0EeGa2q-8wWMz3g" source="displayNameLabelIcon">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pcoT8rt0EeGa2q-8wWMz3g" key="displayNameLabelIcon_value" value="false"/>

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_vCOSkLu4EeGGxqg-2oDCrw" source="displayNameLabelIcon">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_vCOSkbu4EeGGxqg-2oDCrw" key="displayNameLabelIcon_value" value="false"/>

     </eAnnotations>

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pcoT87t0EeGa2q-8wWMz3g" source="QualifiedName">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pcoT9Lt0EeGa2q-8wWMz3g" key="QualifiedNameDepth" value="1000"/>

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_vCOSkru4EeGGxqg-2oDCrw" source="QualifiedName">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_vCOSk7u4EeGGxqg-2oDCrw" key="QualifiedNameDepth" value="1000"/>

     </eAnnotations>

-    <children xmi:type="notation:DecorationNode" xmi:id="_pcoT9bt0EeGa2q-8wWMz3g" type="5029"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_pcoT9rt0EeGa2q-8wWMz3g" type="7017">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_pcoT97t0EeGa2q-8wWMz3g"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_pcoT-Lt0EeGa2q-8wWMz3g"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_pcoT-bt0EeGa2q-8wWMz3g"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pcoT-rt0EeGa2q-8wWMz3g"/>

+    <children xmi:type="notation:DecorationNode" xmi:id="_vCOSlLu4EeGGxqg-2oDCrw" type="5029"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_vCOSlbu4EeGGxqg-2oDCrw" type="7017">

+      <children xmi:type="notation:Shape" xmi:id="_xZFcQLu4EeGGxqg-2oDCrw" type="3012" fontName="Segoe UI" lineColor="0">

+        <element xmi:type="uml:Property" href="model.uml#_xZDAALu4EeGGxqg-2oDCrw"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_xZFcQbu4EeGGxqg-2oDCrw"/>

+      </children>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_vCOSlru4EeGGxqg-2oDCrw"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_vCOSl7u4EeGGxqg-2oDCrw"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_vCOSmLu4EeGGxqg-2oDCrw"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vCOSmbu4EeGGxqg-2oDCrw"/>

     </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_pcoT-7t0EeGa2q-8wWMz3g" type="7018">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_pcoT_Lt0EeGa2q-8wWMz3g"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_pcoT_bt0EeGa2q-8wWMz3g"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_pcoT_rt0EeGa2q-8wWMz3g"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pcoT_7t0EeGa2q-8wWMz3g"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_vCOSmru4EeGGxqg-2oDCrw" type="7018">

+      <styles xmi:type="notation:TitleStyle" xmi:id="_vCOSm7u4EeGGxqg-2oDCrw"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_vCOSnLu4EeGGxqg-2oDCrw"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_vCOSnbu4EeGGxqg-2oDCrw"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vCOSnru4EeGGxqg-2oDCrw"/>

     </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_pcoUALt0EeGa2q-8wWMz3g" type="7019">

-      <styles xmi:type="notation:TitleStyle" xmi:id="_pcoUAbt0EeGa2q-8wWMz3g"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_pcoUArt0EeGa2q-8wWMz3g"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_pcoUA7t0EeGa2q-8wWMz3g"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pcoUBLt0EeGa2q-8wWMz3g"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_vCO5oLu4EeGGxqg-2oDCrw" type="7019">

+      <styles xmi:type="notation:TitleStyle" xmi:id="_vCO5obu4EeGGxqg-2oDCrw"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_vCO5oru4EeGGxqg-2oDCrw"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_vCO5o7u4EeGGxqg-2oDCrw"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vCO5pLu4EeGGxqg-2oDCrw"/>

     </children>

-    <element xmi:type="uml:Class" href="model.uml#_eYsnUInuEeGxdcQdAms8Gw"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pcns4bt0EeGa2q-8wWMz3g" x="111" y="220"/>

+    <element xmi:type="uml:Class" href="model.uml#_vCJaELu4EeGGxqg-2oDCrw"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vCNEcbu4EeGGxqg-2oDCrw" x="81" y="224"/>

   </children>

-  <children xmi:type="notation:Shape" xmi:id="_rOCnMLt0EeGa2q-8wWMz3g" type="2007" fontName="Segoe UI" lineColor="0">

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_rOCnMrt0EeGa2q-8wWMz3g" source="ShadowFigure">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rOCnM7t0EeGa2q-8wWMz3g" key="ShadowFigure_Value" value="false"/>

+  <children xmi:type="notation:Shape" xmi:id="_v2r1YLu4EeGGxqg-2oDCrw" type="2007" fontName="Segoe UI" lineColor="0">

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_v2r1Yru4EeGGxqg-2oDCrw" source="ShadowFigure">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_v2r1Y7u4EeGGxqg-2oDCrw" key="ShadowFigure_Value" value="false"/>

     </eAnnotations>

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_rODOQLt0EeGa2q-8wWMz3g" source="displayNameLabelIcon">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rODOQbt0EeGa2q-8wWMz3g" key="displayNameLabelIcon_value" value="false"/>

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_v2r1ZLu4EeGGxqg-2oDCrw" source="displayNameLabelIcon">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_v2r1Zbu4EeGGxqg-2oDCrw" key="displayNameLabelIcon_value" value="false"/>

     </eAnnotations>

-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_rODOQrt0EeGa2q-8wWMz3g" source="QualifiedName">

-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rODOQ7t0EeGa2q-8wWMz3g" key="QualifiedNameDepth" value="1000"/>

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_v2r1Zru4EeGGxqg-2oDCrw" source="QualifiedName">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_v2r1Z7u4EeGGxqg-2oDCrw" key="QualifiedNameDepth" value="1000"/>

     </eAnnotations>

-    <children xmi:type="notation:DecorationNode" xmi:id="_rODORLt0EeGa2q-8wWMz3g" type="5026"/>

-    <children xmi:type="notation:DecorationNode" xmi:id="_rODORbt0EeGa2q-8wWMz3g" type="7016">

-      <children xmi:type="notation:Shape" xmi:id="_r-InYLt0EeGa2q-8wWMz3g" type="3010" fontName="Segoe UI" lineColor="0">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_r-InYrt0EeGa2q-8wWMz3g" source="ShadowFigure">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_r-InY7t0EeGa2q-8wWMz3g" key="ShadowFigure_Value" value="false"/>

+    <children xmi:type="notation:DecorationNode" xmi:id="_v2sccLu4EeGGxqg-2oDCrw" type="5026"/>

+    <children xmi:type="notation:DecorationNode" xmi:id="_v2sccbu4EeGGxqg-2oDCrw" type="7016">

+      <children xmi:type="notation:Shape" xmi:id="_wqZKQLu4EeGGxqg-2oDCrw" type="3010" fontName="Segoe UI" lineColor="0">

+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_wqZxULu4EeGGxqg-2oDCrw" source="ShadowFigure">

+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_wqZxUbu4EeGGxqg-2oDCrw" key="ShadowFigure_Value" value="false"/>

         </eAnnotations>

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_r-JOcLt0EeGa2q-8wWMz3g" source="displayNameLabelIcon">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_r-JOcbt0EeGa2q-8wWMz3g" key="displayNameLabelIcon_value" value="false"/>

+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_wqZxUru4EeGGxqg-2oDCrw" source="displayNameLabelIcon">

+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_wqZxU7u4EeGGxqg-2oDCrw" key="displayNameLabelIcon_value" value="false"/>

         </eAnnotations>

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_r-JOcrt0EeGa2q-8wWMz3g" source="QualifiedName">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_r-JOc7t0EeGa2q-8wWMz3g" key="QualifiedNameDepth" value="1000"/>

+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_wqZxVLu4EeGGxqg-2oDCrw" source="QualifiedName">

+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_wqZxVbu4EeGGxqg-2oDCrw" key="QualifiedNameDepth" value="1000"/>

         </eAnnotations>

-        <children xmi:type="notation:DecorationNode" xmi:id="_r-JOdLt0EeGa2q-8wWMz3g" type="5014"/>

-        <children xmi:type="notation:BasicCompartment" xmi:id="_r-JOdbt0EeGa2q-8wWMz3g" type="7011">

-          <children xmi:type="notation:Shape" xmi:id="_As0c8Lt1EeGa2q-8wWMz3g" type="3012" fontName="Segoe UI" lineColor="0">

-            <element xmi:type="uml:Property" href="model.uml#_Asu9YLt1EeGa2q-8wWMz3g"/>

-            <layoutConstraint xmi:type="notation:Location" xmi:id="_As0c8bt1EeGa2q-8wWMz3g"/>

-          </children>

-          <styles xmi:type="notation:TitleStyle" xmi:id="_r-JOdrt0EeGa2q-8wWMz3g"/>

-          <styles xmi:type="notation:SortingStyle" xmi:id="_r-JOd7t0EeGa2q-8wWMz3g"/>

-          <styles xmi:type="notation:FilteringStyle" xmi:id="_r-JOeLt0EeGa2q-8wWMz3g"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_r-JOebt0EeGa2q-8wWMz3g"/>

+        <children xmi:type="notation:DecorationNode" xmi:id="_wqZxVru4EeGGxqg-2oDCrw" type="5014"/>

+        <children xmi:type="notation:BasicCompartment" xmi:id="_wqZxV7u4EeGGxqg-2oDCrw" type="7011">

+          <styles xmi:type="notation:TitleStyle" xmi:id="_wqZxWLu4EeGGxqg-2oDCrw"/>

+          <styles xmi:type="notation:SortingStyle" xmi:id="_wqZxWbu4EeGGxqg-2oDCrw"/>

+          <styles xmi:type="notation:FilteringStyle" xmi:id="_wqZxWru4EeGGxqg-2oDCrw"/>

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wqZxW7u4EeGGxqg-2oDCrw"/>

         </children>

-        <children xmi:type="notation:BasicCompartment" xmi:id="_r-JOert0EeGa2q-8wWMz3g" type="7012">

-          <styles xmi:type="notation:TitleStyle" xmi:id="_r-JOe7t0EeGa2q-8wWMz3g"/>

-          <styles xmi:type="notation:SortingStyle" xmi:id="_r-JOfLt0EeGa2q-8wWMz3g"/>

-          <styles xmi:type="notation:FilteringStyle" xmi:id="_r-JOfbt0EeGa2q-8wWMz3g"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_r-JOfrt0EeGa2q-8wWMz3g"/>

+        <children xmi:type="notation:BasicCompartment" xmi:id="_wqZxXLu4EeGGxqg-2oDCrw" type="7012">

+          <styles xmi:type="notation:TitleStyle" xmi:id="_wqZxXbu4EeGGxqg-2oDCrw"/>

+          <styles xmi:type="notation:SortingStyle" xmi:id="_wqZxXru4EeGGxqg-2oDCrw"/>

+          <styles xmi:type="notation:FilteringStyle" xmi:id="_wqZxX7u4EeGGxqg-2oDCrw"/>

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wqZxYLu4EeGGxqg-2oDCrw"/>

         </children>

-        <children xmi:type="notation:BasicCompartment" xmi:id="_r-J1gLt0EeGa2q-8wWMz3g" type="7013">

-          <styles xmi:type="notation:TitleStyle" xmi:id="_r-J1gbt0EeGa2q-8wWMz3g"/>

-          <styles xmi:type="notation:SortingStyle" xmi:id="_r-J1grt0EeGa2q-8wWMz3g"/>

-          <styles xmi:type="notation:FilteringStyle" xmi:id="_r-J1g7t0EeGa2q-8wWMz3g"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_r-J1hLt0EeGa2q-8wWMz3g"/>

+        <children xmi:type="notation:BasicCompartment" xmi:id="_wqZxYbu4EeGGxqg-2oDCrw" type="7013">

+          <styles xmi:type="notation:TitleStyle" xmi:id="_wqZxYru4EeGGxqg-2oDCrw"/>

+          <styles xmi:type="notation:SortingStyle" xmi:id="_wqZxY7u4EeGGxqg-2oDCrw"/>

+          <styles xmi:type="notation:FilteringStyle" xmi:id="_wqZxZLu4EeGGxqg-2oDCrw"/>

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wqZxZbu4EeGGxqg-2oDCrw"/>

         </children>

-        <element xmi:type="uml:Class" href="model.uml#_gc1CQInuEeGxdcQdAms8Gw"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_r-InYbt0EeGa2q-8wWMz3g" x="109" y="81"/>

+        <element xmi:type="uml:Class" href="model.uml#_wqWuALu4EeGGxqg-2oDCrw"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wqZKQbu4EeGGxqg-2oDCrw" x="83" y="55"/>

       </children>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_rODORrt0EeGa2q-8wWMz3g"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rODOR7t0EeGa2q-8wWMz3g"/>

+      <styles xmi:type="notation:TitleStyle" xmi:id="_v2sccru4EeGGxqg-2oDCrw"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_v2scc7u4EeGGxqg-2oDCrw"/>

     </children>

-    <element xmi:type="uml:Package" href="model.uml#_fsfxgInuEeGxdcQdAms8Gw"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rOCnMbt0EeGa2q-8wWMz3g" x="545" y="152" width="396" height="249"/>

+    <element xmi:type="uml:Package" href="model.uml#_v2j5kLu4EeGGxqg-2oDCrw"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_v2r1Ybu4EeGGxqg-2oDCrw" x="615" y="170" width="466" height="296"/>

+  </children>

+  <children xmi:type="notation:Shape" xmi:id="_xopiQLu4EeGGxqg-2oDCrw" type="2015" fontName="Segoe UI">

+    <styles xmi:type="notation:DescriptionStyle" xmi:id="_xopiQbu4EeGGxqg-2oDCrw"/>

+    <styles xmi:type="notation:FontStyle" xmi:id="_xopiQru4EeGGxqg-2oDCrw"/>

+    <element xmi:type="uml:Association" href="model.uml#_xojboLu4EeGGxqg-2oDCrw"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xopiQ7u4EeGGxqg-2oDCrw" x="266" y="503"/>

   </children>

-  <styles xmi:type="notation:DiagramStyle" xmi:id="_XSuDIYnuEeGxdcQdAms8Gw"/>

-  <element xmi:type="uml:Model" href="model.uml#_XSnVcInuEeGxdcQdAms8Gw"/>

+  <styles xmi:type="notation:DiagramStyle" xmi:id="_sX-S07u4EeGGxqg-2oDCrw"/>

+  <element xmi:type="uml:Model" href="model.uml#_sX-S0Lu4EeGGxqg-2oDCrw"/>

 </notation:Diagram>

diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/resources/nested/modelElementChangeRightTarget_1/model.uml b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/resources/nested/modelElementChangeRightTarget_1/model.uml
index 99336cda6b8..8d4623f9e07 100644
--- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/resources/nested/modelElementChangeRightTarget_1/model.uml
+++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/resources/nested/modelElementChangeRightTarget_1/model.uml
@@ -1,15 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_XSnVcInuEeGxdcQdAms8Gw" name="model">

-  <packagedElement xmi:type="uml:Class" xmi:id="_eYsnUInuEeGxdcQdAms8Gw" name="Class1"/>

-  <packagedElement xmi:type="uml:Package" xmi:id="_fsfxgInuEeGxdcQdAms8Gw" name="Package1">

-    <packagedElement xmi:type="uml:Class" xmi:id="_gc1CQInuEeGxdcQdAms8Gw" name="Class1">

-      <ownedAttribute xmi:id="_Asu9YLt1EeGa2q-8wWMz3g" name="Property1" visibility="public">

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A1DL4Lt1EeGa2q-8wWMz3g" value="1"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A1Dy8Lt1EeGa2q-8wWMz3g" value="1"/>

-        <defaultValue xmi:type="uml:LiteralString" xmi:id="_A1Dy8bt1EeGa2q-8wWMz3g">

-          <value xsi:nil="true"/>

-        </defaultValue>

-      </ownedAttribute>

-    </packagedElement>

+<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_sX-S0Lu4EeGGxqg-2oDCrw" name="Model">

+  <packageImport xmi:id="_sX-S0bu4EeGGxqg-2oDCrw">

+    <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>

+  </packageImport>

+  <packagedElement xmi:type="uml:Class" xmi:id="_vCJaELu4EeGGxqg-2oDCrw" name="Class1">

+    <ownedAttribute xmi:id="_xZDAALu4EeGGxqg-2oDCrw" name="Property1" visibility="public">

+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_xkGZcLu4EeGGxqg-2oDCrw" value="1"/>

+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xkGZcbu4EeGGxqg-2oDCrw" value="1"/>

+      <defaultValue xmi:type="uml:LiteralString" xmi:id="_xkHAgLu4EeGGxqg-2oDCrw">

+        <value xsi:nil="true"/>

+      </defaultValue>

+    </ownedAttribute>

   </packagedElement>

+  <packagedElement xmi:type="uml:Package" xmi:id="_v2j5kLu4EeGGxqg-2oDCrw" name="Package1">

+    <packagedElement xmi:type="uml:Class" xmi:id="_wqWuALu4EeGGxqg-2oDCrw" name="Class1"/>

+  </packagedElement>

+  <packagedElement xmi:type="uml:Association" xmi:id="_xojboLu4EeGGxqg-2oDCrw"/>

 </uml:Model>