Bug 538358: [Tests] Some tests are failing

Manage failing tests due to tests problems.

Change-Id: Ie6c7ab0bb0a7641426848d7f25420ad2e63390eb
Signed-off-by: Nicolas FAUVERGUE <nicolas.fauvergue@cea.fr>

4 files changed, 249 insertions, 224 deletions

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/model/legacyPackage/package24.di b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/model/legacyPackage/package24.di
index 6bddfe2e53b..8634d4c00e0 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/model/legacyPackage/package24.di
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/model/legacyPackage/package24.di
@@ -1,26 +1,2 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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="package24.notation#_y2V9wBM4EeSW8ufHPtpJcQ"/>
-    </availablePage>
-    <availablePage>
-      <emfPageIdentifier href="package24.notation#_Da1q0BM5EeSW8ufHPtpJcQ"/>
-    </availablePage>
-    <availablePage>
-      <emfPageIdentifier href="package24.notation#_L0CKYBM5EeSW8ufHPtpJcQ"/>
-    </availablePage>
-  </pageList>
-  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
-    <windows>
-      <children xsi:type="di:TabFolder">
-        <children>
-          <emfPageIdentifier href="package24.notation#_L0CKYBM5EeSW8ufHPtpJcQ"/>
-        </children>
-        <children>
-          <emfPageIdentifier href="package24.notation#_y2V9wBM4EeSW8ufHPtpJcQ"/>
-        </children>
-      </children>
-    </windows>
-  </sashModel>
-</di:SashWindowsMngr>
+<?xml version="1.0" encoding="UTF-8"?>

+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/model/legacyPackage/package24.notation b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/model/legacyPackage/package24.notation
index 17069df2437..0caa4f45c60 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/model/legacyPackage/package24.notation
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/model/legacyPackage/package24.notation
@@ -1,167 +1,216 @@
-<?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: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="_y2V9wBM4EeSW8ufHPtpJcQ" type="Package" name="Diagram1" measurementUnit="Pixel">
-    <children xmi:type="notation:Shape" xmi:id="_1KkqMBM4EeSW8ufHPtpJcQ" type="2007">
-      <children xmi:type="notation:DecorationNode" xmi:id="_1K72kBM4EeSW8ufHPtpJcQ" type="5026"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_1K9EsBM4EeSW8ufHPtpJcQ" type="7016">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_1K9EsRM4EeSW8ufHPtpJcQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1K9EshM4EeSW8ufHPtpJcQ"/>
-      </children>
-      <element xmi:type="uml:Package" href="package24.uml#_1JXwUBM4EeSW8ufHPtpJcQ"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1KkqMRM4EeSW8ufHPtpJcQ" x="416" y="196"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_1YKaQBM4EeSW8ufHPtpJcQ" type="2007">
-      <children xmi:type="notation:DecorationNode" xmi:id="_1YKaQhM4EeSW8ufHPtpJcQ" type="5026"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_1YLBUBM4EeSW8ufHPtpJcQ" type="7016">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_1YLBURM4EeSW8ufHPtpJcQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1YLBUhM4EeSW8ufHPtpJcQ"/>
-      </children>
-      <element xmi:type="uml:Package" href="package24.uml#_1YJMIBM4EeSW8ufHPtpJcQ"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1YKaQRM4EeSW8ufHPtpJcQ" x="876" y="197"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_2StW8BM4EeSW8ufHPtpJcQ" type="2005">
-      <children xmi:type="notation:DecorationNode" xmi:id="_2StW8hM4EeSW8ufHPtpJcQ" type="5020"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_2StW8xM4EeSW8ufHPtpJcQ" type="7009">
-        <children xmi:type="notation:Shape" xmi:id="_2v3NABM4EeSW8ufHPtpJcQ" type="3009">
-          <children xmi:type="notation:DecorationNode" xmi:id="_2v3NAhM4EeSW8ufHPtpJcQ" type="5017"/>
-          <children xmi:type="notation:DecorationNode" xmi:id="_2v3NAxM4EeSW8ufHPtpJcQ" type="7010">
-            <styles xmi:type="notation:TitleStyle" xmi:id="_2v3NBBM4EeSW8ufHPtpJcQ"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2v3NBRM4EeSW8ufHPtpJcQ"/>
-          </children>
-          <element xmi:type="uml:Package" href="package24.uml#_2v0wwBM4EeSW8ufHPtpJcQ"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2v3NARM4EeSW8ufHPtpJcQ" x="56" y="51"/>
-        </children>
-        <children xmi:type="notation:Shape" xmi:id="_24pVkBM4EeSW8ufHPtpJcQ" type="3009">
-          <children xmi:type="notation:DecorationNode" xmi:id="_24pVkhM4EeSW8ufHPtpJcQ" type="5017"/>
-          <children xmi:type="notation:DecorationNode" xmi:id="_24pVkxM4EeSW8ufHPtpJcQ" type="7010">
-            <styles xmi:type="notation:TitleStyle" xmi:id="_24pVlBM4EeSW8ufHPtpJcQ"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_24pVlRM4EeSW8ufHPtpJcQ"/>
-          </children>
-          <element xmi:type="uml:Package" href="package24.uml#_24m5UBM4EeSW8ufHPtpJcQ"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_24pVkRM4EeSW8ufHPtpJcQ" x="359" y="50"/>
-        </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="_2StW9BM4EeSW8ufHPtpJcQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2StW9RM4EeSW8ufHPtpJcQ"/>
-      </children>
-      <element xmi:type="uml:Model" href="package24.uml#_2Sq6sBM4EeSW8ufHPtpJcQ"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2StW8RM4EeSW8ufHPtpJcQ" x="1172" y="114" width="652" height="249"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_4U-JoBM4EeSW8ufHPtpJcQ" type="2012">
-      <children xmi:type="notation:DecorationNode" xmi:id="_4U-wsRM4EeSW8ufHPtpJcQ" type="5038"/>
-      <element xmi:type="uml:Comment" href="package24.uml#_4UdzUBM4EeSW8ufHPtpJcQ"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4U-wsBM4EeSW8ufHPtpJcQ" x="1473" y="482"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_7icyQBM4EeSW8ufHPtpJcQ" type="2011">
-      <children xmi:type="notation:DecorationNode" xmi:id="_7icyQhM4EeSW8ufHPtpJcQ" type="5037"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_7icyQxM4EeSW8ufHPtpJcQ" type="5159"/>
-      <element xmi:type="uml:Constraint" href="package24.uml#_7iZH4BM4EeSW8ufHPtpJcQ"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7icyQRM4EeSW8ufHPtpJcQ" x="1050" y="489"/>
-    </children>
-    <styles xmi:type="notation:DiagramStyle" xmi:id="_y2V9wRM4EeSW8ufHPtpJcQ"/>
-    <element xmi:type="uml:Model" href="package24.uml#_yzyZABM4EeSW8ufHPtpJcQ"/>
-    <edges xmi:type="notation:Connector" xmi:id="_1u44MBM4EeSW8ufHPtpJcQ" type="4008" source="_1KkqMBM4EeSW8ufHPtpJcQ" target="_1YKaQBM4EeSW8ufHPtpJcQ">
-      <children xmi:type="notation:DecorationNode" xmi:id="_1u5fQBM4EeSW8ufHPtpJcQ" type="6026">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_1u5fQRM4EeSW8ufHPtpJcQ" y="40"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_1u5fQhM4EeSW8ufHPtpJcQ" type="6027">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_1u5fQxM4EeSW8ufHPtpJcQ" y="60"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_1u44MRM4EeSW8ufHPtpJcQ"/>
-      <element xmi:type="uml:Dependency" href="package24.uml#_1tPSYBM4EeSW8ufHPtpJcQ"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1u44MhM4EeSW8ufHPtpJcQ" points="[100, 8, -360, 7]$[560, 8, 100, 7]"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_3nLPgBM4EeSW8ufHPtpJcQ" type="4008" source="_2v3NABM4EeSW8ufHPtpJcQ" target="_1YKaQBM4EeSW8ufHPtpJcQ">
-      <children xmi:type="notation:DecorationNode" xmi:id="_3nLPgxM4EeSW8ufHPtpJcQ" type="6026">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_3nL2kBM4EeSW8ufHPtpJcQ" y="40"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_3nL2kRM4EeSW8ufHPtpJcQ" type="6027">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_3nL2khM4EeSW8ufHPtpJcQ" y="60"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_3nLPgRM4EeSW8ufHPtpJcQ"/>
-      <element xmi:type="uml:Dependency" href="package24.uml#_3nIzQBM4EeSW8ufHPtpJcQ"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3nLPghM4EeSW8ufHPtpJcQ" points="[-100, 4, 254, -19]$[-361, -5, -7, -28]"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_45HYgBM4EeSW8ufHPtpJcQ" type="4013" source="_4U-JoBM4EeSW8ufHPtpJcQ" target="_24pVkBM4EeSW8ufHPtpJcQ">
-      <styles xmi:type="notation:FontStyle" xmi:id="_45HYgRM4EeSW8ufHPtpJcQ"/>
-      <element xsi:nil="true"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_45HYghM4EeSW8ufHPtpJcQ" points="[3, -50, -19, 230]$[20, -308, -2, -28]"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_5NSRsBM4EeSW8ufHPtpJcQ" type="4010" source="_2v3NABM4EeSW8ufHPtpJcQ" target="_1KkqMBM4EeSW8ufHPtpJcQ">
-      <children xmi:type="notation:DecorationNode" xmi:id="_5NS4wBM4EeSW8ufHPtpJcQ" type="6022">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_5NS4wRM4EeSW8ufHPtpJcQ" y="40"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_5NSRsRM4EeSW8ufHPtpJcQ"/>
-      <element xmi:type="uml:PackageImport" href="package24.uml#_5NPOYBM4EeSW8ufHPtpJcQ"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_5NSRshM4EeSW8ufHPtpJcQ" points="[8, 50, 825, 47]$[8, 188, 825, 185]$[-811, 188, 6, 185]$[-811, 53, 6, 50]"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_AAMI4BM5EeSW8ufHPtpJcQ" type="4006" source="_24pVkBM4EeSW8ufHPtpJcQ" target="_2v3NABM4EeSW8ufHPtpJcQ">
-      <children xmi:type="notation:DecorationNode" xmi:id="_AAMI4xM5EeSW8ufHPtpJcQ" type="6014">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_AAMv8BM5EeSW8ufHPtpJcQ" y="40"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_AAMv8RM5EeSW8ufHPtpJcQ" type="6015">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_AAMv8hM5EeSW8ufHPtpJcQ" y="60"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_AAMI4RM5EeSW8ufHPtpJcQ"/>
-      <element xmi:type="uml:Abstraction" href="package24.uml#_AAJFkBM5EeSW8ufHPtpJcQ"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_AAMI4hM5EeSW8ufHPtpJcQ" points="[-100, 0, 129, 4]$[-329, 0, -100, 4]"/>
-    </edges>
-  </notation:Diagram>
-  <notation:Diagram xmi:id="_Da1q0BM5EeSW8ufHPtpJcQ" type="Package" name="ClosedDiagram" measurementUnit="Pixel">
-    <children xmi:type="notation:Shape" xmi:id="_D1e_cBM5EeSW8ufHPtpJcQ" type="2007">
-      <children xmi:type="notation:DecorationNode" xmi:id="_D1e_chM5EeSW8ufHPtpJcQ" type="5026"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_D1e_cxM5EeSW8ufHPtpJcQ" type="7016">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_D1e_dBM5EeSW8ufHPtpJcQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_D1e_dRM5EeSW8ufHPtpJcQ"/>
-      </children>
-      <element xmi:type="uml:Package" href="package24.uml#_D1dKQBM5EeSW8ufHPtpJcQ"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_D1e_cRM5EeSW8ufHPtpJcQ" x="614" y="254"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_EZN-oBM5EeSW8ufHPtpJcQ" type="2005">
-      <children xmi:type="notation:DecorationNode" xmi:id="_EZN-ohM5EeSW8ufHPtpJcQ" type="5020"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_EZN-oxM5EeSW8ufHPtpJcQ" type="7009">
-        <children xmi:type="notation:Shape" xmi:id="_D6T1EBM5EeSW8ufHPtpJcQ" type="2007">
-          <children xmi:type="notation:DecorationNode" xmi:id="_D6UcIBM5EeSW8ufHPtpJcQ" type="5026"/>
-          <children xmi:type="notation:DecorationNode" xmi:id="_D6UcIRM5EeSW8ufHPtpJcQ" type="7016">
-            <styles xmi:type="notation:TitleStyle" xmi:id="_D6UcIhM5EeSW8ufHPtpJcQ"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_D6UcIxM5EeSW8ufHPtpJcQ"/>
-          </children>
-          <element xmi:type="uml:Package" href="package24.uml#_D6Sm8BM5EeSW8ufHPtpJcQ"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_D6T1ERM5EeSW8ufHPtpJcQ" x="15" y="47"/>
-        </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="_EZN-pBM5EeSW8ufHPtpJcQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EZN-pRM5EeSW8ufHPtpJcQ"/>
-      </children>
-      <element xmi:type="uml:Model" href="package24.uml#_EZMwgBM5EeSW8ufHPtpJcQ"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EZN-oRM5EeSW8ufHPtpJcQ" x="909" y="174" width="395" height="226"/>
-    </children>
-    <styles xmi:type="notation:DiagramStyle" xmi:id="_Da1q0RM5EeSW8ufHPtpJcQ"/>
-    <element xmi:type="uml:Model" href="package24.uml#_yzyZABM4EeSW8ufHPtpJcQ"/>
-    <edges xmi:type="notation:Connector" xmi:id="_GAooYBM5EeSW8ufHPtpJcQ" type="4006" source="_D6T1EBM5EeSW8ufHPtpJcQ" target="_D1e_cBM5EeSW8ufHPtpJcQ">
-      <children xmi:type="notation:DecorationNode" xmi:id="_GAooYxM5EeSW8ufHPtpJcQ" type="6014">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_GAooZBM5EeSW8ufHPtpJcQ" y="21"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_GAooZRM5EeSW8ufHPtpJcQ" type="6015">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_GApPcBM5EeSW8ufHPtpJcQ" x="13" y="36"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_GAooYRM5EeSW8ufHPtpJcQ"/>
-      <element xmi:type="uml:Abstraction" href="package24.uml#_GAmMIBM5EeSW8ufHPtpJcQ"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_GAooYhM5EeSW8ufHPtpJcQ" points="[-100, 6, 214, -8]$[-214, 20, 100, 6]"/>
-    </edges>
-    <edges xmi:type="notation:Connector" xmi:id="_HGT3ABM5EeSW8ufHPtpJcQ" type="4008" source="_EZN-oBM5EeSW8ufHPtpJcQ" target="_D1e_cBM5EeSW8ufHPtpJcQ">
-      <children xmi:type="notation:DecorationNode" xmi:id="_HGUeEBM5EeSW8ufHPtpJcQ" type="6026">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_HGUeERM5EeSW8ufHPtpJcQ" x="-6" y="13"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_HGUeEhM5EeSW8ufHPtpJcQ" type="6027">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_HGUeExM5EeSW8ufHPtpJcQ" y="60"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_HGT3ARM5EeSW8ufHPtpJcQ"/>
-      <element xmi:type="uml:Dependency" href="package24.uml#_HGQzsBM5EeSW8ufHPtpJcQ"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_HGT3AhM5EeSW8ufHPtpJcQ" points="[0, 13, 428, 96]$[0, 64, 428, 147]$[-434, 64, -6, 147]$[-434, -33, -6, 50]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HGfdMBM5EeSW8ufHPtpJcQ" id="(0.589873417721519,0.9424778761061947)"/>
-    </edges>
-  </notation:Diagram>
-  <notation:Diagram xmi:id="_L0CKYBM5EeSW8ufHPtpJcQ" type="PapyrusTestInvalidDiagram" name="InvalidDiagram" measurementUnit="Pixel">
-    <styles xmi:type="notation:DiagramStyle" xmi:id="_L0CxcBM5EeSW8ufHPtpJcQ"/>
-    <element xmi:type="uml:Package" href="package24.uml#_1JXwUBM4EeSW8ufHPtpJcQ"/>
-  </notation:Diagram>
-</xmi:XMI>
+<?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:style="http://www.eclipse.org/papyrus/infra/gmfdiag/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">

+  <notation:Diagram xmi:id="_L0CKYBM5EeSW8ufHPtpJcQ" type="PapyrusTestInvalidDiagram" name="InvalidDiagram" measurementUnit="Pixel">

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

+    <element xmi:type="uml:Package" href="package24.uml#_1JXwUBM4EeSW8ufHPtpJcQ"/>

+  </notation:Diagram>

+  <notation:Diagram xmi:id="_dHSk8KrJEeicWvEzWuwy8g" type="PapyrusUMLClassDiagram" name="Diagram1" measurementUnit="Pixel">

+    <children xmi:type="notation:Shape" xmi:id="_g_b7MKrJEeicWvEzWuwy8g" type="Package_Shape">

+      <children xmi:type="notation:DecorationNode" xmi:id="_g_dJUKrJEeicWvEzWuwy8g" type="Package_NameLabel"/>

+      <children xmi:type="notation:BasicCompartment" xmi:id="_g_dwYKrJEeicWvEzWuwy8g" type="Package_PackagedElementCompartment">

+        <styles xmi:type="notation:TitleStyle" xmi:id="_g_dwYarJEeicWvEzWuwy8g"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g_dwYqrJEeicWvEzWuwy8g"/>

+      </children>

+      <element xmi:type="uml:Package" href="package24.uml#_1JXwUBM4EeSW8ufHPtpJcQ"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g_b7MarJEeicWvEzWuwy8g" x="180" y="107"/>

+    </children>

+    <children xmi:type="notation:Shape" xmi:id="_hdVYIKrJEeicWvEzWuwy8g" type="Package_Shape">

+      <children xmi:type="notation:DecorationNode" xmi:id="_hdV_MKrJEeicWvEzWuwy8g" type="Package_NameLabel"/>

+      <children xmi:type="notation:BasicCompartment" xmi:id="_hdWmQKrJEeicWvEzWuwy8g" type="Package_PackagedElementCompartment">

+        <styles xmi:type="notation:TitleStyle" xmi:id="_hdWmQarJEeicWvEzWuwy8g"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hdWmQqrJEeicWvEzWuwy8g"/>

+      </children>

+      <element xmi:type="uml:Package" href="package24.uml#_1YJMIBM4EeSW8ufHPtpJcQ"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hdVYIarJEeicWvEzWuwy8g" x="580" y="180"/>

+    </children>

+    <children xmi:type="notation:Shape" xmi:id="_iKbusKrJEeicWvEzWuwy8g" type="Model_Shape">

+      <children xmi:type="notation:DecorationNode" xmi:id="_iKcVwKrJEeicWvEzWuwy8g" type="Model_NameLabel"/>

+      <children xmi:type="notation:BasicCompartment" xmi:id="_iKcVwarJEeicWvEzWuwy8g" type="Model_PackagedElementCompartment">

+        <children xmi:type="notation:Shape" xmi:id="_iagLAKrJEeicWvEzWuwy8g" type="Package_Shape_CN">

+          <children xmi:type="notation:DecorationNode" xmi:id="_iagyEKrJEeicWvEzWuwy8g" type="Package_NameLabel_CN"/>

+          <children xmi:type="notation:BasicCompartment" xmi:id="_iagyEarJEeicWvEzWuwy8g" type="Package_PackagedElementCompartment_CN">

+            <styles xmi:type="notation:TitleStyle" xmi:id="_iagyEqrJEeicWvEzWuwy8g"/>

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iagyE6rJEeicWvEzWuwy8g"/>

+          </children>

+          <element xmi:type="uml:Package" href="package24.uml#_2v0wwBM4EeSW8ufHPtpJcQ"/>

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iagLAarJEeicWvEzWuwy8g" x="47" y="18"/>

+        </children>

+        <children xmi:type="notation:Shape" xmi:id="_i4V9kKrJEeicWvEzWuwy8g" type="Package_Shape_CN">

+          <children xmi:type="notation:DecorationNode" xmi:id="_i4WkoKrJEeicWvEzWuwy8g" type="Package_NameLabel_CN"/>

+          <children xmi:type="notation:BasicCompartment" xmi:id="_i4WkoarJEeicWvEzWuwy8g" type="Package_PackagedElementCompartment_CN">

+            <styles xmi:type="notation:TitleStyle" xmi:id="_i4WkoqrJEeicWvEzWuwy8g"/>

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_i4Wko6rJEeicWvEzWuwy8g"/>

+          </children>

+          <element xmi:type="uml:Package" href="package24.uml#_24m5UBM4EeSW8ufHPtpJcQ"/>

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_i4V9karJEeicWvEzWuwy8g" x="365" y="19"/>

+        </children>

+        <styles xmi:type="notation:TitleStyle" xmi:id="_iKcVwqrJEeicWvEzWuwy8g"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iKcVw6rJEeicWvEzWuwy8g"/>

+      </children>

+      <element xmi:type="uml:Model" href="package24.uml#_2Sq6sBM4EeSW8ufHPtpJcQ"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iKbusarJEeicWvEzWuwy8g" x="169" y="413" width="792"/>

+    </children>

+    <children xmi:type="notation:Shape" xmi:id="_lVANQKrJEeicWvEzWuwy8g" type="Constraint_PackagedElementShape">

+      <children xmi:type="notation:DecorationNode" xmi:id="_lVA0UKrJEeicWvEzWuwy8g" type="Constraint_NameLabel"/>

+      <children xmi:type="notation:DecorationNode" xmi:id="_lVA0UarJEeicWvEzWuwy8g" type="Constraint_BodyLabel"/>

+      <element xmi:type="uml:Constraint" href="package24.uml#_7iZH4BM4EeSW8ufHPtpJcQ"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lVANQarJEeicWvEzWuwy8g" x="492" y="630"/>

+    </children>

+    <children xmi:type="notation:Shape" xmi:id="_ly0xsKrJEeicWvEzWuwy8g" type="Package_Shape">

+      <children xmi:type="notation:DecorationNode" xmi:id="_ly0xsqrJEeicWvEzWuwy8g" type="Package_NameLabel"/>

+      <children xmi:type="notation:BasicCompartment" xmi:id="_ly1YwKrJEeicWvEzWuwy8g" type="Package_PackagedElementCompartment">

+        <styles xmi:type="notation:TitleStyle" xmi:id="_ly1YwarJEeicWvEzWuwy8g"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ly1YwqrJEeicWvEzWuwy8g"/>

+      </children>

+      <element xmi:type="uml:Package" href="package24.uml#_D1dKQBM5EeSW8ufHPtpJcQ"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ly0xsarJEeicWvEzWuwy8g" x="1003" y="170"/>

+    </children>

+    <children xmi:type="notation:Shape" xmi:id="_mYN9wKrJEeicWvEzWuwy8g" type="Model_Shape">

+      <children xmi:type="notation:DecorationNode" xmi:id="_mYN9wqrJEeicWvEzWuwy8g" type="Model_NameLabel"/>

+      <children xmi:type="notation:BasicCompartment" xmi:id="_mYN9w6rJEeicWvEzWuwy8g" type="Model_PackagedElementCompartment">

+        <children xmi:type="notation:Shape" xmi:id="_nAQOIKrJEeicWvEzWuwy8g" type="Package_Shape_CN">

+          <children xmi:type="notation:DecorationNode" xmi:id="_nAQOIqrJEeicWvEzWuwy8g" type="Package_NameLabel_CN"/>

+          <children xmi:type="notation:BasicCompartment" xmi:id="_nAQ1MKrJEeicWvEzWuwy8g" type="Package_PackagedElementCompartment_CN">

+            <styles xmi:type="notation:TitleStyle" xmi:id="_nAQ1MarJEeicWvEzWuwy8g"/>

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nAQ1MqrJEeicWvEzWuwy8g"/>

+          </children>

+          <element xmi:type="uml:Package" href="package24.uml#_D6Sm8BM5EeSW8ufHPtpJcQ"/>

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nAQOIarJEeicWvEzWuwy8g" x="61" y="38"/>

+        </children>

+        <styles xmi:type="notation:TitleStyle" xmi:id="_mYN9xKrJEeicWvEzWuwy8g"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mYN9xarJEeicWvEzWuwy8g"/>

+      </children>

+      <element xmi:type="uml:Model" href="package24.uml#_EZMwgBM5EeSW8ufHPtpJcQ"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mYN9warJEeicWvEzWuwy8g" x="1124" y="367" width="277" height="214"/>

+    </children>

+    <styles xmi:type="notation:StringValueStyle" xmi:id="_dHSk8arJEeicWvEzWuwy8g" name="diagram_compatibility_version" stringValue="1.4.0"/>

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

+    <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_dHSk86rJEeicWvEzWuwy8g" diagramKindId="org.eclipse.papyrus.uml.diagram.package">

+      <owner xmi:type="uml:Model" href="package24.uml#_yzyZABM4EeSW8ufHPtpJcQ"/>

+    </styles>

+    <element xmi:type="uml:Model" href="package24.uml#_yzyZABM4EeSW8ufHPtpJcQ"/>

+    <edges xmi:type="notation:Connector" xmi:id="_hdskgKrJEeicWvEzWuwy8g" type="Dependency_Edge" source="_g_b7MKrJEeicWvEzWuwy8g" target="_hdVYIKrJEeicWvEzWuwy8g">

+      <children xmi:type="notation:DecorationNode" xmi:id="_hdskg6rJEeicWvEzWuwy8g" type="Dependency_NameLabel">

+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_huSlQKrJEeicWvEzWuwy8g" name="IS_UPDATED_POSITION" booleanValue="true"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_hdskhKrJEeicWvEzWuwy8g" x="1" y="38"/>

+      </children>

+      <children xmi:type="notation:DecorationNode" xmi:id="_hdtLkKrJEeicWvEzWuwy8g" type="Dependency_StereotypeLabel">

+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_huYE0KrJEeicWvEzWuwy8g" name="IS_UPDATED_POSITION" booleanValue="true"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_hdtLkarJEeicWvEzWuwy8g" x="1" y="58"/>

+      </children>

+      <styles xmi:type="notation:FontStyle" xmi:id="_hdskgarJEeicWvEzWuwy8g"/>

+      <element xmi:type="uml:Dependency" href="package24.uml#_1tPSYBM4EeSW8ufHPtpJcQ"/>

+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hdskgqrJEeicWvEzWuwy8g" points="[190, 107, -643984, -643984]$[0, 0, -643984, -643984]"/>

+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hujD8KrJEeicWvEzWuwy8g" id="(1.0,0.68)"/>

+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hujrAKrJEeicWvEzWuwy8g" id="(0.0,0.31)"/>

+    </edges>

+    <edges xmi:type="notation:Connector" xmi:id="_kgPIcKrJEeicWvEzWuwy8g" type="Dependency_Edge" source="_iagLAKrJEeicWvEzWuwy8g" target="_hdVYIKrJEeicWvEzWuwy8g">

+      <children xmi:type="notation:DecorationNode" xmi:id="_kgPIc6rJEeicWvEzWuwy8g" type="Dependency_NameLabel">

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_kgPIdKrJEeicWvEzWuwy8g" y="40"/>

+      </children>

+      <children xmi:type="notation:DecorationNode" xmi:id="_kgPIdarJEeicWvEzWuwy8g" type="Dependency_StereotypeLabel">

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_kgPIdqrJEeicWvEzWuwy8g" y="60"/>

+      </children>

+      <styles xmi:type="notation:FontStyle" xmi:id="_kgPIcarJEeicWvEzWuwy8g"/>

+      <element xmi:type="uml:Dependency" href="package24.uml#_3nIzQBM4EeSW8ufHPtpJcQ"/>

+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_kgPIcqrJEeicWvEzWuwy8g" points="[357, 481, -643984, -643984]$[617, 279, -643984, -643984]"/>

+    </edges>

+    <edges xmi:type="notation:Connector" xmi:id="_k42cwKrJEeicWvEzWuwy8g" type="Dependency_Edge" source="_i4V9kKrJEeicWvEzWuwy8g" target="_iagLAKrJEeicWvEzWuwy8g">

+      <children xmi:type="notation:DecorationNode" xmi:id="_k43D0KrJEeicWvEzWuwy8g" type="Dependency_NameLabel">

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_k43D0arJEeicWvEzWuwy8g" y="40"/>

+      </children>

+      <children xmi:type="notation:DecorationNode" xmi:id="_k43D0qrJEeicWvEzWuwy8g" type="Dependency_StereotypeLabel">

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_k43D06rJEeicWvEzWuwy8g" y="60"/>

+      </children>

+      <styles xmi:type="notation:FontStyle" xmi:id="_k42cwarJEeicWvEzWuwy8g"/>

+      <element xmi:type="uml:Abstraction" href="package24.uml#_AAJFkBM5EeSW8ufHPtpJcQ"/>

+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_k42cwqrJEeicWvEzWuwy8g" points="[540, 509, -643984, -643984]$[421, 510, -643984, -643984]"/>

+    </edges>

+    <edges xmi:type="notation:Connector" xmi:id="_nWFUMKrJEeicWvEzWuwy8g" type="Dependency_Edge" source="_mYN9wKrJEeicWvEzWuwy8g" target="_ly0xsKrJEeicWvEzWuwy8g">

+      <children xmi:type="notation:DecorationNode" xmi:id="_nWF7QKrJEeicWvEzWuwy8g" type="Dependency_NameLabel">

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_nWF7QarJEeicWvEzWuwy8g" y="40"/>

+      </children>

+      <children xmi:type="notation:DecorationNode" xmi:id="_nWF7QqrJEeicWvEzWuwy8g" type="Dependency_StereotypeLabel">

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_nWF7Q6rJEeicWvEzWuwy8g" y="60"/>

+      </children>

+      <styles xmi:type="notation:FontStyle" xmi:id="_nWFUMarJEeicWvEzWuwy8g"/>

+      <element xmi:type="uml:Dependency" href="package24.uml#_HGQzsBM5EeSW8ufHPtpJcQ"/>

+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_nWFUMqrJEeicWvEzWuwy8g" points="[1190, 367, -643984, -643984]$[1132, 269, -643984, -643984]"/>

+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_oEqRcKrJEeicWvEzWuwy8g" id="(0.23826714801444043,0.0)"/>

+    </edges>

+    <edges xmi:type="notation:Connector" xmi:id="_nlDkUKrJEeicWvEzWuwy8g" type="Dependency_Edge" source="_nAQOIKrJEeicWvEzWuwy8g" target="_ly0xsKrJEeicWvEzWuwy8g">

+      <children xmi:type="notation:DecorationNode" xmi:id="_nlDkU6rJEeicWvEzWuwy8g" type="Dependency_NameLabel">

+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_oDvrcKrJEeicWvEzWuwy8g" name="IS_UPDATED_POSITION" booleanValue="true"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_nlELYKrJEeicWvEzWuwy8g" x="-1" y="38"/>

+      </children>

+      <children xmi:type="notation:DecorationNode" xmi:id="_nlELYarJEeicWvEzWuwy8g" type="Dependency_StereotypeLabel">

+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_oELwUKrJEeicWvEzWuwy8g" name="IS_UPDATED_POSITION" booleanValue="true"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_nlELYqrJEeicWvEzWuwy8g" x="-1" y="58"/>

+      </children>

+      <styles xmi:type="notation:FontStyle" xmi:id="_nlDkUarJEeicWvEzWuwy8g"/>

+      <element xmi:type="uml:Abstraction" href="package24.uml#_GAmMIBM5EeSW8ufHPtpJcQ"/>

+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_nlDkUqrJEeicWvEzWuwy8g" points="[1255, 433, -643984, -643984]$[1138, 269, -643984, -643984]"/>

+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_oEerQKrJEeicWvEzWuwy8g" id="(0.34,0.0)"/>

+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_oEerQarJEeicWvEzWuwy8g" id="(0.655,1.0)"/>

+    </edges>

+  </notation:Diagram>

+  <notation:Diagram xmi:id="_fR6pcKrJEeicWvEzWuwy8g" type="PapyrusUMLClassDiagram" name="ClosedDiagram" measurementUnit="Pixel">

+    <children xmi:type="notation:Shape" xmi:id="_GzpHQKrKEeicWvEzWuwy8g" type="Package_Shape">

+      <children xmi:type="notation:DecorationNode" xmi:id="_GzqVYKrKEeicWvEzWuwy8g" type="Package_NameLabel"/>

+      <children xmi:type="notation:BasicCompartment" xmi:id="_GzqVYarKEeicWvEzWuwy8g" type="Package_PackagedElementCompartment">

+        <styles xmi:type="notation:TitleStyle" xmi:id="_GzqVYqrKEeicWvEzWuwy8g"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GzqVY6rKEeicWvEzWuwy8g"/>

+      </children>

+      <element xmi:type="uml:Package" href="package24.uml#_1JXwUBM4EeSW8ufHPtpJcQ"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GzpHQarKEeicWvEzWuwy8g" x="545" y="172"/>

+    </children>

+    <children xmi:type="notation:Shape" xmi:id="_IFg-0KrKEeicWvEzWuwy8g" type="Package_Shape">

+      <children xmi:type="notation:DecorationNode" xmi:id="_IFhl4KrKEeicWvEzWuwy8g" type="Package_NameLabel"/>

+      <children xmi:type="notation:BasicCompartment" xmi:id="_IFhl4arKEeicWvEzWuwy8g" type="Package_PackagedElementCompartment">

+        <styles xmi:type="notation:TitleStyle" xmi:id="_IFhl4qrKEeicWvEzWuwy8g"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IFhl46rKEeicWvEzWuwy8g"/>

+      </children>

+      <element xmi:type="uml:Package" href="package24.uml#_1YJMIBM4EeSW8ufHPtpJcQ"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IFg-0arKEeicWvEzWuwy8g" x="892" y="180"/>

+    </children>

+    <children xmi:type="notation:Shape" xmi:id="_IQpQwKrKEeicWvEzWuwy8g" type="Model_Shape">

+      <children xmi:type="notation:DecorationNode" xmi:id="_IQp30KrKEeicWvEzWuwy8g" type="Model_NameLabel"/>

+      <children xmi:type="notation:BasicCompartment" xmi:id="_IQp30arKEeicWvEzWuwy8g" type="Model_PackagedElementCompartment">

+        <styles xmi:type="notation:TitleStyle" xmi:id="_IQp30qrKEeicWvEzWuwy8g"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IQp306rKEeicWvEzWuwy8g"/>

+      </children>

+      <element xmi:type="uml:Model" href="package24.uml#_2Sq6sBM4EeSW8ufHPtpJcQ"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IQpQwarKEeicWvEzWuwy8g" x="445" y="420"/>

+    </children>

+    <children xmi:type="notation:Shape" xmi:id="_I3rbkKrKEeicWvEzWuwy8g" type="Constraint_PackagedElementShape">

+      <children xmi:type="notation:DecorationNode" xmi:id="_I3sCoKrKEeicWvEzWuwy8g" type="Constraint_NameLabel"/>

+      <children xmi:type="notation:DecorationNode" xmi:id="_I3sCoarKEeicWvEzWuwy8g" type="Constraint_BodyLabel"/>

+      <element xmi:type="uml:Constraint" href="package24.uml#_7iZH4BM4EeSW8ufHPtpJcQ"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_I3rbkarKEeicWvEzWuwy8g" x="1003" y="413"/>

+    </children>

+    <children xmi:type="notation:Shape" xmi:id="_JGprsKrKEeicWvEzWuwy8g" type="Package_Shape">

+      <children xmi:type="notation:DecorationNode" xmi:id="_JGprsqrKEeicWvEzWuwy8g" type="Package_NameLabel"/>

+      <children xmi:type="notation:BasicCompartment" xmi:id="_JGprs6rKEeicWvEzWuwy8g" type="Package_PackagedElementCompartment">

+        <styles xmi:type="notation:TitleStyle" xmi:id="_JGprtKrKEeicWvEzWuwy8g"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JGprtarKEeicWvEzWuwy8g"/>

+      </children>

+      <element xmi:type="uml:Package" href="package24.uml#_D1dKQBM5EeSW8ufHPtpJcQ"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JGprsarKEeicWvEzWuwy8g" x="274" y="165"/>

+    </children>

+    <children xmi:type="notation:Shape" xmi:id="_JTCh4KrKEeicWvEzWuwy8g" type="Model_Shape">

+      <children xmi:type="notation:DecorationNode" xmi:id="_JTCh4qrKEeicWvEzWuwy8g" type="Model_NameLabel"/>

+      <children xmi:type="notation:BasicCompartment" xmi:id="_JTCh46rKEeicWvEzWuwy8g" type="Model_PackagedElementCompartment">

+        <styles xmi:type="notation:TitleStyle" xmi:id="_JTCh5KrKEeicWvEzWuwy8g"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JTCh5arKEeicWvEzWuwy8g"/>

+      </children>

+      <element xmi:type="uml:Model" href="package24.uml#_EZMwgBM5EeSW8ufHPtpJcQ"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JTCh4arKEeicWvEzWuwy8g" x="106" y="423"/>

+    </children>

+    <styles xmi:type="notation:StringValueStyle" xmi:id="_fR6pcarJEeicWvEzWuwy8g" name="diagram_compatibility_version" stringValue="1.4.0"/>

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

+    <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_fR6pc6rJEeicWvEzWuwy8g" diagramKindId="org.eclipse.papyrus.uml.diagram.package">

+      <owner xmi:type="uml:Model" href="package24.uml#_yzyZABM4EeSW8ufHPtpJcQ"/>

+    </styles>

+    <element xmi:type="uml:Model" href="package24.uml#_yzyZABM4EeSW8ufHPtpJcQ"/>

+  </notation:Diagram>

+</xmi:XMI>

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/model/legacyPackage/package24.uml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/model/legacyPackage/package24.uml
index 25ad33d846a..4ab187d807e 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/model/legacyPackage/package24.uml
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/model/legacyPackage/package24.uml
@@ -1,29 +1,29 @@
-<?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="_yzyZABM4EeSW8ufHPtpJcQ" name="model">
-  <ownedComment xmi:type="uml:Comment" xmi:id="_4UdzUBM4EeSW8ufHPtpJcQ" annotatedElement="_24m5UBM4EeSW8ufHPtpJcQ">
-    <body> </body>
-  </ownedComment>
-  <packagedElement xmi:type="uml:Package" xmi:id="_1JXwUBM4EeSW8ufHPtpJcQ" clientDependency="_1tPSYBM4EeSW8ufHPtpJcQ" name="Package1">
-    <packagedElement xmi:type="uml:Dependency" xmi:id="_1tPSYBM4EeSW8ufHPtpJcQ" name="Dependency1" client="_1JXwUBM4EeSW8ufHPtpJcQ" supplier="_1YJMIBM4EeSW8ufHPtpJcQ"/>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Package" xmi:id="_1YJMIBM4EeSW8ufHPtpJcQ" name="Package2"/>
-  <packagedElement xmi:type="uml:Model" xmi:id="_2Sq6sBM4EeSW8ufHPtpJcQ" name="Model1">
-    <packagedElement xmi:type="uml:Package" xmi:id="_2v0wwBM4EeSW8ufHPtpJcQ" clientDependency="_3nIzQBM4EeSW8ufHPtpJcQ" name="Package1">
-      <packageImport xmi:type="uml:PackageImport" xmi:id="_5NPOYBM4EeSW8ufHPtpJcQ" importedPackage="_1JXwUBM4EeSW8ufHPtpJcQ"/>
-      <packagedElement xmi:type="uml:Dependency" xmi:id="_3nIzQBM4EeSW8ufHPtpJcQ" name="Dependency1" client="_2v0wwBM4EeSW8ufHPtpJcQ" supplier="_1YJMIBM4EeSW8ufHPtpJcQ"/>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Package" xmi:id="_24m5UBM4EeSW8ufHPtpJcQ" clientDependency="_AAJFkBM5EeSW8ufHPtpJcQ" name="Package2">
-      <packagedElement xmi:type="uml:Abstraction" xmi:id="_AAJFkBM5EeSW8ufHPtpJcQ" name="Abstraction1" client="_24m5UBM4EeSW8ufHPtpJcQ" supplier="_2v0wwBM4EeSW8ufHPtpJcQ"/>
-    </packagedElement>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Constraint" xmi:id="_7iZH4BM4EeSW8ufHPtpJcQ" name="Constraint1">
-    <specification xmi:type="uml:LiteralString" xmi:id="_7iaWABM4EeSW8ufHPtpJcQ" value=""/>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Package" xmi:id="_D1dKQBM5EeSW8ufHPtpJcQ" name="Package3"/>
-  <packagedElement xmi:type="uml:Model" xmi:id="_EZMwgBM5EeSW8ufHPtpJcQ" clientDependency="_HGQzsBM5EeSW8ufHPtpJcQ" name="Model2">
-    <packagedElement xmi:type="uml:Package" xmi:id="_D6Sm8BM5EeSW8ufHPtpJcQ" clientDependency="_GAmMIBM5EeSW8ufHPtpJcQ" name="Package4">
-      <packagedElement xmi:type="uml:Abstraction" xmi:id="_GAmMIBM5EeSW8ufHPtpJcQ" name="Abstraction1" client="_D6Sm8BM5EeSW8ufHPtpJcQ" supplier="_D1dKQBM5EeSW8ufHPtpJcQ"/>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Dependency" xmi:id="_HGQzsBM5EeSW8ufHPtpJcQ" name="Dependency1" client="_EZMwgBM5EeSW8ufHPtpJcQ" supplier="_D1dKQBM5EeSW8ufHPtpJcQ"/>
-  </packagedElement>
-</uml:Model>
+<?xml version="1.0" encoding="UTF-8"?>

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

+  <ownedComment xmi:type="uml:Comment" xmi:id="_4UdzUBM4EeSW8ufHPtpJcQ" annotatedElement="_24m5UBM4EeSW8ufHPtpJcQ">

+    <body> </body>

+  </ownedComment>

+  <packagedElement xmi:type="uml:Package" xmi:id="_1JXwUBM4EeSW8ufHPtpJcQ" name="Package1">

+    <packagedElement xmi:type="uml:Dependency" xmi:id="_1tPSYBM4EeSW8ufHPtpJcQ" name="Dependency1" client="_1JXwUBM4EeSW8ufHPtpJcQ" supplier="_1YJMIBM4EeSW8ufHPtpJcQ"/>

+  </packagedElement>

+  <packagedElement xmi:type="uml:Package" xmi:id="_1YJMIBM4EeSW8ufHPtpJcQ" name="Package2"/>

+  <packagedElement xmi:type="uml:Model" xmi:id="_2Sq6sBM4EeSW8ufHPtpJcQ" name="Model1">

+    <packagedElement xmi:type="uml:Package" xmi:id="_2v0wwBM4EeSW8ufHPtpJcQ" name="Package1">

+      <packageImport xmi:type="uml:PackageImport" xmi:id="_5NPOYBM4EeSW8ufHPtpJcQ" importedPackage="_1JXwUBM4EeSW8ufHPtpJcQ"/>

+      <packagedElement xmi:type="uml:Dependency" xmi:id="_3nIzQBM4EeSW8ufHPtpJcQ" name="Dependency1" client="_2v0wwBM4EeSW8ufHPtpJcQ" supplier="_1YJMIBM4EeSW8ufHPtpJcQ"/>

+    </packagedElement>

+    <packagedElement xmi:type="uml:Package" xmi:id="_24m5UBM4EeSW8ufHPtpJcQ" name="Package2">

+      <packagedElement xmi:type="uml:Abstraction" xmi:id="_AAJFkBM5EeSW8ufHPtpJcQ" name="Abstraction1" client="_24m5UBM4EeSW8ufHPtpJcQ" supplier="_2v0wwBM4EeSW8ufHPtpJcQ"/>

+    </packagedElement>

+  </packagedElement>

+  <packagedElement xmi:type="uml:Constraint" xmi:id="_7iZH4BM4EeSW8ufHPtpJcQ" name="Constraint1">

+    <specification xmi:type="uml:LiteralString" xmi:id="_7iaWABM4EeSW8ufHPtpJcQ" value=""/>

+  </packagedElement>

+  <packagedElement xmi:type="uml:Package" xmi:id="_D1dKQBM5EeSW8ufHPtpJcQ" name="Package3"/>

+  <packagedElement xmi:type="uml:Model" xmi:id="_EZMwgBM5EeSW8ufHPtpJcQ" name="Model2">

+    <packagedElement xmi:type="uml:Package" xmi:id="_D6Sm8BM5EeSW8ufHPtpJcQ" name="Package4">

+      <packagedElement xmi:type="uml:Abstraction" xmi:id="_GAmMIBM5EeSW8ufHPtpJcQ" name="Abstraction1" client="_D6Sm8BM5EeSW8ufHPtpJcQ" supplier="_D1dKQBM5EeSW8ufHPtpJcQ"/>

+    </packagedElement>

+    <packagedElement xmi:type="uml:Dependency" xmi:id="_HGQzsBM5EeSW8ufHPtpJcQ" name="Dependency1" client="_EZMwgBM5EeSW8ufHPtpJcQ" supplier="_D1dKQBM5EeSW8ufHPtpJcQ"/>

+  </packagedElement>

+</uml:Model>

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/legacy/PackageDiagramLegacyTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/legacy/PackageDiagramLegacyTest.java
index 10245105556..7e7f205b60e 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/legacy/PackageDiagramLegacyTest.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/legacy/PackageDiagramLegacyTest.java
@@ -11,7 +11,7 @@
  * Contributors:
  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
  *  Christian W. Damus - bug 485220
- *  
+ *
  *****************************************************************************/
 package org.eclipse.papyrus.uml.diagram.clazz.test.legacy;
 
@@ -65,7 +65,7 @@ public class PackageDiagramLegacyTest extends AbstractPapyrusTest {
 
 		Diagram diagram1 = getDiagram("Diagram1");
 		Assert.assertEquals("PapyrusUMLClassDiagram", diagram1.getType());
-		pageManager.selectPage(diagram1);
+		pageManager.openPage(diagram1);
 
 		IEditorPart diagram1Editor = editor.getActiveEditor();
 		Assert.assertTrue(diagram1Editor instanceof UmlClassDiagramForMultiEditor);