Merged branch 0.7.X changes r2480:3444 into the trunk

280 files changed, 7806 insertions, 7152 deletions

diff --git a/tests/.project b/tests/.project
deleted file mode 100644
index 53789de17cc..00000000000
--- a/tests/.project
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>tests</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-	</buildSpec>

-	<natures>

-	</natures>

-</projectDescription>

diff --git a/tests/ClassDiagramTestEditor/ClassDiagramEditorTest.di b/tests/ClassDiagramTestEditor/ClassDiagramEditorTest.di
deleted file mode 100644
index 727d64bae37..00000000000
--- a/tests/ClassDiagramTestEditor/ClassDiagramEditorTest.di
+++ /dev/null
@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>

-<di:Diagram 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/di" name="tabfolder.window" type="tabfolder.window">

-  <contained xsi:type="di:Diagram" name="Overview" type="tab.window">

-    <semanticModel xsi:type="di:CoreSemanticModelBridge">

-      <element href="ClassDiagramEditorTest.notation#/0"/>

-    </semanticModel>

-  </contained>

-  <contained xsi:type="di:Diagram" name="tab.window" type="tab.window">

-    <semanticModel xsi:type="di:CoreSemanticModelBridge">

-      <element href="ClassDiagramEditorTest.notation#/1"/>

-    </semanticModel>

-  </contained>

-  <contained xsi:type="di:Diagram" name="tab.window" type="tab.window">

-    <semanticModel xsi:type="di:CoreSemanticModelBridge">

-      <element href="ClassDiagramEditorTest.notation#/2"/>

-    </semanticModel>

-  </contained>

-  <contained xsi:type="di:Diagram" name="tab.window" type="tab.window">

-    <semanticModel xsi:type="di:CoreSemanticModelBridge">

-      <element href="ClassDiagramEditorTest.notation#/3"/>

-    </semanticModel>

-  </contained>

-  <contained xsi:type="di:Diagram" name="tab.window" type="tab.window">

-    <semanticModel xsi:type="di:CoreSemanticModelBridge">

-      <element href="ClassDiagramEditorTest.notation#/4"/>

-    </semanticModel>

-  </contained>

-  <contained xsi:type="di:Diagram" name="tab.window" type="tab.window">

-    <semanticModel xsi:type="di:CoreSemanticModelBridge">

-      <element href="ClassDiagramEditorTest.notation#/5"/>

-    </semanticModel>

-  </contained>

-  <contained xsi:type="di:Diagram" name="tab.window" type="tab.window">

-    <semanticModel xsi:type="di:CoreSemanticModelBridge">

-      <element href="ClassDiagramEditorTest.notation#/6"/>

-    </semanticModel>

-  </contained>

-  <contained xsi:type="di:Diagram" name="tab.window" type="tab.window">

-    <semanticModel xsi:type="di:CoreSemanticModelBridge">

-      <element href="ClassDiagramEditorTest.notation#/7"/>

-    </semanticModel>

-  </contained>

-  <contained xsi:type="di:Diagram" name="tab.window" type="tab.window">

-    <semanticModel xsi:type="di:CoreSemanticModelBridge">

-      <element href="ClassDiagramEditorTest.notation#/8"/>

-    </semanticModel>

-  </contained>

-  <contained xsi:type="di:Diagram" name="tab.window" type="tab.window">

-    <semanticModel xsi:type="di:CoreSemanticModelBridge">

-      <element href="ClassDiagramEditorTest.notation#/9"/>

-    </semanticModel>

-  </contained>

-  <contained xsi:type="di:Diagram" name="tab.window" type="tab.window">

-    <semanticModel xsi:type="di:CoreSemanticModelBridge">

-      <element href="ClassDiagramEditorTest.notation#/10"/>

-    </semanticModel>

-  </contained>

-  <contained xsi:type="di:Diagram" name="tab.window" type="tab.window">

-    <semanticModel xsi:type="di:CoreSemanticModelBridge">

-      <element href="ClassDiagramEditorTest.notation#/11"/>

-    </semanticModel>

-  </contained>

-  <contained xsi:type="di:Diagram" name="tab.window" type="tab.window">

-    <semanticModel xsi:type="di:CoreSemanticModelBridge">

-      <element href="ClassDiagramEditorTest.notation#/12"/>

-    </semanticModel>

-  </contained>

-  <contained xsi:type="di:Diagram" name="tab.window" type="tab.window">

-    <semanticModel xsi:type="di:CoreSemanticModelBridge">

-      <element href="ClassDiagramEditorTest.notation#/13"/>

-    </semanticModel>

-  </contained>

-  <contained xsi:type="di:Diagram" name="tab.window" type="tab.window">

-    <semanticModel xsi:type="di:CoreSemanticModelBridge">

-      <element href="ClassDiagramEditorTest.notation#/14"/>

-    </semanticModel>

-  </contained>

-  <contained xsi:type="di:Diagram" name="tab.window" type="tab.window">

-    <semanticModel xsi:type="di:CoreSemanticModelBridge">

-      <element href="ClassDiagramEditorTest.notation#/15"/>

-    </semanticModel>

-  </contained>

-  <contained xsi:type="di:Diagram" name="tab.window" type="tab.window">

-    <semanticModel xsi:type="di:CoreSemanticModelBridge">

-      <element href="ClassDiagramEditorTest.notation#/16"/>

-    </semanticModel>

-  </contained>

-  <contained xsi:type="di:Diagram" name="tab.window" type="tab.window">

-    <semanticModel xsi:type="di:CoreSemanticModelBridge">

-      <element href="ClassDiagramEditorTest.notation#/17"/>

-    </semanticModel>

-  </contained>

-  <contained xsi:type="di:Diagram" name="tab.window" type="tab.window">

-    <semanticModel xsi:type="di:CoreSemanticModelBridge">

-      <element href="ClassDiagramEditorTest.notation#/18"/>

-    </semanticModel>

-  </contained>

-  <contained xsi:type="di:Diagram" name="tab.window" type="tab.window">

-    <semanticModel xsi:type="di:CoreSemanticModelBridge">

-      <element href="ClassDiagramEditorTest.notation#/19"/>

-    </semanticModel>

-  </contained>

-  <contained xsi:type="di:Diagram" name="tab.window" type="tab.window">

-    <semanticModel xsi:type="di:CoreSemanticModelBridge">

-      <element href="ClassDiagramEditorTest.notation#/20"/>

-    </semanticModel>

-  </contained>

-  <contained xsi:type="di:Diagram" name="tab.window" type="tab.window">

-    <semanticModel xsi:type="di:CoreSemanticModelBridge">

-      <element href="ClassDiagramEditorTest.notation#/21"/>

-    </semanticModel>

-  </contained>

-  <contained xsi:type="di:Diagram" name="tab.window" type="tab.window">

-    <semanticModel xsi:type="di:CoreSemanticModelBridge">

-      <element href="ClassDiagramEditorTest.notation#/22"/>

-    </semanticModel>

-  </contained>

-  <contained xsi:type="di:Diagram" name="tab.window" type="tab.window">

-    <semanticModel xsi:type="di:CoreSemanticModelBridge">

-      <element href="ClassDiagramEditorTest.notation#/23"/>

-    </semanticModel>

-  </contained>

-  <contained xsi:type="di:Diagram" name="tab.window" type="tab.window">

-    <semanticModel xsi:type="di:CoreSemanticModelBridge">

-      <element href="ClassDiagramEditorTest.notation#/24"/>

-    </semanticModel>

-  </contained>

-  <contained xsi:type="di:Diagram" name="tab.window" type="tab.window">

-    <semanticModel xsi:type="di:CoreSemanticModelBridge">

-      <element href="ClassDiagramEditorTest.notation#/25"/>

-    </semanticModel>

-  </contained>

-  <contained xsi:type="di:Diagram" name="tab.window" type="tab.window">

-    <semanticModel xsi:type="di:CoreSemanticModelBridge">

-      <element href="ClassDiagramEditorTest.notation#/26"/>

-    </semanticModel>

-  </contained>

-  <contained xsi:type="di:Diagram" name="tab.window" type="tab.window">

-    <semanticModel xsi:type="di:CoreSemanticModelBridge">

-      <element href="ClassDiagramEditorTest.notation#/27"/>

-    </semanticModel>

-  </contained>

-  <contained xsi:type="di:Diagram" name="tab.window" type="tab.window">

-    <semanticModel xsi:type="di:CoreSemanticModelBridge">

-      <element href="ClassDiagramEditorTest.notation#/28"/>

-    </semanticModel>

-  </contained>

-  <contained xsi:type="di:Diagram" name="tab.window" type="tab.window">

-    <semanticModel xsi:type="di:CoreSemanticModelBridge">

-      <element href="ClassDiagramEditorTest.notation#/29"/>

-    </semanticModel>

-  </contained>

-  <contained xsi:type="di:Diagram" name="tab.window" type="tab.window">

-    <semanticModel xsi:type="di:CoreSemanticModelBridge">

-      <element href="ClassDiagramEditorTest.notation#/30"/>

-    </semanticModel>

-  </contained>

-  <contained xsi:type="di:Diagram" name="tab.window" type="tab.window">

-    <semanticModel xsi:type="di:CoreSemanticModelBridge">

-      <element href="ClassDiagramEditorTest.notation#/31"/>

-    </semanticModel>

-  </contained>

-</di:Diagram>

diff --git a/tests/ClassDiagramTestEditor/ClassDiagramEditorTest.notation b/tests/ClassDiagramTestEditor/ClassDiagramEditorTest.notation
deleted file mode 100644
index 900edc09028..00000000000
--- a/tests/ClassDiagramTestEditor/ClassDiagramEditorTest.notation
+++ /dev/null
@@ -1,894 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>

-<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.1/notation">

-  <notation:Diagram type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">

-    <eAnnotations source="org.eclipse.papyrus.diagram.common.Belongs_To_This_Diagram">

-      <references href="ClassDiagramEditorTest.uml#_yYZpwAisEd6X-5NwKztg_w"/>

-    </eAnnotations>

-    <children type="2012">

-      <children type="5038"/>

-      <styles xsi:type="notation:ShapeStyle" fontHeight="8" fillColor="0" lineColor="0"/>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="ClassDiagramEditorTest.uml#_hyN6oAisEd6X-5NwKztg_w"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="92" y="62" width="476" height="68"/>

-    </children>

-    <styles xsi:type="notation:DiagramStyle"/>

-    <element href="ClassDiagramEditorTest.uml#_RzX4UAisEd6_MpEAxXq7Hg"/>

-  </notation:Diagram>

-  <notation:Diagram type="PapyrusUMLClassDiagram" name="CreationDeletionTest" measurementUnit="Pixel">

-    <children type="2012">

-      <children type="5038"/>

-      <styles xsi:type="notation:ShapeStyle" fontHeight="8" fillColor="0" lineColor="0"/>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="ClassDiagramEditorTest.uml#_IPpp4AitEd6X-5NwKztg_w"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="29" y="10" width="240" height="77"/>

-    </children>

-    <styles xsi:type="notation:DiagramStyle"/>

-    <element href="ClassDiagramEditorTest.uml#_yYZpwAisEd6X-5NwKztg_w"/>

-  </notation:Diagram>

-  <notation:Diagram type="PapyrusUMLClassDiagram" name="MovementResizingTest" measurementUnit="Pixel">

-    <children type="2012">

-      <children type="5038"/>

-      <styles xsi:type="notation:ShapeStyle" fontHeight="8" fillColor="0" lineColor="0"/>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="ClassDiagramEditorTest.uml#_LwSEwAi9Ed67XriYtPXATQ"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="7" y="17" width="461" height="39"/>

-    </children>

-    <children type="2008">

-      <children type="5028"/>

-      <children type="5029"/>

-      <children type="5030"/>

-      <children type="7017">

-        <styles xsi:type="notation:DrawerStyle"/>

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children type="7018">

-        <styles xsi:type="notation:DrawerStyle"/>

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children type="7019">

-        <styles xsi:type="notation:DrawerStyle"/>

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:ShapeStyle" fontHeight="28" fillColor="0" lineColor="0"/>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="ClassDiagramEditorTest.uml#_Z3mkwAi9Ed67XriYtPXATQ"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="248" y="204" width="262" height="98"/>

-    </children>

-    <styles xsi:type="notation:DiagramStyle"/>

-    <element href="ClassDiagramEditorTest.uml#_yYZpwAisEd6X-5NwKztg_w"/>

-  </notation:Diagram>

-  <notation:Diagram type="PapyrusUMLClassDiagram" name="MovementInAcontainerTest" measurementUnit="Pixel">

-    <eAnnotations source="org.eclipse.papyrus.diagram.common.Belongs_To_This_Diagram">

-      <references href="ClassDiagramEditorTest.uml#_Z3mkwAi9Ed67XriYtPXATQ"/>

-    </eAnnotations>

-    <children type="2012">

-      <children type="5038"/>

-      <styles xsi:type="notation:ShapeStyle" fontHeight="8" fillColor="0" lineColor="0"/>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="ClassDiagramEditorTest.uml#_shM9IAi9Ed67XriYtPXATQ"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="44" y="29" width="344" height="42"/>

-    </children>

-    <children type="2007">

-      <children type="5025"/>

-      <children type="5026"/>

-      <children type="5027"/>

-      <children type="7016">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:ShapeStyle" fontHeight="8" fillColor="0" lineColor="0"/>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="ClassDiagramEditorTest.uml#_0c5oYAi9Ed67XriYtPXATQ"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="195" y="98" width="364" height="144"/>

-    </children>

-    <children type="2008">

-      <children type="5028"/>

-      <children type="5029"/>

-      <children type="5030"/>

-      <children type="7017">

-        <styles xsi:type="notation:DrawerStyle"/>

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children type="7018">

-        <styles xsi:type="notation:DrawerStyle"/>

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children type="7019">

-        <styles xsi:type="notation:DrawerStyle"/>

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:ShapeStyle" fontHeight="28" fillColor="0" lineColor="0"/>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="ClassDiagramEditorTest.uml#_Z3mkwAi9Ed67XriYtPXATQ"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="214" y="316" width="345" height="113"/>

-    </children>

-    <styles xsi:type="notation:DiagramStyle"/>

-    <element href="ClassDiagramEditorTest.uml#_yYZpwAisEd6X-5NwKztg_w"/>

-  </notation:Diagram>

-  <notation:Diagram type="PapyrusUMLClassDiagram" name="ElementDropTest" measurementUnit="Pixel">

-    <eAnnotations source="org.eclipse.papyrus.diagram.common.Belongs_To_This_Diagram">

-      <references href="ClassDiagramEditorTest.uml#_Z3mkwAi9Ed67XriYtPXATQ"/>

-    </eAnnotations>

-    <children type="2012">

-      <children type="5038"/>

-      <styles xsi:type="notation:ShapeStyle" fontHeight="8" fillColor="0" lineColor="0"/>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="ClassDiagramEditorTest.uml#_IVCQcAi-Ed67XriYtPXATQ"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="75" y="23" width="515" height="35"/>

-    </children>

-    <styles xsi:type="notation:DiagramStyle"/>

-    <element href="ClassDiagramEditorTest.uml#_yYZpwAisEd6X-5NwKztg_w"/>

-  </notation:Diagram>

-  <notation:Diagram type="PapyrusUMLClassDiagram" name="CreationDeletionTest" measurementUnit="Pixel">

-    <eAnnotations source="org.eclipse.papyrus.diagram.common.Belongs_To_This_Diagram">

-      <references href="ClassDiagramEditorTest.uml#_nXz14AjHEd6G3Oli81IDTQ"/>

-    </eAnnotations>

-    <children type="2012">

-      <children type="5038"/>

-      <styles xsi:type="notation:ShapeStyle" fontHeight="8" fillColor="0" lineColor="0"/>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="ClassDiagramEditorTest.uml#_nXz14AjHEd6G3Oli81IDTQ"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="85" y="44" width="482"/>

-    </children>

-    <styles xsi:type="notation:DiagramStyle"/>

-    <element href="ClassDiagramEditorTest.uml#_gHVR4AjHEd6G3Oli81IDTQ"/>

-  </notation:Diagram>

-  <notation:Diagram type="PapyrusUMLClassDiagram" name="ElementDropTest" measurementUnit="Pixel">

-    <eAnnotations source="org.eclipse.papyrus.diagram.common.Belongs_To_This_Diagram">

-      <references href="ClassDiagramEditorTest.uml#_nXz14gjHEd6G3Oli81IDTQ"/>

-    </eAnnotations>

-    <children type="2012">

-      <children type="5038"/>

-      <styles xsi:type="notation:ShapeStyle" fontHeight="8" fillColor="0" lineColor="0"/>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="ClassDiagramEditorTest.uml#_nXz14gjHEd6G3Oli81IDTQ"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="56" y="27"/>

-    </children>

-    <styles xsi:type="notation:DiagramStyle"/>

-    <element href="ClassDiagramEditorTest.uml#_gHVR4AjHEd6G3Oli81IDTQ"/>

-  </notation:Diagram>

-  <notation:Diagram type="PapyrusUMLClassDiagram" name="MovementInAContainer" measurementUnit="Pixel">

-    <eAnnotations source="org.eclipse.papyrus.diagram.common.Belongs_To_This_Diagram">

-      <references href="ClassDiagramEditorTest.uml#_nXz14wjHEd6G3Oli81IDTQ"/>

-    </eAnnotations>

-    <children type="2007">

-      <children type="5025"/>

-      <children type="5026"/>

-      <children type="5027"/>

-      <children type="7016">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:ShapeStyle" fontHeight="8" fillColor="13420443" lineColor="0"/>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="ClassDiagramEditorTest.uml#_UKsZYAjKEd6s1Ji8suGDvw"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="140" y="254" width="399" height="212"/>

-    </children>

-    <children type="2012">

-      <children type="5038"/>

-      <styles xsi:type="notation:ShapeStyle" fontHeight="10" bold="true" italic="true" lineColor="0"/>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="ClassDiagramEditorTest.uml#_nXz14wjHEd6G3Oli81IDTQ"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="30" y="17" width="389" height="118"/>

-    </children>

-    <children type="2012">

-      <children type="5038"/>

-      <styles xsi:type="notation:ShapeStyle" fontHeight="8" fillColor="0" lineColor="0"/>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="ClassDiagramEditorTest.uml#_lYQmsAjMEd6s1Ji8suGDvw"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="140" y="164" width="286" height="44"/>

-    </children>

-    <styles xsi:type="notation:DiagramStyle"/>

-    <element href="ClassDiagramEditorTest.uml#_gHVR4AjHEd6G3Oli81IDTQ"/>

-  </notation:Diagram>

-  <notation:Diagram type="PapyrusUMLClassDiagram" name="CreationDeletionTest" measurementUnit="Pixel">

-    <eAnnotations source="org.eclipse.papyrus.diagram.common.Belongs_To_This_Diagram">

-      <references href="ClassDiagramEditorTest.uml#_nFXIEQjUEd6s1Ji8suGDvw"/>

-    </eAnnotations>

-    <children type="2012">

-      <children type="5038"/>

-      <styles xsi:type="notation:ShapeStyle" fontHeight="8" fillColor="0" lineColor="0"/>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="ClassDiagramEditorTest.uml#_nFXIEQjUEd6s1Ji8suGDvw"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="207" y="51"/>

-    </children>

-    <styles xsi:type="notation:DiagramStyle"/>

-    <element href="ClassDiagramEditorTest.uml#_nFXIEAjUEd6s1Ji8suGDvw"/>

-  </notation:Diagram>

-  <notation:Diagram type="PapyrusUMLClassDiagram" name="ElementDrop" measurementUnit="Pixel">

-    <eAnnotations source="org.eclipse.papyrus.diagram.common.Belongs_To_This_Diagram">

-      <references href="ClassDiagramEditorTest.uml#_nFXIFAjUEd6s1Ji8suGDvw"/>

-      <references href="ClassDiagramEditorTest.uml#_rkCLcAjXEd6s1Ji8suGDvw"/>

-    </eAnnotations>

-    <children type="2012">

-      <children type="5038"/>

-      <styles xsi:type="notation:ShapeStyle" fontHeight="8" fillColor="0" lineColor="0"/>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="ClassDiagramEditorTest.uml#_nFXIFAjUEd6s1Ji8suGDvw"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="35" y="15"/>

-    </children>

-    <styles xsi:type="notation:DiagramStyle"/>

-    <element href="ClassDiagramEditorTest.uml#_nFXIEAjUEd6s1Ji8suGDvw"/>

-  </notation:Diagram>

-  <notation:Diagram type="PapyrusUMLClassDiagram" name="MovmentInAContainer" measurementUnit="Pixel">

-    <eAnnotations source="org.eclipse.papyrus.diagram.common.Belongs_To_This_Diagram">

-      <references href="ClassDiagramEditorTest.uml#_nFXIEwjUEd6s1Ji8suGDvw"/>

-      <references href="ClassDiagramEditorTest.uml#_nFXIFgjUEd6s1Ji8suGDvw"/>

-      <references href="ClassDiagramEditorTest.uml#_rkCLcAjXEd6s1Ji8suGDvw"/>

-    </eAnnotations>

-    <children type="2012">

-      <children type="5038"/>

-      <styles xsi:type="notation:ShapeStyle" fontHeight="8" fillColor="0" lineColor="0"/>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="ClassDiagramEditorTest.uml#_nFXIEwjUEd6s1Ji8suGDvw"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="32" y="29"/>

-    </children>

-    <children type="2007">

-      <children type="5025"/>

-      <children type="5026"/>

-      <children type="5027"/>

-      <children type="7016">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:ShapeStyle" fontHeight="8" fillColor="0" lineColor="0"/>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="ClassDiagramEditorTest.uml#_nFXIFgjUEd6s1Ji8suGDvw"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="96" y="225" width="414" height="242"/>

-    </children>

-    <children type="2002">

-      <children type="5004"/>

-      <children type="5005"/>

-      <children type="5006"/>

-      <children type="7002">

-        <styles xsi:type="notation:DrawerStyle"/>

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children type="7003">

-        <styles xsi:type="notation:DrawerStyle"/>

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children type="7004">

-        <styles xsi:type="notation:DrawerStyle"/>

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:ShapeStyle" fontHeight="8" fillColor="0" lineColor="0"/>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="ClassDiagramEditorTest.uml#_rkCLcAjXEd6s1Ji8suGDvw"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="95" y="113"/>

-    </children>

-    <styles xsi:type="notation:DiagramStyle"/>

-    <element href="ClassDiagramEditorTest.uml#_nFXIEAjUEd6s1Ji8suGDvw"/>

-  </notation:Diagram>

-  <notation:Diagram type="PapyrusUMLClassDiagram" name="MovementResizing" measurementUnit="Pixel">

-    <eAnnotations source="org.eclipse.papyrus.diagram.common.Belongs_To_This_Diagram">

-      <references href="ClassDiagramEditorTest.uml#_nFXIEwjUEd6s1Ji8suGDvw"/>

-      <references href="ClassDiagramEditorTest.uml#_nFXIEgjUEd6s1Ji8suGDvw"/>

-      <references href="ClassDiagramEditorTest.uml#_rkCLcAjXEd6s1Ji8suGDvw"/>

-    </eAnnotations>

-    <children type="2012">

-      <children type="5038"/>

-      <styles xsi:type="notation:ShapeStyle" fontHeight="8" fillColor="0" lineColor="0"/>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="ClassDiagramEditorTest.uml#_nFXIEgjUEd6s1Ji8suGDvw"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="66" y="31"/>

-    </children>

-    <children type="2002">

-      <children type="5004"/>

-      <children type="5005"/>

-      <children type="5006"/>

-      <children type="7002">

-        <styles xsi:type="notation:DrawerStyle"/>

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children type="7003">

-        <styles xsi:type="notation:DrawerStyle"/>

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children type="7004">

-        <styles xsi:type="notation:DrawerStyle"/>

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:ShapeStyle" fontHeight="8" fillColor="0" lineColor="0"/>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="ClassDiagramEditorTest.uml#_rkCLcAjXEd6s1Ji8suGDvw"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="175" y="134" width="345" height="117"/>

-    </children>

-    <styles xsi:type="notation:DiagramStyle"/>

-    <element href="ClassDiagramEditorTest.uml#_nFXIEAjUEd6s1Ji8suGDvw"/>

-  </notation:Diagram>

-  <notation:Diagram type="PapyrusUMLClassDiagram" name="CreationDeletionTest" measurementUnit="Pixel">

-    <eAnnotations source="org.eclipse.papyrus.diagram.common.Belongs_To_This_Diagram">

-      <references href="ClassDiagramEditorTest.uml#_USWtUQjaEd6ftJNsxnHJwA"/>

-    </eAnnotations>

-    <children type="2012">

-      <children type="5038"/>

-      <styles xsi:type="notation:ShapeStyle" fontHeight="8" fillColor="0" lineColor="0"/>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="ClassDiagramEditorTest.uml#_USWtUQjaEd6ftJNsxnHJwA"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="239" y="65"/>

-    </children>

-    <styles xsi:type="notation:DiagramStyle"/>

-    <element href="ClassDiagramEditorTest.uml#_USWtUAjaEd6ftJNsxnHJwA"/>

-  </notation:Diagram>

-  <notation:Diagram type="PapyrusUMLClassDiagram" name="ElementDropTest" measurementUnit="Pixel">

-    <eAnnotations source="org.eclipse.papyrus.diagram.common.Belongs_To_This_Diagram">

-      <references href="ClassDiagramEditorTest.uml#_USWtVAjaEd6ftJNsxnHJwA"/>

-      <references href="ClassDiagramEditorTest.uml#_uZbj4AjaEd6ftJNsxnHJwA"/>

-    </eAnnotations>

-    <children type="2012">

-      <children type="5038"/>

-      <styles xsi:type="notation:ShapeStyle" fontHeight="8" fillColor="0" lineColor="0"/>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="ClassDiagramEditorTest.uml#_USWtVAjaEd6ftJNsxnHJwA"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="54" y="23"/>

-    </children>

-    <styles xsi:type="notation:DiagramStyle"/>

-    <element href="ClassDiagramEditorTest.uml#_USWtUAjaEd6ftJNsxnHJwA"/>

-  </notation:Diagram>

-  <notation:Diagram type="PapyrusUMLClassDiagram" name="MovementResizingTest" measurementUnit="Pixel">

-    <eAnnotations source="org.eclipse.papyrus.diagram.common.Belongs_To_This_Diagram">

-      <references href="ClassDiagramEditorTest.uml#_USWtUgjaEd6ftJNsxnHJwA"/>

-      <references href="ClassDiagramEditorTest.uml#_uZbj4AjaEd6ftJNsxnHJwA"/>

-    </eAnnotations>

-    <children type="2012">

-      <children type="5038"/>

-      <styles xsi:type="notation:ShapeStyle" fontHeight="8" fillColor="0" lineColor="0"/>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="ClassDiagramEditorTest.uml#_USWtUgjaEd6ftJNsxnHJwA"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="65" y="23"/>

-    </children>

-    <children type="2011">

-      <children type="5037"/>

-      <styles xsi:type="notation:ShapeStyle" fontHeight="8" fillColor="0" lineColor="0"/>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="ClassDiagramEditorTest.uml#_uZbj4AjaEd6ftJNsxnHJwA"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="126" y="158" width="179" height="38"/>

-    </children>

-    <styles xsi:type="notation:DiagramStyle"/>

-    <element href="ClassDiagramEditorTest.uml#_USWtUAjaEd6ftJNsxnHJwA"/>

-  </notation:Diagram>

-  <notation:Diagram type="PapyrusUMLClassDiagram" name="MovementIntoContainer" measurementUnit="Pixel">

-    <eAnnotations source="org.eclipse.papyrus.diagram.common.Belongs_To_This_Diagram">

-      <references href="ClassDiagramEditorTest.uml#_USWtUwjaEd6ftJNsxnHJwA"/>

-      <references href="ClassDiagramEditorTest.uml#_USWtVQjaEd6ftJNsxnHJwA"/>

-      <references href="ClassDiagramEditorTest.uml#_uZbj4AjaEd6ftJNsxnHJwA"/>

-    </eAnnotations>

-    <children type="2012">

-      <children type="5038"/>

-      <styles xsi:type="notation:ShapeStyle" fontHeight="8" fillColor="0" lineColor="0"/>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="ClassDiagramEditorTest.uml#_USWtUwjaEd6ftJNsxnHJwA"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="58" y="17"/>

-    </children>

-    <children type="2007">

-      <children type="5025"/>

-      <children type="5026"/>

-      <children type="5027"/>

-      <children type="7016">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:ShapeStyle" fontHeight="8" fillColor="0" lineColor="0"/>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="ClassDiagramEditorTest.uml#_USWtVQjaEd6ftJNsxnHJwA"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="271" y="184" width="366" height="260"/>

-    </children>

-    <children type="2011">

-      <children type="5037"/>

-      <styles xsi:type="notation:ShapeStyle" fontHeight="8" fillColor="0" lineColor="0"/>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="ClassDiagramEditorTest.uml#_uZbj4AjaEd6ftJNsxnHJwA"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="76" y="145"/>

-    </children>

-    <styles xsi:type="notation:DiagramStyle"/>

-    <element href="ClassDiagramEditorTest.uml#_USWtUAjaEd6ftJNsxnHJwA"/>

-  </notation:Diagram>

-  <notation:Diagram type="PapyrusUMLClassDiagram" name="CreationDeletionTest" measurementUnit="Pixel">

-    <eAnnotations source="org.eclipse.papyrus.diagram.common.Belongs_To_This_Diagram">

-      <references href="ClassDiagramEditorTest.uml#_eY9UcQjbEd6ftJNsxnHJwA"/>

-    </eAnnotations>

-    <children type="2012">

-      <children type="5038"/>

-      <styles xsi:type="notation:ShapeStyle" fontHeight="8" fillColor="0" lineColor="0"/>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="ClassDiagramEditorTest.uml#_eY9UcQjbEd6ftJNsxnHJwA"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="86" y="8"/>

-    </children>

-    <styles xsi:type="notation:DiagramStyle"/>

-    <element href="ClassDiagramEditorTest.uml#_eY9UcAjbEd6ftJNsxnHJwA"/>

-  </notation:Diagram>

-  <notation:Diagram type="PapyrusUMLClassDiagram" name="MovementResizingTest" measurementUnit="Pixel">

-    <eAnnotations source="org.eclipse.papyrus.diagram.common.Belongs_To_This_Diagram">

-      <references href="ClassDiagramEditorTest.uml#_eY9UcgjbEd6ftJNsxnHJwA"/>

-      <references href="ClassDiagramEditorTest.uml#_l6Rw0AjbEd6ftJNsxnHJwA"/>

-    </eAnnotations>

-    <children type="2012">

-      <children type="5038"/>

-      <styles xsi:type="notation:ShapeStyle" fontHeight="8" fillColor="0" lineColor="0"/>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="ClassDiagramEditorTest.uml#_eY9UcgjbEd6ftJNsxnHJwA"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="98" y="19"/>

-    </children>

-    <children type="2010">

-      <children type="5034"/>

-      <children type="5035"/>

-      <children type="5036"/>

-      <children type="7020">

-        <styles xsi:type="notation:DrawerStyle"/>

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children type="7021">

-        <styles xsi:type="notation:DrawerStyle"/>

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:ShapeStyle" fontHeight="8" fillColor="0" lineColor="0"/>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="ClassDiagramEditorTest.uml#_l6Rw0AjbEd6ftJNsxnHJwA"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="159" y="199" width="335" height="89"/>

-    </children>

-    <styles xsi:type="notation:DiagramStyle"/>

-    <element href="ClassDiagramEditorTest.uml#_eY9UcAjbEd6ftJNsxnHJwA"/>

-  </notation:Diagram>

-  <notation:Diagram type="PapyrusUMLClassDiagram" name="MovementIntoDiagramTest" measurementUnit="Pixel">

-    <eAnnotations source="org.eclipse.papyrus.diagram.common.Belongs_To_This_Diagram">

-      <references href="ClassDiagramEditorTest.uml#_eY9UcwjbEd6ftJNsxnHJwA"/>

-      <references href="ClassDiagramEditorTest.uml#_eY9UdQjbEd6ftJNsxnHJwA"/>

-      <references href="ClassDiagramEditorTest.uml#_l6Rw0AjbEd6ftJNsxnHJwA"/>

-    </eAnnotations>

-    <children type="2012">

-      <children type="5038"/>

-      <styles xsi:type="notation:ShapeStyle" fontHeight="8" fillColor="0" lineColor="0"/>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="ClassDiagramEditorTest.uml#_eY9UcwjbEd6ftJNsxnHJwA"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="123" y="27"/>

-    </children>

-    <children type="2007">

-      <children type="5025"/>

-      <children type="5026"/>

-      <children type="5027"/>

-      <children type="7016">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:ShapeStyle" fontHeight="8" fillColor="0" lineColor="0"/>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="ClassDiagramEditorTest.uml#_eY9UdQjbEd6ftJNsxnHJwA"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="102" y="293" width="404" height="148"/>

-    </children>

-    <children type="2010">

-      <children type="5034"/>

-      <children type="5035"/>

-      <children type="5036"/>

-      <children type="7020">

-        <styles xsi:type="notation:DrawerStyle"/>

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children type="7021">

-        <styles xsi:type="notation:DrawerStyle"/>

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:ShapeStyle" fontHeight="8" fillColor="0" lineColor="0"/>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="ClassDiagramEditorTest.uml#_l6Rw0AjbEd6ftJNsxnHJwA"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="67" y="145"/>

-    </children>

-    <styles xsi:type="notation:DiagramStyle"/>

-    <element href="ClassDiagramEditorTest.uml#_eY9UcAjbEd6ftJNsxnHJwA"/>

-  </notation:Diagram>

-  <notation:Diagram type="PapyrusUMLClassDiagram" name="DropTest" measurementUnit="Pixel">

-    <eAnnotations source="org.eclipse.papyrus.diagram.common.Belongs_To_This_Diagram">

-      <references href="ClassDiagramEditorTest.uml#_eY9UdAjbEd6ftJNsxnHJwA"/>

-      <references href="ClassDiagramEditorTest.uml#_l6Rw0AjbEd6ftJNsxnHJwA"/>

-    </eAnnotations>

-    <children type="2012">

-      <children type="5038"/>

-      <styles xsi:type="notation:ShapeStyle" fontHeight="8" fillColor="0" lineColor="0"/>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="ClassDiagramEditorTest.uml#_eY9UdAjbEd6ftJNsxnHJwA"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="40" y="24"/>

-    </children>

-    <styles xsi:type="notation:DiagramStyle"/>

-    <element href="ClassDiagramEditorTest.uml#_eY9UcAjbEd6ftJNsxnHJwA"/>

-  </notation:Diagram>

-  <notation:Diagram type="PapyrusUMLClassDiagram" name="CreationDeletionTest" measurementUnit="Pixel">

-    <eAnnotations source="org.eclipse.papyrus.diagram.common.Belongs_To_This_Diagram">

-      <references href="ClassDiagramEditorTest.uml#_xrkYIQjcEd6ftJNsxnHJwA"/>

-    </eAnnotations>

-    <children type="2012">

-      <children type="5038"/>

-      <styles xsi:type="notation:ShapeStyle" fontHeight="8" fillColor="0" lineColor="0"/>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="ClassDiagramEditorTest.uml#_xrkYIQjcEd6ftJNsxnHJwA"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="131" y="47"/>

-    </children>

-    <styles xsi:type="notation:DiagramStyle"/>

-    <element href="ClassDiagramEditorTest.uml#_xrkYIAjcEd6ftJNsxnHJwA"/>

-  </notation:Diagram>

-  <notation:Diagram type="PapyrusUMLClassDiagram" name="MovementResizingTest" measurementUnit="Pixel">

-    <eAnnotations source="org.eclipse.papyrus.diagram.common.Belongs_To_This_Diagram">

-      <references href="ClassDiagramEditorTest.uml#_xrkYIgjcEd6ftJNsxnHJwA"/>

-    </eAnnotations>

-    <children type="2012">

-      <children type="5038"/>

-      <styles xsi:type="notation:ShapeStyle" fontHeight="8" fillColor="0" lineColor="0"/>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="ClassDiagramEditorTest.uml#_xrkYIgjcEd6ftJNsxnHJwA"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="79" y="25"/>

-    </children>

-    <children type="2006">

-      <children type="5022"/>

-      <children type="5023"/>

-      <children type="5024"/>

-      <children type="7015">

-        <styles xsi:type="notation:DrawerStyle"/>

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:ShapeStyle" fontHeight="8" fillColor="0" lineColor="0"/>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="ClassDiagramEditorTest.uml#_GtLwwAjdEd6ftJNsxnHJwA"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="45" y="133" width="336" height="90"/>

-    </children>

-    <styles xsi:type="notation:DiagramStyle"/>

-    <element href="ClassDiagramEditorTest.uml#_xrkYIAjcEd6ftJNsxnHJwA"/>

-  </notation:Diagram>

-  <notation:Diagram type="PapyrusUMLClassDiagram" name="MovementIntoAContainer" measurementUnit="Pixel">

-    <eAnnotations source="org.eclipse.papyrus.diagram.common.Belongs_To_This_Diagram">

-      <references href="ClassDiagramEditorTest.uml#_xrkYIwjcEd6ftJNsxnHJwA"/>

-      <references href="ClassDiagramEditorTest.uml#_xrkYJQjcEd6ftJNsxnHJwA"/>

-      <references href="ClassDiagramEditorTest.uml#_GtLwwAjdEd6ftJNsxnHJwA"/>

-    </eAnnotations>

-    <children type="2012">

-      <children type="5038"/>

-      <styles xsi:type="notation:ShapeStyle" fontHeight="8" fillColor="0" lineColor="0"/>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="ClassDiagramEditorTest.uml#_xrkYIwjcEd6ftJNsxnHJwA"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="113" y="21"/>

-    </children>

-    <children type="2007">

-      <children type="5025"/>

-      <children type="5026"/>

-      <children type="5027"/>

-      <children type="7016">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:ShapeStyle" fontHeight="8" fillColor="0" lineColor="0"/>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="ClassDiagramEditorTest.uml#_xrkYJQjcEd6ftJNsxnHJwA"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="71" y="283" width="563" height="151"/>

-    </children>

-    <children type="2006">

-      <children type="5022"/>

-      <children type="5023"/>

-      <children type="5024"/>

-      <children type="7015">

-        <styles xsi:type="notation:DrawerStyle"/>

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:ShapeStyle" fontHeight="8" fillColor="0" lineColor="0"/>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="ClassDiagramEditorTest.uml#_GtLwwAjdEd6ftJNsxnHJwA"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="171" y="139"/>

-    </children>

-    <styles xsi:type="notation:DiagramStyle"/>

-    <element href="ClassDiagramEditorTest.uml#_xrkYIAjcEd6ftJNsxnHJwA"/>

-  </notation:Diagram>

-  <notation:Diagram type="PapyrusUMLClassDiagram" name="DropTest" measurementUnit="Pixel">

-    <eAnnotations source="org.eclipse.papyrus.diagram.common.Belongs_To_This_Diagram">

-      <references href="ClassDiagramEditorTest.uml#_xrkYJAjcEd6ftJNsxnHJwA"/>

-      <references href="ClassDiagramEditorTest.uml#_GtLwwAjdEd6ftJNsxnHJwA"/>

-    </eAnnotations>

-    <children type="2012">

-      <children type="5038"/>

-      <styles xsi:type="notation:ShapeStyle" fontHeight="8" fillColor="0" lineColor="0"/>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="ClassDiagramEditorTest.uml#_xrkYJAjcEd6ftJNsxnHJwA"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="179" y="39"/>

-    </children>

-    <styles xsi:type="notation:DiagramStyle"/>

-    <element href="ClassDiagramEditorTest.uml#_xrkYIAjcEd6ftJNsxnHJwA"/>

-  </notation:Diagram>

-  <notation:Diagram type="PapyrusUMLClassDiagram" name="CreationDeletionTest" measurementUnit="Pixel">

-    <eAnnotations source="org.eclipse.papyrus.diagram.common.Belongs_To_This_Diagram">

-      <references href="ClassDiagramEditorTest.uml#_uL595gjdEd6M04pHOkSelQ"/>

-      <references href="ClassDiagramEditorTest.uml#_uL594QjdEd6M04pHOkSelQ"/>

-    </eAnnotations>

-    <children type="2006">

-      <children type="5022"/>

-      <children type="5023"/>

-      <children type="5024"/>

-      <children type="7015">

-        <children type="3017">

-          <element href="ClassDiagramEditorTest.uml#_GecUsAjeEd6M04pHOkSelQ"/>

-          <layoutConstraint xsi:type="notation:Location"/>

-        </children>

-        <styles xsi:type="notation:DrawerStyle"/>

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:ShapeStyle" fontHeight="8" fillColor="0" lineColor="0"/>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="ClassDiagramEditorTest.uml#_uL595gjdEd6M04pHOkSelQ"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="101" y="172" height="159"/>

-    </children>

-    <children type="2012">

-      <children type="5038"/>

-      <styles xsi:type="notation:ShapeStyle" fontHeight="8" fillColor="0" lineColor="0"/>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="ClassDiagramEditorTest.uml#_uL594QjdEd6M04pHOkSelQ"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="72" y="21"/>

-    </children>

-    <styles xsi:type="notation:DiagramStyle"/>

-    <element href="ClassDiagramEditorTest.uml#_uL594AjdEd6M04pHOkSelQ"/>

-  </notation:Diagram>

-  <notation:Diagram type="PapyrusUMLClassDiagram" name="MovementTest" measurementUnit="Pixel">

-    <eAnnotations source="org.eclipse.papyrus.diagram.common.Belongs_To_This_Diagram">

-      <references href="ClassDiagramEditorTest.uml#_uL594gjdEd6M04pHOkSelQ"/>

-    </eAnnotations>

-    <children type="2012">

-      <children type="5038"/>

-      <styles xsi:type="notation:ShapeStyle" fontHeight="8" fillColor="0" lineColor="0"/>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="ClassDiagramEditorTest.uml#_uL594gjdEd6M04pHOkSelQ"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="41" y="35"/>

-    </children>

-    <children type="2006">

-      <children type="5022"/>

-      <children type="5023"/>

-      <children type="5024"/>

-      <children type="7015">

-        <children type="3017">

-          <element href="ClassDiagramEditorTest.uml#_XBvdAAjgEd6M04pHOkSelQ"/>

-          <layoutConstraint xsi:type="notation:Location"/>

-        </children>

-        <children type="3017">

-          <element href="ClassDiagramEditorTest.uml#_XX89kAjgEd6M04pHOkSelQ"/>

-          <layoutConstraint xsi:type="notation:Location"/>

-        </children>

-        <children type="3017">

-          <element href="ClassDiagramEditorTest.uml#_XvWJ4AjgEd6M04pHOkSelQ"/>

-          <layoutConstraint xsi:type="notation:Location"/>

-        </children>

-        <children type="3017">

-          <element href="ClassDiagramEditorTest.uml#_YC3i0AjgEd6M04pHOkSelQ"/>

-          <layoutConstraint xsi:type="notation:Location"/>

-        </children>

-        <children type="3017">

-          <element href="ClassDiagramEditorTest.uml#_YVye0AjgEd6M04pHOkSelQ"/>

-          <layoutConstraint xsi:type="notation:Location"/>

-        </children>

-        <children type="3017">

-          <element href="ClassDiagramEditorTest.uml#_YvbG0AjgEd6M04pHOkSelQ"/>

-          <layoutConstraint xsi:type="notation:Location"/>

-        </children>

-        <children type="3017">

-          <element href="ClassDiagramEditorTest.uml#_ZCo9wAjgEd6M04pHOkSelQ"/>

-          <layoutConstraint xsi:type="notation:Location"/>

-        </children>

-        <children type="3017">

-          <element href="ClassDiagramEditorTest.uml#_Za7h8AjgEd6M04pHOkSelQ"/>

-          <layoutConstraint xsi:type="notation:Location"/>

-        </children>

-        <children type="3017">

-          <element href="ClassDiagramEditorTest.uml#_ZwilkAjgEd6M04pHOkSelQ"/>

-          <layoutConstraint xsi:type="notation:Location"/>

-        </children>

-        <styles xsi:type="notation:DrawerStyle"/>

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:ShapeStyle" fontHeight="8" fillColor="0" lineColor="0"/>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="ClassDiagramEditorTest.uml#_VvWBAAjgEd6M04pHOkSelQ"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="113" y="151" width="300" height="220"/>

-    </children>

-    <styles xsi:type="notation:DiagramStyle"/>

-    <element href="ClassDiagramEditorTest.uml#_uL594AjdEd6M04pHOkSelQ"/>

-  </notation:Diagram>

-  <notation:Diagram type="PapyrusUMLClassDiagram" name="MoveIntoAContainer" measurementUnit="Pixel">

-    <eAnnotations source="org.eclipse.papyrus.diagram.common.Belongs_To_This_Diagram">

-      <references href="ClassDiagramEditorTest.uml#_XBvdAAjgEd6M04pHOkSelQ"/>

-      <references href="ClassDiagramEditorTest.uml#_XX89kAjgEd6M04pHOkSelQ"/>

-      <references href="ClassDiagramEditorTest.uml#_XvWJ4AjgEd6M04pHOkSelQ"/>

-      <references href="ClassDiagramEditorTest.uml#_YC3i0AjgEd6M04pHOkSelQ"/>

-      <references href="ClassDiagramEditorTest.uml#_YVye0AjgEd6M04pHOkSelQ"/>

-      <references href="ClassDiagramEditorTest.uml#_YvbG0AjgEd6M04pHOkSelQ"/>

-      <references href="ClassDiagramEditorTest.uml#_ZCo9wAjgEd6M04pHOkSelQ"/>

-      <references href="ClassDiagramEditorTest.uml#_Za7h8AjgEd6M04pHOkSelQ"/>

-      <references href="ClassDiagramEditorTest.uml#_ZwilkAjgEd6M04pHOkSelQ"/>

-      <references href="ClassDiagramEditorTest.uml#_VvWBAAjgEd6M04pHOkSelQ"/>

-      <references href="ClassDiagramEditorTest.uml#_uL594wjdEd6M04pHOkSelQ"/>

-    </eAnnotations>

-    <children type="2006">

-      <children type="5022"/>

-      <children type="5023"/>

-      <children type="5024"/>

-      <children type="7015">

-        <children type="3017">

-          <element href="ClassDiagramEditorTest.uml#_nvRU0AjhEd6tRLTiTp-cYA"/>

-          <layoutConstraint xsi:type="notation:Location"/>

-        </children>

-        <styles xsi:type="notation:DrawerStyle"/>

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:ShapeStyle" fontHeight="8" fillColor="0" lineColor="0"/>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="ClassDiagramEditorTest.uml#_VvWBAAjgEd6M04pHOkSelQ"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="96" y="103" height="137"/>

-    </children>

-    <children type="2012">

-      <children type="5038"/>

-      <styles xsi:type="notation:ShapeStyle" fontHeight="8" fillColor="0" lineColor="0"/>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="ClassDiagramEditorTest.uml#_uL594wjdEd6M04pHOkSelQ"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="72" y="10"/>

-    </children>

-    <children type="2006">

-      <children type="5022"/>

-      <children type="5023"/>

-      <children type="5024"/>

-      <children type="7015">

-        <styles xsi:type="notation:DrawerStyle"/>

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:ShapeStyle" fontHeight="8" fillColor="0" lineColor="0"/>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="ClassDiagramEditorTest.uml#_tU5gkAjhEd6tRLTiTp-cYA"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="95" y="310" height="197"/>

-    </children>

-    <styles xsi:type="notation:DiagramStyle"/>

-    <element href="ClassDiagramEditorTest.uml#_uL594AjdEd6M04pHOkSelQ"/>

-  </notation:Diagram>

-  <notation:Diagram type="PapyrusUMLClassDiagram" name="DropTest" measurementUnit="Pixel">

-    <eAnnotations source="org.eclipse.papyrus.diagram.common.Belongs_To_This_Diagram">

-      <references href="ClassDiagramEditorTest.uml#_GecUsAjeEd6M04pHOkSelQ"/>

-      <references href="ClassDiagramEditorTest.uml#_uL595gjdEd6M04pHOkSelQ"/>

-      <references href="ClassDiagramEditorTest.uml#_uL595AjdEd6M04pHOkSelQ"/>

-    </eAnnotations>

-    <children type="2006">

-      <children type="5022"/>

-      <children type="5023"/>

-      <children type="5024"/>

-      <children type="7015">

-        <styles xsi:type="notation:DrawerStyle"/>

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:ShapeStyle" fontHeight="8" fillColor="0" lineColor="0"/>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="ClassDiagramEditorTest.uml#_uL595gjdEd6M04pHOkSelQ"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="66" y="249" height="196"/>

-    </children>

-    <children type="2012">

-      <children type="5038"/>

-      <styles xsi:type="notation:ShapeStyle" fontHeight="8" fillColor="0" lineColor="0"/>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="ClassDiagramEditorTest.uml#_uL595AjdEd6M04pHOkSelQ"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="198" y="40"/>

-    </children>

-    <styles xsi:type="notation:DiagramStyle"/>

-    <element href="ClassDiagramEditorTest.uml#_uL594AjdEd6M04pHOkSelQ"/>

-  </notation:Diagram>

-  <notation:Diagram type="PapyrusUMLClassDiagram" name="CreationDeletionTest" measurementUnit="Pixel">

-    <eAnnotations source="org.eclipse.papyrus.diagram.common.Belongs_To_This_Diagram">

-      <references href="ClassDiagramEditorTest.uml#_pLatQAjiEd6tRLTiTp-cYA"/>

-    </eAnnotations>

-    <children type="2012">

-      <children type="5038"/>

-      <styles xsi:type="notation:ShapeStyle" fontHeight="8" fillColor="0" lineColor="0"/>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="ClassDiagramEditorTest.uml#_pLatQAjiEd6tRLTiTp-cYA"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="171" y="46"/>

-    </children>

-    <styles xsi:type="notation:DiagramStyle"/>

-    <element href="ClassDiagramEditorTest.uml#_eAmaoAjiEd6tRLTiTp-cYA"/>

-  </notation:Diagram>

-  <notation:Diagram type="PapyrusUMLClassDiagram" name="MovementResizingTest" measurementUnit="Pixel">

-    <eAnnotations source="org.eclipse.papyrus.diagram.common.Belongs_To_This_Diagram">

-      <references href="ClassDiagramEditorTest.uml#_pLatQgjiEd6tRLTiTp-cYA"/>

-      <references href="ClassDiagramEditorTest.uml#_q6uuwAjiEd6tRLTiTp-cYA"/>

-    </eAnnotations>

-    <children type="2012">

-      <children type="5038"/>

-      <styles xsi:type="notation:ShapeStyle" fontHeight="8" fillColor="0" lineColor="0"/>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="ClassDiagramEditorTest.uml#_pLatQgjiEd6tRLTiTp-cYA"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="66" y="23"/>

-    </children>

-    <children type="2001">

-      <children type="5001"/>

-      <children type="5002"/>

-      <children type="5003"/>

-      <children type="7001">

-        <styles xsi:type="notation:DrawerStyle"/>

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:ShapeStyle" fontHeight="8" fillColor="0" lineColor="0"/>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="ClassDiagramEditorTest.uml#_q6uuwAjiEd6tRLTiTp-cYA"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="74" y="228" width="486" height="86"/>

-    </children>

-    <styles xsi:type="notation:DiagramStyle"/>

-    <element href="ClassDiagramEditorTest.uml#_eAmaoAjiEd6tRLTiTp-cYA"/>

-  </notation:Diagram>

-  <notation:Diagram type="PapyrusUMLClassDiagram" name="MovementIntoContainerTest" measurementUnit="Pixel">

-    <eAnnotations source="org.eclipse.papyrus.diagram.common.Belongs_To_This_Diagram">

-      <references href="ClassDiagramEditorTest.uml#_q6uuwAjiEd6tRLTiTp-cYA"/>

-      <references href="ClassDiagramEditorTest.uml#_pLatQwjiEd6tRLTiTp-cYA"/>

-      <references href="ClassDiagramEditorTest.uml#_eAmapQjiEd6tRLTiTp-cYA"/>

-    </eAnnotations>

-    <children type="2001">

-      <children type="5001"/>

-      <children type="5002"/>

-      <children type="5003"/>

-      <children type="7001">

-        <styles xsi:type="notation:DrawerStyle"/>

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:ShapeStyle" fontHeight="8" fillColor="0" lineColor="0"/>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="ClassDiagramEditorTest.uml#_q6uuwAjiEd6tRLTiTp-cYA"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="54" y="158"/>

-    </children>

-    <children type="2012">

-      <children type="5038"/>

-      <styles xsi:type="notation:ShapeStyle" fontHeight="8" fillColor="0" lineColor="0"/>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="ClassDiagramEditorTest.uml#_pLatQwjiEd6tRLTiTp-cYA"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="61" y="23"/>

-    </children>

-    <children type="2007">

-      <children type="5025"/>

-      <children type="5026"/>

-      <children type="5027"/>

-      <children type="7016">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:ShapeStyle" fontHeight="8" fillColor="0" lineColor="0"/>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="ClassDiagramEditorTest.uml#_eAmapQjiEd6tRLTiTp-cYA"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="71" y="242" width="616" height="120"/>

-    </children>

-    <styles xsi:type="notation:DiagramStyle"/>

-    <element href="ClassDiagramEditorTest.uml#_eAmaoAjiEd6tRLTiTp-cYA"/>

-  </notation:Diagram>

-  <notation:Diagram type="PapyrusUMLClassDiagram" name="DropTest" measurementUnit="Pixel">

-    <eAnnotations source="org.eclipse.papyrus.diagram.common.Belongs_To_This_Diagram">

-      <references href="ClassDiagramEditorTest.uml#_pLatQQjiEd6tRLTiTp-cYA"/>

-      <references href="ClassDiagramEditorTest.uml#_q6uuwAjiEd6tRLTiTp-cYA"/>

-    </eAnnotations>

-    <children type="2012">

-      <children type="5038"/>

-      <styles xsi:type="notation:ShapeStyle" fontHeight="8" fillColor="0" lineColor="0"/>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="ClassDiagramEditorTest.uml#_pLatQQjiEd6tRLTiTp-cYA"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="31" y="18"/>

-    </children>

-    <styles xsi:type="notation:DiagramStyle"/>

-    <element href="ClassDiagramEditorTest.uml#_eAmaoAjiEd6tRLTiTp-cYA"/>

-  </notation:Diagram>

-</xmi:XMI>

diff --git a/tests/ClassDiagramTestEditor/ClassDiagramEditorTest.uml b/tests/ClassDiagramTestEditor/ClassDiagramEditorTest.uml
deleted file mode 100644
index 0dd4f154bcd..00000000000
--- a/tests/ClassDiagramTestEditor/ClassDiagramEditorTest.uml
+++ /dev/null
@@ -1,256 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Model xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/2.1.0/UML" xmi:id="_RzX4UAisEd6_MpEAxXq7Hg" name="ClassDiagramEditorTest">

-  <ownedComment xmi:id="_hyN6oAisEd6X-5NwKztg_w">

-    <body>The purpose if this model is to test the class diagram editor.&#xD;

-Each package focuses on testing one element.</body>

-  </ownedComment>

-  <packagedElement xmi:type="uml:Package" xmi:id="_yYZpwAisEd6X-5NwKztg_w" name="ClassElementTest">

-    <ownedComment xmi:id="_IPpp4AitEd6X-5NwKztg_w">

-      <body>The prupose is to test:&#xD;

-	- creation with undo redo&#xD;

-	- graphical deletion with undo redo&#xD;

-	-model deletion with undo redo</body>

-    </ownedComment>

-    <ownedComment xmi:id="_LwSEwAi9Ed67XriYtPXATQ">

-      <body>The purpose is to test here the resizing and the movement of the element in each direction.&#xD;

-</body>

-    </ownedComment>

-    <ownedComment xmi:id="_shM9IAi9Ed67XriYtPXATQ">

-      <body>The purpose is to test the movement of the element into a container with undo redo</body>

-    </ownedComment>

-    <ownedComment xmi:id="_IVCQcAi-Ed67XriYtPXATQ">

-      <body>The purpose is to test the drop of element from the model explorer with undo redo</body>

-    </ownedComment>

-    <packagedElement xmi:type="uml:Class" xmi:id="_Z3mkwAi9Ed67XriYtPXATQ" name="ClassToTest"/>

-    <packagedElement xmi:type="uml:Package" xmi:id="_0c5oYAi9Ed67XriYtPXATQ" name="Container"/>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Package" xmi:id="_gHVR4AjHEd6G3Oli81IDTQ" name="CommentElementTest">

-    <ownedComment xmi:id="_nXz14AjHEd6G3Oli81IDTQ">

-      <body>The prupose is to test:&#xD;

-	- creation with undo redo&#xD;

-	- graphical deletion with undo redo&#xD;

-	-model deletion with undo redo</body>

-    </ownedComment>

-    <ownedComment xmi:id="_nXz14QjHEd6G3Oli81IDTQ">

-      <body>The purpose is to test here the resizing and the movement of the element in each direction.&#xD;

-</body>

-    </ownedComment>

-    <ownedComment xmi:id="_nXz14gjHEd6G3Oli81IDTQ">

-      <body>The purpose is to test the drop of element from the model explorer with undo redo</body>

-    </ownedComment>

-    <ownedComment xmi:id="_nXz14wjHEd6G3Oli81IDTQ">

-      <body>Name: test of move on Element&#xD;

-Goal: test the movement of a Comment into a container, including undo/redo.&#xD;

-Actions:&#xD;

-a1 - move the yellow comment element into the package called Container.&#xD;

-a2 - undo and redo.&#xD;

-Comments:&#xD;

-N/A.</body>

-    </ownedComment>

-    <ownedComment xmi:id="_lYQmsAjMEd6s1Ji8suGDvw">

-      <body>I am the Comment model element to use for this test.</body>

-    </ownedComment>

-    <packagedElement xmi:type="uml:Package" xmi:id="_UKsZYAjKEd6s1Ji8suGDvw" name="Container"/>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Package" xmi:id="_nFXIEAjUEd6s1Ji8suGDvw" name="ComponentElementTest">

-    <ownedComment xmi:id="_nFXIEQjUEd6s1Ji8suGDvw">

-      <body>The purpose is to test:&#xD;

-	- creation with undo redo&#xD;

-	- graphical deletion with undo redo&#xD;

-	- model deletion with undo redo</body>

-    </ownedComment>

-    <ownedComment xmi:id="_nFXIEgjUEd6s1Ji8suGDvw">

-      <body>The purpose is to test here the resizing and the movement of the element in each direction.&#xD;

-</body>

-    </ownedComment>

-    <ownedComment xmi:id="_nFXIEwjUEd6s1Ji8suGDvw">

-      <body>The purpose is to test the movement of the element into a container with undo redo</body>

-    </ownedComment>

-    <ownedComment xmi:id="_nFXIFAjUEd6s1Ji8suGDvw">

-      <body>The purpose is to test the drop of element from the model explorer with undo redo</body>

-    </ownedComment>

-    <packagedElement xmi:type="uml:Package" xmi:id="_nFXIFgjUEd6s1Ji8suGDvw" name="Container"/>

-    <packagedElement xmi:type="uml:Component" xmi:id="_rkCLcAjXEd6s1Ji8suGDvw" name="ComponentToTest"/>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Package" xmi:id="_USWtUAjaEd6ftJNsxnHJwA" name="ConstraintElementTest">

-    <ownedComment xmi:id="_USWtUQjaEd6ftJNsxnHJwA">

-      <body>The purpose is to test:&#xD;

-	- creation with undo redo&#xD;

-	- graphical deletion with undo redo&#xD;

-	- model deletion with undo redo</body>

-    </ownedComment>

-    <ownedComment xmi:id="_USWtUgjaEd6ftJNsxnHJwA">

-      <body>The purpose is to test here the resizing and the movement of the element in each direction.&#xD;

-Action:&#xD;

-	- resize in all directions&#xD;

-	- move the element&#xD;

-</body>

-    </ownedComment>

-    <ownedComment xmi:id="_USWtUwjaEd6ftJNsxnHJwA">

-      <body>Name: test of move on Element&#xD;

-Goal: test the movement of an element into a container, including undo/redo.&#xD;

-Actions:&#xD;

-a1 - move the yellow element into the package called Container.&#xD;

-a2 - undo and redo.</body>

-    </ownedComment>

-    <ownedComment xmi:id="_USWtVAjaEd6ftJNsxnHJwA">

-      <body>The purpose is to test the drop of element from the model explorer with undo redo</body>

-    </ownedComment>

-    <packagedElement xmi:type="uml:Package" xmi:id="_USWtVQjaEd6ftJNsxnHJwA" name="Container"/>

-    <packagedElement xmi:type="uml:Constraint" xmi:id="_uZbj4AjaEd6ftJNsxnHJwA" name="ConstraintToTest"/>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Package" xmi:id="_eY9UcAjbEd6ftJNsxnHJwA" name="DataTypeElementTest">

-    <ownedComment xmi:id="_eY9UcQjbEd6ftJNsxnHJwA">

-      <body>Name: creation deletion test&#xD;

-Goal :The purpose is to test the creation, graphical deletion, model deletion&#xD;

-Action:&#xD;

-	a. create the element with undo redo&#xD;

-	b. delete from model with undo redo&#xD;

-	c. do a graphical deletion with undo redo</body>

-    </ownedComment>

-    <ownedComment xmi:id="_eY9UcgjbEd6ftJNsxnHJwA">

-      <body>Name: movement and resizing element,&#xD;

-Goal: The purpose is to test here the resizing and the movement of the element in each direction.&#xD;

-Action:&#xD;

-	a. resize in all directions&#xD;

-	b. move the element</body>

-    </ownedComment>

-    <ownedComment xmi:id="_eY9UcwjbEd6ftJNsxnHJwA">

-      <body>Name: test of move on Element&#xD;

-Goal: test the movement of an element into a container, including undo/redo.&#xD;

-Actions:&#xD;

-a1 - move the  element into the package called Container.&#xD;

-a2 - undo and redo.</body>

-    </ownedComment>

-    <ownedComment xmi:id="_eY9UdAjbEd6ftJNsxnHJwA">

-      <body>Name: Drop Test&#xD;

-Goal: The purpose is to test the drop of element from the model explorer&#xD;

-Actions:&#xD;

-	a. drop the element&#xD;

-	b. undo and redo</body>

-    </ownedComment>

-    <packagedElement xmi:type="uml:Package" xmi:id="_eY9UdQjbEd6ftJNsxnHJwA" name="Container"/>

-    <packagedElement xmi:type="uml:DataType" xmi:id="_l6Rw0AjbEd6ftJNsxnHJwA" name="DataTypeToTest"/>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Package" xmi:id="_xrkYIAjcEd6ftJNsxnHJwA" name="EnumerationElementTest">

-    <ownedComment xmi:id="_xrkYIQjcEd6ftJNsxnHJwA">

-      <body>Name: creation deletion test&#xD;

-Goal :The purpose is to test the creation, graphical deletion, model deletion&#xD;

-Action:&#xD;

-	a. create the element with undo redo&#xD;

-	b. delete from model with undo redo&#xD;

-	c. do a graphical deletion with undo redo</body>

-    </ownedComment>

-    <ownedComment xmi:id="_xrkYIgjcEd6ftJNsxnHJwA">

-      <body>Name: movement and resizing element,&#xD;

-Goal: The purpose is to test here the resizing and the movement of the element in each direction.&#xD;

-Action:&#xD;

-	a. resize in all directions&#xD;

-	b. move the element</body>

-    </ownedComment>

-    <ownedComment xmi:id="_xrkYIwjcEd6ftJNsxnHJwA">

-      <body>Name: test of move on Element&#xD;

-Goal: test the movement of an element into a container, including undo/redo.&#xD;

-Actions:&#xD;

-a1 - move the  element into the package called Container.&#xD;

-a2 - undo and redo.</body>

-    </ownedComment>

-    <ownedComment xmi:id="_xrkYJAjcEd6ftJNsxnHJwA">

-      <body>Name: Drop Test&#xD;

-Goal: The purpose is to test the drop of element from the model explorer&#xD;

-Actions:&#xD;

-	a. drop the element&#xD;

-	b. undo and redo</body>

-    </ownedComment>

-    <packagedElement xmi:type="uml:Package" xmi:id="_xrkYJQjcEd6ftJNsxnHJwA" name="Container"/>

-    <packagedElement xmi:type="uml:Enumeration" xmi:id="_GtLwwAjdEd6ftJNsxnHJwA" name="EnumerationToTest"/>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Package" xmi:id="_uL594AjdEd6M04pHOkSelQ" name="EnumerationLiteralElementTest">

-    <ownedComment xmi:id="_uL594QjdEd6M04pHOkSelQ">

-      <body>Name: creation deletion test of &#xD;

-ennumeration&#xD;

-Goal :The purpose is to test the creation, graphical deletion, model deletion&#xD;

-Action:&#xD;

-	a. create the element with undo redo&#xD;

-	b. delete from model with undo redo&#xD;

-	c. do a graphical deletion with undo redo</body>

-    </ownedComment>

-    <ownedComment xmi:id="_uL594gjdEd6M04pHOkSelQ">

-      <body>Name: movement&#xD;

-Goal: The purpose is to test here the movement of the element in his container.&#xD;

-Action:&#xD;

-	a. move the element in the list</body>

-    </ownedComment>

-    <ownedComment xmi:id="_uL594wjdEd6M04pHOkSelQ">

-      <body>Name: test of move on Element&#xD;

-Goal: test the movement of an element into a container, including undo/redo.&#xD;

-Actions:&#xD;

-a1 - move the  element into the enumeration called Container.&#xD;

-a2 - undo and redo.</body>

-    </ownedComment>

-    <ownedComment xmi:id="_uL595AjdEd6M04pHOkSelQ">

-      <body>Name: Drop Test&#xD;

-Goal: The purpose is to test the drop of element from the model explorer&#xD;

-Actions:&#xD;

-	a. drop the element&#xD;

-	b. undo and redo</body>

-    </ownedComment>

-    <packagedElement xmi:type="uml:Package" xmi:id="_uL595QjdEd6M04pHOkSelQ" name="Container"/>

-    <packagedElement xmi:type="uml:Enumeration" xmi:id="_uL595gjdEd6M04pHOkSelQ" name="Enumeration">

-      <ownedLiteral xmi:id="_GecUsAjeEd6M04pHOkSelQ" name="EnumerationLiteral0"/>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Enumeration" xmi:id="_VvWBAAjgEd6M04pHOkSelQ" name="Enumeration0">

-      <ownedLiteral xmi:id="_XBvdAAjgEd6M04pHOkSelQ" name="EnumerationLiteralToMove"/>

-      <ownedLiteral xmi:id="_XX89kAjgEd6M04pHOkSelQ" name="EnumerationLiteral1"/>

-      <ownedLiteral xmi:id="_XvWJ4AjgEd6M04pHOkSelQ" name="EnumerationLiteral2"/>

-      <ownedLiteral xmi:id="_YC3i0AjgEd6M04pHOkSelQ" name="EnumerationLiteral3"/>

-      <ownedLiteral xmi:id="_YVye0AjgEd6M04pHOkSelQ" name="EnumerationLiteral4"/>

-      <ownedLiteral xmi:id="_YvbG0AjgEd6M04pHOkSelQ" name="EnumerationLiteral5"/>

-      <ownedLiteral xmi:id="_ZCo9wAjgEd6M04pHOkSelQ" name="EnumerationLiteral6"/>

-      <ownedLiteral xmi:id="_Za7h8AjgEd6M04pHOkSelQ" name="EnumerationLiteral7"/>

-      <ownedLiteral xmi:id="_ZwilkAjgEd6M04pHOkSelQ" name="EnumerationLiteral8"/>

-      <ownedLiteral xmi:id="_nvRU0AjhEd6tRLTiTp-cYA" name="EnumerationLiteral0"/>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Enumeration" xmi:id="_tU5gkAjhEd6tRLTiTp-cYA" name="Container"/>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Package" xmi:id="_eAmaoAjiEd6tRLTiTp-cYA" name="InstanceSpecificationElementTest">

-    <ownedComment xmi:id="_pLatQAjiEd6tRLTiTp-cYA">

-      <body>Name: creation deletion test&#xD;

-Goal :The purpose is to test the creation, graphical deletion, model deletion&#xD;

-Action:&#xD;

-	a. create the element with undo redo&#xD;

-	b. delete from model with undo redo&#xD;

-	c. do a graphical deletion with undo redo</body>

-    </ownedComment>

-    <ownedComment xmi:id="_pLatQQjiEd6tRLTiTp-cYA">

-      <body>Name: Drop Test&#xD;

-Goal: The purpose is to test the drop of element from the model explorer&#xD;

-Actions:&#xD;

-	a. drop the element&#xD;

-	b. undo and redo</body>

-    </ownedComment>

-    <ownedComment xmi:id="_pLatQgjiEd6tRLTiTp-cYA">

-      <body>Name: movement and resizing element,&#xD;

-Goal: The purpose is to test here the resizing and the movement of the element in each direction.&#xD;

-Action:&#xD;

-	a. resize in all directions&#xD;

-	b. move the element</body>

-    </ownedComment>

-    <ownedComment xmi:id="_pLatQwjiEd6tRLTiTp-cYA">

-      <body>Name: test of move on Element&#xD;

-Goal: test the movement of an element into a container, including undo/redo.&#xD;

-Actions:&#xD;

-a1 - move the  element into the package called Container.&#xD;

-a2 - undo and redo.</body>

-    </ownedComment>

-    <packagedElement xmi:type="uml:Package" xmi:id="_eAmapQjiEd6tRLTiTp-cYA" name="Container"/>

-    <packagedElement xmi:type="uml:Constraint" xmi:id="_eAmapgjiEd6tRLTiTp-cYA" name="ConstraintToTest"/>

-    <packagedElement xmi:type="uml:InstanceSpecification" xmi:id="_q6uuwAjiEd6tRLTiTp-cYA" name="InstanceSpecificationToTest"/>

-  </packagedElement>

-  <profileApplication xmi:id="_RzX4UQisEd6_MpEAxXq7Hg">

-    <eAnnotations xmi:id="_RzX4UgisEd6_MpEAxXq7Hg" source="http://www.eclipse.org/uml2/2.0.0/UML">

-      <references xmi:type="ecore:EPackage" href="pathmap://UML_PROFILES/Standard.profile.uml#_yzU58YinEdqtvbnfB2L_5w"/>

-    </eAnnotations>

-    <appliedProfile href="pathmap://UML_PROFILES/Standard.profile.uml#_0"/>

-  </profileApplication>

-</uml:Model>

diff --git a/tests/ClassDiagramTestEditor/SYSML.metamodel.di b/tests/ClassDiagramTestEditor/SYSML.metamodel.di
deleted file mode 100644
index a33c20090c9..00000000000
--- a/tests/ClassDiagramTestEditor/SYSML.metamodel.di
+++ /dev/null
@@ -1,227 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>

-<xmi:XMI 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/di" xmlns:di_1="http://www.eclipse.org/papyrus/0.7.0/sashdi">

-  <di:Diagram name="tabfolder.window" type="tabfolder.window"/>

-  <di_1:SashWindowsMngr>

-    <pageList>

-      <availablePage>

-        <emfPageIdentifier href="SYSML.metamodel.notation#/0"/>

-      </availablePage>

-      <availablePage>

-        <emfPageIdentifier href="SYSML.metamodel.notation#/1"/>

-      </availablePage>

-      <availablePage>

-        <emfPageIdentifier href="SYSML.metamodel.notation#/0"/>

-      </availablePage>

-      <availablePage>

-        <emfPageIdentifier href="SYSML.metamodel.notation#/1"/>

-      </availablePage>

-      <availablePage>

-        <emfPageIdentifier href="SYSML.metamodel.notation#/2"/>

-      </availablePage>

-      <availablePage>

-        <emfPageIdentifier href="SYSML.metamodel.notation#/3"/>

-      </availablePage>

-      <availablePage>

-        <emfPageIdentifier href="SYSML.metamodel.notation#/4"/>

-      </availablePage>

-      <availablePage>

-        <emfPageIdentifier href="SYSML.metamodel.notation#/5"/>

-      </availablePage>

-      <availablePage>

-        <emfPageIdentifier href="SYSML.metamodel.notation#/6"/>

-      </availablePage>

-      <availablePage>

-        <emfPageIdentifier href="SYSML.metamodel.notation#/7"/>

-      </availablePage>

-      <availablePage>

-        <emfPageIdentifier href="SYSML.metamodel.notation#/8"/>

-      </availablePage>

-      <availablePage>

-        <emfPageIdentifier href="SYSML.metamodel.notation#/9"/>

-      </availablePage>

-      <availablePage>

-        <emfPageIdentifier href="SYSML.metamodel.notation#/10"/>

-      </availablePage>

-      <availablePage>

-        <emfPageIdentifier href="SYSML.metamodel.notation#/9"/>

-      </availablePage>

-      <availablePage>

-        <emfPageIdentifier href="SYSML.metamodel.notation#/9"/>

-      </availablePage>

-      <availablePage>

-        <emfPageIdentifier href="SYSML.metamodel.notation#/10"/>

-      </availablePage>

-      <availablePage>

-        <emfPageIdentifier href="SYSML.metamodel.notation#/10"/>

-      </availablePage>

-      <availablePage>

-        <emfPageIdentifier href="SYSML.metamodel.notation#/9"/>

-      </availablePage>

-      <availablePage>

-        <emfPageIdentifier href="SYSML.metamodel.notation#/3"/>

-      </availablePage>

-      <availablePage>

-        <emfPageIdentifier href="SYSML.metamodel.notation#/1"/>

-      </availablePage>

-      <availablePage>

-        <emfPageIdentifier href="SYSML.metamodel.notation#/4"/>

-      </availablePage>

-      <availablePage>

-        <emfPageIdentifier href="SYSML.metamodel.notation#/4"/>

-      </availablePage>

-      <availablePage>

-        <emfPageIdentifier href="SYSML.metamodel.notation#/4"/>

-      </availablePage>

-      <availablePage>

-        <emfPageIdentifier href="SYSML.metamodel.notation#/2"/>

-      </availablePage>

-      <availablePage>

-        <emfPageIdentifier href="SYSML.metamodel.notation#/8"/>

-      </availablePage>

-      <availablePage>

-        <emfPageIdentifier href="SYSML.metamodel.notation#/7"/>

-      </availablePage>

-      <availablePage>

-        <emfPageIdentifier href="SYSML.metamodel.notation#/10"/>

-      </availablePage>

-      <availablePage>

-        <emfPageIdentifier href="SYSML.metamodel.notation#/9"/>

-      </availablePage>

-      <availablePage>

-        <emfPageIdentifier href="SYSML.metamodel.notation#/3"/>

-      </availablePage>

-      <availablePage>

-        <emfPageIdentifier href="SYSML.metamodel.notation#/1"/>

-      </availablePage>

-      <availablePage>

-        <emfPageIdentifier href="SYSML.metamodel.notation#/4"/>

-      </availablePage>

-      <availablePage>

-        <emfPageIdentifier href="SYSML.metamodel.notation#/2"/>

-      </availablePage>

-      <availablePage>

-        <emfPageIdentifier href="SYSML.metamodel.notation#/8"/>

-      </availablePage>

-      <availablePage>

-        <emfPageIdentifier href="SYSML.metamodel.notation#/6"/>

-      </availablePage>

-      <availablePage>

-        <emfPageIdentifier href="SYSML.metamodel.notation#/5"/>

-      </availablePage>

-      <availablePage>

-        <emfPageIdentifier href="SYSML.metamodel.notation#/0"/>

-      </availablePage>

-      <availablePage>

-        <emfPageIdentifier href="SYSML.metamodel.notation#/7"/>

-      </availablePage>

-      <availablePage>

-        <emfPageIdentifier href="SYSML.metamodel.notation#/5"/>

-      </availablePage>

-      <availablePage>

-        <emfPageIdentifier href="SYSML.metamodel.notation#/6"/>

-      </availablePage>

-      <availablePage>

-        <emfPageIdentifier href="SYSML.metamodel.notation#/2"/>

-      </availablePage>

-      <availablePage>

-        <emfPageIdentifier href="SYSML.metamodel.notation#/0"/>

-      </availablePage>

-      <availablePage>

-        <emfPageIdentifier href="SYSML.metamodel.notation#/0"/>

-      </availablePage>

-      <availablePage>

-        <emfPageIdentifier href="SYSML.metamodel.notation#/0"/>

-      </availablePage>

-      <availablePage>

-        <emfPageIdentifier href="SYSML.metamodel.notation#/0"/>

-      </availablePage>

-      <availablePage>

-        <emfPageIdentifier href="SYSML.metamodel.notation#/0"/>

-      </availablePage>

-      <availablePage>

-        <emfPageIdentifier href="SYSML.metamodel.notation#/5"/>

-      </availablePage>

-      <availablePage>

-        <emfPageIdentifier href="SYSML.metamodel.notation#/0"/>

-      </availablePage>

-      <availablePage>

-        <emfPageIdentifier href="SYSML.metamodel.notation#/0"/>

-      </availablePage>

-      <availablePage>

-        <emfPageIdentifier href="SYSML.metamodel.notation#/1"/>

-      </availablePage>

-      <availablePage>

-        <emfPageIdentifier href="SYSML.metamodel.notation#/5"/>

-      </availablePage>

-      <availablePage>

-        <emfPageIdentifier href="SYSML.metamodel.notation#/6"/>

-      </availablePage>

-      <availablePage>

-        <emfPageIdentifier href="SYSML.metamodel.notation#/1"/>

-      </availablePage>

-      <availablePage>

-        <emfPageIdentifier href="SYSML.metamodel.notation#/5"/>

-      </availablePage>

-      <availablePage>

-        <emfPageIdentifier href="SYSML.metamodel.notation#/3"/>

-      </availablePage>

-      <availablePage>

-        <emfPageIdentifier href="SYSML.metamodel.notation#/7"/>

-      </availablePage>

-      <availablePage>

-        <emfPageIdentifier href="SYSML.metamodel.notation#/8"/>

-      </availablePage>

-      <availablePage>

-        <emfPageIdentifier href="SYSML.metamodel.notation#/5"/>

-      </availablePage>

-      <availablePage>

-        <emfPageIdentifier href="SYSML.metamodel.notation#/8"/>

-      </availablePage>

-      <availablePage>

-        <emfPageIdentifier href="SYSML.metamodel.notation#/9"/>

-      </availablePage>

-    </pageList>

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

-      <windows>

-        <children xsi:type="di_1:TabFolder">

-          <children>

-            <emfPageIdentifier href="SYSML.metamodel.notation#/9"/>

-          </children>

-          <children>

-            <emfPageIdentifier href="SYSML.metamodel.notation#/10"/>

-          </children>

-          <children>

-            <emfPageIdentifier href="SYSML.metamodel.notation#/3"/>

-          </children>

-          <children>

-            <emfPageIdentifier href="SYSML.metamodel.notation#/1"/>

-          </children>

-          <children>

-            <emfPageIdentifier href="SYSML.metamodel.notation#/10"/>

-          </children>

-          <children>

-            <emfPageIdentifier href="SYSML.metamodel.notation#/3"/>

-          </children>

-          <children>

-            <emfPageIdentifier href="SYSML.metamodel.notation#/1"/>

-          </children>

-          <children>

-            <emfPageIdentifier href="SYSML.metamodel.notation#/4"/>

-          </children>

-          <children>

-            <emfPageIdentifier href="SYSML.metamodel.notation#/2"/>

-          </children>

-          <children>

-            <emfPageIdentifier href="SYSML.metamodel.notation#/8"/>

-          </children>

-          <children>

-            <emfPageIdentifier href="SYSML.metamodel.notation#/6"/>

-          </children>

-          <children>

-            <emfPageIdentifier href="SYSML.metamodel.notation#/5"/>

-          </children>

-        </children>

-      </windows>

-    </sashModel>

-  </di_1:SashWindowsMngr>

-</xmi:XMI>

diff --git a/tests/ClassDiagramTestEditor/SYSML.metamodel.notation b/tests/ClassDiagramTestEditor/SYSML.metamodel.notation
deleted file mode 100644
index c69533d1406..00000000000
--- a/tests/ClassDiagramTestEditor/SYSML.metamodel.notation
+++ /dev/null
@@ -1,3584 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>

-<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">

-  <notation:Diagram type="PapyrusUMLClassDiagram" name="classdiagram" measurementUnit="Pixel">

-    <eAnnotations source="es.cv.gvcase.mdt.uml2.diagram.common.Belongs_To_This_Diagram">

-      <references href="SYSML.metamodel.uml#Allocate-_generalization.0"/>

-      <references href="SYSML.metamodel.uml#Allocate"/>

-      <references href="SYSML.metamodel.uml#Conform-_generalization.0"/>

-      <references href="SYSML.metamodel.uml#Conform"/>

-    </eAnnotations>

-    <styles xsi:type="notation:DiagramStyle"/>

-    <element href="SYSML.metamodel.uml#_0"/>

-  </notation:Diagram>

-  <notation:Diagram type="PapyrusUMLClassDiagram" name="stereotypes" measurementUnit="Pixel">

-    <eAnnotations source="es.cv.gvcase.mdt.uml2.diagram.common.Belongs_To_This_Diagram">

-      <references href="SYSML.metamodel.uml#Conform-_generalization.0"/>

-      <references href="SYSML.metamodel.uml#Conform"/>

-      <references href="SYSML.metamodel.uml#Viewpoint-_generalization.0"/>

-      <references href="SYSML.metamodel.uml#Viewpoint-stakeholders-_upperValue"/>

-      <references href="SYSML.metamodel.uml#Viewpoint-stakeholders-_lowerValue"/>

-      <references href="SYSML.metamodel.uml#Viewpoint-stakeholders"/>

-      <references href="SYSML.metamodel.uml#Viewpoint-purpose-_lowerValue"/>

-      <references href="SYSML.metamodel.uml#Viewpoint-purpose"/>

-      <references href="SYSML.metamodel.uml#Viewpoint-concerns-_upperValue"/>

-      <references href="SYSML.metamodel.uml#Viewpoint-concerns-_lowerValue"/>

-      <references href="SYSML.metamodel.uml#Viewpoint-concerns"/>

-      <references href="SYSML.metamodel.uml#Viewpoint-languages-_upperValue"/>

-      <references href="SYSML.metamodel.uml#Viewpoint-languages-_lowerValue"/>

-      <references href="SYSML.metamodel.uml#Viewpoint-languages"/>

-      <references href="SYSML.metamodel.uml#Viewpoint-methods-_upperValue"/>

-      <references href="SYSML.metamodel.uml#Viewpoint-methods-_lowerValue"/>

-      <references href="SYSML.metamodel.uml#Viewpoint-methods"/>

-      <references href="SYSML.metamodel.uml#Viewpoint"/>

-      <references href="SYSML.metamodel.uml#View-_generalization.0"/>

-      <references href="SYSML.metamodel.uml#View-viewpoint"/>

-      <references href="SYSML.metamodel.uml#View"/>

-      <references href="SYSML.metamodel.uml#Rationale-_generalization.0"/>

-      <references href="SYSML.metamodel.uml#Rationale"/>

-      <references href="SYSML.metamodel.uml#Problem-_generalization.0"/>

-      <references href="SYSML.metamodel.uml#Problem"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Comment-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Comment-_generalization.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Comment-body-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Comment-body-_upperValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Comment-body-_lowerValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Comment-body"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Comment-annotatedElement-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Comment-annotatedElement-_upperValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Comment-annotatedElement-_lowerValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Comment-annotatedElement"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Comment"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-_ownedComment.1"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-_ownedComment.2"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-elements_public_or_private-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-elements_public_or_private-_specification"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-elements_public_or_private"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-_generalization.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-_generalization.1"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-_generalization.2"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-packageMerge-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-packageMerge-_upperValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-packageMerge-_lowerValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-packageMerge"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-packagedElement-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-packagedElement-_upperValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-packagedElement-_lowerValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-packagedElement"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-ownedType-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-ownedType-_upperValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-ownedType-_lowerValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-ownedType"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-nestedPackage-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-nestedPackage-_upperValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-nestedPackage-_lowerValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-nestedPackage"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-nestingPackage-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-nestingPackage-_upperValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-nestingPackage-_lowerValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-nestingPackage"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-profileApplication-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-profileApplication-_upperValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-profileApplication-_lowerValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-profileApplication"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-createOwnedClass-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-createOwnedClass-_ownedParameter.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-createOwnedClass-name-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-createOwnedClass-name"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-createOwnedClass-isAbstract-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-createOwnedClass-isAbstract"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-createOwnedClass"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-createOwnedEnumeration-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-createOwnedEnumeration-_ownedParameter.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-createOwnedEnumeration-name-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-createOwnedEnumeration-name"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-createOwnedEnumeration"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-createOwnedPrimitiveType-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-createOwnedPrimitiveType-_ownedParameter.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-createOwnedPrimitiveType-name-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-createOwnedPrimitiveType-name"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-createOwnedPrimitiveType"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-createOwnedInterface-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-createOwnedInterface-_ownedParameter.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-createOwnedInterface-name-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-createOwnedInterface-name"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-createOwnedInterface"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-isProfileApplied-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-isProfileApplied-_ownedParameter.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-isProfileApplied-profile-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-isProfileApplied-profile"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-isProfileApplied"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-applyProfile-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-applyProfile-_ownedParameter.0-_upperValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-applyProfile-_ownedParameter.0-_lowerValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-applyProfile-_ownedParameter.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-applyProfile-profile-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-applyProfile-profile"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-applyProfile"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-unapplyProfile-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-unapplyProfile-_ownedParameter.0-_upperValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-unapplyProfile-_ownedParameter.0-_lowerValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-unapplyProfile-_ownedParameter.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-unapplyProfile-profile-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-unapplyProfile-profile"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-unapplyProfile"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-getAppliedProfiles-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-getAppliedProfiles-_ownedParameter.0-_upperValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-getAppliedProfiles-_ownedParameter.0-_lowerValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-getAppliedProfiles-_ownedParameter.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-getAppliedProfiles"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-getAllAppliedProfiles-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-getAllAppliedProfiles-_ownedParameter.0-_upperValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-getAllAppliedProfiles-_ownedParameter.0-_lowerValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-getAllAppliedProfiles-_ownedParameter.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-getAllAppliedProfiles"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-getAppliedProfile-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-getAppliedProfile-_ownedParameter.0-_upperValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-getAppliedProfile-_ownedParameter.0-_lowerValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-getAppliedProfile-_ownedParameter.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-getAppliedProfile-qualifiedName-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-getAppliedProfile-qualifiedName"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-getAppliedProfile"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-getAppliedProfile.1-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-getAppliedProfile.1-_ownedParameter.0-_upperValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-getAppliedProfile.1-_ownedParameter.0-_lowerValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-getAppliedProfile.1-_ownedParameter.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-getAppliedProfile.1-qualifiedName-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-getAppliedProfile.1-qualifiedName"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-getAppliedProfile.1-recurse-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-getAppliedProfile.1-recurse"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-getAppliedProfile.1"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-getAllProfileApplications-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-getAllProfileApplications-_ownedParameter.0-_upperValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-getAllProfileApplications-_ownedParameter.0-_lowerValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-getAllProfileApplications-_ownedParameter.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-getAllProfileApplications"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-getProfileApplication-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-getProfileApplication-_ownedParameter.0-_upperValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-getProfileApplication-_ownedParameter.0-_lowerValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-getProfileApplication-_ownedParameter.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-getProfileApplication-profile-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-getProfileApplication-profile"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-getProfileApplication"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-getProfileApplication.1-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-getProfileApplication.1-_ownedParameter.0-_upperValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-getProfileApplication.1-_ownedParameter.0-_lowerValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-getProfileApplication.1-_ownedParameter.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-getProfileApplication.1-profile-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-getProfileApplication.1-profile"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-getProfileApplication.1-recurse-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-getProfileApplication.1-recurse"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-getProfileApplication.1"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-isModelLibrary-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-isModelLibrary-_ownedParameter.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-isModelLibrary"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-mustBeOwned-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-mustBeOwned-spec-_specification"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-mustBeOwned-spec"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-mustBeOwned-_ownedParameter.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-mustBeOwned"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-visibleMembers-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-visibleMembers-spec-_specification"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-visibleMembers-spec"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-visibleMembers-_ownedParameter.0-_upperValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-visibleMembers-_ownedParameter.0-_lowerValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-visibleMembers-_ownedParameter.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-visibleMembers"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-makesVisible-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-makesVisible-_ownedRule.0-_specification"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-makesVisible-_ownedRule.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-makesVisible-spec-_specification"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-makesVisible-spec"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-makesVisible-_ownedParameter.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-makesVisible-el"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package-makesVisible"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-_ownedComment.1"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-_ownedComment.2"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-_ownedComment.3"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-passive_class-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-passive_class-_specification"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-passive_class"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-_generalization.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-_generalization.1"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-isAbstract-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-isAbstract-_ownedComment.1"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-isAbstract-_defaultValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-isAbstract"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-nestedClassifier-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-nestedClassifier-_upperValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-nestedClassifier-_lowerValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-nestedClassifier"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-ownedAttribute-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-ownedAttribute-_upperValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-ownedAttribute-_lowerValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-ownedAttribute"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-ownedOperation-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-ownedOperation-_upperValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-ownedOperation-_lowerValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-ownedOperation"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-superClass-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-superClass-_upperValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-superClass-_lowerValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-superClass"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-isActive-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-isActive-_defaultValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-isActive"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-ownedReception-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-ownedReception-_upperValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-ownedReception-_lowerValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-ownedReception"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-extension-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-extension-_upperValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-extension-_lowerValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-extension"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-getExtensions-_ownedParameter.0-_upperValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-getExtensions-_ownedParameter.0-_lowerValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-getExtensions-_ownedParameter.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-getExtensions"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-createOwnedOperation-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-createOwnedOperation-_ownedParameter.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-createOwnedOperation-name-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-createOwnedOperation-name-_upperValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-createOwnedOperation-name-_lowerValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-createOwnedOperation-name"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-createOwnedOperation-parameterNames-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-createOwnedOperation-parameterNames-_upperValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-createOwnedOperation-parameterNames-_lowerValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-createOwnedOperation-parameterNames"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-createOwnedOperation-parameterTypes-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-createOwnedOperation-parameterTypes-_upperValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-createOwnedOperation-parameterTypes-_lowerValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-createOwnedOperation-parameterTypes"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-createOwnedOperation-returnType-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-createOwnedOperation-returnType-_upperValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-createOwnedOperation-returnType-_lowerValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-createOwnedOperation-returnType"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-createOwnedOperation"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-isMetaclass-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-isMetaclass-_ownedParameter.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-isMetaclass"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-inherit-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-inherit-spec-_specification"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-inherit-spec"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-inherit-_ownedParameter.0-_upperValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-inherit-_ownedParameter.0-_lowerValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-inherit-_ownedParameter.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-inherit-inhs-_upperValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-inherit-inhs-_lowerValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-inherit-inhs"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-inherit"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Dependency-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Dependency-_generalization.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Dependency-_generalization.1"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Dependency-supplier-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Dependency-supplier-_upperValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Dependency-supplier-_lowerValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Dependency-supplier"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Dependency-client-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Dependency-client-_upperValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Dependency-client-_lowerValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Dependency-client"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Dependency"/>

-    </eAnnotations>

-    <children xsi:type="notation:Shape" type="2008" fontName="Microsoft Sans Serif" fontHeight="8" transparency="0" gradient="16777215, 15060913, 0" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="5029"/>

-      <children xsi:type="notation:BasicCompartment" type="7017">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7018">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7019">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="SYSML.metamodel.uml#Conform"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="36" y="544" width="122"/>

-    </children>

-    <children xsi:type="notation:Shape" type="2008" fontName="Microsoft Sans Serif" fontHeight="8" transparency="0" gradient="16777215, 15060913, 0" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="5029"/>

-      <children xsi:type="notation:BasicCompartment" type="7017">

-        <children type="3012">

-          <element href="SYSML.metamodel.uml#Viewpoint-languages"/>

-          <layoutConstraint xsi:type="notation:Location" x="20" y="5"/>

-        </children>

-        <children type="3012">

-          <element href="SYSML.metamodel.uml#Viewpoint-concerns"/>

-          <layoutConstraint xsi:type="notation:Location" x="20" y="5"/>

-        </children>

-        <children type="3012">

-          <element href="SYSML.metamodel.uml#Viewpoint-purpose"/>

-          <layoutConstraint xsi:type="notation:Location" x="20" y="5"/>

-        </children>

-        <children type="3012">

-          <element href="SYSML.metamodel.uml#Viewpoint-methods"/>

-          <layoutConstraint xsi:type="notation:Location" x="20" y="5"/>

-        </children>

-        <children type="3012">

-          <element href="SYSML.metamodel.uml#Viewpoint-stakeholders"/>

-          <layoutConstraint xsi:type="notation:Location" x="20" y="5"/>

-        </children>

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7018">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7019">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="SYSML.metamodel.uml#Viewpoint"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="444" y="405" width="243" height="134"/>

-    </children>

-    <children xsi:type="notation:Shape" type="2008" fontName="Microsoft Sans Serif" fontHeight="8" transparency="0" gradient="16777215, 15060913, 0" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="5029"/>

-      <children xsi:type="notation:BasicCompartment" type="7017">

-        <children type="3012">

-          <element href="SYSML.metamodel.uml#View-viewpoint"/>

-          <layoutConstraint xsi:type="notation:Location" x="42" y="7"/>

-        </children>

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7018">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7019">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="SYSML.metamodel.uml#View"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="238" y="404" width="186"/>

-    </children>

-    <children xsi:type="notation:Shape" type="2008" fontName="Microsoft Sans Serif" fontHeight="8" transparency="0" gradient="16777215, 15060913, 0" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="5029"/>

-      <children xsi:type="notation:BasicCompartment" type="7017">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7018">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7019">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="SYSML.metamodel.uml#Rationale"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="702" y="411" width="107"/>

-    </children>

-    <children xsi:type="notation:Shape" type="2008" fontName="Microsoft Sans Serif" fontHeight="8" transparency="0" gradient="16777215, 15060913, 0" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="5029"/>

-      <children xsi:type="notation:BasicCompartment" type="7017">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7018">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7019">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="SYSML.metamodel.uml#Problem"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="822" y="411" width="106"/>

-    </children>

-    <children xsi:type="notation:Shape" type="2008" fontName="Microsoft Sans Serif" fontHeight="8" transparency="0" gradient="16777215, 15060913, 0" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="5029"/>

-      <children xsi:type="notation:BasicCompartment" type="7017">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7018">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7019">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="pathmap://UML_METAMODELS/UML.metamodel.uml#Comment"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="688" y="138" width="122"/>

-    </children>

-    <children xsi:type="notation:Shape" type="2008" fontName="Microsoft Sans Serif" fontHeight="8" transparency="0" gradient="16777215, 15060913, 0" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="5029"/>

-      <children xsi:type="notation:BasicCompartment" type="7017">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7018">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7019">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="272" y="234" width="122"/>

-    </children>

-    <children xsi:type="notation:Shape" type="2008" fontName="Microsoft Sans Serif" fontHeight="8" transparency="0" gradient="16777215, 15060913, 0" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="5029"/>

-      <children xsi:type="notation:BasicCompartment" type="7017">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7018">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7019">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="496" y="237" width="120"/>

-    </children>

-    <children xsi:type="notation:Shape" type="2008" fontName="Microsoft Sans Serif" fontHeight="8" transparency="0" gradient="16777215, 15060913, 0" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="5029"/>

-      <children xsi:type="notation:BasicCompartment" type="7017">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7018">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7019">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="pathmap://UML_METAMODELS/UML.metamodel.uml#Dependency"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="36" y="138" width="107"/>

-    </children>

-    <children xsi:type="notation:Shape" type="2008" fontName="Microsoft Sans Serif" fontHeight="8" transparency="0" gradient="16777215, 15060913, 0" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="5029"/>

-      <children xsi:type="notation:BasicCompartment" type="7017">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7018">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7019">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="pathmap://UML_METAMODELS/UML.metamodel.uml#NamedElement"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="331" y="-8" width="112"/>

-    </children>

-    <styles xsi:type="notation:DiagramStyle"/>

-    <element href="SYSML.metamodel.uml#_0"/>

-    <edges xsi:type="notation:Connector" type="4002" source="/1/@children.3" target="/1/@children.5" routing="Rectilinear" lineColor="0">

-      <children xsi:type="notation:DecorationNode" type="6007">

-        <layoutConstraint xsi:type="notation:Location" y="40"/>

-      </children>

-      <styles xsi:type="notation:FontStyle" fontName="Microsoft Sans Serif" fontHeight="8"/>

-      <element href="SYSML.metamodel.uml#Rationale-_generalization.0"/>

-      <bendpoints xsi:type="notation:RelativeBendpoints" points="[-26, -50, 27, 216]$[-26, -216, 27, 50]"/>

-    </edges>

-    <edges xsi:type="notation:Connector" type="4002" source="/1/@children.4" target="/1/@children.5" routing="Rectilinear" lineColor="0">

-      <children xsi:type="notation:DecorationNode" type="6007">

-        <layoutConstraint xsi:type="notation:Location" y="40"/>

-      </children>

-      <styles xsi:type="notation:FontStyle" fontName="Microsoft Sans Serif" fontHeight="8"/>

-      <element href="SYSML.metamodel.uml#Problem-_generalization.0"/>

-      <bendpoints xsi:type="notation:RelativeBendpoints" points="[13, -50, 153, 223]$[13, -155, 153, 118]$[-129, -155, 11, 118]$[-129, -223, 11, 50]"/>

-    </edges>

-    <edges xsi:type="notation:Connector" type="4002" source="/1/@children.2" target="/1/@children.6" routing="Rectilinear" lineColor="0">

-      <children xsi:type="notation:DecorationNode" type="6007">

-        <layoutConstraint xsi:type="notation:Location" y="40"/>

-      </children>

-      <styles xsi:type="notation:FontStyle" fontName="Microsoft Sans Serif" fontHeight="8"/>

-      <element href="SYSML.metamodel.uml#View-_generalization.0"/>

-      <bendpoints xsi:type="notation:RelativeBendpoints" points="[42, -50, -1, 119]$[42, -119, -1, 50]"/>

-    </edges>

-    <edges xsi:type="notation:Connector" type="4002" source="/1/@children.1" target="/1/@children.7" routing="Rectilinear" lineColor="0">

-      <children xsi:type="notation:DecorationNode" type="6007">

-        <layoutConstraint xsi:type="notation:Location" y="40"/>

-      </children>

-      <styles xsi:type="notation:FontStyle" fontName="Microsoft Sans Serif" fontHeight="8"/>

-      <element href="SYSML.metamodel.uml#Viewpoint-_generalization.0"/>

-      <bendpoints xsi:type="notation:RelativeBendpoints" points="[-2, -51, 0, 126]$[-2, -127, 0, 50]"/>

-    </edges>

-    <edges xsi:type="notation:Connector" type="4002" source="/1/@children.0" target="/1/@children.8" routing="Rectilinear" lineColor="0">

-      <children xsi:type="notation:DecorationNode" type="6007">

-        <layoutConstraint xsi:type="notation:Location" y="40"/>

-      </children>

-      <styles xsi:type="notation:FontStyle" fontName="Microsoft Sans Serif" fontHeight="8"/>

-      <element href="SYSML.metamodel.uml#Conform-_generalization.0"/>

-      <bendpoints xsi:type="notation:RelativeBendpoints" points="[-7, -50, 1, 360]$[-8, -65, 0, 345]$[-8, -360, 0, 50]"/>

-    </edges>

-    <edges xsi:type="notation:Connector" type="4001" source="/1/@children.8" target="/1/@children.9" routing="Rectilinear" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="6001">

-        <layoutConstraint xsi:type="notation:Location" y="-20"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6002">

-        <layoutConstraint xsi:type="notation:Location" x="41" y="18"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6003">

-        <layoutConstraint xsi:type="notation:Location" x="35" y="83"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6004">

-        <layoutConstraint xsi:type="notation:Location" y="20"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6005">

-        <layoutConstraint xsi:type="notation:Location" x="-31" y="12"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6006">

-        <layoutConstraint xsi:type="notation:Location" x="23" y="-13"/>

-      </children>

-      <styles xsi:type="notation:FontStyle" fontName="Microsoft Sans Serif" fontHeight="8"/>

-      <element href="pathmap://UML_METAMODELS/UML.metamodel.uml#A_clientDependency_client"/>

-      <bendpoints xsi:type="notation:RelativeBendpoints" points="[50, -25, -245, 121]$[295, -25, 0, 121]$[295, -96, 0, 50]"/>

-    </edges>

-    <edges xsi:type="notation:Connector" type="4001" source="/1/@children.8" target="/1/@children.9" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="6001">

-        <layoutConstraint xsi:type="notation:Location" y="-20"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6002">

-        <layoutConstraint xsi:type="notation:Location" x="-42" y="-12"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6003">

-        <layoutConstraint xsi:type="notation:Location" x="-55" y="9"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6004">

-        <layoutConstraint xsi:type="notation:Location" x="33" y="10"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6005">

-        <layoutConstraint xsi:type="notation:Location" x="-36" y="15"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6006">

-        <layoutConstraint xsi:type="notation:Location" x="-36" y="-77"/>

-      </children>

-      <styles xsi:type="notation:FontStyle" fontName="Microsoft Sans Serif" fontHeight="8"/>

-      <element href="pathmap://UML_METAMODELS/UML.metamodel.uml#A_supplierDependency_supplier"/>

-      <bendpoints xsi:type="notation:RelativeBendpoints" points="[0, -50, -295, 96]$[0, -146, -295, 0]$[245, -146, -50, 0]"/>

-    </edges>

-    <edges xsi:type="notation:Connector" type="4001" source="/1/@children.0" target="/1/@children.2" routing="Rectilinear" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="6001">

-        <layoutConstraint xsi:type="notation:Location" y="-20"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6002">

-        <layoutConstraint xsi:type="notation:Location" x="-26" y="2"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6003">

-        <layoutConstraint xsi:type="notation:Location" x="-41" y="-13"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6004">

-        <layoutConstraint xsi:type="notation:Location" x="21" y="14"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6005">

-        <layoutConstraint xsi:type="notation:Location" x="-21" y="-13"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6006">

-        <layoutConstraint xsi:type="notation:Location" x="-21" y="125"/>

-      </children>

-      <styles xsi:type="notation:FontStyle" fontName="Microsoft Sans Serif" fontHeight="8"/>

-      <element href="SYSML.metamodel.uml#_jA0_YG1gEd6aGe9mbu2K8Q"/>

-      <bendpoints xsi:type="notation:RelativeBendpoints" points="[43, -24, -167, 125]$[43, -140, -167, 9]$[155, -140, -55, 9]"/>

-      <sourceAnchor xsi:type="notation:IdentityAnchor" id="(0.56,0.24)"/>

-      <targetAnchor xsi:type="notation:IdentityAnchor" id="(0.34375,0.15)"/>

-    </edges>

-    <edges xsi:type="notation:Connector" type="4001" source="/1/@children.0" target="/1/@children.1" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="6001">

-        <layoutConstraint xsi:type="notation:Location" y="-20"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6002">

-        <layoutConstraint xsi:type="notation:Location" x="11" y="12"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6003">

-        <layoutConstraint xsi:type="notation:Location" x="115" y="-26"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6004">

-        <layoutConstraint xsi:type="notation:Location" y="20"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6005">

-        <layoutConstraint xsi:type="notation:Location" y="20"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6006">

-        <layoutConstraint xsi:type="notation:Location" x="66" y="-14"/>

-      </children>

-      <styles xsi:type="notation:FontStyle" fontName="Microsoft Sans Serif" fontHeight="8"/>

-      <element href="SYSML.metamodel.uml#_x1z3oG1VEd6aGe9mbu2K8Q"/>

-      <bendpoints xsi:type="notation:RelativeBendpoints" points="[50, 0, -423, 122]$[473, 0, 0, 122]$[473, -55, 0, 67]"/>

-    </edges>

-  </notation:Diagram>

-  <notation:Diagram type="PapyrusUMLClassDiagram" name="Abstract syntax extensions for SysML properties and blocks" measurementUnit="Pixel">

-    <eAnnotations source="es.cv.gvcase.mdt.uml2.diagram.common.Belongs_To_This_Diagram">

-      <references href="SYSML.metamodel.uml#Block-isEncapsulated-_lowerValue"/>

-      <references href="SYSML.metamodel.uml#Block-isEncapsulated"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-_ownedComment.1"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-_ownedComment.2"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-_ownedComment.3"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-passive_class-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-passive_class-_specification"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-passive_class"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-_generalization.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-_generalization.1"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-isAbstract-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-isAbstract-_ownedComment.1"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-isAbstract-_defaultValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-isAbstract"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-nestedClassifier-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-nestedClassifier-_upperValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-nestedClassifier-_lowerValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-nestedClassifier"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-ownedAttribute-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-ownedAttribute-_upperValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-ownedAttribute-_lowerValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-ownedAttribute"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-ownedOperation-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-ownedOperation-_upperValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-ownedOperation-_lowerValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-ownedOperation"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-superClass-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-superClass-_upperValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-superClass-_lowerValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-superClass"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-isActive-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-isActive-_defaultValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-isActive"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-ownedReception-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-ownedReception-_upperValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-ownedReception-_lowerValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-ownedReception"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-extension-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-extension-_upperValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-extension-_lowerValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-extension"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-getExtensions-_ownedParameter.0-_upperValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-getExtensions-_ownedParameter.0-_lowerValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-getExtensions-_ownedParameter.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-getExtensions"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-createOwnedOperation-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-createOwnedOperation-_ownedParameter.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-createOwnedOperation-name-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-createOwnedOperation-name-_upperValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-createOwnedOperation-name-_lowerValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-createOwnedOperation-name"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-createOwnedOperation-parameterNames-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-createOwnedOperation-parameterNames-_upperValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-createOwnedOperation-parameterNames-_lowerValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-createOwnedOperation-parameterNames"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-createOwnedOperation-parameterTypes-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-createOwnedOperation-parameterTypes-_upperValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-createOwnedOperation-parameterTypes-_lowerValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-createOwnedOperation-parameterTypes"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-createOwnedOperation-returnType-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-createOwnedOperation-returnType-_upperValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-createOwnedOperation-returnType-_lowerValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-createOwnedOperation-returnType"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-createOwnedOperation"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-isMetaclass-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-isMetaclass-_ownedParameter.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-isMetaclass"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-inherit-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-inherit-spec-_specification"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-inherit-spec"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-inherit-_ownedParameter.0-_upperValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-inherit-_ownedParameter.0-_lowerValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-inherit-_ownedParameter.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-inherit-inhs-_upperValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-inherit-inhs-_lowerValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-inherit-inhs"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-inherit"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>

-      <references href="SYSML.metamodel.uml#ConnectorProperty-_generalization.0"/>

-      <references href="SYSML.metamodel.uml#ConnectorProperty-connector"/>

-      <references href="SYSML.metamodel.uml#ConnectorProperty"/>

-      <references href="SYSML.metamodel.uml#ParticipantProperty-_generalization.0"/>

-      <references href="SYSML.metamodel.uml#ParticipantProperty"/>

-      <references href="SYSML.metamodel.uml#DistributedProperty-_generalization.0"/>

-      <references href="SYSML.metamodel.uml#DistributedProperty"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-_ownedComment.1"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-_ownedComment.2"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-_ownedComment.3"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-_ownedComment.4"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-multiplicity_of_composite-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-multiplicity_of_composite-_ownedComment.1"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-multiplicity_of_composite-_specification"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-multiplicity_of_composite"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-subsetting_context_conforms-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-subsetting_context_conforms-_specification"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-subsetting_context_conforms"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-redefined_property_inherited-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-redefined_property_inherited-_specification"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-redefined_property_inherited"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-subsetting_rules-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-subsetting_rules-_specification"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-subsetting_rules"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-navigable_readonly-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-navigable_readonly-_specification"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-navigable_readonly"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-derived_union_is_derived-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-derived_union_is_derived-_specification"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-derived_union_is_derived"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-derived_union_is_read_only-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-derived_union_is_read_only-_specification"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-derived_union_is_read_only"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-subsetted_property_names-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-subsetted_property_names-_specification"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-subsetted_property_names"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-deployment_target-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-deployment_target-_specification"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-deployment_target"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-binding_to_attribute-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-binding_to_attribute-_specification"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-binding_to_attribute"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-_generalization.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-_generalization.1"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-_generalization.2"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-isDerived-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-isDerived-_ownedComment.1"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-isDerived-_defaultValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-isDerived"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-isReadOnly-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-isReadOnly-_ownedComment.1"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-isReadOnly-_defaultValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-isReadOnly"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-isDerivedUnion-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-isDerivedUnion-_defaultValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-isDerivedUnion"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-default-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-default-_ownedComment.1"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-default-_upperValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-default-_lowerValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-default"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-aggregation-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-aggregation-_defaultValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-aggregation"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-isComposite-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-isComposite-_ownedComment.1"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-isComposite-_defaultValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-isComposite"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-class-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-class-_upperValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-class-_lowerValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-class"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-redefinedProperty-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-redefinedProperty-_upperValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-redefinedProperty-_lowerValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-redefinedProperty"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-owningAssociation-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-owningAssociation-_upperValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-owningAssociation-_lowerValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-owningAssociation"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-datatype-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-datatype-_upperValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-datatype-_lowerValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-datatype"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-defaultValue-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-defaultValue-_upperValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-defaultValue-_lowerValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-defaultValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-opposite-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-opposite-_upperValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-opposite-_lowerValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-opposite"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-subsettedProperty-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-subsettedProperty-_upperValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-subsettedProperty-_lowerValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-subsettedProperty"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-association-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-association-_upperValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-association-_lowerValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-association"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-qualifier-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-qualifier-_upperValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-qualifier-_lowerValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-qualifier"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-associationEnd-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-associationEnd-_upperValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-associationEnd-_lowerValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-associationEnd"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-getDefault-_ownedParameter.0-_upperValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-getDefault-_ownedParameter.0-_lowerValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-getDefault-_ownedParameter.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-getDefault"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-isSetDefault-_ownedParameter.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-isSetDefault"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-setDefault-newDefault"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-setDefault"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-setIsComposite-newIsComposite"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-setIsComposite"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-setOpposite-newOpposite"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-setOpposite"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-unsetDefault"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-setIsNavigable-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-setIsNavigable-isNavigable-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-setIsNavigable-isNavigable"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-setIsNavigable"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-getOtherEnd-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-getOtherEnd-_ownedParameter.0-_upperValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-getOtherEnd-_ownedParameter.0-_lowerValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-getOtherEnd-_ownedParameter.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-getOtherEnd"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-setBooleanDefaultValue-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-setBooleanDefaultValue-value-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-setBooleanDefaultValue-value"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-setBooleanDefaultValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-setIntegerDefaultValue-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-setIntegerDefaultValue-value-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-setIntegerDefaultValue-value"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-setIntegerDefaultValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-setStringDefaultValue-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-setStringDefaultValue-value-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-setStringDefaultValue-value"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-setStringDefaultValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-setUnlimitedNaturalDefaultValue-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-setUnlimitedNaturalDefaultValue-value-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-setUnlimitedNaturalDefaultValue-value"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-setUnlimitedNaturalDefaultValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-setNullDefaultValue-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-setNullDefaultValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-isAttribute-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-isAttribute-spec-_specification"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-isAttribute-spec"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-isAttribute-_ownedParameter.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-isAttribute-p"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-isAttribute"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-opposite.1-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-opposite.1-spec-_specification"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-opposite.1-spec"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-opposite.1-_ownedParameter.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-opposite.1"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-isComposite.1-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-isComposite.1-spec-_specification"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-isComposite.1-spec"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-isComposite.1-_ownedParameter.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-isComposite.1"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-isConsistentWith-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-isConsistentWith-_ownedRule.0-_specification"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-isConsistentWith-_ownedRule.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-isConsistentWith-spec-_specification"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-isConsistentWith-spec"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-isConsistentWith-_ownedParameter.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-isConsistentWith-redefinee"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-isConsistentWith"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-subsettingContext-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-subsettingContext-spec-_specification"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-subsettingContext-spec"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-subsettingContext-_ownedParameter.0-_upperValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-subsettingContext-_ownedParameter.0-_lowerValue"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-subsettingContext-_ownedParameter.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-subsettingContext"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-isNavigable-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-isNavigable-spec-_specification"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-isNavigable-spec"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-isNavigable-_ownedParameter.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-isNavigable"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-isCompatibleWith-_ownedComment.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-isCompatibleWith-spec-_specification"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-isCompatibleWith-spec"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-isCompatibleWith-_ownedParameter.0"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-isCompatibleWith-p"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property-isCompatibleWith"/>

-      <references href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>

-    </eAnnotations>

-    <children xsi:type="notation:Shape" type="2008" fontName="Microsoft Sans Serif" fontHeight="8" transparency="0" gradient="16777215, 15060913, 0" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="5029"/>

-      <children xsi:type="notation:BasicCompartment" type="7017">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7018">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7019">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="-9" y="-54" width="106"/>

-    </children>

-    <children xsi:type="notation:Shape" type="2008" fontName="Microsoft Sans Serif" fontHeight="8" transparency="0" gradient="16777215, 15060913, 0" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="5029"/>

-      <children xsi:type="notation:BasicCompartment" type="7017" collapsed="true">

-        <children type="3012">

-          <element href="SYSML.metamodel.uml#ConnectorProperty-connector"/>

-          <layoutConstraint xsi:type="notation:Location" x="41" y="3"/>

-        </children>

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7018">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7019">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="SYSML.metamodel.uml#ConnectorProperty"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="353" y="313" width="230"/>

-    </children>

-    <children xsi:type="notation:Shape" type="2008" fontName="Microsoft Sans Serif" fontHeight="8" transparency="0" gradient="16777215, 15060913, 0" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="5029"/>

-      <children xsi:type="notation:BasicCompartment" type="7017">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7018">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7019">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="SYSML.metamodel.uml#DistributedProperty"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="866" y="313" width="115"/>

-    </children>

-    <children xsi:type="notation:Shape" type="2008" fontName="Microsoft Sans Serif" fontHeight="8" transparency="0" gradient="16777215, 15060913, 0" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="5029"/>

-      <children xsi:type="notation:BasicCompartment" type="7017">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7018">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7019">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="723" y="7" width="164" height="124"/>

-    </children>

-    <children xsi:type="notation:Shape" type="2008" fontName="Microsoft Sans Serif" fontHeight="8" transparency="0" gradient="16777215, 15060913, 0" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="5029"/>

-      <children xsi:type="notation:BasicCompartment" type="7017">

-        <children type="3012">

-          <element href="SYSML.metamodel.uml#Block-isEncapsulated"/>

-          <layoutConstraint xsi:type="notation:Location" x="43" y="8"/>

-        </children>

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7018">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7019">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="SYSML.metamodel.uml#_fmUJsHIpEd6oWe6GYqP1Cw"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="180" y="171" width="192"/>

-    </children>

-    <children xsi:type="notation:Shape" type="2008" fontName="Microsoft Sans Serif" fontHeight="8" transparency="0" gradient="16777215, 15060913, 0" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="5029"/>

-      <children xsi:type="notation:BasicCompartment" type="7017">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7018">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7019">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="SYSML.metamodel.uml#_o98AYHIpEd6oWe6GYqP1Cw"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="-45" y="449" width="188" height="121"/>

-    </children>

-    <children xsi:type="notation:Shape" type="2008" fontName="Microsoft Sans Serif" fontHeight="8" transparency="0" gradient="16777215, 15060913, 0" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="5029"/>

-      <children xsi:type="notation:BasicCompartment" type="7017">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7018">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7019">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="SYSML.metamodel.uml#ParticipantProperty"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="615" y="312" width="226"/>

-    </children>

-    <children xsi:type="notation:Shape" type="2008" fontName="Microsoft Sans Serif" fontHeight="8" transparency="0" gradient="16777215, 15060913, 0" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="5029"/>

-      <children xsi:type="notation:BasicCompartment" type="7017">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7018">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7019">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="SYSML.metamodel.uml#ValueType"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="990" y="92" width="106"/>

-    </children>

-    <children xsi:type="notation:Shape" type="2008" fontName="Microsoft Sans Serif" fontHeight="8" transparency="0" gradient="16777215, 15060913, 0" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="5029"/>

-      <children xsi:type="notation:BasicCompartment" type="7017">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7018">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7019">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="pathmap://UML_METAMODELS/UML.metamodel.uml#Association"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="-59" y="169" width="106"/>

-    </children>

-    <children xsi:type="notation:Shape" type="2008" fontName="Microsoft Sans Serif" fontHeight="8" transparency="0" gradient="16777215, 15060913, 0" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="5029"/>

-      <children xsi:type="notation:BasicCompartment" type="7017" collapsed="true">

-        <children type="3012">

-          <element href="pathmap://UML_METAMODELS/UML.metamodel.uml#Connector-redefinedConnector"/>

-          <layoutConstraint xsi:type="notation:Location" x="45" y="5"/>

-        </children>

-        <children type="3012">

-          <element href="pathmap://UML_METAMODELS/UML.metamodel.uml#Connector-end"/>

-          <layoutConstraint xsi:type="notation:Location" x="45" y="5"/>

-        </children>

-        <children type="3012">

-          <element href="pathmap://UML_METAMODELS/UML.metamodel.uml#Connector-type"/>

-          <layoutConstraint xsi:type="notation:Location" x="45" y="5"/>

-        </children>

-        <children type="3012">

-          <element href="pathmap://UML_METAMODELS/UML.metamodel.uml#Connector-contract"/>

-          <layoutConstraint xsi:type="notation:Location" x="45" y="5"/>

-        </children>

-        <children type="3012">

-          <element href="pathmap://UML_METAMODELS/UML.metamodel.uml#Connector-kind"/>

-          <layoutConstraint xsi:type="notation:Location" x="39" y="13"/>

-        </children>

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7018">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7019">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="pathmap://UML_METAMODELS/UML.metamodel.uml#Connector"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="473" y="175" width="143" height="68"/>

-    </children>

-    <styles xsi:type="notation:DiagramStyle"/>

-    <element href="SYSML.metamodel.uml#_0"/>

-    <edges xsi:type="notation:Connector" type="4001" source="/2/@children.4" target="/2/@children.3" routing="Rectilinear" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="6001">

-        <layoutConstraint xsi:type="notation:Location" y="-20"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6002">

-        <layoutConstraint xsi:type="notation:Location" x="-82" y="-11"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6003">

-        <layoutConstraint xsi:type="notation:Location" x="15" y="-10"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6004">

-        <layoutConstraint xsi:type="notation:Location" x="52" y="8"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6005">

-        <layoutConstraint xsi:type="notation:Location" x="-74" y="-18"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6006">

-        <layoutConstraint xsi:type="notation:Location" x="-74" y="-107"/>

-      </children>

-      <styles xsi:type="notation:FontStyle" fontName="Microsoft Sans Serif" fontHeight="8"/>

-      <element href="SYSML.metamodel.uml#_RiGJYHIbEd6oWe6GYqP1Cw"/>

-      <bendpoints xsi:type="notation:RelativeBendpoints" points="[53, -59, -477, 111]$[53, -160, -477, 10]$[502, -160, -28, 10]"/>

-      <sourceAnchor xsi:type="notation:IdentityAnchor" id="(0.22,0.59)"/>

-      <targetAnchor xsi:type="notation:IdentityAnchor" id="(0.18,0.24)"/>

-    </edges>

-    <edges xsi:type="notation:Connector" type="4001" source="/2/@children.4" target="/2/@children.3" routing="Rectilinear" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="6001">

-        <layoutConstraint xsi:type="notation:Location" y="-20"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6002">

-        <layoutConstraint xsi:type="notation:Location" x="-32" y="-9"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6003">

-        <eAnnotations source="QualifiedName">

-          <details key="QualifiedNameDepth" value="0"/>

-        </eAnnotations>

-        <layoutConstraint xsi:type="notation:Location" x="-11" y="-10"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6004">

-        <layoutConstraint xsi:type="notation:Location" x="43" y="-24"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6005">

-        <layoutConstraint xsi:type="notation:Location" x="-28" y="43"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6006">

-        <layoutConstraint xsi:type="notation:Location" x="71" y="42"/>

-      </children>

-      <styles xsi:type="notation:FontStyle" fontName="Microsoft Sans Serif" fontHeight="8"/>

-      <element href="SYSML.metamodel.uml#_8uzrMHIbEd6oWe6GYqP1Cw"/>

-      <bendpoints xsi:type="notation:RelativeBendpoints" points="[22, -79, -514, 101]$[22, -124, -514, 56]$[410, -124, -126, 56]"/>

-      <sourceAnchor xsi:type="notation:IdentityAnchor" id="(0.71,0.79)"/>

-      <targetAnchor xsi:type="notation:IdentityAnchor" id="(0.8,0.34)"/>

-    </edges>

-    <edges xsi:type="notation:Connector" type="4002" source="/2/@children.5" target="/2/@children.4" routing="Tree" lineColor="0">

-      <children xsi:type="notation:DecorationNode" type="6007">

-        <layoutConstraint xsi:type="notation:Location" y="40"/>

-      </children>

-      <styles xsi:type="notation:FontStyle" fontName="Microsoft Sans Serif" fontHeight="8"/>

-      <element href="SYSML.metamodel.uml#_xdxTcHIpEd6oWe6GYqP1Cw"/>

-      <bendpoints xsi:type="notation:RelativeBendpoints" points="[0, -60, -251, 263]$[0, -171, -251, 152]$[152, -171, -99, 152]$[152, -238, -99, 85]"/>

-      <targetAnchor xsi:type="notation:IdentityAnchor" id="(0.63,0.15)"/>

-    </edges>

-    <edges xsi:type="notation:Connector" type="4002" source="/2/@children.2" target="/2/@children.3" routing="Tree" lineColor="0">

-      <children xsi:type="notation:DecorationNode" type="6007">

-        <layoutConstraint xsi:type="notation:Location" y="40"/>

-      </children>

-      <styles xsi:type="notation:FontStyle" fontName="Microsoft Sans Serif" fontHeight="8"/>

-      <element href="SYSML.metamodel.uml#DistributedProperty-_generalization.0"/>

-      <bendpoints xsi:type="notation:RelativeBendpoints" points="[0, -50, 110, 246]$[0, -74, 110, 222]$[-75, -74, 35, 222]$[-75, -246, 35, 50]"/>

-    </edges>

-    <edges xsi:type="notation:Connector" type="4002" source="/2/@children.6" target="/2/@children.3" routing="Tree" lineColor="0">

-      <children xsi:type="notation:DecorationNode" type="6007">

-        <layoutConstraint xsi:type="notation:Location" y="40"/>

-      </children>

-      <styles xsi:type="notation:FontStyle" fontName="Microsoft Sans Serif" fontHeight="8"/>

-      <element href="SYSML.metamodel.uml#ParticipantProperty-_generalization.0"/>

-      <bendpoints xsi:type="notation:RelativeBendpoints" points="[64, -50, -13, 246]$[64, -74, -13, 222]$[112, -74, 35, 222]$[112, -246, 35, 50]"/>

-    </edges>

-    <edges xsi:type="notation:Connector" type="4002" source="/2/@children.1" target="/2/@children.3" routing="Tree" lineColor="0">

-      <children xsi:type="notation:DecorationNode" type="6007">

-        <layoutConstraint xsi:type="notation:Location" y="40"/>

-      </children>

-      <styles xsi:type="notation:FontStyle" fontName="Microsoft Sans Serif" fontHeight="8"/>

-      <element href="SYSML.metamodel.uml#ConnectorProperty-_generalization.0"/>

-      <bendpoints xsi:type="notation:RelativeBendpoints" points="[108, -50, -229, 247]$[108, -75, -229, 222]$[372, -75, 35, 222]$[372, -247, 35, 50]"/>

-    </edges>

-    <edges xsi:type="notation:Connector" type="4001" source="/2/@children.7" target="/2/@children.2" routing="Rectilinear" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="6001">

-        <layoutConstraint xsi:type="notation:Location" y="-20"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6002">

-        <eAnnotations source="displayNameLabelIcon">

-          <details key="displayNameLabelIcon_value" value="false"/>

-        </eAnnotations>

-        <layoutConstraint xsi:type="notation:Location" y="-80"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6003">

-        <layoutConstraint xsi:type="notation:Location" x="-90" y="-15"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6004">

-        <layoutConstraint xsi:type="notation:Location" x="21" y="13"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6005">

-        <layoutConstraint xsi:type="notation:Location" x="-24" y="-17"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6006">

-        <layoutConstraint xsi:type="notation:Location" x="-25" y="84"/>

-      </children>

-      <styles xsi:type="notation:FontStyle" fontName="Microsoft Sans Serif" fontHeight="8"/>

-      <element href="SYSML.metamodel.uml#_AiN0sHLHEd6z4NQq9r5Ykg"/>

-      <bendpoints xsi:type="notation:RelativeBendpoints" points="[12, 50, 150, -135]$[12, 220, 150, 35]$[-57, 220, 81, 35]"/>

-      <targetAnchor xsi:type="notation:IdentityAnchor" id="(0.425531914893617,0.15)"/>

-    </edges>

-    <edges xsi:type="notation:Connector" type="4002" source="/2/@children.5" target="/2/@children.8" routing="Tree" lineColor="0">

-      <children xsi:type="notation:DecorationNode" type="6007">

-        <layoutConstraint xsi:type="notation:Location" x="-2" y="-42"/>

-      </children>

-      <styles xsi:type="notation:FontStyle" fontName="Microsoft Sans Serif" fontHeight="8"/>

-      <element href="SYSML.metamodel.uml#_0SZzIHabEd6sO-Hboh1LgQ"/>

-      <bendpoints xsi:type="notation:RelativeBendpoints" points="[-1, -23, 60, 266]$[-1, -134, 60, 155]$[-56, -134, 5, 155]$[-56, -203, 5, 86]"/>

-      <sourceAnchor xsi:type="notation:IdentityAnchor" id="(0.5054945054945055,0.19008264462809918)"/>

-      <targetAnchor xsi:type="notation:IdentityAnchor" id="(0.45,0.14)"/>

-    </edges>

-    <edges xsi:type="notation:Connector" type="4001" source="/2/@children.5" target="/2/@children.6" routing="Rectilinear" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="6001">

-        <layoutConstraint xsi:type="notation:Location" y="-20"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6002">

-        <layoutConstraint xsi:type="notation:Location" x="32" y="10"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6003">

-        <layoutConstraint xsi:type="notation:Location" x="-131" y="-77"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6004">

-        <layoutConstraint xsi:type="notation:Location" x="28" y="-79"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6005">

-        <layoutConstraint xsi:type="notation:Location" x="-83" y="11"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6006">

-        <layoutConstraint xsi:type="notation:Location" x="11" y="-11"/>

-      </children>

-      <styles xsi:type="notation:FontStyle" fontName="Microsoft Sans Serif" fontHeight="8"/>

-      <element href="SYSML.metamodel.uml#_SHSG0HIrEd6oWe6GYqP1Cw"/>

-      <bendpoints xsi:type="notation:RelativeBendpoints" points="[91, -2, -355, 146]$[446, -8, 0, 140]$[446, -98, 0, 50]"/>

-    </edges>

-    <edges xsi:type="notation:Connector" type="4002" source="/2/@children.4" target="/2/@children.0" routing="Tree" lineColor="0">

-      <children xsi:type="notation:DecorationNode" type="6007">

-        <layoutConstraint xsi:type="notation:Location" y="40"/>

-      </children>

-      <styles xsi:type="notation:FontStyle" fontName="Microsoft Sans Serif" fontHeight="8"/>

-      <element href="SYSML.metamodel.uml#_W5jNUHacEd6sO-Hboh1LgQ"/>

-      <bendpoints xsi:type="notation:RelativeBendpoints" points="[-36, -15, 173, 203]$[-36, -108, 173, 110]$[-183, -108, 26, 110]$[-183, -140, 26, 78]"/>

-      <sourceAnchor xsi:type="notation:IdentityAnchor" id="(0.23655913978494625,0.15)"/>

-      <targetAnchor xsi:type="notation:IdentityAnchor" id="(0.24,0.22)"/>

-    </edges>

-    <edges xsi:type="notation:Connector" type="4001" source="/2/@children.4" target="/2/@children.2" routing="Rectilinear" jumpLinkStatus="Above" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="6001">

-        <layoutConstraint xsi:type="notation:Location" y="-20"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6002">

-        <layoutConstraint xsi:type="notation:Location" x="28" y="10"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6003">

-        <layoutConstraint xsi:type="notation:Location" x="246" y="-31"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6004">

-        <layoutConstraint xsi:type="notation:Location" x="104" y="-32"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6005">

-        <layoutConstraint xsi:type="notation:Location" x="-115" y="12"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6006">

-        <layoutConstraint xsi:type="notation:Location" x="-114" y="-42"/>

-      </children>

-      <styles xsi:type="notation:FontStyle" fontName="Microsoft Sans Serif" fontHeight="8"/>

-      <element href="SYSML.metamodel.uml#_ZxjRAHajEd6vj7tN0L3z0A"/>

-      <bendpoints xsi:type="notation:RelativeBendpoints" points="[-50, 55, -630, -91]$[-50, 238, -630, 92]$[580, 238, 0, 92]$[580, 196, 0, 50]"/>

-      <sourceAnchor xsi:type="notation:IdentityAnchor" id="(0.7688172043010753,0.45)"/>

-    </edges>

-    <edges xsi:type="notation:Connector" type="4001" source="/2/@children.9" target="/2/@children.1" routing="Rectilinear" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="6001">

-        <layoutConstraint xsi:type="notation:Location" y="-20"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6002">

-        <layoutConstraint xsi:type="notation:Location" y="20"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" visible="false" type="6003">

-        <layoutConstraint xsi:type="notation:Location" y="-20"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6004">

-        <layoutConstraint xsi:type="notation:Location" x="-1" y="-15"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6005">

-        <layoutConstraint xsi:type="notation:Location" x="5" y="10"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6006">

-        <layoutConstraint xsi:type="notation:Location" x="4" y="-77"/>

-      </children>

-      <styles xsi:type="notation:FontStyle" fontName="Microsoft Sans Serif" fontHeight="8"/>

-      <element href="SYSML.metamodel.uml#_packagedElement.46"/>

-      <bendpoints xsi:type="notation:RelativeBendpoints" points="[-33, 34, 43, -120]$[-33, 104, 43, -50]"/>

-    </edges>

-    <edges xsi:type="notation:Connector" type="4001" source="/2/@children.6" target="/2/@children.3" routing="Rectilinear" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="6001">

-        <layoutConstraint xsi:type="notation:Location" y="-20"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6002">

-        <layoutConstraint xsi:type="notation:Location" x="10" y="-22"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6003">

-        <layoutConstraint xsi:type="notation:Location" x="13" y="-53"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6004">

-        <layoutConstraint xsi:type="notation:Location" x="11" y="7"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" visible="false" type="6005">

-        <layoutConstraint xsi:type="notation:Location" x="-16" y="13"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" visible="false" type="6006">

-        <layoutConstraint xsi:type="notation:Location" x="-18" y="-31"/>

-      </children>

-      <styles xsi:type="notation:FontStyle" fontName="Microsoft Sans Serif" fontHeight="8"/>

-      <element href="SYSML.metamodel.uml#_ICdvII1XEd6Uwep1wGTpyA"/>

-      <bendpoints xsi:type="notation:RelativeBendpoints" points="[32, -50, -35, 294]$[32, -246, -35, 98]"/>

-      <targetAnchor xsi:type="notation:IdentityAnchor" id="(0.43670886075949367,0.02)"/>

-    </edges>

-  </notation:Diagram>

-  <notation:Diagram type="PapyrusUMLClassDiagram" name="Abstract syntax extensions for SysML value types" measurementUnit="Pixel">

-    <children xsi:type="notation:Shape" type="2008" fontName="Microsoft Sans Serif" fontHeight="8" transparency="0" gradient="16777215, 15060913, 0" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="5029"/>

-      <children xsi:type="notation:BasicCompartment" type="7017">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7018">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7019">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="pathmap://UML_METAMODELS/UML.metamodel.uml#InstanceSpecification"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="354" y="32"/>

-    </children>

-    <children xsi:type="notation:Shape" type="2008" fontName="Microsoft Sans Serif" fontHeight="8" transparency="0" gradient="16777215, 15060913, 0" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="5029"/>

-      <children xsi:type="notation:BasicCompartment" type="7017">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7018">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7019">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="pathmap://UML_METAMODELS/UML.metamodel.uml#DataType"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="101" y="40"/>

-    </children>

-    <children xsi:type="notation:Shape" type="2008" fontName="Microsoft Sans Serif" fontHeight="8" transparency="0" gradient="16777215, 15060913, 0" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="5029"/>

-      <children xsi:type="notation:BasicCompartment" type="7017">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7018">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7019">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="SYSML.metamodel.uml#ValueType"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="26" y="221" width="114"/>

-    </children>

-    <children xsi:type="notation:Shape" type="2008" fontName="Microsoft Sans Serif" fontHeight="8" transparency="0" gradient="16777215, 15060913, 0" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="5029"/>

-      <children xsi:type="notation:BasicCompartment" type="7017">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7018">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7019">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="SYSML.metamodel.uml#Unit"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="278" y="224"/>

-    </children>

-    <children xsi:type="notation:Shape" type="2008" fontName="Microsoft Sans Serif" fontHeight="8" transparency="0" gradient="16777215, 15060913, 0" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="5029"/>

-      <children xsi:type="notation:BasicCompartment" type="7017">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7018">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7019">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="SYSML.metamodel.uml#Dimension"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="596" y="225" width="145"/>

-    </children>

-    <styles xsi:type="notation:DiagramStyle"/>

-    <element href="SYSML.metamodel.uml#_0"/>

-    <edges xsi:type="notation:Connector" type="4002" source="/3/@children.2" target="/3/@children.1" routing="Rectilinear" lineColor="0">

-      <children xsi:type="notation:DecorationNode" type="6007">

-        <layoutConstraint xsi:type="notation:Location" y="40"/>

-      </children>

-      <styles xsi:type="notation:FontStyle" fontName="Microsoft Sans Serif" fontHeight="8"/>

-      <element href="SYSML.metamodel.uml#ValueType-_generalization.0"/>

-      <bendpoints xsi:type="notation:RelativeBendpoints" points="[46, -50, -30, 137]$[46, -137, -30, 50]"/>

-    </edges>

-    <edges xsi:type="notation:Connector" type="4002" source="/3/@children.3" target="/3/@children.0" routing="Rectilinear" lineColor="0">

-      <children xsi:type="notation:DecorationNode" type="6007">

-        <layoutConstraint xsi:type="notation:Location" y="40"/>

-      </children>

-      <styles xsi:type="notation:FontStyle" fontName="Microsoft Sans Serif" fontHeight="8"/>

-      <element href="SYSML.metamodel.uml#Unit-_generalization.0"/>

-      <bendpoints xsi:type="notation:RelativeBendpoints" points="[0, -50, -94, 139]$[0, -92, -94, 97]$[68, -92, -26, 97]$[68, -139, -26, 50]"/>

-    </edges>

-    <edges xsi:type="notation:Connector" type="4002" source="/3/@children.4" target="/3/@children.0" routing="Rectilinear" lineColor="0">

-      <children xsi:type="notation:DecorationNode" type="6007">

-        <layoutConstraint xsi:type="notation:Location" y="40"/>

-      </children>

-      <styles xsi:type="notation:FontStyle" fontName="Microsoft Sans Serif" fontHeight="8"/>

-      <element href="SYSML.metamodel.uml#Dimension-_generalization.0"/>

-      <bendpoints xsi:type="notation:RelativeBendpoints" points="[-15, -50, 66, 134]$[-15, -89, 66, 95]$[-115, -89, -34, 95]$[-115, -134, -34, 50]"/>

-    </edges>

-    <edges xsi:type="notation:Connector" type="4001" source="/3/@children.3" target="/3/@children.2" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="6001">

-        <layoutConstraint xsi:type="notation:Location" y="-20"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6002">

-        <layoutConstraint xsi:type="notation:Location" y="20"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" visible="false" type="6003">

-        <layoutConstraint xsi:type="notation:Location" y="-20"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6004">

-        <layoutConstraint xsi:type="notation:Location" y="20"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6005">

-        <layoutConstraint xsi:type="notation:Location" x="1" y="13"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6006">

-        <layoutConstraint xsi:type="notation:Location" x="35" y="-16"/>

-      </children>

-      <styles xsi:type="notation:FontStyle" fontName="Microsoft Sans Serif" fontHeight="8"/>

-      <element href="SYSML.metamodel.uml#_packagedElement.25"/>

-      <bendpoints xsi:type="notation:RelativeBendpoints" points="[-50, -2, 143, 0]$[-143, 0, 50, 2]"/>

-    </edges>

-    <edges xsi:type="notation:Connector" type="4001" source="/3/@children.4" target="/3/@children.2" routing="Rectilinear" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="6001">

-        <layoutConstraint xsi:type="notation:Location" y="-20"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6002">

-        <layoutConstraint xsi:type="notation:Location" y="20"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" visible="false" type="6003">

-        <layoutConstraint xsi:type="notation:Location" y="-20"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6004">

-        <layoutConstraint xsi:type="notation:Location" x="43" y="13"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6005">

-        <layoutConstraint xsi:type="notation:Location" x="-81" y="6"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6006">

-        <layoutConstraint xsi:type="notation:Location" x="14" y="9"/>

-      </children>

-      <styles xsi:type="notation:FontStyle" fontName="Microsoft Sans Serif" fontHeight="8"/>

-      <element href="SYSML.metamodel.uml#_packagedElement.26"/>

-      <bendpoints xsi:type="notation:RelativeBendpoints" points="[13, 50, 598, 54]$[13, 83, 598, 87]$[-546, 83, 39, 87]$[-546, 46, 39, 50]"/>

-    </edges>

-    <edges xsi:type="notation:Connector" type="4001" source="/3/@children.4" target="/3/@children.3" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="6001">

-        <layoutConstraint xsi:type="notation:Location" y="-20"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6002">

-        <layoutConstraint xsi:type="notation:Location" y="20"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" visible="false" type="6003">

-        <layoutConstraint xsi:type="notation:Location" y="-20"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6004">

-        <layoutConstraint xsi:type="notation:Location" x="24" y="-12"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6005">

-        <layoutConstraint xsi:type="notation:Location" x="-4" y="10"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6006">

-        <layoutConstraint xsi:type="notation:Location" x="40" y="-14"/>

-      </children>

-      <styles xsi:type="notation:FontStyle" fontName="Microsoft Sans Serif" fontHeight="8"/>

-      <element href="SYSML.metamodel.uml#_packagedElement.24"/>

-      <bendpoints xsi:type="notation:RelativeBendpoints" points="[-50, -1, 152, 2]$[-152, -3, 50, 0]"/>

-    </edges>

-  </notation:Diagram>

-  <notation:Diagram type="PapyrusUMLClassDiagram" name="Abstract syntax extensions for SysML connector ends" measurementUnit="Pixel">

-    <children xsi:type="notation:Shape" type="2008" fontName="Microsoft Sans Serif" fontHeight="8" transparency="0" gradient="16777215, 15060913, 0" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="5029"/>

-      <children xsi:type="notation:BasicCompartment" type="7017">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7018">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7019">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="SYSML.metamodel.uml#BindingConnector"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="114" y="295" width="135"/>

-    </children>

-    <children xsi:type="notation:Shape" type="2008" fontName="Microsoft Sans Serif" fontHeight="8" transparency="0" gradient="16777215, 15060913, 0" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="5029"/>

-      <children xsi:type="notation:BasicCompartment" type="7017">

-        <children type="3012">

-          <element href="SYSML.metamodel.uml#NestedConnectorEnd-propertyPath"/>

-          <layoutConstraint xsi:type="notation:Location" x="18" y="5"/>

-        </children>

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7018">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7019">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="SYSML.metamodel.uml#NestedConnectorEnd"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="347" y="293" width="209"/>

-    </children>

-    <children xsi:type="notation:Shape" type="2008" fontName="Microsoft Sans Serif" fontHeight="8" transparency="0" gradient="16777215, 15060913, 0" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="5029"/>

-      <children xsi:type="notation:BasicCompartment" type="7017">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7018">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7019">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="pathmap://UML_METAMODELS/UML.metamodel.uml#Connector"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="128" y="46" width="108"/>

-    </children>

-    <children xsi:type="notation:Shape" type="2008" fontName="Microsoft Sans Serif" fontHeight="8" transparency="0" gradient="16777215, 15060913, 0" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="5029"/>

-      <children xsi:type="notation:BasicCompartment" type="7017">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7018">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7019">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="pathmap://UML_METAMODELS/UML.metamodel.uml#ConnectorEnd"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="379" y="47" width="108"/>

-    </children>

-    <styles xsi:type="notation:DiagramStyle"/>

-    <element href="SYSML.metamodel.uml#_0"/>

-    <edges xsi:type="notation:Connector" type="4002" source="/4/@children.1" target="/4/@children.3" routing="Rectilinear" lineColor="0">

-      <children xsi:type="notation:DecorationNode" type="6007">

-        <layoutConstraint xsi:type="notation:Location" y="40"/>

-      </children>

-      <styles xsi:type="notation:FontStyle" fontName="Microsoft Sans Serif" fontHeight="8"/>

-      <element href="SYSML.metamodel.uml#NestedConnectorEnd-_generalization.0"/>

-      <bendpoints xsi:type="notation:RelativeBendpoints" points="[62, -50, -255, 205]$[267, -215, -50, 40]"/>

-    </edges>

-    <edges xsi:type="notation:Connector" type="4002" source="/4/@children.0" target="/4/@children.2" routing="Rectilinear" lineColor="0">

-      <children xsi:type="notation:DecorationNode" type="6007">

-        <layoutConstraint xsi:type="notation:Location" y="40"/>

-      </children>

-      <styles xsi:type="notation:FontStyle" fontName="Microsoft Sans Serif" fontHeight="8"/>

-      <element href="SYSML.metamodel.uml#BindingConnector-_generalization.0"/>

-      <bendpoints xsi:type="notation:RelativeBendpoints" points="[-3, -50, 8, 208]$[-9, -208, 2, 50]"/>

-    </edges>

-  </notation:Diagram>

-  <notation:Diagram type="PapyrusUMLClassDiagram" name="Abstract syntax extensions for SysML property-specific types" measurementUnit="Pixel">

-    <children xsi:type="notation:Shape" type="2008" fontName="Microsoft Sans Serif" fontHeight="8" transparency="0" gradient="16777215, 15060913, 0" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="5029"/>

-      <children xsi:type="notation:BasicCompartment" type="7017">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7018">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7019">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="SYSML.metamodel.uml#PropertySpecificType"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="262" y="321" width="170"/>

-    </children>

-    <children xsi:type="notation:Shape" type="2008" fontName="Microsoft Sans Serif" fontHeight="8" transparency="0" gradient="16777215, 15060913, 0" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="5029"/>

-      <children xsi:type="notation:BasicCompartment" type="7017">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7018">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7019">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="pathmap://UML_METAMODELS/UML.metamodel.uml#Classifier"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="278" y="69" width="107"/>

-    </children>

-    <styles xsi:type="notation:DiagramStyle"/>

-    <element href="SYSML.metamodel.uml#_0"/>

-    <edges xsi:type="notation:Connector" type="4002" source="/5/@children.0" target="/5/@children.1" routing="Rectilinear" lineColor="0">

-      <children xsi:type="notation:DecorationNode" type="6007">

-        <layoutConstraint xsi:type="notation:Location" y="40"/>

-      </children>

-      <styles xsi:type="notation:FontStyle" fontName="Microsoft Sans Serif" fontHeight="8"/>

-      <element href="SYSML.metamodel.uml#PropertySpecificType-_generalization.0"/>

-      <bendpoints xsi:type="notation:RelativeBendpoints" points="[-1, -50, 0, 202]$[0, -202, 1, 50]"/>

-    </edges>

-  </notation:Diagram>

-  <notation:Diagram type="PapyrusUMLClassDiagram" name="Port Stereotypes" measurementUnit="Pixel">

-    <children xsi:type="notation:Shape" type="2008" fontName="Microsoft Sans Serif" fontHeight="8" transparency="0" gradient="16777215, 15060913, 0" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="5029"/>

-      <children xsi:type="notation:BasicCompartment" type="7017">

-        <children type="3012">

-          <element href="SYSML.metamodel.uml#FlowProperty-direction"/>

-          <layoutConstraint xsi:type="notation:Location" x="43" y="7"/>

-        </children>

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7018">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7019">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="SYSML.metamodel.uml#FlowProperty"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="274" y="253" width="196"/>

-    </children>

-    <children xsi:type="notation:Shape" type="2008" fontName="Microsoft Sans Serif" fontHeight="8" transparency="0" gradient="16777215, 15060913, 0" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="5029"/>

-      <children xsi:type="notation:BasicCompartment" type="7017">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7018">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7019">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="SYSML.metamodel.uml#FlowSpecification"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="829" y="382" width="108"/>

-    </children>

-    <children xsi:type="notation:Shape" type="2006" fontName="Microsoft Sans Serif" fontHeight="8" transparency="0" gradient="16777215, 15060913, 0" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="5023"/>

-      <children xsi:type="notation:BasicCompartment" type="7015">

-        <children type="3017">

-          <element href="SYSML.metamodel.uml#FlowDirection-inout"/>

-          <layoutConstraint xsi:type="notation:Location" x="29" y="14"/>

-        </children>

-        <children type="3017">

-          <element href="SYSML.metamodel.uml#FlowDirection-in"/>

-          <layoutConstraint xsi:type="notation:Location" x="29" y="14"/>

-        </children>

-        <children type="3017">

-          <element href="SYSML.metamodel.uml#FlowDirection-out"/>

-          <layoutConstraint xsi:type="notation:Location" x="29" y="14"/>

-        </children>

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="SYSML.metamodel.uml#FlowDirection"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="278" y="397" width="131" height="120"/>

-    </children>

-    <children xsi:type="notation:Shape" type="2008" fontName="Microsoft Sans Serif" fontHeight="8" transparency="0" gradient="16777215, 15060913, 0" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="5029"/>

-      <children xsi:type="notation:BasicCompartment" type="7017">

-        <children type="3012">

-          <element href="SYSML.metamodel.uml#FlowPort-isConjugated"/>

-          <layoutConstraint xsi:type="notation:Location" x="23" y="11"/>

-        </children>

-        <children type="3012">

-          <element href="SYSML.metamodel.uml#FlowPort-isAtomic"/>

-          <layoutConstraint xsi:type="notation:Location" x="23" y="11"/>

-        </children>

-        <children type="3012">

-          <element href="SYSML.metamodel.uml#FlowPort-direction"/>

-          <layoutConstraint xsi:type="notation:Location" x="23" y="11"/>

-        </children>

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7018">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7019">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="SYSML.metamodel.uml#FlowPort"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="18" y="417" width="214"/>

-    </children>

-    <children xsi:type="notation:Shape" type="2008" fontName="Microsoft Sans Serif" fontHeight="8" transparency="0" gradient="16777215, 15060913, 0" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="5029"/>

-      <children xsi:type="notation:BasicCompartment" type="7017" collapsed="true">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7018" collapsed="true">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7019" collapsed="true">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="pathmap://UML_METAMODELS/UML.metamodel.uml#Interface"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="831" y="169" width="106"/>

-    </children>

-    <children xsi:type="notation:Shape" type="2008" fontName="Microsoft Sans Serif" fontHeight="8" transparency="0" gradient="16777215, 15060913, 0" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="5029"/>

-      <children xsi:type="notation:BasicCompartment" type="7017">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7018">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7019">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="pathmap://UML_METAMODELS/UML.metamodel.uml#Port"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="67" y="265" width="106"/>

-    </children>

-    <children xsi:type="notation:Shape" type="2008" fontName="Microsoft Sans Serif" fontHeight="8" transparency="0" gradient="16777215, 15060913, 0" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="5029"/>

-      <children xsi:type="notation:BasicCompartment" type="7017">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7018">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7019">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="210" y="39" width="106"/>

-    </children>

-    <styles xsi:type="notation:DiagramStyle"/>

-    <element href="SYSML.metamodel.uml#_0"/>

-    <edges xsi:type="notation:Connector" type="4002" source="/6/@children.3" target="/6/@children.5" routing="Rectilinear" lineColor="0">

-      <children xsi:type="notation:DecorationNode" type="6007">

-        <layoutConstraint xsi:type="notation:Location" y="40"/>

-      </children>

-      <styles xsi:type="notation:FontStyle" fontName="Microsoft Sans Serif" fontHeight="8"/>

-      <element href="SYSML.metamodel.uml#FlowPort-_generalization.0"/>

-      <bendpoints xsi:type="notation:RelativeBendpoints" points="[-3, -50, 8, 85]$[-3, -85, 8, 50]"/>

-    </edges>

-    <edges xsi:type="notation:Connector" type="4002" source="/6/@children.0" target="/6/@children.6" routing="Rectilinear" lineColor="0">

-      <children xsi:type="notation:DecorationNode" type="6007">

-        <layoutConstraint xsi:type="notation:Location" y="40"/>

-      </children>

-      <styles xsi:type="notation:FontStyle" fontName="Microsoft Sans Serif" fontHeight="8"/>

-      <element href="SYSML.metamodel.uml#FlowProperty-_generalization.0"/>

-      <bendpoints xsi:type="notation:RelativeBendpoints" points="[9, -50, 86, 164]$[9, -121, 86, 93]$[-82, -121, -5, 93]$[-82, -164, -5, 50]"/>

-    </edges>

-    <edges xsi:type="notation:Connector" type="4002" source="/6/@children.1" target="/6/@children.4" routing="Rectilinear" lineColor="0">

-      <children xsi:type="notation:DecorationNode" type="6007">

-        <layoutConstraint xsi:type="notation:Location" y="40"/>

-      </children>

-      <styles xsi:type="notation:FontStyle" fontName="Microsoft Sans Serif" fontHeight="8"/>

-      <element href="SYSML.metamodel.uml#FlowSpecification-_generalization.0"/>

-      <bendpoints xsi:type="notation:RelativeBendpoints" points="[-3, -50, 6, 143]$[-7, -143, 2, 50]"/>

-    </edges>

-    <edges xsi:type="notation:Connector" type="4002" source="/6/@children.5" target="/6/@children.6" routing="Rectilinear" lineColor="0">

-      <children xsi:type="notation:DecorationNode" type="6007">

-        <layoutConstraint xsi:type="notation:Location" y="40"/>

-      </children>

-      <styles xsi:type="notation:FontStyle" fontName="Microsoft Sans Serif" fontHeight="8"/>

-      <element href="pathmap://UML_METAMODELS/UML.metamodel.uml#Port-_generalization.0"/>

-      <bendpoints xsi:type="notation:RelativeBendpoints" points="[17, -50, -116, 139]$[17, -108, -116, 81]$[120, -108, -13, 81]$[120, -139, -13, 50]"/>

-    </edges>

-    <edges xsi:type="notation:Connector" type="4001" source="/6/@children.1" target="/6/@children.0" routing="Rectilinear" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="6001">

-        <layoutConstraint xsi:type="notation:Location" y="-20"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6002">

-        <layoutConstraint xsi:type="notation:Location" y="8"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6003">

-        <layoutConstraint xsi:type="notation:Location" x="-79" y="15"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6004">

-        <layoutConstraint xsi:type="notation:Location" x="54" y="14"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6005">

-        <layoutConstraint xsi:type="notation:Location" x="-50" y="-10"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6006">

-        <layoutConstraint xsi:type="notation:Location" x="42" y="-9"/>

-      </children>

-      <styles xsi:type="notation:FontStyle" fontName="Microsoft Sans Serif" fontHeight="8"/>

-      <element href="SYSML.metamodel.uml#_1WAjgHLdEd6z4NQq9r5Ykg"/>

-      <bendpoints xsi:type="notation:RelativeBendpoints" points="[-57, -1, 230, 2]$[-254, 0, 33, 3]"/>

-      <targetAnchor xsi:type="notation:IdentityAnchor" id="(0.8263157894736842,0.56)"/>

-    </edges>

-  </notation:Diagram>

-  <notation:Diagram type="PapyrusUMLClassDiagram" name="ItemFlow Stereotype" measurementUnit="Pixel">

-    <children xsi:type="notation:Shape" type="2008" fontName="Microsoft Sans Serif" fontHeight="8" transparency="0" gradient="16777215, 15060913, 0" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="5029"/>

-      <children xsi:type="notation:BasicCompartment" type="7017">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7018">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7019">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="pathmap://UML_METAMODELS/UML.metamodel.uml#NamedElement"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="775" y="151"/>

-    </children>

-    <children xsi:type="notation:Shape" type="2008" fontName="Microsoft Sans Serif" fontHeight="8" transparency="0" gradient="16777215, 15060913, 0" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="5029"/>

-      <children xsi:type="notation:BasicCompartment" type="7017">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7018">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7019">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="pathmap://UML_METAMODELS/UML.metamodel.uml#InformationItem"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="35" y="307"/>

-    </children>

-    <children xsi:type="notation:Shape" type="2008" fontName="Microsoft Sans Serif" fontHeight="8" transparency="0" gradient="16777215, 15060913, 0" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="5029"/>

-      <children xsi:type="notation:BasicCompartment" type="7017">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7018">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7019">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="pathmap://UML_METAMODELS/UML.metamodel.uml#Classifier"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="51" y="65"/>

-    </children>

-    <children xsi:type="notation:Shape" type="2008" fontName="Microsoft Sans Serif" fontHeight="8" transparency="0" gradient="16777215, 15060913, 0" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="5029"/>

-      <children xsi:type="notation:BasicCompartment" type="7017">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7018">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7019">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="pathmap://UML_METAMODELS/UML.metamodel.uml#InformationFlow"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="327" y="153" width="134"/>

-    </children>

-    <children xsi:type="notation:Shape" type="2008" fontName="Microsoft Sans Serif" fontHeight="8" transparency="0" gradient="16777215, 15060913, 0" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="5029"/>

-      <children xsi:type="notation:BasicCompartment" type="7017">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7018">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7019">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="SYSML.metamodel.uml#ItemFlow"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="300" y="302" width="199"/>

-    </children>

-    <children xsi:type="notation:Shape" type="2008" fontName="Microsoft Sans Serif" fontHeight="8" transparency="0" gradient="16777215, 15060913, 0" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="5029"/>

-      <children xsi:type="notation:BasicCompartment" type="7017">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7018">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7019">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="701" y="299"/>

-    </children>

-    <styles xsi:type="notation:DiagramStyle"/>

-    <element href="SYSML.metamodel.uml#_0"/>

-    <edges xsi:type="notation:Connector" type="4002" source="/7/@children.4" target="/7/@children.3" routing="Rectilinear" lineColor="0">

-      <children xsi:type="notation:DecorationNode" type="6007">

-        <layoutConstraint xsi:type="notation:Location" y="40"/>

-      </children>

-      <styles xsi:type="notation:FontStyle" fontName="Microsoft Sans Serif" fontHeight="8"/>

-      <element href="SYSML.metamodel.uml#ItemFlow-_generalization.0"/>

-      <bendpoints xsi:type="notation:RelativeBendpoints" points="[-7, -50, 16, 136]$[-7, -136, 16, 50]"/>

-    </edges>

-    <edges xsi:type="notation:Connector" type="4002" source="/7/@children.1" target="/7/@children.2" routing="Rectilinear" lineColor="0">

-      <children xsi:type="notation:DecorationNode" type="6007">

-        <layoutConstraint xsi:type="notation:Location" y="40"/>

-      </children>

-      <styles xsi:type="notation:FontStyle" fontName="Microsoft Sans Serif" fontHeight="8"/>

-      <element href="pathmap://UML_METAMODELS/UML.metamodel.uml#InformationItem-_generalization.0"/>

-      <bendpoints xsi:type="notation:RelativeBendpoints" points="[3, -50, -13, 192]$[12, -192, -4, 50]"/>

-    </edges>

-    <edges xsi:type="notation:Connector" type="4001" source="/7/@children.2" target="/7/@children.3" routing="Rectilinear" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="6001">

-        <layoutConstraint xsi:type="notation:Location" y="-20"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6002">

-        <layoutConstraint xsi:type="notation:Location" x="-8" y="-10"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" visible="false" type="6003">

-        <layoutConstraint xsi:type="notation:Location" x="-39" y="-94"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6004">

-        <layoutConstraint xsi:type="notation:Location" x="37" y="18"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6005">

-        <layoutConstraint xsi:type="notation:Location" x="-13" y="20"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6006">

-        <layoutConstraint xsi:type="notation:Location" x="-89" y="19"/>

-      </children>

-      <styles xsi:type="notation:FontStyle" fontName="Microsoft Sans Serif" fontHeight="8"/>

-      <element href="pathmap://UML_METAMODELS/UML.metamodel.uml#A_conveyed_informationFlow"/>

-      <bendpoints xsi:type="notation:RelativeBendpoints" points="[8, -50, -279, -138]$[8, -79, -279, -167]$[255, -79, -32, -167]$[255, 38, -32, -50]"/>

-    </edges>

-    <edges xsi:type="notation:Connector" type="4001" source="/7/@children.0" target="/7/@children.3" routing="Rectilinear" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="6001">

-        <layoutConstraint xsi:type="notation:Location" y="-20"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6002">

-        <layoutConstraint xsi:type="notation:Location" x="-12" y="12"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" visible="false" type="6003">

-        <layoutConstraint xsi:type="notation:Location" y="-20"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6004">

-        <layoutConstraint xsi:type="notation:Location" x="15" y="-19"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6005">

-        <layoutConstraint xsi:type="notation:Location" x="-51" y="-17"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6006">

-        <layoutConstraint xsi:type="notation:Location" x="83" y="-17"/>

-      </children>

-      <styles xsi:type="notation:FontStyle" fontName="Microsoft Sans Serif" fontHeight="8"/>

-      <element href="pathmap://UML_METAMODELS/UML.metamodel.uml#A_informationSource_informationFlow"/>

-      <bendpoints xsi:type="notation:RelativeBendpoints" points="[-16, -50, 348, -52]$[-16, -78, 348, -80]$[-326, -78, 38, -80]$[-326, -48, 38, -50]"/>

-    </edges>

-    <edges xsi:type="notation:Connector" type="4001" source="/7/@children.2" target="/7/@children.1" routing="Rectilinear" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="6001">

-        <layoutConstraint xsi:type="notation:Location" y="-20"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6002">

-        <layoutConstraint xsi:type="notation:Location" x="17" y="-6"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" visible="false" type="6003">

-        <layoutConstraint xsi:type="notation:Location" x="-1" y="8"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6004">

-        <layoutConstraint xsi:type="notation:Location" x="42" y="-14"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6005">

-        <layoutConstraint xsi:type="notation:Location" x="14" y="40"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6006">

-        <layoutConstraint xsi:type="notation:Location" x="-18" y="-1"/>

-      </children>

-      <styles xsi:type="notation:FontStyle" fontName="Microsoft Sans Serif" fontHeight="8"/>

-      <element href="pathmap://UML_METAMODELS/UML.metamodel.uml#A_represented_representation"/>

-      <bendpoints xsi:type="notation:RelativeBendpoints" points="[50, 0, 66, -242]$[103, 0, 119, -242]$[103, 242, 119, 0]$[35, 242, 51, 0]"/>

-    </edges>

-    <edges xsi:type="notation:Connector" type="4001" source="/7/@children.0" target="/7/@children.3" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="6001">

-        <layoutConstraint xsi:type="notation:Location" y="-20"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6002">

-        <layoutConstraint xsi:type="notation:Location" x="-8" y="10"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" visible="false" type="6003">

-        <layoutConstraint xsi:type="notation:Location" y="-20"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6004">

-        <layoutConstraint xsi:type="notation:Location" x="31" y="12"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6005">

-        <layoutConstraint xsi:type="notation:Location" x="-23" y="8"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6006">

-        <layoutConstraint xsi:type="notation:Location" x="60" y="-11"/>

-      </children>

-      <styles xsi:type="notation:FontStyle" fontName="Microsoft Sans Serif" fontHeight="8"/>

-      <element href="pathmap://UML_METAMODELS/UML.metamodel.uml#A_informationSource_informationFlow"/>

-      <bendpoints xsi:type="notation:RelativeBendpoints" points="[-58, -5, 191, 16]$[-188, -16, 61, 5]"/>

-    </edges>

-    <edges xsi:type="notation:Connector" type="4001" source="/7/@children.5" target="/7/@children.4" routing="Rectilinear" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="6001">

-        <layoutConstraint xsi:type="notation:Location" y="-20"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6002">

-        <layoutConstraint xsi:type="notation:Location" y="20"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" visible="false" type="6003">

-        <layoutConstraint xsi:type="notation:Location" y="-20"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6004">

-        <layoutConstraint xsi:type="notation:Location" x="16" y="-14"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6005">

-        <layoutConstraint xsi:type="notation:Location" x="-6" y="-14"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6006">

-        <layoutConstraint xsi:type="notation:Location" x="53" y="12"/>

-      </children>

-      <styles xsi:type="notation:FontStyle" fontName="Microsoft Sans Serif" fontHeight="8"/>

-      <element href="SYSML.metamodel.uml#_packagedElement.29"/>

-      <bendpoints xsi:type="notation:RelativeBendpoints" points="[0, 0, -401, -374]$[347, 324, -54, -50]"/>

-    </edges>

-  </notation:Diagram>

-  <notation:Diagram type="PapyrusUMLClassDiagram" name="Stereotypes defined in SysML ConstraintBlocks package" measurementUnit="Pixel">

-    <children xsi:type="notation:Shape" type="2008" fontName="Microsoft Sans Serif" fontHeight="8" transparency="0" gradient="16777215, 15060913, 0" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="5029"/>

-      <children xsi:type="notation:BasicCompartment" type="7017">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7018">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7019">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="541" y="83" width="106"/>

-    </children>

-    <children xsi:type="notation:Shape" type="2008" fontName="Microsoft Sans Serif" fontHeight="8" transparency="0" gradient="16777215, 15060913, 0" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="5029"/>

-      <children xsi:type="notation:BasicCompartment" type="7017">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7018">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7019">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="SYSML.metamodel.uml#ConstraintBlock"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="-17" y="301" width="106"/>

-    </children>

-    <children xsi:type="notation:Shape" type="2008" fontName="Microsoft Sans Serif" fontHeight="8" transparency="0" gradient="16777215, 15060913, 0" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="5029"/>

-      <children xsi:type="notation:BasicCompartment" type="7017">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7018">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7019">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="SYSML.metamodel.uml#ConstraintProperty"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="564" y="298" width="112"/>

-    </children>

-    <children xsi:type="notation:Shape" type="2008" fontName="Microsoft Sans Serif" fontHeight="8" transparency="0" gradient="16777215, 15060913, 0" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="5029"/>

-      <children xsi:type="notation:BasicCompartment" type="7017">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7018">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7019">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="SYSML.metamodel.uml#_fmUJsHIpEd6oWe6GYqP1Cw"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="-19" y="111" width="106"/>

-    </children>

-    <styles xsi:type="notation:DiagramStyle"/>

-    <element href="SYSML.metamodel.uml#_0"/>

-    <edges xsi:type="notation:Connector" type="4002" source="/8/@children.2" target="/8/@children.0" routing="Rectilinear" lineColor="0">

-      <children xsi:type="notation:DecorationNode" type="6007">

-        <layoutConstraint xsi:type="notation:Location" y="40"/>

-      </children>

-      <styles xsi:type="notation:FontStyle" fontName="Microsoft Sans Serif" fontHeight="8"/>

-      <element href="SYSML.metamodel.uml#ConstraintProperty-_generalization.0"/>

-      <bendpoints xsi:type="notation:RelativeBendpoints" points="[7, -50, -23, 180]$[7, -180, -23, 50]"/>

-    </edges>

-    <edges xsi:type="notation:Connector" type="4002" source="/8/@children.1" target="/8/@children.3" routing="Rectilinear" lineColor="0">

-      <children xsi:type="notation:DecorationNode" type="6007">

-        <layoutConstraint xsi:type="notation:Location" y="40"/>

-      </children>

-      <styles xsi:type="notation:FontStyle" fontName="Microsoft Sans Serif" fontHeight="8"/>

-      <element href="SYSML.metamodel.uml#_nT8RcHbDEd6vj7tN0L3z0A"/>

-      <bendpoints xsi:type="notation:RelativeBendpoints" points="[4, -50, -21, 168]$[13, -268, -12, -50]"/>

-    </edges>

-    <edges xsi:type="notation:Connector" type="4001" source="/8/@children.2" target="/8/@children.1" routing="Rectilinear" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="6001">

-        <layoutConstraint xsi:type="notation:Location" y="-20"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6002">

-        <layoutConstraint xsi:type="notation:Location" x="-70" y="10"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6003">

-        <layoutConstraint xsi:type="notation:Location" x="-27" y="10"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6004">

-        <layoutConstraint xsi:type="notation:Location" x="61" y="-11"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6005">

-        <layoutConstraint xsi:type="notation:Location" x="-59" y="11"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6006">

-        <layoutConstraint xsi:type="notation:Location" x="59" y="-11"/>

-      </children>

-      <styles xsi:type="notation:FontStyle" fontName="Microsoft Sans Serif" fontHeight="8"/>

-      <element href="SYSML.metamodel.uml#_gv8GAHbQEd6vj7tN0L3z0A"/>

-      <bendpoints xsi:type="notation:RelativeBendpoints" points="[-59, -2, 190, 0]$[-199, -27, 50, -25]"/>

-    </edges>

-  </notation:Diagram>

-  <notation:Diagram type="PapyrusUMLClassDiagram" name="Abstract Syntax for SysML Activity Extensions" measurementUnit="Pixel">

-    <children xsi:type="notation:Shape" type="2008" fontName="Microsoft Sans Serif" fontHeight="8" transparency="0" gradient="16777215, 15060913, 0" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="5029"/>

-      <children xsi:type="notation:BasicCompartment" type="7017">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7018">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7019">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="pathmap://UML_METAMODELS/UML.metamodel.uml#Behavior"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="-99" y="431" width="106"/>

-    </children>

-    <children xsi:type="notation:Shape" type="2008" fontName="Microsoft Sans Serif" fontHeight="8" transparency="0" gradient="16777215, 15060913, 0" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="5029"/>

-      <children xsi:type="notation:BasicCompartment" type="7017">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7018">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7019">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="pathmap://UML_METAMODELS/UML.metamodel.uml#ParameterSet"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="196" y="168" width="106"/>

-    </children>

-    <children xsi:type="notation:Shape" type="2008" fontName="Microsoft Sans Serif" fontHeight="8" transparency="0" gradient="16777215, 15060913, 0" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="5029"/>

-      <children xsi:type="notation:BasicCompartment" type="7017">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7018">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7019">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="pathmap://UML_METAMODELS/UML.metamodel.uml#Operation"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="345" y="423" width="106"/>

-    </children>

-    <children xsi:type="notation:Shape" type="2008" fontName="Microsoft Sans Serif" fontHeight="8" transparency="0" gradient="16777215, 15060913, 0" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="5029"/>

-      <children xsi:type="notation:BasicCompartment" type="7017">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7018">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7019">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="pathmap://UML_METAMODELS/UML.metamodel.uml#Parameter"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="-119" y="-98" width="106"/>

-    </children>

-    <children xsi:type="notation:Shape" type="2008" fontName="Microsoft Sans Serif" fontHeight="8" transparency="0" gradient="16777215, 15060913, 0" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="5029"/>

-      <children xsi:type="notation:BasicCompartment" type="7017">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7018">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7019">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="pathmap://UML_METAMODELS/UML.metamodel.uml#ActivityEdge"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="497" y="-114" width="106"/>

-    </children>

-    <children xsi:type="notation:Shape" type="2008" fontName="Microsoft Sans Serif" fontHeight="8" transparency="0" gradient="16777215, 15060913, 0" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="5029"/>

-      <children xsi:type="notation:BasicCompartment" type="7017">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7018">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7019">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="pathmap://UML_METAMODELS/UML.metamodel.uml#ObjectNode"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="540" y="443" width="106"/>

-    </children>

-    <children xsi:type="notation:Shape" type="2008" fontName="Microsoft Sans Serif" fontHeight="8" transparency="0" gradient="16777215, 15060913, 0" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="5029"/>

-      <children xsi:type="notation:BasicCompartment" type="7017">

-        <children type="3012">

-          <element href="SYSML.metamodel.uml#_zLNXII18Ed64grchIi3hnw"/>

-          <layoutConstraint xsi:type="notation:Location"/>

-        </children>

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7018">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7019">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="SYSML.metamodel.uml#Rate"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="173" y="47" width="214"/>

-    </children>

-    <children xsi:type="notation:Shape" type="2008" fontName="Microsoft Sans Serif" fontHeight="8" transparency="0" gradient="16777215, 15060913, 0" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="5029"/>

-      <children xsi:type="notation:BasicCompartment" type="7017">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7018">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7019">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="SYSML.metamodel.uml#ControlOperator"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="353" y="616" width="152"/>

-    </children>

-    <children xsi:type="notation:Shape" type="2008" fontName="Microsoft Sans Serif" fontHeight="8" transparency="0" gradient="16777215, 15060913, 0" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="5029"/>

-      <children xsi:type="notation:BasicCompartment" type="7017">

-        <children type="3012">

-          <element href="SYSML.metamodel.uml#_5o0FAI2CEd64grchIi3hnw"/>

-          <layoutConstraint xsi:type="notation:Location"/>

-        </children>

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7018">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7019">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="SYSML.metamodel.uml#Overwrite"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="513" y="615" width="274"/>

-    </children>

-    <children xsi:type="notation:Shape" type="2008" fontName="Microsoft Sans Serif" fontHeight="8" transparency="0" gradient="16777215, 15060913, 0" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="5029"/>

-      <children xsi:type="notation:BasicCompartment" type="7017">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7018">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7019">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="SYSML.metamodel.uml#_d80QUHePEd6DPZaLLWzzlg"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="-126" y="623" width="155"/>

-    </children>

-    <children xsi:type="notation:Shape" type="2008" fontName="Microsoft Sans Serif" fontHeight="8" transparency="0" gradient="16777215, 15060913, 0" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="5029"/>

-      <children xsi:type="notation:BasicCompartment" type="7017">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7018">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7019">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="SYSML.metamodel.uml#_oCyZwHeaEd6DPZaLLWzzlg"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="518" y="312" width="106"/>

-    </children>

-    <children xsi:type="notation:Shape" type="2008" fontName="Microsoft Sans Serif" fontHeight="8" transparency="0" gradient="16777215, 15060913, 0" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="5029"/>

-      <children xsi:type="notation:BasicCompartment" type="7017">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7018">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7019">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="pathmap://UML_METAMODELS/UML.metamodel.uml#InstanceSpecification"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="223" y="-102" width="143"/>

-    </children>

-    <children xsi:type="notation:Shape" type="2008" fontName="Microsoft Sans Serif" fontHeight="8" transparency="0" gradient="16777215, 15060913, 0" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="5029"/>

-      <children xsi:type="notation:BasicCompartment" type="7017">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7018">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7019">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="pathmap://UML_METAMODELS/UML.metamodel.uml#ValueSpecification"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="749" y="306" width="113"/>

-    </children>

-    <children xsi:type="notation:Shape" type="2008" fontName="Microsoft Sans Serif" fontHeight="8" transparency="0" gradient="16777215, 15060913, 0" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="5029"/>

-      <children xsi:type="notation:BasicCompartment" type="7017">

-        <children type="3012">

-          <element href="SYSML.metamodel.uml#_WCAW4I19Ed64grchIi3hnw"/>

-          <layoutConstraint xsi:type="notation:Location"/>

-        </children>

-        <children type="3012">

-          <element href="SYSML.metamodel.uml#__jnzYI1-Ed64grchIi3hnw"/>

-          <layoutConstraint xsi:type="notation:Location"/>

-        </children>

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7018">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7019">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="SYSML.metamodel.uml#_Fs_QQI19Ed64grchIi3hnw"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="-187" y="42" width="237"/>

-    </children>

-    <children xsi:type="notation:Shape" type="2006" fontName="Microsoft Sans Serif" fontHeight="8" transparency="0" gradient="16777215, 15060913, 0" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="5023"/>

-      <children xsi:type="notation:BasicCompartment" type="7015">

-        <children type="3017">

-          <element href="SYSML.metamodel.uml#_G7nUoI1_Ed64grchIi3hnw"/>

-          <layoutConstraint xsi:type="notation:Location"/>

-        </children>

-        <children type="3017">

-          <element href="SYSML.metamodel.uml#_HDW7YI1_Ed64grchIi3hnw"/>

-          <layoutConstraint xsi:type="notation:Location"/>

-        </children>

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="SYSML.metamodel.uml#_Cbf_cI1_Ed64grchIi3hnw"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="-79" y="163" width="106"/>

-    </children>

-    <children xsi:type="notation:Shape" type="2008" fontName="Microsoft Sans Serif" fontHeight="8" transparency="0" gradient="16777215, 15060913, 0" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="5029"/>

-      <children xsi:type="notation:BasicCompartment" type="7017">

-        <children type="3012">

-          <element href="SYSML.metamodel.uml#_It0xwI2CEd64grchIi3hnw"/>

-          <layoutConstraint xsi:type="notation:Location" x="50" y="7"/>

-        </children>

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7018">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7019">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="SYSML.metamodel.uml#_UiCcII2BEd64grchIi3hnw"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="481" y="45" width="235"/>

-    </children>

-    <children xsi:type="notation:Shape" type="2008" fontName="Microsoft Sans Serif" fontHeight="8" transparency="0" gradient="16777215, 15060913, 0" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="5029"/>

-      <children xsi:type="notation:BasicCompartment" type="7017">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7018">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7019">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="SYSML.metamodel.uml#_ZXG4MI2CEd64grchIi3hnw"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="196" y="322" width="106"/>

-    </children>

-    <children xsi:type="notation:Shape" type="2006" fontName="Microsoft Sans Serif" fontHeight="8" transparency="0" gradient="16777215, 15060913, 0" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="5023"/>

-      <children xsi:type="notation:BasicCompartment" type="7015">

-        <children type="3017">

-          <element href="SYSML.metamodel.uml#_Ac0IYI2DEd64grchIi3hnw"/>

-          <layoutConstraint xsi:type="notation:Location"/>

-        </children>

-        <children type="3017">

-          <element href="SYSML.metamodel.uml#_CDVaQI2DEd64grchIi3hnw"/>

-          <layoutConstraint xsi:type="notation:Location"/>

-        </children>

-        <children type="3017">

-          <element href="SYSML.metamodel.uml#_C3WRII2DEd64grchIi3hnw"/>

-          <layoutConstraint xsi:type="notation:Location"/>

-        </children>

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="SYSML.metamodel.uml#_2pxhAI2CEd64grchIi3hnw"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="676" y="446" width="122"/>

-    </children>

-    <styles xsi:type="notation:DiagramStyle"/>

-    <element href="SYSML.metamodel.uml#_0"/>

-    <edges xsi:type="notation:Connector" type="4002" source="/9/@children.7" target="/9/@children.2" routing="Rectilinear" lineColor="0">

-      <children xsi:type="notation:DecorationNode" type="6007">

-        <layoutConstraint xsi:type="notation:Location" y="40"/>

-      </children>

-      <styles xsi:type="notation:FontStyle" fontName="Microsoft Sans Serif" fontHeight="8"/>

-      <element href="SYSML.metamodel.uml#ControlOperator-_generalization.0"/>

-      <bendpoints xsi:type="notation:RelativeBendpoints" points="[29, -50, -6, 188]$[29, -188, -6, 50]"/>

-    </edges>

-    <edges xsi:type="notation:Connector" type="4002" source="/9/@children.8" target="/9/@children.5" routing="Tree" lineColor="0">

-      <children xsi:type="notation:DecorationNode" type="6007">

-        <layoutConstraint xsi:type="notation:Location" y="40"/>

-      </children>

-      <styles xsi:type="notation:FontStyle" fontName="Microsoft Sans Serif" fontHeight="8"/>

-      <element href="SYSML.metamodel.uml#Overwrite-_generalization.0"/>

-      <bendpoints xsi:type="notation:RelativeBendpoints" points="[-19, -50, 21, 122]$[-19, -73, 21, 99]$[-19, -73, 21, 99]$[-19, -122, 21, 50]"/>

-    </edges>

-    <edges xsi:type="notation:Connector" type="4002" source="/9/@children.9" target="/9/@children.0" routing="Rectilinear" lineColor="0">

-      <children xsi:type="notation:DecorationNode" type="6007">

-        <layoutConstraint xsi:type="notation:Location" y="40"/>

-      </children>

-      <styles xsi:type="notation:FontStyle" fontName="Microsoft Sans Serif" fontHeight="8"/>

-      <element href="SYSML.metamodel.uml#_mfLCoGr8Ed6wEN-goObHxA"/>

-      <bendpoints xsi:type="notation:RelativeBendpoints" points="[0, -21, 9, 180]$[0, -113, 9, 88]"/>

-      <sourceAnchor xsi:type="notation:IdentityAnchor" id="(0.5094339622641509,0.21)"/>

-      <targetAnchor xsi:type="notation:IdentityAnchor" id="(0.46,0.12)"/>

-    </edges>

-    <edges xsi:type="notation:Connector" type="4002" source="/9/@children.13" target="/9/@children.3" routing="Rectilinear" lineColor="0">

-      <children xsi:type="notation:DecorationNode" type="6007">

-        <layoutConstraint xsi:type="notation:Location" y="40"/>

-      </children>

-      <styles xsi:type="notation:FontStyle" fontName="Microsoft Sans Serif" fontHeight="8"/>

-      <element href="SYSML.metamodel.uml#Rate-_generalization.0"/>

-      <bendpoints xsi:type="notation:RelativeBendpoints" points="[-6, -11, 0, 102]$[-6, -63, 0, 50]"/>

-      <sourceAnchor xsi:type="notation:IdentityAnchor" id="(0.5,0.11)"/>

-    </edges>

-    <edges xsi:type="notation:Connector" type="4002" source="/9/@children.15" target="/9/@children.4" routing="Rectilinear" lineColor="0">

-      <children xsi:type="notation:DecorationNode" type="6007">

-        <layoutConstraint xsi:type="notation:Location" y="40"/>

-      </children>

-      <styles xsi:type="notation:FontStyle" fontName="Microsoft Sans Serif" fontHeight="8"/>

-      <element href="SYSML.metamodel.uml#Probability-_generalization.0"/>

-      <bendpoints xsi:type="notation:RelativeBendpoints" points="[-8, -50, -4, 111]$[-8, -111, -4, 50]"/>

-    </edges>

-    <edges xsi:type="notation:Connector" type="4001" source="/9/@children.7" target="/9/@children.9" routing="Rectilinear" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="6001">

-        <layoutConstraint xsi:type="notation:Location" y="-20"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" visible="false" type="6002">

-        <layoutConstraint xsi:type="notation:Location" x="2" y="12"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6003">

-        <layoutConstraint xsi:type="notation:Location" x="-40" y="-14"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6004">

-        <layoutConstraint xsi:type="notation:Location" x="35" y="12"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6005">

-        <layoutConstraint xsi:type="notation:Location" x="-26" y="11"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6006">

-        <layoutConstraint xsi:type="notation:Location" x="16" y="-14"/>

-      </children>

-      <styles xsi:type="notation:FontStyle" fontName="Microsoft Sans Serif" fontHeight="8"/>

-      <element href="SYSML.metamodel.uml#_DhrlMHdWEd6DPZaLLWzzlg"/>

-      <bendpoints xsi:type="notation:RelativeBendpoints" points="[-82, 1, 358, 0]$[-360, 0, 80, -1]"/>

-    </edges>

-    <edges xsi:type="notation:Connector" type="4001" source="/9/@children.11" target="/9/@children.6" routing="Rectilinear" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="6001">

-        <layoutConstraint xsi:type="notation:Location" y="-20"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6002">

-        <layoutConstraint xsi:type="notation:Location" y="20"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" visible="false" type="6003">

-        <layoutConstraint xsi:type="notation:Location" y="-39"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6004">

-        <layoutConstraint xsi:type="notation:Location" y="20"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6005">

-        <layoutConstraint xsi:type="notation:Location" x="5" y="18"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6006">

-        <layoutConstraint xsi:type="notation:Location" x="7" y="-64"/>

-      </children>

-      <styles xsi:type="notation:FontStyle" fontName="Microsoft Sans Serif" fontHeight="8"/>

-      <element href="SYSML.metamodel.uml#_packagedElement.53"/>

-      <bendpoints xsi:type="notation:RelativeBendpoints" points="[68, -37, -162, 88]$[138, -75, -92, 50]"/>

-    </edges>

-    <edges xsi:type="notation:Connector" type="4001" source="/9/@children.13" target="/9/@children.6" routing="Rectilinear" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="6001">

-        <layoutConstraint xsi:type="notation:Location" y="-20"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" visible="false" type="6002">

-        <layoutConstraint xsi:type="notation:Location" x="-1" y="10"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6003">

-        <layoutConstraint xsi:type="notation:Location" x="-15" y="-12"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6004">

-        <layoutConstraint xsi:type="notation:Location" x="5" y="17"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" visible="false" type="6005">

-        <layoutConstraint xsi:type="notation:Location" y="20"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" visible="false" type="6006">

-        <layoutConstraint xsi:type="notation:Location" y="-20"/>

-      </children>

-      <styles xsi:type="notation:FontStyle" fontName="Microsoft Sans Serif" fontHeight="8"/>

-      <element href="SYSML.metamodel.uml#_K-8SEI19Ed64grchIi3hnw"/>

-      <bendpoints xsi:type="notation:RelativeBendpoints" points="[50, -7, -175, 9]$[121, -44, -104, -28]"/>

-    </edges>

-    <edges xsi:type="notation:Connector" type="4001" source="/9/@children.15" target="/9/@children.6" routing="Rectilinear" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="6001">

-        <layoutConstraint xsi:type="notation:Location" y="-20"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" visible="false" type="6002">

-        <layoutConstraint xsi:type="notation:Location" y="20"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6003">

-        <layoutConstraint xsi:type="notation:Location" x="-17" y="12"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6004">

-        <layoutConstraint xsi:type="notation:Location" x="5" y="-14"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" visible="false" type="6005">

-        <layoutConstraint xsi:type="notation:Location" y="20"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" visible="false" type="6006">

-        <layoutConstraint xsi:type="notation:Location" y="-20"/>

-      </children>

-      <styles xsi:type="notation:FontStyle" fontName="Microsoft Sans Serif" fontHeight="8"/>

-      <element href="SYSML.metamodel.uml#_ZCrVwI2BEd64grchIi3hnw"/>

-      <bendpoints xsi:type="notation:RelativeBendpoints" points="[-50, -2, 148, 2]$[-170, -6, 28, -2]"/>

-      <targetAnchor xsi:type="notation:IdentityAnchor" id="(0.8653846153846154,0.46)"/>

-    </edges>

-    <edges xsi:type="notation:Connector" type="4001" source="/9/@children.15" target="/9/@children.10" routing="Rectilinear" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="6001">

-        <layoutConstraint xsi:type="notation:Location" y="-20"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" visible="false" type="6002">

-        <layoutConstraint xsi:type="notation:Location" y="20"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6003">

-        <layoutConstraint xsi:type="notation:Location" x="5" y="52"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6004">

-        <layoutConstraint xsi:type="notation:Location" x="5" y="-22"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" visible="false" type="6005">

-        <layoutConstraint xsi:type="notation:Location" y="20"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" visible="false" type="6006">

-        <layoutConstraint xsi:type="notation:Location" y="-20"/>

-      </children>

-      <styles xsi:type="notation:FontStyle" fontName="Microsoft Sans Serif" fontHeight="8"/>

-      <element href="SYSML.metamodel.uml#_71WDcI2BEd64grchIi3hnw"/>

-      <bendpoints xsi:type="notation:RelativeBendpoints" points="[4, 85, -12, -189]$[13, 289, -3, 15]"/>

-      <sourceAnchor xsi:type="notation:IdentityAnchor" id="(0.35,0.15)"/>

-      <targetAnchor xsi:type="notation:IdentityAnchor" id="(0.45,0.85)"/>

-    </edges>

-    <edges xsi:type="notation:Connector" type="4002" source="/9/@children.16" target="/9/@children.1" routing="Rectilinear" lineColor="0">

-      <children xsi:type="notation:DecorationNode" type="6007">

-        <layoutConstraint xsi:type="notation:Location" y="40"/>

-      </children>

-      <styles xsi:type="notation:FontStyle" fontName="Microsoft Sans Serif" fontHeight="8"/>

-      <element href="SYSML.metamodel.uml#_awg7II2CEd64grchIi3hnw"/>

-      <bendpoints xsi:type="notation:RelativeBendpoints" points="[4, -50, 21, 167]$[4, -86, 21, 131]$[3, -86, 20, 131]$[3, -122, 20, 95]"/>

-      <targetAnchor xsi:type="notation:IdentityAnchor" id="(0.3,0.05)"/>

-    </edges>

-    <edges xsi:type="notation:Connector" type="4001" source="/9/@children.16" target="/9/@children.10" routing="Rectilinear" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="6001">

-        <layoutConstraint xsi:type="notation:Location" y="-20"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" visible="false" type="6002">

-        <layoutConstraint xsi:type="notation:Location" x="-4" y="10"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6003">

-        <layoutConstraint xsi:type="notation:Location" x="-23" y="-10"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6004">

-        <layoutConstraint xsi:type="notation:Location" x="22" y="11"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" visible="false" type="6005">

-        <layoutConstraint xsi:type="notation:Location" y="20"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" visible="false" type="6006">

-        <layoutConstraint xsi:type="notation:Location" y="-20"/>

-      </children>

-      <styles xsi:type="notation:FontStyle" fontName="Microsoft Sans Serif" fontHeight="8"/>

-      <element href="SYSML.metamodel.uml#_hQ2boI2CEd64grchIi3hnw"/>

-      <bendpoints xsi:type="notation:RelativeBendpoints" points="[14, 13, -272, -3]$[236, 13, -50, -3]"/>

-      <sourceAnchor xsi:type="notation:IdentityAnchor" id="(0.86,0.24)"/>

-    </edges>

-    <edges xsi:type="notation:Connector" type="4001" source="/9/@children.10" target="/9/@children.12" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="6001">

-        <layoutConstraint xsi:type="notation:Location" y="-20"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" visible="false" type="6002">

-        <layoutConstraint xsi:type="notation:Location" y="20"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6003">

-        <layoutConstraint xsi:type="notation:Location" x="-29" y="-10"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6004">

-        <layoutConstraint xsi:type="notation:Location" y="20"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" visible="false" type="6005">

-        <layoutConstraint xsi:type="notation:Location" y="20"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" visible="false" type="6006">

-        <layoutConstraint xsi:type="notation:Location" y="-20"/>

-      </children>

-      <styles xsi:type="notation:FontStyle" fontName="Microsoft Sans Serif" fontHeight="8"/>

-      <element href="SYSML.metamodel.uml#_KoTE8I2DEd64grchIi3hnw"/>

-      <bendpoints xsi:type="notation:RelativeBendpoints" points="[50, -2, -195, 3]$[195, -4, -50, 1]"/>

-    </edges>

-  </notation:Diagram>

-  <notation:Diagram type="PapyrusUMLClassDiagram" name="Abstract syntax extensions for SysML Allocation" measurementUnit="Pixel">

-    <children xsi:type="notation:Shape" type="2008" fontName="Microsoft Sans Serif" fontHeight="8" transparency="0" gradient="16777215, 15060913, 0" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="5029"/>

-      <children xsi:type="notation:BasicCompartment" type="7017">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7018">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7019">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="pathmap://UML_METAMODELS/UML.metamodel.uml#NamedElement"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="494" y="27"/>

-    </children>

-    <children xsi:type="notation:Shape" type="2008" fontName="Microsoft Sans Serif" fontHeight="8" transparency="0" gradient="16777215, 15060913, 0" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="5029"/>

-      <children xsi:type="notation:BasicCompartment" type="7017">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7018">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7019">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="pathmap://UML_METAMODELS/UML.metamodel.uml#Abstraction"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="11" y="20"/>

-    </children>

-    <children xsi:type="notation:Shape" type="2008" fontName="Microsoft Sans Serif" fontHeight="8" transparency="0" gradient="16777215, 15060913, 0" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="5029"/>

-      <children xsi:type="notation:BasicCompartment" type="7017">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7018">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7019">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="SYSML.metamodel.uml#Allocated"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="384" y="264" width="335"/>

-    </children>

-    <children xsi:type="notation:Shape" type="2008" fontName="Microsoft Sans Serif" fontHeight="8" transparency="0" gradient="16777215, 15060913, 0" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="5029"/>

-      <children xsi:type="notation:BasicCompartment" type="7017">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7018">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7019">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="SYSML.metamodel.uml#Allocate"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="12" y="196"/>

-    </children>

-    <children xsi:type="notation:Shape" type="2008" fontName="Microsoft Sans Serif" fontHeight="8" transparency="0" gradient="16777215, 15060913, 0" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="5029"/>

-      <children xsi:type="notation:BasicCompartment" type="7017">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7018">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7019">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="SYSML.metamodel.uml#AllocateActivityPartition"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="36" y="498" width="156"/>

-    </children>

-    <children xsi:type="notation:Shape" type="2008" fontName="Microsoft Sans Serif" fontHeight="8" transparency="0" gradient="16777215, 15060913, 0" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="5029"/>

-      <children xsi:type="notation:BasicCompartment" type="7017">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7018">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7019">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="pathmap://UML_METAMODELS/UML.metamodel.uml#ActivityPartition"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="173" y="339"/>

-    </children>

-    <styles xsi:type="notation:DiagramStyle"/>

-    <element href="SYSML.metamodel.uml#_0"/>

-    <edges xsi:type="notation:Connector" type="4002" source="/10/@children.3" target="/10/@children.1" routing="Rectilinear" lineColor="0">

-      <children xsi:type="notation:DecorationNode" type="6007">

-        <layoutConstraint xsi:type="notation:Location" y="40"/>

-      </children>

-      <styles xsi:type="notation:FontStyle" fontName="Microsoft Sans Serif" fontHeight="8"/>

-      <element href="SYSML.metamodel.uml#Allocate-_generalization.0"/>

-      <bendpoints xsi:type="notation:RelativeBendpoints" points="[-4, -50, -3, 126]$[-4, -126, -3, 50]"/>

-    </edges>

-    <edges xsi:type="notation:Connector" type="4002" source="/10/@children.2" target="/10/@children.0" routing="Rectilinear" lineColor="0">

-      <children xsi:type="notation:DecorationNode" type="6007">

-        <layoutConstraint xsi:type="notation:Location" y="40"/>

-      </children>

-      <styles xsi:type="notation:FontStyle" fontName="Microsoft Sans Serif" fontHeight="8"/>

-      <element href="SYSML.metamodel.uml#Allocated-_generalization.0"/>

-      <bendpoints xsi:type="notation:RelativeBendpoints" points="[-27, -50, -52, 212]$[-27, -212, -52, 50]"/>

-    </edges>

-    <edges xsi:type="notation:Connector" type="4001" source="/10/@children.3" target="/10/@children.2" routing="Rectilinear" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="6001">

-        <layoutConstraint xsi:type="notation:Location" y="-20"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" visible="false" type="6002">

-        <layoutConstraint xsi:type="notation:Location" x="19" y="-44"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6003">

-        <layoutConstraint xsi:type="notation:Location" x="-61" y="-12"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6004">

-        <layoutConstraint xsi:type="notation:Location" x="26" y="12"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6005">

-        <layoutConstraint xsi:type="notation:Location" x="-22" y="-12"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6006">

-        <layoutConstraint xsi:type="notation:Location" x="20" y="14"/>

-      </children>

-      <styles xsi:type="notation:FontStyle" fontName="Microsoft Sans Serif" fontHeight="8"/>

-      <element href="SYSML.metamodel.uml#_xcgv4HhjEd6xUocNBcy1EA"/>

-      <bendpoints xsi:type="notation:RelativeBendpoints" points="[50, 26, -415, -42]$[298, 26, -167, -42]"/>

-    </edges>

-    <edges xsi:type="notation:Connector" type="4002" source="/10/@children.4" target="/10/@children.5" routing="Rectilinear" lineColor="0">

-      <children xsi:type="notation:DecorationNode" type="6007">

-        <layoutConstraint xsi:type="notation:Location" y="40"/>

-      </children>

-      <styles xsi:type="notation:FontStyle" fontName="Microsoft Sans Serif" fontHeight="8"/>

-      <element href="SYSML.metamodel.uml#AllocateActivityPartition-_generalization.0"/>

-      <bendpoints xsi:type="notation:RelativeBendpoints" points="[6, -50, 7, 109]$[6, -109, 7, 50]"/>

-    </edges>

-    <edges xsi:type="notation:Connector" type="4001" source="/10/@children.2" target="/10/@children.2" routing="Rectilinear" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="6001">

-        <layoutConstraint xsi:type="notation:Location" y="-20"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" visible="false" type="6002">

-        <layoutConstraint xsi:type="notation:Location" y="20"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6003">

-        <layoutConstraint xsi:type="notation:Location" x="50" y="-65"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6004">

-        <layoutConstraint xsi:type="notation:Location" x="49" y="12"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6005">

-        <layoutConstraint xsi:type="notation:Location" x="-47" y="14"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6006">

-        <layoutConstraint xsi:type="notation:Location" y="-20"/>

-      </children>

-      <styles xsi:type="notation:FontStyle" fontName="Microsoft Sans Serif" fontHeight="8"/>

-      <element href="SYSML.metamodel.uml#_AqeZ0I2XEd6vodSRJgEedg"/>

-      <bendpoints xsi:type="notation:RelativeBendpoints" points="[-167, -44, -167, -44]$[-167, -44, -167, -44]"/>

-    </edges>

-    <edges xsi:type="notation:Connector" type="4002" source="/10/@children.4" target="/10/@children.3" routing="Tree" lineColor="0">

-      <children xsi:type="notation:DecorationNode" type="6007">

-        <layoutConstraint xsi:type="notation:Location" y="40"/>

-      </children>

-      <styles xsi:type="notation:FontStyle" fontName="Microsoft Sans Serif" fontHeight="8"/>

-      <element href="SYSML.metamodel.uml#_Sbb6AI2XEd6vodSRJgEedg"/>

-      <bendpoints xsi:type="notation:RelativeBendpoints" points="[-2, -13, 32, 252]$[4, -315, 38, -50]"/>

-      <sourceAnchor xsi:type="notation:IdentityAnchor" id="(0.5454545454545454,0.13)"/>

-    </edges>

-    <edges xsi:type="notation:Connector" type="4001" source="/10/@children.4" target="/10/@children.2" routing="Rectilinear" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="6001">

-        <layoutConstraint xsi:type="notation:Location" y="-20"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" visible="false" type="6002">

-        <layoutConstraint xsi:type="notation:Location" y="20"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6003">

-        <layoutConstraint xsi:type="notation:Location" x="27" y="124"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6004">

-        <layoutConstraint xsi:type="notation:Location" x="28" y="-14"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6005">

-        <layoutConstraint xsi:type="notation:Location" x="-50" y="15"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6006">

-        <layoutConstraint xsi:type="notation:Location" x="48" y="-13"/>

-      </children>

-      <styles xsi:type="notation:FontStyle" fontName="Microsoft Sans Serif" fontHeight="8"/>

-      <element href="SYSML.metamodel.uml#_VpOEoI2XEd6vodSRJgEedg"/>

-      <bendpoints xsi:type="notation:RelativeBendpoints" points="[21, -19, -287, 248]$[288, -19, -20, 248]$[288, -194, -20, 73]"/>

-      <sourceAnchor xsi:type="notation:IdentityAnchor" id="(0.8090909090909091,0.6)"/>

-      <targetAnchor xsi:type="notation:IdentityAnchor" id="(0.21791044776119403,0.27)"/>

-    </edges>

-  </notation:Diagram>

-  <notation:Diagram type="PapyrusUMLClassDiagram" name="Abstract syntax expression for AllocatedActivityPartition" measurementUnit="Pixel">

-    <children xsi:type="notation:Shape" type="2008" fontName="Microsoft Sans Serif" fontHeight="8" transparency="0" gradient="16777215, 15060913, 0" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="5029"/>

-      <children xsi:type="notation:BasicCompartment" type="7017">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7018">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7019">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="SYSML.metamodel.uml#AllocateActivityPartition"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="195" y="303" width="189"/>

-    </children>

-    <children xsi:type="notation:Shape" type="2008" fontName="Microsoft Sans Serif" fontHeight="8" transparency="0" gradient="16777215, 15060913, 0" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="5029"/>

-      <children xsi:type="notation:BasicCompartment" type="7017">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7018">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7019">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="pathmap://UML_METAMODELS/UML.metamodel.uml#ActivityPartition"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="225" y="84"/>

-    </children>

-    <styles xsi:type="notation:DiagramStyle"/>

-    <element href="SYSML.metamodel.uml#_0"/>

-    <edges xsi:type="notation:Connector" type="4002" source="/11/@children.0" target="/11/@children.1" routing="Rectilinear" lineColor="0">

-      <children xsi:type="notation:DecorationNode" type="6007">

-        <layoutConstraint xsi:type="notation:Location" y="40"/>

-      </children>

-      <styles xsi:type="notation:FontStyle" fontName="Microsoft Sans Serif" fontHeight="8"/>

-      <element href="SYSML.metamodel.uml#AllocateActivityPartition-_generalization.0"/>

-      <bendpoints xsi:type="notation:RelativeBendpoints" points="[-4, -50, 16, 208]$[-17, -208, 3, 50]"/>

-    </edges>

-  </notation:Diagram>

-  <notation:Diagram type="PapyrusUMLClassDiagram" name="Abstract Syntax for Requirements Stereotypes" measurementUnit="Pixel">

-    <children xsi:type="notation:Shape" type="2008" fontName="Microsoft Sans Serif" fontHeight="8" transparency="0" gradient="16777215, 15060913, 0" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="5029"/>

-      <children xsi:type="notation:BasicCompartment" type="7017">

-        <children type="3012">

-          <element href="SYSML.metamodel.uml#_mGuyMI2SEd64grchIi3hnw"/>

-          <layoutConstraint xsi:type="notation:Location"/>

-        </children>

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7018">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7019">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="SYSML.metamodel.uml#Trace"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="98" y="240" width="159"/>

-    </children>

-    <children xsi:type="notation:Shape" type="2008" fontName="Microsoft Sans Serif" fontHeight="8" transparency="0" gradient="16777215, 15060913, 0" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="5029"/>

-      <children xsi:type="notation:BasicCompartment" type="7017">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7018">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7019">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="pathmap://UML_METAMODELS/UML.metamodel.uml#Behavior"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="577" y="536"/>

-    </children>

-    <children xsi:type="notation:Shape" type="2008" fontName="Microsoft Sans Serif" fontHeight="8" transparency="0" gradient="16777215, 15060913, 0" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="5029"/>

-      <children xsi:type="notation:BasicCompartment" type="7017">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7018">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7019">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="pathmap://UML_METAMODELS/UML.metamodel.uml#Operation"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="351" y="534"/>

-    </children>

-    <children xsi:type="notation:Shape" type="2008" fontName="Microsoft Sans Serif" fontHeight="8" transparency="0" gradient="16777215, 15060913, 0" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="5029"/>

-      <children xsi:type="notation:BasicCompartment" type="7017">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7018">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7019">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="95" y="476"/>

-    </children>

-    <children xsi:type="notation:Shape" type="2006" fontName="Microsoft Sans Serif" fontHeight="8" transparency="0" gradient="16777215, 15060913, 0" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="5023"/>

-      <children xsi:type="notation:BasicCompartment" type="7015">

-        <children type="3017">

-          <element href="SYSML.metamodel.uml#VerdictKind-error"/>

-          <layoutConstraint xsi:type="notation:Location" x="48" y="10"/>

-        </children>

-        <children type="3017">

-          <element href="SYSML.metamodel.uml#VerdictKind-inconclusive"/>

-          <layoutConstraint xsi:type="notation:Location" x="48" y="10"/>

-        </children>

-        <children type="3017">

-          <element href="SYSML.metamodel.uml#VerdictKind-fail"/>

-          <layoutConstraint xsi:type="notation:Location" x="48" y="10"/>

-        </children>

-        <children type="3017">

-          <element href="SYSML.metamodel.uml#VerdictKind-pass"/>

-          <layoutConstraint xsi:type="notation:Location" x="48" y="10"/>

-        </children>

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="SYSML.metamodel.uml#VerdictKind"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="168" y="604" width="151" height="135"/>

-    </children>

-    <children xsi:type="notation:Shape" type="2008" fontName="Microsoft Sans Serif" fontHeight="8" transparency="0" gradient="16777215, 15060913, 0" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="5029"/>

-      <children xsi:type="notation:BasicCompartment" type="7017">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7018">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7019">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="SYSML.metamodel.uml#TestCase"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="332" y="699"/>

-    </children>

-    <children xsi:type="notation:Shape" type="2008" fontName="Microsoft Sans Serif" fontHeight="8" transparency="0" gradient="16777215, 15060913, 0" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="5029"/>

-      <children xsi:type="notation:BasicCompartment" type="7017">

-        <children type="3012">

-          <element href="SYSML.metamodel.uml#Requirement-text"/>

-          <layoutConstraint xsi:type="notation:Location" x="28" y="11"/>

-        </children>

-        <children type="3012">

-          <element href="SYSML.metamodel.uml#Requirement-id"/>

-          <layoutConstraint xsi:type="notation:Location" x="28" y="11"/>

-        </children>

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7018">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7019">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="SYSML.metamodel.uml#Requirement"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="-354" y="750" width="420" height="194"/>

-    </children>

-    <children xsi:type="notation:Shape" type="2008" fontName="Microsoft Sans Serif" fontHeight="8" transparency="0" gradient="16777215, 15060913, 0" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="5029"/>

-      <children xsi:type="notation:BasicCompartment" type="7017">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7018">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7019">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="pathmap://UML_METAMODELS/UML.metamodel.uml#NamedElement"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="-93" y="211"/>

-    </children>

-    <children xsi:type="notation:Shape" type="2008" fontName="Microsoft Sans Serif" fontHeight="8" transparency="0" gradient="16777215, 15060913, 0" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="5029"/>

-      <children xsi:type="notation:BasicCompartment" type="7017">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7018">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7019" collapsed="true">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="SYSML.metamodel.uml#RequirementRelated"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="-359" y="429" width="437" height="132"/>

-    </children>

-    <children xsi:type="notation:Shape" type="2008" fontName="Microsoft Sans Serif" fontHeight="8" transparency="0" gradient="16777215, 15060913, 0" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="5029"/>

-      <children xsi:type="notation:BasicCompartment" type="7017">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7018">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7019">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="SYSML.metamodel.uml#_BeFkcHqFEd6NO-HJErclZA"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="561" y="695"/>

-    </children>

-    <children xsi:type="notation:Shape" type="2008" fontName="Microsoft Sans Serif" fontHeight="8" transparency="0" gradient="16777215, 15060913, 0" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="5029"/>

-      <children xsi:type="notation:BasicCompartment" type="7017">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7018">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7019">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="SYSML.metamodel.uml#_rTCCEHqFEd6NO-HJErclZA"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="467" y="888"/>

-    </children>

-    <children xsi:type="notation:Shape" type="2008" fontName="Microsoft Sans Serif" fontHeight="8" transparency="0" gradient="16777215, 15060913, 0" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="5029"/>

-      <children xsi:type="notation:BasicCompartment" type="7017">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7018">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <children xsi:type="notation:BasicCompartment" type="7019">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="pathmap://UML_METAMODELS/UML.metamodel.uml#Abstraction"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="97" y="52" width="180"/>

-    </children>

-    <children xsi:type="notation:Shape" type="2006" fontName="Microsoft Sans Serif" fontHeight="8" transparency="0" gradient="16777215, 15060913, 0" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="5023"/>

-      <children xsi:type="notation:BasicCompartment" type="7015">

-        <children type="3017">

-          <element href="SYSML.metamodel.uml#_ptFN0I2SEd64grchIi3hnw"/>

-          <layoutConstraint xsi:type="notation:Location"/>

-        </children>

-        <children type="3017">

-          <element href="SYSML.metamodel.uml#_pzySwI2SEd64grchIi3hnw"/>

-          <layoutConstraint xsi:type="notation:Location"/>

-        </children>

-        <children type="3017">

-          <element href="SYSML.metamodel.uml#_p7YvkI2SEd64grchIi3hnw"/>

-          <layoutConstraint xsi:type="notation:Location"/>

-        </children>

-        <children type="3017">

-          <element href="SYSML.metamodel.uml#_qEeaII2SEd64grchIi3hnw"/>

-          <layoutConstraint xsi:type="notation:Location"/>

-        </children>

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="SYSML.metamodel.uml#_b97WMI2SEd64grchIi3hnw"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="301" y="51" width="143" height="118"/>

-    </children>

-    <styles xsi:type="notation:DiagramStyle"/>

-    <element href="SYSML.metamodel.uml#_0"/>

-    <edges xsi:type="notation:Connector" type="4002" source="/12/@children.6" target="/12/@children.3" routing="Rectilinear" lineColor="0">

-      <children xsi:type="notation:DecorationNode" type="6007">

-        <layoutConstraint xsi:type="notation:Location" y="40"/>

-      </children>

-      <styles xsi:type="notation:FontStyle" fontName="Microsoft Sans Serif" fontHeight="8"/>

-      <element href="SYSML.metamodel.uml#Requirement-_generalization.0"/>

-      <bendpoints xsi:type="notation:RelativeBendpoints" points="[210, 0, -79, 321]$[263, 0, -26, 321]$[263, -271, -26, 50]"/>

-    </edges>

-    <edges xsi:type="notation:Connector" type="4002" source="/12/@children.9" target="/12/@children.1" routing="Rectilinear" lineColor="0">

-      <children xsi:type="notation:DecorationNode" type="6007">

-        <layoutConstraint xsi:type="notation:Location" y="40"/>

-      </children>

-      <styles xsi:type="notation:FontStyle" fontName="Microsoft Sans Serif" fontHeight="8"/>

-      <element href="SYSML.metamodel.uml#TestCase-_generalization.0"/>

-      <bendpoints xsi:type="notation:RelativeBendpoints" points="[11, -50, -2, 109]$[11, -109, -2, 50]"/>

-    </edges>

-    <edges xsi:type="notation:Connector" type="4002" source="/12/@children.5" target="/12/@children.2" routing="Rectilinear" lineColor="0">

-      <children xsi:type="notation:DecorationNode" type="6007">

-        <layoutConstraint xsi:type="notation:Location" y="40"/>

-      </children>

-      <styles xsi:type="notation:FontStyle" fontName="Microsoft Sans Serif" fontHeight="8"/>

-      <element href="SYSML.metamodel.uml#_P4YNMGsCEd6zrJm-6aQpAw"/>

-      <bendpoints xsi:type="notation:RelativeBendpoints" points="[12, -11, -9, 115]$[12, -76, -9, 50]"/>

-      <sourceAnchor xsi:type="notation:IdentityAnchor" id="(0.44,0.11)"/>

-    </edges>

-    <edges xsi:type="notation:Connector" type="4002" source="/12/@children.8" target="/12/@children.7" routing="Rectilinear" lineColor="0">

-      <children xsi:type="notation:DecorationNode" type="6007">

-        <layoutConstraint xsi:type="notation:Location" y="40"/>

-      </children>

-      <styles xsi:type="notation:FontStyle" fontName="Microsoft Sans Serif" fontHeight="8"/>

-      <element href="SYSML.metamodel.uml#RequirementRelated-_generalization.0"/>

-      <bendpoints xsi:type="notation:RelativeBendpoints" points="[-4, -50, 15, 182]$[-15, -182, 4, 50]"/>

-    </edges>

-    <edges xsi:type="notation:Connector" type="4001" source="/12/@children.6" target="/12/@children.6" routing="Rectilinear" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="6001">

-        <layoutConstraint xsi:type="notation:Location" y="-20"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6002">

-        <layoutConstraint xsi:type="notation:Location" y="20"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" visible="false" type="6003">

-        <layoutConstraint xsi:type="notation:Location" y="-20"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6004">

-        <layoutConstraint xsi:type="notation:Location" x="16" y="12"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6005">

-        <layoutConstraint xsi:type="notation:Location" x="-13" y="-15"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6006">

-        <layoutConstraint xsi:type="notation:Location" x="54" y="17"/>

-      </children>

-      <styles xsi:type="notation:FontStyle" fontName="Microsoft Sans Serif" fontHeight="8"/>

-      <element href="SYSML.metamodel.uml#_packagedElement.5"/>

-      <bendpoints xsi:type="notation:RelativeBendpoints" points="[210, 91, 210, 91]$[272, 91, 272, 91]$[272, 159, 272, 159]$[179, 159, 179, 159]$[179, 97, 179, 97]"/>

-    </edges>

-    <edges xsi:type="notation:Connector" type="4002" source="/12/@children.5" target="/12/@children.10" routing="Tree" lineColor="0">

-      <children xsi:type="notation:DecorationNode" type="6007">

-        <layoutConstraint xsi:type="notation:Location" y="40"/>

-      </children>

-      <styles xsi:type="notation:FontStyle" fontName="Microsoft Sans Serif" fontHeight="8"/>

-      <element href="SYSML.metamodel.uml#_uB9tgHqFEd6NO-HJErclZA"/>

-      <bendpoints xsi:type="notation:RelativeBendpoints" points="[19, -50, -53, 139]$[52, -212, -20, -23]"/>

-      <targetAnchor xsi:type="notation:IdentityAnchor" id="(0.27,0.23)"/>

-    </edges>

-    <edges xsi:type="notation:Connector" type="4002" source="/12/@children.9" target="/12/@children.10" routing="Tree" lineColor="0">

-      <children xsi:type="notation:DecorationNode" type="6007">

-        <layoutConstraint xsi:type="notation:Location" y="40"/>

-      </children>

-      <styles xsi:type="notation:FontStyle" fontName="Microsoft Sans Serif" fontHeight="8"/>

-      <element href="SYSML.metamodel.uml#_uW1KQHqFEd6NO-HJErclZA"/>

-      <bendpoints xsi:type="notation:RelativeBendpoints" points="[0, 85, 74, -143]$[0, 146, 74, -82]$[-75, 146, -1, -82]$[-75, 178, -1, -50]"/>

-      <sourceAnchor xsi:type="notation:IdentityAnchor" id="(0.2807017543859649,0.15)"/>

-    </edges>

-    <edges xsi:type="notation:Connector" type="4001" source="/12/@children.6" target="/12/@children.6" routing="Rectilinear" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="6001">

-        <layoutConstraint xsi:type="notation:Location" y="-20"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6002">

-        <layoutConstraint xsi:type="notation:Location" y="20"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" visible="false" type="6003">

-        <layoutConstraint xsi:type="notation:Location" y="-20"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6004">

-        <layoutConstraint xsi:type="notation:Location" x="13" y="19"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6005">

-        <layoutConstraint xsi:type="notation:Location" x="-10" y="15"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6006">

-        <layoutConstraint xsi:type="notation:Location" x="29" y="-61"/>

-      </children>

-      <styles xsi:type="notation:FontStyle" fontName="Microsoft Sans Serif" fontHeight="8"/>

-      <element href="SYSML.metamodel.uml#_packagedElement.6"/>

-      <bendpoints xsi:type="notation:RelativeBendpoints" points="[5, 97, 5, 97]$[5, 137, 5, 137]$[82, 137, 82, 137]$[82, 97, 82, 97]"/>

-    </edges>

-    <edges xsi:type="notation:Connector" type="4001" source="/12/@children.6" target="/12/@children.6" routing="Rectilinear" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="6001">

-        <layoutConstraint xsi:type="notation:Location" y="-20"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6002">

-        <layoutConstraint xsi:type="notation:Location" y="20"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" visible="false" type="6003">

-        <layoutConstraint xsi:type="notation:Location" x="-23" y="-10"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6004">

-        <layoutConstraint xsi:type="notation:Location" x="-4" y="-10"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6005">

-        <layoutConstraint xsi:type="notation:Location" x="-15" y="9"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6006">

-        <layoutConstraint xsi:type="notation:Location" x="88" y="11"/>

-      </children>

-      <styles xsi:type="notation:FontStyle" fontName="Microsoft Sans Serif" fontHeight="8"/>

-      <element href="SYSML.metamodel.uml#_packagedElement.13"/>

-      <bendpoints xsi:type="notation:RelativeBendpoints" points="[-103, 86, -103, 86]$[-166, 86, -166, 86]$[-166, 117, -166, 117]$[-58, 117, -58, 117]$[-58, 97, -58, 97]"/>

-    </edges>

-    <edges xsi:type="notation:Connector" type="4002" source="/12/@children.0" target="/12/@children.11" routing="Rectilinear" lineColor="0">

-      <children xsi:type="notation:DecorationNode" type="6007">

-        <layoutConstraint xsi:type="notation:Location" y="40"/>

-      </children>

-      <styles xsi:type="notation:FontStyle" fontName="Microsoft Sans Serif" fontHeight="8"/>

-      <element href="SYSML.metamodel.uml#_KsttEI2SEd64grchIi3hnw"/>

-      <bendpoints xsi:type="notation:RelativeBendpoints" points="[-4, -20, 1, 138]$[-4, -108, 1, 50]"/>

-      <sourceAnchor xsi:type="notation:IdentityAnchor" id="(0.54,0.2)"/>

-    </edges>

-    <edges xsi:type="notation:Connector" type="4001" source="/12/@children.10" target="/12/@children.6" routing="Rectilinear" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="6001">

-        <layoutConstraint xsi:type="notation:Location" y="-20"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" visible="false" type="6002">

-        <layoutConstraint xsi:type="notation:Location" y="20"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6003">

-        <layoutConstraint xsi:type="notation:Location" x="17" y="-20"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6004">

-        <layoutConstraint xsi:type="notation:Location" x="52" y="12"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6005">

-        <layoutConstraint xsi:type="notation:Location" x="-33" y="9"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6006">

-        <layoutConstraint xsi:type="notation:Location" x="44" y="-14"/>

-      </children>

-      <styles xsi:type="notation:FontStyle" fontName="Microsoft Sans Serif" fontHeight="8"/>

-      <element href="SYSML.metamodel.uml#_1ujmMI2TEd64grchIi3hnw"/>

-      <bendpoints xsi:type="notation:RelativeBendpoints" points="[0, -50, 511, -26]$[0, -68, 511, -44]$[-451, -68, 60, -44]"/>

-      <targetAnchor xsi:type="notation:IdentityAnchor" id="(0.8592233009708737,0.845360824742268)"/>

-    </edges>

-    <edges xsi:type="notation:Connector" type="4001" source="/12/@children.8" target="/12/@children.6" routing="Rectilinear" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="6001">

-        <layoutConstraint xsi:type="notation:Location" y="-20"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6002">

-        <layoutConstraint xsi:type="notation:Location" y="20"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6003">

-        <layoutConstraint xsi:type="notation:Location" x="16" y="-50"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6004">

-        <layoutConstraint xsi:type="notation:Location" x="17" y="18"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6005">

-        <layoutConstraint xsi:type="notation:Location" x="-12" y="13"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6006">

-        <layoutConstraint xsi:type="notation:Location" x="-11" y="-57"/>

-      </children>

-      <styles xsi:type="notation:FontStyle" fontName="Microsoft Sans Serif" fontHeight="8"/>

-      <element href="SYSML.metamodel.uml#_lGHiYI2VEd6vodSRJgEedg"/>

-      <bendpoints xsi:type="notation:RelativeBendpoints" points="[44, 104, 41, -227]$[44, 293, 41, -38]"/>

-      <sourceAnchor xsi:type="notation:IdentityAnchor" id="(0.6796338672768879,0.21212121212121213)"/>

-      <targetAnchor xsi:type="notation:IdentityAnchor" id="(0.7023809523809523,0.1958762886597938)"/>

-    </edges>

-    <edges xsi:type="notation:Connector" type="4001" source="/12/@children.8" target="/12/@children.6" routing="Rectilinear" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="6001">

-        <layoutConstraint xsi:type="notation:Location" y="-20"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" visible="false" type="6002">

-        <layoutConstraint xsi:type="notation:Location" y="20"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6003">

-        <layoutConstraint xsi:type="notation:Location" x="18" y="-48"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6004">

-        <layoutConstraint xsi:type="notation:Location" x="17" y="16"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6005">

-        <layoutConstraint xsi:type="notation:Location" x="-12" y="17"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6006">

-        <layoutConstraint xsi:type="notation:Location" x="-12" y="-51"/>

-      </children>

-      <styles xsi:type="notation:FontStyle" fontName="Microsoft Sans Serif" fontHeight="8"/>

-      <element href="SYSML.metamodel.uml#_mjjJsI2VEd6vodSRJgEedg"/>

-      <bendpoints xsi:type="notation:RelativeBendpoints" points="[-28, 66, -25, -286]$[-28, 255, -25, -97]"/>

-    </edges>

-    <edges xsi:type="notation:Connector" type="4001" source="/12/@children.8" target="/12/@children.6" routing="Rectilinear" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="6001">

-        <layoutConstraint xsi:type="notation:Location" y="-20"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" visible="false" type="6002">

-        <layoutConstraint xsi:type="notation:Location" y="20"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6003">

-        <layoutConstraint xsi:type="notation:Location" x="20" y="-47"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6004">

-        <layoutConstraint xsi:type="notation:Location" x="19" y="17"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6005">

-        <layoutConstraint xsi:type="notation:Location" x="-11" y="14"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6006">

-        <layoutConstraint xsi:type="notation:Location" x="-14" y="-54"/>

-      </children>

-      <styles xsi:type="notation:FontStyle" fontName="Microsoft Sans Serif" fontHeight="8"/>

-      <element href="SYSML.metamodel.uml#_nJsjsI2VEd6vodSRJgEedg"/>

-      <bendpoints xsi:type="notation:RelativeBendpoints" points="[-59, 66, -60, -273]$[-59, 255, -60, -84]"/>

-      <sourceAnchor xsi:type="notation:IdentityAnchor" id="(0.2334096109839817,0.5)"/>

-      <targetAnchor xsi:type="notation:IdentityAnchor" id="(0.23333333333333334,0.4329896907216495)"/>

-    </edges>

-    <edges xsi:type="notation:Connector" type="4001" source="/12/@children.8" target="/12/@children.6" routing="Rectilinear" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="6001">

-        <layoutConstraint xsi:type="notation:Location" y="-20"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" visible="false" type="6002">

-        <layoutConstraint xsi:type="notation:Location" y="20"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6003">

-        <layoutConstraint xsi:type="notation:Location" x="44" y="14"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6004">

-        <layoutConstraint xsi:type="notation:Location" x="17" y="-20"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6005">

-        <layoutConstraint xsi:type="notation:Location" x="-45" y="-14"/>

-      </children>

-      <children xsi:type="notation:DecorationNode" type="6006">

-        <layoutConstraint xsi:type="notation:Location" x="-60" y="18"/>

-      </children>

-      <styles xsi:type="notation:FontStyle" fontName="Microsoft Sans Serif" fontHeight="8"/>

-      <element href="SYSML.metamodel.uml#_nh_H4I2VEd6vodSRJgEedg"/>

-      <bendpoints xsi:type="notation:RelativeBendpoints" points="[-32, 3, -21, -279]$[-62, 3, -51, -279]$[-62, 355, -51, 73]$[-27, 355, -16, 73]"/>

-      <sourceAnchor xsi:type="notation:IdentityAnchor" id="(0.07322654462242563,0.4772727272727273)"/>

-      <targetAnchor xsi:type="notation:IdentityAnchor" id="(0.0380952380952381,0.12371134020618557)"/>

-    </edges>

-  </notation:Diagram>

-</xmi:XMI>

diff --git a/tests/ClassDiagramTestEditor/SYSML.metamodel.uml b/tests/ClassDiagramTestEditor/SYSML.metamodel.uml
deleted file mode 100644
index ff22b02975c..00000000000
--- a/tests/ClassDiagramTestEditor/SYSML.metamodel.uml
+++ /dev/null
@@ -1,800 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Ecore="http://www.eclipse.org/uml2/schemas/Ecore/5" xmlns:Standard="http://www.eclipse.org/uml2/schemas/Standard/1" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/3.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/uml2/schemas/Ecore/5 pathmap://UML_PROFILES/Ecore.profile.uml#_z1OFcHjqEdy8S4Cr8Rc_NA http://www.eclipse.org/uml2/schemas/Standard/1 pathmap://UML_PROFILES/Standard.profile.uml#_yzU58YinEdqtvbnfB2L_5w">

-  <uml:Model xmi:id="_0" name="sysml">

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

-      <generalization xmi:id="FlowPort-_generalization.0">

-        <general xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Port"/>

-      </generalization>

-      <ownedAttribute xmi:id="FlowPort-direction" name="direction" visibility="public" type="FlowDirection" isOrdered="true"/>

-      <ownedAttribute xmi:id="FlowPort-isConjugated" name="isConjugated" visibility="public" isOrdered="true">

-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Boolean"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="FlowPort-isConjugated-_lowerValue"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:id="FlowPort-isAtomic" name="isAtomic" visibility="public" isOrdered="true" isReadOnly="true" isDerived="true">

-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Boolean"/>

-      </ownedAttribute>

-      <ownedOperation xmi:id="FlowPort-validateConnectedPortsCompatibility" name="validateConnectedPortsCompatibility" visibility="public">

-        <ownedComment xmi:id="FlowPort-validateConnectedPortsCompatibility-_ownedComment.0" annotatedElement="FlowPort-validateConnectedPortsCompatibility">

-          <body>Verify that the flow port is connected to one or more flow ports that have type, direction and name matching</body>

-        </ownedComment>

-        <ownedParameter xmi:id="FlowPort-validateConnectedPortsCompatibility-_ownedParameter.0" isOrdered="true" direction="return">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Boolean"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="FlowPort-validateConnectedPortsCompatibility-_ownedParameter.0-_lowerValue"/>

-        </ownedParameter>

-      </ownedOperation>

-      <ownedOperation xmi:id="FlowPort-validateType" name="validateType" visibility="public">

-        <ownedComment xmi:id="FlowPort-validateType-_ownedComment.0" annotatedElement="FlowPort-validateType">

-          <body>An invariant constraint based on the following OCL expression : &lt;code> self.type.oclIsTypeOf(FlowSpecification) or self.type.oclIsTypeOf(Signal) or self.type.oclIsTypeOf(DataType) or self.type.oclIsTypeOf(Block) or self.type.oclIsTypeOf(ValueType)&lt;/code></body>

-        </ownedComment>

-        <ownedParameter xmi:id="FlowPort-validateType-_ownedParameter.0" isOrdered="true" direction="return">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Boolean"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="FlowPort-validateType-_ownedParameter.0-_lowerValue"/>

-        </ownedParameter>

-      </ownedOperation>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Enumeration" xmi:id="FlowDirection" name="FlowDirection">

-      <ownedLiteral xmi:id="FlowDirection-inout" name="inout"/>

-      <ownedLiteral xmi:id="FlowDirection-in" name="in"/>

-      <ownedLiteral xmi:id="FlowDirection-out" name="out"/>

-    </packagedElement>

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

-      <generalization xmi:id="FlowSpecification-_generalization.0">

-        <general xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Interface"/>

-      </generalization>

-    </packagedElement>

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

-      <generalization xmi:id="Requirement-_generalization.0">

-        <general xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>

-      </generalization>

-      <ownedAttribute xmi:id="Requirement-id" name="id" visibility="public" isOrdered="true">

-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_METAMODELS/UML.metamodel.uml#String"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="Requirement-id-_lowerValue"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:id="Requirement-text" name="text" visibility="public" isOrdered="true">

-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_METAMODELS/UML.metamodel.uml#String"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="Requirement-text-_lowerValue"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:id="Requirement-derivedFrom" name="derivedFrom" type="Requirement" isOrdered="true" isReadOnly="true" isDerived="true" association="_packagedElement.5">

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="Requirement-derivedFrom-_upperValue" value="*"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="Requirement-derivedFrom-_lowerValue"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:id="Requirement-derived" name="derived" type="Requirement" isOrdered="true" isReadOnly="true" isDerived="true" association="_packagedElement.6">

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="Requirement-derived-_upperValue" value="*"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="Requirement-derived-_lowerValue"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:id="Requirement-verifiedBy" name="verifiedBy" type="_rTCCEHqFEd6NO-HJErclZA" isOrdered="true" isReadOnly="true" isDerived="true">

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="Requirement-verifiedBy-_upperValue" value="*"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="Requirement-verifiedBy-_lowerValue"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:id="Requirement-tracedTo" name="tracedTo" isOrdered="true" isReadOnly="true" isDerived="true">

-        <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#NamedElement"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="Requirement-tracedTo-_upperValue" value="*"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="Requirement-tracedTo-_lowerValue"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:id="Requirement-satisfiedBy" name="satisfiedBy" isOrdered="true" isReadOnly="true" isDerived="true">

-        <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#NamedElement"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="Requirement-satisfiedBy-_upperValue" value="*"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="Requirement-satisfiedBy-_lowerValue"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:id="Requirement-refinedBy" name="refinedBy" isOrdered="true" isReadOnly="true" isDerived="true">

-        <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#NamedElement"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="Requirement-refinedBy-_upperValue" value="*"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="Requirement-refinedBy-_lowerValue"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:id="Requirement-master" name="master" type="Requirement" isOrdered="true" isReadOnly="true" isDerived="true" association="_packagedElement.13">

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="Requirement-master-_lowerValue"/>

-      </ownedAttribute>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Association" xmi:id="_packagedElement.5" visibility="private" memberEnd="Requirement-derivedFrom _packagedElement.5-_ownedEnd.0">

-      <ownedEnd xmi:id="_packagedElement.5-_ownedEnd.0" type="Requirement" association="_packagedElement.5"/>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Association" xmi:id="_packagedElement.6" visibility="private" memberEnd="Requirement-derived _packagedElement.6-_ownedEnd.0">

-      <ownedEnd xmi:id="_packagedElement.6-_ownedEnd.0" type="Requirement" association="_packagedElement.6"/>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Class" xmi:id="TestCase" name="TestCaseOperation">

-      <generalization xmi:id="_P4YNMGsCEd6zrJm-6aQpAw">

-        <general xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Operation"/>

-      </generalization>

-      <generalization xmi:id="_uB9tgHqFEd6NO-HJErclZA" general="_rTCCEHqFEd6NO-HJErclZA"/>

-      <ownedAttribute xmi:id="TestCase-verifies" name="verifies" type="Requirement" isOrdered="true" isReadOnly="true" isDerived="true">

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="TestCase-verifies-_upperValue" value="*"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="TestCase-verifies-_lowerValue"/>

-      </ownedAttribute>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Association" xmi:id="_packagedElement.13" visibility="private" memberEnd="Requirement-master _packagedElement.13-_ownedEnd.0">

-      <ownedEnd xmi:id="_packagedElement.13-_ownedEnd.0" type="Requirement" association="_packagedElement.13"/>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Enumeration" xmi:id="VerdictKind" name="VerdictKind">

-      <ownedLiteral xmi:id="VerdictKind-pass" name="pass"/>

-      <ownedLiteral xmi:id="VerdictKind-fail" name="fail"/>

-      <ownedLiteral xmi:id="VerdictKind-inconclusive" name="inconclusive"/>

-      <ownedLiteral xmi:id="VerdictKind-error" name="error"/>

-    </packagedElement>

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

-      <generalization xmi:id="Trace-_generalization.0">

-        <general xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Dependency"/>

-      </generalization>

-      <generalization xmi:id="_KsttEI2SEd64grchIi3hnw">

-        <general xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Abstraction"/>

-      </generalization>

-      <ownedAttribute xmi:id="_mGuyMI2SEd64grchIi3hnw" name="kind" visibility="public" type="_b97WMI2SEd64grchIi3hnw">

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_n0GS8Y2SEd64grchIi3hnw" value="1"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_n0GS8I2SEd64grchIi3hnw" value="1"/>

-        <defaultValue xmi:type="uml:LiteralString" xmi:id="_n0GS8o2SEd64grchIi3hnw">

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

-        </defaultValue>

-      </ownedAttribute>

-    </packagedElement>

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

-      <generalization xmi:id="Rationale-_generalization.0">

-        <general xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Comment"/>

-      </generalization>

-    </packagedElement>

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

-      <generalization xmi:id="Problem-_generalization.0">

-        <general xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Comment"/>

-      </generalization>

-    </packagedElement>

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

-      <generalization xmi:id="ValueType-_generalization.0">

-        <general xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#DataType"/>

-      </generalization>

-      <ownedAttribute xmi:id="ValueType-unit" name="unit" type="Unit" isOrdered="true" association="_packagedElement.25">

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="ValueType-unit-_lowerValue"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:id="ValueType-dimension" name="dimension" type="Dimension" isOrdered="true" association="_packagedElement.26">

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="ValueType-dimension-_lowerValue"/>

-      </ownedAttribute>

-    </packagedElement>

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

-      <generalization xmi:id="Unit-_generalization.0">

-        <general xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#InstanceSpecification"/>

-      </generalization>

-      <ownedAttribute xmi:id="Unit-dimension" name="dimension" type="Dimension" isOrdered="true" association="_packagedElement.24">

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="Unit-dimension-_lowerValue"/>

-      </ownedAttribute>

-    </packagedElement>

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

-      <generalization xmi:id="Dimension-_generalization.0">

-        <general xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#InstanceSpecification"/>

-      </generalization>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Association" xmi:id="_packagedElement.24" visibility="private" memberEnd="Unit-dimension _packagedElement.24-_ownedEnd.0">

-      <ownedEnd xmi:id="_packagedElement.24-_ownedEnd.0" type="Unit" association="_packagedElement.24"/>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Association" xmi:id="_packagedElement.25" visibility="private" memberEnd="ValueType-unit _packagedElement.25-_ownedEnd.0">

-      <ownedEnd xmi:id="_packagedElement.25-_ownedEnd.0" type="ValueType" association="_packagedElement.25"/>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Association" xmi:id="_packagedElement.26" visibility="private" memberEnd="ValueType-dimension _packagedElement.26-_ownedEnd.0">

-      <ownedEnd xmi:id="_packagedElement.26-_ownedEnd.0" type="ValueType" association="_packagedElement.26"/>

-    </packagedElement>

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

-      <generalization xmi:id="DistributedProperty-_generalization.0">

-        <general xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>

-      </generalization>

-    </packagedElement>

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

-      <generalization xmi:id="ItemFlow-_generalization.0">

-        <general xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#InformationFlow"/>

-      </generalization>

-      <ownedAttribute xmi:id="ItemFlow-itemProperty" name="itemProperty" isOrdered="true" association="_packagedElement.29">

-        <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="ItemFlow-itemProperty-_lowerValue"/>

-      </ownedAttribute>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Association" xmi:id="_packagedElement.29" visibility="private" memberEnd="ItemFlow-itemProperty _packagedElement.29-_ownedEnd.0">

-      <ownedEnd xmi:id="_packagedElement.29-_ownedEnd.0" type="ItemFlow" association="_packagedElement.29"/>

-    </packagedElement>

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

-      <generalization xmi:id="FlowProperty-_generalization.0">

-        <general xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>

-      </generalization>

-      <ownedAttribute xmi:id="FlowProperty-direction" name="direction" visibility="public" type="FlowDirection" isOrdered="true"/>

-      <ownedOperation xmi:id="FlowProperty-validateType" name="validateType" visibility="public">

-        <ownedComment xmi:id="FlowProperty-validateType-_ownedComment.0" annotatedElement="FlowProperty-validateType">

-          <body>An invariant constraint based on the following OCL expression : &lt;code>  self.type.oclIsTypeOf(Signal) or self.type.oclIsTypeOf(DataType) or self.type.oclIsTypeOf(Block) or self.type.oclIsTypeOf(ValueType)&lt;/code></body>

-        </ownedComment>

-        <ownedParameter xmi:id="FlowProperty-validateType-_ownedParameter.0" isOrdered="true" direction="return">

-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Boolean"/>

-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="FlowProperty-validateType-_ownedParameter.0-_lowerValue"/>

-        </ownedParameter>

-      </ownedOperation>

-    </packagedElement>

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

-      <generalization xmi:id="_nT8RcHbDEd6vj7tN0L3z0A" general="_fmUJsHIpEd6oWe6GYqP1Cw"/>

-    </packagedElement>

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

-      <generalization xmi:id="Refine-_generalization.0" general="Trace"/>

-    </packagedElement>

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

-      <generalization xmi:id="ConstraintProperty-_generalization.0">

-        <general xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>

-      </generalization>

-    </packagedElement>

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

-      <generalization xmi:id="RequirementRelated-_generalization.0">

-        <general xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#NamedElement"/>

-      </generalization>

-    </packagedElement>

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

-      <generalization xmi:id="Conform-_generalization.0">

-        <general xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Dependency"/>

-      </generalization>

-    </packagedElement>

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

-      <generalization xmi:id="View-_generalization.0">

-        <general xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package"/>

-      </generalization>

-      <ownedAttribute xmi:id="View-viewpoint" name="viewpoint" type="Viewpoint" isOrdered="true" isDerived="true" association="_packagedElement.42"/>

-    </packagedElement>

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

-      <ownedRule xmi:id="_Gi77EG1jEd6aGe9mbu2K8Q" name="A viewpoint cannot be the classifier of an instance specification" constrainedElement="Viewpoint">

-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_MP3BoG1jEd6aGe9mbu2K8Q">

-          <language>OCL</language>

-          <body>InstanceSpecification.allInstances()&#xD;&#xA;&#x9;->select(i | i.classifier = self)->isEmpty()</body>

-        </specification>

-      </ownedRule>

-      <ownedRule xmi:id="_Q0XuoG1jEd6aGe9mbu2K8Q" name="OwnedAttributeEmpty" constrainedElement="Viewpoint">

-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Q0XuoW1jEd6aGe9mbu2K8Q">

-          <language>OCL</language>

-          <body>self.ownedAttribute->isEmpty()</body>

-        </specification>

-      </ownedRule>

-      <ownedRule xmi:id="_Q9dZMG1jEd6aGe9mbu2K8Q" name="OwnedOperationEmpty" constrainedElement="Viewpoint">

-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Q9dZMW1jEd6aGe9mbu2K8Q">

-          <language>OCL</language>

-          <body>self.ownedOperation->isEmpty()</body>

-        </specification>

-      </ownedRule>

-      <generalization xmi:id="Viewpoint-_generalization.0">

-        <general xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>

-      </generalization>

-      <ownedAttribute xmi:id="Viewpoint-stakeholders" name="stakeholders" visibility="public" isOrdered="true">

-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_METAMODELS/UML.metamodel.uml#String"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="Viewpoint-stakeholders-_upperValue" value="*"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="Viewpoint-stakeholders-_lowerValue"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:id="Viewpoint-purpose" name="purpose" visibility="public" isOrdered="true">

-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_METAMODELS/UML.metamodel.uml#String"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="Viewpoint-purpose-_lowerValue"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:id="Viewpoint-concerns" name="concerns" visibility="public" isOrdered="true">

-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_METAMODELS/UML.metamodel.uml#String"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="Viewpoint-concerns-_upperValue" value="*"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="Viewpoint-concerns-_lowerValue"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:id="Viewpoint-languages" name="languages" visibility="public" isOrdered="true">

-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_METAMODELS/UML.metamodel.uml#String"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="Viewpoint-languages-_upperValue" value="*"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="Viewpoint-languages-_lowerValue"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:id="Viewpoint-methods" name="methods" visibility="public" isOrdered="true">

-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_METAMODELS/UML.metamodel.uml#String"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="Viewpoint-methods-_upperValue" value="*"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="Viewpoint-methods-_lowerValue"/>

-      </ownedAttribute>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Association" xmi:id="_packagedElement.42" visibility="private" memberEnd="View-viewpoint _packagedElement.42-_ownedEnd.0">

-      <ownedEnd xmi:id="_packagedElement.42-_ownedEnd.0" type="View" association="_packagedElement.42"/>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Association" xmi:id="_packagedElement.44" visibility="private" memberEnd="_packagedElement.44-_ownedEnd.0">

-      <ownedEnd xmi:id="_packagedElement.44-_ownedEnd.0" type="ParticipantProperty" association="_packagedElement.44"/>

-    </packagedElement>

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

-      <generalization xmi:id="ConnectorProperty-_generalization.0">

-        <general xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>

-      </generalization>

-      <ownedAttribute xmi:id="ConnectorProperty-connector" name="connector" isOrdered="true" association="_packagedElement.46">

-        <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Connector"/>

-      </ownedAttribute>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Association" xmi:id="_packagedElement.46" visibility="private" memberEnd="ConnectorProperty-connector _packagedElement.46-_ownedEnd.0">

-      <ownedEnd xmi:id="_packagedElement.46-_ownedEnd.0" type="ConnectorProperty" association="_packagedElement.46"/>

-    </packagedElement>

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

-      <generalization xmi:id="BindingConnector-_generalization.0">

-        <general xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Connector"/>

-      </generalization>

-    </packagedElement>

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

-      <generalization xmi:id="NestedConnectorEnd-_generalization.0">

-        <general xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#ConnectorEnd"/>

-      </generalization>

-      <ownedAttribute xmi:id="NestedConnectorEnd-propertyPath" name="propertyPath" isOrdered="true" isDerived="true" association="_packagedElement.49">

-        <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="NestedConnectorEnd-propertyPath-_upperValue" value="*"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="NestedConnectorEnd-propertyPath-_lowerValue" value="2"/>

-      </ownedAttribute>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Association" xmi:id="_packagedElement.49" visibility="private" memberEnd="NestedConnectorEnd-propertyPath _packagedElement.49-_ownedEnd.0">

-      <ownedEnd xmi:id="_packagedElement.49-_ownedEnd.0" type="NestedConnectorEnd" association="_packagedElement.49"/>

-    </packagedElement>

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

-      <generalization xmi:id="PropertySpecificType-_generalization.0">

-        <general xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Classifier"/>

-      </generalization>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Class" xmi:id="Rate" name="Rate" isAbstract="true">

-      <ownedAttribute xmi:id="Rate-rate" name="rate" isOrdered="true" association="_packagedElement.53">

-        <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#InstanceSpecification"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:id="_zLNXII18Ed64grchIi3hnw" name="isContinuous" visibility="public" isDerived="true">

-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1-UX8Y18Ed64grchIi3hnw" value="1"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_1-UX8I18Ed64grchIi3hnw" value="1"/>

-        <defaultValue xmi:type="uml:LiteralString" xmi:id="_1-UX8o18Ed64grchIi3hnw">

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

-        </defaultValue>

-      </ownedAttribute>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Association" xmi:id="_packagedElement.53" visibility="private" memberEnd="Rate-rate _packagedElement.53-_ownedEnd.0">

-      <ownedEnd xmi:id="_packagedElement.53-_ownedEnd.0" type="Rate" association="_packagedElement.53"/>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Class" xmi:id="ControlOperator" name="ControlOperationOperator">

-      <generalization xmi:id="ControlOperator-_generalization.0">

-        <general xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Operation"/>

-      </generalization>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Class" xmi:id="Overwrite" name="ObjectNode" isAbstract="true">

-      <generalization xmi:id="Overwrite-_generalization.0">

-        <general xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#ObjectNode"/>

-      </generalization>

-      <ownedAttribute xmi:id="_5o0FAI2CEd64grchIi3hnw" name="objectNodeKind" visibility="public" type="_2pxhAI2CEd64grchIi3hnw">

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_75WkQY2CEd64grchIi3hnw" value="1"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_75WkQI2CEd64grchIi3hnw" value="1"/>

-        <defaultValue xmi:type="uml:LiteralString" xmi:id="_75WkQo2CEd64grchIi3hnw">

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

-        </defaultValue>

-      </ownedAttribute>

-    </packagedElement>

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

-      <generalization xmi:id="Allocate-_generalization.0">

-        <general xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Abstraction"/>

-      </generalization>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Class" xmi:id="Allocated" name="Allocated" isAbstract="true">

-      <generalization xmi:id="Allocated-_generalization.0">

-        <general xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#NamedElement"/>

-      </generalization>

-      <ownedAttribute xmi:id="Allocated-allocatedFrom" name="allocatedFrom" type="Allocate" isOrdered="true" isDerived="true">

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="Allocated-allocatedFrom-_upperValue" value="*"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="Allocated-allocatedFrom-_lowerValue"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:id="Allocated-allocatedTo" name="allocatedTo" type="Allocate" isOrdered="true" isDerived="true">

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="Allocated-allocatedTo-_upperValue" value="*"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="Allocated-allocatedTo-_lowerValue"/>

-      </ownedAttribute>

-    </packagedElement>

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

-      <generalization xmi:id="AllocateActivityPartition-_generalization.0">

-        <general xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#ActivityPartition"/>

-      </generalization>

-      <generalization xmi:id="_Sbb6AI2XEd6vodSRJgEedg" general="Allocate"/>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Association" xmi:id="_x1z3oG1VEd6aGe9mbu2K8Q" name="A_conform_viewpoint" memberEnd="_x1z3pG1VEd6aGe9mbu2K8Q _x1z3oW1VEd6aGe9mbu2K8Q">

-      <ownedEnd xmi:id="_x1z3oW1VEd6aGe9mbu2K8Q" name="viewpoint" type="Viewpoint" isDerived="true" association="_x1z3oG1VEd6aGe9mbu2K8Q">

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_x1z3om1VEd6aGe9mbu2K8Q" value="*"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_x1z3o21VEd6aGe9mbu2K8Q" value="1"/>

-        <redefinedProperty href="pathmap://UML_METAMODELS/UML.metamodel.uml#Dependency-supplier"/>

-      </ownedEnd>

-      <ownedEnd xmi:id="_x1z3pG1VEd6aGe9mbu2K8Q" name="supplierConform" type="Conform" association="_x1z3oG1VEd6aGe9mbu2K8Q">

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_x1z3pW1VEd6aGe9mbu2K8Q" value="*"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_x1z3pm1VEd6aGe9mbu2K8Q"/>

-        <subsettedProperty href="pathmap://UML_METAMODELS/UML.metamodel.uml#A_supplierDependency_supplier-supplierDependency"/>

-      </ownedEnd>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Association" xmi:id="_jA0_YG1gEd6aGe9mbu2K8Q" name="A_conform_view" memberEnd="_jA0_ZG1gEd6aGe9mbu2K8Q _jA0_YW1gEd6aGe9mbu2K8Q">

-      <ownedEnd xmi:id="_jA0_YW1gEd6aGe9mbu2K8Q" name="view" type="View" association="_jA0_YG1gEd6aGe9mbu2K8Q">

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_jA0_Ym1gEd6aGe9mbu2K8Q" value="*"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_jA0_Y21gEd6aGe9mbu2K8Q" value="1"/>

-        <redefinedProperty href="pathmap://UML_METAMODELS/UML.metamodel.uml#Dependency-client"/>

-      </ownedEnd>

-      <ownedEnd xmi:id="_jA0_ZG1gEd6aGe9mbu2K8Q" name="clientConform" type="Conform" association="_jA0_YG1gEd6aGe9mbu2K8Q">

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_jA0_ZW1gEd6aGe9mbu2K8Q" value="*"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_jA0_Zm1gEd6aGe9mbu2K8Q"/>

-        <subsettedProperty href="pathmap://UML_METAMODELS/UML.metamodel.uml#NamedElement-clientDependency"/>

-      </ownedEnd>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Association" xmi:id="_RiGJYHIbEd6oWe6GYqP1Cw" name="A_block_property" memberEnd="_RiGJZHIbEd6oWe6GYqP1Cw _RiGJYXIbEd6oWe6GYqP1Cw">

-      <ownedEnd xmi:id="_RiGJYXIbEd6oWe6GYqP1Cw" name="partProperties" isDerived="true" aggregation="composite" association="_RiGJYHIbEd6oWe6GYqP1Cw">

-        <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_RiGJYnIbEd6oWe6GYqP1Cw" value="*"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_RiGJY3IbEd6oWe6GYqP1Cw"/>

-      </ownedEnd>

-      <ownedEnd xmi:id="_RiGJZHIbEd6oWe6GYqP1Cw" name="block" type="_fmUJsHIpEd6oWe6GYqP1Cw" association="_RiGJYHIbEd6oWe6GYqP1Cw">

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_RiGJZXIbEd6oWe6GYqP1Cw" value="1"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_RiGJZnIbEd6oWe6GYqP1Cw"/>

-        <redefinedProperty href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element-owner"/>

-      </ownedEnd>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Association" xmi:id="_8uzrMHIbEd6oWe6GYqP1Cw" name="A_block_referenceProperty" memberEnd="_8uzrNHIbEd6oWe6GYqP1Cw _8uzrMXIbEd6oWe6GYqP1Cw">

-      <ownedEnd xmi:id="_8uzrMXIbEd6oWe6GYqP1Cw" name="referenceProperties" isDerived="true" aggregation="composite" association="_8uzrMHIbEd6oWe6GYqP1Cw">

-        <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8uzrMnIbEd6oWe6GYqP1Cw" value="*"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_8uzrM3IbEd6oWe6GYqP1Cw"/>

-      </ownedEnd>

-      <ownedEnd xmi:id="_8uzrNHIbEd6oWe6GYqP1Cw" name="block" visibility="public" type="_fmUJsHIpEd6oWe6GYqP1Cw" association="_8uzrMHIbEd6oWe6GYqP1Cw">

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8uzrNXIbEd6oWe6GYqP1Cw" value="1"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_8uzrNnIbEd6oWe6GYqP1Cw"/>

-        <redefinedProperty href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element-owner"/>

-      </ownedEnd>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Class" xmi:id="_fmUJsHIpEd6oWe6GYqP1Cw" name="Block">

-      <generalization xmi:id="_W5jNUHacEd6sO-Hboh1LgQ">

-        <general xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>

-      </generalization>

-      <ownedAttribute xmi:id="Block-isEncapsulated" name="isEncapsulated" visibility="public" isOrdered="true">

-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Boolean"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="Block-isEncapsulated-_lowerValue"/>

-      </ownedAttribute>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Class" xmi:id="_o98AYHIpEd6oWe6GYqP1Cw" name="AssociationBlock">

-      <generalization xmi:id="_xdxTcHIpEd6oWe6GYqP1Cw" general="_fmUJsHIpEd6oWe6GYqP1Cw"/>

-      <generalization xmi:id="_0SZzIHabEd6sO-Hboh1LgQ">

-        <general xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Association"/>

-      </generalization>

-    </packagedElement>

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

-      <generalization xmi:id="ParticipantProperty-_generalization.0">

-        <general xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>

-      </generalization>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Association" xmi:id="_SHSG0HIrEd6oWe6GYqP1Cw" name="A_associationBlock_participantProperty" memberEnd="_SHSG1HIrEd6oWe6GYqP1Cw _SHSG0XIrEd6oWe6GYqP1Cw">

-      <ownedEnd xmi:id="_SHSG0XIrEd6oWe6GYqP1Cw" name="participantProperties" type="ParticipantProperty" aggregation="composite" association="_SHSG0HIrEd6oWe6GYqP1Cw">

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_SHSG0nIrEd6oWe6GYqP1Cw" value="*"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_SHSG03IrEd6oWe6GYqP1Cw"/>

-        <subsettedProperty href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-ownedAttribute"/>

-      </ownedEnd>

-      <ownedEnd xmi:id="_SHSG1HIrEd6oWe6GYqP1Cw" name="associationBlock" type="_o98AYHIpEd6oWe6GYqP1Cw" association="_SHSG0HIrEd6oWe6GYqP1Cw">

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_SHSG1XIrEd6oWe6GYqP1Cw" value="1"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_SHSG1nIrEd6oWe6GYqP1Cw" value="1"/>

-        <redefinedProperty href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element-owner"/>

-      </ownedEnd>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Association" xmi:id="_AiN0sHLHEd6z4NQq9r5Ykg" name="A_valueType_distributedProperty" memberEnd="_AiN0tHLHEd6z4NQq9r5Ykg _AiN0sXLHEd6z4NQq9r5Ykg">

-      <ownedEnd xmi:id="_AiN0sXLHEd6z4NQq9r5Ykg" name="distributedProperties" type="DistributedProperty" aggregation="composite" association="_AiN0sHLHEd6z4NQq9r5Ykg">

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_AiN0snLHEd6z4NQq9r5Ykg" value="*"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_AiN0s3LHEd6z4NQq9r5Ykg"/>

-        <subsettedProperty href="pathmap://UML_METAMODELS/UML.metamodel.uml#DataType-ownedAttribute"/>

-      </ownedEnd>

-      <ownedEnd xmi:id="_AiN0tHLHEd6z4NQq9r5Ykg" name="owner" type="ValueType" association="_AiN0sHLHEd6z4NQq9r5Ykg">

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_AiN0tXLHEd6z4NQq9r5Ykg" value="1"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_AiN0tnLHEd6z4NQq9r5Ykg"/>

-        <redefinedProperty href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element-owner"/>

-      </ownedEnd>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Association" xmi:id="_B66n0HLZEd6z4NQq9r5Ykg" name="A_block_flowProperty" memberEnd="_B66n1HLZEd6z4NQq9r5Ykg _B66n0XLZEd6z4NQq9r5Ykg">

-      <ownedEnd xmi:id="_B66n0XLZEd6z4NQq9r5Ykg" name="flowProperties" type="FlowProperty" aggregation="composite" association="_B66n0HLZEd6z4NQq9r5Ykg">

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_B66n0nLZEd6z4NQq9r5Ykg" value="*"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_B66n03LZEd6z4NQq9r5Ykg"/>

-      </ownedEnd>

-      <ownedEnd xmi:id="_B66n1HLZEd6z4NQq9r5Ykg" name="block" association="_B66n0HLZEd6z4NQq9r5Ykg">

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_B66n1XLZEd6z4NQq9r5Ykg" value="1"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_B66n1nLZEd6z4NQq9r5Ykg"/>

-        <redefinedProperty href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element-owner"/>

-        <subsettedProperty href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-ownedAttribute"/>

-      </ownedEnd>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Association" xmi:id="_4vBYoHLbEd6z4NQq9r5Ykg" name="A_block_port" memberEnd="_4vBYpHLbEd6z4NQq9r5Ykg _4vBYoXLbEd6z4NQq9r5Ykg">

-      <ownedEnd xmi:id="_4vBYoXLbEd6z4NQq9r5Ykg" name="ports" aggregation="composite" association="_4vBYoHLbEd6z4NQq9r5Ykg">

-        <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Port"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4vBYonLbEd6z4NQq9r5Ykg" value="*"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_4vBYo3LbEd6z4NQq9r5Ykg"/>

-        <subsettedProperty href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-ownedAttribute"/>

-      </ownedEnd>

-      <ownedEnd xmi:id="_4vBYpHLbEd6z4NQq9r5Ykg" name="block" association="_4vBYoHLbEd6z4NQq9r5Ykg">

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4vBYpXLbEd6z4NQq9r5Ykg" value="1"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_4vBYpnLbEd6z4NQq9r5Ykg"/>

-      </ownedEnd>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Association" xmi:id="_1WAjgHLdEd6z4NQq9r5Ykg" name="A_flowProperty_flowSpecification" memberEnd="_1WAjhHLdEd6z4NQq9r5Ykg _1WAjgXLdEd6z4NQq9r5Ykg">

-      <ownedEnd xmi:id="_1WAjgXLdEd6z4NQq9r5Ykg" name="flowProperties" type="FlowProperty" aggregation="composite" association="_1WAjgHLdEd6z4NQq9r5Ykg">

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1WAjgnLdEd6z4NQq9r5Ykg" value="*"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_1WAjg3LdEd6z4NQq9r5Ykg"/>

-        <redefinedProperty href="pathmap://UML_METAMODELS/UML.metamodel.uml#Interface-ownedAttribute"/>

-      </ownedEnd>

-      <ownedEnd xmi:id="_1WAjhHLdEd6z4NQq9r5Ykg" name="owner" type="FlowSpecification" association="_1WAjgHLdEd6z4NQq9r5Ykg">

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1WAjhXLdEd6z4NQq9r5Ykg" value="1"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_1WAjhnLdEd6z4NQq9r5Ykg"/>

-        <redefinedProperty href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element-owner"/>

-      </ownedEnd>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Association" xmi:id="_ZxjRAHajEd6vj7tN0L3z0A" name="A_block_distributedProperty" memberEnd="_ZxjRBHajEd6vj7tN0L3z0A _ZxjRAXajEd6vj7tN0L3z0A">

-      <ownedEnd xmi:id="_ZxjRAXajEd6vj7tN0L3z0A" name="distributedProperties" type="DistributedProperty" aggregation="composite" association="_ZxjRAHajEd6vj7tN0L3z0A">

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ZxjRAnajEd6vj7tN0L3z0A" value="*"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ZxjRA3ajEd6vj7tN0L3z0A"/>

-        <subsettedProperty href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-ownedAttribute"/>

-      </ownedEnd>

-      <ownedEnd xmi:id="_ZxjRBHajEd6vj7tN0L3z0A" name="block" type="_fmUJsHIpEd6oWe6GYqP1Cw" association="_ZxjRAHajEd6vj7tN0L3z0A">

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ZxjRBXajEd6vj7tN0L3z0A" value="1"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ZxjRBnajEd6vj7tN0L3z0A" value="1"/>

-      </ownedEnd>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Association" xmi:id="_gv8GAHbQEd6vj7tN0L3z0A" name="A_constraintBlock_constraintProperty" memberEnd="_gv8GBHbQEd6vj7tN0L3z0A _gv8GAXbQEd6vj7tN0L3z0A">

-      <ownedEnd xmi:id="_gv8GAXbQEd6vj7tN0L3z0A" name="constraintblock" type="ConstraintBlock" association="_gv8GAHbQEd6vj7tN0L3z0A">

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_gv8GAnbQEd6vj7tN0L3z0A" value="1"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_gv8GA3bQEd6vj7tN0L3z0A" value="1"/>

-        <redefinedProperty href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element-owner"/>

-      </ownedEnd>

-      <ownedEnd xmi:id="_gv8GBHbQEd6vj7tN0L3z0A" name="constraintProperties" type="ConstraintProperty" aggregation="composite" association="_gv8GAHbQEd6vj7tN0L3z0A">

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_gv8GBXbQEd6vj7tN0L3z0A" value="*"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_gv8GBnbQEd6vj7tN0L3z0A"/>

-        <redefinedProperty href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class-ownedAttribute"/>

-      </ownedEnd>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Association" xmi:id="_DhrlMHdWEd6DPZaLLWzzlg" name="A_BehaviorControlOperator_OperationControlOperator" memberEnd="_DhrlNHdWEd6DPZaLLWzzlg _DhrlMXdWEd6DPZaLLWzzlg">

-      <ownedEnd xmi:id="_DhrlMXdWEd6DPZaLLWzzlg" name="method" type="_d80QUHePEd6DPZaLLWzzlg" association="_DhrlMHdWEd6DPZaLLWzzlg">

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DhrlMndWEd6DPZaLLWzzlg" value="*"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DhrlM3dWEd6DPZaLLWzzlg"/>

-        <redefinedProperty href="pathmap://UML_METAMODELS/UML.metamodel.uml#BehavioralFeature-method"/>

-      </ownedEnd>

-      <ownedEnd xmi:id="_DhrlNHdWEd6DPZaLLWzzlg" name="controlOperator" type="ControlOperator" association="_DhrlMHdWEd6DPZaLLWzzlg">

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DhrlNXdWEd6DPZaLLWzzlg" value="1"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DhrlNndWEd6DPZaLLWzzlg" value="1"/>

-      </ownedEnd>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Class" xmi:id="_d80QUHePEd6DPZaLLWzzlg" name="ControlBehaviorOperator" isAbstract="true">

-      <generalization xmi:id="_mfLCoGr8Ed6wEN-goObHxA">

-        <general xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Behavior"/>

-      </generalization>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Class" xmi:id="_oCyZwHeaEd6DPZaLLWzzlg" name="Probability"/>

-    <packagedElement xmi:type="uml:Association" xmi:id="_xcgv4HhjEd6xUocNBcy1EA" name="A_Allocate_NamedElement" memberEnd="_xcgv5HhjEd6xUocNBcy1EA _xcgv4XhjEd6xUocNBcy1EA">

-      <ownedEnd xmi:id="_xcgv4XhjEd6xUocNBcy1EA" name="allocatedFrom" type="Allocated" isDerived="true" association="_xcgv4HhjEd6xUocNBcy1EA">

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xcgv4nhjEd6xUocNBcy1EA" value="*"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_xcgv43hjEd6xUocNBcy1EA"/>

-        <redefinedProperty href="pathmap://UML_METAMODELS/UML.metamodel.uml#Dependency-client"/>

-      </ownedEnd>

-      <ownedEnd xmi:id="_xcgv5HhjEd6xUocNBcy1EA" name="allocatedTo" type="Allocate" isDerived="true" association="_xcgv4HhjEd6xUocNBcy1EA">

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xcgv5XhjEd6xUocNBcy1EA" value="*"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_xcgv5nhjEd6xUocNBcy1EA"/>

-      </ownedEnd>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Class" xmi:id="_BeFkcHqFEd6NO-HJErclZA" name="TestCaseBehavior">

-      <generalization xmi:id="TestCase-_generalization.0">

-        <general xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Behavior"/>

-      </generalization>

-      <generalization xmi:id="_uW1KQHqFEd6NO-HJErclZA" general="_rTCCEHqFEd6NO-HJErclZA"/>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Class" xmi:id="_rTCCEHqFEd6NO-HJErclZA" name="TestCase" isAbstract="true"/>

-    <packagedElement xmi:type="uml:Association" xmi:id="_ICdvII1XEd6Uwep1wGTpyA" name="Association_ParticipantProperty_Property" memberEnd="_ICdvJI1XEd6Uwep1wGTpyA _ICdvIY1XEd6Uwep1wGTpyA">

-      <ownedEnd xmi:id="_ICdvIY1XEd6Uwep1wGTpyA" name="endProperty" association="_ICdvII1XEd6Uwep1wGTpyA">

-        <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ICdvIo1XEd6Uwep1wGTpyA" value="1"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ICdvI41XEd6Uwep1wGTpyA" value="1"/>

-      </ownedEnd>

-      <ownedEnd xmi:id="_ICdvJI1XEd6Uwep1wGTpyA" name="" type="ParticipantProperty" association="_ICdvII1XEd6Uwep1wGTpyA">

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ICdvJY1XEd6Uwep1wGTpyA" value="1"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ICdvJo1XEd6Uwep1wGTpyA" value="1"/>

-      </ownedEnd>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Class" xmi:id="_Fs_QQI19Ed64grchIi3hnw" name="Parameter">

-      <generalization xmi:id="Rate-_generalization.0">

-        <general xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Parameter"/>

-      </generalization>

-      <ownedAttribute xmi:id="_WCAW4I19Ed64grchIi3hnw" name="isRequired" visibility="public" isDerived="true">

-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ZiRYoY19Ed64grchIi3hnw" value="1"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ZiRYoI19Ed64grchIi3hnw" value="1"/>

-        <defaultValue xmi:type="uml:LiteralString" xmi:id="_ZiRYoo19Ed64grchIi3hnw">

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

-        </defaultValue>

-      </ownedAttribute>

-      <ownedAttribute xmi:id="__jnzYI1-Ed64grchIi3hnw" name="streaming" visibility="public" type="_Cbf_cI1_Ed64grchIi3hnw" isDerived="true">

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A4G6EY1_Ed64grchIi3hnw" value="1"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A4G6EI1_Ed64grchIi3hnw" value="1"/>

-        <defaultValue xmi:type="uml:LiteralString" xmi:id="_A4G6Eo1_Ed64grchIi3hnw">

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

-        </defaultValue>

-      </ownedAttribute>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Association" xmi:id="_K-8SEI19Ed64grchIi3hnw" name="Association_Parameter_Rate" memberEnd="_K-8SFI19Ed64grchIi3hnw _K-8SEY19Ed64grchIi3hnw">

-      <ownedEnd xmi:id="_K-8SEY19Ed64grchIi3hnw" name="rate" type="Rate" association="_K-8SEI19Ed64grchIi3hnw">

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

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_K-8SE419Ed64grchIi3hnw"/>

-      </ownedEnd>

-      <ownedEnd xmi:id="_K-8SFI19Ed64grchIi3hnw" name="parameter" type="_Fs_QQI19Ed64grchIi3hnw" association="_K-8SEI19Ed64grchIi3hnw">

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

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

-      </ownedEnd>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Enumeration" xmi:id="_Cbf_cI1_Ed64grchIi3hnw" name="StreamingTime">

-      <ownedLiteral xmi:id="_G7nUoI1_Ed64grchIi3hnw" name="Discrete"/>

-      <ownedLiteral xmi:id="_HDW7YI1_Ed64grchIi3hnw" name="Continuous"/>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Class" xmi:id="_UiCcII2BEd64grchIi3hnw" name="ActivityEdge">

-      <generalization xmi:id="Probability-_generalization.0">

-        <general xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#ActivityEdge"/>

-      </generalization>

-      <ownedAttribute xmi:id="_It0xwI2CEd64grchIi3hnw" name="streaming" visibility="public" type="_Cbf_cI1_Ed64grchIi3hnw" isDerived="true">

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_It0xwY2CEd64grchIi3hnw" value="1"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_It0xwo2CEd64grchIi3hnw" value="1"/>

-        <defaultValue xmi:type="uml:LiteralString" xmi:id="_It0xw42CEd64grchIi3hnw">

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

-        </defaultValue>

-      </ownedAttribute>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Association" xmi:id="_ZCrVwI2BEd64grchIi3hnw" name="Association_ActivityEdge_Rate" memberEnd="_ZCrVxI2BEd64grchIi3hnw _ZCrVwY2BEd64grchIi3hnw">

-      <ownedEnd xmi:id="_ZCrVwY2BEd64grchIi3hnw" name="rate" type="Rate" association="_ZCrVwI2BEd64grchIi3hnw">

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ZCrVwo2BEd64grchIi3hnw" value="1"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ZCrVw42BEd64grchIi3hnw"/>

-      </ownedEnd>

-      <ownedEnd xmi:id="_ZCrVxI2BEd64grchIi3hnw" name="activityedge" type="_UiCcII2BEd64grchIi3hnw" association="_ZCrVwI2BEd64grchIi3hnw">

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ZCrVxY2BEd64grchIi3hnw" value="1"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ZCrVxo2BEd64grchIi3hnw" value="1"/>

-      </ownedEnd>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Association" xmi:id="_71WDcI2BEd64grchIi3hnw" name="Association_ActivityEdge_Probability" memberEnd="_71WDdI2BEd64grchIi3hnw _71WDcY2BEd64grchIi3hnw">

-      <ownedEnd xmi:id="_71WDcY2BEd64grchIi3hnw" name="probability" type="_oCyZwHeaEd6DPZaLLWzzlg" association="_71WDcI2BEd64grchIi3hnw">

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_71WDco2BEd64grchIi3hnw" value="1"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_71WDc42BEd64grchIi3hnw"/>

-      </ownedEnd>

-      <ownedEnd xmi:id="_71WDdI2BEd64grchIi3hnw" name="activityedge" type="_UiCcII2BEd64grchIi3hnw" association="_71WDcI2BEd64grchIi3hnw">

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_71WDdY2BEd64grchIi3hnw" value="1"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_71WDdo2BEd64grchIi3hnw" value="1"/>

-      </ownedEnd>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Class" xmi:id="_ZXG4MI2CEd64grchIi3hnw" name="ParameterSet">

-      <generalization xmi:id="_awg7II2CEd64grchIi3hnw">

-        <general xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#ParameterSet"/>

-      </generalization>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Association" xmi:id="_hQ2boI2CEd64grchIi3hnw" name="Association_ParameterSet_Probability" memberEnd="_hQ2bpI2CEd64grchIi3hnw _hQ2boY2CEd64grchIi3hnw">

-      <ownedEnd xmi:id="_hQ2boY2CEd64grchIi3hnw" name="probability" type="_oCyZwHeaEd6DPZaLLWzzlg" association="_hQ2boI2CEd64grchIi3hnw">

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_hQ2boo2CEd64grchIi3hnw" value="1"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_hQ2bo42CEd64grchIi3hnw"/>

-      </ownedEnd>

-      <ownedEnd xmi:id="_hQ2bpI2CEd64grchIi3hnw" name="parameterset" type="_ZXG4MI2CEd64grchIi3hnw" association="_hQ2boI2CEd64grchIi3hnw">

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_hQ2bpY2CEd64grchIi3hnw" value="1"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_hQ2bpo2CEd64grchIi3hnw" value="1"/>

-      </ownedEnd>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Enumeration" xmi:id="_2pxhAI2CEd64grchIi3hnw" name="ObjectNodeKind">

-      <ownedLiteral xmi:id="_Ac0IYI2DEd64grchIi3hnw" name="Buffer"/>

-      <ownedLiteral xmi:id="_CDVaQI2DEd64grchIi3hnw" name="NoBuffer"/>

-      <ownedLiteral xmi:id="_C3WRII2DEd64grchIi3hnw" name="Overwrite"/>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Association" xmi:id="_KoTE8I2DEd64grchIi3hnw" name="Association_Probability_ValueSpecification" memberEnd="_KoTE9I2DEd64grchIi3hnw _KoTE8Y2DEd64grchIi3hnw">

-      <ownedEnd xmi:id="_KoTE8Y2DEd64grchIi3hnw" name="probability" association="_KoTE8I2DEd64grchIi3hnw">

-        <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#ValueSpecification"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KoTE8o2DEd64grchIi3hnw" value="1"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_KoTE842DEd64grchIi3hnw" value="1"/>

-      </ownedEnd>

-      <ownedEnd xmi:id="_KoTE9I2DEd64grchIi3hnw" name="element" type="_oCyZwHeaEd6DPZaLLWzzlg" association="_KoTE8I2DEd64grchIi3hnw">

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KoTE9Y2DEd64grchIi3hnw" value="1"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_KoTE9o2DEd64grchIi3hnw" value="1"/>

-      </ownedEnd>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Enumeration" xmi:id="_b97WMI2SEd64grchIi3hnw" name="TraceKind">

-      <ownedLiteral xmi:id="_ptFN0I2SEd64grchIi3hnw" name="DeriveReqt"/>

-      <ownedLiteral xmi:id="_pzySwI2SEd64grchIi3hnw" name="Verify"/>

-      <ownedLiteral xmi:id="_p7YvkI2SEd64grchIi3hnw" name="Copy"/>

-      <ownedLiteral xmi:id="_qEeaII2SEd64grchIi3hnw" name="Satisfy"/>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Association" xmi:id="_1ujmMI2TEd64grchIi3hnw" name="Association_Requirement_TestCase" memberEnd="_1ujmNI2TEd64grchIi3hnw _1ujmMY2TEd64grchIi3hnw">

-      <ownedEnd xmi:id="_1ujmMY2TEd64grchIi3hnw" name="verifies" type="Requirement" isDerived="true" association="_1ujmMI2TEd64grchIi3hnw">

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1ujmMo2TEd64grchIi3hnw" value="*"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_1ujmM42TEd64grchIi3hnw"/>

-      </ownedEnd>

-      <ownedEnd xmi:id="_1ujmNI2TEd64grchIi3hnw" name="verifiedBy" type="_rTCCEHqFEd6NO-HJErclZA" isDerived="true" association="_1ujmMI2TEd64grchIi3hnw">

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1ujmNY2TEd64grchIi3hnw" value="*"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_1ujmNo2TEd64grchIi3hnw"/>

-      </ownedEnd>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Association" xmi:id="_lGHiYI2VEd6vodSRJgEedg" name="Association_Satisfy" memberEnd="_lGHiZI2VEd6vodSRJgEedg _lGHiYY2VEd6vodSRJgEedg">

-      <ownedEnd xmi:id="_lGHiYY2VEd6vodSRJgEedg" name="satisfies" type="Requirement" isDerived="true" association="_lGHiYI2VEd6vodSRJgEedg">

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_lGHiYo2VEd6vodSRJgEedg" value="*"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_lGHiY42VEd6vodSRJgEedg"/>

-      </ownedEnd>

-      <ownedEnd xmi:id="_lGHiZI2VEd6vodSRJgEedg" name="satisfiedBy" type="RequirementRelated" isDerived="true" association="_lGHiYI2VEd6vodSRJgEedg">

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_lGHiZY2VEd6vodSRJgEedg" value="*"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_lGHiZo2VEd6vodSRJgEedg"/>

-      </ownedEnd>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Association" xmi:id="_mjjJsI2VEd6vodSRJgEedg" name="Association_Verify" memberEnd="_mjjJtI2VEd6vodSRJgEedg _mjjJsY2VEd6vodSRJgEedg">

-      <ownedEnd xmi:id="_mjjJsY2VEd6vodSRJgEedg" name="verifies" type="Requirement" isDerived="true" association="_mjjJsI2VEd6vodSRJgEedg">

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_mjjJso2VEd6vodSRJgEedg" value="*"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_mjjJs42VEd6vodSRJgEedg"/>

-      </ownedEnd>

-      <ownedEnd xmi:id="_mjjJtI2VEd6vodSRJgEedg" name="verifiedBy" type="RequirementRelated" isDerived="true" association="_mjjJsI2VEd6vodSRJgEedg">

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_mjjJtY2VEd6vodSRJgEedg" value="*"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_mjjJto2VEd6vodSRJgEedg"/>

-      </ownedEnd>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Association" xmi:id="_nJsjsI2VEd6vodSRJgEedg" name="Association_Refine" memberEnd="_nJsjtI2VEd6vodSRJgEedg _nJsjsY2VEd6vodSRJgEedg">

-      <ownedEnd xmi:id="_nJsjsY2VEd6vodSRJgEedg" name="refines" type="Requirement" isDerived="true" association="_nJsjsI2VEd6vodSRJgEedg">

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_nJsjso2VEd6vodSRJgEedg" value="*"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_nJsjs42VEd6vodSRJgEedg"/>

-      </ownedEnd>

-      <ownedEnd xmi:id="_nJsjtI2VEd6vodSRJgEedg" name="refinedBy" type="RequirementRelated" isDerived="true" association="_nJsjsI2VEd6vodSRJgEedg">

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_nJsjtY2VEd6vodSRJgEedg" value="*"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_nJsjto2VEd6vodSRJgEedg"/>

-      </ownedEnd>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Association" xmi:id="_nh_H4I2VEd6vodSRJgEedg" name="Association_Trace" memberEnd="_nh_H5I2VEd6vodSRJgEedg _nh_H4Y2VEd6vodSRJgEedg">

-      <ownedEnd xmi:id="_nh_H4Y2VEd6vodSRJgEedg" name="tracedFrom" type="Requirement" isDerived="true" association="_nh_H4I2VEd6vodSRJgEedg">

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_nh_H4o2VEd6vodSRJgEedg" value="*"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_nh_H442VEd6vodSRJgEedg"/>

-      </ownedEnd>

-      <ownedEnd xmi:id="_nh_H5I2VEd6vodSRJgEedg" name="tracedTo" type="RequirementRelated" isDerived="true" association="_nh_H4I2VEd6vodSRJgEedg">

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_nh_H5Y2VEd6vodSRJgEedg" value="*"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_nh_H5o2VEd6vodSRJgEedg"/>

-      </ownedEnd>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Association" xmi:id="_AqeZ0I2XEd6vodSRJgEedg" name="Association_Allocate" memberEnd="_AqeZ1I2XEd6vodSRJgEedg _AqeZ0Y2XEd6vodSRJgEedg">

-      <ownedEnd xmi:id="_AqeZ0Y2XEd6vodSRJgEedg" name="allocatedFrom" type="Allocated" isDerived="true" association="_AqeZ0I2XEd6vodSRJgEedg">

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_AqeZ0o2XEd6vodSRJgEedg" value="*"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_AqeZ042XEd6vodSRJgEedg"/>

-      </ownedEnd>

-      <ownedEnd xmi:id="_AqeZ1I2XEd6vodSRJgEedg" name="allocatedTo" type="Allocated" isDerived="true" association="_AqeZ0I2XEd6vodSRJgEedg">

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_AqeZ1Y2XEd6vodSRJgEedg" value="*"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_AqeZ1o2XEd6vodSRJgEedg"/>

-      </ownedEnd>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Association" xmi:id="_VpOEoI2XEd6vodSRJgEedg" name="AssociationActivityPartition_Allocated" memberEnd="_VpOEpI2XEd6vodSRJgEedg _VpOEoY2XEd6vodSRJgEedg">

-      <ownedEnd xmi:id="_VpOEoY2XEd6vodSRJgEedg" name="allocatedFrom" type="Allocated" isDerived="true" redefinedProperty="_xcgv4XhjEd6xUocNBcy1EA" association="_VpOEoI2XEd6vodSRJgEedg">

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_VpOEoo2XEd6vodSRJgEedg" value="*"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VpOEo42XEd6vodSRJgEedg"/>

-      </ownedEnd>

-      <ownedEnd xmi:id="_VpOEpI2XEd6vodSRJgEedg" name="allocatedTo" type="AllocateActivityPartition" isDerived="true" redefinedProperty="_xcgv5HhjEd6xUocNBcy1EA" association="_VpOEoI2XEd6vodSRJgEedg">

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_VpOEpY2XEd6vodSRJgEedg" value="*"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VpOEpo2XEd6vodSRJgEedg"/>

-      </ownedEnd>

-    </packagedElement>

-    <profileApplication xmi:id="_profileApplication.0">

-      <eAnnotations xmi:id="_profileApplication.0-_http2F2Fwww.eclipse.org2Fuml22F2.0.02FUML" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="pathmap://UML_PROFILES/Standard.profile.uml#_yzU58YinEdqtvbnfB2L_5w"/>

-      </eAnnotations>

-      <appliedProfile href="pathmap://UML_PROFILES/Standard.profile.uml#_0"/>

-    </profileApplication>

-    <profileApplication xmi:id="_ykL4MCaWEd6yfMyjxTTfNg">

-      <eAnnotations xmi:id="_ykR-0CaWEd6yfMyjxTTfNg" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="pathmap://UML_PROFILES/Ecore.profile.uml#_z1OFcHjqEdy8S4Cr8Rc_NA"/>

-      </eAnnotations>

-      <appliedProfile href="pathmap://UML_PROFILES/Ecore.profile.uml#_0"/>

-    </profileApplication>

-  </uml:Model>

-  <Standard:Metamodel xmi:id="_ckvcECXrEd6qXv5MKMJM1Q" base_Model="_0"/>

-  <Standard:Metaclass xmi:id="_ckvcESXrEd6qXv5MKMJM1Q"/>

-  <Standard:Metaclass xmi:id="_ckvcEiXrEd6qXv5MKMJM1Q" base_Class="FlowPort"/>

-  <Standard:Metaclass xmi:id="_ckvcEyXrEd6qXv5MKMJM1Q" base_Class="FlowSpecification"/>

-  <Standard:Metaclass xmi:id="_ckvcFCXrEd6qXv5MKMJM1Q" base_Class="Requirement"/>

-  <Standard:Metaclass xmi:id="_ck4mACXrEd6qXv5MKMJM1Q" base_Class="TestCase"/>

-  <Standard:Metaclass xmi:id="_ck4mASXrEd6qXv5MKMJM1Q"/>

-  <Standard:Metaclass xmi:id="_ck4mAiXrEd6qXv5MKMJM1Q"/>

-  <Standard:Metaclass xmi:id="_ck4mAyXrEd6qXv5MKMJM1Q" base_Class="Trace"/>

-  <Standard:Metaclass xmi:id="_ck4mBCXrEd6qXv5MKMJM1Q"/>

-  <Standard:Metaclass xmi:id="_ck4mBSXrEd6qXv5MKMJM1Q" base_Class="Rationale"/>

-  <Standard:Metaclass xmi:id="_ck4mBiXrEd6qXv5MKMJM1Q" base_Class="Problem"/>

-  <Standard:Metaclass xmi:id="_ck4mByXrEd6qXv5MKMJM1Q" base_Class="ValueType"/>

-  <Standard:Metaclass xmi:id="_ck4mCCXrEd6qXv5MKMJM1Q" base_Class="Unit"/>

-  <Standard:Metaclass xmi:id="_ck4mCSXrEd6qXv5MKMJM1Q" base_Class="Dimension"/>

-  <Standard:Metaclass xmi:id="_ck4mCiXrEd6qXv5MKMJM1Q" base_Class="DistributedProperty"/>

-  <Standard:Metaclass xmi:id="_ck4mCyXrEd6qXv5MKMJM1Q" base_Class="ItemFlow"/>

-  <Standard:Metaclass xmi:id="_ck4mDCXrEd6qXv5MKMJM1Q" base_Class="FlowProperty"/>

-  <Standard:Metaclass xmi:id="_ck4mDSXrEd6qXv5MKMJM1Q" base_Class="ConstraintBlock"/>

-  <Standard:Metaclass xmi:id="_ck4mDiXrEd6qXv5MKMJM1Q"/>

-  <Standard:Metaclass xmi:id="_ck4mDyXrEd6qXv5MKMJM1Q" base_Class="Refine"/>

-  <Standard:Metaclass xmi:id="_ck4mECXrEd6qXv5MKMJM1Q" base_Class="ConstraintProperty"/>

-  <Standard:Metaclass xmi:id="_ck4mESXrEd6qXv5MKMJM1Q" base_Class="RequirementRelated"/>

-  <Standard:Metaclass xmi:id="_ck4mEiXrEd6qXv5MKMJM1Q" base_Class="Conform"/>

-  <Standard:Metaclass xmi:id="_ck4mEyXrEd6qXv5MKMJM1Q" base_Class="View"/>

-  <Standard:Metaclass xmi:id="_ck4mFCXrEd6qXv5MKMJM1Q" base_Class="Viewpoint"/>

-  <Standard:Metaclass xmi:id="_ck4mFSXrEd6qXv5MKMJM1Q" base_Class="ParticipantProperty"/>

-  <Standard:Metaclass xmi:id="_ck4mFiXrEd6qXv5MKMJM1Q" base_Class="ConnectorProperty"/>

-  <Standard:Metaclass xmi:id="_ck4mFyXrEd6qXv5MKMJM1Q" base_Class="BindingConnector"/>

-  <Standard:Metaclass xmi:id="_ck4mGCXrEd6qXv5MKMJM1Q" base_Class="NestedConnectorEnd"/>

-  <Standard:Metaclass xmi:id="_ck4mGSXrEd6qXv5MKMJM1Q" base_Class="PropertySpecificType"/>

-  <Standard:Metaclass xmi:id="_ck4mGiXrEd6qXv5MKMJM1Q"/>

-  <Standard:Metaclass xmi:id="_ck4mGyXrEd6qXv5MKMJM1Q" base_Class="Rate"/>

-  <Standard:Metaclass xmi:id="_ck4mHCXrEd6qXv5MKMJM1Q"/>

-  <Standard:Metaclass xmi:id="_ck4mHSXrEd6qXv5MKMJM1Q"/>

-  <Standard:Metaclass xmi:id="_ck4mHiXrEd6qXv5MKMJM1Q"/>

-  <Standard:Metaclass xmi:id="_ck4mHyXrEd6qXv5MKMJM1Q" base_Class="ControlOperator"/>

-  <Standard:Metaclass xmi:id="_ck4mICXrEd6qXv5MKMJM1Q"/>

-  <Standard:Metaclass xmi:id="_ck4mISXrEd6qXv5MKMJM1Q" base_Class="Overwrite"/>

-  <Standard:Metaclass xmi:id="_ck4mIiXrEd6qXv5MKMJM1Q" base_Class="Allocate"/>

-  <Standard:Metaclass xmi:id="_ck4mIyXrEd6qXv5MKMJM1Q" base_Class="Allocated"/>

-  <Standard:Metaclass xmi:id="_ck4mJCXrEd6qXv5MKMJM1Q" base_Class="AllocateActivityPartition"/>

-  <Ecore:EPackage xmi:id="_zS9CsCaWEd6yfMyjxTTfNg" base_Package="_0" packageName="sysml" nsPrefix="sysML" nsURI="http://www.topcased.org/2.0/sysML" basePackage="org.topcased.sysml" prefix="SysML"/>

-</xmi:XMI>

diff --git a/tests/TC1/diagram.png b/tests/TC1/diagram.png
deleted file mode 100644
index 39d7d66e63e..00000000000
--- a/tests/TC1/diagram.png
+++ /dev/null
diff --git a/tests/TC1/testcase1-fromXMI.uml b/tests/TC1/testcase1-fromXMI.uml
deleted file mode 100644
index 8ebc519647a..00000000000
--- a/tests/TC1/testcase1-fromXMI.uml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Model xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:uml="http://www.eclipse.org/uml2/2.1.0/UML" xmi:id="_Y10C0B_CEd6KLOscCwv-5A">

-  <packagedElement xmi:type="uml:Package" xmi:id="_hHjPgB_CEd6KLOscCwv-5A" name="package1">

-    <ownedComment xmi:id="_hHjPgR_CEd6KLOscCwv-5A" annotatedElement="_hHjPih_CEd6KLOscCwv-5A">

-      <body>&lt;p>&#xD;

-    Private visibility.&#xD;

-&lt;/p></body>

-    </ownedComment>

-    <packagedElement xmi:type="uml:Class" xmi:id="_hHjPgh_CEd6KLOscCwv-5A" name="Class1" isAbstract="true">

-      <ownedAttribute xmi:id="_hHjPgx_CEd6KLOscCwv-5A" name="attribute1" visibility="public">

-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_hHjPhB_CEd6KLOscCwv-5A"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:id="_hHjPhR_CEd6KLOscCwv-5A" name="class3_1" visibility="private" type="_hHjPih_CEd6KLOscCwv-5A" association="_hHjPnB_CEd6KLOscCwv-5A"/>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Class" xmi:id="_hHjPhh_CEd6KLOscCwv-5A" name="Class2">

-      <ownedAttribute xmi:id="_hHjPhx_CEd6KLOscCwv-5A" name="attribute2" visibility="protected">

-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>

-        <defaultValue xmi:type="uml:LiteralBoolean" xmi:id="_hHjPiB_CEd6KLOscCwv-5A" value="true"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:id="_hHjPiR_CEd6KLOscCwv-5A" name="class3_2" visibility="private" type="_hHjPih_CEd6KLOscCwv-5A" association="_hHjPmx_CEd6KLOscCwv-5A"/>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Class" xmi:id="_hHjPih_CEd6KLOscCwv-5A" name="Class3" visibility="private">

-      <generalization xmi:id="_hHjPix_CEd6KLOscCwv-5A" general="_hHjPgh_CEd6KLOscCwv-5A"/>

-      <generalization xmi:id="_hHjPjB_CEd6KLOscCwv-5A" general="_hHjPhh_CEd6KLOscCwv-5A"/>

-      <ownedAttribute xmi:id="_hHjPjR_CEd6KLOscCwv-5A" name="attribute3" visibility="package">

-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_hHjPjh_CEd6KLOscCwv-5A" value="*"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_hHjPjx_CEd6KLOscCwv-5A"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:id="_hHjPkB_CEd6KLOscCwv-5A" name="class1" visibility="public" type="_hHjPgh_CEd6KLOscCwv-5A" aggregation="shared" association="_hHjPnB_CEd6KLOscCwv-5A">

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_hHjPkR_CEd6KLOscCwv-5A" value="*"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_hHjPkh_CEd6KLOscCwv-5A"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:id="_hHjPkx_CEd6KLOscCwv-5A" name="class2" visibility="protected" type="_hHjPhh_CEd6KLOscCwv-5A" aggregation="composite" association="_hHjPmx_CEd6KLOscCwv-5A">

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_hHjPlB_CEd6KLOscCwv-5A" value="*"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:id="_hHjPlR_CEd6KLOscCwv-5A" name="class3" visibility="package" type="_hHjPih_CEd6KLOscCwv-5A" association="_hHjPmB_CEd6KLOscCwv-5A">

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_hHjPlh_CEd6KLOscCwv-5A" value="3"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_hHjPlx_CEd6KLOscCwv-5A" value="2"/>

-      </ownedAttribute>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Association" xmi:id="_hHjPmB_CEd6KLOscCwv-5A" memberEnd="_hHjPmR_CEd6KLOscCwv-5A _hHjPlR_CEd6KLOscCwv-5A">

-      <ownedEnd xmi:id="_hHjPmR_CEd6KLOscCwv-5A" type="_hHjPih_CEd6KLOscCwv-5A" association="_hHjPmB_CEd6KLOscCwv-5A">

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_hHjPmh_CEd6KLOscCwv-5A"/>

-      </ownedEnd>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Association" xmi:id="_hHjPmx_CEd6KLOscCwv-5A" name="Association2" memberEnd="_hHjPkx_CEd6KLOscCwv-5A _hHjPiR_CEd6KLOscCwv-5A"/>

-    <packagedElement xmi:type="uml:Association" xmi:id="_hHjPnB_CEd6KLOscCwv-5A" name="Association1" memberEnd="_hHjPkB_CEd6KLOscCwv-5A _hHjPhR_CEd6KLOscCwv-5A"/>

-  </packagedElement>

-</uml:Model>

diff --git a/tests/TC1/testcase1.di b/tests/TC1/testcase1.di
deleted file mode 100644
index 42490998198..00000000000
--- a/tests/TC1/testcase1.di
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>

-<di:Diagram 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/di" name="tabfolder.window" type="tabfolder.window">

-  <contained xsi:type="di:Diagram" name="tab.window" type="tab.window">

-    <semanticModel xsi:type="di:CoreSemanticModelBridge">

-      <element href="testcase1.notation#/"/>

-    </semanticModel>

-  </contained>

-</di:Diagram>

diff --git a/tests/TC1/testcase1.gif b/tests/TC1/testcase1.gif
deleted file mode 100644
index 3d1d52b349e..00000000000
--- a/tests/TC1/testcase1.gif
+++ /dev/null
diff --git a/tests/TC1/testcase1.notation b/tests/TC1/testcase1.notation
deleted file mode 100644
index b7f5ba52900..00000000000
--- a/tests/TC1/testcase1.notation
+++ /dev/null
@@ -1,226 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>

-<notation:Diagram 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.1/notation" type="PapyrusUMLClassDiagram" name="testcase1" measurementUnit="Pixel">

-  <eAnnotations source="org.eclipse.papyrus.diagram.common.Belongs_To_This_Diagram">

-    <references href="testcase1.uml#_cPjJUB_DEd6YoYo_qcjZ1A"/>

-    <references href="testcase1.uml#_CcNHEB_DEd6YoYo_qcjZ1A"/>

-    <references href="testcase1.uml#_Qqb1cR_FEd6shpq_sNxTJQ"/>

-    <references href="testcase1.uml#_Qqb1cB_FEd6shpq_sNxTJQ"/>

-    <references href="testcase1.uml#_OxbscB_FEd6shpq_sNxTJQ"/>

-    <references href="testcase1.uml#_aVkeAB_FEd6shpq_sNxTJQ"/>

-    <references href="testcase1.uml#_jHfmoR_FEd6shpq_sNxTJQ"/>

-    <references href="testcase1.uml#_jHfmoB_FEd6shpq_sNxTJQ"/>

-    <references href="testcase1.uml#_ooNdMB_FEd6shpq_sNxTJQ"/>

-    <references href="testcase1.uml#_d_hnQB_FEd6shpq_sNxTJQ"/>

-    <references href="testcase1.uml#_0R3A4B_FEd6shpq_sNxTJQ"/>

-    <references href="testcase1.uml#_j_IuYR_HEd6wzp0oZera5w"/>

-    <references href="testcase1.uml#_j_IuYB_HEd6wzp0oZera5w"/>

-    <references href="testcase1.uml#_RZw5QB_IEd6wzp0oZera5w"/>

-    <references href="testcase1.uml#_h9zIwB_HEd6wzp0oZera5w"/>

-    <references href="testcase1.uml#_jAtXQB_HEd6wzp0oZera5w"/>

-    <references href="testcase1.uml#_G1VjIR_GEd6shpq_sNxTJQ"/>

-    <references href="testcase1.uml#_G1VjIB_GEd6shpq_sNxTJQ"/>

-    <references href="testcase1.uml#_EptZEB_GEd6shpq_sNxTJQ"/>

-    <references href="testcase1.uml#_EPurcB_JEd6wzp0oZera5w"/>

-    <references href="testcase1.uml#_KbpbIB_JEd6wzp0oZera5w"/>

-    <references href="testcase1.uml#_j-_kcB_HEd6wzp0oZera5w"/>

-    <references href="testcase1.uml#_HztvkB_JEd6wzp0oZera5w"/>

-    <references href="testcase1.uml#_k1Oo4B_HEd6wzp0oZera5w"/>

-    <references href="testcase1.uml#_OvU20B_JEd6wzp0oZera5w"/>

-    <references href="testcase1.uml#_dobjoR_KEd6wzp0oZera5w"/>

-    <references href="testcase1.uml#_dobjoB_KEd6wzp0oZera5w"/>

-    <references href="testcase1.uml#_k1YZ4R_HEd6wzp0oZera5w"/>

-    <references href="testcase1.uml#_k1YZ4B_HEd6wzp0oZera5w"/>

-    <references href="testcase1.uml#_lxfx8B_JEd6wzp0oZera5w"/>

-    <references href="testcase1.uml#_OvU20h_JEd6wzp0oZera5w"/>

-    <references href="testcase1.uml#_OvU20R_JEd6wzp0oZera5w"/>

-  </eAnnotations>

-  <eAnnotations source="org.eclipse.papyrus.diagram.common.FilterViewsAndLabelsSource">

-    <details key="3002" value=""/>

-  </eAnnotations>

-  <children type="2008">

-    <children type="5029"/>

-    <children type="7017">

-      <children type="3012">

-        <element href="testcase1.uml#_OxbscB_FEd6shpq_sNxTJQ"/>

-        <layoutConstraint xsi:type="notation:Location"/>

-      </children>

-      <styles xsi:type="notation:DrawerStyle"/>

-      <styles xsi:type="notation:SortingStyle"/>

-      <styles xsi:type="notation:FilteringStyle"/>

-    </children>

-    <children type="7018">

-      <styles xsi:type="notation:DrawerStyle"/>

-      <styles xsi:type="notation:SortingStyle"/>

-      <styles xsi:type="notation:FilteringStyle"/>

-    </children>

-    <children type="7019">

-      <styles xsi:type="notation:DrawerStyle"/>

-      <styles xsi:type="notation:SortingStyle"/>

-      <styles xsi:type="notation:FilteringStyle"/>

-    </children>

-    <styles xsi:type="notation:ShapeStyle" fontHeight="8" lineColor="15060913"/>

-    <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-    <element href="testcase1.uml#_CcNHEB_DEd6YoYo_qcjZ1A"/>

-    <layoutConstraint xsi:type="notation:Bounds" x="36" y="127" width="183" height="115"/>

-  </children>

-  <children type="2008">

-    <children type="5029"/>

-    <children type="7017">

-      <children type="3012">

-        <element href="testcase1.uml#_d_hnQB_FEd6shpq_sNxTJQ"/>

-        <layoutConstraint xsi:type="notation:Location"/>

-      </children>

-      <styles xsi:type="notation:DrawerStyle"/>

-      <styles xsi:type="notation:SortingStyle"/>

-      <styles xsi:type="notation:FilteringStyle"/>

-    </children>

-    <children type="7018">

-      <styles xsi:type="notation:DrawerStyle"/>

-      <styles xsi:type="notation:SortingStyle"/>

-      <styles xsi:type="notation:FilteringStyle"/>

-    </children>

-    <children type="7019">

-      <styles xsi:type="notation:DrawerStyle"/>

-      <styles xsi:type="notation:SortingStyle"/>

-      <styles xsi:type="notation:FilteringStyle"/>

-    </children>

-    <styles xsi:type="notation:ShapeStyle" fontHeight="8" lineColor="15060913"/>

-    <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-    <element href="testcase1.uml#_aVkeAB_FEd6shpq_sNxTJQ"/>

-    <layoutConstraint xsi:type="notation:Bounds" x="431" y="131" width="207" height="116"/>

-  </children>

-  <children type="2008">

-    <children type="5029"/>

-    <children type="7017">

-      <children type="3012">

-        <element href="testcase1.uml#_EptZEB_GEd6shpq_sNxTJQ"/>

-        <layoutConstraint xsi:type="notation:Location"/>

-      </children>

-      <styles xsi:type="notation:DrawerStyle"/>

-      <styles xsi:type="notation:SortingStyle"/>

-      <styles xsi:type="notation:FilteringStyle"/>

-    </children>

-    <children type="7018">

-      <styles xsi:type="notation:DrawerStyle"/>

-      <styles xsi:type="notation:SortingStyle"/>

-      <styles xsi:type="notation:FilteringStyle"/>

-    </children>

-    <children type="7019">

-      <styles xsi:type="notation:DrawerStyle"/>

-      <styles xsi:type="notation:SortingStyle"/>

-      <styles xsi:type="notation:FilteringStyle"/>

-    </children>

-    <styles xsi:type="notation:ShapeStyle" fontHeight="8" lineColor="15060913"/>

-    <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-    <element href="testcase1.uml#_0R3A4B_FEd6shpq_sNxTJQ"/>

-    <layoutConstraint xsi:type="notation:Bounds" x="195" y="303" width="175" height="96"/>

-  </children>

-  <children type="2012">

-    <children type="5038"/>

-    <styles xsi:type="notation:ShapeStyle" fontHeight="8" lineColor="15060913"/>

-    <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-    <element href="testcase1.uml#_Ro_LkB_JEd6wzp0oZera5w"/>

-    <layoutConstraint xsi:type="notation:Bounds" x="270" y="179"/>

-  </children>

-  <styles xsi:type="notation:DiagramStyle"/>

-  <element href="testcase1.uml#_1CpE8B_CEd6YoYo_qcjZ1A"/>

-  <edges type="4002" source="//@children.2" target="//@children.0">

-    <children type="6007">

-      <layoutConstraint xsi:type="notation:Location" y="40"/>

-    </children>

-    <styles xsi:type="notation:RoutingStyle"/>

-    <styles xsi:type="notation:FontStyle" fontHeight="8"/>

-    <element href="testcase1.uml#_h9zIwB_HEd6wzp0oZera5w"/>

-    <bendpoints xsi:type="notation:RelativeBendpoints" points="[-12, -21, 57, 108]$[-31, -116, 38, 13]"/>

-    <sourceAnchor xsi:type="notation:IdentityAnchor" id="(0.47428572,0.21875)"/>

-    <targetAnchor xsi:type="notation:IdentityAnchor" id="(0.79234976,0.6695652)"/>

-  </edges>

-  <edges type="4002" source="//@children.2" target="//@children.1">

-    <children type="6007">

-      <layoutConstraint xsi:type="notation:Location" y="40"/>

-    </children>

-    <styles xsi:type="notation:RoutingStyle"/>

-    <styles xsi:type="notation:FontStyle" fontHeight="8"/>

-    <element href="testcase1.uml#_jAtXQB_HEd6wzp0oZera5w"/>

-    <bendpoints xsi:type="notation:RelativeBendpoints" points="[33, -39, -68, 77]$[85, -101, -16, 15]"/>

-    <sourceAnchor xsi:type="notation:IdentityAnchor" id="(0.7771429,0.40625)"/>

-    <targetAnchor xsi:type="notation:IdentityAnchor" id="(0.28502417,0.87068963)"/>

-  </edges>

-  <edges type="4001" source="//@children.2" target="//@children.0">

-    <children type="6001">

-      <layoutConstraint xsi:type="notation:Location" y="40"/>

-    </children>

-    <children type="6002">

-      <layoutConstraint xsi:type="notation:Location" x="11" y="44"/>

-    </children>

-    <children type="6003">

-      <layoutConstraint xsi:type="notation:Location" x="1" y="-29"/>

-    </children>

-    <children type="6004">

-      <layoutConstraint xsi:type="notation:Location" x="-2" y="37"/>

-    </children>

-    <children type="6005">

-      <layoutConstraint xsi:type="notation:Location" x="9" y="-13"/>

-    </children>

-    <children type="6006">

-      <layoutConstraint xsi:type="notation:Location" x="-5" y="-32"/>

-    </children>

-    <styles xsi:type="notation:RoutingStyle"/>

-    <styles xsi:type="notation:FontStyle" fontHeight="8"/>

-    <element href="testcase1.uml#_j_IuYB_HEd6wzp0oZera5w"/>

-    <bendpoints xsi:type="notation:RelativeBendpoints" points="[-87, 0, 100, 127]$[-187, 0, 0, 127]$[-187, -110, 0, 17]"/>

-    <targetAnchor xsi:type="notation:IdentityAnchor" id="(0.30054644,0.8521739)"/>

-  </edges>

-  <edges type="4001" source="//@children.2" target="//@children.1">

-    <children type="6001">

-      <layoutConstraint xsi:type="notation:Location" y="40"/>

-    </children>

-    <children type="6002">

-      <layoutConstraint xsi:type="notation:Location" x="-38" y="-25"/>

-    </children>

-    <children type="6003">

-      <layoutConstraint xsi:type="notation:Location" x="-2" y="33"/>

-    </children>

-    <children type="6004">

-      <layoutConstraint xsi:type="notation:Location" x="-31" y="39"/>

-    </children>

-    <children type="6005">

-      <layoutConstraint xsi:type="notation:Location" x="-12" y="-17"/>

-    </children>

-    <children visible="false" type="6006">

-      <layoutConstraint xsi:type="notation:Location" x="-1" y="56"/>

-    </children>

-    <styles xsi:type="notation:RoutingStyle"/>

-    <styles xsi:type="notation:FontStyle" fontHeight="8"/>

-    <element href="testcase1.uml#_k1YZ4B_HEd6wzp0oZera5w"/>

-    <bendpoints xsi:type="notation:RelativeBendpoints" points="[15, 0, -228, 105]$[243, 0, 0, 105]$[243, -93, 0, 12]"/>

-    <sourceAnchor xsi:type="notation:IdentityAnchor" id="(0.9142857,0.38541666)"/>

-    <targetAnchor xsi:type="notation:IdentityAnchor" id="(0.7874396,0.9051724)"/>

-  </edges>

-  <edges type="4001" source="//@children.2" target="//@children.2">

-    <children visible="false" type="6001">

-      <layoutConstraint xsi:type="notation:Location" y="40"/>

-    </children>

-    <children visible="false" type="6002">

-      <layoutConstraint xsi:type="notation:Location" x="50" y="-22"/>

-    </children>

-    <children visible="false" type="6003">

-      <layoutConstraint xsi:type="notation:Location" y="80"/>

-    </children>

-    <children visible="false" type="6004">

-      <layoutConstraint xsi:type="notation:Location" y="100"/>

-    </children>

-    <children visible="false" type="6005">

-      <layoutConstraint xsi:type="notation:Location" y="120"/>

-    </children>

-    <children visible="false" type="6006">

-      <layoutConstraint xsi:type="notation:Location" y="140"/>

-    </children>

-    <styles xsi:type="notation:RoutingStyle"/>

-    <styles xsi:type="notation:FontStyle" fontHeight="8"/>

-    <element href="testcase1.uml#_OvU20R_JEd6wzp0oZera5w"/>

-    <bendpoints xsi:type="notation:RelativeBendpoints" points="[80, -1, 79, -16]$[142, -1, 141, -16]$[142, 85, 141, 70]$[1, 85, 0, 70]$[1, 23, 0, 8]"/>

-    <sourceAnchor xsi:type="notation:IdentityAnchor" id="(0.54285717,0.7604167)"/>

-    <targetAnchor xsi:type="notation:IdentityAnchor" id="(0.5542857,0.9270833)"/>

-  </edges>

-</notation:Diagram>

diff --git a/tests/TC1/testcase1.uml b/tests/TC1/testcase1.uml
deleted file mode 100644
index 7b551afbd73..00000000000
--- a/tests/TC1/testcase1.uml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Model xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/2.1.0/UML" xmi:id="_1CpE8B_CEd6YoYo_qcjZ1A" name="testcase1">

-  <ownedComment xmi:id="_Ro_LkB_JEd6wzp0oZera5w" annotatedElement="_0R3A4B_FEd6shpq_sNxTJQ">

-    <body>private visibility</body>

-  </ownedComment>

-  <packagedElement xmi:type="uml:Package" xmi:id="_cPjJUB_DEd6YoYo_qcjZ1A" name="package1">

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

-      <ownedAttribute xmi:id="_OxbscB_FEd6shpq_sNxTJQ" name="attribute1" isUnique="false">

-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Qqb1cR_FEd6shpq_sNxTJQ" value="1"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Qqb1cB_FEd6shpq_sNxTJQ"/>

-      </ownedAttribute>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Class" xmi:id="_aVkeAB_FEd6shpq_sNxTJQ" name="Class2">

-      <ownedAttribute xmi:id="_d_hnQB_FEd6shpq_sNxTJQ" name="attribute2" visibility="protected" isUnique="false">

-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_jHfmoR_FEd6shpq_sNxTJQ" value="1"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_jHfmoB_FEd6shpq_sNxTJQ" value="1"/>

-        <defaultValue xmi:type="uml:LiteralString" xmi:id="_ooNdMB_FEd6shpq_sNxTJQ" value="true"/>

-      </ownedAttribute>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Class" xmi:id="_0R3A4B_FEd6shpq_sNxTJQ" name="Class3">

-      <generalization xmi:id="_h9zIwB_HEd6wzp0oZera5w" general="_CcNHEB_DEd6YoYo_qcjZ1A"/>

-      <generalization xmi:id="_jAtXQB_HEd6wzp0oZera5w" general="_aVkeAB_FEd6shpq_sNxTJQ"/>

-      <ownedAttribute xmi:id="_EptZEB_GEd6shpq_sNxTJQ" name="attribute3" visibility="private" isUnique="false">

-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_G1VjIR_GEd6shpq_sNxTJQ" value="*"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_G1VjIB_GEd6shpq_sNxTJQ"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:id="_j-_kcB_HEd6wzp0oZera5w" name="class3_1" visibility="private" type="_CcNHEB_DEd6YoYo_qcjZ1A" association="_j_IuYB_HEd6wzp0oZera5w">

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EPurcB_JEd6wzp0oZera5w" value="*"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_KbpbIB_JEd6wzp0oZera5w"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:id="_k1Oo4B_HEd6wzp0oZera5w" name="class3_2" visibility="private" type="_aVkeAB_FEd6shpq_sNxTJQ" association="_k1YZ4B_HEd6wzp0oZera5w">

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_HztvkB_JEd6wzp0oZera5w" value="2"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Z5ezICBuEd6B1-g56hjodA" value="1"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:id="_OvU20B_JEd6wzp0oZera5w" name="class3" type="_0R3A4B_FEd6shpq_sNxTJQ" association="_OvU20R_JEd6wzp0oZera5w"/>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Association" xmi:id="_j_IuYB_HEd6wzp0oZera5w" name="Association1" memberEnd="_j_IuYR_HEd6wzp0oZera5w _j-_kcB_HEd6wzp0oZera5w">

-      <ownedEnd xmi:id="_j_IuYR_HEd6wzp0oZera5w" name="class3" type="_0R3A4B_FEd6shpq_sNxTJQ" aggregation="shared" association="_j_IuYB_HEd6wzp0oZera5w">

-        <defaultValue xmi:type="uml:LiteralString" xmi:id="_RZw5QB_IEd6wzp0oZera5w"/>

-      </ownedEnd>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Association" xmi:id="_k1YZ4B_HEd6wzp0oZera5w" name="Association2" memberEnd="_k1YZ4R_HEd6wzp0oZera5w _k1Oo4B_HEd6wzp0oZera5w">

-      <ownedEnd xmi:id="_k1YZ4R_HEd6wzp0oZera5w" name="class3" type="_0R3A4B_FEd6shpq_sNxTJQ" aggregation="composite" association="_k1YZ4B_HEd6wzp0oZera5w">

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_dobjoR_KEd6wzp0oZera5w" value="2"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_dobjoB_KEd6wzp0oZera5w" value="1"/>

-      </ownedEnd>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Association" xmi:id="_OvU20R_JEd6wzp0oZera5w" name="Association3" memberEnd="_OvU20h_JEd6wzp0oZera5w _OvU20B_JEd6wzp0oZera5w">

-      <ownedEnd xmi:id="_OvU20h_JEd6wzp0oZera5w" name="class3" type="_0R3A4B_FEd6shpq_sNxTJQ" association="_OvU20R_JEd6wzp0oZera5w">

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_lxfx8B_JEd6wzp0oZera5w"/>

-      </ownedEnd>

-    </packagedElement>

-  </packagedElement>

-  <profileApplication xmi:id="_1CpE8R_CEd6YoYo_qcjZ1A">

-    <eAnnotations xmi:id="_1CpE8h_CEd6YoYo_qcjZ1A" source="http://www.eclipse.org/uml2/2.0.0/UML">

-      <references xmi:type="ecore:EPackage" href="pathmap://UML_PROFILES/Standard.profile.uml#_yzU58YinEdqtvbnfB2L_5w"/>

-    </eAnnotations>

-    <appliedProfile href="pathmap://UML_PROFILES/Standard.profile.uml#_0"/>

-  </profileApplication>

-</uml:Model>

diff --git a/tests/TC1/validTestCase1.xmi b/tests/TC1/validTestCase1.xmi
deleted file mode 100644
index 559aca8a417..00000000000
--- a/tests/TC1/validTestCase1.xmi
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Model xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:uml="http://schema.omg.org/spec/UML/2.1.1" xsi:schemaLocation="http://schema.omg.org/spec/UML/2.1.1 http://www.eclipse.org/uml2/2.1.0/UML" xmi:id="_0" name="testCase1">

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

-    <ownedComment xmi:type="uml:Comment" xmi:id="package1-_ownedComment.0" annotatedElement="package1-Class3">

-      <body>&lt;p>&#xD;

-    Private visibility.&#xD;

-&lt;/p></body>

-    </ownedComment>

-    <packagedElement xmi:type="uml:Class" xmi:id="package1-Class1" name="Class1" isAbstract="true">

-      <ownedAttribute xmi:type="uml:Property" xmi:id="package1-Class1-attribute1" name="attribute1" visibility="public">

-        <type xmi:type="uml:PrimitiveType" href="http://schema.omg.org/spec/UML/2.1.1/uml.xml#Boolean"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="package1-Class1-attribute1-_lowerValue"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="package1-Class1-class3_1" name="class3_1" visibility="private" type="package1-Class3" association="package1-Association1"/>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Class" xmi:id="package1-Class2" name="Class2">

-      <ownedAttribute xmi:type="uml:Property" xmi:id="package1-Class2-attribute2" name="attribute2" visibility="protected">

-        <type xmi:type="uml:PrimitiveType" href="http://schema.omg.org/spec/UML/2.1.1/uml.xml#Boolean"/>

-        <defaultValue xmi:type="uml:LiteralBoolean" xmi:id="package1-Class2-attribute2-_defaultValue" value="true"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="package1-Class2-class3_2" name="class3_2" visibility="private" type="package1-Class3" association="package1-Association2"/>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Class" xmi:id="package1-Class3" name="Class3" visibility="private">

-      <generalization xmi:type="uml:Generalization" xmi:id="package1-Class3-_generalization.0" general="package1-Class1" specific="package1-Class3"/>

-      <generalization xmi:type="uml:Generalization" xmi:id="package1-Class3-_generalization.1" general="package1-Class2" specific="package1-Class3"/>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="package1-Class3-attribute3" name="attribute3" visibility="package">

-        <type xmi:type="uml:PrimitiveType" href="http://schema.omg.org/spec/UML/2.1.1/uml.xml#String"/>

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="package1-Class3-attribute3-_upperValue" value="*"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="package1-Class3-attribute3-_lowerValue"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="package1-Class3-class1" name="class1" visibility="public" type="package1-Class1" aggregation="shared" association="package1-Association1">

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="package1-Class3-class1-_upperValue" value="*"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="package1-Class3-class1-_lowerValue"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="package1-Class3-class2" name="class2" visibility="protected" type="package1-Class2" aggregation="composite" association="package1-Association2">

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="package1-Class3-class2-_upperValue" value="*"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="uml:Property" xmi:id="package1-Class3-class3" name="class3" visibility="package" type="package1-Class3" association="package1-_packagedElement.3">

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="package1-Class3-class3-_upperValue" value="3"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="package1-Class3-class3-_lowerValue" value="2"/>

-      </ownedAttribute>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Association" xmi:id="package1-_packagedElement.3" memberEnd="package1-_packagedElement.3-_ownedEnd.0 package1-Class3-class3">

-      <ownedEnd xmi:type="uml:Property" xmi:id="package1-_packagedElement.3-_ownedEnd.0" type="package1-Class3" owningAssociation="package1-_packagedElement.3" association="package1-_packagedElement.3">

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="package1-_packagedElement.3-_ownedEnd.0-_lowerValue"/>

-      </ownedEnd>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Association" xmi:id="package1-Association2" name="Association2" memberEnd="package1-Class3-class2 package1-Class2-class3_2"/>

-    <packagedElement xmi:type="uml:Association" xmi:id="package1-Association1" name="Association1" memberEnd="package1-Class3-class1 package1-Class1-class3_1"/>

-  </packagedElement>

-</uml:Model>

diff --git a/tests/UseCaseTestEditor/.project b/tests/UseCaseTestEditor/.project
deleted file mode 100644
index 671504c20a5..00000000000
--- a/tests/UseCaseTestEditor/.project
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>UseCaseTestEditor</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-	</buildSpec>

-	<natures>

-	</natures>

-</projectDescription>

diff --git a/tests/UseCaseTestEditor/UseCaseDiagramTest.di b/tests/UseCaseTestEditor/UseCaseDiagramTest.di
deleted file mode 100644
index d40fd21704f..00000000000
--- a/tests/UseCaseTestEditor/UseCaseDiagramTest.di
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>

-<xmi:XMI 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/di" xmlns:di_1="http://www.eclipse.org/papyrus/0.7.0/sashdi">

-  <di:Diagram name="tabfolder.window" type="tabfolder.window"/>

-  <di_1:SashWindowsMngr>

-    <pageList>

-      <availablePage>

-        <emfPageIdentifier href="UseCaseDiagramTest.notation#/0"/>

-      </availablePage>

-      <availablePage>

-        <emfPageIdentifier href="UseCaseDiagramTest.notation#/1"/>

-      </availablePage>

-    </pageList>

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

-      <windows>

-        <children xsi:type="di_1:TabFolder">

-          <children>

-            <emfPageIdentifier href="UseCaseDiagramTest.notation#/0"/>

-          </children>

-          <children>

-            <emfPageIdentifier href="UseCaseDiagramTest.notation#/1"/>

-          </children>

-        </children>

-      </windows>

-    </sashModel>

-  </di_1:SashWindowsMngr>

-</xmi:XMI>

diff --git a/tests/UseCaseTestEditor/UseCaseDiagramTest.notation b/tests/UseCaseTestEditor/UseCaseDiagramTest.notation
deleted file mode 100644
index fc607762744..00000000000
--- a/tests/UseCaseTestEditor/UseCaseDiagramTest.notation
+++ /dev/null
@@ -1,179 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>

-<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">

-  <notation:Diagram type="UseCase" name="TestCreationUseCase" measurementUnit="Pixel">

-    <children type="2018">

-      <children xsi:type="notation:DecorationNode" type="5027"/>

-      <styles xsi:type="notation:DescriptionStyle"/>

-      <styles xsi:type="notation:FontStyle" fontHeight="8"/>

-      <styles xsi:type="notation:HintedDiagramLinkStyle"/>

-      <element href="UseCaseDiagramTest.uml#_KxXd0Jb5Ed6IEoV1pxdOjw"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="121" y="24" width="800" height="93"/>

-    </children>

-    <children xsi:type="notation:Shape" type="2011" fontHeight="8" lineColor="15060913">

-      <children xsi:type="notation:DecorationNode" type="5014">

-        <layoutConstraint xsi:type="notation:Location" y="5"/>

-      </children>

-      <element href="UseCaseDiagramTest.uml#_UrwJsJcBEd6IEoV1pxdOjw"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="1009" y="335"/>

-    </children>

-    <children type="2015">

-      <children xsi:type="notation:DecorationNode" type="5019"/>

-      <children xsi:type="notation:DecorationNode" type="7011">

-        <children type="2013">

-          <children xsi:type="notation:DecorationNode" type="5016"/>

-          <children xsi:type="notation:DecorationNode" type="7009">

-            <children type="3007">

-              <element href="UseCaseDiagramTest.uml#_tWEHUJcBEd6IEoV1pxdOjw"/>

-              <layoutConstraint xsi:type="notation:Location"/>

-            </children>

-            <styles xsi:type="notation:SortingStyle"/>

-            <styles xsi:type="notation:FilteringStyle"/>

-          </children>

-          <styles xsi:type="notation:DescriptionStyle"/>

-          <styles xsi:type="notation:FontStyle" fontHeight="8"/>

-          <element href="UseCaseDiagramTest.uml#_ruVGwJb8Ed6IEoV1pxdOjw"/>

-          <layoutConstraint xsi:type="notation:Bounds" x="76" y="59"/>

-        </children>

-        <children type="3009">

-          <children xsi:type="notation:DecorationNode" type="5018"/>

-          <children xsi:type="notation:DecorationNode" type="7012">

-            <styles xsi:type="notation:SortingStyle"/>

-            <styles xsi:type="notation:FilteringStyle"/>

-          </children>

-          <styles xsi:type="notation:DescriptionStyle"/>

-          <styles xsi:type="notation:FontStyle"/>

-          <element href="UseCaseDiagramTest.uml#_8GWEwJcBEd6IEoV1pxdOjw"/>

-          <layoutConstraint xsi:type="notation:Bounds" x="13" y="192"/>

-        </children>

-        <children type="3009">

-          <children xsi:type="notation:DecorationNode" type="5018"/>

-          <children xsi:type="notation:DecorationNode" type="7012">

-            <styles xsi:type="notation:SortingStyle"/>

-            <styles xsi:type="notation:FilteringStyle"/>

-          </children>

-          <styles xsi:type="notation:DescriptionStyle"/>

-          <styles xsi:type="notation:FontStyle"/>

-          <element href="UseCaseDiagramTest.uml#_ItGJ4JcCEd6IEoV1pxdOjw"/>

-          <layoutConstraint xsi:type="notation:Bounds" x="286" y="188"/>

-        </children>

-      </children>

-      <styles xsi:type="notation:DescriptionStyle"/>

-      <styles xsi:type="notation:FontStyle" fontHeight="8"/>

-      <styles xsi:type="notation:LineStyle" lineColor="15060913"/>

-      <element href="UseCaseDiagramTest.uml#_Yv7JwJcBEd6IEoV1pxdOjw"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="174" y="142" width="459" height="296"/>

-    </children>

-    <styles xsi:type="notation:DiagramStyle"/>

-    <element href="UseCaseDiagramTest.uml#_ILqm4Jb5Ed6IEoV1pxdOjw"/>

-    <edges type="4011" source="/0/@children.1" target="/0/@children.2/@children.1/@children.0">

-      <children xsi:type="notation:DecorationNode" type="6008">

-        <layoutConstraint xsi:type="notation:Location" y="40"/>

-      </children>

-      <styles xsi:type="notation:RoutingStyle"/>

-      <styles xsi:type="notation:FontStyle" fontHeight="8"/>

-      <element href="UseCaseDiagramTest.uml#_XA6DMJcBEd6IEoV1pxdOjw"/>

-      <bendpoints xsi:type="notation:RelativeBendpoints" points="[-14, 4, 381, -129]$[-347, 130, 48, -3]"/>

-      <sourceAnchor xsi:type="notation:IdentityAnchor" id="(0.4666666666666667,0.16)"/>

-      <targetAnchor xsi:type="notation:IdentityAnchor" id="(0.7796610169491526,0.43333333333333335)"/>

-    </edges>

-    <edges type="4008" source="/0/@children.2/@children.1/@children.0" target="/0/@children.2/@children.1/@children.1">

-      <children xsi:type="notation:DecorationNode" type="6006">

-        <eAnnotations source="displayNameLabelIcon">

-          <details key="displayNameLabelIcon_value" value="true"/>

-        </eAnnotations>

-        <eAnnotations source="QualifiedName">

-          <details key="QualifiedNameDepth" value="0"/>

-        </eAnnotations>

-        <layoutConstraint xsi:type="notation:Location" x="-22" y="81"/>

-      </children>

-      <styles xsi:type="notation:RoutingStyle"/>

-      <styles xsi:type="notation:FontStyle" fontHeight="8"/>

-      <element href="UseCaseDiagramTest.uml#_-ywAoJcBEd6IEoV1pxdOjw"/>

-      <bendpoints xsi:type="notation:RelativeBendpoints" points="[11, 29, -30, -79]$[34, 95, -7, -13]"/>

-      <targetAnchor xsi:type="notation:IdentityAnchor" id="(0.4482758620689655,0.21666666666666667)"/>

-    </edges>

-    <edges type="4009" source="/0/@children.2/@children.1/@children.0" target="/0/@children.2/@children.1/@children.2">

-      <children xsi:type="notation:DecorationNode" type="6007">

-        <eAnnotations source="displayNameLabelIcon">

-          <details key="displayNameLabelIcon_value" value="false"/>

-        </eAnnotations>

-        <layoutConstraint xsi:type="notation:Location" y="20"/>

-      </children>

-      <styles xsi:type="notation:RoutingStyle"/>

-      <styles xsi:type="notation:FontStyle" fontHeight="8"/>

-      <element href="UseCaseDiagramTest.uml#_L92wAJcCEd6IEoV1pxdOjw"/>

-      <bendpoints xsi:type="notation:RelativeBendpoints" points="[44, 23, -159, -84]$[197, 100, -6, -7]"/>

-      <targetAnchor xsi:type="notation:IdentityAnchor" id="(0.39375,0.13333333333333333)"/>

-    </edges>

-  </notation:Diagram>

-  <notation:Diagram type="UseCase" name="DragAndDropTesting" measurementUnit="Pixel">

-    <children xsi:type="notation:Shape" type="2011" fontHeight="8" transparency="0" lineColor="15060913">

-      <eAnnotations source="QualifiedName">

-        <details key="QualifiedNameDepth" value="1"/>

-      </eAnnotations>

-      <eAnnotations source="displayNameLabelIcon">

-        <details key="displayNameLabelIcon_value" value="false"/>

-      </eAnnotations>

-      <eAnnotations source="ShadowFigure">

-        <details key="ShadowFigure_Value" value="false"/>

-      </eAnnotations>

-      <eAnnotations source="Stereotype_Annotation">

-        <details key="StereotypeWithQualifiedNameList" value=""/>

-        <details key="StereotypeList" value="Standard::Realization"/>

-        <details key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>

-        <details key="PropStereoDisplay" value=""/>

-        <details key="StereotypePropertyLocation" value="Compartment"/>

-      </eAnnotations>

-      <children xsi:type="notation:DecorationNode" type="5014">

-        <layoutConstraint xsi:type="notation:Location" y="5"/>

-      </children>

-      <element href="UseCaseDiagramTest.uml#_UrwJsJcBEd6IEoV1pxdOjw"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="668" y="247"/>

-    </children>

-    <children type="2013">

-      <eAnnotations source="QualifiedName">

-        <details key="QualifiedNameDepth" value="0"/>

-      </eAnnotations>

-      <eAnnotations source="displayNameLabelIcon">

-        <details key="displayNameLabelIcon_value" value="false"/>

-      </eAnnotations>

-      <eAnnotations source="ShadowFigure">

-        <details key="ShadowFigure_Value" value="false"/>

-      </eAnnotations>

-      <eAnnotations source="Stereotype_Annotation">

-        <details key="StereotypeWithQualifiedNameList" value=""/>

-        <details key="StereotypeList" value="Standard::Realization"/>

-        <details key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>

-        <details key="PropStereoDisplay" value=""/>

-        <details key="StereotypePropertyLocation" value="Compartment"/>

-      </eAnnotations>

-      <children xsi:type="notation:DecorationNode" type="5016"/>

-      <children xsi:type="notation:DecorationNode" type="7009">

-        <styles xsi:type="notation:SortingStyle"/>

-        <styles xsi:type="notation:FilteringStyle"/>

-      </children>

-      <styles xsi:type="notation:DescriptionStyle"/>

-      <styles xsi:type="notation:FontStyle" fontHeight="8"/>

-      <element href="UseCaseDiagramTest.uml#_ruVGwJb8Ed6IEoV1pxdOjw"/>

-      <layoutConstraint xsi:type="notation:Bounds" x="155" y="259"/>

-    </children>

-    <styles xsi:type="notation:DiagramStyle"/>

-    <element href="UseCaseDiagramTest.uml#_ILqm4Jb5Ed6IEoV1pxdOjw"/>

-    <edges type="4011" source="/1/@children.0" target="/1/@children.1">

-      <eAnnotations source="Stereotype_Annotation">

-        <details key="StereotypeWithQualifiedNameList" value=""/>

-        <details key="StereotypeList" value="Standard::Specification"/>

-        <details key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>

-        <details key="PropStereoDisplay" value=""/>

-        <details key="StereotypePropertyLocation" value="Compartment"/>

-      </eAnnotations>

-      <children xsi:type="notation:DecorationNode" type="6008">

-        <layoutConstraint xsi:type="notation:Location" x="21" y="22"/>

-      </children>

-      <styles xsi:type="notation:RoutingStyle"/>

-      <styles xsi:type="notation:FontStyle" fontHeight="8"/>

-      <element href="UseCaseDiagramTest.uml#_XA6DMJcBEd6IEoV1pxdOjw"/>

-      <bendpoints xsi:type="notation:RelativeBendpoints" points="[-15, 1, 265, -25]$[-212, 19, 68, -7]"/>

-    </edges>

-  </notation:Diagram>

-</xmi:XMI>

diff --git a/tests/UseCaseTestEditor/UseCaseDiagramTest.uml b/tests/UseCaseTestEditor/UseCaseDiagramTest.uml
deleted file mode 100644
index 722aac2dc1e..00000000000
--- a/tests/UseCaseTestEditor/UseCaseDiagramTest.uml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Standard="http://www.eclipse.org/uml2/schemas/Standard/1" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/3.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/uml2/schemas/Standard/1 pathmap://UML_PROFILES/Standard.profile.uml#_yzU58YinEdqtvbnfB2L_5w">

-  <uml:Model xmi:id="_ILqm4Jb5Ed6IEoV1pxdOjw" name="UseCaseDiagramTest">

-    <ownedComment xmi:id="_KxXd0Jb5Ed6IEoV1pxdOjw">

-      <body>&#xD;

-the pupose is to create a use case, an actor , an association between actor and usecase.Create a subsystems. Move usecase into subsystems</body>

-    </ownedComment>

-    <ownedComment xmi:id="_IpCC4Jb6Ed6IEoV1pxdOjw">

-      <body> </body>

-    </ownedComment>

-    <packagedElement xmi:type="uml:Class" xmi:id="_H2XP0Jb6Ed6IEoV1pxdOjw" name="Class0"/>

-    <packagedElement xmi:type="uml:Actor" xmi:id="_UrwJsJcBEd6IEoV1pxdOjw" name="myActor"/>

-    <packagedElement xmi:type="uml:Association" xmi:id="_XA6DMJcBEd6IEoV1pxdOjw" name="A_myactor_myusecase" memberEnd="_XA6DMZcBEd6IEoV1pxdOjw _XA6DNJcBEd6IEoV1pxdOjw">

-      <ownedEnd xmi:id="_XA6DMZcBEd6IEoV1pxdOjw" name="myactor" type="_UrwJsJcBEd6IEoV1pxdOjw" association="_XA6DMJcBEd6IEoV1pxdOjw">

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_XA6DMpcBEd6IEoV1pxdOjw" value="1"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_XA6DM5cBEd6IEoV1pxdOjw" value="1"/>

-      </ownedEnd>

-      <ownedEnd xmi:id="_XA6DNJcBEd6IEoV1pxdOjw" name="fdkljgdmkhgdqmhkjhdg" type="_ruVGwJb8Ed6IEoV1pxdOjw" association="_XA6DMJcBEd6IEoV1pxdOjw">

-        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_XA6DNZcBEd6IEoV1pxdOjw" value="1"/>

-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_XA6DNpcBEd6IEoV1pxdOjw" value="1"/>

-      </ownedEnd>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Component" xmi:id="_Yv7JwJcBEd6IEoV1pxdOjw" name="Subsystem" useCase="_8GWEwJcBEd6IEoV1pxdOjw _ItGJ4JcCEd6IEoV1pxdOjw">

-      <ownedUseCase xmi:id="_ruVGwJb8Ed6IEoV1pxdOjw" name="MyUseCase">

-        <include xmi:id="_-ywAoJcBEd6IEoV1pxdOjw" addition="_8GWEwJcBEd6IEoV1pxdOjw"/>

-        <extend xmi:id="_L92wAJcCEd6IEoV1pxdOjw" extendedCase="_ItGJ4JcCEd6IEoV1pxdOjw"/>

-        <extensionPoint xmi:id="_tWEHUJcBEd6IEoV1pxdOjw" name="anExtensionPoint"/>

-      </ownedUseCase>

-      <ownedUseCase xmi:id="_8GWEwJcBEd6IEoV1pxdOjw" name="AnOtherUseCase" subject="_Yv7JwJcBEd6IEoV1pxdOjw"/>

-      <ownedUseCase xmi:id="_ItGJ4JcCEd6IEoV1pxdOjw" name="AThirdUseCase" subject="_Yv7JwJcBEd6IEoV1pxdOjw"/>

-    </packagedElement>

-    <profileApplication xmi:id="_ILqm4Zb5Ed6IEoV1pxdOjw">

-      <eAnnotations xmi:id="_ILqm4pb5Ed6IEoV1pxdOjw" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="pathmap://UML_PROFILES/Standard.profile.uml#_yzU58YinEdqtvbnfB2L_5w"/>

-      </eAnnotations>

-      <appliedProfile href="pathmap://UML_PROFILES/Standard.profile.uml#_0"/>

-    </profileApplication>

-  </uml:Model>

-  <Standard:Realization xmi:id="_UDOfMJcDEd6IEoV1pxdOjw" base_Classifier="_ruVGwJb8Ed6IEoV1pxdOjw"/>

-  <Standard:Realization xmi:id="_X0xeMJcDEd6IEoV1pxdOjw" base_Classifier="_UrwJsJcBEd6IEoV1pxdOjw"/>

-  <Standard:Specification xmi:id="_ZnXdMJcDEd6IEoV1pxdOjw" base_Classifier="_XA6DMJcBEd6IEoV1pxdOjw"/>

-</xmi:XMI>

diff --git a/tests/org.eclipse.papyrus.diagram.common.tests/.classpath b/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/.classpath
index 2d1a4302f04..046bda900d2 100644
--- a/tests/org.eclipse.papyrus.diagram.common.tests/.classpath
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/.classpath
@@ -2,6 +2,6 @@
 <classpath>

 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="src" path="src"/>

+	<classpathentry kind="src" path="test"/>

 	<classpathentry kind="output" path="bin"/>

 </classpath>

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/.project b/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/.project
new file mode 100644
index 00000000000..5177d23b6a0
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<projectDescription>

+	<name>org.eclipse.papyrus.core.resourceloading.tests</name>

+	<comment></comment>

+	<projects>

+	</projects>

+	<buildSpec>

+		<buildCommand>

+			<name>org.eclipse.jdt.core.javabuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.pde.ManifestBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.pde.SchemaBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+	</buildSpec>

+	<natures>

+		<nature>org.eclipse.pde.PluginNature</nature>

+		<nature>org.eclipse.jdt.core.javanature</nature>

+	</natures>

+</projectDescription>

diff --git a/tests/org.eclipse.papyrus.core.test/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/.settings/org.eclipse.jdt.core.prefs
index b1390e98854..309162d9621 100644
--- a/tests/org.eclipse.papyrus.core.test/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,4 @@
-#Fri Apr 23 10:27:24 CEST 2010

+#Tue Nov 09 19:22:07 CET 2010

 eclipse.preferences.version=1

 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..28a623b9c3c
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/META-INF/MANIFEST.MF
@@ -0,0 +1,13 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %fragmentName
+Bundle-SymbolicName: org.eclipse.papyrus.core.resourceloading.tests
+Bundle-Version: 0.7.1.qualifier
+Bundle-Vendor: %providerName
+Bundle-Localization: fragment
+Fragment-Host: org.eclipse.papyrus.core.resourceloading;bundle-version="0.7.1"
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Require-Bundle: org.junit;bundle-version="4.8.1",
+ org.eclipse.uml2.uml;bundle-version="3.1.0",
+ org.eclipse.papyrus.core.resourceloading.preferences;bundle-version="0.7.1",
+ org.eclipse.papyrus.resourceloading.umlprofile;bundle-version="0.7.1"
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/about.html b/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/about.html
new file mode 100644
index 00000000000..82d49bf5f81
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

+<title>About</title>

+</head>

+<body lang="EN-US">

+<h2>About This Content</h2>

+ 

+<p>June 5, 2007</p>	

+<h3>License</h3>

+

+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

+indicated below, the Content is provided to you under the terms and conditions of the

+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

+

+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

+apply to your use of any object code in the Content.  Check the Redistributor's license that was 

+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

+indicated below, the terms and conditions of the EPL still apply to any source code in the Content

+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

+

+</body>

+</html>

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/build.properties b/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/build.properties
new file mode 100644
index 00000000000..1f8934d4f52
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/build.properties
@@ -0,0 +1,8 @@
+source.. = test/

+output.. = bin/

+bin.includes = META-INF/,\

+               .,\

+               resources/,\

+               about.html,\

+               org.eclipse.papyrus.core.resourceloading.tests.launch,\

+               fragment.properties

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/fragment.properties b/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/fragment.properties
new file mode 100644
index 00000000000..9674e3f4b1e
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/fragment.properties
@@ -0,0 +1,12 @@
+#################################################################################

+# Copyright (c) 2008 CEA LIST.

+# All rights reserved. This program and the accompanying materials

+# are made available under the terms of the Eclipse Public License v1.0

+# which accompanies this distribution, and is available at

+# http://www.eclipse.org/legal/epl-v10.html

+#

+# Contributors:

+#     Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - initial API and implementation

+##################################################################################

+fragmentName=Tests for Resource Loading Plugin (Incubation)

+providerName=Eclipse Modeling Project

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/org.eclipse.papyrus.core.resourceloading.tests.launch b/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/org.eclipse.papyrus.core.resourceloading.tests.launch
new file mode 100644
index 00000000000..33c8cb3617f
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/org.eclipse.papyrus.core.resourceloading.tests.launch
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">

+<booleanAttribute key="append.args" value="true"/>

+<booleanAttribute key="askclear" value="false"/>

+<booleanAttribute key="automaticAdd" value="true"/>

+<booleanAttribute key="automaticValidate" value="false"/>

+<stringAttribute key="bootstrap" value=""/>

+<stringAttribute key="checked" value="[NONE]"/>

+<booleanAttribute key="clearConfig" value="true"/>

+<booleanAttribute key="clearws" value="true"/>

+<booleanAttribute key="clearwslog" value="false"/>

+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>

+<booleanAttribute key="default" value="true"/>

+<booleanAttribute key="includeOptional" value="true"/>

+<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>

+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">

+<listEntry value="/org.eclipse.papyrus.core.resourceloading.tests/test/org/eclipse/papyrus/core/resourceloading/tests/AllTests.java"/>

+</listAttribute>

+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">

+<listEntry value="1"/>

+</listAttribute>

+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>

+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>

+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>

+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>

+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.core.resourceloading.tests.AllTests"/>

+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>

+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.core.resourceloading.tests"/>

+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>

+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -Xms40m -Xmx512m"/>

+<stringAttribute key="pde.version" value="3.3"/>

+<stringAttribute key="product" value="org.eclipse.platform.ide"/>

+<booleanAttribute key="run_in_ui_thread" value="true"/>

+<booleanAttribute key="show_selected_only" value="false"/>

+<booleanAttribute key="tracing" value="false"/>

+<booleanAttribute key="useCustomFeatures" value="false"/>

+<booleanAttribute key="useDefaultConfig" value="true"/>

+<booleanAttribute key="useDefaultConfigArea" value="false"/>

+<booleanAttribute key="useProduct" value="true"/>

+</launchConfiguration>

diff --git a/tests/org.eclipse.papyrus.core.test/resources/TestModel1/.project b/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/resources/TestModel1/.project
index 60eef8df6e7..60eef8df6e7 100644
--- a/tests/org.eclipse.papyrus.core.test/resources/TestModel1/.project
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/resources/TestModel1/.project
diff --git a/tests/org.eclipse.papyrus.core.test/resources/TestModel1/MyProfile.uml b/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/resources/TestModel1/MyProfile.uml
index c3524336a36..c3524336a36 100644
--- a/tests/org.eclipse.papyrus.core.test/resources/TestModel1/MyProfile.uml
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/resources/TestModel1/MyProfile.uml
diff --git a/tests/org.eclipse.papyrus.core.test/resources/TestModel1/Package0.di b/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/resources/TestModel1/Package0.di
index e35f85b923b..e35f85b923b 100644
--- a/tests/org.eclipse.papyrus.core.test/resources/TestModel1/Package0.di
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/resources/TestModel1/Package0.di
diff --git a/tests/org.eclipse.papyrus.core.test/resources/TestModel1/Package0.notation b/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/resources/TestModel1/Package0.notation
index 372817a8170..372817a8170 100644
--- a/tests/org.eclipse.papyrus.core.test/resources/TestModel1/Package0.notation
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/resources/TestModel1/Package0.notation
diff --git a/tests/org.eclipse.papyrus.core.test/resources/TestModel1/Package0.uml b/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/resources/TestModel1/Package0.uml
index a2ead3dc006..a2ead3dc006 100644
--- a/tests/org.eclipse.papyrus.core.test/resources/TestModel1/Package0.uml
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/resources/TestModel1/Package0.uml
diff --git a/tests/org.eclipse.papyrus.core.test/resources/TestModel1/Package1.di b/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/resources/TestModel1/Package1.di
index ddfa664795e..ddfa664795e 100644
--- a/tests/org.eclipse.papyrus.core.test/resources/TestModel1/Package1.di
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/resources/TestModel1/Package1.di
diff --git a/tests/org.eclipse.papyrus.core.test/resources/TestModel1/Package1.notation b/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/resources/TestModel1/Package1.notation
index 109887dc0ac..109887dc0ac 100644
--- a/tests/org.eclipse.papyrus.core.test/resources/TestModel1/Package1.notation
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/resources/TestModel1/Package1.notation
diff --git a/tests/org.eclipse.papyrus.core.test/resources/TestModel1/Package1.uml b/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/resources/TestModel1/Package1.uml
index 6431ba3eaf2..6431ba3eaf2 100644
--- a/tests/org.eclipse.papyrus.core.test/resources/TestModel1/Package1.uml
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/resources/TestModel1/Package1.uml
diff --git a/tests/org.eclipse.papyrus.core.test/resources/TestModel1/model1.di b/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/resources/TestModel1/model1.di
index 68d5842e5b9..68d5842e5b9 100644
--- a/tests/org.eclipse.papyrus.core.test/resources/TestModel1/model1.di
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/resources/TestModel1/model1.di
diff --git a/tests/org.eclipse.papyrus.core.test/resources/TestModel1/model1.notation b/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/resources/TestModel1/model1.notation
index 3a28d25c9e9..3a28d25c9e9 100644
--- a/tests/org.eclipse.papyrus.core.test/resources/TestModel1/model1.notation
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/resources/TestModel1/model1.notation
diff --git a/tests/org.eclipse.papyrus.core.test/resources/TestModel1/model1.uml b/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/resources/TestModel1/model1.uml
index b4f1e6cdb0c..b4f1e6cdb0c 100644
--- a/tests/org.eclipse.papyrus.core.test/resources/TestModel1/model1.uml
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/resources/TestModel1/model1.uml
diff --git a/tests/org.eclipse.papyrus.core.test/resources/TestModel2/.project b/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/resources/TestModel2/.project
index d4d9e708148..d4d9e708148 100644
--- a/tests/org.eclipse.papyrus.core.test/resources/TestModel2/.project
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/resources/TestModel2/.project
diff --git a/tests/org.eclipse.papyrus.core.test/resources/TestModel2/Package0.di b/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/resources/TestModel2/Package0.di
index 266051e4f6f..266051e4f6f 100644
--- a/tests/org.eclipse.papyrus.core.test/resources/TestModel2/Package0.di
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/resources/TestModel2/Package0.di
diff --git a/tests/org.eclipse.papyrus.core.test/resources/TestModel2/Package0.notation b/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/resources/TestModel2/Package0.notation
index c4c0c25efd6..c4c0c25efd6 100644
--- a/tests/org.eclipse.papyrus.core.test/resources/TestModel2/Package0.notation
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/resources/TestModel2/Package0.notation
diff --git a/tests/org.eclipse.papyrus.core.test/resources/TestModel2/Package0.uml b/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/resources/TestModel2/Package0.uml
index 718bae12387..718bae12387 100644
--- a/tests/org.eclipse.papyrus.core.test/resources/TestModel2/Package0.uml
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/resources/TestModel2/Package0.uml
diff --git a/tests/org.eclipse.papyrus.core.test/resources/TestModel2/model1.di b/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/resources/TestModel2/model1.di
index fb8791b258e..fb8791b258e 100644
--- a/tests/org.eclipse.papyrus.core.test/resources/TestModel2/model1.di
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/resources/TestModel2/model1.di
diff --git a/tests/org.eclipse.papyrus.core.test/resources/TestModel2/model1.notation b/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/resources/TestModel2/model1.notation
index 46538a70935..46538a70935 100644
--- a/tests/org.eclipse.papyrus.core.test/resources/TestModel2/model1.notation
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/resources/TestModel2/model1.notation
diff --git a/tests/org.eclipse.papyrus.core.test/resources/TestModel2/model1.uml b/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/resources/TestModel2/model1.uml
index b793bcb792d..b793bcb792d 100644
--- a/tests/org.eclipse.papyrus.core.test/resources/TestModel2/model1.uml
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/resources/TestModel2/model1.uml
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/test/org/eclipse/papyrus/core/resourceloading/tests/AllTests.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/test/org/eclipse/papyrus/core/resourceloading/tests/AllTests.java
new file mode 100644
index 00000000000..dc5b3a12d21
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/test/org/eclipse/papyrus/core/resourceloading/tests/AllTests.java
@@ -0,0 +1,36 @@
+package org.eclipse.papyrus.core.resourceloading.tests;

+

+import org.eclipse.papyrus.core.resourceloading.tests.testModel1.Strategy0TestModel1;

+import org.eclipse.papyrus.core.resourceloading.tests.testModel1.Strategy1TestModel1;

+import org.eclipse.papyrus.core.resourceloading.tests.testModel1.Strategy2TestModel1;

+import org.eclipse.papyrus.core.resourceloading.tests.testModel2.Strategy0TestModel2WithModel1;

+import org.eclipse.papyrus.core.resourceloading.tests.testModel2.Strategy0TestModel2WithPackage0;

+import org.eclipse.papyrus.core.resourceloading.tests.testModel2.Strategy1TestModel2WithModel1;

+import org.eclipse.papyrus.core.resourceloading.tests.testModel2.Strategy1TestModel2WithPackage0;

+import org.eclipse.papyrus.core.resourceloading.tests.testModel2.Strategy2TestModel2WithModel1;

+import org.eclipse.papyrus.core.resourceloading.tests.testModel2.Strategy2TestModel2WithPackage0;

+import org.junit.runner.RunWith;

+import org.junit.runners.Suite;

+import org.junit.runners.Suite.SuiteClasses;

+

+

+/**

+ * All tests together.

+ */

+@RunWith(Suite.class)

+@SuiteClasses({

+	// testModel1

+Strategy1TestModel1.class,

+Strategy2TestModel1.class,

+ Strategy0TestModel1.class,

+// testModel2

+Strategy0TestModel2WithModel1.class,

+Strategy0TestModel2WithPackage0.class,

+Strategy1TestModel2WithModel1.class,

+Strategy1TestModel2WithPackage0.class,

+Strategy2TestModel2WithModel1.class,

+Strategy2TestModel2WithPackage0.class

+})

+public class AllTests {

+

+}
\ No newline at end of file
diff --git a/tests/org.eclipse.papyrus.core.test/src/org/eclipse/papyrus/core/test/testModel1/AbstractResourceLoadingTestModel1.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/test/org/eclipse/papyrus/core/resourceloading/tests/testModel1/AbstractResourceLoadingTestModel1.java
index 9f57a26a63c..36a4d522524 100644
--- a/tests/org.eclipse.papyrus.core.test/src/org/eclipse/papyrus/core/test/testModel1/AbstractResourceLoadingTestModel1.java
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/test/org/eclipse/papyrus/core/resourceloading/tests/testModel1/AbstractResourceLoadingTestModel1.java
@@ -11,8 +11,9 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.core.test.testModel1;

+package org.eclipse.papyrus.core.resourceloading.tests.testModel1;

 

+import java.io.File;

 import java.net.URL;

 

 import junit.framework.TestCase;

@@ -27,12 +28,15 @@ import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.IProgressMonitor;

 import org.eclipse.core.runtime.NullProgressMonitor;

 import org.eclipse.core.runtime.Path;

+import org.eclipse.core.runtime.Platform;

 import org.eclipse.emf.common.util.URI;

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.ecore.resource.Resource;

+import org.eclipse.emf.ecore.util.EcoreUtil;

+import org.eclipse.papyrus.core.Activator;

 import org.eclipse.papyrus.core.resourceloading.OnDemandLoadingModelSetServiceFactory;

 import org.eclipse.papyrus.core.resourceloading.preferences.StrategyChooser;

-import org.eclipse.papyrus.core.test.Activator;

+import org.eclipse.papyrus.core.resourceloading.tests.testModel2.ITestConstants;

 import org.eclipse.papyrus.resource.ModelSet;

 import org.eclipse.uml2.uml.Property;

 import org.eclipse.uml2.uml.Type;

@@ -49,10 +53,10 @@ import org.eclipse.uml2.uml.Type;
  */

 public abstract class AbstractResourceLoadingTestModel1 extends TestCase {

 

-	public static final String RESOURCE_URI = "org.eclipse.papyrus.core.test/resources/TestModel1/";

-

 	private static final String INITIAL_PATH = "resources/TestModel1/";

 

+	public static final String RESOURCE_URI = ITestConstants.FRAGMENT_ID + "/" + INITIAL_PATH;

+

 	private String[] resources = new String[]{ "model1", "Package0", "Package1" };

 

 	private String[] extensions = new String[]{ ".di", ".notation", ".uml" };

@@ -73,6 +77,8 @@ public abstract class AbstractResourceLoadingTestModel1 extends TestCase {
 		if(project != null) {

 			IFile modelFile = project.getFile(INITIAL_PATH + "model1.di");

 			modelSet.loadModels(modelFile);

+		} else {

+			fail("Could not initialize correctly the project");

 		}

 	}

 

@@ -83,9 +89,13 @@ public abstract class AbstractResourceLoadingTestModel1 extends TestCase {
 	 * @throws Exception

 	 */

 	private IProject copyTestModelToThePlatform() throws Exception {

-		IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject("org.eclipse.papyrus.core.test");

+		IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(ITestConstants.FRAGMENT_ID);

 		IProgressMonitor monitor = new NullProgressMonitor();

 

+		if(project != null && project.exists()) {

+			project.delete(true, monitor);

+		}

+

 		if(project != null && !project.exists()) {

 			project.create(monitor);

 		}

@@ -97,9 +107,10 @@ public abstract class AbstractResourceLoadingTestModel1 extends TestCase {
 				if(!file.exists()) {

 					createFolder(project, "resources/");

 					createFolder(project, INITIAL_PATH);

-					URL url = FileLocator.find(Activator.getDefault().getBundle(), new Path(INITIAL_PATH + res + s), null);

-					URL newFile = FileLocator.resolve(url);

-					file.createLink(newFile.toURI(), IResource.REPLACE, monitor);

+					// URL url = FileLocator.find(Platform.getBundle(ITestConstants.FRAGMENT_ID), new Path(INITIAL_PATH + res + s), null);

+					// URL newFileURL = FileLocator.resolve(url);

+					// file.createLink(newFile.toURI(), IResource.REPLACE, monitor);

+					file.create(Platform.getBundle(ITestConstants.FRAGMENT_ID).getEntry(INITIAL_PATH + res + s).openStream(), true, monitor);

 				}

 			}

 		}

@@ -107,9 +118,13 @@ public abstract class AbstractResourceLoadingTestModel1 extends TestCase {
 		String profilePath = INITIAL_PATH + "MyProfile.uml";

 		IFile file = project.getFile(profilePath);

 		if(!file.exists()) {

-			URL url = FileLocator.find(Activator.getDefault().getBundle(), new Path(profilePath), null);

-			URL newFile = FileLocator.resolve(url);

-			file.createLink(newFile.toURI(), IResource.REPLACE, monitor);

+			//URL url = FileLocator.find(Platform.getBundle(ITestConstants.FRAGMENT_ID), new Path(profilePath), null);

+			//URL newFile = FileLocator.resolve(url);

+			//file.createLink(newFile.toURI(), IResource.REPLACE, monitor);

+			file.create(Platform.getBundle(ITestConstants.FRAGMENT_ID).getEntry(profilePath).openStream(), true, monitor);

+			if(!file.exists()) {

+				fail("Impossible to create the profile file");

+			}

 		}

 		project.refreshLocal(IResource.DEPTH_INFINITE, monitor);

 		return project;

@@ -221,6 +236,10 @@ public abstract class AbstractResourceLoadingTestModel1 extends TestCase {
 	 */

 	public void testGetObjectOfProfileResource() {

 		URI uriPlatformProfile = URI.createPlatformResourceURI(RESOURCE_URI + "MyProfile.uml#_XkGiwB07Ed-QQ4mYkrb7Gg", false);

+		System.err.println(uriPlatformProfile);

+		Resource resource = modelSet.getResource(uriPlatformProfile, true);

+		assertNotNull("Resource should not be null", resource);

+

 		EObject platformProfile = modelSet.getEObject(uriPlatformProfile, true);

 		// profile must be loaded with all the strategies

 		assertNotNull("Load a platform profile resource", platformProfile);

@@ -298,6 +317,6 @@ public abstract class AbstractResourceLoadingTestModel1 extends TestCase {
 		if(!parent.exists()) {

 			parent.create(true, true, new NullProgressMonitor());

 		}

-		assert (parent.exists());

+		assertTrue(parent.exists());

 	}

 }

diff --git a/tests/org.eclipse.papyrus.core.test/src/org/eclipse/papyrus/core/test/testModel1/Strategy0TestModel1.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/test/org/eclipse/papyrus/core/resourceloading/tests/testModel1/Strategy0TestModel1.java
index d5fce542d9a..a3a8248e7d3 100644
--- a/tests/org.eclipse.papyrus.core.test/src/org/eclipse/papyrus/core/test/testModel1/Strategy0TestModel1.java
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/test/org/eclipse/papyrus/core/resourceloading/tests/testModel1/Strategy0TestModel1.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

   *****************************************************************************/

-package org.eclipse.papyrus.core.test.testModel1;

+package org.eclipse.papyrus.core.resourceloading.tests.testModel1;

 

 /**

  * Test strategy 0 = Load all the needed resources

diff --git a/tests/org.eclipse.papyrus.core.test/src/org/eclipse/papyrus/core/test/testModel1/Strategy1TestModel1.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/test/org/eclipse/papyrus/core/resourceloading/tests/testModel1/Strategy1TestModel1.java
index 741798e64c7..cfa2790f817 100644
--- a/tests/org.eclipse.papyrus.core.test/src/org/eclipse/papyrus/core/test/testModel1/Strategy1TestModel1.java
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/test/org/eclipse/papyrus/core/resourceloading/tests/testModel1/Strategy1TestModel1.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.core.test.testModel1;

+package org.eclipse.papyrus.core.resourceloading.tests.testModel1;

 

 /**

  * Test strategy 1 = Load the additional resources (profile and pathmap). Controlled resources are not loaded

diff --git a/tests/org.eclipse.papyrus.core.test/src/org/eclipse/papyrus/core/test/testModel1/Strategy2TestModel1.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/test/org/eclipse/papyrus/core/resourceloading/tests/testModel1/Strategy2TestModel1.java
index e17c9a213fa..46ff3d3fd08 100644
--- a/tests/org.eclipse.papyrus.core.test/src/org/eclipse/papyrus/core/test/testModel1/Strategy2TestModel1.java
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/test/org/eclipse/papyrus/core/resourceloading/tests/testModel1/Strategy2TestModel1.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.core.test.testModel1;

+package org.eclipse.papyrus.core.resourceloading.tests.testModel1;

 

 

 

diff --git a/tests/org.eclipse.papyrus.core.test/src/org/eclipse/papyrus/core/test/testModel2/AbstractResourceLoadingTestModel2.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/test/org/eclipse/papyrus/core/resourceloading/tests/testModel2/AbstractResourceLoadingTestModel2.java
index 7c2f9258bb9..ca7f6c498c6 100644
--- a/tests/org.eclipse.papyrus.core.test/src/org/eclipse/papyrus/core/test/testModel2/AbstractResourceLoadingTestModel2.java
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/test/org/eclipse/papyrus/core/resourceloading/tests/testModel2/AbstractResourceLoadingTestModel2.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.core.test.testModel2;

+package org.eclipse.papyrus.core.resourceloading.tests.testModel2;

 

 import java.net.URL;

 

@@ -27,13 +27,13 @@ import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.IProgressMonitor;

 import org.eclipse.core.runtime.NullProgressMonitor;

 import org.eclipse.core.runtime.Path;

+import org.eclipse.core.runtime.Platform;

 import org.eclipse.emf.common.util.URI;

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.ecore.resource.Resource;

 import org.eclipse.gmf.runtime.notation.Node;

 import org.eclipse.papyrus.core.resourceloading.OnDemandLoadingModelSetServiceFactory;

 import org.eclipse.papyrus.core.resourceloading.preferences.StrategyChooser;

-import org.eclipse.papyrus.core.test.Activator;

 import org.eclipse.papyrus.resource.ModelSet;

 import org.eclipse.uml2.uml.Property;

 import org.eclipse.uml2.uml.Type;

@@ -49,10 +49,10 @@ import org.eclipse.uml2.uml.Type;
  */

 public abstract class AbstractResourceLoadingTestModel2 extends TestCase {

 

-	public static final String RESOURCE_URI = "org.eclipse.papyrus.core.test/resources/TestModel2/";

-

 	public static final String INITIAL_PATH = "resources/TestModel2/";

 

+	public static final String RESOURCE_URI = ITestConstants.FRAGMENT_ID + "/" + INITIAL_PATH;

+

 	private String[] resources = new String[]{ "model1", "Package0" };

 

 	private String[] extensions = new String[]{ ".di", ".notation", ".uml" };

@@ -84,7 +84,7 @@ public abstract class AbstractResourceLoadingTestModel2 extends TestCase {
 	 * @throws Exception

 	 */

 	private IProject copyTestModelToThePlatform() throws Exception {

-		IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject("org.eclipse.papyrus.core.test");

+		IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(ITestConstants.FRAGMENT_ID);

 		IProgressMonitor monitor = new NullProgressMonitor();

 

 		if(project != null && !project.exists()) {

@@ -98,7 +98,7 @@ public abstract class AbstractResourceLoadingTestModel2 extends TestCase {
 				if(!file.exists()) {

 					createFolder(project, "resources/");

 					createFolder(project, INITIAL_PATH);

-					URL url = FileLocator.find(Activator.getDefault().getBundle(), new Path(INITIAL_PATH + res + s), null);

+					URL url = FileLocator.find(Platform.getBundle(ITestConstants.FRAGMENT_ID), new Path(INITIAL_PATH + res + s), null);

 					URL newFile = FileLocator.resolve(url);

 					file.createLink(newFile.toURI(), IResource.REPLACE, monitor);

 				}

@@ -118,6 +118,9 @@ public abstract class AbstractResourceLoadingTestModel2 extends TestCase {
 	/**

 	 * Gets the resource to load, the one it is opened with the papyrus editor

 	 * 

+	 * @param project

+	 *        the project in which the resources should be

+	 * 

 	 * @return the resource to load

 	 */

 	public abstract IFile getResourceToLoad(IProject project);

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/test/org/eclipse/papyrus/core/resourceloading/tests/testModel2/ITestConstants.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/test/org/eclipse/papyrus/core/resourceloading/tests/testModel2/ITestConstants.java
new file mode 100644
index 00000000000..a74e2bac670
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/test/org/eclipse/papyrus/core/resourceloading/tests/testModel2/ITestConstants.java
@@ -0,0 +1,22 @@
+/*****************************************************************************

+ * Copyright (c) 2010 CEA LIST.

+ *    

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.core.resourceloading.tests.testModel2;

+

+

+/**

+ * interface that contains all constants for the project

+ */

+public interface ITestConstants {

+

+	/** id of the fragment */

+	public static final String FRAGMENT_ID = "org.eclipse.papyrus.core.resourceloading.tests";

+}

diff --git a/tests/org.eclipse.papyrus.core.test/src/org/eclipse/papyrus/core/test/testModel2/Strategy0TestModel2WithModel1.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/test/org/eclipse/papyrus/core/resourceloading/tests/testModel2/Strategy0TestModel2WithModel1.java
index 0724a7a797f..88f1de35074 100644
--- a/tests/org.eclipse.papyrus.core.test/src/org/eclipse/papyrus/core/test/testModel2/Strategy0TestModel2WithModel1.java
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/test/org/eclipse/papyrus/core/resourceloading/tests/testModel2/Strategy0TestModel2WithModel1.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

   *****************************************************************************/

-package org.eclipse.papyrus.core.test.testModel2;

+package org.eclipse.papyrus.core.resourceloading.tests.testModel2;

 

 import org.eclipse.core.resources.IFile;

 import org.eclipse.core.resources.IProject;

diff --git a/tests/org.eclipse.papyrus.core.test/src/org/eclipse/papyrus/core/test/testModel2/Strategy0TestModel2WithPackage0.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/test/org/eclipse/papyrus/core/resourceloading/tests/testModel2/Strategy0TestModel2WithPackage0.java
index 834056e5e78..02daee6adcf 100644
--- a/tests/org.eclipse.papyrus.core.test/src/org/eclipse/papyrus/core/test/testModel2/Strategy0TestModel2WithPackage0.java
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/test/org/eclipse/papyrus/core/resourceloading/tests/testModel2/Strategy0TestModel2WithPackage0.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

   *****************************************************************************/

-package org.eclipse.papyrus.core.test.testModel2;

+package org.eclipse.papyrus.core.resourceloading.tests.testModel2;

 

 import org.eclipse.core.resources.IFile;

 import org.eclipse.core.resources.IProject;

diff --git a/tests/org.eclipse.papyrus.core.test/src/org/eclipse/papyrus/core/test/testModel2/Strategy1TestModel2WithModel1.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/test/org/eclipse/papyrus/core/resourceloading/tests/testModel2/Strategy1TestModel2WithModel1.java
index fdc2c96ab35..8a9d01d4379 100644
--- a/tests/org.eclipse.papyrus.core.test/src/org/eclipse/papyrus/core/test/testModel2/Strategy1TestModel2WithModel1.java
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/test/org/eclipse/papyrus/core/resourceloading/tests/testModel2/Strategy1TestModel2WithModel1.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.core.test.testModel2;

+package org.eclipse.papyrus.core.resourceloading.tests.testModel2;

 

 import org.eclipse.core.resources.IFile;

 import org.eclipse.core.resources.IProject;

diff --git a/tests/org.eclipse.papyrus.core.test/src/org/eclipse/papyrus/core/test/testModel2/Strategy1TestModel2WithPackage0.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/test/org/eclipse/papyrus/core/resourceloading/tests/testModel2/Strategy1TestModel2WithPackage0.java
index 604c7bfb38e..212e802df70 100644
--- a/tests/org.eclipse.papyrus.core.test/src/org/eclipse/papyrus/core/test/testModel2/Strategy1TestModel2WithPackage0.java
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/test/org/eclipse/papyrus/core/resourceloading/tests/testModel2/Strategy1TestModel2WithPackage0.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

  *****************************************************************************/

-package org.eclipse.papyrus.core.test.testModel2;

+package org.eclipse.papyrus.core.resourceloading.tests.testModel2;

 

 import org.eclipse.core.resources.IFile;

 import org.eclipse.core.resources.IProject;

diff --git a/tests/org.eclipse.papyrus.core.test/src/org/eclipse/papyrus/core/test/testModel2/Strategy2TestModel2WithModel1.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/test/org/eclipse/papyrus/core/resourceloading/tests/testModel2/Strategy2TestModel2WithModel1.java
index 22ae424a477..aa9c49fa77c 100644
--- a/tests/org.eclipse.papyrus.core.test/src/org/eclipse/papyrus/core/test/testModel2/Strategy2TestModel2WithModel1.java
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/test/org/eclipse/papyrus/core/resourceloading/tests/testModel2/Strategy2TestModel2WithModel1.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

   *****************************************************************************/

-package org.eclipse.papyrus.core.test.testModel2;

+package org.eclipse.papyrus.core.resourceloading.tests.testModel2;

 

 import org.eclipse.core.resources.IFile;

 import org.eclipse.core.resources.IProject;

diff --git a/tests/org.eclipse.papyrus.core.test/src/org/eclipse/papyrus/core/test/testModel2/Strategy2TestModel2WithPackage0.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/test/org/eclipse/papyrus/core/resourceloading/tests/testModel2/Strategy2TestModel2WithPackage0.java
index fdf4b196fdb..655e52748fb 100644
--- a/tests/org.eclipse.papyrus.core.test/src/org/eclipse/papyrus/core/test/testModel2/Strategy2TestModel2WithPackage0.java
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.resourceloading.tests/test/org/eclipse/papyrus/core/resourceloading/tests/testModel2/Strategy2TestModel2WithPackage0.java
@@ -11,7 +11,7 @@
  *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

  *

   *****************************************************************************/

-package org.eclipse.papyrus.core.test.testModel2;

+package org.eclipse.papyrus.core.resourceloading.tests.testModel2;

 

 import org.eclipse.core.resources.IFile;

 import org.eclipse.core.resources.IProject;

diff --git a/tests/org.eclipse.papyrus.properties.runtime.tests/.classpath b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/.classpath
index 2d1a4302f04..046bda900d2 100644
--- a/tests/org.eclipse.papyrus.properties.runtime.tests/.classpath
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/.classpath
@@ -2,6 +2,6 @@
 <classpath>

 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="src" path="src"/>

+	<classpathentry kind="src" path="test"/>

 	<classpathentry kind="output" path="bin"/>

 </classpath>

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/.project b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/.project
new file mode 100644
index 00000000000..1c62f57281b
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<projectDescription>

+	<name>org.eclipse.papyrus.core.tests</name>

+	<comment></comment>

+	<projects>

+	</projects>

+	<buildSpec>

+		<buildCommand>

+			<name>org.eclipse.jdt.core.javabuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.pde.ManifestBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.pde.SchemaBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+	</buildSpec>

+	<natures>

+		<nature>org.eclipse.pde.PluginNature</nature>

+		<nature>org.eclipse.jdt.core.javanature</nature>

+	</natures>

+</projectDescription>

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..6e3f672ae67
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,8 @@
+#Mon Nov 08 19:25:55 CET 2010

+eclipse.preferences.version=1

+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5

+org.eclipse.jdt.core.compiler.compliance=1.5

+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

+org.eclipse.jdt.core.compiler.source=1.5

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..f396f401f4f
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/META-INF/MANIFEST.MF
@@ -0,0 +1,15 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.papyrus.core.tests;singleton:=true
+Bundle-Version: 0.7.1.qualifier
+Bundle-Vendor: %providerName
+Bundle-Localization: fragment
+Fragment-Host: org.eclipse.papyrus.core;bundle-version="0.7.1"
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Require-Bundle: org.junit;bundle-version="3.8.2",
+ org.eclipse.uml2.uml;bundle-version="3.1.0"
+Export-Package: org.eclipse.papyrus.core.lifecycleevents,
+ org.eclipse.papyrus.core.services,
+ org.eclipse.papyrus.core.tests,
+ org.eclipse.papyrus.resource
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/about.html b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/about.html
new file mode 100644
index 00000000000..82d49bf5f81
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

+<title>About</title>

+</head>

+<body lang="EN-US">

+<h2>About This Content</h2>

+ 

+<p>June 5, 2007</p>	

+<h3>License</h3>

+

+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

+indicated below, the Content is provided to you under the terms and conditions of the

+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

+

+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

+apply to your use of any object code in the Content.  Check the Redistributor's license that was 

+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

+indicated below, the terms and conditions of the EPL still apply to any source code in the Content

+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

+

+</body>

+</html>

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/build.properties b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/build.properties
new file mode 100644
index 00000000000..b2c376d73bf
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/build.properties
@@ -0,0 +1,7 @@
+source.. = test/

+output.. = bin/

+bin.includes = META-INF/,\

+               .,\

+               about.html,\

+               org.eclipse.papyrus.core.tests.launch,\

+               fragment.properties

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/fragment.properties b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/fragment.properties
new file mode 100644
index 00000000000..c87dd57f053
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/fragment.properties
@@ -0,0 +1,12 @@
+#################################################################################
+# Copyright (c) 2008 CEA LIST.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - initial API and implementation
+##################################################################################
+pluginName=Papyrus Core Test(Incubation)
+providerName=Eclipse Modeling Project
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/org.eclipse.papyrus.core.tests.launch b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/org.eclipse.papyrus.core.tests.launch
new file mode 100644
index 00000000000..aeabc1de553
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/org.eclipse.papyrus.core.tests.launch
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">

+<booleanAttribute key="append.args" value="true"/>

+<booleanAttribute key="askclear" value="false"/>

+<booleanAttribute key="automaticAdd" value="true"/>

+<booleanAttribute key="automaticValidate" value="false"/>

+<stringAttribute key="bootstrap" value=""/>

+<stringAttribute key="checked" value="[NONE]"/>

+<booleanAttribute key="clearConfig" value="true"/>

+<booleanAttribute key="clearws" value="true"/>

+<booleanAttribute key="clearwslog" value="false"/>

+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>

+<booleanAttribute key="default" value="true"/>

+<booleanAttribute key="includeOptional" value="true"/>

+<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>

+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">

+<listEntry value="/org.eclipse.papyrus.core.tests/src/org/eclipse/papyrus/core/tests/AllTests.java"/>

+</listAttribute>

+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">

+<listEntry value="1"/>

+</listAttribute>

+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>

+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>

+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>

+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>

+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.core.tests.AllTests"/>

+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>

+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.core.tests"/>

+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>

+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -Xms40m -Xmx512m"/>

+<stringAttribute key="pde.version" value="3.3"/>

+<stringAttribute key="product" value="org.eclipse.platform.ide"/>

+<booleanAttribute key="run_in_ui_thread" value="true"/>

+<booleanAttribute key="show_selected_only" value="false"/>

+<booleanAttribute key="tracing" value="false"/>

+<booleanAttribute key="useCustomFeatures" value="false"/>

+<booleanAttribute key="useDefaultConfig" value="true"/>

+<booleanAttribute key="useDefaultConfigArea" value="false"/>

+<booleanAttribute key="useProduct" value="true"/>

+</launchConfiguration>

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/lifecycleevents/FakeSaveEvent.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/lifecycleevents/FakeSaveEvent.java
new file mode 100644
index 00000000000..524b8b57ca2
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/lifecycleevents/FakeSaveEvent.java
@@ -0,0 +1,29 @@
+/**

+ * 

+ */

+package org.eclipse.papyrus.core.lifecycleevents;

+

+import javax.imageio.spi.ServiceRegistry;

+

+import org.eclipse.papyrus.core.editor.IMultiDiagramEditor;

+import org.eclipse.papyrus.core.lifecycleevents.DoSaveEvent;

+

+

+/**

+ * @author dumoulin

+ *

+ */

+public class FakeSaveEvent extends DoSaveEvent {

+

+	/**

+	 * Constructor.

+	 *

+	 * @param serviceRegistry

+	 * @param multiDiagramEditor

+	 */

+	public FakeSaveEvent() {

+		super(null, null);

+		// TODO Auto-generated constructor stub

+	}

+

+}

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/lifecycleevents/FakeSaveEventListener.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/lifecycleevents/FakeSaveEventListener.java
new file mode 100644
index 00000000000..fec3a0a9f54
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/lifecycleevents/FakeSaveEventListener.java
@@ -0,0 +1,60 @@
+/**

+ * 

+ */

+package org.eclipse.papyrus.core.lifecycleevents;

+

+import java.util.ArrayList;

+import java.util.HashSet;

+import java.util.List;

+import java.util.Set;

+

+import org.eclipse.papyrus.core.lifecycleevents.DoSaveEvent;

+import org.eclipse.papyrus.core.lifecycleevents.ISaveEventListener;

+

+

+/**

+ * @author dumoulin

+ *

+ */

+public class FakeSaveEventListener implements ISaveEventListener {

+

+	List<DoSaveEvent> receivedEvents = new ArrayList<DoSaveEvent>();

+	

+	/**

+	 * @see org.eclipse.papyrus.core.lifecycleevents.ISaveEventListener#doSave(org.eclipse.papyrus.core.lifecycleevents.DoSaveEvent)

+	 *

+	 * @param event

+	 */

+	public void doSave(DoSaveEvent event) {

+		receivedEvents.add(event);

+

+	}

+

+	/**

+	 * @see org.eclipse.papyrus.core.lifecycleevents.ISaveEventListener#doSaveAs(org.eclipse.papyrus.core.lifecycleevents.DoSaveEvent)

+	 *

+	 * @param event

+	 */

+	public void doSaveAs(DoSaveEvent event) {

+		receivedEvents.add(event);

+

+	}

+

+	/**

+	 * Return true if the event has been received.

+	 * @param event

+	 * @return

+	 */

+	public boolean isEventReceived(DoSaveEvent event) {

+		return receivedEvents.contains(event);

+	}

+

+	

+	/**

+	 * @return the receivedEvents

+	 */

+	public List<DoSaveEvent> getReceivedEvents() {

+		return receivedEvents;

+	}

+

+}

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/lifecycleevents/LifeCycleEventsProviderTest.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/lifecycleevents/LifeCycleEventsProviderTest.java
new file mode 100644
index 00000000000..a1c4c811a5b
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/lifecycleevents/LifeCycleEventsProviderTest.java
@@ -0,0 +1,236 @@
+/**

+ * 

+ */

+package org.eclipse.papyrus.core.lifecycleevents;

+

+import org.eclipse.papyrus.core.lifecycleevents.DoSaveEvent;

+import org.eclipse.papyrus.core.lifecycleevents.ISaveEventListener;

+import org.eclipse.papyrus.core.lifecycleevents.LifeCycleEventsProvider;

+

+import junit.framework.TestCase;

+

+

+/**

+ * @author cedric dumoulin

+ *

+ */

+public class LifeCycleEventsProviderTest extends TestCase {

+

+	/**

+	 * Object under test.

+	 */

+	protected LifeCycleEventsProvider eventProvider;

+	

+	/**

+	 * @see junit.framework.TestCase#setUp()

+	 *

+	 * @throws Exception

+	 */

+	@Override

+	protected void setUp() throws Exception {

+		super.setUp();

+		eventProvider = new LifeCycleEventsProvider();

+	}

+	

+	/**

+	 * Test method for {@link org.eclipse.papyrus.core.lifecycleevents.LifeCycleEventsProvider#addDoSaveListener(org.eclipse.papyrus.core.lifecycleevents.ISaveEventListener)}.

+	 */

+	public void testAddSaveListener() {

+

+		ISaveEventListener listener = new FakeSaveEventListener();

+		

+		try {

+			eventProvider.addDoSaveListener(listener);

+		} catch (Exception e) {

+			fail("Add listener");

+		}

+		

+	}

+

+	/**

+	 * Test method for {@link org.eclipse.papyrus.core.lifecycleevents.LifeCycleEventsProvider#removeDoSaveListener(org.eclipse.papyrus.core.lifecycleevents.ISaveEventListener)}.

+	 */

+	public void testRemoveSaveListener() {

+		ISaveEventListener listener = new FakeSaveEventListener();

+		

+		try {

+			eventProvider.addDoSaveListener(listener);

+			eventProvider.removeDoSaveListener(listener);

+		} catch (Exception e) {

+			fail("Remove listener");

+		}

+	}

+

+	/**

+	 * Test method for {@link org.eclipse.papyrus.core.lifecycleevents.LifeCycleEventsProvider#addAboutToDoSaveListener(org.eclipse.papyrus.core.lifecycleevents.ISaveEventListener)}.

+	 */

+	public void testAddAboutToSaveListener() {

+		ISaveEventListener listener = new FakeSaveEventListener();

+		

+		try {

+			eventProvider.addAboutToDoSaveListener(listener);

+		} catch (Exception e) {

+			fail("Add listener");

+		}

+	}

+

+	/**

+	 * Test method for {@link org.eclipse.papyrus.core.lifecycleevents.LifeCycleEventsProvider#removeAboutToDoSaveListener(org.eclipse.papyrus.core.lifecycleevents.ISaveEventListener)}.

+	 */

+	public void testRemoveAboutToSaveListener() {

+		ISaveEventListener listener = new FakeSaveEventListener();

+		

+		try {

+			eventProvider.addAboutToDoSaveListener(listener);

+			eventProvider.removeAboutToDoSaveListener(listener);

+		} catch (Exception e) {

+			fail("Remove listener");

+		}

+	}

+

+	/**

+	 * Test method for {@link org.eclipse.papyrus.core.lifecycleevents.LifeCycleEventsProvider#addPostDoSaveListener(org.eclipse.papyrus.core.lifecycleevents.ISaveEventListener)}.

+	 */

+	public void testAddPostSaveListener() {

+		ISaveEventListener listener = new FakeSaveEventListener();

+		

+		try {

+			eventProvider.addPostDoSaveListener(listener);

+		} catch (Exception e) {

+			fail("Add listener");

+		}

+	}

+

+	/**

+	 * Test method for {@link org.eclipse.papyrus.core.lifecycleevents.LifeCycleEventsProvider#removePostDoSaveListener(org.eclipse.papyrus.core.lifecycleevents.ISaveEventListener)}.

+	 */

+	public void testRemovePostSaveListener() {

+		ISaveEventListener listener = new FakeSaveEventListener();

+		

+		try {

+			eventProvider.addPostDoSaveListener(listener);

+			eventProvider.removePostDoSaveListener(listener);

+		} catch (Exception e) {

+			fail("Remove listener");

+		}

+	}

+

+	/**

+	 * Test method for {@link org.eclipse.papyrus.core.lifecycleevents.LifeCycleEventsProvider#fireAboutToDoSaveEvent(org.eclipse.papyrus.core.lifecycleevents.DoSaveEvent)}.

+	 */

+	public void testFireAboutToSaveEvent() {

+		FakeSaveEventListener listener = new FakeSaveEventListener();

+		

+		eventProvider.addAboutToDoSaveListener(listener);

+		DoSaveEvent event = new FakeSaveEvent(); 

+		eventProvider.fireAboutToDoSaveEvent(event);

+		

+		assertTrue("event received", listener.isEventReceived(event) );

+	}

+

+	/**

+	 * Test method for {@link org.eclipse.papyrus.core.lifecycleevents.LifeCycleEventsProvider#fireAboutToDoSaveAsEvent(org.eclipse.papyrus.core.lifecycleevents.DoSaveEvent)}.

+	 */

+	public void testFireAboutToSaveAsEvent() {

+		FakeSaveEventListener listener = new FakeSaveEventListener();

+		

+		eventProvider.addAboutToDoSaveListener(listener);

+		DoSaveEvent event = new FakeSaveEvent(); 

+		eventProvider.fireAboutToDoSaveAsEvent(event);

+		

+		assertTrue("event received", listener.isEventReceived(event) );

+	}

+

+	/**

+	 * Test method for {@link org.eclipse.papyrus.core.lifecycleevents.LifeCycleEventsProvider#fireDoSaveEvent(org.eclipse.papyrus.core.lifecycleevents.DoSaveEvent)}.

+	 */

+	public void testFireSaveEvent() {

+		FakeSaveEventListener listener = new FakeSaveEventListener();

+		

+		eventProvider.addDoSaveListener(listener);

+		DoSaveEvent event = new FakeSaveEvent(); 

+		eventProvider.fireDoSaveEvent(event);

+		

+		assertTrue("event received", listener.isEventReceived(event) );

+	}

+

+	/**

+	 * Test method for {@link org.eclipse.papyrus.core.lifecycleevents.LifeCycleEventsProvider#fireDoSaveAsEvent(org.eclipse.papyrus.core.lifecycleevents.DoSaveEvent)}.

+	 */

+	public void testFireSaveAsEvent() {

+		FakeSaveEventListener listener = new FakeSaveEventListener();

+		

+		eventProvider.addDoSaveListener(listener);

+		DoSaveEvent event = new FakeSaveEvent(); 

+		eventProvider.fireDoSaveAsEvent(event);

+		

+		assertTrue("event received", listener.isEventReceived(event) );

+	}

+

+	/**

+	 * Test method for {@link org.eclipse.papyrus.core.lifecycleevents.LifeCycleEventsProvider#firePostDoSaveEvent(org.eclipse.papyrus.core.lifecycleevents.DoSaveEvent)}.

+	 */

+	public void testFirePostSaveEvent() {

+		FakeSaveEventListener listener = new FakeSaveEventListener();

+		

+		eventProvider.addPostDoSaveListener(listener);

+		DoSaveEvent event = new FakeSaveEvent(); 

+		eventProvider.firePostDoSaveEvent(event);

+		

+		assertTrue("event received", listener.isEventReceived(event) );

+	}

+

+	/**

+	 * Test method for {@link org.eclipse.papyrus.core.lifecycleevents.LifeCycleEventsProvider#firePostDoSaveAsEvent(org.eclipse.papyrus.core.lifecycleevents.DoSaveEvent)}.

+	 */

+	public void testFirePostSaveAsEvent() {

+		FakeSaveEventListener listener = new FakeSaveEventListener();

+		

+		eventProvider.addPostDoSaveListener(listener);

+		DoSaveEvent event = new FakeSaveEvent(); 

+		eventProvider.firePostDoSaveAsEvent(event);

+		

+		assertTrue("event received", listener.isEventReceived(event) );

+	}

+

+	/**

+	 * Test method for {@link org.eclipse.papyrus.core.lifecycleevents.LifeCycleEventsProvider#fireAllDoSaveEvent(org.eclipse.papyrus.core.lifecycleevents.DoSaveEvent)}.

+	 */

+	public void testFireAllSaveEvent() {

+		FakeSaveEventListener preListener = new FakeSaveEventListener();

+		FakeSaveEventListener listener = new FakeSaveEventListener();

+		FakeSaveEventListener postListener = new FakeSaveEventListener();

+		

+		eventProvider.addAboutToDoSaveListener(preListener);

+		eventProvider.addDoSaveListener(listener);

+		eventProvider.addPostDoSaveListener(postListener);

+		

+		DoSaveEvent event = new FakeSaveEvent(); 

+		eventProvider.fireAllDoSaveEvent(event);

+		

+		assertTrue("event received", preListener.isEventReceived(event) );

+		assertTrue("event received", listener.isEventReceived(event) );

+		assertTrue("event received", postListener.isEventReceived(event) );

+	}

+

+	/**

+	 * Test method for {@link org.eclipse.papyrus.core.lifecycleevents.LifeCycleEventsProvider#fireAllDoSaveAsEvent(org.eclipse.papyrus.core.lifecycleevents.DoSaveEvent)}.

+	 */

+	public void testFireAllSaveAsEvent() {

+		FakeSaveEventListener preListener = new FakeSaveEventListener();

+		FakeSaveEventListener listener = new FakeSaveEventListener();

+		FakeSaveEventListener postListener = new FakeSaveEventListener();

+		

+		eventProvider.addAboutToDoSaveListener(preListener);

+		eventProvider.addDoSaveListener(listener);

+		eventProvider.addPostDoSaveListener(postListener);

+		

+		DoSaveEvent event = new FakeSaveEvent(); 

+		eventProvider.fireAllDoSaveAsEvent(event);

+		

+		assertTrue("event received", preListener.isEventReceived(event) );

+		assertTrue("event received", listener.isEventReceived(event) );

+		assertTrue("event received", postListener.isEventReceived(event) );

+	}

+

+}

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/lifecycleevents/SaveAndDirtyServiceTest.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/lifecycleevents/SaveAndDirtyServiceTest.java
new file mode 100644
index 00000000000..8fcd273c236
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/lifecycleevents/SaveAndDirtyServiceTest.java
@@ -0,0 +1,100 @@
+/*****************************************************************************

+ * Copyright (c) 2010 LIFL & CEA LIST.

+ *

+ *    

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Cedric Dumoulin (LIFL) cedric.dumoulin@lifl.fr - Initial API and implementation

+ *

+ *****************************************************************************/

+

+package org.eclipse.papyrus.core.lifecycleevents;

+

+import static org.junit.Assert.*;

+

+import org.junit.After;

+import org.junit.Before;

+import org.junit.Test;

+

+

+/**

+ * @author dumoulin

+ *

+ */

+public class SaveAndDirtyServiceTest {

+

+	/**

+	 * @throws java.lang.Exception

+	 */

+	@Before

+	public void setUp() throws Exception {

+	}

+

+	/**

+	 * @throws java.lang.Exception

+	 */

+	@After

+	public void tearDown() throws Exception {

+	}

+

+	/**

+	 * Test method for {@link org.eclipse.papyrus.core.lifecycleevents.SaveAndDirtyService#doSave(org.eclipse.core.runtime.IProgressMonitor)}.

+	 */

+	@Test

+	public void testDoSave() {

+		fail("Not yet implemented");

+	}

+

+	/**

+	 * Test method for {@link org.eclipse.papyrus.core.lifecycleevents.SaveAndDirtyService#doSaveAs()}.

+	 */

+	@Test

+	public void testDoSaveAs() {

+		fail("Not yet implemented");

+	}

+

+	/**

+	 * Test method for {@link org.eclipse.papyrus.core.lifecycleevents.SaveAndDirtyService#isDirty()}.

+	 */

+	@Test

+	public void testIsDirty() {

+		fail("Not yet implemented");

+	}

+

+	/**

+	 * Test method for {@link org.eclipse.papyrus.core.lifecycleevents.SaveAndDirtyService#isSaveAsAllowed()}.

+	 */

+	@Test

+	public void testIsSaveAsAllowed() {

+		fail("Not yet implemented");

+	}

+

+	/**

+	 * Test method for {@link org.eclipse.papyrus.core.lifecycleevents.SaveAndDirtyService#isSaveOnCloseNeeded()}.

+	 */

+	@Test

+	public void testIsSaveOnCloseNeeded() {

+		fail("Not yet implemented");

+	}

+

+	/**

+	 * Test method for {@link org.eclipse.papyrus.core.lifecycleevents.SaveAndDirtyService#registerIsaveablePart(org.eclipse.ui.ISaveablePart)}.

+	 */

+	@Test

+	public void testRegisterIsaveablePart() {

+		fail("Not yet implemented");

+	}

+

+	/**

+	 * Test method for {@link org.eclipse.papyrus.core.lifecycleevents.SaveAndDirtyService#removeIsaveablePart(org.eclipse.ui.ISaveablePart)}.

+	 */

+	@Test

+	public void testRemoveIsaveablePart() {

+		fail("Not yet implemented");

+	}

+

+}

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/services/ComposedServiceTest.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/services/ComposedServiceTest.java
new file mode 100644
index 00000000000..5a331e62383
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/services/ComposedServiceTest.java
@@ -0,0 +1,139 @@
+package org.eclipse.papyrus.core.services;

+

+import static org.junit.Assert.*;

+

+import java.util.List;

+

+import org.eclipse.papyrus.core.services.ServiceDescriptor;

+import org.eclipse.papyrus.core.services.ServiceException;

+import org.eclipse.papyrus.core.services.ServiceStartKind;

+import org.eclipse.papyrus.core.services.ServicesRegistry;

+import org.junit.After;

+import org.junit.Before;

+import org.junit.Test;

+

+

+public class ComposedServiceTest {

+

+	private FakeComposedService masterService;

+	

+	

+	@Before

+	public void setUp() throws Exception {

+		masterService = new FakeComposedService();

+	}

+

+	@After

+	public void tearDown() throws Exception {

+	}

+

+	@Test

+	public void testAddServicePart() {

+		FakeComposedServicePartA partA = new FakeComposedServicePartA();

+		FakeComposedServicePartB partB = new FakeComposedServicePartB();

+		

+		masterService.addServicePart(partA);

+		masterService.addServicePart(partB);

+		

+		List<?> addedParts = masterService.getRegisteredServices();

+		

+		assertTrue("service contains partA", addedParts.contains(partA));

+		assertTrue("service contains partB", addedParts.contains(partB));

+	}

+

+	@Test

+	public void testRemoveServicePart() {

+		FakeComposedServicePartA partA = new FakeComposedServicePartA();

+		FakeComposedServicePartB partB = new FakeComposedServicePartB();

+		

+		masterService.addServicePart(partA);

+		masterService.addServicePart(partB);

+		

+		List<?> addedParts = masterService.getRegisteredServices();

+		

+		assertTrue("service contains partA", addedParts.contains(partA));

+		assertTrue("service contains partB", addedParts.contains(partB));

+		

+		masterService.removeServicePart(partA);

+		assertFalse("service contains partA", addedParts.contains(partA));

+		assertTrue("service contains partB", addedParts.contains(partB));

+		

+	}

+

+	/**

+	 * Test that the parts registered to the ServiceRegistry are automaticly

+	 * registered to there associated main service when registry is started.

+	 * @throws ServiceException 

+	 */

+	@Test

+	public void testPartAutomaticRegistration() throws ServiceException {

+		

+		ServicesRegistry serviceRegistry = new ServicesRegistry();

+		

+		// Register services

+		serviceRegistry.add(new ComposedServiceDescriptor());

+		serviceRegistry.add(new ServicePartADescriptor());

+		serviceRegistry.add(new ServicePartBDescriptor());

+		

+		// start registry

+		serviceRegistry.startRegistry();

+		

+		// Check if connected

+		FakeComposedService masterService = serviceRegistry.getService(FakeComposedService.class);

+		FakeComposedServicePartA partA = serviceRegistry.getService( FakeComposedServicePartA.class);

+		FakeComposedServicePartB partB = serviceRegistry.getService( FakeComposedServicePartB.class);

+		

+		List<?> addedParts = masterService.getRegisteredServices();

+		

+		assertNotNull("master service found", masterService);

+		assertTrue("service contains partA", addedParts.contains(partA));

+		assertTrue("service contains partB", addedParts.contains(partB));

+		

+		

+	}

+

+	

+	/* ***************************** */

+	

+	/**

+	 * A descriptor

+	 * @author dumoulin

+	 *

+	 */

+	public class ServicePartADescriptor extends ServiceDescriptor {

+

+

+		public ServicePartADescriptor() {

+			super(FakeComposedServicePartA.class, FakeComposedServicePartA.class.getName(), ServiceStartKind.STARTUP, 1);

+		}

+	}

+

+	

+	/**

+	 * A descriptor

+	 * @author dumoulin

+	 *

+	 */

+	public class ServicePartBDescriptor extends ServiceDescriptor {

+

+

+		public ServicePartBDescriptor() {

+			super(FakeComposedServicePartB.class, FakeComposedServicePartB.class.getName(), ServiceStartKind.STARTUP, 1);

+		}

+	}

+

+	/**

+	 * A descriptor

+	 * @author dumoulin

+	 *

+	 */

+	public class ComposedServiceDescriptor extends ServiceDescriptor {

+

+

+		public ComposedServiceDescriptor() {

+			super(FakeComposedService.class, FakeComposedService.class.getName(), ServiceStartKind.STARTUP, 1);

+		}

+	}

+

+	

+}

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/services/FakeComposedService.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/services/FakeComposedService.java
new file mode 100644
index 00000000000..af3b9953870
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/services/FakeComposedService.java
@@ -0,0 +1,49 @@
+/**

+ * 

+ */

+package org.eclipse.papyrus.core.services;

+

+import org.eclipse.papyrus.core.services.ComposedService;

+import org.eclipse.papyrus.core.services.ServiceException;

+import org.eclipse.papyrus.core.services.ServicesRegistry;

+

+

+

+/**

+ * A fake composed service for testing purpose.

+ * 

+ * @author cedric dumoulin

+ *

+ */

+public class FakeComposedService extends ComposedService<FakeComposedServicePart> {

+

+	/**

+	 * Call the same method on all associated service parts.

+	 */

+	public void walkService() {

+		

+		for( FakeComposedServicePart servicePart : serviceParts )

+		{

+			servicePart.walkService();

+		}

+	}

+

+	@Override

+	public void init(ServicesRegistry servicesRegistry) throws ServiceException {

+		// TODO Auto-generated method stub

+		

+	}

+

+	@Override

+	public void startService() throws ServiceException {

+		// TODO Auto-generated method stub

+		

+	}

+

+	@Override

+	public void disposeService() throws ServiceException {

+		// TODO Auto-generated method stub

+		

+	}

+	

+}

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/services/FakeComposedServicePart.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/services/FakeComposedServicePart.java
new file mode 100644
index 00000000000..2bef4af6870
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/services/FakeComposedServicePart.java
@@ -0,0 +1,28 @@
+/**

+ * 

+ */

+package org.eclipse.papyrus.core.services;

+

+import org.eclipse.papyrus.core.services.ComposedServicePart;

+

+

+/**

+ * A fake composed service part for testing purpose.

+ * @author cedric dumoulin

+ *

+ */

+public class FakeComposedServicePart extends ComposedServicePart<FakeComposedService> {

+

+	

+	public FakeComposedServicePart() {

+		super(FakeComposedService.class);

+	}

+

+	/**

+	 * A common method.

+	 */

+	public void walkService() {

+		// TODO Auto-generated method stub

+		

+	}

+}

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/services/FakeComposedServicePartA.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/services/FakeComposedServicePartA.java
new file mode 100644
index 00000000000..b079ae71848
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/services/FakeComposedServicePartA.java
@@ -0,0 +1,13 @@
+/**

+ * 

+ */

+package org.eclipse.papyrus.core.services;

+

+

+/**

+ * @author dumoulin

+ *

+ */

+public class FakeComposedServicePartA extends FakeComposedServicePart {

+

+}

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/services/FakeComposedServicePartB.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/services/FakeComposedServicePartB.java
new file mode 100644
index 00000000000..a22bfbb3ab6
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/services/FakeComposedServicePartB.java
@@ -0,0 +1,13 @@
+/**

+ * 

+ */

+package org.eclipse.papyrus.core.services;

+

+

+/**

+ * @author dumoulin

+ *

+ */

+public class FakeComposedServicePartB extends FakeComposedServicePart {

+

+}

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/services/FakeService.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/services/FakeService.java
new file mode 100644
index 00000000000..85df0d40751
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/services/FakeService.java
@@ -0,0 +1,77 @@
+package org.eclipse.papyrus.core.services;

+

+import org.eclipse.papyrus.core.services.IService;

+import org.eclipse.papyrus.core.services.ServicesRegistry;

+

+

+/**

+ * Fake service for testing purpose.

+ * 

+ * @author cedric dumoulin

+ *

+ */

+public class FakeService implements IService {

+

+

+	static public TestTrace trace = new TestTrace();

+

+	static int count = 0;

+	

+	public String name = "name" + count++;

+	

+	

+	/**

+	 * 

+	 * Constructor.

+	 *

+	 */

+	public FakeService() {

+		trace.addTrace(name, "create");

+	}

+	

+	/**

+	 * Constructor.

+	 *

+	 * @param name

+	 */

+	public FakeService(String name) {

+		this.name = name;

+		trace.addTrace(name, "create");

+	}

+

+	

+	/**

+	 * @return the name

+	 */

+	public String getName() {

+		return name;

+	}

+

+	/**

+	 * @return the trace

+	 */

+	static public TestTrace getTrace() {

+		return trace;

+	}

+

+	

+	/**

+	 * @param trace the trace to set

+	 */

+	public void setTrace(TestTrace trace) {

+		this.trace = trace;

+	}

+

+	public void init(ServicesRegistry servicesRegistry) {

+		trace.addTrace(name, "init", servicesRegistry);

+	}

+

+	public void startService() {

+		trace.addTrace(name, "start");

+	}

+

+	public void disposeService() {

+		trace.addTrace(name, "dispose");

+	}

+

+}

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/services/FakeServiceFactory.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/services/FakeServiceFactory.java
new file mode 100644
index 00000000000..ab4dc4865cd
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/services/FakeServiceFactory.java
@@ -0,0 +1,67 @@
+package org.eclipse.papyrus.core.services;

+

+import org.eclipse.papyrus.core.services.IServiceFactory;

+

+

+/**

+ * Fake service factory for testing purpose.

+ * 

+ * @author cedric dumoulin

+ *

+ */

+public class FakeServiceFactory extends FakeService implements IServiceFactory {

+

+

+	/**

+	 * 

+	 * Constructor.

+	 *

+	 */

+	public FakeServiceFactory() {

+

+		super( "factoryName" + count++ );

+	}

+	

+	/**

+	 * Constructor.

+	 *

+	 * @param name

+	 */

+	public FakeServiceFactory(String name) {

+		super(name);

+	}

+

+	

+	/**

+	 * @return the name

+	 */

+	public String getName() {

+		return name;

+	}

+

+	/**

+	 * Create the service

+	 * @see org.eclipse.papyrus.core.services.IServiceFactory#createServiceInstance()

+	 *

+	 * @return

+	 */

+	public Object createServiceInstance() {

+		trace.addTrace(getName(), "createInstance");

+		return new FakeCreatedService();

+	}

+

+	/**

+	 * Pseudo service created by the factory.

+	 * @author dumoulin

+	 *

+	 */

+	public class FakeCreatedService {

+		

+		/**

+		 * @return the name

+		 */

+		public String getName() {

+			return name;

+		}		

+	}

+}

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/services/FakeWithRequiredServiceFactory.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/services/FakeWithRequiredServiceFactory.java
new file mode 100644
index 00000000000..b68491b40ad
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/services/FakeWithRequiredServiceFactory.java
@@ -0,0 +1,57 @@
+package org.eclipse.papyrus.core.services;

+

+import org.eclipse.papyrus.core.services.IServiceFactory;

+import org.eclipse.papyrus.core.services.ServiceException;

+import org.eclipse.papyrus.core.services.ServicesRegistry;

+

+

+/**

+ * Fake service factory for testing purpose.

+ * This service require the 

+ * 

+ * @author cedric dumoulin

+ *

+ */

+public class FakeWithRequiredServiceFactory extends FakeServiceFactory implements IServiceFactory {

+

+

+	/**

+	 * 

+	 * Constructor.

+	 *

+	 */

+	public FakeWithRequiredServiceFactory() {

+

+		super( "factoryName" + count++ );

+	}

+	

+	/**

+	 * Constructor.

+	 *

+	 * @param name

+	 */

+	public FakeWithRequiredServiceFactory(String name) {

+		super(name);

+	}

+

+	

+	/**

+	 * 

+	 * @see org.eclipse.papyrus.core.services.FakeService#init(org.eclipse.papyrus.core.services.ServicesRegistry)

+	 *

+	 * @param servicesRegistry

+	 */

+	@Override

+	public void init(ServicesRegistry servicesRegistry) {

+		

+		trace.addTrace(name, "init");

+		Object foundService = null;

+		try {

+			foundService = servicesRegistry.getService("C");

+		} catch (ServiceException e) {

+			// TODO Auto-generated catch block

+			e.printStackTrace();

+		}

+		trace.addTrace(name, "initEnd", foundService);

+	}

+}

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/services/ServiceA.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/services/ServiceA.java
new file mode 100644
index 00000000000..5626b492453
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/services/ServiceA.java
@@ -0,0 +1,52 @@
+package org.eclipse.papyrus.core.services;

+

+import java.util.ArrayList;

+import java.util.List;

+

+import org.eclipse.papyrus.core.services.IService;

+import org.eclipse.papyrus.core.services.ServicesRegistry;

+

+public class ServiceA implements IService {

+

+	public enum TraceKind {

+		init, start, dispose

+	};

+

+	static List<TraceKind> trace = new ArrayList<TraceKind>();

+

+	static List<String> nametrace = new ArrayList<String>();

+

+

+

+	static public TraceKind getEvent(int index) {

+		return trace.get(index);

+	}

+

+	static public String getTraceName(int index) {

+		return nametrace.get(index);

+	}

+

+	static public void resetTrace() {

+		trace.clear();

+		nametrace.clear();

+	}

+

+	public void init(ServicesRegistry servicesRegistry) {

+		trace.add(TraceKind.init);

+		nametrace.add(this.getClass().getSimpleName());

+

+	}

+

+	public void startService() {

+		trace.add(TraceKind.start);

+		nametrace.add(this.getClass().getSimpleName());

+

+	}

+

+	public void disposeService() {

+		trace.add(TraceKind.dispose);

+		nametrace.add(this.getClass().getSimpleName());

+

+	}

+

+}

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/services/ServiceA10.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/services/ServiceA10.java
new file mode 100644
index 00000000000..a36eb59ce2f
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/services/ServiceA10.java
@@ -0,0 +1,6 @@
+package org.eclipse.papyrus.core.services;

+

+

+public class ServiceA10 extends ServiceA {

+

+}

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/services/ServiceB.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/services/ServiceB.java
new file mode 100644
index 00000000000..c8db40311b6
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/services/ServiceB.java
@@ -0,0 +1,6 @@
+package org.eclipse.papyrus.core.services;

+

+

+public class ServiceB extends ServiceA {

+

+}

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/services/ServiceC.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/services/ServiceC.java
new file mode 100644
index 00000000000..31276d53126
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/services/ServiceC.java
@@ -0,0 +1,6 @@
+package org.eclipse.papyrus.core.services;

+

+

+public class ServiceC extends ServiceA {

+

+}

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/services/ServicePojoA.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/services/ServicePojoA.java
new file mode 100644
index 00000000000..5602c3c6e12
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/services/ServicePojoA.java
@@ -0,0 +1,6 @@
+package org.eclipse.papyrus.core.services;

+

+

+public class ServicePojoA extends ServiceA {

+

+}

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/services/ServicesRegistryTest.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/services/ServicesRegistryTest.java
new file mode 100644
index 00000000000..f57f57d7afd
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/services/ServicesRegistryTest.java
@@ -0,0 +1,741 @@
+/**

+ * 

+ */

+package org.eclipse.papyrus.core.services;

+

+import java.util.Arrays;

+import java.util.List;

+

+import junit.framework.TestCase;

+

+import org.eclipse.papyrus.core.services.IService;

+import org.eclipse.papyrus.core.services.ServiceDescriptor;

+import org.eclipse.papyrus.core.services.ServiceException;

+import org.eclipse.papyrus.core.services.ServiceMultiException;

+import org.eclipse.papyrus.core.services.ServiceNotFoundException;

+import org.eclipse.papyrus.core.services.ServiceStartKind;

+import org.eclipse.papyrus.core.services.ServiceState;

+import org.eclipse.papyrus.core.services.ServicesRegistry;

+import org.eclipse.papyrus.core.services.FakeServiceFactory.FakeCreatedService;

+import org.eclipse.papyrus.core.services.ServiceA.TraceKind;

+

+

+/**

+ * @author dumoulin

+ * 

+ */

+public class ServicesRegistryTest extends TestCase {

+

+	/** The registry to test */

+	ServicesRegistry servicesRegistry;

+

+	ServiceDescriptor serviceADesc = new LazyServiceADescriptor();

+

+	ServiceDescriptor serviceA10Desc = new LazyServiceA10Descriptor();

+

+	ServiceDescriptor serviceBDesc = new LazyServiceBDescriptor();

+

+	ServiceDescriptor serviceCDesc = new ServiceCDescriptor();

+

+	ServiceDescriptor servicePojoADesc = new LazyServicePojoADescriptor();

+

+	public ServicesRegistryTest(String name) {

+		super(name);

+	}

+

+	/**

+	 * @throws java.lang.Exception

+	 */

+	protected void setUp() throws Exception {

+		servicesRegistry = new ServicesRegistry();

+	}

+

+	/**

+	 * @throws java.lang.Exception

+	 */

+	protected void tearDown() throws Exception {

+	}

+

+	/**

+	 * Test method for {@link org.eclipse.papyrus.core.services.ServicesRegistry#add(org.eclipse.papyrus.core.services.ServiceDescriptor)} .

+	 * @throws ServiceMultiException 

+	 */

+	public void testAdd() throws ServiceMultiException {

+

+		servicesRegistry.add(serviceADesc);

+		servicesRegistry.add(serviceBDesc);

+		servicesRegistry.add(serviceCDesc);

+		servicesRegistry.add(servicePojoADesc);

+

+		// Test entries creation

+//		try {

+//			assertFalse("serviceA stopped", servicesRegistry.isStarted(serviceADesc.getKey()));

+//			assertFalse("serviceB stopped", servicesRegistry.isStarted(serviceBDesc.getKey()));

+//			assertFalse("serviceC stopped", servicesRegistry.isStarted(serviceCDesc.getKey()));

+//			assertFalse("servicePojoA stopped", servicesRegistry.isStarted(servicePojoADesc.getKey()));

+//		} catch (ServiceNotFoundException e) {

+//			fail("Service should exist." + e.getMessage());

+//		}

+

+		// Test startup

+		servicesRegistry.startRegistry();

+

+		// Test always started

+		try {

+			assertFalse("serviceA stopped", servicesRegistry.isStarted(serviceADesc.getKey()));

+			assertFalse("serviceB stopped", servicesRegistry.isStarted(serviceBDesc.getKey()));

+			assertEquals("serviceC state", ServiceState.started, servicesRegistry.serviceState(serviceCDesc.getKey()));

+			assertTrue("serviceC started", servicesRegistry.isStarted(serviceCDesc.getKey()));

+			assertFalse("servicePojoA stopped", servicesRegistry.isStarted(servicePojoADesc.getKey()));

+		} catch (ServiceNotFoundException e) {

+			fail("Service should exist.");

+		}

+

+

+	}

+

+	/**

+	 * Test method for {@link org.eclipse.papyrus.core.services.ServicesRegistry#getService(java.lang.Object)}.

+	 * 

+	 * @throws ServiceException

+	 */

+	public void testGetService() throws ServiceException {

+		servicesRegistry.add(serviceADesc);

+		servicesRegistry.add(serviceBDesc);

+		servicesRegistry.add(serviceCDesc);

+		servicesRegistry.add(servicePojoADesc);

+

+

+		servicesRegistry.startRegistry();

+		

+		// Test lazy service

+		Object serviceA = servicesRegistry.getService(serviceADesc.getKey());

+		assertNotNull("service created", serviceA);

+		assertEquals("right class", ServiceA.class, serviceA.getClass());

+

+		Object serviceA2 = servicesRegistry.getService(serviceADesc.getKey());

+		assertEquals("Second retrieve get the same service", serviceA, serviceA2);

+

+		// test startup service

+		Object serviceC = servicesRegistry.getService(serviceCDesc.getKey());

+		assertNotNull("service created", serviceC);

+		assertEquals("right class", ServiceC.class, serviceC.getClass());

+

+		Object serviceC2 = servicesRegistry.getService(serviceCDesc.getKey());

+		assertEquals("Second retrieve get the same service", serviceC, serviceC2);

+

+		// test pojo service

+		Object servicePojo = servicesRegistry.getService(servicePojoADesc.getKey());

+		assertNotNull("service created", servicePojo);

+		assertEquals("right class", ServicePojoA.class, servicePojo.getClass());

+

+		Object servicePojo2 = servicesRegistry.getService(servicePojoADesc.getKey());

+		assertEquals("Second retrieve get the same service", servicePojo, servicePojo2);

+

+

+	}

+

+	/**

+	 * Test method for {@link org.eclipse.papyrus.core.services.ServicesRegistry#getService(java.lang.Object)}.

+	 * 

+	 * @throws ServiceException

+	 */

+	public void testGetServiceByClass() throws ServiceException {

+		servicesRegistry.add(serviceADesc);

+		servicesRegistry.add(serviceBDesc);

+		servicesRegistry.add(serviceCDesc);

+		servicesRegistry.add(servicePojoADesc);

+

+

+		servicesRegistry.startRegistry();

+		

+		// Test lazy service

+		ServiceA serviceA = servicesRegistry.getService(ServiceA.class);

+		assertNotNull("service created", serviceA);

+		assertEquals("right class", ServiceA.class, serviceA.getClass());

+

+		ServiceA serviceA2 = servicesRegistry.getService(ServiceA.class);

+		assertEquals("Second retrieve get the same service", serviceA, serviceA2);

+

+		// test startup service

+		ServiceC serviceC = servicesRegistry.getService(ServiceC.class);

+		assertNotNull("service created", serviceC);

+		assertEquals("right class", ServiceC.class, serviceC.getClass());

+

+		// test pojo service

+		ServicePojoA servicePojo = servicesRegistry.getService(ServicePojoA.class);

+		assertNotNull("service created", servicePojo);

+		assertEquals("right class", ServicePojoA.class, servicePojo.getClass());

+

+		Object servicePojo2 = servicesRegistry.getService(ServicePojoA.class);

+		assertEquals("Second retrieve get the same service", servicePojo, servicePojo2);

+

+

+	}

+

+	/**

+	 * Try to register 2 services under the same name, but with different priorities.

+	 * 

+	 * @throws ServiceException

+	 */

+	public void testPriority() throws ServiceException {

+		servicesRegistry.add(serviceADesc);

+		servicesRegistry.add(serviceA10Desc);

+		servicesRegistry.add(serviceBDesc);

+

+		// Test creation

+//		try {

+//			assertFalse("serviceA stopped", servicesRegistry.isStarted(serviceADesc.getKey()));

+//			assertFalse("serviceB stopped", servicesRegistry.isStarted(serviceBDesc.getKey()));

+//		} catch (ServiceNotFoundException e) {

+//			fail("Service should exist.");

+//		}

+

+		servicesRegistry.startRegistry();

+		

+		Object serviceA = servicesRegistry.getService(serviceADesc.getKey());

+

+		assertNotNull("Service created", serviceA);

+		assertEquals("right class", ServiceA10.class, serviceA.getClass());

+

+

+	}

+

+	/**

+	 * Test add for a direct instance of service.

+	 * 

+	 * @throws ServiceException

+	 */

+	public void testAddDirectInstance() throws ServiceException {

+		IService instanciatedService = new ServiceA();

+		String key = instanciatedService.getClass().getName();

+

+		servicesRegistry.add(key, 1, instanciatedService);

+

+		servicesRegistry.add(serviceCDesc);

+		servicesRegistry.add(serviceBDesc);

+

+		servicesRegistry.startRegistry();

+

+		Object serviceA = servicesRegistry.getService(key);

+

+		assertNotNull("Service created", serviceA);

+		assertEquals("right object", instanciatedService, serviceA);

+		assertEquals("right class", ServiceA.class, serviceA.getClass());

+

+

+	}

+

+	/**

+	 * Test life cycle for directly registered services

+	 * @throws ServiceException

+	 */

+	public void testCallsOrder() throws ServiceException {

+		// Register services as STARTUP !

+		servicesRegistry.add(ServiceA.class, 1, new ServiceA() );

+		// Lazy - generate no trace

+		servicesRegistry.add(ServiceB.class, 1, new ServiceB(), ServiceStartKind.LAZY);

+		servicesRegistry.add(ServiceC.class, 1, new ServiceC());

+		servicesRegistry.add(ServicePojoA.class, 1, new ServicePojoA());

+		

+

+		ServiceA.resetTrace();

+		servicesRegistry.startRegistry();

+		

+		// Check orders

+		// 

+		int i=0;

+		assertEquals("service", TraceKind.init, ServiceA.getEvent(i++));

+		assertEquals("service", TraceKind.init, ServiceA.getEvent(i++));

+		assertEquals("service", TraceKind.init, ServiceA.getEvent(i++));

+//		assertEquals("service", TraceKind.init, ServiceA.getEvent(i++));

+		

+		assertEquals("service", TraceKind.start, ServiceA.getEvent(i++));

+		assertEquals("service", TraceKind.start, ServiceA.getEvent(i++));

+		assertEquals("service", TraceKind.start, ServiceA.getEvent(i++));

+//		assertEquals("service", TraceKind.start, ServiceA.getEvent(i++));

+		

+		// Now, start lazy service

+		ServiceB service = servicesRegistry.getService(ServiceB.class);

+		assertNotNull("service found", service);

+		assertEquals("service", TraceKind.init, ServiceA.getEvent(i++));

+		assertEquals("service", TraceKind.start, ServiceA.getEvent(i++));

+			

+		

+		// Check dispose

+		servicesRegistry.disposeRegistry();

+		assertEquals("service", TraceKind.dispose, ServiceA.getEvent(i++));

+		assertEquals("service", TraceKind.dispose, ServiceA.getEvent(i++));

+		assertEquals("service", TraceKind.dispose, ServiceA.getEvent(i++));

+//		assertEquals("service", TraceKind.dispose, ServiceA.getEvent(i++));

+		

+		// 

+	}

+	

+	/**

+	 * Test life cycle for   services registered wih descriptors

+	 * @throws ServiceException

+	 */

+	public void testCallsOrderForDescriptors() throws ServiceException {

+		// Register services as STARTUP !

+		// Lazy - generate no trace

+		servicesRegistry.add( new LazyServiceBDescriptor() );

+		servicesRegistry.add( new ServiceCDescriptor());

+		

+

+		ServiceA.resetTrace();

+		servicesRegistry.startRegistry();

+

+		// Check orders

+		// 

+		int i=0;

+		assertEquals("service", TraceKind.init, ServiceA.getEvent(i++));

+//		assertEquals("service", TraceKind.init, ServiceA.getEvent(i++));

+		

+		assertEquals("service", TraceKind.start, ServiceA.getEvent(i++));

+//		assertEquals("service", TraceKind.start, ServiceA.getEvent(i++));

+		

+		// Now, start lazy service

+		ServiceB service = (ServiceB)servicesRegistry.getService(ServiceB.class.getName());

+		assertNotNull("service found", service);

+		assertEquals("service", TraceKind.init, ServiceA.getEvent(i++));

+		assertEquals("service", TraceKind.start, ServiceA.getEvent(i++));

+			

+		

+		// Check dispose

+		servicesRegistry.disposeRegistry();

+		assertEquals("service", TraceKind.dispose, ServiceA.getEvent(i++));

+		assertEquals("service", TraceKind.dispose, ServiceA.getEvent(i++));

+//		assertEquals("service", TraceKind.dispose, ServiceA.getEvent(i++));

+		

+		// 

+	}

+	

+	/**

+	 * Test the start order for services of type Start et Service

+	 * @throws ServiceException

+	 */

+	public void testStartDependantOrder() throws ServiceException {

+		

+		String A = "A";

+		String B = "B";

+		String C = "C";

+		String D = "D";

+		String E = "E";

+//		String F = "F";

+		

+		// Create services E --> D --> C --> B --> A

+		FakeService.getTrace().reset();

+		

+		servicesRegistry.add( new ServiceDesc( E, ServiceStartKind.STARTUP, Arrays.asList(D) ));

+		servicesRegistry.add( new ServiceDesc( D, ServiceStartKind.STARTUP, Arrays.asList(C) ));

+		servicesRegistry.add( new ServiceDesc( C, ServiceStartKind.STARTUP, Arrays.asList(B) ));

+		servicesRegistry.add( new ServiceDesc( B, ServiceStartKind.STARTUP, Arrays.asList(A) ));

+		servicesRegistry.add( new ServiceDesc( A, ServiceStartKind.STARTUP ));

+//		servicesRegistry.add( new ServiceDesc( F, ServiceStartKind.STARTUP, Arrays.asList(E) ));

+		

+		// Start services

+		servicesRegistry.startRegistry();

+		

+		// check services

+		assertTrue("service started", servicesRegistry.isStarted(A));

+		assertTrue("service started", servicesRegistry.isStarted(B));

+		assertNotSame("services are different", servicesRegistry.getService(A), servicesRegistry.getService(B));

+

+		// Get names of created services

+		String nameA = ((FakeService)servicesRegistry.getService(A)).getName();

+		String nameB = ((FakeService)servicesRegistry.getService(B)).getName();

+		String nameC = ((FakeService)servicesRegistry.getService(C)).getName();

+		String nameD = ((FakeService)servicesRegistry.getService(D)).getName();

+		String nameE = ((FakeService)servicesRegistry.getService(E)).getName();

+//		String nameF = ((FakeService)servicesRegistry.getService(F)).getName();

+		

+		

+		// check order	(E and F order are not guaranteed)	

+		// order should be A, B, C, D, E

+		TestTrace trace = FakeService.getTrace();

+		int i = 0;

+//		assertEquals("order", nameF + ",create", trace.getNameTrace(i++));

+		assertEquals("order", nameA + ",create", trace.getNameTrace(i++));

+		assertEquals("order", nameB + ",create", trace.getNameTrace(i++));

+		assertEquals("order", nameC + ",create", trace.getNameTrace(i++));

+		assertEquals("order", nameD + ",create", trace.getNameTrace(i++));

+		assertEquals("order", nameE + ",create", trace.getNameTrace(i++));

+

+//		assertEquals("order", nameF + ",init", trace.getNameTrace(i++));

+		assertEquals("order", nameA + ",init", trace.getNameTrace(i++));

+		assertEquals("order", nameB + ",init", trace.getNameTrace(i++));

+		assertEquals("order", nameC + ",init", trace.getNameTrace(i++));

+		assertEquals("order", nameD + ",init", trace.getNameTrace(i++));

+		assertEquals("order", nameE + ",init", trace.getNameTrace(i++));

+

+//		assertEquals("order", nameF + ",start", trace.getNameTrace(i++));

+		assertEquals("order", nameA + ",start", trace.getNameTrace(i++));

+		assertEquals("order", nameB + ",start", trace.getNameTrace(i++));

+		assertEquals("order", nameC + ",start", trace.getNameTrace(i++));

+		assertEquals("order", nameD + ",start", trace.getNameTrace(i++));

+		assertEquals("order", nameE + ",start", trace.getNameTrace(i++));

+

+	}

+

+	/**

+	 * Test Service Factory creation

+	 * @throws ServiceException

+	 */

+	public void testServiceFactoryCreation() throws ServiceException {

+		

+		String A = "A";

+		String B = "B";

+		String C = "C";

+		

+		// Create services

+		FakeService.getTrace().reset();

+		

+		servicesRegistry.add( new ServiceFactoryDesc( C, ServiceStartKind.STARTUP ));

+		servicesRegistry.add( new ServiceFactoryDesc( B, ServiceStartKind.STARTUP, Arrays.asList(C) ));

+		servicesRegistry.add( new ServiceFactoryDesc( A, ServiceStartKind.STARTUP, Arrays.asList(B) ));

+		

+		// Start services

+		servicesRegistry.startRegistry();

+		

+		// check services

+		assertSame("service type", FakeCreatedService.class, servicesRegistry.getService(A).getClass());

+		assertSame("service type", FakeCreatedService.class, servicesRegistry.getService(B).getClass());

+		

+		// Get names of created services

+		String nameA = ((FakeCreatedService)servicesRegistry.getService(A)).getName();

+		String nameB = ((FakeCreatedService)servicesRegistry.getService(B)).getName();

+		String nameC = ((FakeCreatedService)servicesRegistry.getService(C)).getName();

+		

+		

+		// check order	

+		// Order should be: C, B, A

+		TestTrace trace = FakeService.getTrace();

+		int i = 0;

+		assertEquals("order", nameC + ",create", trace.getNameTrace(i++));

+		assertEquals("order", nameB + ",create", trace.getNameTrace(i++));

+		assertEquals("order", nameA + ",create", trace.getNameTrace(i++));

+

+		assertEquals("order", nameC + ",init", trace.getNameTrace(i++));

+		assertEquals("order", nameB + ",init", trace.getNameTrace(i++));

+		assertEquals("order", nameA + ",init", trace.getNameTrace(i++));

+

+		assertEquals("order", nameC + ",start", trace.getNameTrace(i++));

+		assertEquals("order", nameB + ",start", trace.getNameTrace(i++));

+		assertEquals("order", nameA + ",start", trace.getNameTrace(i++));

+

+		// next order is the order of getService()

+		assertEquals("order", nameA + ",createInstance", trace.getNameTrace(i++));

+		assertEquals("order", nameB + ",createInstance", trace.getNameTrace(i++));

+		assertEquals("order", nameC + ",createInstance", trace.getNameTrace(i++));

+	}

+

+	/**

+	 * Test Creation of Service Factory used with class as key.

+	 * @throws ServiceException

+	 */

+	public void testServiceFactoryWithClassKey() throws ServiceException {

+		

+		//

+		Class<?> A = ServiceA.class;

+		Class<?> B = ServiceB.class;

+		Class<?> C = ServiceC.class;

+		

+		// Specify service types as String

+		String serviceClassname1 = FakeServiceFactory.class.getName();;

+		String serviceClassname2 = FakeServiceFactory.class.getName();

+		String serviceClassname3 = FakeServiceFactory.class.getName();

+		

+		// Create services

+		FakeService.getTrace().reset();

+		

+		servicesRegistry.add( new ServiceFactoryDesc( C, serviceClassname3, ServiceStartKind.STARTUP ));

+		servicesRegistry.add( new ServiceFactoryDesc( B, serviceClassname2, ServiceStartKind.STARTUP , Arrays.asList(C.getName()) ));

+		servicesRegistry.add( new ServiceFactoryDesc( A, serviceClassname1, ServiceStartKind.STARTUP , Arrays.asList(B.getName()) ));

+		

+		// Start services

+		servicesRegistry.startRegistry();

+		

+		// check services

+		assertSame("service type", FakeCreatedService.class, servicesRegistry.getService(A).getClass());

+		assertSame("service type", FakeCreatedService.class, servicesRegistry.getService(B).getClass());

+		

+		// Get names of created services

+		String nameA = ((FakeCreatedService)servicesRegistry.getService(A)).getName();

+		String nameB = ((FakeCreatedService)servicesRegistry.getService(B)).getName();

+		String nameC = ((FakeCreatedService)servicesRegistry.getService(C)).getName();

+		

+		

+		// check order	(E and F order are not guaranteed)	

+		// Order should be

+		TestTrace trace = FakeService.getTrace();

+		int i = 0;

+		assertEquals("order", nameC + ",create", trace.getNameTrace(i++));

+		assertEquals("order", nameB + ",create", trace.getNameTrace(i++));

+		assertEquals("order", nameA + ",create", trace.getNameTrace(i++));

+

+		assertEquals("order", nameC + ",init", trace.getNameTrace(i++));

+		assertEquals("order", nameB + ",init", trace.getNameTrace(i++));

+		assertEquals("order", nameA + ",init", trace.getNameTrace(i++));

+

+		assertEquals("order", nameC + ",start", trace.getNameTrace(i++));

+		assertEquals("order", nameB + ",start", trace.getNameTrace(i++));

+		assertEquals("order", nameA + ",start", trace.getNameTrace(i++));

+

+		// next order is the order of getService()

+		assertEquals("order", nameA + ",createInstance", trace.getNameTrace(i++));

+		assertEquals("order", nameB + ",createInstance", trace.getNameTrace(i++));

+		assertEquals("order", nameC + ",createInstance", trace.getNameTrace(i++));

+	}

+	

+	/**

+	 * Test Service Factory creation order.

+	 * One of the factory try to get the required service from its init() method.

+	 * @throws ServiceException

+	 */

+	public void testServiceFactoryWithRequiredInInit() throws ServiceException {

+		

+		String A = "A";

+		String B = "B";

+		String C = "C";

+		

+		// Create services C --> A --> B

+		FakeService.getTrace().reset();

+		

+		// FakeWithRequiredServiceFactory try to retrieve service "C"

+		servicesRegistry.add( new ServiceFactoryDesc( B, FakeWithRequiredServiceFactory.class.getName(), ServiceStartKind.STARTUP, 1, Arrays.asList(C) ));

+		servicesRegistry.add( new ServiceFactoryDesc( A, FakeWithRequiredServiceFactory.class.getName(), ServiceStartKind.STARTUP, 1, Arrays.asList(B, C) ));

+		servicesRegistry.add( new ServiceFactoryDesc( C, FakeServiceFactory.class.getName(), ServiceStartKind.STARTUP, 1 ));

+		

+		// Start services

+		servicesRegistry.startRegistry();

+		

+		// check services

+		assertSame("service type", FakeCreatedService.class, servicesRegistry.getService(A).getClass());

+		assertSame("service type", FakeCreatedService.class, servicesRegistry.getService(B).getClass());

+		

+		// Get names of created services

+		String nameA = ((FakeCreatedService)servicesRegistry.getService(A)).getName();

+		String nameB = ((FakeCreatedService)servicesRegistry.getService(B)).getName();

+		String nameC = ((FakeCreatedService)servicesRegistry.getService(C)).getName();

+		

+		

+		// check order	

+		// Order should be: C, B, A

+		TestTrace trace = FakeService.getTrace();

+		int i = 0;

+		assertEquals("order", nameC + ",create", trace.getNameTrace(i++));

+		assertEquals("order", nameB + ",create", trace.getNameTrace(i++));

+		assertEquals("order", nameA + ",create", trace.getNameTrace(i++));

+

+		assertEquals("order", nameC + ",init", trace.getNameTrace(i++));

+		assertEquals("order", nameB + ",init", trace.getNameTrace(i++));

+		

+		assertEquals("order", nameC + ",createInstance", trace.getNameTrace(i++));

+		assertEquals("value", servicesRegistry.getService(C), trace.getValue(i));

+		assertEquals("order", nameB + ",initEnd", trace.getNameTrace(i++));

+		

+		assertEquals("order", nameA + ",init", trace.getNameTrace(i++));

+		assertEquals("order", nameA + ",initEnd", trace.getNameTrace(i++));

+

+		assertEquals("order", nameC + ",start", trace.getNameTrace(i++));

+		assertEquals("order", nameB + ",start", trace.getNameTrace(i++));

+		assertEquals("order", nameA + ",start", trace.getNameTrace(i++));

+

+		// next order is the order of getService()

+		assertEquals("order", nameA + ",createInstance", trace.getNameTrace(i++));

+//		assertEquals("order", nameB + ",createInstance", trace.getNameTrace(i++));

+//		assertEquals("order", nameC + ",createInstance", trace.getNameTrace(i++));

+	}

+

+	/**

+	 * Test  {@link ServicesRegistry#startServicesByClassKeys(List)}. 

+	 * Check that services are started.

+	 * 

+	 * @throws ServiceException

+	 */

+	public void testStartService() throws ServiceException {

+		

+		String A = "A";

+		String B = "B";

+		String C = "C";

+		String D = "D";

+		String E = "E";

+		

+		// Create services E --> D --> C --> B --> A

+		FakeService.getTrace().reset();

+		

+		servicesRegistry.add( new ServiceDesc( E, ServiceStartKind.STARTUP, Arrays.asList(D) ));

+		servicesRegistry.add( new ServiceDesc( D, ServiceStartKind.STARTUP, Arrays.asList(C) ));

+		servicesRegistry.add( new ServiceDesc( C, ServiceStartKind.STARTUP, Arrays.asList(A, B) ));

+		servicesRegistry.add( new ServiceDesc( B, ServiceStartKind.STARTUP, Arrays.asList(A) ));

+		servicesRegistry.add( new ServiceDesc( A, ServiceStartKind.STARTUP ));

+		

+		// Start services

+		servicesRegistry.startServices(Arrays.asList(C));

+		

+		// check services

+		assertTrue("service started", servicesRegistry.isStarted(A));

+		assertTrue("service started", servicesRegistry.isStarted(B));

+		assertTrue("service started", servicesRegistry.isStarted(C));

+

+		// Get names of created services

+		String nameA = ((FakeService)servicesRegistry.getService(A)).getName();

+		String nameB = ((FakeService)servicesRegistry.getService(B)).getName();

+		String nameC = ((FakeService)servicesRegistry.getService(C)).getName();

+//		String nameD = ((FakeService)servicesRegistry.getService(D)).getName();

+//		String nameE = ((FakeService)servicesRegistry.getService(E)).getName();

+//		String nameF = ((FakeService)servicesRegistry.getService(F)).getName();

+		

+		

+		// check order	(E and F order are not guaranteed)	

+		// order should be A, B, C

+		TestTrace trace = FakeService.getTrace();

+		int i = 0;

+		assertEquals("order", nameA + ",create", trace.getNameTrace(i++));

+		assertEquals("order", nameB + ",create", trace.getNameTrace(i++));

+		assertEquals("order", nameC + ",create", trace.getNameTrace(i++));

+//		assertEquals("order", nameD + ",create", trace.getNameTrace(i++));

+//		assertEquals("order", nameE + ",create", trace.getNameTrace(i++));

+

+		assertEquals("order", nameA + ",init", trace.getNameTrace(i++));

+		assertEquals("order", nameB + ",init", trace.getNameTrace(i++));

+		assertEquals("order", nameC + ",init", trace.getNameTrace(i++));

+//		assertEquals("order", nameD + ",init", trace.getNameTrace(i++));

+//		assertEquals("order", nameE + ",init", trace.getNameTrace(i++));

+

+		assertEquals("order", nameA + ",start", trace.getNameTrace(i++));

+		assertEquals("order", nameB + ",start", trace.getNameTrace(i++));

+		assertEquals("order", nameC + ",start", trace.getNameTrace(i++));

+//		assertEquals("order", nameD + ",start", trace.getNameTrace(i++));

+//		assertEquals("order", nameE + ",start", trace.getNameTrace(i++));

+

+	}

+

+	/* **************************************** */

+

+

+

+

+

+	/**

+	 * General purpose descriptor.

+	 */

+	public class ServiceDesc extends ServiceDescriptor {

+

+

+		public ServiceDesc( String key, ServiceStartKind startKind) {

+			super(key, FakeService.class.getName(), startKind, 1 );

+		}

+		

+		public ServiceDesc( String key, ServiceStartKind startKind, List<String> requiredService) {

+			super(key, FakeService.class.getName(), startKind, 1, requiredService );

+		}

+	}

+

+	/**

+	 * General purpose descriptor.

+	 */

+	public class ServiceFactoryDesc extends ServiceDescriptor {

+

+

+		public ServiceFactoryDesc( String key, ServiceStartKind startKind) {

+			super(key, FakeServiceFactory.class.getName(), startKind, 1 );

+			setServiceTypeKind(ServiceTypeKind.serviceFactory);

+		}

+		

+		public ServiceFactoryDesc( String key, ServiceStartKind startKind, List<String> requiredService) {

+			super(key, FakeServiceFactory.class.getName(), startKind, 1, requiredService );

+			setServiceTypeKind(ServiceTypeKind.serviceFactory);

+		}

+		/**

+		 * Constructor with a classname and {@link ServiceDescriptor#isStartAtStartup()} = true.

+		 * Constructor.

+		 *

+		 * @param key

+		 * @param startKind

+		 * @param requiredService

+		 */

+		public ServiceFactoryDesc( Class<?> key, String classname, ServiceStartKind startKind, List<String> requiredService) {

+			super(key, classname, startKind, 1, requiredService );

+			setServiceTypeKind(ServiceTypeKind.serviceFactory);

+		}

+		/**

+		 * Constructor with a classname and {@link ServiceDescriptor#isStartAtStartup()} = true.

+		 * Constructor.

+		 *

+		 * @param key

+		 * @param startKind

+		 * @param requiredService

+		 */

+		public ServiceFactoryDesc( Class<?>  key, String classname, ServiceStartKind startKind) {

+			super(key, classname, startKind, 1 );

+			setServiceTypeKind(ServiceTypeKind.serviceFactory);

+		}

+

+		public ServiceFactoryDesc(String key, String serviceClassname, ServiceStartKind serviceStartKind, int priority, List<String> requiredServices) {

+			super(key, serviceClassname, serviceStartKind, priority, requiredServices);

+			setServiceTypeKind(ServiceTypeKind.serviceFactory);

+		}

+

+		public ServiceFactoryDesc(String key, String serviceClassname, ServiceStartKind serviceStartKind, int priority) {

+			super(key, serviceClassname, serviceStartKind, priority);

+			setServiceTypeKind(ServiceTypeKind.serviceFactory);

+		}

+	}

+

+	/**

+	 * 

+	 * @author dumoulin

+	 *

+	 */

+	public class LazyServiceADescriptor extends ServiceDescriptor {

+

+

+		public LazyServiceADescriptor() {

+			super(ServiceA.class.getName(), ServiceStartKind.LAZY, 1);

+		}

+	}

+

+	public class LazyServiceA10Descriptor extends ServiceDescriptor {

+

+

+		public LazyServiceA10Descriptor() {

+			super(ServiceA.class.getName(), ServiceA10.class.getName(), ServiceStartKind.LAZY, 10);

+		}

+	}

+

+	public class LazyServiceBDescriptor extends ServiceDescriptor {

+

+

+		public LazyServiceBDescriptor() {

+			super(ServiceB.class.getName(), ServiceStartKind.LAZY, 1);

+		}

+	}

+

+	public class ServiceCDescriptor extends ServiceDescriptor {

+

+

+		public ServiceCDescriptor() {

+			super(ServiceC.class.getName(), ServiceStartKind.STARTUP, 1);

+		}

+	}

+

+	public class LazyServicePojoADescriptor extends ServiceDescriptor {

+

+

+		public LazyServicePojoADescriptor() {

+			super(ServicePojoA.class.getName(), ServiceStartKind.LAZY, 1);

+		}

+	}

+

+	public class PojoServiceDescriptor extends ServiceDescriptor {

+

+

+		public PojoServiceDescriptor() {

+			super(Object.class.getName(), ServiceStartKind.STARTUP, 1);

+		}

+	}

+

+

+}

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/services/TestTrace.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/services/TestTrace.java
new file mode 100644
index 00000000000..66feb56a032
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/services/TestTrace.java
@@ -0,0 +1,181 @@
+/**

+ * 

+ */

+package org.eclipse.papyrus.core.services;

+

+import java.util.ArrayList;

+import java.util.List;

+

+

+/**

+ * A class used to record traces for tests

+ * 

+ * @author cedric dumoulin

+ *

+ */

+public class TestTrace {

+

+	public List<TraceRecord>traces = new ArrayList<TraceRecord>();

+	

+	/**

+	 * Record a new trace.

+	 * @param trace

+	 */

+	public void addTrace(String trace) {

+		addTrace(null, trace, null);

+	}

+	

+	/**

+	 * Record a new trace.

+	 * @param trace

+	 */

+	public void addTrace(String name, String trace) {

+		addTrace(name, trace, null);

+	}

+	

+	/**

+	 * Record a new trace.

+	 * @param trace

+	 */

+	public void addTrace(String name, String trace, Object value) {

+		traces.add(new TraceRecord( name, trace, value));

+	}

+	

+	/**

+	 * Return the name and the trace in one concatenated string ("name,trace").

+	 * @param i Index of the requested trace

+	 * @return

+	 */

+	public String getNameTrace(int i) {

+		return traces.get(i).getNameTrace();

+	}

+

+	/**

+	 * Get the value

+	 * @param i

+	 * @return

+	 */

+	public Object getValue(int i) {

+		return traces.get(i).value;

+	}

+

+	/**

+	 * Return true if the trace contains the specified events.

+	 * @return

+	 */

+	public boolean contains( String name, String trace) {

+		

+		return indexOfNameTrace(name, trace) >= 0;

+	}

+	

+    /**

+     * Returns the index of the first occurrence of the specified elements

+     * in these lists, or -1 if this list does not contain the element.

+     */

+    public int indexOf(String name, String trace, Object value) {

+

+    	for (int i = 0; i < traces.size(); i++) {

+    		TraceRecord record = traces.get(i);

+

+    		if( name.equals(record.name) && trace.equals(record.trace) )

+    			return i;

+    	}

+

+    	return -1;

+      }

+

+    /**

+     * Returns the index of the first occurrence of the specified elements

+     * in these lists, or -1 if this list does not contain the element.

+     */

+    public int indexOfNameTrace(String name, String trace) {

+

+    	for (int i = 0; i < traces.size(); i++) {

+    		TraceRecord record = traces.get(i);

+

+    		if( name.equals(record.name) && trace.equals(record.trace) )

+    			return i;

+    	}

+

+    	return -1;

+      }

+

+    /**

+     * Returns the index of the first occurrence of the specified elements

+     * in these lists, or -1 if this list does not contain the element.

+     */

+    public int indexOfTrace(String trace) {

+

+    	for (int i = 0; i < traces.size(); i++) {

+    		TraceRecord record = traces.get(i);

+

+    		if( trace.equals(record.trace) )

+    			return i;

+    	}

+

+    	return -1;

+      }

+

+    /**

+     * Returns the index of the first occurrence of the specified elements

+     * in these lists, or -1 if this list does not contain the element.

+     */

+    public int indexOfName(String name) {

+

+    	for (int i = 0; i < traces.size(); i++) {

+    		TraceRecord record = traces.get(i);

+

+    		if( name.equals(record.name)  )

+    			return i;

+    	}

+

+    	return -1;

+      }

+

+	/**

+	 * Reset the trace.

+	 */

+	public void reset() {

+		traces.clear();

+	}

+

+	

+	/**

+	 * @return the traces

+	 */

+	public List<TraceRecord> getTraces() {

+		return traces;

+	}

+	

+	/**

+	 * A Record of the trace.

+	 */

+	public class TraceRecord {

+		public String name;

+		public String trace;

+		public Object value;

+		/**

+		 * Constructor.

+		 *

+		 * @param name

+		 * @param trace

+		 * @param value

+		 */

+		public TraceRecord(String name, String trace, Object value) {

+			this.name = name;

+			this.trace = trace;

+			this.value = value;

+		}

+		

+		/**

+		 * 

+		 * @return

+		 */

+		public String getNameTrace() {

+			// TODO Auto-generated method stub

+			return name + "," + trace;

+		}

+		

+	}

+

+}

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/tests/AllTests.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/tests/AllTests.java
new file mode 100644
index 00000000000..cc5da0cba1d
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/core/tests/AllTests.java
@@ -0,0 +1,39 @@
+/*****************************************************************************

+ * Copyright (c) 2010 CEA LIST.

+ *    

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.core.tests;

+

+import org.eclipse.papyrus.core.lifecycleevents.LifeCycleEventsProviderTest;

+import org.eclipse.papyrus.core.services.ComposedServiceTest;

+import org.eclipse.papyrus.core.services.ServicesRegistryTest;

+import org.eclipse.papyrus.resource.AbstractModelWithSharedResourceTest;

+import org.eclipse.papyrus.resource.ModelSetTest;

+import org.junit.runner.RunWith;

+import org.junit.runners.Suite;

+import org.junit.runners.Suite.SuiteClasses;

+

+

+

+@RunWith(Suite.class)

+@SuiteClasses({

+// {oep.resource}

+ModelSetTest.class, AbstractModelWithSharedResourceTest.class,

+// {oep}.core.services

+ComposedServiceTest.class, ServicesRegistryTest.class,

+// {oep}.core.lifecycleevents

+/* SaveAndDirtyServiceTest.class, */LifeCycleEventsProviderTest.class

+})

+/**

+ * Suite Class for all tests in the plugin

+ */

+public class AllTests {

+

+}

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/resource/AbstractModelWithSharedResourceTest.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/resource/AbstractModelWithSharedResourceTest.java
new file mode 100644
index 00000000000..bf780ba86a4
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/resource/AbstractModelWithSharedResourceTest.java
@@ -0,0 +1,309 @@
+/**

+ * 

+ */

+package org.eclipse.papyrus.resource;

+

+import static org.junit.Assert.assertEquals;

+import static org.junit.Assert.assertFalse;

+import static org.junit.Assert.assertNotNull;

+import static org.junit.Assert.assertTrue;

+

+import java.io.IOException;

+import java.util.List;

+

+import org.eclipse.core.resources.IFile;

+import org.eclipse.core.resources.IProject;

+import org.eclipse.core.resources.ResourcesPlugin;

+import org.eclipse.core.runtime.CoreException;

+import org.eclipse.core.runtime.NullProgressMonitor;

+import org.eclipse.emf.ecore.EClass;

+import org.eclipse.emf.ecore.EPackage;

+import org.eclipse.emf.ecore.EcoreFactory;

+import org.eclipse.papyrus.resource.ModelMultiException;

+import org.eclipse.papyrus.resource.ModelSet;

+import org.eclipse.papyrus.resource.AbstractModelWithSharedResource.ModelKind;

+import org.junit.After;

+import org.junit.Before;

+import org.junit.Test;

+

+

+/**

+ * Run as "JUnit Plugin-Test"

+ * 

+ * @author cedric dumoulin

+ *

+ */

+public class AbstractModelWithSharedResourceTest {

+

+	/**

+	 * @throws java.lang.Exception

+	 */

+	@Before

+	public void setUp() throws Exception {

+	}

+

+	/**

+	 * @throws java.lang.Exception

+	 */

+	@After

+	public void tearDown() throws Exception {

+	}

+

+	/**

+	 * Test that the resource is created only once.

+	 * Test method for {@link org.eclipse.papyrus.resource.AbstractModelWithSharedResource#createModel(org.eclipse.core.runtime.IPath)}.

+	 */

+	@Test

+	public void testCreateModel() {

+		

+		String model1Key = "ecore";

+		String model2Key = "genmodel";

+

+		// Create models with different key, but use same extension (default from FakeModelWithSharedResource)

+		FakeModelWithSharedResource<EPackage> model1 = new FakeModelWithSharedResource<EPackage>(ModelKind.master, model1Key, EPackage.class);

+		FakeModelWithSharedResource<EClass> model2 = new FakeModelWithSharedResource<EClass>(model2Key, EClass.class);

+		

+		ModelSet modelSet = new ModelSet();

+		modelSet.registerModel(model1);

+		modelSet.registerModel(model2);

+		

+		IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject("org.eclipse.papyrus.core");

+		

+		IFile model1File = p.getFile("tmp/model1." + model1Key);

+

+		// Call creates

+		modelSet.createsModels(model1File);

+		

+		// Do check

+		assertNotNull( "resource created", model1.getResouce() );

+		assertNotNull( "resource created", model2.getResouce() );

+		assertEquals("Resource is shared", model1.getResouce(), model2.getResouce());

+

+		

+	}

+

+	/**

+	 * Create and save models.

+	 * @throws IOException 

+	 * @throws CoreException 

+	 */

+	private void createAndSave(String model1Key, String model2Key) throws IOException, CoreException {

+

+		FakeModelWithSharedResource<EPackage> model1 = new FakeModelWithSharedResource<EPackage>(ModelKind.master, model1Key, EPackage.class);

+		FakeModelWithSharedResource<EClass> model2 = new FakeModelWithSharedResource<EClass>(model2Key, EClass.class);

+		

+		ModelSet modelSet = new ModelSet();

+		modelSet.registerModel(model1);

+		modelSet.registerModel(model2);

+		

+		IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject("org.eclipse.papyrus.core");

+		if(!p.exists())

+			  p.create(new NullProgressMonitor());

+		p.open(new NullProgressMonitor());

+		

+		IFile model1File = p.getFile("tmp/model1." + model1Key);

+		

+		// Call creates and save

+		

+		modelSet.createsModels(model1File);

+		model1.getResouce().setModified(true);

+		modelSet.save(new NullProgressMonitor());

+		modelSet.unload();

+	}

+

+	/**

+	 * Test method for {@link org.eclipse.papyrus.resource.AbstractModelWithSharedResource#loadModel(org.eclipse.core.runtime.IPath)}.

+	 * @throws CoreException 

+	 * @throws IOException 

+	 * @throws ModelMultiException 

+	 */

+	@Test

+	public void testLoadModelIPath() throws IOException, CoreException, ModelMultiException {

+		

+		

+		String model1Key = "ecore";

+		String model2Key = "genmodel";

+		

+		createAndSave(model1Key, model2Key);

+

+		FakeModelWithSharedResource<EPackage> model1 = new FakeModelWithSharedResource<EPackage>(ModelKind.master, model1Key, EPackage.class);

+		FakeModelWithSharedResource<EClass> model2 = new FakeModelWithSharedResource<EClass>(model2Key, EClass.class);

+		

+		ModelSet modelSet = new ModelSet();

+		modelSet.registerModel(model1);

+		modelSet.registerModel(model2);

+		

+		IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject("org.eclipse.papyrus.core");

+		

+		IFile model1File = p.getFile("tmp/model1." + model1Key);

+

+		// Call creates

+		modelSet.loadModels(model1File);

+		

+		// Do check

+		assertNotNull( "resource loaded", model1.getResouce() );

+		assertNotNull( "resource loaded", model2.getResouce() );

+		assertEquals("Resource is shared", model1.getResouce(), model2.getResouce());

+	}

+

+	/**

+	 * Test method for {@link org.eclipse.papyrus.resource.AbstractModelWithSharedResource#saveModel()}.

+	 * @throws IOException 

+	 * @throws CoreException 

+	 */

+	@Test

+	public void testSaveModel() throws IOException, CoreException {

+		String model1Key = "ecore";

+		String model2Key = "genmodel";

+

+		FakeModelWithSharedResource<EPackage> model1 = new FakeModelWithSharedResource<EPackage>(ModelKind.master, model1Key, EPackage.class);

+		FakeModelWithSharedResource<EClass> model2 = new FakeModelWithSharedResource<EClass>(model2Key, EClass.class);

+		

+		ModelSet modelSet = new ModelSet();

+		modelSet.registerModel(model1);

+		modelSet.registerModel(model2);

+		

+		IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject("org.eclipse.papyrus.core");

+		if(!p.exists())

+			  p.create(new NullProgressMonitor());

+		p.open(new NullProgressMonitor());

+		

+		IFile model1File = p.getFile("tmp/model1." + model1Key);

+		

+		// Call creates and save

+		

+		modelSet.createsModels(model1File);

+		model1.getResouce().setModified(true);

+		modelSet.save(new NullProgressMonitor());

+		

+		// Do check

+		assertNotNull( "resource created", model1.getResouce() );

+		assertNotNull( "resource created", model2.getResouce() );

+		assertEquals("Resource is shared", model1.getResouce(), model2.getResouce());

+		// Check weither it is save

+		assertFalse("Resource is saved", model1.getResouce().isModified());

+		assertFalse("Resource is saved", model2.getResouce().isModified());

+		// TODO : check that it is saved only once !

+

+	}

+

+	/**

+	 * Test method for {@link org.eclipse.papyrus.resource.AbstractModelWithSharedResource#getModelRoot()}.

+	 */

+	@Test

+	public void testGetModelRoot() {

+		String model1Key = "ecore";

+		String model2Key = "genmodel";

+

+		FakeModelWithSharedResource<EPackage> model1 = new FakeModelWithSharedResource<EPackage>(ModelKind.master, model1Key, EPackage.class);

+		FakeModelWithSharedResource<EClass> model2 = new FakeModelWithSharedResource<EClass>(model2Key, EClass.class);

+		

+		ModelSet modelSet = new ModelSet();

+		modelSet.registerModel(model1);

+		modelSet.registerModel(model2);

+		

+		IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject("org.eclipse.papyrus.core");

+		

+		IFile model1File = p.getFile("tmp/model1." + model1Key);

+

+		// Call creates 

+		modelSet.createsModels(model1File);

+		// Add elements in both model

+		EPackage p1 = EcoreFactory.eINSTANCE.createEPackage();

+		model1.addModelRoot(p1);

+		

+		EClass c1 = EcoreFactory.eINSTANCE.createEClass();

+		model2.addModelRoot(c1);

+		

+		// Do check

+		assertEquals( "root found", p1, model1.getModelRoot() );

+		assertEquals( "root found", c1, model2.getModelRoot() );

+	}

+

+	/**

+	 * Test method for {@link org.eclipse.papyrus.resource.AbstractModelWithSharedResource#getModelRoot()}.

+	 */

+	@Test

+	public void testGetModelRoots() {

+		String model1Key = "ecore";

+		String model2Key = "genmodel";

+

+		FakeModelWithSharedResource<EPackage> model1 = new FakeModelWithSharedResource<EPackage>(ModelKind.master, model1Key, EPackage.class);

+		FakeModelWithSharedResource<EClass> model2 = new FakeModelWithSharedResource<EClass>(model2Key, EClass.class);

+		

+		ModelSet modelSet = new ModelSet();

+		modelSet.registerModel(model1);

+		modelSet.registerModel(model2);

+		

+		IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject("org.eclipse.papyrus.core");

+		

+		IFile model1File = p.getFile("tmp/model1." + model1Key);

+

+		// Call creates 

+		modelSet.createsModels(model1File);

+		// Add elements in both model

+		EPackage p1 = EcoreFactory.eINSTANCE.createEPackage();

+		model1.addModelRoot(p1);

+		EPackage p2 = EcoreFactory.eINSTANCE.createEPackage();

+		model1.addModelRoot(p2);

+		EPackage p3 = EcoreFactory.eINSTANCE.createEPackage();

+		model1.addModelRoot(p3);

+		

+		EClass c1 = EcoreFactory.eINSTANCE.createEClass();

+		model2.addModelRoot(c1);

+		EClass c2 = EcoreFactory.eINSTANCE.createEClass();

+		model2.addModelRoot(c2);

+		EClass c3 = EcoreFactory.eINSTANCE.createEClass();

+		model2.addModelRoot(c3);

+		

+		// Do check

+		List<EPackage> lp = model1.getModelRoots();

+		List<EClass> lc = model2.getModelRoots();

+		

+		assertNotNull("list exist", lp );

+		assertEquals("list size", 3, lp.size());

+		assertTrue("element found", lp.contains(p1));

+		assertTrue("element found", lp.contains(p2));

+		assertTrue("element found", lp.contains(p3));

+		

+		assertNotNull("list exist", lc );

+		assertEquals("list size", 3, lc.size());

+		assertTrue("element found", lc.contains(c1));

+		assertTrue("element found", lc.contains(c2));

+		assertTrue("element found", lc.contains(c3));

+	}

+

+	/**

+	 * Test method for {@link org.eclipse.papyrus.resource.AbstractModelWithSharedResource#addModelRoot(org.eclipse.emf.ecore.EObject)}.

+	 */

+	@Test

+	public void testAddModelRoot() {

+		String model1Key = "ecore";

+		String model2Key = "genmodel";

+

+		FakeModelWithSharedResource<EPackage> model1 = new FakeModelWithSharedResource<EPackage>(ModelKind.master, model1Key, EPackage.class);

+		FakeModelWithSharedResource<EClass> model2 = new FakeModelWithSharedResource<EClass>(model2Key, EClass.class);

+		

+		ModelSet modelSet = new ModelSet();

+		modelSet.registerModel(model1);

+		modelSet.registerModel(model2);

+		

+		IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject("org.eclipse.papyrus.core");

+		

+		IFile model1File = p.getFile("tmp/model1." + model1Key);

+

+		// Call creates 

+		modelSet.createsModels(model1File);

+		// Add elements in both model

+		EPackage p1 = EcoreFactory.eINSTANCE.createEPackage();

+		model1.addModelRoot(p1);

+		

+		EClass c1 = EcoreFactory.eINSTANCE.createEClass();

+		model2.addModelRoot(c1);

+		

+		// Do check

+		assertTrue("model contain element", model1.getResouce().getContents().contains(p1) );

+		assertTrue("model contain element", model2.getResouce().getContents().contains(c1) );

+	}

+

+}

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/resource/FakeModel.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/resource/FakeModel.java
new file mode 100644
index 00000000000..2d08383e105
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/resource/FakeModel.java
@@ -0,0 +1,45 @@
+/**

+ * 

+ */

+package org.eclipse.papyrus.resource;

+

+import org.eclipse.emf.ecore.resource.Resource;

+import org.eclipse.papyrus.resource.AbstractBaseModel;

+import org.eclipse.papyrus.resource.ModelSet;

+

+

+/**

+ * @author dumoulin

+ *

+ */

+public class FakeModel extends AbstractBaseModel {

+

+	private String identifier;

+	

+	public FakeModel(String identifier) {

+		this.identifier = identifier;

+	}

+

+	/**

+	 * @see org.eclipse.papyrus.resource.AbstractBaseModel#getIdentifier()

+	 *

+	 * @return

+	 */

+	@Override

+	public String getIdentifier() {

+		// TODO Auto-generated method stub

+		return identifier;

+	}

+

+	/**

+	 * @see org.eclipse.papyrus.resource.AbstractBaseModel#getModelFileExtension()

+	 *

+	 * @return

+	 */

+	@Override

+	protected String getModelFileExtension() {

+		// TODO Auto-generated method stub

+		return identifier;

+	}

+

+}

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/resource/FakeModelManagerSnippet.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/resource/FakeModelManagerSnippet.java
new file mode 100644
index 00000000000..6c3c582d1dd
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/resource/FakeModelManagerSnippet.java
@@ -0,0 +1,64 @@
+/**

+ * 

+ */

+package org.eclipse.papyrus.resource;

+

+import org.eclipse.papyrus.resource.IModelSetSnippet;

+import org.eclipse.papyrus.resource.ModelSet;

+

+

+/**

+ * a fake {@link IModelSetSnippet} for test purpose.

+ * 

+ * @author cedric dumoulin

+ * 

+ */

+public class FakeModelManagerSnippet implements IModelSetSnippet {

+

+	private TestTrace trace;

+

+	private String name;

+

+	/**

+	 * 

+	 * Constructor.

+	 * 

+	 * @param string

+	 */

+	public FakeModelManagerSnippet(String name) {

+		this.trace = new TestTrace();

+		this.name = name;

+	}

+

+	/**

+	 * 

+	 * Constructor.

+	 * 

+	 * @param trace2

+	 * @param string

+	 */

+	public FakeModelManagerSnippet(TestTrace trace, String name) {

+		this.trace = trace;

+		this.name = name;

+	}

+

+	/**

+	 * @see org.eclipse.papyrus.resource.IModelSetSnippet#start(org.eclipse.papyrus.resource.ModelSet)

+	 * 

+	 * @param modelsManager

+	 */

+	public void start(ModelSet modelsManager) {

+		trace.addTrace(name, "start");

+	}

+

+	/**

+	 * @see org.eclipse.papyrus.resource.IModelSetSnippet#dispose(org.eclipse.papyrus.resource.ModelSet)

+	 * 

+	 * @param modelsManager

+	 */

+	public void dispose(ModelSet modelsManager) {

+		trace.addTrace(name, "dispose");

+

+	}

+

+}

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/resource/FakeModelWithSharedResource.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/resource/FakeModelWithSharedResource.java
new file mode 100644
index 00000000000..07ffcf4722a
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/resource/FakeModelWithSharedResource.java
@@ -0,0 +1,101 @@
+/**

+ * 

+ */

+package org.eclipse.papyrus.resource;

+

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.resource.Resource;

+import org.eclipse.papyrus.resource.AbstractModelWithSharedResource;

+

+

+/**

+ * @author dumoulin

+ *

+ */

+public class FakeModelWithSharedResource<T extends EObject> extends AbstractModelWithSharedResource<T> {

+

+	private String identifier;

+	private String fileExtension;

+	private Class<T> expectedType;

+	

+	/**

+	 * 

+	 * Constructor.

+	 *

+	 * @param kind

+	 * @param identifier

+	 * @param fileExtension

+	 * @param expectedType

+	 */

+	public FakeModelWithSharedResource(ModelKind kind, String identifier, String fileExtension, Class<T> expectedType) {

+        super(kind);

+		this.identifier = identifier;

+		this.expectedType = expectedType;

+		this.fileExtension = fileExtension;

+	}

+	

+	/**

+	 * 

+	 * Constructor.

+	 *

+	 * @param kind

+	 * @param identifier

+	 * @param expectedType

+	 */

+	public FakeModelWithSharedResource(ModelKind kind, String identifier, Class<T> expectedType) {

+		this(kind, identifier, "di", expectedType);

+	}

+	

+	/**

+	 * 

+	 * Constructor.

+	 *

+	 * @param identifier

+	 * @param expectedType

+	 */

+	public FakeModelWithSharedResource(String identifier, Class<T> expectedType) {

+		this(ModelKind.slave, identifier, expectedType);

+	}

+	

+	/**

+	 * 

+	 * @see org.eclipse.papyrus.resource.AbstractModelWithSharedResource#isModelRoot(org.eclipse.emf.ecore.EObject)

+	 *

+	 * @param object

+	 * @return

+	 */

+	@Override

+	protected boolean isModelRoot(EObject object) {

+		return expectedType.isInstance(object);

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.papyrus.resource.AbstractBaseModel#getIdentifier()

+	 *

+	 * @return

+	 */

+	@Override

+	public String getIdentifier() {

+		return identifier;

+	}

+

+	/**

+	 * 

+	 * @see org.eclipse.papyrus.resource.AbstractBaseModel#getModelFileExtension()

+	 *

+	 * @return

+	 */

+	@Override

+	protected String getModelFileExtension() {

+		return fileExtension;

+	}

+

+	/**

+	 * Get the associated resource.

+	 * @return

+	 */

+	public Resource getResouce() {

+		return resource;

+	}

+}

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/resource/ModelSetTest.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/resource/ModelSetTest.java
new file mode 100644
index 00000000000..03e8476c774
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/resource/ModelSetTest.java
@@ -0,0 +1,489 @@
+package org.eclipse.papyrus.resource;

+

+import static org.junit.Assert.assertEquals;

+import static org.junit.Assert.assertNotNull;

+import static org.junit.Assert.assertNull;

+import static org.junit.Assert.assertTrue;

+

+import java.io.IOException;

+

+import org.eclipse.core.resources.IFile;

+import org.eclipse.core.resources.IProject;

+import org.eclipse.core.resources.ResourcesPlugin;

+import org.eclipse.core.runtime.CoreException;

+import org.eclipse.core.runtime.IPath;

+import org.eclipse.core.runtime.NullProgressMonitor;

+import org.eclipse.emf.common.util.URI;

+import org.eclipse.emf.ecore.EcoreFactory;

+import org.eclipse.emf.ecore.resource.Resource;

+import org.eclipse.emf.ecore.resource.ResourceSet;

+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;

+import org.eclipse.papyrus.resource.ModelException;

+import org.eclipse.papyrus.resource.ModelIdentifiers;

+import org.eclipse.papyrus.resource.ModelMultiException;

+import org.eclipse.papyrus.resource.ModelSet;

+import org.junit.After;

+import org.junit.Before;

+import org.junit.Test;

+

+/**

+ * Test for {@link ModelSet}. <br>

+ * Run as "JUnit Plugin-Test"

+ * 

+ * @author cedric dumoulin

+ * 

+ */

+public class ModelSetTest {

+

+	/**

+	 * Name of the plugin that is created.

+	 */

+	final protected String PLUGIN_PROJECT_NAME = "org.eclipse.papyrus.core";

+

+	/**

+	 * 

+	 * @throws Exception

+	 */

+	@Before

+	public void setUp() throws Exception {

+	}

+

+	/**

+	 * 

+	 * @throws Exception

+	 */

+	@After

+	public void tearDown() throws Exception {

+	}

+

+	/**

+	 * Test method for {@link org.eclipse.papyrus.resource.ModelSet.registerModel(IModel)} .

+	 */

+	@Test

+	public void testRegisterModel() {

+		ModelSet mngr = new ModelSet();

+

+		FakeModel model1 = new FakeModel("model1");

+

+		mngr.registerModel(model1);

+

+		assertNotNull("mngr is set", model1.getModelManager());

+		assertNotNull("model is registered", mngr.getModel("model1"));

+	}

+

+	/**

+	 * Test method for {@link org.eclipse.papyrus.resource.ModelSet#getModel(String)} .

+	 */

+	@Test

+	public void testGetModel() {

+		ModelSet mngr = new ModelSet();

+

+		FakeModel model1 = new FakeModel("model1");

+		FakeModel model2 = new FakeModel("model2");

+

+		mngr.registerModel(model1);

+		mngr.registerModel(model2);

+

+		assertNotNull("model is registered", mngr.getModel("model1"));

+		assertNotNull("model is registered", mngr.getModel("model2"));

+	}

+

+	/**

+	 * Test method for {@link org.eclipse.papyrus.resource.ModelSet#getTransactionalEditingDomain()} .

+	 */

+	@Test

+	public void testGetTransactionalEditingDomain() {

+		ModelSet mngr = new ModelSet();

+

+		assertNotNull("editing domain created", mngr.getTransactionalEditingDomain());

+	}

+

+	/**

+	 * Test method for {@link org.eclipse.papyrus.resource.ModelSet#createsModels(IFile)} .

+	 */

+	@Test

+	public void testCreatesModels() throws IOException, CoreException {

+		ModelSet mngr = new ModelSet();

+

+		String model1Key = "ecore";

+		String model2Key = "genmodel";

+

+		FakeModel model1 = new FakeModel(model1Key);

+		FakeModel model2 = new FakeModel(model2Key);

+

+		mngr.registerModel(model1);

+		mngr.registerModel(model2);

+

+		IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject("org.eclipse.papyrus.core");

+

+		IFile model1File = p.getFile("tmp/model1." + model1Key);

+

+		// Do create

+		mngr.createsModels(model1File);

+

+		assertNotNull("resource created", model1.getResource());

+		assertNotNull("resource created", model2.getResource());

+	}

+

+	/**

+	 * Test method for {@link org.eclipse.papyrus.resource.ModelSet#loadModels(IFile)} .

+	 * 

+	 * @throws ModelMultiException

+	 */

+	@Test

+	public void testLoadModels() throws IOException, CoreException, ModelMultiException {

+

+		// Create models so they exists

+		testSave();

+

+		// Now do load

+		ModelSet mngr = new ModelSet();

+

+		String model1Key = "ecore";

+		String model2Key = "genmodel";

+

+		FakeModel model1 = new FakeModel(model1Key);

+		FakeModel model2 = new FakeModel(model2Key);

+

+		mngr.registerModel(model1);

+		mngr.registerModel(model2);

+

+		IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject("org.eclipse.papyrus.core");

+

+		IFile model1File = p.getFile("tmp/model1." + model1Key);

+		IFile model2File = p.getFile("tmp/model1." + model2Key);

+

+		assertTrue("modelFile exist", model1File.exists());

+		assertTrue("modelFile exist", model2File.exists());

+

+		// Try to load

+		mngr.loadModels(model1File);

+

+		assertNotNull("resource created", model1.getResource());

+		assertNotNull("resource created", model2.getResource());

+	}

+

+	/**

+	 * Test method for {@link org.eclipse.papyrus.resource.ModelSet#save(IProgressMonitor)} .

+	 */

+	@Test

+	public void testSave() throws CoreException, IOException {

+		ModelSet mngr = new ModelSet();

+

+		String model1Key = "ecore";

+		String model2Key = "genmodel";

+

+		FakeModel model1 = new FakeModel(model1Key);

+		FakeModel model2 = new FakeModel(model2Key);

+

+		mngr.registerModel(model1);

+		mngr.registerModel(model2);

+

+		IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject("org.eclipse.papyrus.core");

+		if(!p.exists())

+			p.create(new NullProgressMonitor());

+		p.open(new NullProgressMonitor());

+

+		IFile model1File = p.getFile("tmp/model1." + model1Key);

+		IFile model2File = p.getFile("tmp/model1." + model2Key);

+

+		// Do create and save

+		mngr.createsModels(model1File);

+		mngr.save(new NullProgressMonitor());

+		//

+		assertTrue("resource created", model1File.exists());

+		assertTrue("resource created", model2File.exists());

+		//

+		assertNotNull("resource created", model1.getResource());

+		assertNotNull("resource created", model2.getResource());

+	}

+

+	/**

+	 * Create some Resources for other test. This method should be called explicitly.

+	 * 

+	 * @throws CoreException

+	 * @throws IOException

+	 */

+	protected void createResources(String... filenames) throws CoreException, IOException {

+

+		IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject(PLUGIN_PROJECT_NAME);

+		if(!p.exists())

+			p.create(new NullProgressMonitor());

+		p.open(new NullProgressMonitor());

+

+		ResourceSet resourceSet = new ResourceSetImpl();

+

+		for(String filename : filenames) {

+			createResource(p, resourceSet, filename);

+		}

+

+		// Save created resources

+		for(Resource resource : resourceSet.getResources()) {

+			resource.save(null);

+		}

+

+	}

+

+

+	/**

+	 * Create a resource.

+	 * 

+	 * @param p

+	 * @param resourceSet

+	 * @param filename

+	 */

+	private void createResource(IProject p, ResourceSet resourceSet, String filename) {

+

+		// Build a valid file

+		IFile file = p.getFile(filename);

+

+

+		URI uri = URI.createPlatformResourceURI(file.getFullPath().toOSString(), true);

+		resourceSet.createResource(uri);

+

+	}

+

+	/**

+	 * Test method for {@link org.eclipse.papyrus.resource.ModelSet#saveAs(IPath)} .

+	 */

+	@Test

+	public void testSaveAs() throws CoreException, IOException {

+		ModelSet mngr = new ModelSet();

+

+		String model1Key = "ecore";

+		String model2Key = "genmodel";

+

+		FakeModel model1 = new FakeModel(model1Key);

+		FakeModel model2 = new FakeModel(model2Key);

+

+		mngr.registerModel(model1);

+		mngr.registerModel(model2);

+

+		IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject("org.eclipse.papyrus.core");

+		if(!p.exists())

+			p.create(new NullProgressMonitor());

+		p.open(new NullProgressMonitor());

+

+		IFile model1File = p.getFile("tmp/model1." + model1Key);

+

+		// Do create and save

+		mngr.createsModels(model1File);

+		mngr.save(new NullProgressMonitor());

+

+		// Change the name

+		IFile newModel1File = p.getFile("tmp/model2." + model1Key);

+		IFile newModel2File = p.getFile("tmp/model2." + model2Key);

+		IPath newPath = newModel1File.getFullPath();

+

+		mngr.saveAs(newPath);

+		// check creation

+

+		assertTrue("resource created", newModel2File.exists());

+		assertTrue("resource created", newModel2File.exists());

+		//

+		assertNotNull("resource created", model1.getResource());

+		assertNotNull("resource created", model2.getResource());

+

+	}

+

+	/**

+	 * Test method for {@link org.eclipse.papyrus.resource.ModelSet#unload()} .

+	 */

+	@Test

+	public void testUnload() {

+		ModelSet mngr = new ModelSet();

+

+		String model1Key = "ecore";

+		String model2Key = "genmodel";

+

+		FakeModel model1 = new FakeModel(model1Key);

+		FakeModel model2 = new FakeModel(model2Key);

+

+		mngr.registerModel(model1);

+		mngr.registerModel(model2);

+

+		IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject("org.eclipse.papyrus.core");

+

+		IFile model1File = p.getFile("tmp/model1." + model1Key);

+

+		// Do create and then unload

+		mngr.createsModels(model1File);

+		mngr.unload();

+

+		assertNull("resource unloaded", model1.getResource());

+		assertNull("resource unloaded", model2.getResource());

+	}

+

+	/**

+	 * Test method for {@link org.eclipse.papyrus.resource.ModelSet#addModelSetSnippet(IModelManagerSnippet)} .

+	 */

+	@Test

+	public void testAddModelSetSnippet() {

+		ModelSet mngr = new ModelSet();

+

+		// Add snippets

+		TestTrace trace = new TestTrace();

+		mngr.addModelSetSnippet(new FakeModelManagerSnippet(trace, "snippet1"));

+		mngr.addModelSetSnippet(new FakeModelManagerSnippet(trace, "snippet2"));

+

+		// Do create

+		IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject("org.eclipse.papyrus.core");

+		IFile model1File = p.getFile("tmp/model1.ecore");

+		mngr.createsModels(model1File);

+

+		// Check calls

+		assertTrue("snippet1 called", trace.contains("snippet1", "start"));

+		assertTrue("snippet2 called", trace.contains("snippet2", "start"));

+

+	}

+

+	/**

+	 * Test that snippets are called after a call to createsModels()

+	 */

+	@Test

+	public void testSnippetCalledAfterCreateModels() {

+		ModelSet mngr = new ModelSet();

+

+		// Add snippets

+		TestTrace trace = new TestTrace();

+		mngr.addModelSetSnippet(new FakeModelManagerSnippet(trace, "snippet1"));

+		mngr.addModelSetSnippet(new FakeModelManagerSnippet(trace, "snippet2"));

+

+		// Do create

+		IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject("org.eclipse.papyrus.core");

+		IFile model1File = p.getFile("tmp/model1.ecore");

+		mngr.createsModels(model1File);

+

+		// Check calls

+		assertTrue("snippet1 called", trace.contains("snippet1", "start"));

+		assertTrue("snippet2 called", trace.contains("snippet2", "start"));

+

+		// dispose

+		mngr.unload();

+		// Check calls

+		assertTrue("snippet1 called", trace.contains("snippet1", "dispose"));

+		assertTrue("snippet2 called", trace.contains("snippet2", "dispose"));

+

+	}

+

+	/**

+	 * Test that snippets are called after a call to loadModels()

+	 * 

+	 * @throws ModelMultiException

+	 */

+	@Test

+	public void testSnippetCalledAfterLoadModels() throws ModelMultiException {

+

+		// force model creation

+		testSnippetCalledAfterCreateModels();

+

+		// now  do load.

+		ModelSet mngr = new ModelSet();

+

+		// Add snippets

+		TestTrace trace = new TestTrace();

+		mngr.addModelSetSnippet(new FakeModelManagerSnippet(trace, "snippet1"));

+		mngr.addModelSetSnippet(new FakeModelManagerSnippet(trace, "snippet2"));

+

+		// Do create

+		IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject("org.eclipse.papyrus.core");

+		IFile model1File = p.getFile("tmp/model1.ecore");

+		mngr.loadModels(model1File);

+

+		// Check calls

+		assertTrue("snippet1 called", trace.contains("snippet1", "start"));

+		assertTrue("snippet2 called", trace.contains("snippet2", "start"));

+

+		// dispose

+		mngr.unload();

+		// Check calls

+		assertTrue("snippet1 called", trace.contains("snippet1", "dispose"));

+		assertTrue("snippet2 called", trace.contains("snippet2", "dispose"));

+

+	}

+

+	/**

+	 * Test {@link #createResources(String...)}. This is a test methods :-)

+	 * 

+	 * @throws ModelMultiException

+	 */

+	@Test

+	public void testCreateResource() throws IOException, CoreException, ModelMultiException {

+

+		String model1Key = "ecore";

+		String model2Key = "genmodel";

+		String model3Key = "uml";

+

+		// Create models

+		createResources("tmp/model1." + model1Key, "tmp/model1." + model2Key, "tmp/model1." + model3Key);

+

+		// Check model creation

+		IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject(PLUGIN_PROJECT_NAME);

+

+		IFile model1File = p.getFile("tmp/model1." + model1Key);

+		IFile model2File = p.getFile("tmp/model1." + model2Key);

+		IFile model3File = p.getFile("tmp/model1." + model3Key);

+

+		assertTrue("modelFile exist", model1File.exists());

+		assertTrue("modelFile exist", model2File.exists());

+		assertTrue("modelFile exist", model3File.exists());

+	}

+

+	/**

+	 * Test {@link ModelSet#importModels(ModelIdentifiers, IFile)} called after {@link ModelSet#createsModels(IFile)} .

+	 * 

+	 * @throws ModelException

+	 */

+	@Test

+	public void testImportAfterCreate() throws IOException, CoreException, ModelException {

+

+		String model1Key = "ecore";

+		String model2Key = "genmodel";

+		String model3Key = "uml";

+

+		// Create models

+		createResources("tmp/model1." + model1Key, "tmp/model1." + model2Key, "tmp/model1." + model3Key);

+

+		// Now do registration

+		ModelSet mngr = new ModelSet();

+

+		FakeModel model1 = new FakeModel(model1Key);

+		FakeModel model2 = new FakeModel(model2Key);

+		FakeModel model3 = new FakeModel(model3Key);

+

+		mngr.registerModel(model1);

+		mngr.registerModel(model2);

+		mngr.registerModel(model3);

+

+

+		// Get an handle on one of the files 

+		IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject(PLUGIN_PROJECT_NAME);

+		IFile createdFile = p.getFile("tmp/model2." + model1Key);

+

+

+		// Try to create all models

+		mngr.createsModels(createdFile);

+

+		assertNotNull("resource created", model1.getResource());

+		assertNotNull("resource created", model2.getResource());

+		assertNotNull("resource created", model3.getResource());

+

+		// Add something in the model

+		model1.getResource().getContents().add(EcoreFactory.eINSTANCE.createEPackage());

+		assertEquals("model1 has changed", 1, model1.getResource().getContents().size());

+

+		// Try to import 

+		IFile importFile = p.getFile("tmp/model1." + model1Key);

+		mngr.importModels(new ModelIdentifiers(model1Key, model2Key), importFile);

+

+		assertNotNull("resource exist", model1.getResource());

+		assertNotNull("resource exist", model2.getResource());

+		assertNotNull("resource exist", model3.getResource());

+

+		assertEquals("model1 has changed", 0, model1.getResource().getContents().size());

+

+

+	}

+

+

+}

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/resource/TestTrace.java b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/resource/TestTrace.java
new file mode 100644
index 00000000000..7975598d9bd
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.core.tests/test/org/eclipse/papyrus/resource/TestTrace.java
@@ -0,0 +1,153 @@
+/**

+ * 

+ */

+package org.eclipse.papyrus.resource;

+

+import java.util.ArrayList;

+import java.util.List;

+

+

+/**

+ * A class used to record traces for tests

+ * 

+ * @author cedric dumoulin

+ *

+ */

+public class TestTrace {

+

+	public List<TraceRecord>traces = new ArrayList<TraceRecord>();

+	

+	/**

+	 * Record a new trace.

+	 * @param trace

+	 */

+	public void addTrace(String trace) {

+		addTrace(null, trace, null);

+	}

+	

+	/**

+	 * Record a new trace.

+	 * @param trace

+	 */

+	public void addTrace(String name, String trace) {

+		addTrace(name, trace, null);

+	}

+	

+	/**

+	 * Record a new trace.

+	 * @param trace

+	 */

+	public void addTrace(String name, String trace, Object value) {

+		traces.add(new TraceRecord( name, trace, value));

+	}

+	

+	/**

+	 * Return true if the trace contains the specified events.

+	 * @return

+	 */

+	public boolean contains( String name, String trace) {

+		

+		return indexOfNameTrace(name, trace) >= 0;

+	}

+	

+    /**

+     * Returns the index of the first occurrence of the specified elements

+     * in these lists, or -1 if this list does not contain the element.

+     */

+    public int indexOf(String name, String trace, Object value) {

+

+    	for (int i = 0; i < traces.size(); i++) {

+    		TraceRecord record = traces.get(i);

+

+    		if( name.equals(record.name) && trace.equals(record.trace) )

+    			return i;

+    	}

+

+    	return -1;

+      }

+

+    /**

+     * Returns the index of the first occurrence of the specified elements

+     * in these lists, or -1 if this list does not contain the element.

+     */

+    public int indexOfNameTrace(String name, String trace) {

+

+    	for (int i = 0; i < traces.size(); i++) {

+    		TraceRecord record = traces.get(i);

+

+    		if( name.equals(record.name) && trace.equals(record.trace) )

+    			return i;

+    	}

+

+    	return -1;

+      }

+

+    /**

+     * Returns the index of the first occurrence of the specified elements

+     * in these lists, or -1 if this list does not contain the element.

+     */

+    public int indexOfTrace(String trace) {

+

+    	for (int i = 0; i < traces.size(); i++) {

+    		TraceRecord record = traces.get(i);

+

+    		if( trace.equals(record.trace) )

+    			return i;

+    	}

+

+    	return -1;

+      }

+

+    /**

+     * Returns the index of the first occurrence of the specified elements

+     * in these lists, or -1 if this list does not contain the element.

+     */

+    public int indexOfName(String name) {

+

+    	for (int i = 0; i < traces.size(); i++) {

+    		TraceRecord record = traces.get(i);

+

+    		if( name.equals(record.name)  )

+    			return i;

+    	}

+

+    	return -1;

+      }

+

+	/**

+	 * Reset the trace.

+	 */

+	public void reset() {

+		traces.clear();

+	}

+

+	

+	/**

+	 * @return the traces

+	 */

+	public List<TraceRecord> getTraces() {

+		return traces;

+	}

+	

+	/**

+	 * A Record of the trace.

+	 */

+	public class TraceRecord {

+		public String name;

+		public String trace;

+		public Object value;

+		/**

+		 * Constructor.

+		 *

+		 * @param name

+		 * @param trace

+		 * @param value

+		 */

+		public TraceRecord(String name, String trace, Object value) {

+			this.name = name;

+			this.trace = trace;

+			this.value = value;

+		}

+		

+	}

+}

diff --git a/tests/org.eclipse.papyrus.core.test/.classpath b/tests/junit/plugins/core/org.eclipse.papyrus.properties.runtime.tests/.classpath
index 2d1a4302f04..046bda900d2 100644
--- a/tests/org.eclipse.papyrus.core.test/.classpath
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.properties.runtime.tests/.classpath
@@ -2,6 +2,6 @@
 <classpath>

 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="src" path="src"/>

+	<classpathentry kind="src" path="test"/>

 	<classpathentry kind="output" path="bin"/>

 </classpath>

diff --git a/tests/org.eclipse.papyrus.properties.runtime.tests/.project b/tests/junit/plugins/core/org.eclipse.papyrus.properties.runtime.tests/.project
index 8af638fd906..8af638fd906 100644
--- a/tests/org.eclipse.papyrus.properties.runtime.tests/.project
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.properties.runtime.tests/.project
diff --git a/tests/org.eclipse.papyrus.properties.runtime.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/core/org.eclipse.papyrus.properties.runtime.tests/.settings/org.eclipse.jdt.core.prefs
index b6d01f28eae..b6d01f28eae 100644
--- a/tests/org.eclipse.papyrus.properties.runtime.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.properties.runtime.tests/.settings/org.eclipse.jdt.core.prefs
diff --git a/tests/org.eclipse.papyrus.properties.runtime.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/core/org.eclipse.papyrus.properties.runtime.tests/META-INF/MANIFEST.MF
index ac7e8ab4db4..30eda02135f 100644
--- a/tests/org.eclipse.papyrus.properties.runtime.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.properties.runtime.tests/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Propertiers Runtime Plugin - Tests
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.papyrus.properties.runtime.tests;singleton:=true
-Bundle-Version: 0.7.0.qualifier
+Bundle-Version: 0.7.1.qualifier
 Bundle-Activator: org.eclipse.papyrus.properties.runtime.tests.Activator
-Bundle-Vendor: Eclipse.org
+Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.junit;bundle-version="4.8.1",
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.properties.runtime.tests/about.html b/tests/junit/plugins/core/org.eclipse.papyrus.properties.runtime.tests/about.html
new file mode 100644
index 00000000000..82d49bf5f81
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.properties.runtime.tests/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

+<title>About</title>

+</head>

+<body lang="EN-US">

+<h2>About This Content</h2>

+ 

+<p>June 5, 2007</p>	

+<h3>License</h3>

+

+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

+indicated below, the Content is provided to you under the terms and conditions of the

+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

+

+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

+apply to your use of any object code in the Content.  Check the Redistributor's license that was 

+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

+indicated below, the terms and conditions of the EPL still apply to any source code in the Content

+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

+

+</body>

+</html>

diff --git a/tests/org.eclipse.papyrus.diagram.clazz.test/build.properties b/tests/junit/plugins/core/org.eclipse.papyrus.properties.runtime.tests/build.properties
index 41eb6ade2b4..dc49f378c50 100644
--- a/tests/org.eclipse.papyrus.diagram.clazz.test/build.properties
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.properties.runtime.tests/build.properties
@@ -1,4 +1,4 @@
-source.. = src/

+source.. = test/

 output.. = bin/

 bin.includes = META-INF/,\

                .

diff --git a/tests/org.eclipse.papyrus.properties.runtime.tests/launch/PropertyEditorControllerServiceTestCase.launch b/tests/junit/plugins/core/org.eclipse.papyrus.properties.runtime.tests/launch/PropertyEditorControllerServiceTestCase.launch
index 21f769674fa..21f769674fa 100644
--- a/tests/org.eclipse.papyrus.properties.runtime.tests/launch/PropertyEditorControllerServiceTestCase.launch
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.properties.runtime.tests/launch/PropertyEditorControllerServiceTestCase.launch
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.properties.runtime.tests/plugin.properties b/tests/junit/plugins/core/org.eclipse.papyrus.properties.runtime.tests/plugin.properties
new file mode 100644
index 00000000000..7930ac5dff0
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.properties.runtime.tests/plugin.properties
@@ -0,0 +1,12 @@
+#################################################################################
+# Copyright (c) 2008 CEA LIST.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Remi Schnekenburger(CEA LIST) remi.schnekenburger@cea.fr - initial API and implementation
+##################################################################################
+pluginName=Papyrus Properties Runtime Test(Incubation)
+providerName=Eclipse Modeling Project
diff --git a/tests/org.eclipse.papyrus.properties.runtime.tests/src/org/eclipse/papyrus/properties/runtime/tests/Activator.java b/tests/junit/plugins/core/org.eclipse.papyrus.properties.runtime.tests/test/org/eclipse/papyrus/properties/runtime/tests/Activator.java
index 6962cf110ce..6962cf110ce 100644
--- a/tests/org.eclipse.papyrus.properties.runtime.tests/src/org/eclipse/papyrus/properties/runtime/tests/Activator.java
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.properties.runtime.tests/test/org/eclipse/papyrus/properties/runtime/tests/Activator.java
diff --git a/tests/org.eclipse.papyrus.properties.runtime.tests/src/org/eclipse/papyrus/properties/runtime/tests/controller/PropertyEditorControllerServiceTestCase.java b/tests/junit/plugins/core/org.eclipse.papyrus.properties.runtime.tests/test/org/eclipse/papyrus/properties/runtime/tests/controller/PropertyEditorControllerServiceTestCase.java
index 4c9f45aebf5..4c9f45aebf5 100644
--- a/tests/org.eclipse.papyrus.properties.runtime.tests/src/org/eclipse/papyrus/properties/runtime/tests/controller/PropertyEditorControllerServiceTestCase.java
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.properties.runtime.tests/test/org/eclipse/papyrus/properties/runtime/tests/controller/PropertyEditorControllerServiceTestCase.java
diff --git a/tests/org.eclipse.papyrus.diagram.clazz.test/.classpath b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/.classpath
index 2d1a4302f04..046bda900d2 100644
--- a/tests/org.eclipse.papyrus.diagram.clazz.test/.classpath
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/.classpath
@@ -2,6 +2,6 @@
 <classpath>

 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="src" path="src"/>

+	<classpathentry kind="src" path="test"/>

 	<classpathentry kind="output" path="bin"/>

 </classpath>

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/.project b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/.project
new file mode 100644
index 00000000000..ce90e46429f
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<projectDescription>

+	<name>org.eclipse.papyrus.sasheditor.tests</name>

+	<comment></comment>

+	<projects>

+	</projects>

+	<buildSpec>

+		<buildCommand>

+			<name>org.eclipse.jdt.core.javabuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.pde.ManifestBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.pde.SchemaBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+	</buildSpec>

+	<natures>

+		<nature>org.eclipse.pde.PluginNature</nature>

+		<nature>org.eclipse.jdt.core.javanature</nature>

+	</natures>

+</projectDescription>

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..70803840e5e
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,8 @@
+#Tue Nov 09 21:18:25 CET 2010

+eclipse.preferences.version=1

+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5

+org.eclipse.jdt.core.compiler.compliance=1.5

+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

+org.eclipse.jdt.core.compiler.source=1.5

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..aa30a8243de
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/META-INF/MANIFEST.MF
@@ -0,0 +1,9 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %fragmentName
+Bundle-SymbolicName: org.eclipse.papyrus.sasheditor.tests
+Bundle-Version: 0.7.1.qualifier
+Bundle-Vendor: %providerName
+Fragment-Host: org.eclipse.papyrus.sasheditor;bundle-version="0.7.1"
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-Localization: fragment
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/about.html b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/about.html
new file mode 100644
index 00000000000..82d49bf5f81
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

+<title>About</title>

+</head>

+<body lang="EN-US">

+<h2>About This Content</h2>

+ 

+<p>June 5, 2007</p>	

+<h3>License</h3>

+

+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

+indicated below, the Content is provided to you under the terms and conditions of the

+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

+

+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

+apply to your use of any object code in the Content.  Check the Redistributor's license that was 

+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

+indicated below, the terms and conditions of the EPL still apply to any source code in the Content

+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

+

+</body>

+</html>

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/build.properties b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/build.properties
new file mode 100644
index 00000000000..e2f332e572f
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/build.properties
@@ -0,0 +1,7 @@
+source.. = test/

+output.. = bin/

+bin.includes = META-INF/,\

+               .,\

+               org.eclipse.papyrus.sasheditor.tests.launch,\

+               fragment.properties,\

+               about.html

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/fragment.properties b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/fragment.properties
new file mode 100644
index 00000000000..b97668b8f83
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/fragment.properties
@@ -0,0 +1,13 @@
+#################################################################################

+# Copyright (c) 2010 CEA LIST.

+# All rights reserved. This program and the accompanying materials

+# are made available under the terms of the Eclipse Public License v1.0

+# which accompanies this distribution, and is available at

+# http://www.eclipse.org/legal/epl-v10.html

+#

+# Contributors:

+#     Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - initial API and implementation

+##################################################################################

+pluginName=Papyrus Sash editor Tests Fragment (Incubation)

+providerName=Eclipse Modeling Project

+

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/org.eclipse.papyrus.sasheditor.tests.launch b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/org.eclipse.papyrus.sasheditor.tests.launch
new file mode 100644
index 00000000000..737a86888a1
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/org.eclipse.papyrus.sasheditor.tests.launch
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">

+<booleanAttribute key="append.args" value="true"/>

+<booleanAttribute key="askclear" value="false"/>

+<booleanAttribute key="automaticAdd" value="true"/>

+<booleanAttribute key="automaticValidate" value="false"/>

+<stringAttribute key="bootstrap" value=""/>

+<stringAttribute key="checked" value="[NONE]"/>

+<booleanAttribute key="clearConfig" value="true"/>

+<booleanAttribute key="clearws" value="true"/>

+<booleanAttribute key="clearwslog" value="false"/>

+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>

+<booleanAttribute key="default" value="true"/>

+<booleanAttribute key="includeOptional" value="true"/>

+<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>

+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">

+<listEntry value="/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/sasheditor/AllTests.java"/>

+</listAttribute>

+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">

+<listEntry value="1"/>

+</listAttribute>

+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>

+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>

+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>

+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>

+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.sasheditor.tests.AllTests"/>

+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>

+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.sasheditor.tests"/>

+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>

+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -Xms40m -Xmx512m"/>

+<stringAttribute key="pde.version" value="3.3"/>

+<stringAttribute key="product" value="org.eclipse.platform.ide"/>

+<booleanAttribute key="run_in_ui_thread" value="true"/>

+<booleanAttribute key="show_selected_only" value="false"/>

+<booleanAttribute key="tracing" value="false"/>

+<booleanAttribute key="useCustomFeatures" value="false"/>

+<booleanAttribute key="useDefaultConfig" value="true"/>

+<booleanAttribute key="useDefaultConfigArea" value="false"/>

+<booleanAttribute key="useProduct" value="true"/>

+</launchConfiguration>

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/sasheditor/contentprovider/IPageMngrTest.java b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/sasheditor/contentprovider/IPageMngrTest.java
new file mode 100644
index 00000000000..93c42cc28c6
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/sasheditor/contentprovider/IPageMngrTest.java
@@ -0,0 +1,53 @@
+/**

+ * 

+ */

+package org.eclipse.papyrus.sasheditor.contentprovider;

+

+import junit.framework.TestCase;

+

+

+/**

+ * Base class for testing real implementation of ContentProvider.

+ * Real implementation should subclass this class, and implement the create method.

+ * 

+ * @author cedric dumoulin

+ *

+ */

+public abstract class IPageMngrTest extends TestCase {

+

+	/**

+	 * The public API allowing to access to the implementation.

+	 */

+	protected ISashWindowsContentProvider contentProvider;

+	

+	/**

+	 * The public API allowing to access to the implementation.

+	 */

+//	protected IPageMngr pageMngr;

+	

+	/**

+	 * Setup the test.

+	 * @see junit.framework.TestCase#setUp()

+	 *

+	 * @throws Exception

+	 */

+	@Override

+	protected void setUp() throws Exception {

+		// TODO Auto-generated method stub

+		super.setUp();

+	}

+	

+	@Override

+	protected void tearDown() throws Exception {

+		// TODO Auto-generated method stub

+		super.tearDown();

+	}

+	

+	/**

+	 * Test that the pageIdentifier passed to addPAge() is provided back from 

+	 * {@link ISashWindowsContainer#getActiveEditor()()} 

+	 */

+	public void testAddPage() {

+		

+	}

+}

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/sasheditor/contentprovider/simple/AllTests.java b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/sasheditor/contentprovider/simple/AllTests.java
new file mode 100644
index 00000000000..a9047bbf64b
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/sasheditor/contentprovider/simple/AllTests.java
@@ -0,0 +1,27 @@
+/*****************************************************************************

+ * Copyright (c) 2010 CEA LIST.

+ *    

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.sasheditor.contentprovider.simple;

+

+import org.eclipse.papyrus.sasheditor.editor.SashMultiPageEditorTest;

+import org.junit.runner.RunWith;

+import org.junit.runners.Suite;

+import org.junit.runners.Suite.SuiteClasses;

+

+

+/**

+ * All tests for package org.eclipse.papyrus.sasheditor.contentprovider.simple

+ */

+@RunWith(Suite.class)

+@SuiteClasses({ SimpleSashWindowsContentProviderTest.class })

+public class AllTests {

+

+}

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/sasheditor/contentprovider/simple/FakePageModel.java b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/sasheditor/contentprovider/simple/FakePageModel.java
new file mode 100644
index 00000000000..43bdf5ed67c
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/sasheditor/contentprovider/simple/FakePageModel.java
@@ -0,0 +1,65 @@
+/*****************************************************************************

+ * Copyright (c) 2009 CEA LIST & LIFL 

+ *

+ *    

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.sasheditor.contentprovider.simple;

+

+import org.eclipse.papyrus.sasheditor.contentprovider.IPageModel;

+import org.eclipse.swt.graphics.Image;

+

+

+/**

+ * A fake page for testing purpose

+ * 

+ * @author dumoulin

+ */

+public class FakePageModel implements IPageModel {

+

+	String title;

+

+	static int count = 0;

+

+	public FakePageModel() {

+		title = "noname" + count++;

+	}

+

+	/**

+	 * @param title

+	 */

+	public FakePageModel(String title) {

+		this.title = title;

+	}

+

+	/**

+	 * {@inheritDoc}

+	 */

+	public Object getRawModel() {

+		return this;

+	}

+

+	/**

+	 * {@inheritDoc}

+	 */

+	public Image getTabIcon() {

+		// TODO Auto-generated method stub

+		return null;

+	}

+

+	/**

+	 * {@inheritDoc}

+	 */

+	public String getTabTitle() {

+		// TODO Auto-generated method stub

+		return null;

+	}

+

+}

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/sasheditor/contentprovider/simple/SimpleSashWindowsContentProviderTest.java b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/sasheditor/contentprovider/simple/SimpleSashWindowsContentProviderTest.java
new file mode 100644
index 00000000000..0d90ba92044
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/sasheditor/contentprovider/simple/SimpleSashWindowsContentProviderTest.java
@@ -0,0 +1,202 @@
+/*****************************************************************************

+ * Copyright (c) 2009 CEA LIST & LIFL 

+ *

+ *    

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.sasheditor.contentprovider.simple;

+

+import java.util.ArrayList;

+import java.util.List;

+

+import junit.framework.TestCase;

+

+import org.eclipse.papyrus.sasheditor.contentprovider.IPageModel;

+import org.eclipse.papyrus.sasheditor.contentprovider.ITabFolderModel;

+import org.eclipse.swt.SWT;

+

+

+/**

+ * @author dumoulin

+ */

+public class SimpleSashWindowsContentProviderTest extends TestCase {

+

+	protected SimpleSashWindowsContentProvider contentProvider;

+

+	/**

+	 * Initialize the tree {@inheritDoc}

+	 */

+	@Override

+	protected void setUp() throws Exception {

+		super.setUp();

+		createContentProvider();

+	}

+

+	/**

+	 * Create a tree

+	 */

+	private void createContentProvider() {

+		contentProvider = new SimpleSashWindowsContentProvider();

+	}

+

+	/**

+	 * Test method for

+	 * {@link org.eclipse.papyrus.sasheditor.contentprovider.simple.SimpleSashWindowsContentProvider#addPage(org.eclipse.papyrus.sasheditor.contentprovider.IPageModel)}

+	 * .

+	 */

+	public void testAddTabIPageModel() {

+		IPageModel newModel = new FakePageModel();

+		contentProvider.addPage(newModel);

+

+		assertTrue("Folder contains added item", contentProvider.getCurrentTabFolder().getChildren().contains(newModel));

+	}

+

+	/**

+	 * Test method for

+	 * {@link org.eclipse.papyrus.sasheditor.contentprovider.simple.SimpleSashWindowsContentProvider#movePage(org.eclipse.papyrus.sasheditor.contentprovider.ITabFolderModel, int, int)}

+	 * .

+	 */

+	//	public void testMoveTabITabFolderModelIntInt() {

+	//		fail("Not yet implemented");

+	//	}

+

+	/**

+	 * Test method for

+	 * {@link org.eclipse.papyrus.sasheditor.contentprovider.simple.SimpleSashWindowsContentProvider#movePage(org.eclipse.papyrus.sasheditor.contentprovider.ITabFolderModel, int, org.eclipse.papyrus.sasheditor.contentprovider.ITabFolderModel, int)}

+	 * .

+	 */

+	//	public void testMoveTabITabFolderModelIntITabFolderModelInt() {

+	//		fail("Not yet implemented");

+	//	}

+

+	/**

+	 * Test method for

+	 * {@link org.eclipse.papyrus.sasheditor.contentprovider.simple.SimpleSashWindowsContentProvider#createFolder(org.eclipse.papyrus.sasheditor.contentprovider.ITabFolderModel, int, org.eclipse.papyrus.sasheditor.contentprovider.ITabFolderModel, int)}

+	 * .

+	 */

+	public void testCreateFolder() {

+

+		// Create pages and add them to the default folder

+		List<IPageModel> models = new ArrayList<IPageModel>();

+		for(int i = 0; i < 8; i++) {

+			IPageModel newModel = new FakePageModel("model" + i);

+			contentProvider.addPage(newModel);

+			models.add(newModel);

+		}

+

+		ITabFolderModel folder = contentProvider.getCurrentTabFolder();

+

+		//		// Do move tab 0 to right

+		//		ITabFolderModel newFolder = contentProvider.createFolder(folder, 0, folder, SWT.RIGHT);

+		//		// Check creation

+		//		assertNotNull("Folder created", newFolder);

+		//		// Check if correctly attached and reachable

+		//		assertEquals("Tab 2 added in correct folder", folder, contentProvider.getParentFolder(newModel2));

+		//		assertEquals("Tab 1 added in correct folder", newFolder, contentProvider.getParentFolder(newModel1));

+		//		

+		////		assertNotNull("folder attached", contentProvider.getParentFolder(newModel1));

+		////		assertNotNull("folder attached", contentProvider.getParentFolder(newModel1));

+		//		

+		//		assertTrue("Folder contains added item", newFolder.getChildren().contains(newModel1));

+		//		assertTrue("Folder contains added item", folder.getChildren().contains(newModel2));

+

+

+		// 

+		// Create another folder

+		int index = 0;

+		IPageModel movedTab = models.get(index++);

+		assertEquals("moved tab is the first in tab", movedTab, folder.getChildren().get(0));

+		contentProvider.createFolder(folder, 0, folder, SWT.UP);

+		// Find created folder

+		ITabFolderModel newFolder2 = contentProvider.getParentFolder(movedTab);

+		assertFolderCreated(folder, newFolder2, movedTab);

+

+		movedTab = models.get(index++);

+		assertEquals("moved tab is the first in tab", movedTab, folder.getChildren().get(0));

+		contentProvider.createFolder(folder, 0, newFolder2, SWT.UP);

+		ITabFolderModel newFolder3 = contentProvider.getParentFolder(movedTab);

+		assertFolderCreated(folder, newFolder3, movedTab);

+

+		movedTab = models.get(index++);

+		assertEquals("moved tab is the first in tab", movedTab, folder.getChildren().get(0));

+		contentProvider.createFolder(folder, 0, newFolder2, SWT.DOWN);

+		ITabFolderModel newFolder4 = contentProvider.getParentFolder(movedTab);

+		assertFolderCreated(folder, newFolder4, movedTab);

+

+		movedTab = models.get(index++);

+		assertEquals("moved tab is the first in tab", movedTab, folder.getChildren().get(0));

+		contentProvider.createFolder(folder, 0, folder, SWT.LEFT);

+		ITabFolderModel newFolder5 = contentProvider.getParentFolder(movedTab);

+		assertFolderCreated(folder, newFolder5, movedTab);

+

+	}

+

+	/**

+	 * Test method for

+	 * {@link org.eclipse.papyrus.sasheditor.contentprovider.simple.SimpleSashWindowsContentProvider#createFolder(org.eclipse.papyrus.sasheditor.contentprovider.ITabFolderModel, int, org.eclipse.papyrus.sasheditor.contentprovider.ITabFolderModel, int)}

+	 * .

+	 */

+	public void testCreateFolder_ITabFolderModel_int() {

+

+		// Create pages and add them to the default folder

+		List<IPageModel> models = new ArrayList<IPageModel>();

+		for(int i = 0; i < 8; i++) {

+			IPageModel newModel = new FakePageModel("model" + i);

+			contentProvider.addPage(newModel);

+			models.add(newModel);

+		}

+

+		ITabFolderModel referenceFolder = contentProvider.getCurrentTabFolder();

+

+		assertNotNull("referenceFolder exist", referenceFolder);

+		

+		// Create a new folder.

+		ITabFolderModel createdFolder = contentProvider.createFolder(referenceFolder, SWT.TOP);

+		

+		assertNotNull("folder created", createdFolder);

+		

+	}

+

+	/**

+	 * Assert folder is correctly created

+	 * 

+	 * @param srcFolder

+	 * @param newFolder

+	 * @param movedTab

+	 */

+	protected void assertFolderCreated(ITabFolderModel srcFolder, ITabFolderModel newFolder, IPageModel movedTab) {

+		// Check creation

+		assertNotNull("Folder exist", newFolder);

+

+		// Check if it is really a new folder

+		assertNotSame("Old folder and new folder are differents", srcFolder, newFolder);

+

+		// Check removed from source

+		assertFalse("item removed from source folder", srcFolder.getChildren().contains(movedTab));

+		// Check contained in created folder

+		assertTrue("Folder contains added item", newFolder.getChildren().contains(movedTab));

+	}

+	/**

+	 * Test method for {@link org.eclipse.papyrus.sasheditor.contentprovider.simple.SimpleSashWindowsContentProvider#removePage(int)}.

+	 */

+	//	public void testRemoveTabInt() {

+	//		fail("Not yet implemented");

+	//	}

+

+	/**

+	 * Test method for

+	 * {@link org.eclipse.papyrus.sasheditor.contentprovider.simple.SimpleSashWindowsContentProvider#removePage(org.eclipse.papyrus.sasheditor.contentprovider.IPageModel)}

+	 * .

+	 */

+	//	public void testRemoveTabIPageModel() {

+	//		fail("Not yet implemented");

+	//	}

+

+}

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/sasheditor/editor/AllTests.java b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/sasheditor/editor/AllTests.java
new file mode 100644
index 00000000000..7ab7d1defef
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/sasheditor/editor/AllTests.java
@@ -0,0 +1,26 @@
+/*****************************************************************************

+ * Copyright (c) 2010 CEA LIST.

+ *    

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.sasheditor.editor;

+

+import org.junit.runner.RunWith;

+import org.junit.runners.Suite;

+import org.junit.runners.Suite.SuiteClasses;

+

+

+/**

+ * All tests for package org.eclipse.papyrus.sasheditor.editor

+ */

+@RunWith(Suite.class)

+@SuiteClasses({ SashMultiPageEditorTest.class })

+public class AllTests {

+

+}

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/sasheditor/editor/FakeEditorModel.java b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/sasheditor/editor/FakeEditorModel.java
new file mode 100644
index 00000000000..9602494f120
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/sasheditor/editor/FakeEditorModel.java
@@ -0,0 +1,121 @@
+/**

+ * 

+ */

+package org.eclipse.papyrus.sasheditor.editor;

+

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.papyrus.sasheditor.contentprovider.IEditorModel;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.widgets.Composite;

+import org.eclipse.ui.IEditorInput;

+import org.eclipse.ui.IEditorPart;

+import org.eclipse.ui.IEditorSite;

+import org.eclipse.ui.PartInitException;

+import org.eclipse.ui.part.EditorActionBarContributor;

+import org.eclipse.ui.part.EditorPart;

+

+

+/**

+ * A simple model that can be used as editor in tests.

+ * @author cedric dumoulin

+ *

+ */

+public class FakeEditorModel  implements IEditorModel {

+

+	

+	private String name;

+

+	public FakeEditorModel() {

+		name = "noname";

+	}

+	/**

+	 * @see org.eclipse.papyrus.sasheditor.contentprovider.IPageModel#getTabTitle()

+	 *

+	 * @return

+	 */

+	public String getTabTitle() {

+		return name;

+	}

+

+	/**

+	 * @see org.eclipse.papyrus.sasheditor.contentprovider.IPageModel#getTabIcon()

+	 *

+	 * @return

+	 */

+	public Image getTabIcon() {

+		return null;

+	}

+

+	/**

+	 * @see org.eclipse.papyrus.sasheditor.contentprovider.IPageModel#getRawModel()

+	 *

+	 * @return

+	 */

+	public Object getRawModel() {

+		// TODO Auto-generated method stub

+		return this;

+	}

+

+	/**

+	 * @see org.eclipse.papyrus.sasheditor.contentprovider.IEditorModel#createIEditorPart()

+	 *

+	 * @return

+	 * @throws PartInitException

+	 */

+	public IEditorPart createIEditorPart() throws PartInitException {

+		return new FakeEditorPart();

+	}

+

+	/**

+	 * @see org.eclipse.papyrus.sasheditor.contentprovider.IEditorModel#getActionBarContributor()

+	 *

+	 * @return

+	 */

+	public EditorActionBarContributor getActionBarContributor() {

+		return null;

+	}

+

+	/**

+	 * A class implementing a fake editor.

+	 * @author dumoulin

+	 *

+	 */

+	public class FakeEditorPart extends EditorPart {

+

+		@Override

+		public void doSave(IProgressMonitor monitor) {

+		}

+

+		@Override

+		public void doSaveAs() {

+		}

+

+		@Override

+		public void init(IEditorSite site, IEditorInput input) throws PartInitException {

+			setSite(site);

+			setInput(input);

+			setPartName(input.getName());

+		}

+

+		@Override

+		public boolean isDirty() {

+			return false;

+		}

+

+		@Override

+		public boolean isSaveAsAllowed() {

+			return false;

+		}

+

+		@Override

+		public void createPartControl(Composite parent) {

+			// do nothing

+			

+		}

+

+		@Override

+		public void setFocus() {

+		}

+		

+	}

+}

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/sasheditor/editor/MessagePartModel.java b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/sasheditor/editor/MessagePartModel.java
new file mode 100644
index 00000000000..eafb0e28e85
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/sasheditor/editor/MessagePartModel.java
@@ -0,0 +1,73 @@
+package org.eclipse.papyrus.sasheditor.editor;

+

+import org.eclipse.papyrus.sasheditor.contentprovider.IComponentModel;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.custom.StyledText;

+import org.eclipse.swt.graphics.Image;

+import org.eclipse.swt.layout.FillLayout;

+import org.eclipse.swt.widgets.Composite;

+

+/**

+ * Description of the first page

+ * 

+ * @author dumoulin

+ */

+

+public class MessagePartModel implements IComponentModel {

+

+	private String title;

+

+	private String msg;

+

+	static private int count = 0;

+

+

+	/**

+	 * 

+	 */

+	public MessagePartModel(String msg) {

+		title = "newMsg " + count++;

+		this.msg = msg;

+	}

+

+	/**

+	 * @param title

+	 */

+	public MessagePartModel(String title, String msg) {

+		this.title = title;

+		this.msg = msg;

+	}

+

+	/**

+	 * Return the control to be shown. {@inheritDoc}

+	 */

+	public Composite createPartControl(Composite parent) {

+		Composite composite = new Composite(parent, SWT.NONE);

+		FillLayout layout = new FillLayout();

+		composite.setLayout(layout);

+		StyledText text;

+

+		text = new StyledText(composite, SWT.H_SCROLL | SWT.V_SCROLL);

+		text.setEditable(false);

+

+		text.setText("  " + msg + " - " + getTabTitle());

+		return composite;

+	}

+

+	public Image getTabIcon() {

+		return null;

+	}

+

+	public String getTabTitle() {

+		return title;

+	}

+

+	/**

+	 * Return this. In this implementation, the rawModel and the IEditorModel are the same.

+	 * 

+	 */

+	public Object getRawModel() {

+		return this;

+	}

+

+}

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/sasheditor/editor/SashMultiPageEditorTest.java b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/sasheditor/editor/SashMultiPageEditorTest.java
new file mode 100644
index 00000000000..61e08b69f7e
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/sasheditor/editor/SashMultiPageEditorTest.java
@@ -0,0 +1,21 @@
+/**

+ * 

+ */

+package org.eclipse.papyrus.sasheditor.editor;

+

+import junit.framework.TestCase;

+

+

+/**

+ * @author dumoulin

+ */

+public class SashMultiPageEditorTest extends TestCase {

+

+	/**

+	 * Test method for {@link org.eclipse.papyrus.sasheditor.editor.AbstractMultiPageSashEditor#refreshTabs()}.

+	 */

+	public void testRefreshTabs() {

+		//		fail("Not yet implemented"); // TODO

+	}

+

+}

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/sasheditor/editor/ShellEditor.java b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/sasheditor/editor/ShellEditor.java
new file mode 100644
index 00000000000..f86f5a598bc
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/sasheditor/editor/ShellEditor.java
@@ -0,0 +1,113 @@
+/*****************************************************************************

+ * Copyright (c) 2009 CEA LIST & LIFL 

+ *

+ *    

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.sasheditor.editor;

+

+import org.eclipse.papyrus.sasheditor.contentprovider.IPageModel;

+import org.eclipse.papyrus.sasheditor.contentprovider.ISashWindowsContentProvider;

+import org.eclipse.papyrus.sasheditor.contentprovider.simple.SimpleSashWindowsContentProvider;

+import org.eclipse.papyrus.sasheditor.internal.SashWindowsContainer;

+import org.eclipse.swt.layout.FillLayout;

+import org.eclipse.swt.widgets.Composite;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.swt.widgets.Shell;

+

+

+/**

+ * A standalone application testing the Sash system.

+ * It must be run as Java program.

+ * 

+ * @author dumoulin

+ */

+public class ShellEditor {

+

+	protected SashWindowsContainer sashContainer;

+

+	protected ISashWindowsContentProvider contentProvider;

+

+	/**

+	 * Constructor.

+	 * 

+	 * @param parent

+	 */

+	public ShellEditor(Shell parent) {

+		parent.setText(this.getClass().getSimpleName());

+		init();

+		createPartControl(parent);

+

+		// add tabItem

+		int count = 0;

+		IPageModel tabItem = new MessagePartModel("msg" + count++);

+		contentProvider.addPage(tabItem);

+		tabItem = new MessagePartModel("msg" + count++);

+		contentProvider.addPage(tabItem);

+

+		sashContainer.refreshTabs();

+	}

+

+	/**

+	 * init th class

+	 */

+	protected void init() {

+		contentProvider = new SimpleSashWindowsContentProvider();

+		sashContainer = new SashWindowsContainer();

+

+		initContentProvider();

+		sashContainer.setContentProvider(contentProvider);

+

+	}

+

+	/**

+	 * Create some windows.

+	 */

+	protected void initContentProvider() {

+		int count = 0;

+		IPageModel tabItem = new MessagePartModel("msg" + count++);

+		contentProvider.addPage(tabItem);

+

+		tabItem = new MessagePartModel("msg0" + count++);

+		contentProvider.addPage(tabItem);

+	}

+

+	/**

+	 * Create SWT control of this class

+	 * 

+	 * @param parent

+	 */

+	protected void createPartControl(Composite parent) {

+		//		Text newText = new Text(parent, SWT.BORDER & SWT.SCROLL_PAGE);

+

+		sashContainer.createPartControl(parent);

+	}

+

+	/**

+	 * @param args

+	 */

+	public static void main(String[] args) {

+		Display display = new Display();

+

+		Shell shell = new Shell(display);

+		shell.setLayout(new FillLayout());

+		new ShellEditor(shell);

+

+		shell.open();

+

+		while(!shell.isDisposed()) {

+			if(!display.readAndDispatch())

+				display.sleep();

+		}

+

+		display.dispose();

+	}

+

+}

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/sasheditor/internal/AllTests.java b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/sasheditor/internal/AllTests.java
new file mode 100644
index 00000000000..ff7882c3325
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/sasheditor/internal/AllTests.java
@@ -0,0 +1,26 @@
+/*****************************************************************************

+ * Copyright (c) 2010 CEA LIST.

+ *    

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.sasheditor.internal;

+

+import org.junit.runner.RunWith;

+import org.junit.runners.Suite;

+import org.junit.runners.Suite.SuiteClasses;

+

+

+/**

+ * All tests for package org.eclipse.papyrus.sasheditor.internal

+ */

+@RunWith(Suite.class)

+@SuiteClasses({ SashContainerEventsProviderTest.class, SashWindowsContainerEventsProviderTest.class, SashWindowsContainerTest.class })

+public class AllTests {

+

+}

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/sasheditor/internal/FakePagePart.java b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/sasheditor/internal/FakePagePart.java
new file mode 100644
index 00000000000..7f4e0708461
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/sasheditor/internal/FakePagePart.java
@@ -0,0 +1,57 @@
+/**

+ * 

+ */

+package org.eclipse.papyrus.sasheditor.internal;

+

+import org.eclipse.swt.widgets.Composite;

+import org.eclipse.swt.widgets.Control;

+

+

+/**

+ * A Page part for testing purpose. This page cannot be used in the SashContainer.

+ * @author cedric dumoulin

+ *

+ */

+public class FakePagePart extends PagePart {

+

+	public FakePagePart() {

+		super(null, null);

+	}

+

+	@Override

+	boolean visit(IPartVisitor visitor) {

+		// TODO Auto-generated method stub

+		return false;

+	}

+

+	@Override

+	public void createPartControl(Composite parent) {

+		// TODO Auto-generated method stub

+		

+	}

+

+	@Override

+	public Control getControl() {

+		// TODO Auto-generated method stub

+		return null;

+	}

+

+	@Override

+	public void reparent(TabFolderPart parent) {

+		// TODO Auto-generated method stub

+		

+	}

+

+	@Override

+	public void setFocus() {

+		// TODO Auto-generated method stub

+		

+	}

+

+	@Override

+	public void garbage() {

+		// TODO Auto-generated method stub

+		

+	}

+

+}

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/sasheditor/internal/FakeSashContainerEventsListener.java b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/sasheditor/internal/FakeSashContainerEventsListener.java
new file mode 100644
index 00000000000..8569b1cc836
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/sasheditor/internal/FakeSashContainerEventsListener.java
@@ -0,0 +1,185 @@
+/**

+ * 

+ */

+package org.eclipse.papyrus.sasheditor.internal;

+

+import java.util.ArrayList;

+import java.util.List;

+

+import org.eclipse.papyrus.sasheditor.editor.IPage;

+

+

+/**

+ * A fake listener implementation for testing purpose.

+ * @author cedric dumoulin

+ *

+ */

+public class FakeSashContainerEventsListener implements SashContainerEventsListener {

+

+	public static final String PAGE_CHANGED = "pageChanged";

+

+	public static final String PAGE_OPENED = "pageOpened";

+

+	public static final String PAGE_CLOSED = "pageClosed";

+

+	public static final String PAGE_ACTIVATED = "pageActivated";

+

+	public static final String PAGE_DEACTIVATED = "pageDeactivated";

+

+	public static final String PAGE_ABOUTTOBECLOSED = "pageAboutToBeClosed";

+

+	public static final String PAGE_ABOUTTOBEOPENED = "pageAboutToBeOpened";

+

+	/** */

+	public int eventCount = 0;

+	

+	/** */

+	public List<String> traces;

+	

+	/** */

+	public List<IPage> events;

+	

+	/**

+	 * 

+	 * Constructor.

+	 *

+	 */

+	public FakeSashContainerEventsListener() {

+		traces = new ArrayList<String>();

+		events = new ArrayList<IPage>();

+	}

+	

+	

+	/**

+	 * @return the eventCount

+	 */

+	public int getEventCount() {

+		return eventCount;

+	}

+

+	

+	/**

+	 * @return the trace

+	 */

+	public List<String> getTraces() {

+		return traces;

+	}

+

+	/**

+	 * @return the trace

+	 */

+	public String getTrace(int index) {

+		return traces.get(index);

+	}

+

+	/**

+	 * @return the trace

+	 */

+	public List<IPage> getEvents() {

+		return events;

+	}

+

+	/**

+	 * @return the trace

+	 */

+	public IPage getEvent(int index) {

+		return events.get(index);

+	}

+

+	/**

+	 * 

+	 */

+	public void resetChangeCount() {

+		eventCount = 0;

+	}

+	

+	/**

+	 * 

+	 */

+	public void resetTraces() {

+		traces.clear();

+		events.clear();

+	}

+	

+	/* ************************** */

+	/* Methods          */

+	/* ************************** */

+	

+	/**

+	 * @see org.eclipse.papyrus.sasheditor.editor.IPageChangedListener#pageChanged(org.eclipse.papyrus.sasheditor.editor.IPage)

+	 *

+	 * @param newPage

+	 */

+	public void pageChanged(IPage newPage) {

+		traces.add(PAGE_CHANGED);

+		events.add(newPage);

+		eventCount++;

+	}

+

+	/**

+	 * @see org.eclipse.papyrus.sasheditor.internal.SashContainerEventsListener#pageOpened(org.eclipse.papyrus.sasheditor.editor.IPage)

+	 *

+	 * @param page

+	 */

+	public void pageOpened(IPage page) {

+		traces.add(PAGE_OPENED);

+		events.add(page);

+		eventCount++;

+	}

+

+	/**

+	 * @see org.eclipse.papyrus.sasheditor.internal.SashContainerEventsListener#pageClosed(org.eclipse.papyrus.sasheditor.editor.IPage)

+	 *

+	 * @param page

+	 */

+	public void pageClosed(IPage page) {

+		traces.add(PAGE_CLOSED);

+		events.add(page);

+		eventCount++;

+	}

+

+	/**

+	 * @see org.eclipse.papyrus.sasheditor.internal.SashContainerEventsListener#pageActivated(org.eclipse.papyrus.sasheditor.editor.IPage)

+	 *

+	 * @param page

+	 */

+	public void pageActivated(IPage page) {

+		traces.add(PAGE_ACTIVATED);

+		events.add(page);

+		eventCount++;

+	}

+

+	/**

+	 * @see org.eclipse.papyrus.sasheditor.internal.SashContainerEventsListener#pageDeactivated(org.eclipse.papyrus.sasheditor.editor.IPage)

+	 *

+	 * @param page

+	 */

+	public void pageDeactivated(IPage page) {

+		traces.add(PAGE_DEACTIVATED);

+		events.add(page);

+		eventCount++;

+	}

+

+	/**

+	 * @see org.eclipse.papyrus.sasheditor.internal.SashContainerEventsListener#pageAboutToBeOpened(org.eclipse.papyrus.sasheditor.editor.IPage)

+	 *

+	 * @param page

+	 */

+	public void pageAboutToBeOpened(IPage page) {

+		traces.add(PAGE_ABOUTTOBEOPENED);

+		events.add(page);

+		eventCount++;

+	}

+

+	/**

+	 * @see org.eclipse.papyrus.sasheditor.internal.SashContainerEventsListener#pageAboutToBeClosed(org.eclipse.papyrus.sasheditor.editor.IPage)

+	 *

+	 * @param page

+	 */

+	public void pageAboutToBeClosed(IPage page) {

+		traces.add(PAGE_ABOUTTOBECLOSED);

+		events.add(page);

+		eventCount++;

+	}

+

+}

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/sasheditor/internal/SashContainerEventsProviderTest.java b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/sasheditor/internal/SashContainerEventsProviderTest.java
new file mode 100644
index 00000000000..ba345257b71
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/sasheditor/internal/SashContainerEventsProviderTest.java
@@ -0,0 +1,184 @@
+/**

+ * 

+ */

+package org.eclipse.papyrus.sasheditor.internal;

+

+import static org.junit.Assert.assertEquals;

+

+import org.junit.After;

+import org.junit.Before;

+import org.junit.Test;

+

+

+/**

+ * @author dumoulin

+ *

+ */

+public class SashContainerEventsProviderTest {

+

+	/**

+	 * @throws java.lang.Exception

+	 */

+	@Before

+	public void setUp() throws Exception {

+	}

+

+	/**

+	 * @throws java.lang.Exception

+	 */

+	@After

+	public void tearDown() throws Exception {

+	}

+

+	/**

+	 * Test method for {@link org.eclipse.papyrus.sasheditor.internal.SashContainerEventsProvider#addListener(org.eclipse.papyrus.sasheditor.internal.SashContainerEventsListener)}.

+	 */

+	@Test

+	public void testAddActiveEditorChangedListener() {

+		SashContainerEventsProvider provider = new SashContainerEventsProvider();

+		

+		FakeSashContainerEventsListener listener = new FakeSashContainerEventsListener();

+		provider.addListener(listener);

+		

+		// Use a null page, as it is not possible to instanciate a fake page.

+		PagePart page = null;

+		

+		// Send an event and check that it is received. If received, the listener is register !

+		provider.firePageAboutToBeClosedEvent(page);

+		assertEquals("event fired", 1, listener.getEventCount());

+	}

+

+	/**

+	 * Test method for {@link org.eclipse.papyrus.sasheditor.internal.SashContainerEventsProvider#removeListener(org.eclipse.papyrus.sasheditor.internal.SashContainerEventsListener)}.

+	 */

+	@Test

+	public void testRemoveActiveEditorChangedListener() {

+		SashContainerEventsProvider provider = new SashContainerEventsProvider();

+		

+		FakeSashContainerEventsListener listener = new FakeSashContainerEventsListener();

+		provider.addListener(listener);

+		provider.removeListener(listener);

+		

+		// Use a null page, as it is not possible to instanciate a fake page.

+		PagePart page = null;

+		

+		// Send an event and check that it is received. If received, the listener is register !

+		provider.firePageAboutToBeClosedEvent(page);

+		assertEquals("event not fired", 0, listener.getEventCount());

+	}

+

+	/**

+	 * Test method for {@link org.eclipse.papyrus.sasheditor.internal.SashContainerEventsProvider#firePageOpenedEvent(org.eclipse.papyrus.sasheditor.internal.PagePart)}.

+	 */

+	@Test

+	public void testFirePageOpenedEvent() {

+		SashContainerEventsProvider provider = new SashContainerEventsProvider();

+		

+		FakeSashContainerEventsListener listener = new FakeSashContainerEventsListener();

+		provider.addListener(listener);

+		

+		// Use a null page, as it is not possible to instanciate a fake page.

+		PagePart page = null;

+		

+		// Send an event and check that it is received. If received, the listener is register !

+		provider.firePageOpenedEvent(page);

+		assertEquals("event fired", 1, listener.getEventCount());

+		assertEquals("right event", FakeSashContainerEventsListener.PAGE_OPENED, listener.getTraces().get(0));

+	}

+

+	/**

+	 * Test method for {@link org.eclipse.papyrus.sasheditor.internal.SashContainerEventsProvider#firePageClosedEvent(org.eclipse.papyrus.sasheditor.internal.PagePart)}.

+	 */

+	@Test

+	public void testFirePageClosedEvent() {

+		SashContainerEventsProvider provider = new SashContainerEventsProvider();

+		

+		FakeSashContainerEventsListener listener = new FakeSashContainerEventsListener();

+		provider.addListener(listener);

+		

+		// Use a null page, as it is not possible to instanciate a fake page.

+		PagePart page = null;

+		

+		// Send an event and check that it is received. If received, the listener is register !

+		provider.firePageClosedEvent(page);

+		assertEquals("event fired", 1, listener.getEventCount());

+		assertEquals("right event", FakeSashContainerEventsListener.PAGE_CLOSED, listener.getTraces().get(0));

+	}

+

+	/**

+	 * Test method for {@link org.eclipse.papyrus.sasheditor.internal.SashContainerEventsProvider#firePageAboutToBeOpenedEvent(org.eclipse.papyrus.sasheditor.internal.PagePart)}.

+	 */

+	@Test

+	public void testFirePageAboutToBeOpenedEvent() {

+		SashContainerEventsProvider provider = new SashContainerEventsProvider();

+		

+		FakeSashContainerEventsListener listener = new FakeSashContainerEventsListener();

+		provider.addListener(listener);

+		

+		// Use a null page, as it is not possible to instanciate a fake page.

+		PagePart page = null;

+		

+		// Send an event and check that it is received. If received, the listener is register !

+		provider.firePageAboutToBeOpenedEvent(page);

+		assertEquals("event fired", 1, listener.getEventCount());

+		assertEquals("right event", FakeSashContainerEventsListener.PAGE_ABOUTTOBEOPENED, listener.getTraces().get(0));

+	}

+

+	/**

+	 * Test method for {@link org.eclipse.papyrus.sasheditor.internal.SashContainerEventsProvider#firePageAboutToBeClosedEvent(org.eclipse.papyrus.sasheditor.internal.PagePart)}.

+	 */

+	@Test

+	public void testFirePageAboutToBeClosedEvent() {

+		SashContainerEventsProvider provider = new SashContainerEventsProvider();

+		

+		FakeSashContainerEventsListener listener = new FakeSashContainerEventsListener();

+		provider.addListener(listener);

+		

+		// Use a null page, as it is not possible to instanciate a fake page.

+		PagePart page = null;

+		

+		// Send an event and check that it is received. If received, the listener is register !

+		provider.firePageAboutToBeClosedEvent(page);

+		assertEquals("event fired", 1, listener.getEventCount());

+		assertEquals("right event", FakeSashContainerEventsListener.PAGE_ABOUTTOBECLOSED, listener.getTraces().get(0));

+	}

+

+	/**

+	 * Test method for {@link org.eclipse.papyrus.sasheditor.internal.SashContainerEventsProvider#firePageActivatedEvent(org.eclipse.papyrus.sasheditor.internal.PagePart)}.

+	 */

+	@Test

+	public void testFirePageActivatedEvent() {

+		SashContainerEventsProvider provider = new SashContainerEventsProvider();

+		

+		FakeSashContainerEventsListener listener = new FakeSashContainerEventsListener();

+		provider.addListener(listener);

+		

+		// Use a null page, as it is not possible to instanciate a fake page.

+		PagePart page = null;

+		

+		// Send an event and check that it is received. If received, the listener is register !

+		provider.firePageActivatedEvent(page);

+		assertEquals("event fired", 1, listener.getEventCount());

+		assertEquals("right event", FakeSashContainerEventsListener.PAGE_ACTIVATED, listener.getTraces().get(0));

+	}

+

+	/**

+	 * Test method for {@link org.eclipse.papyrus.sasheditor.internal.SashContainerEventsProvider#firePageDeactivatedEvent(org.eclipse.papyrus.sasheditor.internal.PagePart)}.

+	 */

+	@Test

+	public void testFirePageDeactivatedEvent() {

+		SashContainerEventsProvider provider = new SashContainerEventsProvider();

+		

+		FakeSashContainerEventsListener listener = new FakeSashContainerEventsListener();

+		provider.addListener(listener);

+		

+		// Use a null page, as it is not possible to instanciate a fake page.

+		PagePart page = null;

+		

+		// Send an event and check that it is received. If received, the listener is register !

+		provider.firePageDeactivatedEvent(page);

+		assertEquals("event fired", 1, listener.getEventCount());

+		assertEquals("right event", FakeSashContainerEventsListener.PAGE_DEACTIVATED, listener.getTraces().get(0));

+	}

+

+}

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/sasheditor/internal/SashWindowsContainerEventsProviderTest.java b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/sasheditor/internal/SashWindowsContainerEventsProviderTest.java
new file mode 100644
index 00000000000..6d6d1e15f15
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/sasheditor/internal/SashWindowsContainerEventsProviderTest.java
@@ -0,0 +1,311 @@
+/**

+ * 

+ */

+package org.eclipse.papyrus.sasheditor.internal;

+

+import static org.junit.Assert.assertEquals;

+import static org.junit.Assert.assertNotNull;

+import static org.junit.Assert.assertTrue;

+

+import java.util.ArrayList;

+import java.util.List;

+

+import org.eclipse.papyrus.sasheditor.contentprovider.IPageModel;

+import org.eclipse.papyrus.sasheditor.contentprovider.ISashWindowsContentProvider;

+import org.eclipse.papyrus.sasheditor.contentprovider.ITabFolderModel;

+import org.eclipse.papyrus.sasheditor.contentprovider.simple.SimpleSashWindowsContentProvider;

+import org.eclipse.papyrus.sasheditor.editor.IPage;

+import org.eclipse.papyrus.sasheditor.editor.MessagePartModel;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.layout.FillLayout;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.swt.widgets.Shell;

+import org.junit.After;

+import org.junit.Before;

+import org.junit.Test;

+

+

+/**

+ * Test the Events provider behaviors when pages are added to the SashContainer.

+ * 

+ * @author cedric dumoulin

+ *

+ */

+public class SashWindowsContainerEventsProviderTest {

+

+	protected Display display;

+	

+	/**

+	 * @throws java.lang.Exception

+	 */

+	@Before

+	public void setUp() throws Exception {

+		if(display == null || display.isDisposed()) {

+			display = Display.getCurrent();

+		}

+		if(display == null) {

+			display = new Display();

+		}

+	}

+

+	/**

+	 * @throws java.lang.Exception

+	 */

+	@After

+	public void tearDown() throws Exception {

+		//		if(display != null) {

+		//			display.dispose();

+		//			display = null;

+		//		}

+	}

+

+

+	/**

+	 * 

+	 * @return

+	 */

+	private Display getDisplay() {

+		return display;

+			

+	}

+	/**

+	 * Create a {@link SashWindowsContainer} to test. Initialize it with provided {@link ISashWindowsContentProvider}.

+	 * 

+	 * @param contentProvider

+	 * @return

+	 */

+	protected SashWindowsContainer createSashWindowsContainer(ISashWindowsContentProvider contentProvider) {

+		

+		display = getDisplay();

+		Shell shell = new Shell(display);

+		shell.setLayout(new FillLayout());

+

+		//

+		//new ShellEditor(shell);

+		SashWindowsContainer sashWindowContainer = new SashWindowsContainer();

+

+		sashWindowContainer.setContentProvider(contentProvider);

+

+		sashWindowContainer.createPartControl(shell);

+		//		shell.open();

+		return sashWindowContainer;

+	}

+

+	/**

+	 * Create a contentProvider.

+	 * 

+	 * @return

+	 */

+	protected SimpleSashWindowsContentProvider createContentProvider() {

+		SimpleSashWindowsContentProvider contentProvider = new SimpleSashWindowsContentProvider();

+

+		// Create pages and add them to the default folder

+		List<IPageModel> models = new ArrayList<IPageModel>();

+		for(int i = 0; i < 8; i++) {

+			IPageModel newModel = new MessagePartModel("model" + i);

+			contentProvider.addPage(newModel);

+			models.add(newModel);

+		}

+

+		return contentProvider;

+	}

+

+	/**

+	 * Lookup a page by its raw model.

+	 * @param container

+	 * @param rawModel

+	 * @return

+	 */

+	protected IPage lookupTabFolderPart(SashWindowsContainer container, Object rawModel) {

+

+		LookupModelPageVisitor visitor = new LookupModelPageVisitor(rawModel);

+		container.visit(visitor);

+		return visitor.result();

+	}

+	

+	

+	/**

+	 * Test method for {@link org.eclipse.papyrus.sasheditor.internal.SashContainerEventsProvider#addListener(org.eclipse.papyrus.sasheditor.internal.SashContainerEventsListener)}.

+	 */

+	@Test

+	public void testAddActiveEditorChangedListener() {

+	}

+

+	/**

+	 * Test method for {@link org.eclipse.papyrus.sasheditor.internal.SashContainerEventsProvider#removeListener(org.eclipse.papyrus.sasheditor.internal.SashContainerEventsListener)}.

+	 */

+	@Test

+	public void testRemoveActiveEditorChangedListener() {

+	}

+

+	/**

+	 * Test method for {@link org.eclipse.papyrus.sasheditor.internal.SashContainerEventsProvider#firePageOpenedEvent(org.eclipse.papyrus.sasheditor.internal.PagePart)}.

+	 */

+	@Test

+	public void testFirePageOpenedEvent() {

+		

+		// Create container and contentProvider

+		ISashWindowsContentProvider contentProvider = createContentProvider();

+		SashWindowsContainer container = createSashWindowsContainer(contentProvider);

+

+		// Create listener and attach it

+		FakeSashContainerEventsListener listener = new FakeSashContainerEventsListener();

+		container.addLifeCycleListener(listener);

+

+		// Do refresh. This fire events

+		container.refreshTabs();

+		listener.resetChangeCount();

+		listener.resetTraces();

+

+		

+		// Add an editor

+		contentProvider.addPage( new MessagePartModel("newPage") );

+		container.refreshTabs();

+		

+		// check events (there is more than the 2 expected)

+		assertTrue("event fired", 2<=listener.getEventCount());

+		int i=0;

+		assertEquals("right event", FakeSashContainerEventsListener.PAGE_ABOUTTOBEOPENED, listener.getTraces().get(i++));

+		assertEquals("right event", FakeSashContainerEventsListener.PAGE_OPENED, listener.getTraces().get(i++));

+	}

+

+	/**

+	 * Test method for {@link org.eclipse.papyrus.sasheditor.internal.SashContainerEventsProvider#firePageClosedEvent(org.eclipse.papyrus.sasheditor.internal.PagePart)}.

+	 */

+	@Test

+	public void testFirePageClosedEvent() {

+		// Create container and contentProvider

+		ISashWindowsContentProvider contentProvider = createContentProvider();

+		SashWindowsContainer container = createSashWindowsContainer(contentProvider);

+

+		// Create listener and attach it

+		FakeSashContainerEventsListener listener = new FakeSashContainerEventsListener();

+		container.addLifeCycleListener(listener);

+

+		// Do refresh. This fire events

+		container.refreshTabs();

+

+		

+		// Add an editor

+		IPageModel model = new MessagePartModel("newPage");

+		contentProvider.addPage( model );

+		container.refreshTabs();

+		listener.resetChangeCount();

+		listener.resetTraces();

+		

+		IPage page1 = lookupTabFolderPart(container, model);

+		assertNotNull("Page found", page1);

+

+		// Close page

+		contentProvider.removePage(model);

+		container.refreshTabs();

+		

+		// check events (there is more than the 2 expected)

+		assertTrue("event fired", 2<=listener.getEventCount());

+		

+		assertTrue("close event fired", listener.getEvents().contains(page1));

+		assertTrue("close event fired", listener.getTraces().contains(FakeSashContainerEventsListener.PAGE_CLOSED));

+		int index = listener.getTraces().indexOf(FakeSashContainerEventsListener.PAGE_CLOSED);

+		assertEquals("right page closed", page1, listener.getEvent(index));

+	}

+

+	/**

+	 * Test method for {@link org.eclipse.papyrus.sasheditor.internal.SashContainerEventsProvider#firePageAboutToBeOpenedEvent(org.eclipse.papyrus.sasheditor.internal.PagePart)}.

+	 */

+	@Test

+	public void testFirePageAboutToBeOpenedEvent() {

+		// Create container and contentProvider

+		ISashWindowsContentProvider contentProvider = createContentProvider();

+		SashWindowsContainer container = createSashWindowsContainer(contentProvider);

+

+		// Create listener and attach it

+		FakeSashContainerEventsListener listener = new FakeSashContainerEventsListener();

+		container.addLifeCycleListener(listener);

+

+		// Do refresh. This fire events

+		container.refreshTabs();

+		listener.resetChangeCount();

+		listener.resetTraces();

+

+		

+		// Add an editor

+		contentProvider.addPage( new MessagePartModel("newPage") );

+		container.refreshTabs();

+		

+		// check events (there is more than the 2 expected)

+		assertTrue("event fired", 2<=listener.getEventCount());

+		int i=0;

+		assertEquals("right event", FakeSashContainerEventsListener.PAGE_ABOUTTOBEOPENED, listener.getTraces().get(i++));

+	}

+

+	/**

+	 * Test method for {@link org.eclipse.papyrus.sasheditor.internal.SashContainerEventsProvider#firePageAboutToBeClosedEvent(org.eclipse.papyrus.sasheditor.internal.PagePart)}.

+	 */

+	@Test

+	public void testFirePageAboutToBeClosedEvent() {

+		// no such event anymore

+	}

+

+	/**

+	 * Test method for {@link org.eclipse.papyrus.sasheditor.internal.SashContainerEventsProvider#firePageActivatedEvent(org.eclipse.papyrus.sasheditor.internal.PagePart)}.

+	 */

+	@Test

+	public void testFirePageActivatedEvent() {

+		// Create container and contentProvider

+		SimpleSashWindowsContentProvider contentProvider = createContentProvider();

+		SashWindowsContainer container = createSashWindowsContainer(contentProvider);

+

+		// Create listener and attach it

+		FakeSashContainerEventsListener listener = new FakeSashContainerEventsListener();

+		container.addLifeCycleListener(listener);

+

+		container.refreshTabs();

+

+		

+		// Add two pages

+		IPageModel pageModel1 = new MessagePartModel("newPage1");

+		IPageModel pageModel2 = new MessagePartModel("newPage2");

+		contentProvider.addPage(pageModel1);

+		contentProvider.addPage(pageModel2);

+		

+		

+		// Do refresh. This fire events

+		container.refreshTabs();

+		listener.resetChangeCount();

+		listener.resetTraces();

+

+		// Activate page 1

+		IPage page1 = lookupTabFolderPart(container, pageModel1);

+		container.selectPage(page1);

+		

+		// check events (there is more than the 2 expected)

+		assertEquals("event fired", 1, listener.getEventCount());

+		int i=0;

+		assertEquals("right event", FakeSashContainerEventsListener.PAGE_ACTIVATED, listener.getTraces().get(i++));

+		

+		// ****************

+		// Check with a move

+		listener.resetChangeCount();

+		listener.resetTraces();

+

+		ITabFolderModel folderModel = contentProvider.getCurrentTabFolder();

+		contentProvider.createFolder(folderModel, 1, folderModel, SWT.TOP);

+

+		// Do refresh. This fire events

+		container.refreshTabs();

+		// check events (there is more than the 2 expected)

+		assertEquals("event fired", 3, listener.getEventCount());

+		i=0;

+		assertEquals("right event", FakeSashContainerEventsListener.PAGE_ACTIVATED, listener.getTraces().get(i++));

+		

+

+	}

+

+	/**

+	 * Test method for {@link org.eclipse.papyrus.sasheditor.internal.SashContainerEventsProvider#firePageDeactivatedEvent(org.eclipse.papyrus.sasheditor.internal.PagePart)}.

+	 */

+	@Test

+	public void testFirePageDeactivatedEvent() {

+	}

+

+}

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/sasheditor/internal/SashWindowsContainerTest.java b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/sasheditor/internal/SashWindowsContainerTest.java
new file mode 100644
index 00000000000..f7de1424c49
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/sasheditor/internal/SashWindowsContainerTest.java
@@ -0,0 +1,326 @@
+/**

+ * 

+ */

+package org.eclipse.papyrus.sasheditor.internal;

+

+import java.util.ArrayList;

+import java.util.Collection;

+import java.util.List;

+

+import junit.framework.TestCase;

+

+import org.eclipse.jface.action.MenuManager;

+import org.eclipse.papyrus.sasheditor.contentprovider.IPageModel;

+import org.eclipse.papyrus.sasheditor.contentprovider.ISashWindowsContentProvider;

+import org.eclipse.papyrus.sasheditor.contentprovider.ITabFolderModel;

+import org.eclipse.papyrus.sasheditor.contentprovider.simple.SimpleSashWindowsContentProvider;

+import org.eclipse.papyrus.sasheditor.editor.IComponentPage;

+import org.eclipse.papyrus.sasheditor.editor.IEditorPage;

+import org.eclipse.papyrus.sasheditor.editor.IPage;

+import org.eclipse.papyrus.sasheditor.editor.IPageVisitor;

+import org.eclipse.papyrus.sasheditor.editor.MessagePartModel;

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.layout.FillLayout;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.swt.widgets.Shell;

+

+

+/**

+ * Run as normal test.

+ * 

+ * @author dumoulin

+ * 

+ */

+public class SashWindowsContainerTest extends TestCase {

+

+

+	protected Display display;

+

+	/**

+	 * Constructor.

+	 * 

+	 * @param name

+	 */

+	public SashWindowsContainerTest(String name) {

+		super(name);

+	}

+

+	/**

+	 * @see junit.framework.TestCase#setUp()

+	 * @throws java.lang.Exception

+	 * 

+	 */

+	protected void setUp() throws Exception {

+		super.setUp();

+		display = Display.getCurrent();

+		if(display == null) {

+			display = new Display();

+		}

+

+	}

+

+	/**

+	 * @see junit.framework.TestCase#tearDown()

+	 * @throws java.lang.Exception

+	 * 

+	 */

+	protected void tearDown() throws Exception {

+		super.tearDown();

+		//display.dispose();

+	}

+

+	/**

+	 * Create a {@link SashWindowsContainer} to test. Initialize it with provided {@link ISashWindowsContentProvider}.

+	 * 

+	 * @param contentProvider

+	 * @return

+	 */

+	protected SashWindowsContainer createSashWindowsContainer(ISashWindowsContentProvider contentProvider) {

+		Shell shell = new Shell(display);

+		shell.setLayout(new FillLayout());

+

+		//

+		//new ShellEditor(shell);

+		SashWindowsContainer sashWindowContainer = new SashWindowsContainer();

+

+		sashWindowContainer.setContentProvider(contentProvider);

+

+		sashWindowContainer.createPartControl(shell);

+		//		shell.open();

+		return sashWindowContainer;

+	}

+

+	/**

+	 * Create a contentProvider.

+	 * 

+	 * @return

+	 */

+	protected ISashWindowsContentProvider createContentProvider() {

+		SimpleSashWindowsContentProvider contentProvider = new SimpleSashWindowsContentProvider();

+

+		// Create pages and add them to the default folder

+		List<IPageModel> models = new ArrayList<IPageModel>();

+		for(int i = 0; i < 8; i++) {

+			IPageModel newModel = new MessagePartModel("model" + i);

+			contentProvider.addPage(newModel);

+			models.add(newModel);

+		}

+

+		return contentProvider;

+	}

+

+	/**

+	 * Test the method on a model with several folders and page.

+	 * Test method for {@link org.eclipse.papyrus.sasheditor.internal.SashWindowsContainer#getActiveEditor()}.

+	 */

+	public void testGetActiveEditor() {

+		// Create 

+		SimpleSashWindowsContentProvider contentProvider = new SimpleSashWindowsContentProvider();

+

+		// Create pages and add them to the default folder

+		List<IPageModel> models = new ArrayList<IPageModel>();

+		for(int i = 0; i < 2; i++) {

+			IPageModel newModel = new MessagePartModel("model" + i);

+			contentProvider.addPage(newModel);

+			models.add(newModel);

+		}

+

+		// Create new folder

+		ITabFolderModel folder = contentProvider.getCurrentTabFolder();

+		contentProvider.createFolder(folder, 1, folder, SWT.TOP);

+

+		// Get the active editor

+		SashWindowsContainer container = createSashWindowsContainer(contentProvider);

+		IPage page = container.getActiveSashWindowsPage();

+		assertNotNull("Page exist", page);

+	}

+

+	/**

+	 * Test the method on a model with no pages.

+	 * Test method for {@link org.eclipse.papyrus.sasheditor.internal.SashWindowsContainer#getActiveEditor()}.

+	 */

+	public void testGetActiveEditorNoPage() {

+		// Create 

+		SimpleSashWindowsContentProvider contentProvider = new SimpleSashWindowsContentProvider();

+

+

+		// Get the active editor

+		SashWindowsContainer container = createSashWindowsContainer(contentProvider);

+		IPage page = container.getActiveSashWindowsPage();

+		assertNull("No Page exist", page);

+	}

+

+

+	/**

+	 * Test method for {@link org.eclipse.papyrus.sasheditor.internal.SashWindowsContainer#refreshTabs()}.

+	 */

+	public void testRefreshTabs() {

+

+		ISashWindowsContentProvider contentProvider = createContentProvider();

+		SashWindowsContainer container = createSashWindowsContainer(contentProvider);

+

+		container.refreshTabs();

+		assertNotNull("container is set", container);

+

+	}

+

+	/**

+	 * Test method for {@link org.eclipse.papyrus.sasheditor.internal.SashWindowsContainer#refreshTabs()}.

+	 */

+	public void testRefreshTabs2() {

+

+		// Test 2 folders, one tab each. Then supress one tabs.

+		// 1 folder with one tab should remain. 

+		SimpleSashWindowsContentProvider contentProvider = new SimpleSashWindowsContentProvider();

+

+		// Create pages and add them to the default folder

+		List<IPageModel> models = new ArrayList<IPageModel>();

+		for(int i = 0; i < 2; i++) {

+			IPageModel newModel = new MessagePartModel("model" + i);

+			contentProvider.addPage(newModel);

+			models.add(newModel);

+		}

+

+		// Create new folder

+		ITabFolderModel folder = contentProvider.getCurrentTabFolder();

+		contentProvider.createFolder(folder, 1, folder, SWT.TOP);

+

+		// Create the container

+		SashWindowsContainer container = createSashWindowsContainer(contentProvider);

+		container.refreshTabs();

+		assertNotNull("container is set", container);

+

+	}

+

+	/**

+	 * Test method for {@link SashWindowsContainer#visit(org.eclipse.papyrus.sasheditor.editor.IPageVisitor)}

+	 */

+	public void testVisit() {

+		// Create 

+		SimpleSashWindowsContentProvider contentProvider = new SimpleSashWindowsContentProvider();

+

+		// Create pages and add them to the default folder

+		List<IPageModel> models = new ArrayList<IPageModel>();

+		for(int i = 0; i < 2; i++) {

+			IPageModel newModel = new MessagePartModel("model" + i);

+			contentProvider.addPage(newModel);

+			models.add(newModel);

+		}

+

+		// Create new folder

+		ITabFolderModel folder = contentProvider.getCurrentTabFolder();

+		contentProvider.createFolder(folder, 1, folder, SWT.TOP);

+

+		// Get the active editor

+		SashWindowsContainer container = createSashWindowsContainer(contentProvider);

+

+		CollectRawModelVisitor pageVisitor = new CollectRawModelVisitor();

+		container.visit(pageVisitor);

+

+		// Check each elements

+		Collection<Object> results = pageVisitor.collected;

+		assertEquals("list are of same size", models.size(), results.size());

+		for(Object model : models) {

+			assertTrue("model is in the collected list", results.contains(model));

+		}

+	}

+

+	protected class CollectRawModelVisitor implements IPageVisitor {

+

+		Collection<Object> collected = new ArrayList<Object>();

+

+		public void accept(IComponentPage page) {

+			collected.add(page.getRawModel());

+		}

+

+		public void accept(IEditorPage page) {

+			collected.add(page.getRawModel());

+		}

+	}

+

+	/**

+	 * Test the lookup of a page by its raw model

+	 * Test method for {@link SashWindowsContainer#lookupModelPage(Object)}

+	 */

+	public void testlookupModelPage() {

+		// Create 

+		SimpleSashWindowsContentProvider contentProvider = new SimpleSashWindowsContentProvider();

+

+		// Create pages and add them to the default folder

+		List<IPageModel> models = new ArrayList<IPageModel>();

+		for(int i = 0; i < 2; i++) {

+			IPageModel newModel = new MessagePartModel("model" + i);

+			contentProvider.addPage(newModel);

+			models.add(newModel);

+		}

+

+		// Create new folder

+		ITabFolderModel folder = contentProvider.getCurrentTabFolder();

+		contentProvider.createFolder(folder, 1, folder, SWT.TOP);

+

+		// Get the active editor

+		SashWindowsContainer container = createSashWindowsContainer(contentProvider);

+

+		Object model = models.get(1);

+		IPage foundPage = container.lookupModelPage(model);

+		assertEquals("Corresponding page is found", foundPage.getRawModel(), model);

+	}

+	

+	/**

+	 * Test method for {@link SashWindowsContainer#setFolderTabMenuManager(MenuManager)}

+	 */

+	public void testSetFolderTabMenuManager_MenuManager() {

+		// Create 

+		SimpleSashWindowsContentProvider contentProvider = new SimpleSashWindowsContentProvider();

+

+		// Create pages and add them to the default folder

+		List<IPageModel> models = new ArrayList<IPageModel>();

+		for(int i = 0; i < 2; i++) {

+			IPageModel newModel = new MessagePartModel("model" + i);

+			contentProvider.addPage(newModel);

+			models.add(newModel);

+		}

+

+		// Create new folders

+		ITabFolderModel referenceFolder = contentProvider.getCurrentTabFolder();

+		ITabFolderModel folder1 = contentProvider.createFolder(referenceFolder, SWT.TOP);

+		ITabFolderModel folder2 = contentProvider.createFolder(referenceFolder, SWT.DOWN);

+		ITabFolderModel folder3 = contentProvider.createFolder(referenceFolder, SWT.LEFT);

+

+		// Create SashWindowsContainer

+		SashWindowsContainer container = createSashWindowsContainer(contentProvider);

+		// Set a MenuManager

+		MenuManager menuManager = new MenuManager();

+		container.setFolderTabMenuManager(menuManager);

+		

+		// Test if the menu has been set in already created folders.

+		TabFolderPart folderPart = lookupTabFolderPart(container, referenceFolder);

+		assertNotNull("menu exist", folderPart.getControl().getMenu() );;

+		

+		folderPart = lookupTabFolderPart(container, folder1);

+		assertNotNull("menu exist", folderPart.getControl().getMenu() );;

+		

+		folderPart = lookupTabFolderPart(container, folder2);

+		assertNotNull("menu exist", folderPart.getControl().getMenu() );;

+		

+		folderPart = lookupTabFolderPart(container, folder3);

+		assertNotNull("menu exist", folderPart.getControl().getMenu() );;

+		

+

+		// Now create another tab, refresh the container in order that the part is created,

+		// ant test it

+		ITabFolderModel folder4 = contentProvider.createFolder(referenceFolder, SWT.RIGHT);

+		container.refreshTabs();

+		

+		folderPart = lookupTabFolderPart(container, folder4);

+		assertNotNull("menu exist", folderPart.getControl().getMenu() );;

+		

+	}

+

+	protected TabFolderPart lookupTabFolderPart(SashWindowsContainer container, Object rawModel) {

+

+		LookupFolderPartByRawModelVisitor visitor = new LookupFolderPartByRawModelVisitor(rawModel);

+		container.visit(visitor);

+		return visitor.result();

+	}

+}

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/sasheditor/tests/AllTests.java b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/sasheditor/tests/AllTests.java
new file mode 100644
index 00000000000..f43023974f5
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/sasheditor/tests/AllTests.java
@@ -0,0 +1,28 @@
+/*****************************************************************************

+ * Copyright (c) 2010 CEA LIST.

+ *    

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.sasheditor.tests;

+

+import org.junit.runner.RunWith;

+import org.junit.runners.Suite;

+import org.junit.runners.Suite.SuiteClasses;

+

+

+/**

+ * All tests for this plugin

+ */

+@RunWith(Suite.class)

+@SuiteClasses({

+// testModel1

+org.eclipse.papyrus.sasheditor.contentprovider.simple.AllTests.class, org.eclipse.papyrus.sasheditor.editor.AllTests.class, org.eclipse.papyrus.sasheditor.internal.AllTests.class })

+public class AllTests {

+

+}

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.tests/.classpath b/tests/junit/plugins/core/org.eclipse.papyrus.tests/.classpath
new file mode 100644
index 00000000000..046bda900d2
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.tests/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<classpath>

+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

+	<classpathentry kind="src" path="test"/>

+	<classpathentry kind="output" path="bin"/>

+</classpath>

diff --git a/tests/org.eclipse.papyrus.core.test/.project b/tests/junit/plugins/core/org.eclipse.papyrus.tests/.project
index e0b2f2efb99..979bedcae53 100644
--- a/tests/org.eclipse.papyrus.core.test/.project
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.tests/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <projectDescription>

-	<name>org.eclipse.papyrus.core.test</name>

+	<name>org.eclipse.papyrus.tests</name>

 	<comment></comment>

 	<projects>

 	</projects>

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/core/org.eclipse.papyrus.tests/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..37093296dcd
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.tests/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,8 @@
+#Mon Nov 15 14:11:42 CET 2010

+eclipse.preferences.version=1

+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5

+org.eclipse.jdt.core.compiler.compliance=1.5

+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

+org.eclipse.jdt.core.compiler.source=1.5

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/core/org.eclipse.papyrus.tests/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..4627db3899c
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.tests/META-INF/MANIFEST.MF
@@ -0,0 +1,17 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.papyrus.tests
+Bundle-Version: 0.7.1.qualifier
+Bundle-Activator: org.eclipse.papyrus.tests.Activator
+Bundle-Vendor: %providerName
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.junit;bundle-version="4.8.1",
+ org.eclipse.papyrus.diagram.common;bundle-version="0.7.1",
+ org.eclipse.papyrus.core.resourceloading;bundle-version="0.7.1",
+ org.eclipse.papyrus.diagram.clazz.test;bundle-version="0.7.1",
+ org.eclipse.papyrus.sysml.tests;bundle-version="0.7.1"
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-ActivationPolicy: lazy
+Bundle-Localization: plugin
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.tests/Papyrus ALL tests.launch b/tests/junit/plugins/core/org.eclipse.papyrus.tests/Papyrus ALL tests.launch
new file mode 100644
index 00000000000..ca6182cd7e8
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.tests/Papyrus ALL tests.launch
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">

+<booleanAttribute key="askclear" value="false"/>

+<booleanAttribute key="automaticAdd" value="true"/>

+<booleanAttribute key="automaticValidate" value="false"/>

+<stringAttribute key="bootstrap" value=""/>

+<stringAttribute key="checked" value="[NONE]"/>

+<booleanAttribute key="clearConfig" value="true"/>

+<booleanAttribute key="clearws" value="true"/>

+<booleanAttribute key="clearwslog" value="true"/>

+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/Papyrus ALL tests"/>

+<booleanAttribute key="default" value="true"/>

+<booleanAttribute key="includeOptional" value="true"/>

+<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>

+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">

+<listEntry value="/org.eclipse.papyrus.tests/src/org/eclipse/papyrus/tests/AllTests.java"/>

+</listAttribute>

+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">

+<listEntry value="1"/>

+</listAttribute>

+<mapAttribute key="org.eclipse.debug.core.environmentVariables">

+<mapEntry key="skip.long.junit.tests" value="false"/>

+</mapAttribute>

+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>

+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>

+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>

+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>

+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.tests.AllTests"/>

+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.tests"/>

+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>

+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -Xms60m -Xmx1024m -DsuppressRawWhenUnchecked=true -XX:MaxPermSize=256M"/>

+<stringAttribute key="pde.version" value="3.3"/>

+<stringAttribute key="product" value="org.eclipse.platform.ide"/>

+<booleanAttribute key="run_in_ui_thread" value="true"/>

+<booleanAttribute key="show_selected_only" value="false"/>

+<booleanAttribute key="tracing" value="true"/>

+<booleanAttribute key="useCustomFeatures" value="false"/>

+<booleanAttribute key="useDefaultConfig" value="true"/>

+<booleanAttribute key="useDefaultConfigArea" value="true"/>

+<booleanAttribute key="useProduct" value="true"/>

+</launchConfiguration>

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.tests/about.html b/tests/junit/plugins/core/org.eclipse.papyrus.tests/about.html
new file mode 100644
index 00000000000..82d49bf5f81
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.tests/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

+<title>About</title>

+</head>

+<body lang="EN-US">

+<h2>About This Content</h2>

+ 

+<p>June 5, 2007</p>	

+<h3>License</h3>

+

+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

+indicated below, the Content is provided to you under the terms and conditions of the

+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

+

+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

+apply to your use of any object code in the Content.  Check the Redistributor's license that was 

+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

+indicated below, the terms and conditions of the EPL still apply to any source code in the Content

+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

+

+</body>

+</html>

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.tests/build.properties b/tests/junit/plugins/core/org.eclipse.papyrus.tests/build.properties
new file mode 100644
index 00000000000..2b4b9065052
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.tests/build.properties
@@ -0,0 +1,7 @@
+source.. = test/

+output.. = bin/

+bin.includes = META-INF/,\

+               .,\

+               plugin.properties,\

+               about.html,\

+               Papyrus ALL tests.launch

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.tests/plugin.properties b/tests/junit/plugins/core/org.eclipse.papyrus.tests/plugin.properties
new file mode 100644
index 00000000000..855abf54aa5
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.tests/plugin.properties
@@ -0,0 +1,12 @@
+#################################################################################

+# Copyright (c) 2008 CEA LIST.

+# All rights reserved. This program and the accompanying materials

+# are made available under the terms of the Eclipse Public License v1.0

+# which accompanies this distribution, and is available at

+# http://www.eclipse.org/legal/epl-v10.html

+#

+# Contributors:

+#     Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - initial API and implementation

+##################################################################################

+pluginName=Tests for Papyrus (Incubation)

+providerName=Eclipse Modeling Project

diff --git a/tests/org.eclipse.papyrus.diagram.common.tests/src/org/eclipse/papyrus/diagram/common/tests/Activator.java b/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/Activator.java
index 85f3b5d7e80..7e5f01a0692 100644
--- a/tests/org.eclipse.papyrus.diagram.common.tests/src/org/eclipse/papyrus/diagram/common/tests/Activator.java
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/Activator.java
@@ -1,15 +1,15 @@
-package org.eclipse.papyrus.diagram.common.tests;

+package org.eclipse.papyrus.tests;

 

-import org.eclipse.core.runtime.Plugin;

+import org.eclipse.ui.plugin.AbstractUIPlugin;

 import org.osgi.framework.BundleContext;

 

 /**

  * The activator class controls the plug-in life cycle

  */

-public class Activator extends Plugin {

+public class Activator extends AbstractUIPlugin {

 

 	// The plug-in ID

-	public static final String PLUGIN_ID = "org.eclipse.papyrus.diagram.common.tests";

+	public static final String PLUGIN_ID = "org.eclipse.papyrus.tests"; //$NON-NLS-1$

 

 	// The shared instance

 	private static Activator plugin;

@@ -22,7 +22,7 @@ public class Activator extends Plugin {
 

 	/*

 	 * (non-Javadoc)

-	 * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)

+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)

 	 */

 	public void start(BundleContext context) throws Exception {

 		super.start(context);

@@ -31,7 +31,7 @@ public class Activator extends Plugin {
 

 	/*

 	 * (non-Javadoc)

-	 * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)

+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)

 	 */

 	public void stop(BundleContext context) throws Exception {

 		plugin = null;

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllTests.java b/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllTests.java
new file mode 100644
index 00000000000..37f407735ea
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllTests.java
@@ -0,0 +1,100 @@
+/*****************************************************************************

+ * Copyright (c) 2010 CEA LIST.

+ *    

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.tests;

+

+import java.util.ArrayList;

+import java.util.Arrays;

+import java.util.Collection;

+import java.util.List;

+

+import org.eclipse.core.runtime.Platform;

+import org.eclipse.papyrus.sysml.tests.SysmlAllTests;

+import org.eclipse.papyrus.tests.launcher.FragmentTestSuiteClass;

+import org.eclipse.papyrus.tests.launcher.ITestSuiteClass;

+import org.eclipse.papyrus.tests.launcher.PluginTestSuiteClass;

+import org.junit.runner.RunWith;

+import org.junit.runners.Suite;

+import org.junit.runners.model.InitializationError;

+import org.osgi.framework.Bundle;

+

+

+/**

+ * Test class for all tests for Papyrus

+ */

+@RunWith(AllTests.AllTestsRunner.class)

+public class AllTests {

+

+	/** list of classes to launch */

+	public static final List<ITestSuiteClass> suiteClasses = Arrays.asList(

+

+	/* **************** plugins *********************** */

+	/* core */

+	// {oep}.core

+	new FragmentTestSuiteClass(org.eclipse.papyrus.core.Activator.PLUGIN_ID, "org.eclipse.papyrus.core.tests.AllTests"),

+	// {oep}.sasheditor.tests

+	new FragmentTestSuiteClass(org.eclipse.papyrus.sasheditor.Activator.PLUGIN_ID, "org.eclipse.papyrus.sasheditor.tests.AllTests"),

+	// {oep}.core.resourceloading.tests

+	new FragmentTestSuiteClass(org.eclipse.papyrus.core.resourceloading.Activator.PLUGIN_ID, "org.eclipse.papyrus.core.resourceloading.tests.AllTests"),

+

+	/* uml */

+	// {oep}.diagram.common.tests

+	new FragmentTestSuiteClass(org.eclipse.papyrus.diagram.common.Activator.ID, "org.eclipse.papyrus.diagram.common.tests.AllTests"),

+	// {oep}.diagram.clazz.tests

+	new PluginTestSuiteClass(org.eclipse.papyrus.diagram.clazz.test.AllTests.class),

+	// {oep}.sysml.tests

+	new PluginTestSuiteClass(SysmlAllTests.class)

+	

+	//end

+	);

+

+

+

+

+	/**

+	 * Finds and runs tests.

+	 */

+	public static class AllTestsRunner extends Suite {

+

+		/**

+		 * Constructor.

+		 * 

+		 * @param clazz

+		 *        the suite class – AllTests2

+		 * @throws InitializationError

+		 *         if there's a problem

+		 * @throws org.junit.runners.model.InitializationError

+		 */

+		public AllTestsRunner(final Class<?> clazz) throws InitializationError {

+			super(clazz, getSuites());

+		}

+	}

+

+	/**

+	 * Returns the list of test classes

+	 * 

+	 * @return the list of test classes

+	 */

+	private static Class<?>[] getSuites() {

+		// retrieve all test suites.

+		Collection<Class<?>> suites = new ArrayList<Class<?>>();

+		for(ITestSuiteClass testSuiteClass : suiteClasses) {

+			Class<?> class_ = testSuiteClass.getMainTestSuiteClass();

+			if(class_ != null) {

+				suites.add(class_);

+			} else {

+				System.err.println(testSuiteClass + " does not give a correct test suite class");

+			}

+		}

+		return suites.toArray(new Class<?>[]{});

+	}

+

+}

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/launcher/FragmentTestSuiteClass.java b/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/launcher/FragmentTestSuiteClass.java
new file mode 100644
index 00000000000..fbd259c40e3
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/launcher/FragmentTestSuiteClass.java
@@ -0,0 +1,60 @@
+/*****************************************************************************

+ * Copyright (c) 2010 CEA LIST.

+ *    

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.tests.launcher;

+

+import org.eclipse.core.runtime.Platform;

+import org.osgi.framework.Bundle;

+

+

+/**

+ * Test Suite class entry for a test fragment

+ */

+public class FragmentTestSuiteClass implements ITestSuiteClass {

+

+	/** unique identifier of the bundle host */

+	private final String hostBundleId;

+

+	/** qualified name of the test suite class */

+	private final String classQualifiedName;

+

+	/**

+	 * Constructor.

+	 * 

+	 * @param hostBundleId

+	 *        unique identifier of the bundle host

+	 * @param classQualifiedName

+	 *        qualified name of the test suite class

+	 */

+	public FragmentTestSuiteClass(String hostBundleId, String classQualifiedName) {

+		this.hostBundleId = hostBundleId;

+		this.classQualifiedName = classQualifiedName;

+	}

+

+	/**

+	 * {@inheritDoc}

+	 */

+	public Class<?> getMainTestSuiteClass() {

+		Bundle bundle = Platform.getBundle(hostBundleId);

+		if(bundle == null) {

+			System.err.println("Impossible to find bundle: " + hostBundleId);

+		} else {

+			try {

+				Class<?> class_ = bundle.loadClass(classQualifiedName);

+				return class_;

+			} catch (ClassNotFoundException e) {

+				e.printStackTrace();

+			}

+		}

+		return null;

+	}

+

+}

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/launcher/ITestSuiteClass.java b/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/launcher/ITestSuiteClass.java
new file mode 100644
index 00000000000..c096f44fa96
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/launcher/ITestSuiteClass.java
@@ -0,0 +1,27 @@
+/*****************************************************************************

+ * Copyright (c) 2010 CEA LIST.

+ *    

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.tests.launcher;

+

+

+/**

+ * Interface for all suite classes.

+ */

+public interface ITestSuiteClass {

+

+	/**

+	 * Returns the main test suite class for this entry

+	 * 

+	 * @return the main test suite class for this entry

+	 */

+	public Class<?> getMainTestSuiteClass();

+

+}

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/launcher/PluginTestSuiteClass.java b/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/launcher/PluginTestSuiteClass.java
new file mode 100644
index 00000000000..27d11c955cd
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/launcher/PluginTestSuiteClass.java
@@ -0,0 +1,40 @@
+/*****************************************************************************

+ * Copyright (c) 2010 CEA LIST.

+ *    

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.tests.launcher;

+

+

+/**

+ * Entry for a test suite in a test plugin

+ */

+public class PluginTestSuiteClass implements ITestSuiteClass {

+

+	/** main test suite class */

+	private final Class<?> testClass;

+

+	/**

+	 * Constructor.

+	 * 

+	 * @param testClass

+	 *        the main test suite class

+	 */

+	public PluginTestSuiteClass(Class<?> testClass) {

+		this.testClass = testClass;

+	}

+

+	/**

+	 * {@inheritDoc}

+	 */

+	public Class<?> getMainTestSuiteClass() {

+		return testClass;

+	}

+

+}

diff --git a/tests/org.eclipse.papyrus.sysml.tests/.classpath b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/.classpath
index 45f024e850e..45f024e850e 100644
--- a/tests/org.eclipse.papyrus.sysml.tests/.classpath
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/.classpath
diff --git a/tests/org.eclipse.papyrus.sysml.tests/.project b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/.project
index 68de475b9e2..68de475b9e2 100644
--- a/tests/org.eclipse.papyrus.sysml.tests/.project
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/.project
diff --git a/tests/org.eclipse.papyrus.sysml.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/.settings/org.eclipse.jdt.core.prefs
index 656ad6dd7c3..656ad6dd7c3 100644
--- a/tests/org.eclipse.papyrus.sysml.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/.settings/org.eclipse.jdt.core.prefs
diff --git a/tests/org.eclipse.papyrus.sysml.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/META-INF/MANIFEST.MF
index 249920b3a92..03d8eeb96ca 100644
--- a/tests/org.eclipse.papyrus.sysml.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2

 Bundle-Name: %pluginName

 Bundle-SymbolicName: org.eclipse.papyrus.sysml.tests;singleton:=true

-Bundle-Version: 0.7.0.qualifier

+Bundle-Version: 0.7.1.qualifier

 Bundle-ClassPath: .

 Bundle-Vendor: %providerName

 Bundle-Localization: plugin

@@ -10,6 +10,7 @@ Export-Package: org.eclipse.papyrus.sysml.allocations.tests,
  org.eclipse.papyrus.sysml.modelelements.tests,

  org.eclipse.papyrus.sysml.portandflows.tests,

  org.eclipse.papyrus.sysml.requirements.tests,

+ org.eclipse.papyrus.sysml.tests,

  org.eclipse.papyrus.sysml.utils

 Require-Bundle: org.eclipse.core.runtime,

  org.eclipse.papyrus.sysml;visibility:=reexport,

@@ -19,5 +20,5 @@ Require-Bundle: org.eclipse.core.runtime,
  org.junit;visibility:=reexport,

  org.eclipse.papyrus.uml.standard;bundle-version="0.7.0",

  org.eclipse.papyrus.umlutils;bundle-version="0.7.0"

-Eclipse-LazyStart: true

+Bundle-ActivationPolicy: lazy

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/about.html b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/about.html
new file mode 100644
index 00000000000..82d49bf5f81
--- /dev/null
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

+<title>About</title>

+</head>

+<body lang="EN-US">

+<h2>About This Content</h2>

+ 

+<p>June 5, 2007</p>	

+<h3>License</h3>

+

+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

+indicated below, the Content is provided to you under the terms and conditions of the

+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

+

+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

+apply to your use of any object code in the Content.  Check the Redistributor's license that was 

+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

+indicated below, the terms and conditions of the EPL still apply to any source code in the Content

+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

+

+</body>

+</html>

diff --git a/tests/org.eclipse.papyrus.sysml.tests/build.properties b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/build.properties
index e9d6098b4dc..7d55d1eefba 100644
--- a/tests/org.eclipse.papyrus.sysml.tests/build.properties
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/build.properties
@@ -6,7 +6,9 @@
 

 bin.includes = .,\

                META-INF/,\

-               plugin.properties

+               plugin.properties,\

+               about.html,\

+               samples/

 jars.compile.order = .

 source.. = src/

 output.. = bin/

diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/plugin.properties b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/plugin.properties
new file mode 100644
index 00000000000..b29ed73e181
--- /dev/null
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/plugin.properties
@@ -0,0 +1,12 @@
+#################################################################################

+# Copyright (c) 2008 CEA LIST.

+# All rights reserved. This program and the accompanying materials

+# are made available under the terms of the Eclipse Public License v1.0

+# which accompanies this distribution, and is available at

+# http://www.eclipse.org/legal/epl-v10.html

+#

+# Contributors:

+#     Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - initial API and implementation

+##################################################################################

+pluginName=Tests for static version of the SysML profile (Incubation)

+providerName=Eclipse Modeling Project

diff --git a/tests/org.eclipse.papyrus.sysml.tests/samples/SysML_Allocate_TEST.di2 b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/samples/SysML_Allocate_TEST.di2
index bee187d70e1..bee187d70e1 100644
--- a/tests/org.eclipse.papyrus.sysml.tests/samples/SysML_Allocate_TEST.di2
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/samples/SysML_Allocate_TEST.di2
diff --git a/tests/org.eclipse.papyrus.sysml.tests/samples/SysML_Allocate_TEST.uml b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/samples/SysML_Allocate_TEST.uml
index 08f6af88033..08f6af88033 100644
--- a/tests/org.eclipse.papyrus.sysml.tests/samples/SysML_Allocate_TEST.uml
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/samples/SysML_Allocate_TEST.uml
diff --git a/tests/org.eclipse.papyrus.sysml.tests/samples/SysML_Copy_TEST.di2 b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/samples/SysML_Copy_TEST.di2
index 88fd8a7f707..88fd8a7f707 100644
--- a/tests/org.eclipse.papyrus.sysml.tests/samples/SysML_Copy_TEST.di2
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/samples/SysML_Copy_TEST.di2
diff --git a/tests/org.eclipse.papyrus.sysml.tests/samples/SysML_Copy_TEST.uml b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/samples/SysML_Copy_TEST.uml
index b940ec80eac..b940ec80eac 100644
--- a/tests/org.eclipse.papyrus.sysml.tests/samples/SysML_Copy_TEST.uml
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/samples/SysML_Copy_TEST.uml
diff --git a/tests/org.eclipse.papyrus.sysml.tests/samples/SysML_DeriveReqt_TEST.di2 b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/samples/SysML_DeriveReqt_TEST.di2
index 457b6be40f5..457b6be40f5 100644
--- a/tests/org.eclipse.papyrus.sysml.tests/samples/SysML_DeriveReqt_TEST.di2
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/samples/SysML_DeriveReqt_TEST.di2
diff --git a/tests/org.eclipse.papyrus.sysml.tests/samples/SysML_DeriveReqt_TEST.uml b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/samples/SysML_DeriveReqt_TEST.uml
index cfcf5eccdcd..cfcf5eccdcd 100644
--- a/tests/org.eclipse.papyrus.sysml.tests/samples/SysML_DeriveReqt_TEST.uml
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/samples/SysML_DeriveReqt_TEST.uml
diff --git a/tests/org.eclipse.papyrus.sysml.tests/samples/SysML_FlowPort_TEST.di2 b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/samples/SysML_FlowPort_TEST.di2
index 88d88e21f21..88d88e21f21 100644
--- a/tests/org.eclipse.papyrus.sysml.tests/samples/SysML_FlowPort_TEST.di2
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/samples/SysML_FlowPort_TEST.di2
diff --git a/tests/org.eclipse.papyrus.sysml.tests/samples/SysML_FlowPort_TEST.uml b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/samples/SysML_FlowPort_TEST.uml
index 5042b590bbc..5042b590bbc 100644
--- a/tests/org.eclipse.papyrus.sysml.tests/samples/SysML_FlowPort_TEST.uml
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/samples/SysML_FlowPort_TEST.uml
diff --git a/tests/org.eclipse.papyrus.sysml.tests/samples/SysML_Refine_TEST.di2 b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/samples/SysML_Refine_TEST.di2
index fa6ddef2603..fa6ddef2603 100644
--- a/tests/org.eclipse.papyrus.sysml.tests/samples/SysML_Refine_TEST.di2
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/samples/SysML_Refine_TEST.di2
diff --git a/tests/org.eclipse.papyrus.sysml.tests/samples/SysML_Refine_TEST.uml b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/samples/SysML_Refine_TEST.uml
index aa455b3cea4..aa455b3cea4 100644
--- a/tests/org.eclipse.papyrus.sysml.tests/samples/SysML_Refine_TEST.uml
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/samples/SysML_Refine_TEST.uml
diff --git a/tests/org.eclipse.papyrus.sysml.tests/samples/SysML_Satisfy_TEST.di2 b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/samples/SysML_Satisfy_TEST.di2
index b7ac779d710..b7ac779d710 100644
--- a/tests/org.eclipse.papyrus.sysml.tests/samples/SysML_Satisfy_TEST.di2
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/samples/SysML_Satisfy_TEST.di2
diff --git a/tests/org.eclipse.papyrus.sysml.tests/samples/SysML_Satisfy_TEST.uml b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/samples/SysML_Satisfy_TEST.uml
index 9e383f81406..9e383f81406 100644
--- a/tests/org.eclipse.papyrus.sysml.tests/samples/SysML_Satisfy_TEST.uml
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/samples/SysML_Satisfy_TEST.uml
diff --git a/tests/org.eclipse.papyrus.sysml.tests/samples/SysML_Trace_TEST.di2 b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/samples/SysML_Trace_TEST.di2
index 65d5ce4facf..65d5ce4facf 100644
--- a/tests/org.eclipse.papyrus.sysml.tests/samples/SysML_Trace_TEST.di2
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/samples/SysML_Trace_TEST.di2
diff --git a/tests/org.eclipse.papyrus.sysml.tests/samples/SysML_Trace_TEST.uml b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/samples/SysML_Trace_TEST.uml
index 170deeaa64a..170deeaa64a 100644
--- a/tests/org.eclipse.papyrus.sysml.tests/samples/SysML_Trace_TEST.uml
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/samples/SysML_Trace_TEST.uml
diff --git a/tests/org.eclipse.papyrus.sysml.tests/samples/SysML_Verify_TEST.di2 b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/samples/SysML_Verify_TEST.di2
index cc52f7dfcbb..cc52f7dfcbb 100644
--- a/tests/org.eclipse.papyrus.sysml.tests/samples/SysML_Verify_TEST.di2
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/samples/SysML_Verify_TEST.di2
diff --git a/tests/org.eclipse.papyrus.sysml.tests/samples/SysML_Verify_TEST.uml b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/samples/SysML_Verify_TEST.uml
index 68eab8740e3..68eab8740e3 100644
--- a/tests/org.eclipse.papyrus.sysml.tests/samples/SysML_Verify_TEST.uml
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/samples/SysML_Verify_TEST.uml
diff --git a/tests/org.eclipse.papyrus.sysml.tests/samples/SysML_View_TEST.di2 b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/samples/SysML_View_TEST.di2
index 56046b79807..56046b79807 100644
--- a/tests/org.eclipse.papyrus.sysml.tests/samples/SysML_View_TEST.di2
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/samples/SysML_View_TEST.di2
diff --git a/tests/org.eclipse.papyrus.sysml.tests/samples/SysML_View_TEST.uml b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/samples/SysML_View_TEST.uml
index a9ad5917c81..a9ad5917c81 100644
--- a/tests/org.eclipse.papyrus.sysml.tests/samples/SysML_View_TEST.uml
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/samples/SysML_View_TEST.uml
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/activities/tests/ActivitiesTests.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/activities/tests/ActivitiesTests.java
index ef316f1ce41..ef316f1ce41 100644
--- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/activities/tests/ActivitiesTests.java
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/activities/tests/ActivitiesTests.java
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/activities/tests/ContinuousTest.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/activities/tests/ContinuousTest.java
index fd92081ae11..fd92081ae11 100644
--- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/activities/tests/ContinuousTest.java
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/activities/tests/ContinuousTest.java
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/activities/tests/ControlOperatorTest.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/activities/tests/ControlOperatorTest.java
index e5c8672db16..e5c8672db16 100644
--- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/activities/tests/ControlOperatorTest.java
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/activities/tests/ControlOperatorTest.java
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/activities/tests/DiscreteTest.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/activities/tests/DiscreteTest.java
index 44c75211d52..44c75211d52 100644
--- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/activities/tests/DiscreteTest.java
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/activities/tests/DiscreteTest.java
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/activities/tests/NoBufferTest.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/activities/tests/NoBufferTest.java
index 1c99239b95c..1c99239b95c 100644
--- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/activities/tests/NoBufferTest.java
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/activities/tests/NoBufferTest.java
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/activities/tests/OptionalTest.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/activities/tests/OptionalTest.java
index 35bc9a41820..35bc9a41820 100644
--- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/activities/tests/OptionalTest.java
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/activities/tests/OptionalTest.java
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/activities/tests/OverwriteTest.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/activities/tests/OverwriteTest.java
index a427943b6d1..a427943b6d1 100644
--- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/activities/tests/OverwriteTest.java
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/activities/tests/OverwriteTest.java
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/activities/tests/ProbabilityTest.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/activities/tests/ProbabilityTest.java
index dfaee358a08..dfaee358a08 100644
--- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/activities/tests/ProbabilityTest.java
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/activities/tests/ProbabilityTest.java
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/activities/tests/RateTest.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/activities/tests/RateTest.java
index 5c29be85228..5c29be85228 100644
--- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/activities/tests/RateTest.java
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/activities/tests/RateTest.java
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/allocations/tests/AllocateActivityPartitionTest.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/allocations/tests/AllocateActivityPartitionTest.java
index b33f450c2f5..b33f450c2f5 100644
--- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/allocations/tests/AllocateActivityPartitionTest.java
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/allocations/tests/AllocateActivityPartitionTest.java
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/allocations/tests/AllocateTest.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/allocations/tests/AllocateTest.java
index 05bb1a77dcc..05bb1a77dcc 100644
--- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/allocations/tests/AllocateTest.java
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/allocations/tests/AllocateTest.java
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/allocations/tests/AllocatedTest.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/allocations/tests/AllocatedTest.java
index 72a39990a87..72a39990a87 100644
--- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/allocations/tests/AllocatedTest.java
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/allocations/tests/AllocatedTest.java
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/allocations/tests/AllocationsTests.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/allocations/tests/AllocationsTests.java
index 09633837457..09633837457 100644
--- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/allocations/tests/AllocationsTests.java
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/allocations/tests/AllocationsTests.java
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/blocks/tests/BindingConnectorTest.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/blocks/tests/BindingConnectorTest.java
index d324e25bd04..d324e25bd04 100644
--- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/blocks/tests/BindingConnectorTest.java
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/blocks/tests/BindingConnectorTest.java
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/blocks/tests/BlockTest.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/blocks/tests/BlockTest.java
index eae9da8180d..eae9da8180d 100644
--- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/blocks/tests/BlockTest.java
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/blocks/tests/BlockTest.java
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/blocks/tests/BlocksTests.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/blocks/tests/BlocksTests.java
index 5302e261b72..5302e261b72 100644
--- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/blocks/tests/BlocksTests.java
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/blocks/tests/BlocksTests.java
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/blocks/tests/ConnectorPropertyTest.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/blocks/tests/ConnectorPropertyTest.java
index 0be8adf1f47..0be8adf1f47 100644
--- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/blocks/tests/ConnectorPropertyTest.java
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/blocks/tests/ConnectorPropertyTest.java
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/blocks/tests/DimensionTest.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/blocks/tests/DimensionTest.java
index e26bf0c78b9..e26bf0c78b9 100644
--- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/blocks/tests/DimensionTest.java
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/blocks/tests/DimensionTest.java
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/blocks/tests/DistributedPropertyTest.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/blocks/tests/DistributedPropertyTest.java
index a5c7e3980ea..a5c7e3980ea 100644
--- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/blocks/tests/DistributedPropertyTest.java
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/blocks/tests/DistributedPropertyTest.java
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/blocks/tests/NestedConnectorEndTest.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/blocks/tests/NestedConnectorEndTest.java
index 9359f0614c3..9359f0614c3 100644
--- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/blocks/tests/NestedConnectorEndTest.java
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/blocks/tests/NestedConnectorEndTest.java
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/blocks/tests/ParticipantPropertyTest.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/blocks/tests/ParticipantPropertyTest.java
index 8a0dfb4d99e..8a0dfb4d99e 100644
--- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/blocks/tests/ParticipantPropertyTest.java
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/blocks/tests/ParticipantPropertyTest.java
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/blocks/tests/PropertySpecificTypeTest.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/blocks/tests/PropertySpecificTypeTest.java
index 99d5af5f35e..99d5af5f35e 100644
--- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/blocks/tests/PropertySpecificTypeTest.java
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/blocks/tests/PropertySpecificTypeTest.java
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/blocks/tests/UnitTest.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/blocks/tests/UnitTest.java
index 699f437bcab..699f437bcab 100644
--- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/blocks/tests/UnitTest.java
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/blocks/tests/UnitTest.java
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/blocks/tests/ValueTypeTest.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/blocks/tests/ValueTypeTest.java
index 27b26b17878..27b26b17878 100644
--- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/blocks/tests/ValueTypeTest.java
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/blocks/tests/ValueTypeTest.java
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/constraints/tests/ConstraintBlockTest.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/constraints/tests/ConstraintBlockTest.java
index 7fcb6e940e8..7fcb6e940e8 100644
--- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/constraints/tests/ConstraintBlockTest.java
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/constraints/tests/ConstraintBlockTest.java
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/constraints/tests/ConstraintPropertyTest.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/constraints/tests/ConstraintPropertyTest.java
index eb648ebb3a4..eb648ebb3a4 100644
--- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/constraints/tests/ConstraintPropertyTest.java
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/constraints/tests/ConstraintPropertyTest.java
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/constraints/tests/ConstraintsTests.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/constraints/tests/ConstraintsTests.java
index a3a149d8331..a3a149d8331 100644
--- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/constraints/tests/ConstraintsTests.java
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/constraints/tests/ConstraintsTests.java
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/interactions/tests/InteractionsTests.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/interactions/tests/InteractionsTests.java
index 8224c4ba1bc..8224c4ba1bc 100644
--- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/interactions/tests/InteractionsTests.java
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/interactions/tests/InteractionsTests.java
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/modelelements/tests/ConformTest.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/modelelements/tests/ConformTest.java
index 62db0626395..62db0626395 100644
--- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/modelelements/tests/ConformTest.java
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/modelelements/tests/ConformTest.java
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/modelelements/tests/ModelelementsTests.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/modelelements/tests/ModelelementsTests.java
index 1fa1b74945a..1fa1b74945a 100644
--- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/modelelements/tests/ModelelementsTests.java
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/modelelements/tests/ModelelementsTests.java
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/modelelements/tests/ProblemTest.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/modelelements/tests/ProblemTest.java
index a5dfc2f3c4b..a5dfc2f3c4b 100644
--- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/modelelements/tests/ProblemTest.java
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/modelelements/tests/ProblemTest.java
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/modelelements/tests/RationaleTest.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/modelelements/tests/RationaleTest.java
index 520718d671b..520718d671b 100644
--- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/modelelements/tests/RationaleTest.java
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/modelelements/tests/RationaleTest.java
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/modelelements/tests/ViewPointTest.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/modelelements/tests/ViewPointTest.java
index 3e9b9de97e1..3e9b9de97e1 100644
--- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/modelelements/tests/ViewPointTest.java
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/modelelements/tests/ViewPointTest.java
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/modelelements/tests/ViewTest.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/modelelements/tests/ViewTest.java
index 809bf8416f8..809bf8416f8 100644
--- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/modelelements/tests/ViewTest.java
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/modelelements/tests/ViewTest.java
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/portandflows/tests/FlowPortTest.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/portandflows/tests/FlowPortTest.java
index f80e6a27e98..f80e6a27e98 100644
--- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/portandflows/tests/FlowPortTest.java
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/portandflows/tests/FlowPortTest.java
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/portandflows/tests/FlowPropertyTest.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/portandflows/tests/FlowPropertyTest.java
index 4c3727b9f7c..4c3727b9f7c 100644
--- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/portandflows/tests/FlowPropertyTest.java
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/portandflows/tests/FlowPropertyTest.java
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/portandflows/tests/FlowSpecificationTest.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/portandflows/tests/FlowSpecificationTest.java
index c8cb711671f..c8cb711671f 100644
--- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/portandflows/tests/FlowSpecificationTest.java
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/portandflows/tests/FlowSpecificationTest.java
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/portandflows/tests/ItemFlowTest.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/portandflows/tests/ItemFlowTest.java
index 4c9ff06889b..4c9ff06889b 100644
--- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/portandflows/tests/ItemFlowTest.java
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/portandflows/tests/ItemFlowTest.java
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/portandflows/tests/PortandflowsTests.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/portandflows/tests/PortandflowsTests.java
index 11e391d55f2..11e391d55f2 100644
--- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/portandflows/tests/PortandflowsTests.java
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/portandflows/tests/PortandflowsTests.java
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/CopyTest.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/CopyTest.java
index 1e57ae51c8d..1e57ae51c8d 100644
--- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/CopyTest.java
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/CopyTest.java
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/DeriveReqtTest.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/DeriveReqtTest.java
index d00b46c5f6a..d00b46c5f6a 100644
--- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/DeriveReqtTest.java
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/DeriveReqtTest.java
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/RequirementRelatedTest.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/RequirementRelatedTest.java
index 50caf9f0a52..50caf9f0a52 100644
--- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/RequirementRelatedTest.java
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/RequirementRelatedTest.java
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/RequirementTest.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/RequirementTest.java
index e402b4699f4..e402b4699f4 100644
--- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/RequirementTest.java
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/RequirementTest.java
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/RequirementsTests.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/RequirementsTests.java
index 1329f58fd7b..1329f58fd7b 100644
--- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/RequirementsTests.java
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/RequirementsTests.java
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/SatisfyTest.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/SatisfyTest.java
index 37ad40c8a11..37ad40c8a11 100644
--- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/SatisfyTest.java
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/SatisfyTest.java
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/TestCaseTest.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/TestCaseTest.java
index 1faf6dcc4f3..1faf6dcc4f3 100644
--- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/TestCaseTest.java
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/TestCaseTest.java
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/VerifyTest.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/VerifyTest.java
index 86b0e2339fe..86b0e2339fe 100644
--- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/VerifyTest.java
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/requirements/tests/VerifyTest.java
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/statemachines/tests/StatemachinesTests.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/statemachines/tests/StatemachinesTests.java
index 6d7fd44139a..6d7fd44139a 100644
--- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/statemachines/tests/StatemachinesTests.java
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/statemachines/tests/StatemachinesTests.java
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/tests/SysmlAllTests.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/tests/SysmlAllTests.java
index 0e6acfc79b5..0e6acfc79b5 100644
--- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/tests/SysmlAllTests.java
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/tests/SysmlAllTests.java
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/tests/SysmlTests.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/tests/SysmlTests.java
index 6e69dca0daf..6e69dca0daf 100644
--- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/tests/SysmlTests.java
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/tests/SysmlTests.java
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/usecases/tests/UsecasesTests.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/usecases/tests/UsecasesTests.java
index 5b173e79214..5b173e79214 100644
--- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/usecases/tests/UsecasesTests.java
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/usecases/tests/UsecasesTests.java
diff --git a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/utils/SysMLTestResources.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/utils/SysMLTestResources.java
index 45f8d2606fe..45f8d2606fe 100644
--- a/tests/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/utils/SysMLTestResources.java
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.tests/src/org/eclipse/papyrus/sysml/utils/SysMLTestResources.java
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/.classpath b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/.classpath
new file mode 100644
index 00000000000..046bda900d2
--- /dev/null
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<classpath>

+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

+	<classpathentry kind="src" path="test"/>

+	<classpathentry kind="output" path="bin"/>

+</classpath>

diff --git a/tests/org.eclipse.papyrus.diagram.clazz.test/.project b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/.project
index 8cb1b87fe01..8cb1b87fe01 100644
--- a/tests/org.eclipse.papyrus.diagram.clazz.test/.project
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/.project
diff --git a/tests/org.eclipse.papyrus.diagram.clazz.test/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/.settings/org.eclipse.jdt.core.prefs
index 92b4d8fe254..92b4d8fe254 100644
--- a/tests/org.eclipse.papyrus.diagram.clazz.test/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/.settings/org.eclipse.jdt.core.prefs
diff --git a/tests/org.eclipse.papyrus.diagram.clazz.test/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/META-INF/MANIFEST.MF
index 1c651d065f5..f11d7dc3c1c 100644
--- a/tests/org.eclipse.papyrus.diagram.clazz.test/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.papyrus.diagram.clazz.test
-Bundle-Version: 0.7.0.vqualifier
+Bundle-Version: 0.7.1.qualifier
 Bundle-Activator: org.eclipse.papyrus.diagram.clazz.test.Activator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
@@ -16,3 +16,6 @@ Require-Bundle: org.eclipse.ui,
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-Vendor: %providerName
+Export-Package: org.eclipse.papyrus.diagram.clazz.test,
+ org.eclipse.papyrus.diagram.clazz.test.canonical,
+ org.eclipse.papyrus.diagram.clazz.test.load
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/about.html b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/about.html
new file mode 100644
index 00000000000..82d49bf5f81
--- /dev/null
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

+<title>About</title>

+</head>

+<body lang="EN-US">

+<h2>About This Content</h2>

+ 

+<p>June 5, 2007</p>	

+<h3>License</h3>

+

+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

+indicated below, the Content is provided to you under the terms and conditions of the

+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

+

+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

+apply to your use of any object code in the Content.  Check the Redistributor's license that was 

+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

+indicated below, the terms and conditions of the EPL still apply to any source code in the Content

+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

+

+</body>

+</html>

diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/build.properties b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/build.properties
new file mode 100644
index 00000000000..be5eee65498
--- /dev/null
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/build.properties
@@ -0,0 +1,7 @@
+source.. = test/

+output.. = bin/

+bin.includes = META-INF/,\

+               .,\

+               about.html,\

+               org.eclipse.papyrus.diagram.clazz.test.launch,\

+               plugin.properties

diff --git a/tests/org.eclipse.papyrus.diagram.clazz.test/org.eclipse.papyrus.diagram.clazz.test.launch b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/org.eclipse.papyrus.diagram.clazz.test.launch
index 8093bcd37b9..d6cb5c968ed 100644
--- a/tests/org.eclipse.papyrus.diagram.clazz.test/org.eclipse.papyrus.diagram.clazz.test.launch
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/org.eclipse.papyrus.diagram.clazz.test.launch
@@ -26,12 +26,12 @@
 <stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>

 <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>

 <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>

-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit3"/>

-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.diagram.clazz.test.canonical.AllTests"/>

+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>

+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.diagram.clazz.test.AllTests"/>

 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>

 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.diagram.clazz.test"/>

 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>

-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -Xms40m -Xmx512m"/>

+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -Xms256m -Xmx1024m -XX:PermSize=128m  -XX:MaxPermSize=128m"/>

 <stringAttribute key="pde.version" value="3.3"/>

 <stringAttribute key="product" value="org.eclipse.platform.ide"/>

 <booleanAttribute key="run_in_ui_thread" value="true"/>

diff --git a/tests/org.eclipse.papyrus.diagram.clazz.test/plugin.properties b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/plugin.properties
index 7c462c1672b..f71c00eda7b 100644
--- a/tests/org.eclipse.papyrus.diagram.clazz.test/plugin.properties
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/plugin.properties
@@ -9,4 +9,4 @@
 #     Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - initial API and implementation
 ##################################################################################
 pluginName=Papyrus Class Diagram Test(Incubation)
-providerName=Eclipse.org
+providerName=Eclipse Modeling Project
diff --git a/tests/org.eclipse.papyrus.diagram.clazz.test/src/org/eclipse/papyrus/diagram/clazz/test/Activator.java b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/Activator.java
index e85ddf994b4..e85ddf994b4 100644
--- a/tests/org.eclipse.papyrus.diagram.clazz.test/src/org/eclipse/papyrus/diagram/clazz/test/Activator.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/Activator.java
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/AllTests.java b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/AllTests.java
new file mode 100644
index 00000000000..956b3bcfa04
--- /dev/null
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/AllTests.java
@@ -0,0 +1,35 @@
+/*****************************************************************************

+ * Copyright (c) 2009 CEA LIST.

+ *

+ *    

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.diagram.clazz.test;

+

+import org.eclipse.papyrus.diagram.clazz.test.canonical.AllCanonicalTests;

+import org.eclipse.papyrus.diagram.clazz.test.load.LoadTests;

+import org.junit.runner.RunWith;

+import org.junit.runners.Suite;

+import org.junit.runners.Suite.SuiteClasses;

+

+/**

+ * All tests together.

+ */

+@RunWith(Suite.class)

+@SuiteClasses({

+	// canonical

+AllCanonicalTests.class,

+

+// load

+LoadTests.class

+})

+public class AllTests {

+

+}

diff --git a/tests/org.eclipse.papyrus.diagram.clazz.test/src/org/eclipse/papyrus/diagram/clazz/test/canonical/AbstractPapyrusTestCase.java b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/AbstractPapyrusTestCase.java
index 163bfc4fa1f..347029873e9 100644
--- a/tests/org.eclipse.papyrus.diagram.clazz.test/src/org/eclipse/papyrus/diagram/clazz/test/canonical/AbstractPapyrusTestCase.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/AbstractPapyrusTestCase.java
@@ -49,6 +49,45 @@ import org.eclipse.uml2.uml.Element;
 public abstract class AbstractPapyrusTestCase extends TestCase {

 

 

+	/** The Constant CREATION. */

+	protected static final String CREATION = "CREATION:";

+

+	/** The Constant CONTAINER_CREATION. */

+	protected static final String CONTAINER_CREATION = "CONTAINER CREATION: ";

+

+	/** The Constant DROP. */

+	protected static final String DROP = "DROP: ";

+

+	/** The Constant DESTROY_DELETION. */

+	protected static final String DESTROY_DELETION = "DESTROY DELETION: ";

+

+	/** The Constant COMMAND_NULL. */

+	protected static final String COMMAND_NULL = " command null";

+

+	/** The Constant VIEW_DELETION. */

+	protected static final String VIEW_DELETION = "VIEW DELETION: ";

+

+	/** The Constant TEST_THE_REDO. */

+	protected static final String TEST_THE_REDO = "test the redo";

+

+	/** The Constant TEST_THE_UNDO. */

+	protected static final String TEST_THE_UNDO = "test the undo";

+

+	/** The Constant TEST_THE_EXECUTION. */

+	protected static final String TEST_THE_EXECUTION = "test the execution";

+

+	/** The Constant TEST_IF_THE_COMMAND_CAN_BE_EXECUTED. */

+	protected static final String TEST_IF_THE_COMMAND_CAN_BE_EXECUTED = "test if the command can be executed";

+

+	/** The Constant TEST_IF_THE_COMMAND_IS_CREATED. */

+	protected static final String TEST_IF_THE_COMMAND_IS_CREATED = "test if the command is created";

+

+	/** The Constant INITIALIZATION_TEST. */

+	protected static final String INITIALIZATION_TEST = "Intitial State";

+

+	/** The Constant CHANGE_CONTAINER. */

+	protected static final String CHANGE_CONTAINER = "CHANGE CONTAINER";

+	

 	/** The papyrus editor. */

 	protected PapyrusMultiDiagramEditor papyrusEditor;

 	

@@ -133,7 +172,6 @@ public abstract class AbstractPapyrusTestCase extends TestCase {
 	protected DiagramEditPart getDiagramEditPart(){

 		if(clazzdiagrameditPart== null){

 			diagramEditor= (UmlClassDiagramForMultiEditor)papyrusEditor.getActiveEditor();

-			System.err.println(diagramEditor.getGraphicalViewer().getContents().getRoot());

 			clazzdiagrameditPart = (DiagramEditPart)diagramEditor.getGraphicalViewer().getContents().getRoot().getChildren().get(0);

 		}

 		return clazzdiagrameditPart;

diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/AbstractTestMultiLink.java b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/AbstractTestMultiLink.java
new file mode 100644
index 00000000000..44902c02ebd
--- /dev/null
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/AbstractTestMultiLink.java
@@ -0,0 +1,499 @@
+/*****************************************************************************

+ * Copyright (c) 2010 CEA LIST.

+ *

+ *    

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.diagram.clazz.test.canonical;

+

+import java.util.ArrayList;

+

+import org.eclipse.core.commands.operations.OperationHistoryFactory;

+import org.eclipse.core.runtime.NullProgressMonitor;

+import org.eclipse.draw2d.ConnectionAnchor;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.gef.ConnectionEditPart;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.NodeEditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.RequestConstants;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gef.requests.GroupRequest;

+import org.eclipse.gef.requests.ReconnectRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeNodeEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewRequest;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;

+import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;

+import org.eclipse.gmf.runtime.diagram.ui.requests.EditCommandRequestWrapper;

+import org.eclipse.gmf.runtime.emf.commands.core.command.EditingDomainUndoContext;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.notation.Diagram;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.diagram.common.command.wrappers.GEFtoEMFCommandWrapper;

+import org.eclipse.uml2.uml.Element;

+import org.eclipse.uml2.uml.Relationship;

+

+

+

+/**

+ * The Class MultiLink.

+ */

+public abstract class AbstractTestMultiLink extends AbstractPapyrusTestCase {

+

+	protected static final String THE_BRANCH_TO_RECONNECT_EXISTS = "the branch to reconnect exists";

+	protected static final String BRANCH_EXISTS_RECONNECTION_ON_TARGET = "branch exists reconnection on target ";

+	protected static final String RECONNECTION_TARGET = "Reconnection target ";

+	protected static final String BRANCH_EXISTS_RECONNECTION_ON_SOURCE = "branch exists reconnection on Source ";

+	protected static final String RECONNECTION_SOURCE = "Reconnection Source ";

+	GraphicalEditPart source=null;

+	GraphicalEditPart target=null;

+	GraphicalEditPart thirdPlayer=null;

+	GraphicalEditPart fourthPlayer=null;

+	GraphicalEditPart guestPlayer=null;

+

+	ConnectionEditPart binaryLink= null;

+

+	ShapeNodeEditPart linkNode=null;

+

+	/** The Constant CREATION. */

+	protected static final String CREATION = "CREATION:";

+

+	/** The Constant CONTAINER_CREATION. */

+	protected static final String CONTAINER_CREATION = "CONTAINER CREATION: ";

+

+	/** The Constant DROP. */

+	protected static final String DROP = "DROP: ";

+

+	/** The Constant DESTROY_DELETION. */

+	protected static final String DESTROY_DELETION = "DESTROY DELETION: ";

+

+	/** The Constant COMMAND_NULL. */

+	protected static final String COMMAND_NULL = " command null";

+

+	/** The Constant VIEW_DELETION. */

+	protected static final String VIEW_DELETION = "VIEW DELETION: ";

+

+	/** The Constant TEST_THE_REDO. */

+	protected static final String TEST_THE_REDO = "test the redo";

+

+	/** The Constant TEST_THE_UNDO. */

+	protected static final String TEST_THE_UNDO = "test the undo";

+

+	/** The Constant TEST_THE_EXECUTION. */

+	protected static final String TEST_THE_EXECUTION = "test the execution";

+

+	/** The Constant TEST_IF_THE_COMMAND_CAN_BE_EXECUTED. */

+	protected static final String TEST_IF_THE_COMMAND_CAN_BE_EXECUTED = "test if the command can be executed";

+

+	/** The Constant TEST_IF_THE_COMMAND_IS_CREATED. */

+	protected static final String TEST_IF_THE_COMMAND_IS_CREATED = "test if the command is created";

+

+	/** The Constant INITIALIZATION_TEST. */

+	protected static final String INITIALIZATION_TEST = "Intitial State";

+

+	/** The Constant CHANGE_CONTAINER. */

+	protected static final String CHANGE_CONTAINER = "CHANGE CONTAINER";

+

+	/** The root compartment. */

+	protected ShapeCompartmentEditPart rootCompartment=null;

+

+	/**

+	 * Test view deletion.

+	 * 

+	 * @param type the type

+	 */

+	public void testViewDeletion(IElementType type) {

+		//DELETION OF THE VIEW

+		//DELETION OF ALL THE VIEW

+		assertTrue(VIEW_DELETION +INITIALIZATION_TEST,linkNode!=null);

+

+		Request deleteViewRequest = new GroupRequest(RequestConstants.REQ_DELETE);

+		Command command = linkNode.getCommand(deleteViewRequest);

+		assertNotNull(VIEW_DELETION +COMMAND_NULL,command);

+		assertTrue(VIEW_DELETION +TEST_IF_THE_COMMAND_IS_CREATED,command!=UnexecutableCommand.INSTANCE);

+		assertTrue(VIEW_DELETION +TEST_IF_THE_COMMAND_CAN_BE_EXECUTED,command.canExecute()==true);

+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

+		assertTrue(VIEW_DELETION +TEST_THE_EXECUTION,getDiagramEditPart().getChildren().size()==5);

+		assertTrue(VIEW_DELETION +TEST_THE_EXECUTION,((Diagram)getRootView()).getEdges().size()==0);

+

+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();

+		assertTrue(VIEW_DELETION +TEST_THE_UNDO,getDiagramEditPart().getChildren().size()==6);

+		assertTrue(VIEW_DELETION +TEST_THE_UNDO,((Diagram)getRootView()).getEdges().size()==4);

+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();

+		assertTrue(VIEW_DELETION +TEST_THE_REDO,getDiagramEditPart().getChildren().size()==5);

+		assertTrue(VIEW_DELETION +TEST_THE_REDO,((Diagram)getRootView()).getEdges().size()==0);

+

+

+

+	}

+	public static Point getIntersectionPoint(ConnectionEditPart connEP, boolean source) {

+

+		ConnectionAnchor sourceAnchor;

+		ConnectionAnchor targetAnchor;

+

+		NodeEditPart sourceEP = (NodeEditPart)connEP.getSource();

+		NodeEditPart targetEP = (NodeEditPart)connEP.getTarget();

+

+		Point endLocation;

+

+		sourceAnchor = sourceEP.getSourceConnectionAnchor(connEP);

+		targetAnchor = targetEP.getTargetConnectionAnchor(connEP);

+

+		if(source) {

+			endLocation = sourceAnchor.getLocation(targetAnchor.getReferencePoint()).getCopy();

+		} else {

+			endLocation = targetAnchor.getLocation(sourceAnchor.getReferencePoint()).getCopy();

+		}

+

+		return endLocation;

+	}

+

+	/**

+	 * Test destroy.

+	 * 

+	 * @param type the type

+	 */

+	public void testDestroy(IElementType type) {

+		//DESTROY SEMANTIC+ VIEW

+		assertTrue(DESTROY_DELETION +INITIALIZATION_TEST,getDiagramEditPart().getChildren().size()==6);

+

+		Request deleteViewRequest =	new EditCommandRequestWrapper( new DestroyElementRequest(false));

+		Command command = linkNode.getCommand(deleteViewRequest);

+		assertNotNull(DESTROY_DELETION +COMMAND_NULL,command);

+		assertTrue(DESTROY_DELETION +TEST_IF_THE_COMMAND_IS_CREATED,command!=UnexecutableCommand.INSTANCE);

+		assertTrue(DESTROY_DELETION+TEST_IF_THE_COMMAND_CAN_BE_EXECUTED,command.canExecute()==true);

+		//getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().execute(command);

+		//getDiagramEditPart().getEditingDomain().getCommandStack().execute(new GEFtoEMFCommandWrapper(command));

+		getDiagramEditPart().getEditingDomain().getCommandStack().execute(new GEFtoEMFCommandWrapper(command));

+		assertTrue(DESTROY_DELETION +TEST_THE_EXECUTION,getDiagramEditPart().getChildren().size()==5);

+		assertTrue(DESTROY_DELETION +TEST_THE_EXECUTION,((Diagram)getRootView()).getEdges().size()==0);

+

+		EditingDomainUndoContext undoContext= new EditingDomainUndoContext(getDiagramEditPart().getEditingDomain());

+		try{

+			OperationHistoryFactory.getOperationHistory().undo(undoContext, new NullProgressMonitor(), null);

+		}catch (Exception e) {

+			System.err.println(e);

+		}

+

+		//diagramEditor.getEditingDomain().getCommandStack().undo();

+		//diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();

+		assertTrue(DESTROY_DELETION +TEST_THE_UNDO,getDiagramEditPart().getChildren().size()==6);

+		assertTrue(DESTROY_DELETION +TEST_THE_UNDO,((Diagram)getRootView()).getEdges().size()==4);

+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();

+		assertTrue(DESTROY_DELETION +TEST_THE_REDO,getDiagramEditPart().getChildren().size()==5);

+		assertTrue(DESTROY_DELETION +TEST_THE_REDO,((Diagram)getRootView()).getEdges().size()==0);

+	}

+

+

+	/**

+	 * Test drop.

+	 * 

+	 * @param type the type

+	 */

+	public void testDrop(IElementType type) {

+		//DROP

+		//INIT

+		assertTrue(DROP +INITIALIZATION_TEST,getDiagramEditPart().getChildren().size()==5);

+		assertTrue(DROP +INITIALIZATION_TEST,getRootSemanticModel().getOwnedElements().size()==6);

+		assertTrue(DROP +INITIALIZATION_TEST,((Diagram)getRootView()).getEdges().size()==0);

+		assertTrue(DROP +INITIALIZATION_TEST,getRootSemanticModel().getOwnedElements().get(5) instanceof Relationship);

+		Relationship relationship=(Relationship)getRootSemanticModel().getOwnedElements().get(5);

+		

+

+		//DO

+		DropObjectsRequest dropObjectsRequest= new DropObjectsRequest();

+		ArrayList<Element> list = new ArrayList<Element>();

+		list.add(relationship);

+		dropObjectsRequest.setObjects(list);

+		dropObjectsRequest.setLocation(new Point(20,20));

+		Command command= getDiagramEditPart().getCommand(dropObjectsRequest);

+		assertNotNull(DROP+COMMAND_NULL,command);

+		assertTrue(DROP +TEST_IF_THE_COMMAND_IS_CREATED,command!=UnexecutableCommand.INSTANCE);

+		assertTrue(DROP+TEST_IF_THE_COMMAND_CAN_BE_EXECUTED,command.canExecute()==true);

+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

+		assertTrue(DROP +TEST_THE_EXECUTION,getDiagramEditPart().getChildren().size()==6);

+		assertTrue(DROP +TEST_THE_EXECUTION,((Diagram)getRootView()).getEdges().size()==4);

+

+		//UNDO

+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();

+		assertTrue(DROP+TEST_THE_UNDO,getDiagramEditPart().getChildren().size()==5);

+		assertTrue(DROP +TEST_THE_UNDO,((Diagram)getRootView()).getEdges().size()==0);

+

+		//REDO

+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();

+		assertTrue(DROP+TEST_THE_REDO,getDiagramEditPart().getChildren().size()==6);

+		assertTrue(DROP+TEST_THE_REDO,getRootSemanticModel().getOwnedElements().size()==6);

+		assertTrue(DROP +TEST_THE_REDO,((Diagram)getRootView()).getEdges().size()==4);

+	}

+

+

+

+	/**

+	 * Test to create a node.

+	 * 

+	 * @param branchType

+	 *        type of the branch to create

+	 * @param flow

+	 *        TODO

+	 * 

+	 */

+	public void testToCreateAMultiLink(IElementType branchType, boolean flow) {

+

+

+		//test to create the branch for dependency to node

+		Command cmd = target.getCommand(createConnectionViewRequest(branchType, binaryLink, thirdPlayer));   

+		assertTrue(CONTAINER_CREATION+TEST_IF_THE_COMMAND_CAN_BE_EXECUTED,cmd.canExecute()==true);

+		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().execute(cmd);	

+		// EditorUtils.getTransactionalEditingDomain().getCommandStack().execute(cmd);

+		assertTrue(CREATION +TEST_THE_EXECUTION,((Diagram)getRootView()).getEdges().size()==3);

+		assertTrue(CREATION +TEST_THE_EXECUTION,getRootSemanticModel().getOwnedElements().size()==6);

+		

+		//Undo

+		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().undo();	

+		assertTrue(CREATION +TEST_THE_UNDO,((Diagram)getRootView()).getEdges().size()==1);

+		assertTrue(CREATION +TEST_THE_UNDO,getRootSemanticModel().getOwnedElements().size()==6);

+		

+		

+		//redo

+		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().redo();	

+		assertTrue(CREATION +TEST_THE_REDO,((Diagram)getRootView()).getEdges().size()==3);

+		assertTrue(CREATION +TEST_THE_REDO,getRootSemanticModel().getOwnedElements().size()==6);

+		assertTrue(CREATION +TEST_THE_REDO,getDiagramEditPart().getChildren().get(5)!=null);

+		linkNode =(ShapeNodeEditPart)getDiagramEditPart().getChildren().get(5);

+

+		//test to create the branch from node to multidependency

+		if(flow){

+			cmd = linkNode.getCommand(createConnectionViewRequest(branchType, fourthPlayer,linkNode));   

+

+		}

+		else{//test to create the branch from  multidependency to node

+			cmd = linkNode.getCommand(createConnectionViewRequest(branchType,linkNode, fourthPlayer));   

+		}

+

+		assertTrue(CONTAINER_CREATION+TEST_IF_THE_COMMAND_CAN_BE_EXECUTED,cmd.canExecute()==true);

+		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().execute(cmd);	

+		assertTrue(CREATION +TEST_THE_EXECUTION,((Diagram)getRootView()).getEdges().size()==4);

+		assertTrue(CREATION +TEST_THE_EXECUTION,getRootSemanticModel().getOwnedElements().size()==6);

+		

+		//undo

+		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().undo();	

+		assertTrue(CREATION +TEST_THE_UNDO,((Diagram)getRootView()).getEdges().size()==3);

+		assertTrue(CREATION +TEST_THE_UNDO,getRootSemanticModel().getOwnedElements().size()==6);

+		

+		//redo

+		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().redo();	

+		assertTrue(CREATION +TEST_THE_REDO,((Diagram)getRootView()).getEdges().size()==4);

+		assertTrue(CREATION +TEST_THE_REDO,getRootSemanticModel().getOwnedElements().size()==6);

+	}

+

+

+

+	public void testTargetReconnectAMultiLink(IElementType type) {

+

+		//target reconnection

+		ReconnectRequest reconnectRequest= new ReconnectRequest();

+		assertTrue(THE_BRANCH_TO_RECONNECT_EXISTS,(ConnectionEditPart)target.getTargetConnections().get(0)!=null);

+		ConnectionEditPart branch=(ConnectionEditPart)target.getTargetConnections().get(0);

+		reconnectRequest.setConnectionEditPart(branch);

+		reconnectRequest.setTargetEditPart(guestPlayer);

+		reconnectRequest.setType(RequestConstants.REQ_RECONNECT_TARGET);

+

+		Command cmd = guestPlayer.getCommand(reconnectRequest);   

+

+		assertTrue(RECONNECTION_TARGET+TEST_IF_THE_COMMAND_CAN_BE_EXECUTED,cmd.canExecute()==true);

+		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().execute(cmd);	

+		// EditorUtils.getTransactionalEditingDomain().getCommandStack().execute(cmd);

+		assertTrue(RECONNECTION_TARGET+TEST_THE_EXECUTION,((Diagram)getRootView()).getEdges().size()==4);

+		assertTrue(RECONNECTION_TARGET +TEST_THE_EXECUTION,getRootSemanticModel().getOwnedElements().size()==6);

+		assertTrue(BRANCH_EXISTS_RECONNECTION_ON_TARGET,branch.getTarget().equals(guestPlayer));

+		

+		//undo

+		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().undo();

+		assertTrue(BRANCH_EXISTS_RECONNECTION_ON_TARGET+ TEST_THE_UNDO,branch.getTarget().equals(target));

+		

+		//redo

+		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().redo();

+		assertTrue(BRANCH_EXISTS_RECONNECTION_ON_TARGET+ TEST_THE_REDO,branch.getTarget().equals(guestPlayer));

+		

+		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().undo();

+

+

+	}

+

+	public void testSourceReconnectAMultiLink(IElementType type) {

+

+		//target reconnection

+		ReconnectRequest reconnectRequest= new ReconnectRequest();

+		assertTrue(THE_BRANCH_TO_RECONNECT_EXISTS,(ConnectionEditPart)source.getSourceConnections().get(0)!=null);

+		ConnectionEditPart branch=(ConnectionEditPart)source.getSourceConnections().get(0);

+		reconnectRequest.setConnectionEditPart(branch);

+		reconnectRequest.setTargetEditPart(guestPlayer);

+		reconnectRequest.setType(RequestConstants.REQ_RECONNECT_SOURCE);

+

+		Command cmd = guestPlayer.getCommand(reconnectRequest);   

+

+		assertTrue(RECONNECTION_SOURCE+TEST_IF_THE_COMMAND_CAN_BE_EXECUTED,cmd.canExecute()==true);

+		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().execute(cmd);	

+		assertTrue(RECONNECTION_SOURCE+TEST_THE_EXECUTION,((Diagram)getRootView()).getEdges().size()==4);

+		assertTrue(RECONNECTION_SOURCE +TEST_THE_EXECUTION,getRootSemanticModel().getOwnedElements().size()==6);

+		assertTrue(BRANCH_EXISTS_RECONNECTION_ON_SOURCE+TEST_THE_EXECUTION,branch.getSource().equals(guestPlayer));

+		

+		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().undo();

+		assertTrue(BRANCH_EXISTS_RECONNECTION_ON_SOURCE+ TEST_THE_UNDO,branch.getSource().equals(source));

+		

+		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().redo();

+		assertTrue(BRANCH_EXISTS_RECONNECTION_ON_SOURCE+TEST_THE_REDO,branch.getSource().equals(guestPlayer));

+		

+		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().undo();

+	}

+

+	public CreateConnectionViewRequest createConnectionViewRequest(IElementType type , EditPart source, EditPart target){

+		CreateConnectionViewRequest connectionRequest = CreateViewRequestFactory.getCreateConnectionRequest(type,((IGraphicalEditPart) getDiagramEditPart())

+				.getDiagramPreferencesHint());

+

+		connectionRequest.setSourceEditPart(null);

+		connectionRequest.setTargetEditPart(source);

+		connectionRequest

+		.setType(RequestConstants.REQ_CONNECTION_START);

+		source.getCommand(connectionRequest);

+

+		// Now, setup the request in preparation to get the

+		// connection end

+		// command.

+		connectionRequest.setSourceEditPart(source);

+		connectionRequest.setTargetEditPart(target);

+		connectionRequest

+		.setType(RequestConstants.REQ_CONNECTION_END);

+		return connectionRequest;

+	}

+

+	/**

+	 * @see org.eclipse.papyrus.diagram.clazz.test.canonical.AbstractPapyrusTestCase#setUp()

+	 *

+	 * @throws Exception

+	 */

+

+	@Override

+	protected void setUp() throws Exception {

+		super.setUp();

+

+		CreateViewRequest requestcreation=CreateViewRequestFactory.getCreateShapeRequest(UMLElementTypes.Class_2008, getDiagramEditPart().getDiagramPreferencesHint());

+		//1st node

+		requestcreation.setLocation(new Point(10,10));

+		Command command=getDiagramEditPart().getCommand(requestcreation);

+		assertNotNull(CONTAINER_CREATION+COMMAND_NULL,command);

+		assertTrue(CONTAINER_CREATION +TEST_IF_THE_COMMAND_IS_CREATED,command!=UnexecutableCommand.INSTANCE);

+		assertTrue(CONTAINER_CREATION+TEST_IF_THE_COMMAND_CAN_BE_EXECUTED,command.canExecute()==true);

+		diagramEditor.getEditingDomain().getCommandStack().execute(new GEFtoEMFCommandWrapper(command));

+		assertTrue(CREATION +INITIALIZATION_TEST,getDiagramEditPart().getChildren().size()==1);

+

+

+		requestcreation.setLocation(new Point(400,10));

+		//2d node

+		command=getDiagramEditPart().getCommand(requestcreation);

+		assertNotNull(CONTAINER_CREATION+COMMAND_NULL,command);

+		assertTrue(CONTAINER_CREATION +TEST_IF_THE_COMMAND_IS_CREATED,command!=UnexecutableCommand.INSTANCE);

+		assertTrue(CONTAINER_CREATION+TEST_IF_THE_COMMAND_CAN_BE_EXECUTED,command.canExecute()==true);

+		diagramEditor.getEditingDomain().getCommandStack().execute(new GEFtoEMFCommandWrapper(command));

+		assertTrue(CREATION +INITIALIZATION_TEST,getDiagramEditPart().getChildren().size()==2);

+

+		requestcreation.setLocation(new Point(200,200));

+		//3d node

+		command=getDiagramEditPart().getCommand(requestcreation);

+		assertNotNull(CONTAINER_CREATION+COMMAND_NULL,command);

+		assertTrue(CONTAINER_CREATION +TEST_IF_THE_COMMAND_IS_CREATED,command!=UnexecutableCommand.INSTANCE);

+		assertTrue(CONTAINER_CREATION+TEST_IF_THE_COMMAND_CAN_BE_EXECUTED,command.canExecute()==true);

+		diagramEditor.getEditingDomain().getCommandStack().execute(new GEFtoEMFCommandWrapper(command));

+		assertTrue(CREATION +INITIALIZATION_TEST,getDiagramEditPart().getChildren().size()==3);

+		source=(GraphicalEditPart)getDiagramEditPart().getChildren().get(0);

+		target=(GraphicalEditPart)getDiagramEditPart().getChildren().get(1);

+		thirdPlayer=(GraphicalEditPart)getDiagramEditPart().getChildren().get(2);

+

+		//4d node

+		requestcreation.setLocation(new Point(400,400));

+		command=getDiagramEditPart().getCommand(requestcreation);

+		assertNotNull(CONTAINER_CREATION+COMMAND_NULL,command);

+		assertTrue(CONTAINER_CREATION +TEST_IF_THE_COMMAND_IS_CREATED,command!=UnexecutableCommand.INSTANCE);

+		assertTrue(CONTAINER_CREATION+TEST_IF_THE_COMMAND_CAN_BE_EXECUTED,command.canExecute()==true);

+		diagramEditor.getEditingDomain().getCommandStack().execute(new GEFtoEMFCommandWrapper(command));

+		assertTrue(CREATION +INITIALIZATION_TEST,getDiagramEditPart().getChildren().size()==4);

+		fourthPlayer=(GraphicalEditPart)getDiagramEditPart().getChildren().get(3);

+		//4d guest

+		requestcreation.setLocation(new Point(600,400));

+		command=getDiagramEditPart().getCommand(requestcreation);

+		assertNotNull(CONTAINER_CREATION+COMMAND_NULL,command);

+		assertTrue(CONTAINER_CREATION +TEST_IF_THE_COMMAND_IS_CREATED,command!=UnexecutableCommand.INSTANCE);

+		assertTrue(CONTAINER_CREATION+TEST_IF_THE_COMMAND_CAN_BE_EXECUTED,command.canExecute()==true);

+		diagramEditor.getEditingDomain().getCommandStack().execute(new GEFtoEMFCommandWrapper(command));

+		assertTrue(CREATION +INITIALIZATION_TEST,getDiagramEditPart().getChildren().size()==5);

+		guestPlayer=(GraphicalEditPart)getDiagramEditPart().getChildren().get(4);

+

+

+

+

+

+	}

+

+	public void installbinaryLink(IElementType type) {

+		//binaryLink

+		Command command = target.getCommand(createConnectionViewRequest(type, source, target));   

+

+		assertTrue(CONTAINER_CREATION+TEST_IF_THE_COMMAND_CAN_BE_EXECUTED,command.canExecute()==true);

+		diagramEditor.getEditingDomain().getCommandStack().execute(new GEFtoEMFCommandWrapper(command));

+		assertTrue(CREATION +INITIALIZATION_TEST,((Diagram)getRootView()).getEdges().size()==1);

+		assertTrue(CREATION +INITIALIZATION_TEST,getRootSemanticModel().getOwnedElements().size()==6);

+

+		binaryLink= (ConnectionEditPart)source.getSourceConnections().get(0);

+

+	}

+

+	/**

+	 * @see org.eclipse.papyrus.diagram.clazz.test.canonical.AbstractPapyrusTestCase#getRootView()

+	 *

+	 * @return

+	 */

+

+	@Override

+	protected View getRootView() {

+		return (View)getDiagramEditPart().getModel();

+	}

+

+	/**

+	 * Test to manage child node.

+	 * 

+	 * @param type the type

+	 * @param containerType the container type

+	 */

+	public void testToManageMultiLink(IElementType binaryLinkType, IElementType branchType, boolean flow) {

+		installbinaryLink(binaryLinkType);

+		testToCreateAMultiLink(branchType, flow);

+		testTargetReconnectAMultiLink(branchType);

+		if(flow){

+			testSourceReconnectAMultiLink(branchType);

+		}

+		testDestroy(branchType);

+		//end of the test

+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();

+		assertTrue(CREATION +TEST_THE_UNDO,getDiagramEditPart().getChildren().get(5) instanceof ShapeNodeEditPart);

+		linkNode =(ShapeNodeEditPart)getDiagramEditPart().getChildren().get(5);

+

+		testViewDeletion(branchType);

+		testDrop(branchType);

+	}

+

+

+}

diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/AllCanonicalTests.java b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/AllCanonicalTests.java
new file mode 100644
index 00000000000..af71e41a8d2
--- /dev/null
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/AllCanonicalTests.java
@@ -0,0 +1,41 @@
+/*****************************************************************************

+ * Copyright (c) 2010 CEA LIST.

+ *    

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation

+ *****************************************************************************/

+package org.eclipse.papyrus.diagram.clazz.test.canonical;

+

+import org.junit.runner.RunWith;

+import org.junit.runners.Suite;

+import org.junit.runners.Suite.SuiteClasses;

+

+

+/**

+ * All test in canonical package

+ */

+@RunWith(Suite.class)

+@SuiteClasses({

+// top nodes

+TestClassDiagramTopNode.class,

+// child nodes

+TestClassDiagramChildNode.class,

+//labelNodes

+TestClassDiagramChildLabel.class,

+//test links

+TestClassDiagramLink.class,

+//test links owned by source

+TestClassDiagramLinkOwnedBySource.class,

+// multilinks

+TestMutliLink.class,

+//test the order for the drop

+TestDropfunction.class,

+})

+public class AllCanonicalTests {

+

+}

diff --git a/tests/org.eclipse.papyrus.diagram.clazz.test/src/org/eclipse/papyrus/diagram/clazz/test/canonical/TestChildLabel.java b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestChildLabel.java
index eba1f7b5662..6c3d3833cec 100644
--- a/tests/org.eclipse.papyrus.diagram.clazz.test/src/org/eclipse/papyrus/diagram/clazz/test/canonical/TestChildLabel.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestChildLabel.java
@@ -41,7 +41,7 @@ import org.eclipse.uml2.uml.Element;
 /**

  * The Class TestChildLabel.

  */

-public class TestChildLabel extends AbstractPapyrusTestCase {

+public abstract class TestChildLabel extends AbstractPapyrusTestCase {

 	

 	

 	/** The Constant CREATION. */

@@ -357,10 +357,10 @@ public class TestChildLabel extends AbstractPapyrusTestCase {
 	public void testToManageTopNode(IElementType topNodeType,IElementType type, int containerType) {

 		testToCreateATopNode(topNodeType);

 		testToCreateANode(type,containerType);

-		testViewDeletion(type,containerType);

-		diagramEditor.getEditingDomain().getCommandStack().undo();

 		testDestroy(type,containerType);

 		diagramEditor.getEditingDomain().getCommandStack().undo();

+		testViewDeletion(type,containerType);

+		//diagramEditor.getEditingDomain().getCommandStack().undo();

 		testDrop(type,containerType);

 		testChangeContainer(topNodeType,type, containerType);

 	}

diff --git a/tests/org.eclipse.papyrus.diagram.clazz.test/src/org/eclipse/papyrus/diagram/clazz/test/canonical/TestChildNode.java b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestChildNode.java
index 51df299b393..f6259b25b52 100644
--- a/tests/org.eclipse.papyrus.diagram.clazz.test/src/org/eclipse/papyrus/diagram/clazz/test/canonical/TestChildNode.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestChildNode.java
@@ -34,6 +34,7 @@ import org.eclipse.gmf.runtime.emf.type.core.IElementType;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.diagram.common.command.wrappers.GEFtoEMFCommandWrapper;

 import org.eclipse.uml2.uml.Element;

 

 

@@ -45,44 +46,7 @@ import org.eclipse.uml2.uml.Element;
 public class TestChildNode extends AbstractPapyrusTestCase {

 	

 	

-	/** The Constant CREATION. */

-	protected static final String CREATION = "CREATION:";

 	

-	/** The Constant CONTAINER_CREATION. */

-	protected static final String CONTAINER_CREATION = "CONTAINER CREATION: ";

-	

-	/** The Constant DROP. */

-	protected static final String DROP = "DROP: ";

-	

-	/** The Constant DESTROY_DELETION. */

-	protected static final String DESTROY_DELETION = "DESTROY DELETION: ";

-	

-	/** The Constant COMMAND_NULL. */

-	protected static final String COMMAND_NULL = " command null";

-	

-	/** The Constant VIEW_DELETION. */

-	protected static final String VIEW_DELETION = "VIEW DELETION: ";

-	

-	/** The Constant TEST_THE_REDO. */

-	protected static final String TEST_THE_REDO = "test the redo";

-	

-	/** The Constant TEST_THE_UNDO. */

-	protected static final String TEST_THE_UNDO = "test the undo";

-	

-	/** The Constant TEST_THE_EXECUTION. */

-	protected static final String TEST_THE_EXECUTION = "test the execution";

-	

-	/** The Constant TEST_IF_THE_COMMAND_CAN_BE_EXECUTED. */

-	protected static final String TEST_IF_THE_COMMAND_CAN_BE_EXECUTED = "test if the command can be executed";

-	

-	/** The Constant TEST_IF_THE_COMMAND_IS_CREATED. */

-	protected static final String TEST_IF_THE_COMMAND_IS_CREATED = "test if the command is created";

-

-	/** The Constant INITIALIZATION_TEST. */

-	protected static final String INITIALIZATION_TEST = "Intitial State";

-	

-	/** The Constant CHANGE_CONTAINER. */

-	protected static final String CHANGE_CONTAINER = "CHANGE CONTAINER";

 	

 	/** The root compartment. */

 	protected ShapeCompartmentEditPart rootCompartment=null;

@@ -102,13 +66,13 @@ public class TestChildNode extends AbstractPapyrusTestCase {
 		assertNotNull(VIEW_DELETION +COMMAND_NULL,command);

 		assertTrue(VIEW_DELETION +TEST_IF_THE_COMMAND_IS_CREATED,command!=UnexecutableCommand.INSTANCE);

 		assertTrue(VIEW_DELETION +TEST_IF_THE_COMMAND_CAN_BE_EXECUTED,command.canExecute()==true);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

+		diagramEditor.getEditingDomain().getCommandStack().execute(new GEFtoEMFCommandWrapper(command));

 		assertTrue(VIEW_DELETION +TEST_THE_EXECUTION,getRootCompartment().getChildren().size()==0);

 		assertTrue(VIEW_DELETION +TEST_THE_EXECUTION,getRootSemanticModel().getOwnedElements().size()==1);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();

+		diagramEditor.getEditingDomain().getCommandStack().undo();

 		assertTrue(VIEW_DELETION +TEST_THE_UNDO,getRootCompartment().getChildren().size()==1);

 		assertTrue(VIEW_DELETION +TEST_THE_UNDO,getRootSemanticModel().getOwnedElements().size()==1);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();

+		diagramEditor.getEditingDomain().getCommandStack().redo();

 		assertTrue(VIEW_DELETION +TEST_THE_REDO,getRootCompartment().getChildren().size()==0);

 		assertTrue(VIEW_DELETION +TEST_THE_REDO,getRootSemanticModel().getOwnedElements().size()==1);

 		

@@ -139,13 +103,13 @@ public class TestChildNode extends AbstractPapyrusTestCase {
 		assertNotNull(DESTROY_DELETION +COMMAND_NULL,command);

 		assertTrue(DESTROY_DELETION +TEST_IF_THE_COMMAND_IS_CREATED,command!=UnexecutableCommand.INSTANCE);

 		assertTrue(DESTROY_DELETION+TEST_IF_THE_COMMAND_CAN_BE_EXECUTED,command.canExecute()==true);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

+		diagramEditor.getEditingDomain().getCommandStack().execute(new GEFtoEMFCommandWrapper(command));

 		assertTrue(DESTROY_DELETION +TEST_THE_EXECUTION,getRootCompartment().getChildren().size()==0);

 		assertTrue(DESTROY_DELETION +TEST_THE_EXECUTION,getRootSemanticModel().getOwnedElements().size()==0);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();

-		//assertTrue(DESTROY_DELETION +TEST_THE_UNDO,getRootCompartment().getChildren().size()==1);

+		diagramEditor.getEditingDomain().getCommandStack().undo();

+		assertTrue(DESTROY_DELETION +TEST_THE_UNDO,getRootCompartment().getChildren().size()==1);

 		assertTrue(DESTROY_DELETION +TEST_THE_UNDO,getRootSemanticModel().getOwnedElements().size()==1);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();

+		diagramEditor.getEditingDomain().getCommandStack().redo();

 		assertTrue(DESTROY_DELETION +TEST_THE_REDO,getRootCompartment().getChildren().size()==0);

 		assertTrue(DESTROY_DELETION +TEST_THE_REDO,getRootSemanticModel().getOwnedElements().size()==0);

 	}

@@ -171,13 +135,13 @@ public class TestChildNode extends AbstractPapyrusTestCase {
 		assertNotNull(DROP+COMMAND_NULL,command);

 		assertTrue(DROP +TEST_IF_THE_COMMAND_IS_CREATED,command!=UnexecutableCommand.INSTANCE);

 		assertTrue(DROP+TEST_IF_THE_COMMAND_CAN_BE_EXECUTED,command.canExecute()==true);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

+		diagramEditor.getEditingDomain().getCommandStack().execute(new GEFtoEMFCommandWrapper(command));

 		assertTrue(DROP +TEST_THE_EXECUTION,getRootCompartment().getChildren().size()!=0);

 		assertTrue(DROP +TEST_THE_EXECUTION,getRootSemanticModel().getOwnedElements().size()!=0);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();

+		diagramEditor.getEditingDomain().getCommandStack().undo();

 		assertTrue(DROP+TEST_THE_UNDO,getRootCompartment().getChildren().size()==0);

 		assertTrue(DROP+TEST_THE_UNDO,getRootSemanticModel().getOwnedElements().size()!=0);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();

+		diagramEditor.getEditingDomain().getCommandStack().redo();

 		assertTrue(DROP+TEST_THE_REDO,getRootCompartment().getChildren().size()!=0);

 		assertTrue(DROP+TEST_THE_REDO,getRootSemanticModel().getOwnedElements().size()!=0);

 		}

@@ -200,7 +164,7 @@ public class TestChildNode extends AbstractPapyrusTestCase {
 		assertNotNull(CONTAINER_CREATION+COMMAND_NULL,command);

 		assertTrue(CONTAINER_CREATION +TEST_IF_THE_COMMAND_IS_CREATED,command!=UnexecutableCommand.INSTANCE);

 		assertTrue(CONTAINER_CREATION+TEST_IF_THE_COMMAND_CAN_BE_EXECUTED,command.canExecute()==true);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

+		diagramEditor.getEditingDomain().getCommandStack().execute(new GEFtoEMFCommandWrapper(command));

 		assertTrue(CONTAINER_CREATION+TEST_THE_EXECUTION,getRootView().getChildren().size()==2);

 		GraphicalEditPart containerEditPart= (GraphicalEditPart)getRootCompartment().getChildren().get(1);

 		ChangeBoundsRequest changeBoundsRequest = new ChangeBoundsRequest(RequestConstants.REQ_ADD);

@@ -221,15 +185,15 @@ public class TestChildNode extends AbstractPapyrusTestCase {
 		assertNotNull(CHANGE_CONTAINER,command);

 		assertTrue(CHANGE_CONTAINER+TEST_IF_THE_COMMAND_IS_CREATED,command!=UnexecutableCommand.INSTANCE);

 		assertTrue(CHANGE_CONTAINER+TEST_IF_THE_COMMAND_CAN_BE_EXECUTED,command.canExecute()==true);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

+		diagramEditor.getEditingDomain().getCommandStack().execute(new GEFtoEMFCommandWrapper(command));

 		assertTrue(CHANGE_CONTAINER+TEST_THE_EXECUTION,getRootView().getChildren().size()==1);

 		assertTrue(CHANGE_CONTAINER+TEST_THE_EXECUTION,getRootSemanticModel().getOwnedElements().size()==1);

 		assertTrue(CHANGE_CONTAINER+TEST_THE_EXECUTION,compartment.getChildren().size()==1);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();

+		diagramEditor.getEditingDomain().getCommandStack().undo();

 		assertTrue(CHANGE_CONTAINER+TEST_THE_UNDO,getRootView().getChildren().size()==2);

 		assertTrue(CHANGE_CONTAINER+TEST_THE_UNDO,getRootSemanticModel().getOwnedElements().size()==2);

 		assertTrue(CHANGE_CONTAINER+TEST_THE_EXECUTION,compartment.getChildren().size()==0);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();

+		diagramEditor.getEditingDomain().getCommandStack().redo();

 		assertTrue(CHANGE_CONTAINER+TEST_THE_REDO,getRootView().getChildren().size()==1);

 		assertTrue(CHANGE_CONTAINER+TEST_THE_REDO,getRootSemanticModel().getOwnedElements().size()==1);

 		assertTrue(CHANGE_CONTAINER+TEST_THE_EXECUTION,compartment.getChildren().size()==1);

@@ -252,12 +216,12 @@ public class TestChildNode extends AbstractPapyrusTestCase {
 		assertNotNull(CREATION+COMMAND_NULL,command);

 		assertTrue(CREATION+TEST_IF_THE_COMMAND_IS_CREATED,command!=UnexecutableCommand.INSTANCE);

 		assertTrue("CREATION: "+TEST_IF_THE_COMMAND_CAN_BE_EXECUTED,command.canExecute()==true);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

+		diagramEditor.getEditingDomain().getCommandStack().execute(new GEFtoEMFCommandWrapper(command));

 		assertTrue(CREATION+TEST_THE_EXECUTION,getRootView().getChildren().size()==1);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();

+		diagramEditor.getEditingDomain().getCommandStack().undo();

 		assertTrue(CREATION+TEST_THE_UNDO,getRootView().getChildren().size()==0);

 		assertTrue(CREATION+TEST_THE_UNDO,getRootSemanticModel().getOwnedElements().size()==0);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();

+		diagramEditor.getEditingDomain().getCommandStack().redo();

 		assertTrue("CREATION: "+TEST_THE_REDO,getRootCompartment().getChildren().size()==1);

 						

 	}

@@ -277,7 +241,7 @@ public class TestChildNode extends AbstractPapyrusTestCase {
 		assertNotNull(CONTAINER_CREATION+COMMAND_NULL,command);

 		assertTrue(CONTAINER_CREATION +TEST_IF_THE_COMMAND_IS_CREATED,command!=UnexecutableCommand.INSTANCE);

 		assertTrue(CONTAINER_CREATION+TEST_IF_THE_COMMAND_CAN_BE_EXECUTED,command.canExecute()==true);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

+		diagramEditor.getEditingDomain().getCommandStack().execute(new GEFtoEMFCommandWrapper(command));

 		assertTrue(CREATION +INITIALIZATION_TEST,getDiagramEditPart().getChildren().size()==1);

 		GraphicalEditPart containerEditPart= (GraphicalEditPart)getDiagramEditPart().getChildren().get(0);

 		rootCompartment = null;

diff --git a/tests/org.eclipse.papyrus.diagram.clazz.test/src/org/eclipse/papyrus/diagram/clazz/test/canonical/TestClassDiagramChildLabel.java b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestClassDiagramChildLabel.java
index 9b3dc5d5843..b3969984c08 100644
--- a/tests/org.eclipse.papyrus.diagram.clazz.test/src/org/eclipse/papyrus/diagram/clazz/test/canonical/TestClassDiagramChildLabel.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestClassDiagramChildLabel.java
@@ -35,36 +35,71 @@ import org.junit.Test;
  */

 public class TestClassDiagramChildLabel extends TestChildLabel {

 

-	

-	/**

-	 * Test to manage component.

-	 */

 	@Test

-	public void testToManageComponent() {

+	public void testToManageinstanceSlot() {

 		//instance specification

 		testToManageTopNode(UMLElementTypes.InstanceSpecification_2001, UMLElementTypes.Slot_3030, InstanceSpecificationSlotCompartmentEditPart.VISUAL_ID);

-		//component

+	}

+	@Test

+	public void testToManageComponentProperty() {

+		//instance specification

 		testToManageTopNode(UMLElementTypes.Component_2002, UMLElementTypes.Property_3002, ComponentAttributeCompartmentEditPart.VISUAL_ID);

-		testToManageTopNode(UMLElementTypes.Component_2002, UMLElementTypes.Operation_3003, ComponentOperationCompartmentEditPart.VISUAL_ID);

+	}

+	

+	@Test

+	public void testToManageComponentNestedClass() {

+		//instance specification

 		testToManageTopNode(UMLElementTypes.Component_2002, UMLElementTypes.Class_3004, ComponentNestedClassifierCompartmentEditPart.VISUAL_ID);

-		//signal

+	}

+	@Test

+	public void testToManageComponentOperation() {

+		//instance specification

+		testToManageTopNode(UMLElementTypes.Component_2002, UMLElementTypes.Operation_3003, ComponentOperationCompartmentEditPart.VISUAL_ID);

+	}

+	

+	@Test

+	public void testToManageSignalProperty() {

+		//instance specification

 		testToManageTopNode(UMLElementTypes.Signal_2003, UMLElementTypes.Property_3005, SignalAttributeCompartmentEditPart.VISUAL_ID);

+	}

+	

+	public void testToManageInterfaceProperty() {

 		//interface

 		testToManageTopNode(UMLElementTypes.Interface_2004, UMLElementTypes.Property_3006, InterfaceAttributeCompartmentEditPart.VISUAL_ID);

+	}	

+	public void testToManageInterfaceOperation() {

+		//interface

 		testToManageTopNode(UMLElementTypes.Interface_2004, UMLElementTypes.Operation_3007, InterfaceOperationCompartmentEditPart.VISUAL_ID);

+	}

+	

+	public void testToManageInterfaceNestedClass() {

+		//interface

 		testToManageTopNode(UMLElementTypes.Interface_2004, UMLElementTypes.Class_3008, InterfaceNestedClassifierCompartmentEditPart.VISUAL_ID);

+	}	

+	

+	public void testToManageEnumerationLiteralEnumeration() {

 		//Enumeration

 		testToManageTopNode(UMLElementTypes.Enumeration_2006, UMLElementTypes.EnumerationLiteral_3017, EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID);

-		

-		//class

+		}

+	

+	public void testToManageClassProperty() {

+		//Enumeration

 		testToManageTopNode(UMLElementTypes.Class_2008, UMLElementTypes.Property_3012, ClassAttributeCompartment2EditPart.VISUAL_ID);

+			}

+	

+	public void testToManageClassReception() {

+		//Enumeration

 		testToManageTopNode(UMLElementTypes.Class_2008, UMLElementTypes.Reception_3011, ClassOperationCompartment2EditPart.VISUAL_ID);

+				}

+	

+	public void testToManageClassOperation() {

+		//Enumeration

 		testToManageTopNode(UMLElementTypes.Class_2008, UMLElementTypes.Operation_3013, ClassOperationCompartment2EditPart.VISUAL_ID);

+				}

+	@Test

+	public void testToClassNestedClass() {

+		//class

 		testToManageTopNode(UMLElementTypes.Class_2008, UMLElementTypes.Class_3014, ClassNestedClassifierCompartment2EditPart.VISUAL_ID);

-

-		//DataType

-		//toDo

-		

 	}

 	

 	

diff --git a/tests/org.eclipse.papyrus.diagram.clazz.test/src/org/eclipse/papyrus/diagram/clazz/test/canonical/TestClassDiagramChildNode.java b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestClassDiagramChildNode.java
index 6fbb247b697..6fbb247b697 100644
--- a/tests/org.eclipse.papyrus.diagram.clazz.test/src/org/eclipse/papyrus/diagram/clazz/test/canonical/TestClassDiagramChildNode.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestClassDiagramChildNode.java
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestClassDiagramLink.java b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestClassDiagramLink.java
new file mode 100644
index 00000000000..64b09bbb458
--- /dev/null
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestClassDiagramLink.java
@@ -0,0 +1,75 @@
+/*****************************************************************************

+ * Copyright (c) 2010 CEA LIST.

+ *

+ *    

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.diagram.clazz.test.canonical;

+

+import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

+import org.junit.Test;

+

+

+/**

+ * The Class TestClassDiagramLink use to test link that are contained by the owner of the target and the source

+ */

+public class TestClassDiagramLink extends TestLink {

+

+	

+	/**

+	 * Test to manage component.

+	 */

+	@Test

+	public void testToManageDependency() {

+		testToManageLink(UMLElementTypes.Component_2002,UMLElementTypes.Component_2002,UMLElementTypes.Dependency_4008,UMLElementTypes.Package_2007);

+	}

+	

+	/**

+	 * Test to manage Association.

+	 */

+	@Test

+	public void testToManageAssociation() {

+		testToManageLink(UMLElementTypes.Class_2008,UMLElementTypes.Class_2008,UMLElementTypes.Association_4001,UMLElementTypes.Package_2007);

+	}

+	//test generatlization

+	//test interfaceRealization

+	//test substitution

+	/**

+	 * Test to manage Realization

+	 */

+	@Test

+	public void testToManageRealization() {

+		testToManageLink(UMLElementTypes.Class_2008,UMLElementTypes.Class_2008,UMLElementTypes.Realization_4005,UMLElementTypes.Package_2007);

+	}

+	

+	/**

+	 * Test to manage Abstraction

+	 */

+	@Test

+	public void testToManageAbstraction() {

+		testToManageLink(UMLElementTypes.Class_2008,UMLElementTypes.Class_2008,UMLElementTypes.Abstraction_4006,UMLElementTypes.Package_2007);

+	}

+	

+	/**

+	 * Test to manage Usage

+	 */

+	@Test

+	public void testToManageUsage() {

+		testToManageLink(UMLElementTypes.Class_2008,UMLElementTypes.Class_2008,UMLElementTypes.Usage_4007,UMLElementTypes.Package_2007);

+	}

+	//test Element import

+	//testPackageImport

+	//test comment link

+	//test constraintLink

+	//test template binding

+	//test containment link

+	//test instancespecificationLink

+	

+}

diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestClassDiagramLinkOwnedBySource.java b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestClassDiagramLinkOwnedBySource.java
new file mode 100644
index 00000000000..7109934350f
--- /dev/null
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestClassDiagramLinkOwnedBySource.java
@@ -0,0 +1,73 @@
+/*****************************************************************************

+ * Copyright (c) 2010 CEA LIST.

+ *

+ *    

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.diagram.clazz.test.canonical;

+

+import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

+import org.junit.Test;

+

+

+/**

+ * The Class TestClassDiagramLink use to test link that are contained by the owner of the target and the source

+ */

+public class TestClassDiagramLinkOwnedBySource extends TestLinkOwnedBySource {

+

+	

+	

+	/**

+	 * Test to manage Association.

+	 */

+	@Test

+	public void testToManageGeneralization() {

+		testToManageLink(UMLElementTypes.Class_2008,UMLElementTypes.Class_2008,UMLElementTypes.Generalization_4002,UMLElementTypes.Package_2007);

+	}

+	

+	/**

+	 * Test to manage InterfaceRealization.

+	 */

+	@Test

+	public void testToManageInterfaceRealization() {

+		testToManageLink(UMLElementTypes.Class_2008,UMLElementTypes.Interface_2004,UMLElementTypes.InterfaceRealization_4003,UMLElementTypes.Package_2007);

+	}

+	

+	/**

+	 * Test to manage Substitution.

+	 */

+	@Test

+	public void testToManageSubstitution() {

+		testToManageLink(UMLElementTypes.Class_2008,UMLElementTypes.Class_2008,UMLElementTypes.Substitution_4004,UMLElementTypes.Package_2007);

+	}

+	

+	/**

+	 * Test to manage ElementImport.

+	 */

+	@Test

+	public void testToManageElementImport() {

+		testToManageLink(UMLElementTypes.Class_2008,UMLElementTypes.Class_2008,UMLElementTypes.ElementImport_4009,UMLElementTypes.Package_2007);

+	}

+	/**

+	 * Test to manage ElementImport.

+	 */

+	@Test

+	public void testToManagePackageImport() {

+		testToManageLink(UMLElementTypes.Package_2007,UMLElementTypes.Package_2007,UMLElementTypes.PackageImport_4010,UMLElementTypes.Package_2007);

+	}

+	

+	

+	//test comment link

+	//test constraintLink

+	//test template binding

+	//test containment link

+	//test instancespecificationLink

+	

+}

diff --git a/tests/org.eclipse.papyrus.diagram.clazz.test/src/org/eclipse/papyrus/diagram/clazz/test/canonical/TestClassDiagramTopNode.java b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestClassDiagramTopNode.java
index f2c6d84afa2..f2c6d84afa2 100644
--- a/tests/org.eclipse.papyrus.diagram.clazz.test/src/org/eclipse/papyrus/diagram/clazz/test/canonical/TestClassDiagramTopNode.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestClassDiagramTopNode.java
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestDropfunction.java b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestDropfunction.java
new file mode 100644
index 00000000000..6406d1f23da
--- /dev/null
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestDropfunction.java
@@ -0,0 +1,129 @@
+/*****************************************************************************

+ * Copyright (c) 2009 CEA LIST.

+ *

+ *    

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.diagram.clazz.test.canonical;

+

+import java.util.ArrayList;

+

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.RequestConstants;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gef.requests.GroupRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ListCompartmentEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;

+import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.notation.View;

+import org.eclipse.papyrus.diagram.clazz.edit.parts.EnumerationEnumerationLiteralCompartmentEditPart;

+import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

+import org.eclipse.papyrus.diagram.common.command.wrappers.GEFtoEMFCommandWrapper;

+import org.eclipse.uml2.uml.Element;

+import org.junit.Test;

+

+/**

+ * test in order to verify if the drop respect the order of the selection

+ * Create an enumeration, create subenumerationliterals, select them, drop into the diagram

+ * the order of enumeration list has to be the same that as the list in the request drop.

+ *

+ */

+

+public  class TestDropfunction extends TestChildLabel {

+public static int MAX=20;

+@Test

+public void testDropWithOrder(){

+	testToCreateATopNode(UMLElementTypes.Enumeration_2006);

+	testToCreateSetOfNode(UMLElementTypes.EnumerationLiteral_3017, EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID);

+	testSetOfDrop(UMLElementTypes.EnumerationLiteral_3017, EnumerationEnumerationLiteralCompartmentEditPart.VISUAL_ID);

+}

+

+	protected void testToCreateSetOfNode(IElementType type,int containerType) {

+		ListCompartmentEditPart compartment=null;

+		int index=0;

+		while (compartment==null && index <getTopEditPart().getChildren().size()){

+			if((getTopEditPart().getChildren().get(index)) instanceof ListCompartmentEditPart&& (((View)((ListCompartmentEditPart)(getTopEditPart().getChildren().get(index))).getModel()).getType().equals(""+containerType))){

+				compartment= (ListCompartmentEditPart)(getTopEditPart().getChildren().get(index));

+			}

+			index++;

+		}

+		assertTrue("Container not found", compartment!=null);

+		//CREATION

+		assertTrue(CREATION +INITIALIZATION_TEST,compartment.getChildren().size()==0);

+		assertTrue(CREATION +INITIALIZATION_TEST,getRootSemanticModel().getOwnedElements().size()==0);

+

+		

+		for(int i=0; i<MAX;i++){

+			CreateViewRequest requestcreation=CreateViewRequestFactory.getCreateShapeRequest(type, getDiagramEditPart().getDiagramPreferencesHint());

+			Command command=compartment.getCommand(requestcreation);

+			assertNotNull(CREATION+COMMAND_NULL,command);

+			assertTrue(CREATION+TEST_IF_THE_COMMAND_IS_CREATED,command!=UnexecutableCommand.INSTANCE);

+			assertTrue("CREATION: "+TEST_IF_THE_COMMAND_CAN_BE_EXECUTED,command.canExecute()==true);

+			//creation of label

+			diagramEditor.getEditingDomain().getCommandStack().execute(new GEFtoEMFCommandWrapper(command));

+			assertTrue(CREATION+TEST_THE_EXECUTION,compartment.getChildren().size()==1);

+			//deletion view

+			Request deleteViewRequest = new GroupRequest(RequestConstants.REQ_DELETE);

+			command = ((GraphicalEditPart)compartment.getChildren().get(0)).getCommand(deleteViewRequest);

+			assertNotNull(VIEW_DELETION +COMMAND_NULL,command);

+			diagramEditor.getEditingDomain().getCommandStack().execute(new GEFtoEMFCommandWrapper(command));

+		}

+

+	}

+	/**

+	 * Test drop.

+	 * 

+	 * @param type the type

+	 * @param containerType the container type

+	 */

+	protected void testSetOfDrop(IElementType type,int containerType) {

+		ListCompartmentEditPart compartment=null;

+		int index=0;

+		while (compartment==null && index <getTopEditPart().getChildren().size()){

+			if((getTopEditPart().getChildren().get(index)) instanceof ListCompartmentEditPart&& (((View)((ListCompartmentEditPart)(getTopEditPart().getChildren().get(index))).getModel()).getType().equals(""+containerType))){

+				compartment= (ListCompartmentEditPart)(getTopEditPart().getChildren().get(index));

+			}

+			index++;

+		}

+		assertTrue("Container not found", compartment!=null);

+		//DROP

+		assertTrue(DROP +INITIALIZATION_TEST,compartment.getChildren().size()==0);

+		assertTrue(DROP +INITIALIZATION_TEST,((Element)((View)getTopEditPart().getModel()).getElement()).getOwnedElements().size()==MAX);

+		

+		

+		DropObjectsRequest dropObjectsRequest= new DropObjectsRequest();

+		ArrayList<Element> list = new ArrayList<Element>();

+		for(int i=0; i<MAX;i++){

+			list.add(getRootSemanticModel().getOwnedElements().get(i));

+		}

+		dropObjectsRequest.setObjects(list);

+		dropObjectsRequest.setLocation(new Point(20,20));

+		Command command= compartment.getCommand(dropObjectsRequest);

+		assertNotNull(DROP+COMMAND_NULL,command);

+		assertTrue(DROP +TEST_IF_THE_COMMAND_IS_CREATED,command!=UnexecutableCommand.INSTANCE);

+		assertTrue(DROP+TEST_IF_THE_COMMAND_CAN_BE_EXECUTED,command.canExecute()==true);

+		diagramEditor.getEditingDomain().getCommandStack().execute(new GEFtoEMFCommandWrapper(command));

+		assertTrue(DROP +TEST_THE_EXECUTION,compartment.getChildren().size()==MAX);

+		assertTrue(DROP +TEST_THE_EXECUTION,((Element)((View)getTopEditPart().getModel()).getElement()).getOwnedElements().size()==MAX);

+		

+		for(int i=0; i<MAX;i++){

+			assertEquals(getRootSemanticModel().getOwnedElements().get(i),((GraphicalEditPart) compartment.getChildren().get(i)).resolveSemanticElement());

+		}	

+	

+	}

+	

+

+

+}

diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestLink.java b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestLink.java
new file mode 100644
index 00000000000..85a8ea8cd2b
--- /dev/null
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestLink.java
@@ -0,0 +1,415 @@
+/*****************************************************************************

+ * Copyright (c) 2009 CEA LIST.

+ *

+ *    

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.diagram.clazz.test.canonical;

+

+import java.util.ArrayList;

+

+import org.eclipse.core.commands.operations.OperationHistoryFactory;

+import org.eclipse.core.runtime.NullProgressMonitor;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.ConnectionEditPart;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.RequestConstants;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gef.requests.ChangeBoundsRequest;

+import org.eclipse.gef.requests.GroupRequest;

+import org.eclipse.gef.requests.ReconnectRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewRequest;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;

+import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;

+import org.eclipse.gmf.runtime.diagram.ui.requests.EditCommandRequestWrapper;

+import org.eclipse.gmf.runtime.emf.commands.core.command.EditingDomainUndoContext;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.notation.Diagram;

+import org.eclipse.papyrus.core.services.ServiceException;

+import org.eclipse.papyrus.core.utils.ServiceUtilsForActionHandlers;

+import org.eclipse.papyrus.diagram.common.Activator;

+import org.eclipse.papyrus.diagram.common.command.wrappers.GEFtoEMFCommandWrapper;

+import org.eclipse.uml2.uml.Element;

+

+

+

+// TODO: Auto-generated Javadoc

+/**

+ * The Class TestTopLink to test when this is link . The link is attached to a semantic element that has to be contained by the source and the target.

+ * To adapt when source owns the created link

+ */

+public class TestLink extends AbstractPapyrusTestCase {

+	

+	

+	

+

+	protected static final String THE_LINK_RECONNECT_EXISTS = "The Link exist";

+	protected static final String RECONNECTION_TARGET = "Reconnection of target";

+	protected static final String LINK_EXISTS_RECONNECTION_ON_TARGET = "Link exist on the target";

+	protected static final String THE_LINK_TO_RECONNECT_EXISTS = "The Link exist";

+	protected static final String RECONNECTION_SOURCE = "Reconnection of source";

+	protected static final String LINK_EXISTS_RECONNECTION_ON_SOURCE = "Link exist on the source";

+	protected GraphicalEditPart source=null;

+	protected GraphicalEditPart sourcePlayer=null;

+	protected GraphicalEditPart target=null;

+	protected GraphicalEditPart targetPlayer=null;

+

+	/**

+	 * Test view deletion.

+	 * 

+	 * @param type the type

+	 */

+	public void testViewDeletion(IElementType type) {

+		//DELETION OF THE VIEW

+		assertTrue(VIEW_DELETION +INITIALIZATION_TEST, source.getSourceConnections().size()==1);

+		assertTrue(VIEW_DELETION +INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size()==5);

+		

+		Request deleteViewRequest = new GroupRequest(RequestConstants.REQ_DELETE);

+		Command command = ((ConnectionEditPart)source.getSourceConnections().get(0)).getCommand(deleteViewRequest);

+		assertNotNull(VIEW_DELETION +COMMAND_NULL,command);

+		assertTrue(VIEW_DELETION +TEST_IF_THE_COMMAND_IS_CREATED,command!=UnexecutableCommand.INSTANCE);

+		assertTrue(VIEW_DELETION +TEST_IF_THE_COMMAND_CAN_BE_EXECUTED,command.canExecute()==true);

+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

+		assertTrue(VIEW_DELETION +TEST_THE_EXECUTION,source.getSourceConnections().size()==0);

+		assertTrue(VIEW_DELETION +TEST_THE_EXECUTION,getRootSemanticModel().getOwnedElements().size()==5);

+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();

+		assertTrue(VIEW_DELETION +TEST_THE_UNDO,source.getSourceConnections().size()==1);

+		assertTrue(VIEW_DELETION +TEST_THE_UNDO,getRootSemanticModel().getOwnedElements().size()==5);

+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();

+		assertTrue(VIEW_DELETION +TEST_THE_REDO,source.getSourceConnections().size()==0);

+		assertTrue(VIEW_DELETION +TEST_THE_REDO,getRootSemanticModel().getOwnedElements().size()==5);

+		

+	}

+	/**

+	 * Retrieves the TransactionalEditingDomain

+	 * 

+	 * @return the editing domain (can be null)

+	 */

+	protected TransactionalEditingDomain getEditingDomain() {

+		ServiceUtilsForActionHandlers serviceUtils = new ServiceUtilsForActionHandlers();

+		TransactionalEditingDomain editingDomain = null;

+		try {

+			editingDomain = serviceUtils.getTransactionalEditingDomain();

+

+		} catch (ServiceException e) {

+			Activator.log.error(e);

+		}

+

+		return editingDomain;

+	}

+	/**

+	 * Test destroy.

+	 * 

+	 * @param type the type

+	 */

+	public void testDestroy(IElementType type) {

+		

+

+		//DESTROY SEMANTIC+ VIEW

+		assertTrue(DESTROY_DELETION +INITIALIZATION_TEST,source.getSourceConnections().size()==1);

+		assertTrue(DESTROY_DELETION +INITIALIZATION_TEST,getRootSemanticModel().getOwnedElements().size()==5);

+	

+		

+		Request deleteViewRequest =	new EditCommandRequestWrapper( new DestroyElementRequest(false));

+		Command command = ((ConnectionEditPart)source.getSourceConnections().get(0)).getCommand(deleteViewRequest);

+		assertNotNull(DESTROY_DELETION +COMMAND_NULL,command);

+		assertTrue(DESTROY_DELETION +TEST_IF_THE_COMMAND_IS_CREATED,command!=UnexecutableCommand.INSTANCE);

+		assertTrue(DESTROY_DELETION+TEST_IF_THE_COMMAND_CAN_BE_EXECUTED,command.canExecute()==true);

+		getEditingDomain().getCommandStack().execute(new GEFtoEMFCommandWrapper(command));

+		assertTrue(DESTROY_DELETION +INITIALIZATION_TEST,source.getSourceConnections().size()==0);

+		assertTrue(DESTROY_DELETION +INITIALIZATION_TEST,getRootSemanticModel().getOwnedElements().size()==4);

+		

+		EditingDomainUndoContext undoContext= new EditingDomainUndoContext(getEditingDomain());

+		try{

+		OperationHistoryFactory.getOperationHistory().undo(undoContext, new NullProgressMonitor(), null);

+		}catch (Exception e) {

+			System.err.println(e);

+		}

+		

+		assertTrue(DESTROY_DELETION +INITIALIZATION_TEST,source.getSourceConnections().size()==1);

+		assertTrue(DESTROY_DELETION +INITIALIZATION_TEST,getRootSemanticModel().getOwnedElements().size()==5);

+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();

+		assertTrue(DESTROY_DELETION +INITIALIZATION_TEST,source.getSourceConnections().size()==0);

+		assertTrue(DESTROY_DELETION +INITIALIZATION_TEST,getRootSemanticModel().getOwnedElements().size()==4);

+	}

+	

+	

+	/**

+	 * Test drop.

+	 * 

+	 * @param type the type

+	 */

+	public void testDrop(IElementType type) {

+		//DROP

+		assertTrue(DROP +INITIALIZATION_TEST,getDiagramEditPart().getChildren().size()==4);

+		assertTrue(DROP +INITIALIZATION_TEST,getRootSemanticModel().getOwnedElements().size()==5);

+		assertTrue(CREATION +INITIALIZATION_TEST,((Diagram)getRootView()).getEdges().size()==0);

+		

+		

+		

+		DropObjectsRequest dropObjectsRequest= new DropObjectsRequest();

+		ArrayList<Element> list = new ArrayList<Element>();

+		list.add(getRootSemanticModel().getOwnedElements().get(4));

+		dropObjectsRequest.setObjects(list);

+		dropObjectsRequest.setLocation(new Point(20,20));

+		Command command= getDiagramEditPart().getCommand(dropObjectsRequest);

+		assertNotNull(DROP+COMMAND_NULL,command);

+		assertTrue(DROP +TEST_IF_THE_COMMAND_IS_CREATED,command!=UnexecutableCommand.INSTANCE);

+		assertTrue(DROP+TEST_IF_THE_COMMAND_CAN_BE_EXECUTED,command.canExecute()==true);

+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

+		assertTrue(DROP +TEST_THE_EXECUTION,getDiagramEditPart().getChildren().size()==4);

+		assertTrue(DROP +TEST_THE_EXECUTION,getRootSemanticModel().getOwnedElements().size()==5);

+		assertTrue(DROP +TEST_THE_EXECUTION,((Diagram)getRootView()).getEdges().size()==1);

+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();

+		assertTrue(DROP +TEST_THE_UNDO,getDiagramEditPart().getChildren().size()==4);

+		assertTrue(DROP +TEST_THE_UNDO,getRootSemanticModel().getOwnedElements().size()==5);

+		assertTrue(DROP +TEST_THE_UNDO,((Diagram)getRootView()).getEdges().size()==0);

+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();

+		assertTrue(DROP +TEST_THE_REDO,getDiagramEditPart().getChildren().size()==4);

+		assertTrue(DROP +TEST_THE_REDO,getRootSemanticModel().getOwnedElements().size()==5);

+		assertTrue(DROP +TEST_THE_REDO,((Diagram)getRootView()).getEdges().size()==1);

+		}

+	

+	

+	/**

+	 * Test change container.

+	 * 

+	 * @param type the type

+	 * @param containerType the container type

+	 */

+	public void testChangeContainer(IElementType type, IElementType containerType) {

+		//CHANGE CONTAINER

+		assertTrue(CHANGE_CONTAINER +INITIALIZATION_TEST,getDiagramEditPart().getChildren().size()==1);

+		assertTrue(CHANGE_CONTAINER +INITIALIZATION_TEST,getRootSemanticModel().getOwnedElements().size()==1);

+		

+		

+		Request requestcreation=CreateViewRequestFactory.getCreateShapeRequest(containerType, getDiagramEditPart().getDiagramPreferencesHint());

+		Command command=getDiagramEditPart().getCommand(requestcreation);

+		assertNotNull(CONTAINER_CREATION+COMMAND_NULL,command);

+		assertTrue(CONTAINER_CREATION +TEST_IF_THE_COMMAND_IS_CREATED,command!=UnexecutableCommand.INSTANCE);

+		assertTrue(CONTAINER_CREATION+TEST_IF_THE_COMMAND_CAN_BE_EXECUTED,command.canExecute()==true);

+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

+		assertTrue(CONTAINER_CREATION+TEST_THE_EXECUTION,getRootView().getChildren().size()==2);

+		GraphicalEditPart containerEditPart= (GraphicalEditPart)getDiagramEditPart().getChildren().get(1);

+		ChangeBoundsRequest changeBoundsRequest = new ChangeBoundsRequest(RequestConstants.REQ_ADD);

+		changeBoundsRequest.setEditParts((EditPart)getDiagramEditPart().getChildren().get(0));

+		changeBoundsRequest.setLocation(new Point(30,30));

+		ShapeCompartmentEditPart compartment=null;

+		int index=0;

+		while (compartment==null && index <containerEditPart.getChildren().size()){

+			if((containerEditPart.getChildren().get(index)) instanceof ShapeCompartmentEditPart){

+				compartment= (ShapeCompartmentEditPart)(containerEditPart.getChildren().get(index));

+			}

+			index++;

+		}

+		assertTrue("Container not found", compartment!=null);

+		

+		

+		command=compartment.getCommand(changeBoundsRequest);

+		assertNotNull(CHANGE_CONTAINER,command);

+		assertTrue(CHANGE_CONTAINER+TEST_IF_THE_COMMAND_IS_CREATED,command!=UnexecutableCommand.INSTANCE);

+		assertTrue(CHANGE_CONTAINER+TEST_IF_THE_COMMAND_CAN_BE_EXECUTED,command.canExecute()==true);

+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

+		assertTrue(CHANGE_CONTAINER+TEST_THE_EXECUTION,getRootView().getChildren().size()==1);

+		assertTrue(CHANGE_CONTAINER+TEST_THE_EXECUTION,getRootSemanticModel().getOwnedElements().size()==1);

+		assertTrue(CHANGE_CONTAINER+TEST_THE_EXECUTION,compartment.getChildren().size()==1);

+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();

+		assertTrue(CHANGE_CONTAINER+TEST_THE_UNDO,getRootView().getChildren().size()==2);

+		assertTrue(CHANGE_CONTAINER+TEST_THE_UNDO,getRootSemanticModel().getOwnedElements().size()==2);

+		assertTrue(CHANGE_CONTAINER+TEST_THE_EXECUTION,compartment.getChildren().size()==0);

+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();

+		assertTrue(CHANGE_CONTAINER+TEST_THE_REDO,getRootView().getChildren().size()==1);

+		assertTrue(CHANGE_CONTAINER+TEST_THE_REDO,getRootSemanticModel().getOwnedElements().size()==1);

+		assertTrue(CHANGE_CONTAINER+TEST_THE_EXECUTION,compartment.getChildren().size()==1);

+		

+		}

+	

+	/**

+	 * Test to create a link.

+	 * 

+	 * @param linkType the type

+	 */

+	public void testToCreateALink(IElementType linkType) {

+		assertTrue(CREATION +INITIALIZATION_TEST,getDiagramEditPart().getChildren().size()==4);

+		assertTrue(CREATION +INITIALIZATION_TEST,getRootSemanticModel().getOwnedElements().size()==4);

+		

+		Command command = target.getCommand(createConnectionViewRequest(linkType, source, target));   

+		assertNotNull(CREATION+COMMAND_NULL,command);

+		assertTrue(CONTAINER_CREATION+TEST_IF_THE_COMMAND_CAN_BE_EXECUTED,command.canExecute()==true);

+		diagramEditor.getEditingDomain().getCommandStack().execute(new GEFtoEMFCommandWrapper(command));

+		assertTrue(CREATION +INITIALIZATION_TEST,((Diagram)getRootView()).getEdges().size()==1);

+		assertTrue(CREATION +INITIALIZATION_TEST,getRootSemanticModel().getOwnedElements().size()==5);

+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();

+		assertTrue(CREATION+TEST_THE_UNDO,getRootView().getChildren().size()==4);

+		assertTrue(CREATION+TEST_THE_UNDO,getRootSemanticModel().getOwnedElements().size()==4);

+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();

+		assertTrue(CREATION +TEST_THE_REDO,((Diagram)getRootView()).getEdges().size()==1);

+		assertTrue(CREATION +TEST_THE_REDO,getRootSemanticModel().getOwnedElements().size()==5);

+						

+	}

+	public void installEnvironment(IElementType sourceType,IElementType targetType ){

+		assertTrue(CREATION +INITIALIZATION_TEST,getDiagramEditPart().getChildren().size()==0);

+		assertTrue(CREATION +INITIALIZATION_TEST,getRootSemanticModel().getOwnedElements().size()==0);

+		

+		//create the source

+		CreateViewRequest requestcreation=CreateViewRequestFactory.getCreateShapeRequest(sourceType, getDiagramEditPart().getDiagramPreferencesHint());

+		requestcreation.setLocation(new Point(100, 100));

+		Command command=getDiagramEditPart().getCommand(requestcreation);

+		assertNotNull(CREATION+COMMAND_NULL,command);

+		assertTrue(CREATION+TEST_IF_THE_COMMAND_IS_CREATED,command!=UnexecutableCommand.INSTANCE);

+		assertTrue("CREATION: "+TEST_IF_THE_COMMAND_CAN_BE_EXECUTED,command.canExecute()==true);

+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

+		

+		

+		//create the source player to test reconnect

+		 requestcreation=CreateViewRequestFactory.getCreateShapeRequest(sourceType, getDiagramEditPart().getDiagramPreferencesHint());

+		requestcreation.setLocation(new Point(100, 300));

+		 command=getDiagramEditPart().getCommand(requestcreation);

+		assertNotNull(CREATION+COMMAND_NULL,command);

+		assertTrue(CREATION+TEST_IF_THE_COMMAND_IS_CREATED,command!=UnexecutableCommand.INSTANCE);

+		assertTrue("CREATION: "+TEST_IF_THE_COMMAND_CAN_BE_EXECUTED,command.canExecute()==true);

+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

+		

+		//create the target

+		requestcreation=CreateViewRequestFactory.getCreateShapeRequest(targetType, getDiagramEditPart().getDiagramPreferencesHint());

+		requestcreation.setLocation(new Point(300, 100));

+		command=getDiagramEditPart().getCommand(requestcreation);

+		assertNotNull(CREATION+COMMAND_NULL,command);

+		assertTrue(CREATION+TEST_IF_THE_COMMAND_IS_CREATED,command!=UnexecutableCommand.INSTANCE);

+		assertTrue("CREATION: "+TEST_IF_THE_COMMAND_CAN_BE_EXECUTED,command.canExecute()==true);

+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

+		

+		//create the target player to test reconnect

+		requestcreation=CreateViewRequestFactory.getCreateShapeRequest(targetType, getDiagramEditPart().getDiagramPreferencesHint());

+		requestcreation.setLocation(new Point(300, 300));

+		command=getDiagramEditPart().getCommand(requestcreation);

+		assertNotNull(CREATION+COMMAND_NULL,command);

+		assertTrue(CREATION+TEST_IF_THE_COMMAND_IS_CREATED,command!=UnexecutableCommand.INSTANCE);

+		assertTrue("CREATION: "+TEST_IF_THE_COMMAND_CAN_BE_EXECUTED,command.canExecute()==true);

+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

+		

+		

+		

+		

+		source=(GraphicalEditPart)getDiagramEditPart().getChildren().get(0);

+		sourcePlayer=(GraphicalEditPart)getDiagramEditPart().getChildren().get(1);

+		target=(GraphicalEditPart)getDiagramEditPart().getChildren().get(2);

+		targetPlayer=(GraphicalEditPart)getDiagramEditPart().getChildren().get(3);

+		

+	}

+	

+	public CreateConnectionViewRequest createConnectionViewRequest(IElementType type , EditPart source, EditPart target){

+		CreateConnectionViewRequest connectionRequest = CreateViewRequestFactory.getCreateConnectionRequest(type,((IGraphicalEditPart) getDiagramEditPart())

+				.getDiagramPreferencesHint());

+

+		connectionRequest.setSourceEditPart(null);

+		connectionRequest.setTargetEditPart(source);

+		connectionRequest

+		.setType(RequestConstants.REQ_CONNECTION_START);

+		source.getCommand(connectionRequest);

+

+		// Now, setup the request in preparation to get the

+		// connection end

+		// command.

+		connectionRequest.setSourceEditPart(source);

+		connectionRequest.setTargetEditPart(target);

+		connectionRequest

+		.setType(RequestConstants.REQ_CONNECTION_END);

+		return connectionRequest;

+	}

+	

+	

+	

+	public void testTargetReconnectAMultiLink(IElementType type) {

+

+		//target reconnection

+		ReconnectRequest reconnectRequest= new ReconnectRequest();

+		assertTrue(THE_LINK_RECONNECT_EXISTS,(ConnectionEditPart)target.getTargetConnections().get(0)!=null);

+		ConnectionEditPart binaryLink=(ConnectionEditPart)target.getTargetConnections().get(0);

+		reconnectRequest.setConnectionEditPart(binaryLink);

+		reconnectRequest.setTargetEditPart(targetPlayer);

+		reconnectRequest.setType(RequestConstants.REQ_RECONNECT_TARGET);

+

+		Command cmd = targetPlayer.getCommand(reconnectRequest);   

+

+		assertTrue(RECONNECTION_TARGET+TEST_IF_THE_COMMAND_CAN_BE_EXECUTED,cmd.canExecute()==true);

+		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().execute(cmd);	

+		// EditorUtils.getTransactionalEditingDomain().getCommandStack().execute(cmd);

+		assertTrue(RECONNECTION_TARGET+TEST_THE_EXECUTION,((Diagram)getRootView()).getEdges().size()==1);

+		assertTrue(RECONNECTION_TARGET +TEST_THE_EXECUTION,getRootSemanticModel().getOwnedElements().size()==5);

+		assertTrue(LINK_EXISTS_RECONNECTION_ON_TARGET,binaryLink.getTarget().equals(targetPlayer));

+		

+		//undo

+		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().undo();

+		assertTrue(LINK_EXISTS_RECONNECTION_ON_TARGET+ TEST_THE_UNDO,binaryLink.getTarget().equals(target));

+		

+		//redo

+		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().redo();

+		assertTrue(LINK_EXISTS_RECONNECTION_ON_TARGET+ TEST_THE_REDO,binaryLink.getTarget().equals(targetPlayer));

+		

+

+

+	}

+

+	public void testSourceReconnectAMultiLink(IElementType type) {

+

+		//target reconnection

+		ReconnectRequest reconnectRequest= new ReconnectRequest();

+		assertTrue(THE_LINK_TO_RECONNECT_EXISTS,(ConnectionEditPart)source.getSourceConnections().get(0)!=null);

+		ConnectionEditPart branch=(ConnectionEditPart)source.getSourceConnections().get(0);

+		reconnectRequest.setConnectionEditPart(branch);

+		reconnectRequest.setTargetEditPart(sourcePlayer);

+		reconnectRequest.setType(RequestConstants.REQ_RECONNECT_SOURCE);

+

+		Command cmd = sourcePlayer.getCommand(reconnectRequest);   

+

+		assertTrue(RECONNECTION_SOURCE+TEST_IF_THE_COMMAND_CAN_BE_EXECUTED,cmd.canExecute()==true);

+		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().execute(cmd);	

+		assertTrue(RECONNECTION_SOURCE+TEST_THE_EXECUTION,((Diagram)getRootView()).getEdges().size()==1);

+		assertTrue(RECONNECTION_SOURCE +TEST_THE_EXECUTION,getRootSemanticModel().getOwnedElements().size()==5);

+		assertTrue(LINK_EXISTS_RECONNECTION_ON_SOURCE+TEST_THE_EXECUTION,branch.getSource().equals(sourcePlayer));

+		

+		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().undo();

+		assertTrue(LINK_EXISTS_RECONNECTION_ON_SOURCE+ TEST_THE_UNDO,branch.getSource().equals(source));

+		

+		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().redo();

+		assertTrue(LINK_EXISTS_RECONNECTION_ON_SOURCE+TEST_THE_REDO,branch.getSource().equals(sourcePlayer));

+		

+	}

+	

+	/**

+	 * Test to manage top node.

+	 * 

+	 * @param type the type

+	 * @param containerType the container type

+	 */

+	public void testToManageLink(IElementType sourceType,IElementType targetType, IElementType linkType, IElementType containerType) {

+		installEnvironment(sourceType, targetType);

+		testToCreateALink(linkType);

+		testDestroy(linkType);

+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();

+		testViewDeletion(linkType);

+		testDrop(linkType);

+		testSourceReconnectAMultiLink(linkType);

+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();

+		testTargetReconnectAMultiLink(linkType);

+		

+	}

+	

+	

+}

diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestLinkOwnedBySource.java b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestLinkOwnedBySource.java
new file mode 100644
index 00000000000..88e0b9ea8e7
--- /dev/null
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestLinkOwnedBySource.java
@@ -0,0 +1,302 @@
+/*****************************************************************************

+ * Copyright (c) 2009 CEA LIST.

+ *

+ *    

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

+ *

+ *****************************************************************************/

+package org.eclipse.papyrus.diagram.clazz.test.canonical;

+

+import java.util.ArrayList;

+

+import org.eclipse.core.commands.operations.OperationHistoryFactory;

+import org.eclipse.core.runtime.NullProgressMonitor;

+import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gef.ConnectionEditPart;

+import org.eclipse.gef.EditPart;

+import org.eclipse.gef.Request;

+import org.eclipse.gef.RequestConstants;

+import org.eclipse.gef.commands.Command;

+import org.eclipse.gef.commands.UnexecutableCommand;

+import org.eclipse.gef.requests.ChangeBoundsRequest;

+import org.eclipse.gef.requests.GroupRequest;

+import org.eclipse.gef.requests.ReconnectRequest;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewRequest;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;

+import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;

+import org.eclipse.gmf.runtime.diagram.ui.requests.EditCommandRequestWrapper;

+import org.eclipse.gmf.runtime.emf.commands.core.command.EditingDomainUndoContext;

+import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.notation.Diagram;

+import org.eclipse.papyrus.core.services.ServiceException;

+import org.eclipse.papyrus.core.utils.ServiceUtilsForActionHandlers;

+import org.eclipse.papyrus.diagram.common.Activator;

+import org.eclipse.papyrus.diagram.common.command.wrappers.GEFtoEMFCommandWrapper;

+import org.eclipse.uml2.uml.Element;

+

+

+public class TestLinkOwnedBySource extends TestLink {

+	

+	

+	/**

+	 * Test view deletion.

+	 * 

+	 * @param type the type

+	 */

+	public void testViewDeletion(IElementType type) {

+		//DELETION OF THE VIEW

+		assertTrue(VIEW_DELETION +INITIALIZATION_TEST, source.getSourceConnections().size()==1);

+		assertTrue(VIEW_DELETION +INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size()==4);

+		assertTrue(VIEW_DELETION +INITIALIZATION_TEST, ((Element)source.resolveSemanticElement()).getOwnedElements().size()==1);

+		Request deleteViewRequest = new GroupRequest(RequestConstants.REQ_DELETE);

+		Command command = ((ConnectionEditPart)source.getSourceConnections().get(0)).getCommand(deleteViewRequest);

+		assertNotNull(VIEW_DELETION +COMMAND_NULL,command);

+		assertTrue(VIEW_DELETION +TEST_IF_THE_COMMAND_IS_CREATED,command!=UnexecutableCommand.INSTANCE);

+		assertTrue(VIEW_DELETION +TEST_IF_THE_COMMAND_CAN_BE_EXECUTED,command.canExecute()==true);

+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

+		assertTrue(VIEW_DELETION +TEST_THE_EXECUTION,source.getSourceConnections().size()==0);

+		assertTrue(VIEW_DELETION +TEST_THE_EXECUTION,getRootSemanticModel().getOwnedElements().size()==4);

+		assertTrue(VIEW_DELETION +TEST_THE_EXECUTION, ((Element)source.resolveSemanticElement()).getOwnedElements().size()==1);

+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();

+		assertTrue(VIEW_DELETION +TEST_THE_UNDO,source.getSourceConnections().size()==1);

+		assertTrue(VIEW_DELETION +TEST_THE_UNDO,getRootSemanticModel().getOwnedElements().size()==4);

+		assertTrue(VIEW_DELETION +TEST_THE_UNDO, ((Element)source.resolveSemanticElement()).getOwnedElements().size()==1);

+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();

+		assertTrue(VIEW_DELETION +TEST_THE_REDO,source.getSourceConnections().size()==0);

+		assertTrue(VIEW_DELETION +TEST_THE_REDO,getRootSemanticModel().getOwnedElements().size()==4);

+		assertTrue(VIEW_DELETION +TEST_THE_REDO, ((Element)source.resolveSemanticElement()).getOwnedElements().size()==1);

+		

+	}

+	

+	/**

+	 * Test destroy.

+	 * 

+	 * @param type the type

+	 */

+	public void testDestroy(IElementType type) {

+		

+

+		//DESTROY SEMANTIC+ VIEW

+		assertTrue(DESTROY_DELETION +INITIALIZATION_TEST,source.getSourceConnections().size()==1);

+		assertTrue(DESTROY_DELETION +INITIALIZATION_TEST,getRootSemanticModel().getOwnedElements().size()==4);

+		assertTrue(DESTROY_DELETION +INITIALIZATION_TEST, ((Element)source.resolveSemanticElement()).getOwnedElements().size()==1);

+		

+		Request deleteViewRequest =	new EditCommandRequestWrapper( new DestroyElementRequest(false));

+		Command command = ((ConnectionEditPart)source.getSourceConnections().get(0)).getCommand(deleteViewRequest);

+		assertNotNull(DESTROY_DELETION +COMMAND_NULL,command);

+		assertTrue(DESTROY_DELETION +TEST_IF_THE_COMMAND_IS_CREATED,command!=UnexecutableCommand.INSTANCE);

+		assertTrue(DESTROY_DELETION+TEST_IF_THE_COMMAND_CAN_BE_EXECUTED,command.canExecute()==true);

+		getEditingDomain().getCommandStack().execute(new GEFtoEMFCommandWrapper(command));

+		assertTrue(DESTROY_DELETION +TEST_THE_EXECUTION,source.getSourceConnections().size()==0);

+		assertTrue(DESTROY_DELETION +TEST_THE_EXECUTION,getRootSemanticModel().getOwnedElements().size()==4);

+		assertTrue(DESTROY_DELETION +TEST_THE_EXECUTION, ((Element)source.resolveSemanticElement()).getOwnedElements().size()==0);

+		

+		EditingDomainUndoContext undoContext= new EditingDomainUndoContext(getEditingDomain());

+		try{

+		OperationHistoryFactory.getOperationHistory().undo(undoContext, new NullProgressMonitor(), null);

+		}catch (Exception e) {

+			System.err.println(e);

+		}

+		

+		assertTrue(DESTROY_DELETION +TEST_THE_UNDO,source.getSourceConnections().size()==1);

+		assertTrue(DESTROY_DELETION +TEST_THE_UNDO,getRootSemanticModel().getOwnedElements().size()==4);

+		assertTrue(DESTROY_DELETION +TEST_THE_UNDO, ((Element)source.resolveSemanticElement()).getOwnedElements().size()==1);

+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();

+		assertTrue(DESTROY_DELETION +TEST_THE_REDO,source.getSourceConnections().size()==0);

+		assertTrue(DESTROY_DELETION +TEST_THE_REDO,getRootSemanticModel().getOwnedElements().size()==4);

+		assertTrue(DESTROY_DELETION +TEST_THE_REDO, ((Element)source.resolveSemanticElement()).getOwnedElements().size()==0);

+	}

+	

+	

+	/**

+	 * Test drop.

+	 * 

+	 * @param type the type

+	 */

+	public void testDrop(IElementType type) {

+		//DROP

+		assertTrue(DROP +INITIALIZATION_TEST,getDiagramEditPart().getChildren().size()==4);

+		assertTrue(DROP +INITIALIZATION_TEST,getRootSemanticModel().getOwnedElements().size()==4);

+		assertTrue(DROP +INITIALIZATION_TEST, ((Element)source.resolveSemanticElement()).getOwnedElements().size()==1);

+		assertTrue(DROP +TEST_THE_REDO,((Diagram)getRootView()).getEdges().size()==0);

+		

+		DropObjectsRequest dropObjectsRequest= new DropObjectsRequest();

+		ArrayList<Element> list = new ArrayList<Element>();

+		list.add(((Element)source.resolveSemanticElement()).getOwnedElements().get(0));

+		dropObjectsRequest.setObjects(list);

+		dropObjectsRequest.setLocation(new Point(20,20));

+		Command command= getDiagramEditPart().getCommand(dropObjectsRequest);

+		assertNotNull(DROP+COMMAND_NULL,command);

+		assertTrue(DROP +TEST_IF_THE_COMMAND_IS_CREATED,command!=UnexecutableCommand.INSTANCE);

+		assertTrue(DROP+TEST_IF_THE_COMMAND_CAN_BE_EXECUTED,command.canExecute()==true);

+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

+		assertTrue(DROP +TEST_THE_EXECUTION,getDiagramEditPart().getChildren().size()==4);

+		assertTrue(DROP +TEST_THE_EXECUTION,getRootSemanticModel().getOwnedElements().size()==4);

+		assertTrue(DROP +TEST_THE_EXECUTION, ((Element)source.resolveSemanticElement()).getOwnedElements().size()==1);

+		assertTrue(DROP +TEST_THE_EXECUTION,((Diagram)getRootView()).getEdges().size()==1);

+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();

+		assertTrue(DROP +TEST_THE_REDO,getDiagramEditPart().getChildren().size()==4);

+		assertTrue(DROP +TEST_THE_REDO,getRootSemanticModel().getOwnedElements().size()==4);

+		assertTrue(DROP +TEST_THE_REDO, ((Element)source.resolveSemanticElement()).getOwnedElements().size()==1);

+		assertTrue(DROP +TEST_THE_REDO,((Diagram)getRootView()).getEdges().size()==0);

+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();

+		assertTrue(DROP +TEST_THE_REDO,getDiagramEditPart().getChildren().size()==4);

+		assertTrue(DROP +TEST_THE_REDO,getRootSemanticModel().getOwnedElements().size()==4);

+		assertTrue(DROP +TEST_THE_REDO, ((Element)source.resolveSemanticElement()).getOwnedElements().size()==1);

+		assertTrue(DROP +TEST_THE_REDO,((Diagram)getRootView()).getEdges().size()==1);

+		}

+	

+	

+	

+	

+	/**

+	 * Test to create a link.

+	 * 

+	 * @param linkType the type

+	 */

+	public void testToCreateALink(IElementType linkType) {

+		assertTrue(CREATION +INITIALIZATION_TEST,getDiagramEditPart().getChildren().size()==4);

+		assertTrue(CREATION +INITIALIZATION_TEST,getRootSemanticModel().getOwnedElements().size()==4);

+		assertTrue(CREATION +INITIALIZATION_TEST, ((Element)source.resolveSemanticElement()).getOwnedElements().size()==0);

+		

+		Command command = target.getCommand(createConnectionViewRequest(linkType, source, target));   

+		assertNotNull(CREATION+COMMAND_NULL,command);

+		assertTrue(CONTAINER_CREATION+TEST_IF_THE_COMMAND_CAN_BE_EXECUTED,command.canExecute()==true);

+		diagramEditor.getEditingDomain().getCommandStack().execute(new GEFtoEMFCommandWrapper(command));

+		assertTrue(CREATION +TEST_THE_EXECUTION,((Diagram)getRootView()).getEdges().size()==1);

+		assertTrue(CREATION +TEST_THE_EXECUTION,getRootSemanticModel().getOwnedElements().size()==4);

+		assertTrue(CREATION +TEST_THE_EXECUTION, ((Element)source.resolveSemanticElement()).getOwnedElements().size()==1);

+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();

+		assertTrue(CREATION+TEST_THE_UNDO,getRootView().getChildren().size()==4);

+		assertTrue(CREATION+TEST_THE_UNDO,getRootSemanticModel().getOwnedElements().size()==4);

+		assertTrue(CREATION +TEST_THE_UNDO, ((Element)source.resolveSemanticElement()).getOwnedElements().size()==0);

+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();

+		assertTrue(CREATION +TEST_THE_REDO,((Diagram)getRootView()).getEdges().size()==1);

+		assertTrue(CREATION +TEST_THE_REDO,getRootSemanticModel().getOwnedElements().size()==4);

+		assertTrue(CREATION +TEST_THE_REDO, ((Element)source.resolveSemanticElement()).getOwnedElements().size()==1);

+						

+	}

+	public void installEnvironment(IElementType sourceType,IElementType targetType ){

+		assertTrue(CREATION +INITIALIZATION_TEST,getDiagramEditPart().getChildren().size()==0);

+		assertTrue(CREATION +INITIALIZATION_TEST,getRootSemanticModel().getOwnedElements().size()==0);

+		

+		//create the source

+		CreateViewRequest requestcreation=CreateViewRequestFactory.getCreateShapeRequest(sourceType, getDiagramEditPart().getDiagramPreferencesHint());

+		requestcreation.setLocation(new Point(100, 100));

+		Command command=getDiagramEditPart().getCommand(requestcreation);

+		assertNotNull(CREATION+COMMAND_NULL,command);

+		assertTrue(CREATION+TEST_IF_THE_COMMAND_IS_CREATED,command!=UnexecutableCommand.INSTANCE);

+		assertTrue("CREATION: "+TEST_IF_THE_COMMAND_CAN_BE_EXECUTED,command.canExecute()==true);

+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

+		

+		

+		//create the source player to test reconnect

+		 requestcreation=CreateViewRequestFactory.getCreateShapeRequest(sourceType, getDiagramEditPart().getDiagramPreferencesHint());

+		requestcreation.setLocation(new Point(100, 300));

+		 command=getDiagramEditPart().getCommand(requestcreation);

+		assertNotNull(CREATION+COMMAND_NULL,command);

+		assertTrue(CREATION+TEST_IF_THE_COMMAND_IS_CREATED,command!=UnexecutableCommand.INSTANCE);

+		assertTrue("CREATION: "+TEST_IF_THE_COMMAND_CAN_BE_EXECUTED,command.canExecute()==true);

+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

+		

+		//create the target

+		requestcreation=CreateViewRequestFactory.getCreateShapeRequest(targetType, getDiagramEditPart().getDiagramPreferencesHint());

+		requestcreation.setLocation(new Point(300, 100));

+		command=getDiagramEditPart().getCommand(requestcreation);

+		assertNotNull(CREATION+COMMAND_NULL,command);

+		assertTrue(CREATION+TEST_IF_THE_COMMAND_IS_CREATED,command!=UnexecutableCommand.INSTANCE);

+		assertTrue("CREATION: "+TEST_IF_THE_COMMAND_CAN_BE_EXECUTED,command.canExecute()==true);

+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

+		

+		//create the target player to test reconnect

+		requestcreation=CreateViewRequestFactory.getCreateShapeRequest(targetType, getDiagramEditPart().getDiagramPreferencesHint());

+		requestcreation.setLocation(new Point(300, 300));

+		command=getDiagramEditPart().getCommand(requestcreation);

+		assertNotNull(CREATION+COMMAND_NULL,command);

+		assertTrue(CREATION+TEST_IF_THE_COMMAND_IS_CREATED,command!=UnexecutableCommand.INSTANCE);

+		assertTrue("CREATION: "+TEST_IF_THE_COMMAND_CAN_BE_EXECUTED,command.canExecute()==true);

+		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

+		

+		

+		

+		

+		source=(GraphicalEditPart)getDiagramEditPart().getChildren().get(0);

+		sourcePlayer=(GraphicalEditPart)getDiagramEditPart().getChildren().get(1);

+		target=(GraphicalEditPart)getDiagramEditPart().getChildren().get(2);

+		targetPlayer=(GraphicalEditPart)getDiagramEditPart().getChildren().get(3);

+		

+	}

+	

+

+	

+	

+	

+	public void testTargetReconnectAMultiLink(IElementType type) {

+

+		//target reconnection

+		ReconnectRequest reconnectRequest= new ReconnectRequest();

+		assertTrue(THE_LINK_RECONNECT_EXISTS,(ConnectionEditPart)target.getTargetConnections().get(0)!=null);

+		ConnectionEditPart binaryLink=(ConnectionEditPart)target.getTargetConnections().get(0);

+		reconnectRequest.setConnectionEditPart(binaryLink);

+		reconnectRequest.setTargetEditPart(targetPlayer);

+		reconnectRequest.setType(RequestConstants.REQ_RECONNECT_TARGET);

+

+		Command cmd = targetPlayer.getCommand(reconnectRequest);   

+

+		assertTrue(RECONNECTION_TARGET+TEST_IF_THE_COMMAND_CAN_BE_EXECUTED,cmd.canExecute()==true);

+		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().execute(cmd);	

+		// EditorUtils.getTransactionalEditingDomain().getCommandStack().execute(cmd);

+		assertTrue(RECONNECTION_TARGET+TEST_THE_EXECUTION,((Diagram)getRootView()).getEdges().size()==1);

+		assertTrue(RECONNECTION_TARGET +TEST_THE_EXECUTION,getRootSemanticModel().getOwnedElements().size()==4);

+		assertTrue(LINK_EXISTS_RECONNECTION_ON_TARGET,binaryLink.getTarget().equals(targetPlayer));

+		

+		//undo

+		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().undo();

+		assertTrue(LINK_EXISTS_RECONNECTION_ON_TARGET+ TEST_THE_UNDO,binaryLink.getTarget().equals(target));

+		

+		//redo

+		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().redo();

+		assertTrue(LINK_EXISTS_RECONNECTION_ON_TARGET+ TEST_THE_REDO,binaryLink.getTarget().equals(targetPlayer));

+		

+

+

+	}

+

+	public void testSourceReconnectAMultiLink(IElementType type) {

+

+		//target reconnection

+		ReconnectRequest reconnectRequest= new ReconnectRequest();

+		assertTrue(THE_LINK_TO_RECONNECT_EXISTS,(ConnectionEditPart)source.getSourceConnections().get(0)!=null);

+		ConnectionEditPart branch=(ConnectionEditPart)source.getSourceConnections().get(0);

+		reconnectRequest.setConnectionEditPart(branch);

+		reconnectRequest.setTargetEditPart(sourcePlayer);

+		reconnectRequest.setType(RequestConstants.REQ_RECONNECT_SOURCE);

+

+		Command cmd = sourcePlayer.getCommand(reconnectRequest);   

+

+		assertTrue(RECONNECTION_SOURCE+TEST_IF_THE_COMMAND_CAN_BE_EXECUTED,cmd.canExecute()==true);

+		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().execute(cmd);	

+		assertTrue(RECONNECTION_SOURCE+TEST_THE_EXECUTION,((Diagram)getRootView()).getEdges().size()==1);

+		assertTrue(RECONNECTION_SOURCE +TEST_THE_EXECUTION,getRootSemanticModel().getOwnedElements().size()==4);

+		assertTrue(LINK_EXISTS_RECONNECTION_ON_SOURCE+TEST_THE_EXECUTION,branch.getSource().equals(sourcePlayer));

+		

+		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().undo();

+		assertTrue(LINK_EXISTS_RECONNECTION_ON_SOURCE+ TEST_THE_UNDO,branch.getSource().equals(source));

+		

+		getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().redo();

+		assertTrue(LINK_EXISTS_RECONNECTION_ON_SOURCE+TEST_THE_REDO,branch.getSource().equals(sourcePlayer));

+		

+	}

+}

diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestMutliLink.java b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestMutliLink.java
new file mode 100644
index 00000000000..51fb39804df
--- /dev/null
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestMutliLink.java
@@ -0,0 +1,22 @@
+package org.eclipse.papyrus.diagram.clazz.test.canonical;

+

+import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

+import org.junit.Test;

+

+public class TestMutliLink extends AbstractTestMultiLink {

+	/**

+	 * Test to manage dependency.

+	 */

+	@Test

+	public void testToManageMultiDependency() {

+		testToManageMultiLink(UMLElementTypes.Dependency_4008, UMLElementTypes.Dependency_4018, true);

+	}

+	

+	/**

+	 * Test to manage multiassociation.

+	 */

+	@Test

+	public void testToManageMultiAssociation() {

+		testToManageMultiLink(UMLElementTypes.Association_4001, UMLElementTypes.Association_4019, false);

+	}

+}

diff --git a/tests/org.eclipse.papyrus.diagram.clazz.test/src/org/eclipse/papyrus/diagram/clazz/test/canonical/TestTopNode.java b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestTopNode.java
index 5f46989aa8c..0bb0fe3a981 100644
--- a/tests/org.eclipse.papyrus.diagram.clazz.test/src/org/eclipse/papyrus/diagram/clazz/test/canonical/TestTopNode.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/canonical/TestTopNode.java
@@ -15,7 +15,10 @@ package org.eclipse.papyrus.diagram.clazz.test.canonical;
 

 import java.util.ArrayList;

 

+import org.eclipse.core.commands.operations.OperationHistoryFactory;

+import org.eclipse.core.runtime.NullProgressMonitor;

 import org.eclipse.draw2d.geometry.Point;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

 import org.eclipse.gef.EditPart;

 import org.eclipse.gef.Request;

 import org.eclipse.gef.RequestConstants;

@@ -29,8 +32,13 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
 import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;

 import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;

 import org.eclipse.gmf.runtime.diagram.ui.requests.EditCommandRequestWrapper;

+import org.eclipse.gmf.runtime.emf.commands.core.command.EditingDomainUndoContext;

 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.papyrus.core.services.ServiceException;

+import org.eclipse.papyrus.core.utils.ServiceUtilsForActionHandlers;

+import org.eclipse.papyrus.diagram.common.Activator;

+import org.eclipse.papyrus.diagram.common.command.wrappers.GEFtoEMFCommandWrapper;

 import org.eclipse.uml2.uml.Element;

 

 

@@ -42,44 +50,7 @@ import org.eclipse.uml2.uml.Element;
 public class TestTopNode extends AbstractPapyrusTestCase {

 	

 	

-	/** The Constant CREATION. */

-	protected static final String CREATION = "CREATION:";

 	

-	/** The Constant CONTAINER_CREATION. */

-	protected static final String CONTAINER_CREATION = "CONTAINER CREATION: ";

-	

-	/** The Constant DROP. */

-	protected static final String DROP = "DROP: ";

-	

-	/** The Constant DESTROY_DELETION. */

-	protected static final String DESTROY_DELETION = "DESTROY DELETION: ";

-	

-	/** The Constant COMMAND_NULL. */

-	protected static final String COMMAND_NULL = " command null";

-	

-	/** The Constant VIEW_DELETION. */

-	protected static final String VIEW_DELETION = "VIEW DELETION: ";

-	

-	/** The Constant TEST_THE_REDO. */

-	protected static final String TEST_THE_REDO = "test the redo";

-	

-	/** The Constant TEST_THE_UNDO. */

-	protected static final String TEST_THE_UNDO = "test the undo";

-	

-	/** The Constant TEST_THE_EXECUTION. */

-	protected static final String TEST_THE_EXECUTION = "test the execution";

-	

-	/** The Constant TEST_IF_THE_COMMAND_CAN_BE_EXECUTED. */

-	protected static final String TEST_IF_THE_COMMAND_CAN_BE_EXECUTED = "test if the command can be executed";

-	

-	/** The Constant TEST_IF_THE_COMMAND_IS_CREATED. */

-	protected static final String TEST_IF_THE_COMMAND_IS_CREATED = "test if the command is created";

-

-	/** The Constant INITIALIZATION_TEST. */

-	protected static final String INITIALIZATION_TEST = "Intitial State";

-	

-	/** The Constant CHANGE_CONTAINER. */

-	protected static final String CHANGE_CONTAINER = "CHANGE CONTAINER";

 

 	/**

 	 * Test view deletion.

@@ -107,26 +78,55 @@ public class TestTopNode extends AbstractPapyrusTestCase {
 		assertTrue(VIEW_DELETION +TEST_THE_REDO,getRootSemanticModel().getOwnedElements().size()==1);

 		

 	}

-	

+	/**

+	 * Retrieves the TransactionalEditingDomain

+	 * 

+	 * @return the editing domain (can be null)

+	 */

+	protected TransactionalEditingDomain getEditingDomain() {

+		ServiceUtilsForActionHandlers serviceUtils = new ServiceUtilsForActionHandlers();

+		TransactionalEditingDomain editingDomain = null;

+		try {

+			editingDomain = serviceUtils.getTransactionalEditingDomain();

+

+		} catch (ServiceException e) {

+			Activator.log.error(e);

+		}

+

+		return editingDomain;

+	}

 	/**

 	 * Test destroy.

 	 * 

 	 * @param type the type

 	 */

 	public void testDestroy(IElementType type) {

+		

+

 		//DESTROY SEMANTIC+ VIEW

 		assertTrue(DESTROY_DELETION +INITIALIZATION_TEST,getDiagramEditPart().getChildren().size()==1);

 		assertTrue(DESTROY_DELETION +INITIALIZATION_TEST,getRootSemanticModel().getOwnedElements().size()==1);

-		

+	

 		Request deleteViewRequest =	new EditCommandRequestWrapper( new DestroyElementRequest(false));

 		Command command = ((GraphicalEditPart)getDiagramEditPart().getChildren().get(0)).getCommand(deleteViewRequest);

 		assertNotNull(DESTROY_DELETION +COMMAND_NULL,command);

 		assertTrue(DESTROY_DELETION +TEST_IF_THE_COMMAND_IS_CREATED,command!=UnexecutableCommand.INSTANCE);

 		assertTrue(DESTROY_DELETION+TEST_IF_THE_COMMAND_CAN_BE_EXECUTED,command.canExecute()==true);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

+		//getDiagramEditPart().getDiagramEditDomain().getDiagramCommandStack().execute(command);

+		//getDiagramEditPart().getEditingDomain().getCommandStack().execute(new GEFtoEMFCommandWrapper(command));

+		getEditingDomain().getCommandStack().execute(new GEFtoEMFCommandWrapper(command));

 		assertTrue(DESTROY_DELETION +TEST_THE_EXECUTION,getDiagramEditPart().getChildren().size()==0);

 		assertTrue(DESTROY_DELETION +TEST_THE_EXECUTION,getRootSemanticModel().getOwnedElements().size()==0);

-		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();

+		

+		EditingDomainUndoContext undoContext= new EditingDomainUndoContext(getEditingDomain());

+		try{

+		OperationHistoryFactory.getOperationHistory().undo(undoContext, new NullProgressMonitor(), null);

+		}catch (Exception e) {

+			System.err.println(e);

+		}

+		

+		//diagramEditor.getEditingDomain().getCommandStack().undo();

+		//diagramEditor.getDiagramEditDomain().getDiagramCommandStack().undo();

 		assertTrue(DESTROY_DELETION +TEST_THE_UNDO,getDiagramEditPart().getChildren().size()==1);

 		assertTrue(DESTROY_DELETION +TEST_THE_UNDO,getRootSemanticModel().getOwnedElements().size()==1);

 		diagramEditor.getDiagramEditDomain().getDiagramCommandStack().redo();

diff --git a/tests/org.eclipse.papyrus.diagram.clazz.test/src/org/eclipse/papyrus/diagram/clazz/test/load/Load100ClassTest.java b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/load/Load100ClassTest.java
index 2c93a9b4cae..b10738ee628 100644
--- a/tests/org.eclipse.papyrus.diagram.clazz.test/src/org/eclipse/papyrus/diagram/clazz/test/load/Load100ClassTest.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/load/Load100ClassTest.java
@@ -13,27 +13,11 @@
  *****************************************************************************/

 package org.eclipse.papyrus.diagram.clazz.test.load;

 

-import java.util.ArrayList;

-

-import org.eclipse.draw2d.geometry.Dimension;

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.gef.Request;

-import org.eclipse.gef.RequestConstants;

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gef.requests.DropRequest;

-import org.eclipse.gef.requests.GroupRequest;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewAndElementRequest;

 import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

 import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;

-import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.EditCommandRequestWrapper;

 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.papyrus.diagram.clazz.UmlClassDiagramForMultiEditor;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditor;

 import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

 import org.eclipse.papyrus.diagram.clazz.test.canonical.AbstractPapyrusTestCase;

 import org.junit.Test;

diff --git a/tests/org.eclipse.papyrus.diagram.clazz.test/src/org/eclipse/papyrus/diagram/clazz/test/load/Load10ClassTest.java b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/load/Load10ClassTest.java
index d10a19ea1f9..a0b856f87fc 100644
--- a/tests/org.eclipse.papyrus.diagram.clazz.test/src/org/eclipse/papyrus/diagram/clazz/test/load/Load10ClassTest.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/load/Load10ClassTest.java
@@ -13,27 +13,11 @@
  *****************************************************************************/

 package org.eclipse.papyrus.diagram.clazz.test.load;

 

-import java.util.ArrayList;

-

-import org.eclipse.draw2d.geometry.Dimension;

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.gef.Request;

-import org.eclipse.gef.RequestConstants;

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gef.requests.DropRequest;

-import org.eclipse.gef.requests.GroupRequest;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewAndElementRequest;

 import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

 import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;

-import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.EditCommandRequestWrapper;

 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.papyrus.diagram.clazz.UmlClassDiagramForMultiEditor;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditor;

 import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

 import org.eclipse.papyrus.diagram.clazz.test.canonical.AbstractPapyrusTestCase;

 import org.junit.Test;

diff --git a/tests/org.eclipse.papyrus.diagram.clazz.test/src/org/eclipse/papyrus/diagram/clazz/test/load/Load200ClassTest.java b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/load/Load200ClassTest.java
index 2cc7e62621a..12b7f0c3d6e 100644
--- a/tests/org.eclipse.papyrus.diagram.clazz.test/src/org/eclipse/papyrus/diagram/clazz/test/load/Load200ClassTest.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/load/Load200ClassTest.java
@@ -13,27 +13,11 @@
  *****************************************************************************/

 package org.eclipse.papyrus.diagram.clazz.test.load;

 

-import java.util.ArrayList;

-

-import org.eclipse.draw2d.geometry.Dimension;

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.gef.Request;

-import org.eclipse.gef.RequestConstants;

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gef.requests.DropRequest;

-import org.eclipse.gef.requests.GroupRequest;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewAndElementRequest;

 import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

 import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;

-import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.EditCommandRequestWrapper;

 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.papyrus.diagram.clazz.UmlClassDiagramForMultiEditor;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditor;

 import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

 import org.eclipse.papyrus.diagram.clazz.test.canonical.AbstractPapyrusTestCase;

 import org.junit.Test;

diff --git a/tests/org.eclipse.papyrus.diagram.clazz.test/src/org/eclipse/papyrus/diagram/clazz/test/load/Load300ClassTest.java b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/load/Load300ClassTest.java
index 75c896f318b..5241b221883 100644
--- a/tests/org.eclipse.papyrus.diagram.clazz.test/src/org/eclipse/papyrus/diagram/clazz/test/load/Load300ClassTest.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/load/Load300ClassTest.java
@@ -13,27 +13,11 @@
  *****************************************************************************/

 package org.eclipse.papyrus.diagram.clazz.test.load;

 

-import java.util.ArrayList;

-

-import org.eclipse.draw2d.geometry.Dimension;

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.gef.Request;

-import org.eclipse.gef.RequestConstants;

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gef.requests.DropRequest;

-import org.eclipse.gef.requests.GroupRequest;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewAndElementRequest;

 import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

 import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;

-import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.EditCommandRequestWrapper;

 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.papyrus.diagram.clazz.UmlClassDiagramForMultiEditor;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditor;

 import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

 import org.eclipse.papyrus.diagram.clazz.test.canonical.AbstractPapyrusTestCase;

 import org.junit.Test;

diff --git a/tests/org.eclipse.papyrus.diagram.clazz.test/src/org/eclipse/papyrus/diagram/clazz/test/load/Load400ClassTest.java b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/load/Load400ClassTest.java
index e16be0022b5..ecf0c20e8e0 100644
--- a/tests/org.eclipse.papyrus.diagram.clazz.test/src/org/eclipse/papyrus/diagram/clazz/test/load/Load400ClassTest.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/load/Load400ClassTest.java
@@ -13,27 +13,11 @@
  *****************************************************************************/

 package org.eclipse.papyrus.diagram.clazz.test.load;

 

-import java.util.ArrayList;

-

-import org.eclipse.draw2d.geometry.Dimension;

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.gef.Request;

-import org.eclipse.gef.RequestConstants;

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gef.requests.DropRequest;

-import org.eclipse.gef.requests.GroupRequest;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewAndElementRequest;

 import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

 import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;

-import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.EditCommandRequestWrapper;

 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.papyrus.diagram.clazz.UmlClassDiagramForMultiEditor;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditor;

 import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

 import org.eclipse.papyrus.diagram.clazz.test.canonical.AbstractPapyrusTestCase;

 import org.junit.Test;

diff --git a/tests/org.eclipse.papyrus.diagram.clazz.test/src/org/eclipse/papyrus/diagram/clazz/test/load/Load500ClassTest.java b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/load/Load500ClassTest.java
index e17399b0cea..4c6ef189412 100644
--- a/tests/org.eclipse.papyrus.diagram.clazz.test/src/org/eclipse/papyrus/diagram/clazz/test/load/Load500ClassTest.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/load/Load500ClassTest.java
@@ -13,27 +13,11 @@
  *****************************************************************************/

 package org.eclipse.papyrus.diagram.clazz.test.load;

 

-import java.util.ArrayList;

-

-import org.eclipse.draw2d.geometry.Dimension;

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.gef.Request;

-import org.eclipse.gef.RequestConstants;

 import org.eclipse.gef.commands.Command;

 import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gef.requests.DropRequest;

-import org.eclipse.gef.requests.GroupRequest;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewAndElementRequest;

 import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

 import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;

-import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.EditCommandRequestWrapper;

 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.papyrus.diagram.clazz.UmlClassDiagramForMultiEditor;

-import org.eclipse.papyrus.diagram.clazz.part.UMLDiagramEditor;

 import org.eclipse.papyrus.diagram.clazz.providers.UMLElementTypes;

 import org.eclipse.papyrus.diagram.clazz.test.canonical.AbstractPapyrusTestCase;

 import org.junit.Test;

diff --git a/tests/org.eclipse.papyrus.diagram.clazz.test/src/org/eclipse/papyrus/diagram/clazz/test/load/LoadTests.java b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/load/LoadTests.java
index 4359ba120c0..cbd63e6fa88 100644
--- a/tests/org.eclipse.papyrus.diagram.clazz.test/src/org/eclipse/papyrus/diagram/clazz/test/load/LoadTests.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.clazz.test/test/org/eclipse/papyrus/diagram/clazz/test/load/LoadTests.java
@@ -15,32 +15,28 @@
 package org.eclipse.papyrus.diagram.clazz.test.load;

 

 

-import junit.framework.Test;

-import junit.framework.TestSuite;

+import org.junit.runner.RunWith;

+import org.junit.runners.Suite;

+import org.junit.runners.Suite.SuiteClasses;

 

-

-// TODO: Auto-generated Javadoc

 /**

  * All tests together.

  */

+@RunWith(Suite.class)

+@SuiteClasses({

+// 10 classes

+Load10ClassTest.class,

+// 100 classes

+Load100ClassTest.class,

+// 200 classes

+Load200ClassTest.class,

+// 300 classes

+Load300ClassTest.class,

+// 400 classes

+Load400ClassTest.class,

+// 500 classes

+Load500ClassTest.class,

+})

 public class LoadTests {

 

-	/**

-	 * Suite.

-	 * 

-	 * @return the test

-	 */

-	public static Test suite() {

-		TestSuite suite = new TestSuite("Test for org.eclipse.papyrus.diagram.common.tests.parser");

-		//$JUnit-BEGIN$

-		suite.addTestSuite(Load10ClassTest.class);

-		suite.addTestSuite(Load100ClassTest.class);

-		suite.addTestSuite(Load200ClassTest.class);

-		suite.addTestSuite(Load300ClassTest.class);

-		suite.addTestSuite(Load400ClassTest.class);

-		suite.addTestSuite(Load500ClassTest.class);

-		//$JUnit-END$

-		return suite;

-	}

-

 }

diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.common.tests/.classpath b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.common.tests/.classpath
new file mode 100644
index 00000000000..046bda900d2
--- /dev/null
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.common.tests/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<classpath>

+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

+	<classpathentry kind="src" path="test"/>

+	<classpathentry kind="output" path="bin"/>

+</classpath>

diff --git a/tests/org.eclipse.papyrus.diagram.common.tests/.project b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.common.tests/.project
index 7c6ab34c616..7c6ab34c616 100644
--- a/tests/org.eclipse.papyrus.diagram.common.tests/.project
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.common.tests/.project
diff --git a/tests/org.eclipse.papyrus.diagram.common.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.common.tests/.settings/org.eclipse.jdt.core.prefs
index 7cfda1c0af8..7cfda1c0af8 100644
--- a/tests/org.eclipse.papyrus.diagram.common.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.common.tests/.settings/org.eclipse.jdt.core.prefs
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.common.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.common.tests/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..df2f7a37713
--- /dev/null
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.common.tests/META-INF/MANIFEST.MF
@@ -0,0 +1,13 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.papyrus.diagram.common.tests;singleton:=true
+Bundle-Version: 0.7.1.qualifier
+Bundle-Vendor: %providerName
+Require-Bundle: org.eclipse.core.runtime,
+ org.junit4
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-ActivationPolicy: lazy
+Fragment-Host: org.eclipse.papyrus.diagram.common;bundle-version="0.7.1"
+Export-Package: org.eclipse.papyrus.diagram.common.tests.parser
+Bundle-Localization: plugin
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.common.tests/about.html b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.common.tests/about.html
new file mode 100644
index 00000000000..82d49bf5f81
--- /dev/null
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.common.tests/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

+<title>About</title>

+</head>

+<body lang="EN-US">

+<h2>About This Content</h2>

+ 

+<p>June 5, 2007</p>	

+<h3>License</h3>

+

+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

+indicated below, the Content is provided to you under the terms and conditions of the

+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

+

+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

+apply to your use of any object code in the Content.  Check the Redistributor's license that was 

+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

+indicated below, the terms and conditions of the EPL still apply to any source code in the Content

+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

+

+</body>

+</html>

diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.common.tests/build.properties b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.common.tests/build.properties
new file mode 100644
index 00000000000..0bf51e28641
--- /dev/null
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.common.tests/build.properties
@@ -0,0 +1,7 @@
+source.. = test/

+output.. = bin/

+bin.includes = META-INF/,\

+               .,\

+               about.html,\

+               plugin.properties,\

+               org.eclipse.papyrus.diagram.common.tests.launch
\ No newline at end of file
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.common.tests/org.eclipse.papyrus.diagram.common.tests.launch b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.common.tests/org.eclipse.papyrus.diagram.common.tests.launch
new file mode 100644
index 00000000000..5edebd3d9b8
--- /dev/null
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.common.tests/org.eclipse.papyrus.diagram.common.tests.launch
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">

+<booleanAttribute key="append.args" value="true"/>

+<stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/>

+<booleanAttribute key="askclear" value="false"/>

+<booleanAttribute key="automaticAdd" value="true"/>

+<booleanAttribute key="automaticValidate" value="false"/>

+<stringAttribute key="bootstrap" value=""/>

+<stringAttribute key="checked" value="[NONE]"/>

+<booleanAttribute key="clearConfig" value="true"/>

+<booleanAttribute key="clearws" value="true"/>

+<booleanAttribute key="clearwslog" value="false"/>

+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>

+<booleanAttribute key="default" value="true"/>

+<booleanAttribute key="includeOptional" value="true"/>

+<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>

+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">

+<listEntry value="/org.eclipse.papyrus.diagram.common.tests/src/org/eclipse/papyrus/diagram/common/tests/AllTests.java"/>

+</listAttribute>

+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">

+<listEntry value="1"/>

+</listAttribute>

+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>

+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>

+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>

+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>

+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.diagram.common.tests.AllTests"/>

+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>

+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.diagram.common.tests"/>

+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>

+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -Xms40m -Xmx512m"/>

+<stringAttribute key="pde.version" value="3.3"/>

+<stringAttribute key="product" value="org.eclipse.platform.ide"/>

+<booleanAttribute key="run_in_ui_thread" value="true"/>

+<booleanAttribute key="show_selected_only" value="false"/>

+<booleanAttribute key="tracing" value="false"/>

+<booleanAttribute key="useCustomFeatures" value="false"/>

+<booleanAttribute key="useDefaultConfig" value="true"/>

+<booleanAttribute key="useDefaultConfigArea" value="false"/>

+<booleanAttribute key="useProduct" value="false"/>

+</launchConfiguration>

diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.common.tests/plugin.properties b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.common.tests/plugin.properties
new file mode 100644
index 00000000000..7108e5d2f0c
--- /dev/null
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.common.tests/plugin.properties
@@ -0,0 +1,12 @@
+#################################################################################
+# Copyright (c) 2008 CEA LIST.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - initial API and implementation
+##################################################################################
+pluginName=Papyrus Common Diagram Test(Incubation)
+providerName=Eclipse Modeling Project
diff --git a/tests/org.eclipse.papyrus.diagram.common.tests/src/org/eclipse/papyrus/diagram/common/tests/parser/AllTests.java b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.common.tests/test/org/eclipse/papyrus/diagram/common/tests/AllTests.java
index 0d5f45cff68..992c17cbd58 100644
--- a/tests/org.eclipse.papyrus.diagram.common.tests/src/org/eclipse/papyrus/diagram/common/tests/parser/AllTests.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.common.tests/test/org/eclipse/papyrus/diagram/common/tests/AllTests.java
@@ -11,23 +11,21 @@
  *

  *****************************************************************************/

 

-package org.eclipse.papyrus.diagram.common.tests.parser;

+package org.eclipse.papyrus.diagram.common.tests;

 

-import junit.framework.Test;

-import junit.framework.TestSuite;

+import org.eclipse.papyrus.diagram.common.tests.parser.HTMLCleanerTestCase;

+import org.eclipse.papyrus.diagram.common.tests.parser.HTMLCornerBentFigureTestCase;

+import org.junit.runner.RunWith;

+import org.junit.runners.Suite;

+import org.junit.runners.Suite.SuiteClasses;

 

 

 /**

  * All tests together

  */

+@RunWith(Suite.class)

+@SuiteClasses({ HTMLCleanerTestCase.class, HTMLCornerBentFigureTestCase.class })

 public class AllTests {

 

-	public static Test suite() {

-		TestSuite suite = new TestSuite("Test for org.eclipse.papyrus.diagram.common.tests.parser");

-		//$JUnit-BEGIN$

-		suite.addTestSuite(HTMLCleanerTestCase.class);

-		//$JUnit-END$

-		return suite;

-	}

 

 }

diff --git a/tests/org.eclipse.papyrus.diagram.common.tests/src/org/eclipse/papyrus/diagram/common/tests/parser/HTMLCleanerTestCase.java b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.common.tests/test/org/eclipse/papyrus/diagram/common/tests/parser/HTMLCleanerTestCase.java
index c496ef3e01d..c496ef3e01d 100644
--- a/tests/org.eclipse.papyrus.diagram.common.tests/src/org/eclipse/papyrus/diagram/common/tests/parser/HTMLCleanerTestCase.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.common.tests/test/org/eclipse/papyrus/diagram/common/tests/parser/HTMLCleanerTestCase.java
diff --git a/tests/org.eclipse.papyrus.diagram.common.tests/src/org/eclipse/papyrus/diagram/common/tests/parser/HTMLCornerBentFigureTestCase.java b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.common.tests/test/org/eclipse/papyrus/diagram/common/tests/parser/HTMLCornerBentFigureTestCase.java
index 6b36d7c37a8..6b36d7c37a8 100644
--- a/tests/org.eclipse.papyrus.diagram.common.tests/src/org/eclipse/papyrus/diagram/common/tests/parser/HTMLCornerBentFigureTestCase.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.diagram.common.tests/test/org/eclipse/papyrus/diagram/common/tests/parser/HTMLCornerBentFigureTestCase.java
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.thousandcreation/.classpath b/tests/junit/plugins/uml/org.eclipse.papyrus.thousandcreation/.classpath
new file mode 100644
index 00000000000..046bda900d2
--- /dev/null
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.thousandcreation/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<classpath>

+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

+	<classpathentry kind="src" path="test"/>

+	<classpathentry kind="output" path="bin"/>

+</classpath>

diff --git a/tests/org.eclipse.papyrus.thousandcreation/.project b/tests/junit/plugins/uml/org.eclipse.papyrus.thousandcreation/.project
index 5bf180e0524..5bf180e0524 100644
--- a/tests/org.eclipse.papyrus.thousandcreation/.project
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.thousandcreation/.project
diff --git a/tests/org.eclipse.papyrus.thousandcreation/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/org.eclipse.papyrus.thousandcreation/.settings/org.eclipse.jdt.core.prefs
index 523e856185d..523e856185d 100644
--- a/tests/org.eclipse.papyrus.thousandcreation/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.thousandcreation/.settings/org.eclipse.jdt.core.prefs
diff --git a/tests/org.eclipse.papyrus.thousandcreation/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/org.eclipse.papyrus.thousandcreation/META-INF/MANIFEST.MF
index 1eb6152b05f..9815114a5af 100644
--- a/tests/org.eclipse.papyrus.thousandcreation/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.thousandcreation/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %providerName
 Bundle-SymbolicName: org.eclipse.papyrus.thousandcreation;singleton:=true
-Bundle-Version: 0.7.0
+Bundle-Version: 0.7.1
 Bundle-Activator: thousandcreation.Activator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.thousandcreation/about.html b/tests/junit/plugins/uml/org.eclipse.papyrus.thousandcreation/about.html
new file mode 100644
index 00000000000..82d49bf5f81
--- /dev/null
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.thousandcreation/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

+<title>About</title>

+</head>

+<body lang="EN-US">

+<h2>About This Content</h2>

+ 

+<p>June 5, 2007</p>	

+<h3>License</h3>

+

+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

+indicated below, the Content is provided to you under the terms and conditions of the

+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

+

+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

+apply to your use of any object code in the Content.  Check the Redistributor's license that was 

+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

+indicated below, the terms and conditions of the EPL still apply to any source code in the Content

+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

+

+</body>

+</html>

diff --git a/tests/org.eclipse.papyrus.core.test/build.properties b/tests/junit/plugins/uml/org.eclipse.papyrus.thousandcreation/build.properties
index 9e670b0543a..09c456ca488 100644
--- a/tests/org.eclipse.papyrus.core.test/build.properties
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.thousandcreation/build.properties
@@ -1,6 +1,7 @@
-source.. = src/

+source.. = test/

 output.. = bin/

 bin.includes = META-INF/,\

                .,\

                plugin.xml,\

-               resources/

+               about.html,\

+               plugin.properties

diff --git a/tests/org.eclipse.papyrus.thousandcreation/plugin.properties b/tests/junit/plugins/uml/org.eclipse.papyrus.thousandcreation/plugin.properties
index e94fd4f4244..d1c7cb7c8de 100644
--- a/tests/org.eclipse.papyrus.thousandcreation/plugin.properties
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.thousandcreation/plugin.properties
@@ -11,6 +11,6 @@
 #  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
 #
 ########################################################################################
-providerName=Eclipse.org
 pluginName= org.eclipse.papyrus.thousandcreation(Incubation)
+providerName=Eclipse Modeling Project
 
diff --git a/tests/org.eclipse.papyrus.thousandcreation/plugin.xml b/tests/junit/plugins/uml/org.eclipse.papyrus.thousandcreation/plugin.xml
index 8c205d51797..8c205d51797 100644
--- a/tests/org.eclipse.papyrus.thousandcreation/plugin.xml
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.thousandcreation/plugin.xml
diff --git a/tests/org.eclipse.papyrus.thousandcreation/src/thousandcreation/Activator.java b/tests/junit/plugins/uml/org.eclipse.papyrus.thousandcreation/test/thousandcreation/Activator.java
index 190ddd313b9..190ddd313b9 100644
--- a/tests/org.eclipse.papyrus.thousandcreation/src/thousandcreation/Activator.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.thousandcreation/test/thousandcreation/Activator.java
diff --git a/tests/org.eclipse.papyrus.thousandcreation/src/thousandcreation/HugeModelGenerationAction.java b/tests/junit/plugins/uml/org.eclipse.papyrus.thousandcreation/test/thousandcreation/HugeModelGenerationAction.java
index d67eb9d4528..d67eb9d4528 100644
--- a/tests/org.eclipse.papyrus.thousandcreation/src/thousandcreation/HugeModelGenerationAction.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.thousandcreation/test/thousandcreation/HugeModelGenerationAction.java
diff --git a/tests/org.eclipse.papyrus.core.test/META-INF/MANIFEST.MF b/tests/org.eclipse.papyrus.core.test/META-INF/MANIFEST.MF
deleted file mode 100644
index f40cb359c44..00000000000
--- a/tests/org.eclipse.papyrus.core.test/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,15 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Test Plugin for core
-Bundle-SymbolicName: org.eclipse.papyrus.core.test;singleton:=true
-Bundle-Version: 0.7.0.qualifier
-Bundle-Activator: org.eclipse.papyrus.core.test.Activator
-Bundle-Vendor: Eclipse.org
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.papyrus.core,
- org.eclipse.uml2.uml,
- org.eclipse.papyrus.core.resourceloading.preferences,
- org.eclipse.papyrus.core.resourceloading;bundle-version="0.7.0"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-ActivationPolicy: lazy
-Import-Package: junit.framework
diff --git a/tests/org.eclipse.papyrus.core.test/plugin.xml b/tests/org.eclipse.papyrus.core.test/plugin.xml
deleted file mode 100644
index 1b17bfe011e..00000000000
--- a/tests/org.eclipse.papyrus.core.test/plugin.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.4"?>

-<plugin>

-   <extension

-         point="org.eclipse.emf.ecore.uri_mapping">

-      <mapping

-            source="pathmap://TestModel1/"

-            target="platform:/plugin/org.eclipse.papyrus.core.test/resources/TestModel1/">

-      </mapping>

-      <mapping

-            source="pathmap://TestModel2/"

-            target="platform:/plugin/org.eclipse.papyrus.core.test/resources/TestModel2/">

-      </mapping>

-   </extension>

-

-</plugin>

diff --git a/tests/org.eclipse.papyrus.core.test/src/org/eclipse/papyrus/core/test/Activator.java b/tests/org.eclipse.papyrus.core.test/src/org/eclipse/papyrus/core/test/Activator.java
deleted file mode 100644
index 06e42219eb7..00000000000
--- a/tests/org.eclipse.papyrus.core.test/src/org/eclipse/papyrus/core/test/Activator.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.eclipse.papyrus.core.test;

-

-import org.eclipse.core.runtime.Plugin;

-import org.osgi.framework.BundleContext;

-

-/**

- * The activator class controls the plug-in life cycle

- */

-public class Activator extends Plugin {

-

-	// The plug-in ID

-	public static final String PLUGIN_ID = "org.eclipse.papyrus.core.test"; //$NON-NLS-1$

-

-	// The shared instance

-	private static Activator plugin;

-	

-	/**

-	 * The constructor

-	 */

-	public Activator() {

-	}

-

-	/*

-	 * (non-Javadoc)

-	 * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)

-	 */

-	public void start(BundleContext context) throws Exception {

-		super.start(context);

-		plugin = this;

-	}

-

-	/*

-	 * (non-Javadoc)

-	 * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)

-	 */

-	public void stop(BundleContext context) throws Exception {

-		plugin = null;

-		super.stop(context);

-	}

-

-	/**

-	 * Returns the shared instance

-	 *

-	 * @return the shared instance

-	 */

-	public static Activator getDefault() {

-		return plugin;

-	}

-

-}

diff --git a/tests/org.eclipse.papyrus.core.test/src/org/eclipse/papyrus/core/test/AllTests.java b/tests/org.eclipse.papyrus.core.test/src/org/eclipse/papyrus/core/test/AllTests.java
deleted file mode 100644
index 53be9a98900..00000000000
--- a/tests/org.eclipse.papyrus.core.test/src/org/eclipse/papyrus/core/test/AllTests.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2010 Atos Origin.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Emilien Perico (Atos Origin) emilien.perico@atosorigin.com - Initial API and implementation

- *

-  *****************************************************************************/

-package org.eclipse.papyrus.core.test;

-

-import junit.framework.Test;

-import junit.framework.TestSuite;

-

-import org.eclipse.papyrus.core.test.testModel1.Strategy0TestModel1;

-import org.eclipse.papyrus.core.test.testModel1.Strategy1TestModel1;

-import org.eclipse.papyrus.core.test.testModel1.Strategy2TestModel1;

-import org.eclipse.papyrus.core.test.testModel2.Strategy0TestModel2WithModel1;

-import org.eclipse.papyrus.core.test.testModel2.Strategy0TestModel2WithPackage0;

-import org.eclipse.papyrus.core.test.testModel2.Strategy1TestModel2WithModel1;

-import org.eclipse.papyrus.core.test.testModel2.Strategy1TestModel2WithPackage0;

-import org.eclipse.papyrus.core.test.testModel2.Strategy2TestModel2WithModel1;

-import org.eclipse.papyrus.core.test.testModel2.Strategy2TestModel2WithPackage0;

-

-

-public class AllTests {

-	

-	public static Test suite()

-    {

-        TestSuite suite = new TestSuite("Test for org.eclipse.papyrus.core.resourceloading");

-        //$JUnit-BEGIN$

-        // Test suite for TestModel1

-        suite.addTestSuite(Strategy0TestModel1.class);

-        suite.addTestSuite(Strategy1TestModel1.class);

-        suite.addTestSuite(Strategy2TestModel1.class);

-        

-        // Test suite for TestModel2

-        suite.addTestSuite(Strategy0TestModel2WithModel1.class);

-        suite.addTestSuite(Strategy0TestModel2WithPackage0.class);

-        suite.addTestSuite(Strategy1TestModel2WithModel1.class);

-        suite.addTestSuite(Strategy1TestModel2WithPackage0.class);

-        suite.addTestSuite(Strategy2TestModel2WithModel1.class);

-        suite.addTestSuite(Strategy2TestModel2WithPackage0.class);

-        //$JUnit-END$

-        return suite;

-    }

-

-}

diff --git a/tests/org.eclipse.papyrus.diagram.clazz.test/src/org/eclipse/papyrus/diagram/clazz/test/canonical/AllTests.java b/tests/org.eclipse.papyrus.diagram.clazz.test/src/org/eclipse/papyrus/diagram/clazz/test/canonical/AllTests.java
deleted file mode 100644
index e3beea71257..00000000000
--- a/tests/org.eclipse.papyrus.diagram.clazz.test/src/org/eclipse/papyrus/diagram/clazz/test/canonical/AllTests.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2009 CEA LIST.

- *

- *    

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation

- *

- *****************************************************************************/

-

-package org.eclipse.papyrus.diagram.clazz.test.canonical;

-

-

-import junit.framework.Test;

-import junit.framework.TestSuite;

-

-

-// TODO: Auto-generated Javadoc

-/**

- * All tests together.

- */

-public class AllTests extends TestSuite {

-

-	/**

-	 * Suite.

-	 * 

-	 * @return the test

-	 */

-	public static Test suite() {

-		TestSuite suite = new TestSuite("Test for org.eclipse.papyrus.diagram.clazz");

-		//$JUnit-BEGIN$

-		

-		suite.addTestSuite(TestClassDiagramTopNode.class);

-		suite.addTestSuite(TestClassDiagramChildNode.class);

-		suite.addTestSuite(TestClassDiagramChildLabel.class);

-		//$JUnit-END$

-		return suite;

-	}

-

-}

diff --git a/tests/org.eclipse.papyrus.diagram.common.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.papyrus.diagram.common.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 950314cfa58..00000000000
--- a/tests/org.eclipse.papyrus.diagram.common.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,16 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Diagram Common Tests
-Bundle-SymbolicName: org.eclipse.papyrus.diagram.common.tests;singleton:=true
-Bundle-Version: 0.7.0.vqualifier
-Bundle-Activator: org.eclipse.papyrus.diagram.common.tests.Activator
-Bundle-Vendor: CEA LIST
-Require-Bundle: org.eclipse.core.runtime,
- org.junit4,
- org.eclipse.papyrus.diagram.common;bundle-version="0.7.0",
- org.eclipse.papyrus.wizards;bundle-version="0.7.0"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.papyrus.diagram.common.tests,
- org.eclipse.papyrus.diagram.common.tests.parser,
- org.eclipse.papyrus.diagram.common.tests.wizard
diff --git a/tests/org.eclipse.papyrus.diagram.common.tests/build.properties b/tests/org.eclipse.papyrus.diagram.common.tests/build.properties
deleted file mode 100644
index 55c35556315..00000000000
--- a/tests/org.eclipse.papyrus.diagram.common.tests/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               bin/

diff --git a/tests/org.eclipse.papyrus.diagram.common.tests/src/org/eclipse/papyrus/diagram/common/tests/wizard/WizardTestCase.java b/tests/org.eclipse.papyrus.diagram.common.tests/src/org/eclipse/papyrus/diagram/common/tests/wizard/WizardTestCase.java
deleted file mode 100644
index 11b03380eb6..00000000000
--- a/tests/org.eclipse.papyrus.diagram.common.tests/src/org/eclipse/papyrus/diagram/common/tests/wizard/WizardTestCase.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package org.eclipse.papyrus.diagram.common.tests.wizard;

-

-import junit.framework.TestCase;

-

-import org.eclipse.jface.dialogs.DialogSettings;

-import org.eclipse.jface.dialogs.IDialogSettings;

-import org.eclipse.papyrus.wizards.SelectDiagramCategoryPage;

-import org.junit.Test;

-

-

-public class WizardTestCase extends TestCase {

-

-	@Override

-	protected void setUp() throws Exception {

-		super.setUp();

-	}

-

-	@Override

-	protected void tearDown() throws Exception {

-		super.tearDown();

-	}

-

-	@Test

-	public void testDefaultDiagramCategory() {

-		final String categoryId = "uml";

-		final IDialogSettings settings = new DialogSettings("") {

-			@Override

-			public String get(String key) {

-				if ("diagramCategory".equals(key)) {

-					return categoryId;

-				}

-				return super.get(key);

-			}

-			

-		};

-		SelectDiagramCategoryPage selectDiagramCategoryPage = new SelectDiagramCategoryPage() {

-			@Override

-			protected IDialogSettings getDialogSettings() {

-				return settings;

-			}

-		};

-		// selectDiagramCategory is initialized in setWizard(), as wizard is needed to get DialogSettings

-		selectDiagramCategoryPage.setWizard(null);

-		assertEquals(categoryId, selectDiagramCategoryPage.getDiagramCategory());

-	}

-

-}

diff --git a/tests/org.eclipse.papyrus.properties.runtime.tests/build.properties b/tests/org.eclipse.papyrus.properties.runtime.tests/build.properties
deleted file mode 100644
index 41eb6ade2b4..00000000000
--- a/tests/org.eclipse.papyrus.properties.runtime.tests/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .

diff --git a/tests/org.eclipse.papyrus.sysml.tests/plugin.properties b/tests/org.eclipse.papyrus.sysml.tests/plugin.properties
deleted file mode 100644
index dc960fcff63..00000000000
--- a/tests/org.eclipse.papyrus.sysml.tests/plugin.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-pluginName = Tests for static version of the SysML profile

-providerName = Papyrus Project

diff --git a/tests/org.eclipse.papyrus.thousandcreation/.classpath b/tests/org.eclipse.papyrus.thousandcreation/.classpath
deleted file mode 100644
index 2d1a4302f04..00000000000
--- a/tests/org.eclipse.papyrus.thousandcreation/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="src" path="src"/>

-	<classpathentry kind="output" path="bin"/>

-</classpath>

diff --git a/tests/org.eclipse.papyrus.thousandcreation/build.properties b/tests/org.eclipse.papyrus.thousandcreation/build.properties
deleted file mode 100644
index 6f20375d6c7..00000000000
--- a/tests/org.eclipse.papyrus.thousandcreation/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               plugin.xml