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

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

A save of my developement : update some models

10 files changed, 82 insertions, 114 deletions

diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/resources/standalone/referenceChangeLeftTarget_1/left.notation b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/resources/standalone/referenceChangeLeftTarget_1/left.notation
index 7036d81d48d..43d250a20fa 100644
--- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/resources/standalone/referenceChangeLeftTarget_1/left.notation
+++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/resources/standalone/referenceChangeLeftTarget_1/left.notation
@@ -1,62 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI 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:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML">

   <notation:Diagram xmi:id="_EEXXoJRREeG1U9r1NQ9zBg" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">

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

     <element xmi:type="uml:Model" href="left.uml#_EEONsJRREeG1U9r1NQ9zBg"/>

   </notation:Diagram>

   <notation:Diagram xmi:id="_lK3ecJRREeG1U9r1NQ9zBg" type="UseCase" name="UseCaseDiagram" measurementUnit="Pixel">

-    <children xmi:type="notation:Shape" xmi:id="_mAyZ0JRREeG1U9r1NQ9zBg" type="2013" fontName="Segoe UI" lineColor="0">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_mAzA4JRREeG1U9r1NQ9zBg" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_mAzn8JRREeG1U9r1NQ9zBg" key="fontHeight" value="true"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_mAzn8ZRREeG1U9r1NQ9zBg" key="bold" value="true"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_mAzn8pRREeG1U9r1NQ9zBg" key="italic" value="true"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_mAzn85RREeG1U9r1NQ9zBg" key="fontColor" value="true"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_mAzn9JRREeG1U9r1NQ9zBg" key="fillColor" value="true"/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_mA0PAJRREeG1U9r1NQ9zBg" source="ShadowFigure">

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

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_mA02EZRREeG1U9r1NQ9zBg" source="displayNameLabelIcon">

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

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_mA3SUJRREeG1U9r1NQ9zBg" source="QualifiedName">

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

-      </eAnnotations>

-      <children xmi:type="notation:DecorationNode" xmi:id="_mA3SUpRREeG1U9r1NQ9zBg" type="5016"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_mA3SU5RREeG1U9r1NQ9zBg" type="7009">

-        <styles xmi:type="notation:SortingStyle" xmi:id="_mA3SVJRREeG1U9r1NQ9zBg"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_mA3SVZRREeG1U9r1NQ9zBg"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mA3SVpRREeG1U9r1NQ9zBg"/>

-      </children>

-      <element xmi:type="uml:UseCase" href="left.uml#_l_6QEJRREeG1U9r1NQ9zBg"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mAyZ0ZRREeG1U9r1NQ9zBg" x="277" y="166"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_naIyYJRREeG1U9r1NQ9zBg" type="2013" fontName="Segoe UI" lineColor="0">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_naJZcJRREeG1U9r1NQ9zBg" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_naJZcZRREeG1U9r1NQ9zBg" key="fontHeight" value="true"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_naJZcpRREeG1U9r1NQ9zBg" key="bold" value="true"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_naJZc5RREeG1U9r1NQ9zBg" key="italic" value="true"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_naJZdJRREeG1U9r1NQ9zBg" key="fontColor" value="true"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_naKAgJRREeG1U9r1NQ9zBg" key="fillColor" value="true"/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_naLOoJRREeG1U9r1NQ9zBg" source="ShadowFigure">

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

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_naLOopRREeG1U9r1NQ9zBg" source="displayNameLabelIcon">

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

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_naLOpJRREeG1U9r1NQ9zBg" source="QualifiedName">

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

-      </eAnnotations>

-      <children xmi:type="notation:DecorationNode" xmi:id="_naL1sJRREeG1U9r1NQ9zBg" type="5016"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_naL1sZRREeG1U9r1NQ9zBg" type="7009">

-        <styles xmi:type="notation:SortingStyle" xmi:id="_naL1spRREeG1U9r1NQ9zBg"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_naL1s5RREeG1U9r1NQ9zBg"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_naL1tJRREeG1U9r1NQ9zBg"/>

-      </children>

-      <element xmi:type="uml:UseCase" href="left.uml#_nZ8lIJRREeG1U9r1NQ9zBg"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_naIyYZRREeG1U9r1NQ9zBg" x="666" y="159"/>

-    </children>

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

     <element xmi:type="uml:Model" href="left.uml#_EEONsJRREeG1U9r1NQ9zBg"/>

   </notation:Diagram>

diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/resources/standalone/referenceChangeLeftTarget_1/left.uml b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/resources/standalone/referenceChangeLeftTarget_1/left.uml
index f3481d67750..8e732169d54 100644
--- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/resources/standalone/referenceChangeLeftTarget_1/left.uml
+++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/resources/standalone/referenceChangeLeftTarget_1/left.uml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_EEONsJRREeG1U9r1NQ9zBg" name="model">

-  <packagedElement xmi:type="uml:Class" xmi:id="_FszVEJRREeG1U9r1NQ9zBg" name="Class1" useCase="_WOeXoJRREeG1U9r1NQ9zBg _l_6QEJRREeG1U9r1NQ9zBg"/>

+  <packagedElement xmi:type="uml:Class" xmi:id="_FszVEJRREeG1U9r1NQ9zBg" name="Class1" useCase="_WOeXoJRREeG1U9r1NQ9zBg"/>

   <packagedElement xmi:type="uml:UseCase" xmi:id="_WOeXoJRREeG1U9r1NQ9zBg" name="UseCase1_extern" subject="_FszVEJRREeG1U9r1NQ9zBg"/>

-  <packagedElement xmi:type="uml:Activity" xmi:id="_f9gowJRREeG1U9r1NQ9zBg" name="Activity1"/>

-  <packagedElement xmi:type="uml:UseCase" xmi:id="_l_6QEJRREeG1U9r1NQ9zBg" name="UseCase" subject="_FszVEJRREeG1U9r1NQ9zBg"/>

-  <packagedElement xmi:type="uml:UseCase" xmi:id="_nZ8lIJRREeG1U9r1NQ9zBg" name="UseCase1"/>

 </uml:Model>

diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/resources/standalone/referenceChangeLeftTarget_1/right.notation b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/resources/standalone/referenceChangeLeftTarget_1/right.notation
index a8f870a0359..4f503738c06 100644
--- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/resources/standalone/referenceChangeLeftTarget_1/right.notation
+++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/resources/standalone/referenceChangeLeftTarget_1/right.notation
@@ -1,62 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI 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:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML">

   <notation:Diagram xmi:id="_EEXXoJRREeG1U9r1NQ9zBg" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">

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

     <element xmi:type="uml:Model" href="right.uml#_EEONsJRREeG1U9r1NQ9zBg"/>

   </notation:Diagram>

   <notation:Diagram xmi:id="_lK3ecJRREeG1U9r1NQ9zBg" type="UseCase" name="UseCaseDiagram" measurementUnit="Pixel">

-    <children xmi:type="notation:Shape" xmi:id="_mAyZ0JRREeG1U9r1NQ9zBg" type="2013" fontName="Segoe UI" lineColor="0">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_mAzA4JRREeG1U9r1NQ9zBg" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_mAzn8JRREeG1U9r1NQ9zBg" key="fontHeight" value="true"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_mAzn8ZRREeG1U9r1NQ9zBg" key="bold" value="true"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_mAzn8pRREeG1U9r1NQ9zBg" key="italic" value="true"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_mAzn85RREeG1U9r1NQ9zBg" key="fontColor" value="true"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_mAzn9JRREeG1U9r1NQ9zBg" key="fillColor" value="true"/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_mA0PAJRREeG1U9r1NQ9zBg" source="ShadowFigure">

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

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_mA02EZRREeG1U9r1NQ9zBg" source="displayNameLabelIcon">

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

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_mA3SUJRREeG1U9r1NQ9zBg" source="QualifiedName">

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

-      </eAnnotations>

-      <children xmi:type="notation:DecorationNode" xmi:id="_mA3SUpRREeG1U9r1NQ9zBg" type="5016"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_mA3SU5RREeG1U9r1NQ9zBg" type="7009">

-        <styles xmi:type="notation:SortingStyle" xmi:id="_mA3SVJRREeG1U9r1NQ9zBg"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_mA3SVZRREeG1U9r1NQ9zBg"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mA3SVpRREeG1U9r1NQ9zBg"/>

-      </children>

-      <element xmi:type="uml:UseCase" href="right.uml#_l_6QEJRREeG1U9r1NQ9zBg"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mAyZ0ZRREeG1U9r1NQ9zBg" x="277" y="166"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_naIyYJRREeG1U9r1NQ9zBg" type="2013" fontName="Segoe UI" lineColor="0">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_naJZcJRREeG1U9r1NQ9zBg" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_naJZcZRREeG1U9r1NQ9zBg" key="fontHeight" value="true"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_naJZcpRREeG1U9r1NQ9zBg" key="bold" value="true"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_naJZc5RREeG1U9r1NQ9zBg" key="italic" value="true"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_naJZdJRREeG1U9r1NQ9zBg" key="fontColor" value="true"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_naKAgJRREeG1U9r1NQ9zBg" key="fillColor" value="true"/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_naLOoJRREeG1U9r1NQ9zBg" source="ShadowFigure">

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

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_naLOopRREeG1U9r1NQ9zBg" source="displayNameLabelIcon">

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

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_naLOpJRREeG1U9r1NQ9zBg" source="QualifiedName">

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

-      </eAnnotations>

-      <children xmi:type="notation:DecorationNode" xmi:id="_naL1sJRREeG1U9r1NQ9zBg" type="5016"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_naL1sZRREeG1U9r1NQ9zBg" type="7009">

-        <styles xmi:type="notation:SortingStyle" xmi:id="_naL1spRREeG1U9r1NQ9zBg"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_naL1s5RREeG1U9r1NQ9zBg"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_naL1tJRREeG1U9r1NQ9zBg"/>

-      </children>

-      <element xmi:type="uml:UseCase" href="right.uml#_nZ8lIJRREeG1U9r1NQ9zBg"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_naIyYZRREeG1U9r1NQ9zBg" x="666" y="159"/>

-    </children>

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

     <element xmi:type="uml:Model" href="right.uml#_EEONsJRREeG1U9r1NQ9zBg"/>

   </notation:Diagram>

diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/resources/standalone/referenceChangeLeftTarget_1/right.uml b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/resources/standalone/referenceChangeLeftTarget_1/right.uml
index 50047687358..835afded51e 100644
--- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/resources/standalone/referenceChangeLeftTarget_1/right.uml
+++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/resources/standalone/referenceChangeLeftTarget_1/right.uml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_EEONsJRREeG1U9r1NQ9zBg" name="model">

-  <packagedElement xmi:type="uml:Class" xmi:id="_FszVEJRREeG1U9r1NQ9zBg" name="Class1" useCase="_l_6QEJRREeG1U9r1NQ9zBg"/>

+  <packagedElement xmi:type="uml:Class" xmi:id="_FszVEJRREeG1U9r1NQ9zBg" name="Class1"/>

   <packagedElement xmi:type="uml:UseCase" xmi:id="_WOeXoJRREeG1U9r1NQ9zBg" name="UseCase1_extern"/>

-  <packagedElement xmi:type="uml:Activity" xmi:id="_f9gowJRREeG1U9r1NQ9zBg" name="Activity1"/>

-  <packagedElement xmi:type="uml:UseCase" xmi:id="_l_6QEJRREeG1U9r1NQ9zBg" name="UseCase" subject="_FszVEJRREeG1U9r1NQ9zBg"/>

-  <packagedElement xmi:type="uml:UseCase" xmi:id="_nZ8lIJRREeG1U9r1NQ9zBg" name="UseCase1"/>

 </uml:Model>

diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/resources/standalone/referenceChangeRightTarget_1/left.di b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/resources/standalone/referenceChangeRightTarget_1/left.di
new file mode 100644
index 00000000000..989c082c3d4
--- /dev/null
+++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/resources/standalone/referenceChangeRightTarget_1/left.di
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="ASCII"?>

+<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="left.notation#_EEXXoJRREeG1U9r1NQ9zBg"/>

+    </availablePage>

+    <availablePage>

+      <emfPageIdentifier href="left.notation#_lK3ecJRREeG1U9r1NQ9zBg"/>

+    </availablePage>

+  </pageList>

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

+    <windows>

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

+        <children>

+          <emfPageIdentifier href="left.notation#_EEXXoJRREeG1U9r1NQ9zBg"/>

+        </children>

+        <children>

+          <emfPageIdentifier href="left.notation#_lK3ecJRREeG1U9r1NQ9zBg"/>

+        </children>

+      </children>

+    </windows>

+  </sashModel>

+</di:SashWindowsMngr>

diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/resources/standalone/referenceChangeRightTarget_1/left.notation b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/resources/standalone/referenceChangeRightTarget_1/left.notation
new file mode 100644
index 00000000000..43d250a20fa
--- /dev/null
+++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/resources/standalone/referenceChangeRightTarget_1/left.notation
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML">

+  <notation:Diagram xmi:id="_EEXXoJRREeG1U9r1NQ9zBg" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">

+    <styles xmi:type="notation:DiagramStyle" xmi:id="_EEXXoZRREeG1U9r1NQ9zBg"/>

+    <element xmi:type="uml:Model" href="left.uml#_EEONsJRREeG1U9r1NQ9zBg"/>

+  </notation:Diagram>

+  <notation:Diagram xmi:id="_lK3ecJRREeG1U9r1NQ9zBg" type="UseCase" name="UseCaseDiagram" measurementUnit="Pixel">

+    <styles xmi:type="notation:DiagramStyle" xmi:id="_lK3ecZRREeG1U9r1NQ9zBg"/>

+    <element xmi:type="uml:Model" href="left.uml#_EEONsJRREeG1U9r1NQ9zBg"/>

+  </notation:Diagram>

+</xmi:XMI>

diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/resources/standalone/referenceChangeRightTarget_1/left.uml b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/resources/standalone/referenceChangeRightTarget_1/left.uml
new file mode 100644
index 00000000000..835afded51e
--- /dev/null
+++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/resources/standalone/referenceChangeRightTarget_1/left.uml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_EEONsJRREeG1U9r1NQ9zBg" name="model">

+  <packagedElement xmi:type="uml:Class" xmi:id="_FszVEJRREeG1U9r1NQ9zBg" name="Class1"/>

+  <packagedElement xmi:type="uml:UseCase" xmi:id="_WOeXoJRREeG1U9r1NQ9zBg" name="UseCase1_extern"/>

+</uml:Model>

diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/resources/standalone/referenceChangeRightTarget_1/right.di b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/resources/standalone/referenceChangeRightTarget_1/right.di
new file mode 100644
index 00000000000..d40a1f21e56
--- /dev/null
+++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/resources/standalone/referenceChangeRightTarget_1/right.di
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="ASCII"?>

+<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="right.notation#_EEXXoJRREeG1U9r1NQ9zBg"/>

+    </availablePage>

+    <availablePage>

+      <emfPageIdentifier href="right.notation#_lK3ecJRREeG1U9r1NQ9zBg"/>

+    </availablePage>

+  </pageList>

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

+    <windows>

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

+        <children>

+          <emfPageIdentifier href="right.notation#_EEXXoJRREeG1U9r1NQ9zBg"/>

+        </children>

+        <children>

+          <emfPageIdentifier href="right.notation#_lK3ecJRREeG1U9r1NQ9zBg"/>

+        </children>

+      </children>

+    </windows>

+  </sashModel>

+</di:SashWindowsMngr>

diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/resources/standalone/referenceChangeRightTarget_1/right.notation b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/resources/standalone/referenceChangeRightTarget_1/right.notation
new file mode 100644
index 00000000000..4f503738c06
--- /dev/null
+++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/resources/standalone/referenceChangeRightTarget_1/right.notation
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML">

+  <notation:Diagram xmi:id="_EEXXoJRREeG1U9r1NQ9zBg" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">

+    <styles xmi:type="notation:DiagramStyle" xmi:id="_EEXXoZRREeG1U9r1NQ9zBg"/>

+    <element xmi:type="uml:Model" href="right.uml#_EEONsJRREeG1U9r1NQ9zBg"/>

+  </notation:Diagram>

+  <notation:Diagram xmi:id="_lK3ecJRREeG1U9r1NQ9zBg" type="UseCase" name="UseCaseDiagram" measurementUnit="Pixel">

+    <styles xmi:type="notation:DiagramStyle" xmi:id="_lK3ecZRREeG1U9r1NQ9zBg"/>

+    <element xmi:type="uml:Model" href="right.uml#_EEONsJRREeG1U9r1NQ9zBg"/>

+  </notation:Diagram>

+</xmi:XMI>

diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/resources/standalone/referenceChangeRightTarget_1/right.uml b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/resources/standalone/referenceChangeRightTarget_1/right.uml
new file mode 100644
index 00000000000..8e732169d54
--- /dev/null
+++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/resources/standalone/referenceChangeRightTarget_1/right.uml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_EEONsJRREeG1U9r1NQ9zBg" name="model">

+  <packagedElement xmi:type="uml:Class" xmi:id="_FszVEJRREeG1U9r1NQ9zBg" name="Class1" useCase="_WOeXoJRREeG1U9r1NQ9zBg"/>

+  <packagedElement xmi:type="uml:UseCase" xmi:id="_WOeXoJRREeG1U9r1NQ9zBg" name="UseCase1_extern" subject="_FszVEJRREeG1U9r1NQ9zBg"/>

+</uml:Model>