431953: Stereotype garbage left in .uml file after removing profile (crash reason?)

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

Fix extended-types registry tests to not pop up the new Model Repair dialog because of unknown and/or incorrect schema for stereotype applications.

4 files changed, 332 insertions, 241 deletions

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.extendedtypes.tests/model/model.di b/tests/junit/plugins/core/org.eclipse.papyrus.infra.extendedtypes.tests/model/model.di
index 6392b22281d..bbc9917a47c 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.extendedtypes.tests/model/model.di
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.extendedtypes.tests/model/model.di
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi" xmi:id="_YCELMP1VEd-WkaQf4YgINA">

-  <pageList xmi:id="_YCELMf1VEd-WkaQf4YgINA">

-    <availablePage>

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

-    </availablePage>

-  </pageList>

-  <sashModel xmi:id="_YCELMv1VEd-WkaQf4YgINA" currentSelection="_YCELNP1VEd-WkaQf4YgINA">

-    <windows xmi:id="_YCELM_1VEd-WkaQf4YgINA">

-      <children xsi:type="di:TabFolder" xmi:id="_YCELNP1VEd-WkaQf4YgINA">

-        <children>

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

-        </children>

-      </children>

-    </windows>

-  </sashModel>

-</di:SashWindowsMngr>

+<?xml version="1.0" encoding="UTF-8"?>
+<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi" xmi:id="_YCELMP1VEd-WkaQf4YgINA">
+  <pageList xmi:id="_YCELMf1VEd-WkaQf4YgINA">
+    <availablePage>
+      <emfPageIdentifier href="model.notation#_MSbgYGfAEeOeZsTtUeHY9w"/>
+    </availablePage>
+  </pageList>
+  <sashModel xmi:id="_YCELMv1VEd-WkaQf4YgINA" currentSelection="_YCELNP1VEd-WkaQf4YgINA">
+    <windows xmi:id="_YCELM_1VEd-WkaQf4YgINA">
+      <children xsi:type="di:TabFolder" xmi:id="_YCELNP1VEd-WkaQf4YgINA">
+        <children>
+          <emfPageIdentifier href="model.notation#_MSbgYGfAEeOeZsTtUeHY9w"/>
+        </children>
+      </children>
+    </windows>
+  </sashModel>
+</di:SashWindowsMngr>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.extendedtypes.tests/model/model.notation b/tests/junit/plugins/core/org.eclipse.papyrus.infra.extendedtypes.tests/model/model.notation
index 3c226f86ef6..6adc7ea7c40 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.extendedtypes.tests/model/model.notation
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.extendedtypes.tests/model/model.notation
@@ -1,105 +1,197 @@
-<?xml version="1.0" encoding="UTF-8"?>

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

-  <children xmi:type="notation:Shape" xmi:id="_NqqeoGfAEeOeZsTtUeHY9w" type="2007">

-    <children xmi:type="notation:DecorationNode" xmi:id="_NqqeomfAEeOeZsTtUeHY9w" type="5026"/>

-    <children xmi:type="notation:DecorationNode" xmi:id="_Nqqeo2fAEeOeZsTtUeHY9w" type="7016">

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

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

-      </eAnnotations>

-      <children xmi:type="notation:Shape" xmi:id="_SYI6YGfAEeOeZsTtUeHY9w" type="3021">

-        <children xmi:type="notation:DecorationNode" xmi:id="_SYI6YmfAEeOeZsTtUeHY9w" type="5043"/>

-        <children xmi:type="notation:BasicCompartment" xmi:id="_SYJhcGfAEeOeZsTtUeHY9w" type="7023">

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

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

-          </eAnnotations>

-          <styles xmi:type="notation:TitleStyle" xmi:id="_SYJhcWfAEeOeZsTtUeHY9w"/>

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

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

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

-        </children>

-        <children xmi:type="notation:BasicCompartment" xmi:id="_SYJhdWfAEeOeZsTtUeHY9w" type="7024">

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

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

-          </eAnnotations>

-          <styles xmi:type="notation:TitleStyle" xmi:id="_SYJhdmfAEeOeZsTtUeHY9w"/>

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

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

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

-        </children>

-        <children xmi:type="notation:BasicCompartment" xmi:id="_SYJhemfAEeOeZsTtUeHY9w" type="7025">

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

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

-          </eAnnotations>

-          <styles xmi:type="notation:TitleStyle" xmi:id="_SYJhe2fAEeOeZsTtUeHY9w"/>

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

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

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

-        </children>

-        <element xmi:type="uml:Component" href="model.uml#_TCAGQGc9EeOeFPMFS4Wv8Q"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SYI6YWfAEeOeZsTtUeHY9w" x="14" y="21"/>

-      </children>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_NqqepGfAEeOeZsTtUeHY9w"/>

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

-    </children>

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

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NqqeoWfAEeOeZsTtUeHY9w" x="186" y="281" width="355" height="168"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_Oclq0GfAEeOeZsTtUeHY9w" type="2007">

-    <children xmi:type="notation:DecorationNode" xmi:id="_OcmR4GfAEeOeZsTtUeHY9w" type="5026"/>

-    <children xmi:type="notation:DecorationNode" xmi:id="_OcmR4WfAEeOeZsTtUeHY9w" type="7016">

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

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

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_OcmR4mfAEeOeZsTtUeHY9w"/>

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

-    </children>

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

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Oclq0WfAEeOeZsTtUeHY9w" x="523" y="99" width="339" height="146"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_Pf9zYGfAEeOeZsTtUeHY9w" type="2007">

-    <children xmi:type="notation:DecorationNode" xmi:id="_Pf9zYmfAEeOeZsTtUeHY9w" type="5026"/>

-    <children xmi:type="notation:DecorationNode" xmi:id="_Pf9zY2fAEeOeZsTtUeHY9w" type="7016">

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

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Pf-acWfAEeOeZsTtUeHY9w" key="showTitle" value="true"/>

-      </eAnnotations>

-      <children xmi:type="notation:Shape" xmi:id="_M-FFcGfAEeOeZsTtUeHY9w" type="2002">

-        <children xmi:type="notation:DecorationNode" xmi:id="_M-JW4GfAEeOeZsTtUeHY9w" type="5005"/>

-        <children xmi:type="notation:BasicCompartment" xmi:id="_M-OPYGfAEeOeZsTtUeHY9w" type="7002">

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

-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_M-riYGfAEeOeZsTtUeHY9w" key="showTitle" value="true"/>

-          </eAnnotations>

-          <styles xmi:type="notation:TitleStyle" xmi:id="_M-OPYWfAEeOeZsTtUeHY9w"/>

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

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

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

-        </children>

-        <children xmi:type="notation:BasicCompartment" xmi:id="_M-OPZWfAEeOeZsTtUeHY9w" type="7003">

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

-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_M-sJcWfAEeOeZsTtUeHY9w" key="showTitle" value="true"/>

-          </eAnnotations>

-          <styles xmi:type="notation:TitleStyle" xmi:id="_M-OPZmfAEeOeZsTtUeHY9w"/>

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

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

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

-        </children>

-        <children xmi:type="notation:BasicCompartment" xmi:id="_M-O2cGfAEeOeZsTtUeHY9w" type="7004">

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

-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_M-swgWfAEeOeZsTtUeHY9w" key="showTitle" value="true"/>

-          </eAnnotations>

-          <styles xmi:type="notation:TitleStyle" xmi:id="_M-O2cWfAEeOeZsTtUeHY9w"/>

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

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

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

-        </children>

-        <element xmi:type="uml:Component" href="model.uml#_M9hEwGfAEeOeZsTtUeHY9w"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_M-FFcWfAEeOeZsTtUeHY9w" x="31" y="18"/>

-      </children>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_Pf9zZGfAEeOeZsTtUeHY9w"/>

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

-    </children>

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

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Pf9zYWfAEeOeZsTtUeHY9w" x="188" y="74" width="269" height="191"/>

-  </children>

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

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

-</notation:Diagram>

+<?xml version="1.0" encoding="UTF-8"?>
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_MSbgYGfAEeOeZsTtUeHY9w" type="PapyrusUMLClassDiagram" name="ClassDiagram" measurementUnit="Pixel">
+  <children xmi:type="notation:Shape" xmi:id="_NqqeoGfAEeOeZsTtUeHY9w" type="2007">
+    <children xmi:type="notation:DecorationNode" xmi:id="_NqqeomfAEeOeZsTtUeHY9w" type="5026"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_Nqqeo2fAEeOeZsTtUeHY9w" type="7016">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_NqwlQGfAEeOeZsTtUeHY9w" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NqwlQWfAEeOeZsTtUeHY9w" key="showTitle" value="true"/>
+      </eAnnotations>
+      <children xmi:type="notation:Shape" xmi:id="_SYI6YGfAEeOeZsTtUeHY9w" type="3021">
+        <children xmi:type="notation:DecorationNode" xmi:id="_SYI6YmfAEeOeZsTtUeHY9w" type="5043"/>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_SYJhcGfAEeOeZsTtUeHY9w" type="7023">
+          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_SYL9sGfAEeOeZsTtUeHY9w" source="PapyrusCSSForceValue">
+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_SYL9sWfAEeOeZsTtUeHY9w" key="showTitle" value="true"/>
+          </eAnnotations>
+          <styles xmi:type="notation:TitleStyle" xmi:id="_SYJhcWfAEeOeZsTtUeHY9w"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_SYJhcmfAEeOeZsTtUeHY9w"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_SYJhc2fAEeOeZsTtUeHY9w"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SYJhdGfAEeOeZsTtUeHY9w"/>
+        </children>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_SYJhdWfAEeOeZsTtUeHY9w" type="7024">
+          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_SYMkwGfAEeOeZsTtUeHY9w" source="PapyrusCSSForceValue">
+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_SYMkwWfAEeOeZsTtUeHY9w" key="showTitle" value="true"/>
+          </eAnnotations>
+          <styles xmi:type="notation:TitleStyle" xmi:id="_SYJhdmfAEeOeZsTtUeHY9w"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_SYJhd2fAEeOeZsTtUeHY9w"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_SYJheGfAEeOeZsTtUeHY9w"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SYJheWfAEeOeZsTtUeHY9w"/>
+        </children>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_SYJhemfAEeOeZsTtUeHY9w" type="7025">
+          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_SYNL0GfAEeOeZsTtUeHY9w" source="PapyrusCSSForceValue">
+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_SYNL0WfAEeOeZsTtUeHY9w" key="showTitle" value="true"/>
+          </eAnnotations>
+          <styles xmi:type="notation:TitleStyle" xmi:id="_SYJhe2fAEeOeZsTtUeHY9w"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_SYJhfGfAEeOeZsTtUeHY9w"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_SYJhfWfAEeOeZsTtUeHY9w"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SYJhfmfAEeOeZsTtUeHY9w"/>
+        </children>
+        <element xmi:type="uml:Component" href="model.uml#_TCAGQGc9EeOeFPMFS4Wv8Q"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SYI6YWfAEeOeZsTtUeHY9w" x="14" y="21"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_QSCiwMBjEeODa7C3IU_ceQ" type="3021">
+        <children xmi:type="notation:DecorationNode" xmi:id="_QSDJ0MBjEeODa7C3IU_ceQ" type="5043"/>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_QSDJ0cBjEeODa7C3IU_ceQ" type="7023">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_QSDJ0sBjEeODa7C3IU_ceQ"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_QSDJ08BjEeODa7C3IU_ceQ"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_QSDJ1MBjEeODa7C3IU_ceQ"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QSDJ1cBjEeODa7C3IU_ceQ"/>
+        </children>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_QSDJ1sBjEeODa7C3IU_ceQ" type="7024">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_QSDJ18BjEeODa7C3IU_ceQ"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_QSDJ2MBjEeODa7C3IU_ceQ"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_QSDJ2cBjEeODa7C3IU_ceQ"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QSDJ2sBjEeODa7C3IU_ceQ"/>
+        </children>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_QSDJ28BjEeODa7C3IU_ceQ" type="7025">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_QSDJ3MBjEeODa7C3IU_ceQ"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_QSDJ3cBjEeODa7C3IU_ceQ"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_QSDJ3sBjEeODa7C3IU_ceQ"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QSDJ38BjEeODa7C3IU_ceQ"/>
+        </children>
+        <element xmi:type="uml:Component" href="model.uml#_8PG7EGctEeOYUqC_A3tTEw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QSCiwcBjEeODa7C3IU_ceQ" x="145" y="21"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_NqqepGfAEeOeZsTtUeHY9w"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NqqepWfAEeOeZsTtUeHY9w"/>
+    </children>
+    <element xmi:type="uml:Package" href="model.uml#_Caa0gGczEeO-Gf1_f5pJdw"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NqqeoWfAEeOeZsTtUeHY9w" x="186" y="281" width="355" height="168"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_Oclq0GfAEeOeZsTtUeHY9w" type="2007">
+    <children xmi:type="notation:DecorationNode" xmi:id="_OcmR4GfAEeOeZsTtUeHY9w" type="5026"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_OcmR4WfAEeOeZsTtUeHY9w" type="7016">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_OcmR5GfAEeOeZsTtUeHY9w" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Ocm48GfAEeOeZsTtUeHY9w" key="showTitle" value="true"/>
+      </eAnnotations>
+      <children xmi:type="notation:Shape" xmi:id="_RbznMMBjEeODa7C3IU_ceQ" type="3010">
+        <children xmi:type="notation:DecorationNode" xmi:id="_Rb0OQMBjEeODa7C3IU_ceQ" type="5014"/>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_Rb0OQcBjEeODa7C3IU_ceQ" type="7011">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_Rb0OQsBjEeODa7C3IU_ceQ"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_Rb0OQ8BjEeODa7C3IU_ceQ"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_Rb0ORMBjEeODa7C3IU_ceQ"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Rb0ORcBjEeODa7C3IU_ceQ"/>
+        </children>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_Rb0ORsBjEeODa7C3IU_ceQ" type="7012">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_Rb0OR8BjEeODa7C3IU_ceQ"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_Rb0OSMBjEeODa7C3IU_ceQ"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_Rb0OScBjEeODa7C3IU_ceQ"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Rb0OSsBjEeODa7C3IU_ceQ"/>
+        </children>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_Rb0OS8BjEeODa7C3IU_ceQ" type="7013">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_Rb0OTMBjEeODa7C3IU_ceQ"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_Rb0OTcBjEeODa7C3IU_ceQ"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_Rb0OTsBjEeODa7C3IU_ceQ"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Rb0OT8BjEeODa7C3IU_ceQ"/>
+        </children>
+        <element xmi:type="uml:Class" href="model.uml#_FbcBIJO3EeOs4_QQK50yyQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RbznMcBjEeODa7C3IU_ceQ" x="13" y="6"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_SQ0joMBjEeODa7C3IU_ceQ" type="3010">
+        <children xmi:type="notation:DecorationNode" xmi:id="_SQ0josBjEeODa7C3IU_ceQ" type="5014"/>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_SQ0jo8BjEeODa7C3IU_ceQ" type="7011">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_SQ0jpMBjEeODa7C3IU_ceQ"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_SQ0jpcBjEeODa7C3IU_ceQ"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_SQ0jpsBjEeODa7C3IU_ceQ"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SQ0jp8BjEeODa7C3IU_ceQ"/>
+        </children>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_SQ0jqMBjEeODa7C3IU_ceQ" type="7012">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_SQ0jqcBjEeODa7C3IU_ceQ"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_SQ0jqsBjEeODa7C3IU_ceQ"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_SQ0jq8BjEeODa7C3IU_ceQ"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SQ0jrMBjEeODa7C3IU_ceQ"/>
+        </children>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_SQ0jrcBjEeODa7C3IU_ceQ" type="7013">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_SQ0jrsBjEeODa7C3IU_ceQ"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_SQ0jr8BjEeODa7C3IU_ceQ"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_SQ0jsMBjEeODa7C3IU_ceQ"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SQ0jscBjEeODa7C3IU_ceQ"/>
+        </children>
+        <element xmi:type="uml:Class" href="model.uml#_Lw35MJO3EeOs4_QQK50yyQ"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SQ0jocBjEeODa7C3IU_ceQ" x="127" y="7"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_OcmR4mfAEeOeZsTtUeHY9w"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OcmR42fAEeOeZsTtUeHY9w"/>
+    </children>
+    <element xmi:type="uml:Package" href="model.uml#_dHWqAP1VEd-WkaQf4YgINA"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Oclq0WfAEeOeZsTtUeHY9w" x="523" y="99" width="339" height="146"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_Pf9zYGfAEeOeZsTtUeHY9w" type="2007">
+    <children xmi:type="notation:DecorationNode" xmi:id="_Pf9zYmfAEeOeZsTtUeHY9w" type="5026"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_Pf9zY2fAEeOeZsTtUeHY9w" type="7016">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Pf-acGfAEeOeZsTtUeHY9w" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Pf-acWfAEeOeZsTtUeHY9w" key="showTitle" value="true"/>
+      </eAnnotations>
+      <children xmi:type="notation:Shape" xmi:id="_M-FFcGfAEeOeZsTtUeHY9w" type="2002">
+        <children xmi:type="notation:DecorationNode" xmi:id="_M-JW4GfAEeOeZsTtUeHY9w" type="5005"/>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_M-OPYGfAEeOeZsTtUeHY9w" type="7002">
+          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_M-q7UGfAEeOeZsTtUeHY9w" source="PapyrusCSSForceValue">
+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_M-riYGfAEeOeZsTtUeHY9w" key="showTitle" value="true"/>
+          </eAnnotations>
+          <styles xmi:type="notation:TitleStyle" xmi:id="_M-OPYWfAEeOeZsTtUeHY9w"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_M-OPYmfAEeOeZsTtUeHY9w"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_M-OPY2fAEeOeZsTtUeHY9w"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_M-OPZGfAEeOeZsTtUeHY9w"/>
+        </children>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_M-OPZWfAEeOeZsTtUeHY9w" type="7003">
+          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_M-sJcGfAEeOeZsTtUeHY9w" source="PapyrusCSSForceValue">
+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_M-sJcWfAEeOeZsTtUeHY9w" key="showTitle" value="true"/>
+          </eAnnotations>
+          <styles xmi:type="notation:TitleStyle" xmi:id="_M-OPZmfAEeOeZsTtUeHY9w"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_M-OPZ2fAEeOeZsTtUeHY9w"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_M-OPaGfAEeOeZsTtUeHY9w"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_M-OPaWfAEeOeZsTtUeHY9w"/>
+        </children>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_M-O2cGfAEeOeZsTtUeHY9w" type="7004">
+          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_M-swgGfAEeOeZsTtUeHY9w" source="PapyrusCSSForceValue">
+            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_M-swgWfAEeOeZsTtUeHY9w" key="showTitle" value="true"/>
+          </eAnnotations>
+          <styles xmi:type="notation:TitleStyle" xmi:id="_M-O2cWfAEeOeZsTtUeHY9w"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_M-O2cmfAEeOeZsTtUeHY9w"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_M-O2c2fAEeOeZsTtUeHY9w"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_M-O2dGfAEeOeZsTtUeHY9w"/>
+        </children>
+        <element xmi:type="uml:Component" href="model.uml#_M9hEwGfAEeOeZsTtUeHY9w"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_M-FFcWfAEeOeZsTtUeHY9w" x="31" y="18"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_O9ejkMBjEeODa7C3IU_ceQ" type="3021">
+        <children xmi:type="notation:DecorationNode" xmi:id="_O9fKoMBjEeODa7C3IU_ceQ" type="5043"/>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_O9fKocBjEeODa7C3IU_ceQ" type="7023">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_O9fKosBjEeODa7C3IU_ceQ"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_O9fKo8BjEeODa7C3IU_ceQ"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_O9fKpMBjEeODa7C3IU_ceQ"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_O9fKpcBjEeODa7C3IU_ceQ"/>
+        </children>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_O9fKpsBjEeODa7C3IU_ceQ" type="7024">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_O9fKp8BjEeODa7C3IU_ceQ"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_O9fKqMBjEeODa7C3IU_ceQ"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_O9fKqcBjEeODa7C3IU_ceQ"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_O9fKqsBjEeODa7C3IU_ceQ"/>
+        </children>
+        <children xmi:type="notation:BasicCompartment" xmi:id="_O9fxsMBjEeODa7C3IU_ceQ" type="7025">
+          <styles xmi:type="notation:TitleStyle" xmi:id="_O9fxscBjEeODa7C3IU_ceQ"/>
+          <styles xmi:type="notation:SortingStyle" xmi:id="_O9fxssBjEeODa7C3IU_ceQ"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_O9fxs8BjEeODa7C3IU_ceQ"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_O9fxtMBjEeODa7C3IU_ceQ"/>
+        </children>
+        <element xmi:type="uml:Component" href="model.uml#_Y-QksGe-EeOeZsTtUeHY9w"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_O9ejkcBjEeODa7C3IU_ceQ" x="145" y="18"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_Pf9zZGfAEeOeZsTtUeHY9w"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Pf9zZWfAEeOeZsTtUeHY9w"/>
+    </children>
+    <element xmi:type="uml:Package" href="model.uml#_b1QI8P1VEd-WkaQf4YgINA"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Pf9zYWfAEeOeZsTtUeHY9w" x="188" y="74" width="269" height="191"/>
+  </children>
+  <styles xmi:type="notation:DiagramStyle" xmi:id="_MScHcGfAEeOeZsTtUeHY9w"/>
+  <element xmi:type="uml:Model" href="model.uml#_X66aUf1VEd-WkaQf4YgINA"/>
+</notation:Diagram>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.extendedtypes.tests/model/model.uml b/tests/junit/plugins/core/org.eclipse.papyrus.infra.extendedtypes.tests/model/model.uml
index 254c4db1865..d30d821fb5c 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.extendedtypes.tests/model/model.uml
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.extendedtypes.tests/model/model.uml
@@ -1,116 +1,110 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ExtendedTypesTestsProfile="http:///schemas/ExtendedTypesTestsProfile/_P0oJcIf5EeOi95YnkGlwiQ/7" xmlns:ExtendedTypesTestsProfile_1="http:///schemas/ExtendedTypesTestsProfile/_3cQg8HkREeOwQstt3pSj0Q/5" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xsi:schemaLocation="http:///schemas/ExtendedTypesTestsProfile/_P0oJcIf5EeOi95YnkGlwiQ/7 ExtendedTypesTestsProfile.profile.uml#_P0tpAIf5EeOi95YnkGlwiQ http:///schemas/ExtendedTypesTestsProfile/_3cQg8HkREeOwQstt3pSj0Q/5 ExtendedTypesTestsProfile.profile.uml#_3cRIAHkREeOwQstt3pSj0Q">

-  <uml:Model xmi:id="_X66aUf1VEd-WkaQf4YgINA" name="Model">

-    <packageImport xmi:type="uml:PackageImport" xmi:id="_X66aUv1VEd-WkaQf4YgINA">

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

-    </packageImport>

-    <packagedElement xmi:type="uml:Package" xmi:id="_b1QI8P1VEd-WkaQf4YgINA" name="PackageWithComponents">

-      <packagedElement xmi:type="uml:Component" xmi:id="_Y-QksGe-EeOeZsTtUeHY9w" name="Component2"/>

-      <packagedElement xmi:type="uml:Component" xmi:id="_M9hEwGfAEeOeZsTtUeHY9w" name="Component1"/>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Package" xmi:id="_dHWqAP1VEd-WkaQf4YgINA" name="PackageWithAllElements">

-      <packagedElement xmi:type="uml:Class" xmi:id="_FbcBIJO3EeOs4_QQK50yyQ" name="Class" isAbstract="true"/>

-      <packagedElement xmi:type="uml:Class" xmi:id="_Lw35MJO3EeOs4_QQK50yyQ" name="StereotypeWithFeaturesToSetClass1"/>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Package" xmi:id="_Caa0gGczEeO-Gf1_f5pJdw" name="OtherPackageWithComponents">

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

-      <packagedElement xmi:type="uml:Component" xmi:id="_TCAGQGc9EeOeFPMFS4Wv8Q" name="Component1"/>

-    </packagedElement>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_dj-KoGcFEeOea9k8XF7uAg">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_dkH7oGcFEeOea9k8XF7uAg" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="ExtendedTypesTestsProfile.profile.uml#_P0tpAIf5EeOi95YnkGlwiQ"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="ExtendedTypesTestsProfile.profile.uml#_sK148Gb7EeOyHY5evmQkxA"/>

-    </profileApplication>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="__7kSYGe0EeOCxY1uxkJbkw">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__8L9cGe0EeOCxY1uxkJbkw" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/0.7.0/SysML#/"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML_PROFILES/SysML.profile.uml#_TZ_nULU5EduiKqCzJMWbGw"/>

-    </profileApplication>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="__8L9cWe0EeOCxY1uxkJbkw">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__8e4YGe0EeOCxY1uxkJbkw" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/0.7.0/SysML#//modelelements"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML_PROFILES/SysML.profile.uml#_Gx8MgLX7EduFmqQsrNB9lw"/>

-    </profileApplication>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="__8e4YWe0EeOCxY1uxkJbkw">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__8opYGe0EeOCxY1uxkJbkw" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/0.7.0/SysML#//blocks"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML_PROFILES/SysML.profile.uml#_fSw28LX7EduFmqQsrNB9lw"/>

-    </profileApplication>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="__8opYWe0EeOCxY1uxkJbkw">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__87kUGe0EeOCxY1uxkJbkw" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/0.7.0/SysML#//portandflows"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML_PROFILES/SysML.profile.uml#_rpx28LX7EduFmqQsrNB9lw"/>

-    </profileApplication>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="__87kUWe0EeOCxY1uxkJbkw">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__9OfQGe0EeOCxY1uxkJbkw" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/0.7.0/SysML#//constraints"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML_PROFILES/SysML.profile.uml#_5WYJ0LX7EduFmqQsrNB9lw"/>

-    </profileApplication>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="__9OfQWe0EeOCxY1uxkJbkw">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__9YQQGe0EeOCxY1uxkJbkw" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/0.7.0/SysML#//activities"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML_PROFILES/SysML.profile.uml#_C2zXMLX8EduFmqQsrNB9lw"/>

-    </profileApplication>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="__9YQQWe0EeOCxY1uxkJbkw">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__9rLMGe0EeOCxY1uxkJbkw" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/0.7.0/SysML#//allocations"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML_PROFILES/SysML.profile.uml#_NxdG4LX8EduFmqQsrNB9lw"/>

-    </profileApplication>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="__9rLMWe0EeOCxY1uxkJbkw">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__90VIGe0EeOCxY1uxkJbkw" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/0.7.0/SysML#//requirements"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML_PROFILES/SysML.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>

-    </profileApplication>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="__90VIWe0EeOCxY1uxkJbkw">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__-H3IGe0EeOCxY1uxkJbkw" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/0.7.0/SysML#//interactions"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML_PROFILES/SysML.profile.uml#_meOioLX8EduFmqQsrNB9lw"/>

-    </profileApplication>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="__-H3IWe0EeOCxY1uxkJbkw">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__-RBEGe0EeOCxY1uxkJbkw" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/0.7.0/SysML#//statemachines"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML_PROFILES/SysML.profile.uml#_nAF5kLX8EduFmqQsrNB9lw"/>

-    </profileApplication>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="__-RBEWe0EeOCxY1uxkJbkw">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__-ayEGe0EeOCxY1uxkJbkw" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/0.7.0/SysML#//usecases"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML_PROFILES/SysML.profile.uml#_neZmMLX8EduFmqQsrNB9lw"/>

-    </profileApplication>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_OqmBEHkYEeOHVq64OdBxbA">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_OrziAHkYEeOHVq64OdBxbA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="pathmap://PAPYRUS_INTERNAL_PROFILES/PapyrusInternal.profile.uml#_eijPgUBcEeKj6r7ThQagKA"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="pathmap://PAPYRUS_INTERNAL_PROFILES/PapyrusInternal.profile.uml#_dL4lkPXAEeGSQON-DQ-5eg"/>

-    </profileApplication>

-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_Or1XMHkYEeOHVq64OdBxbA">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_OsllIHkYEeOHVq64OdBxbA" source="http://www.eclipse.org/uml2/2.0.0/UML">

-        <references xmi:type="ecore:EPackage" href="pathmap://PAPYRUS_INTERNAL_PROFILES/PapyrusInternal.profile.uml#_eikdoEBcEeKj6r7ThQagKA"/>

-      </eAnnotations>

-      <appliedProfile xmi:type="uml:Profile" href="pathmap://PAPYRUS_INTERNAL_PROFILES/PapyrusInternal.profile.uml#_16oYAD-SEeKj6r7ThQagKA"/>

-    </profileApplication>

-  </uml:Model>

-  <ExtendedTypesTestsProfile:PackageWithComponents xmi:id="_keWi0GcFEeOea9k8XF7uAg" base_Element="_b1QI8P1VEd-WkaQf4YgINA"/>

-  <ExtendedTypesTestsProfile:PackageWithComponents xmi:id="_FHOZAGczEeO-Gf1_f5pJdw" base_Element="_Caa0gGczEeO-Gf1_f5pJdw"/>

-  <ExtendedTypesTestsProfile_1:Equipment xmi:id="_e-46gHkOEeOwQstt3pSj0Q"/>

-  <ExtendedTypesTestsProfile_1:Equipment xmi:id="_fmnB0HkOEeOwQstt3pSj0Q"/>

-  <ExtendedTypesTestsProfile_1:Module xmi:id="_bWIEEHkOEeOwQstt3pSj0Q"/>

-  <ExtendedTypesTestsProfile_1:Module xmi:id="_cjKe8HkOEeOwQstt3pSj0Q" kind="Electrical"/>

-  <ExtendedTypesTestsProfile_1:Partition xmi:id="_gW-u0HkOEeOwQstt3pSj0Q"/>

-  <ExtendedTypesTestsProfile_1:Partition xmi:id="_hAeXwHkOEeOwQstt3pSj0Q"/>

-  <ExtendedTypesTestsProfile:StereotypeWithFeaturesToSet xmi:id="_FccGsJO3EeOs4_QQK50yyQ" base_Element="_FbcBIJO3EeOs4_QQK50yyQ" stringFeature="MyOtherValue" value="18" boolean="true" enumeration="Enum2"/>

-  <ExtendedTypesTestsProfile:StereotypeWithFeaturesToSet xmi:id="_LxXBYJO3EeOs4_QQK50yyQ" base_Element="_Lw35MJO3EeOs4_QQK50yyQ" stringFeature="Test Demo" value="3" enumeration="Enum2">

-    <multiStrings>demo</multiStrings>

-  </ExtendedTypesTestsProfile:StereotypeWithFeaturesToSet>

-</xmi:XMI>

+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ExtendedTypesTestsProfile="http:///schemas/ExtendedTypesTestsProfile/_P0oJcIf5EeOi95YnkGlwiQ/7" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http:///schemas/ExtendedTypesTestsProfile/_P0oJcIf5EeOi95YnkGlwiQ/7 ExtendedTypesTestsProfile.profile.uml#_P0tpAIf5EeOi95YnkGlwiQ">
+  <uml:Model xmi:id="_X66aUf1VEd-WkaQf4YgINA" name="Model">
+    <packageImport xmi:type="uml:PackageImport" xmi:id="_X66aUv1VEd-WkaQf4YgINA">
+      <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
+    </packageImport>
+    <packagedElement xmi:type="uml:Package" xmi:id="_b1QI8P1VEd-WkaQf4YgINA" name="PackageWithComponents">
+      <packagedElement xmi:type="uml:Component" xmi:id="_Y-QksGe-EeOeZsTtUeHY9w" name="Component2"/>
+      <packagedElement xmi:type="uml:Component" xmi:id="_M9hEwGfAEeOeZsTtUeHY9w" name="Component1"/>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Package" xmi:id="_dHWqAP1VEd-WkaQf4YgINA" name="PackageWithAllElements">
+      <packagedElement xmi:type="uml:Class" xmi:id="_FbcBIJO3EeOs4_QQK50yyQ" name="Class" isAbstract="true"/>
+      <packagedElement xmi:type="uml:Class" xmi:id="_Lw35MJO3EeOs4_QQK50yyQ" name="StereotypeWithFeaturesToSetClass1"/>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Package" xmi:id="_Caa0gGczEeO-Gf1_f5pJdw" name="OtherPackageWithComponents">
+      <packagedElement xmi:type="uml:Component" xmi:id="_8PG7EGctEeOYUqC_A3tTEw" name="Component"/>
+      <packagedElement xmi:type="uml:Component" xmi:id="_TCAGQGc9EeOeFPMFS4Wv8Q" name="Component1"/>
+    </packagedElement>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_dj-KoGcFEeOea9k8XF7uAg">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_dkH7oGcFEeOea9k8XF7uAg" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="ExtendedTypesTestsProfile.profile.uml#_P0tpAIf5EeOi95YnkGlwiQ"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="ExtendedTypesTestsProfile.profile.uml#_sK148Gb7EeOyHY5evmQkxA"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="__7kSYGe0EeOCxY1uxkJbkw">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__8L9cGe0EeOCxY1uxkJbkw" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/0.7.0/SysML#/"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML_PROFILES/SysML.profile.uml#_TZ_nULU5EduiKqCzJMWbGw"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="__8L9cWe0EeOCxY1uxkJbkw">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__8e4YGe0EeOCxY1uxkJbkw" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/0.7.0/SysML#//modelelements"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML_PROFILES/SysML.profile.uml#_Gx8MgLX7EduFmqQsrNB9lw"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="__8e4YWe0EeOCxY1uxkJbkw">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__8opYGe0EeOCxY1uxkJbkw" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/0.7.0/SysML#//blocks"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML_PROFILES/SysML.profile.uml#_fSw28LX7EduFmqQsrNB9lw"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="__8opYWe0EeOCxY1uxkJbkw">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__87kUGe0EeOCxY1uxkJbkw" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/0.7.0/SysML#//portandflows"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML_PROFILES/SysML.profile.uml#_rpx28LX7EduFmqQsrNB9lw"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="__87kUWe0EeOCxY1uxkJbkw">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__9OfQGe0EeOCxY1uxkJbkw" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/0.7.0/SysML#//constraints"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML_PROFILES/SysML.profile.uml#_5WYJ0LX7EduFmqQsrNB9lw"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="__9OfQWe0EeOCxY1uxkJbkw">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__9YQQGe0EeOCxY1uxkJbkw" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/0.7.0/SysML#//activities"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML_PROFILES/SysML.profile.uml#_C2zXMLX8EduFmqQsrNB9lw"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="__9YQQWe0EeOCxY1uxkJbkw">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__9rLMGe0EeOCxY1uxkJbkw" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/0.7.0/SysML#//allocations"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML_PROFILES/SysML.profile.uml#_NxdG4LX8EduFmqQsrNB9lw"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="__9rLMWe0EeOCxY1uxkJbkw">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__90VIGe0EeOCxY1uxkJbkw" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/0.7.0/SysML#//requirements"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML_PROFILES/SysML.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="__90VIWe0EeOCxY1uxkJbkw">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__-H3IGe0EeOCxY1uxkJbkw" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/0.7.0/SysML#//interactions"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML_PROFILES/SysML.profile.uml#_meOioLX8EduFmqQsrNB9lw"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="__-H3IWe0EeOCxY1uxkJbkw">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__-RBEGe0EeOCxY1uxkJbkw" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/0.7.0/SysML#//statemachines"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML_PROFILES/SysML.profile.uml#_nAF5kLX8EduFmqQsrNB9lw"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="__-RBEWe0EeOCxY1uxkJbkw">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__-ayEGe0EeOCxY1uxkJbkw" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/0.7.0/SysML#//usecases"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML_PROFILES/SysML.profile.uml#_neZmMLX8EduFmqQsrNB9lw"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_OqmBEHkYEeOHVq64OdBxbA">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_OrziAHkYEeOHVq64OdBxbA" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="pathmap://PAPYRUS_INTERNAL_PROFILES/PapyrusInternal.profile.uml#_eijPgUBcEeKj6r7ThQagKA"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://PAPYRUS_INTERNAL_PROFILES/PapyrusInternal.profile.uml#_dL4lkPXAEeGSQON-DQ-5eg"/>
+    </profileApplication>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_Or1XMHkYEeOHVq64OdBxbA">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_OsllIHkYEeOHVq64OdBxbA" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="pathmap://PAPYRUS_INTERNAL_PROFILES/PapyrusInternal.profile.uml#_eikdoEBcEeKj6r7ThQagKA"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://PAPYRUS_INTERNAL_PROFILES/PapyrusInternal.profile.uml#_16oYAD-SEeKj6r7ThQagKA"/>
+    </profileApplication>
+  </uml:Model>
+  <ExtendedTypesTestsProfile:PackageWithComponents xmi:id="_keWi0GcFEeOea9k8XF7uAg" base_Element="_b1QI8P1VEd-WkaQf4YgINA"/>
+  <ExtendedTypesTestsProfile:PackageWithComponents xmi:id="_FHOZAGczEeO-Gf1_f5pJdw" base_Element="_Caa0gGczEeO-Gf1_f5pJdw"/>
+  <ExtendedTypesTestsProfile:StereotypeWithFeaturesToSet xmi:id="_FccGsJO3EeOs4_QQK50yyQ" base_Element="_FbcBIJO3EeOs4_QQK50yyQ" stringFeature="MyOtherValue" value="18" boolean="true" enumeration="Enum2"/>
+  <ExtendedTypesTestsProfile:StereotypeWithFeaturesToSet xmi:id="_LxXBYJO3EeOs4_QQK50yyQ" base_Element="_Lw35MJO3EeOs4_QQK50yyQ" stringFeature="Test Demo" value="3" enumeration="Enum2">
+    <multiStrings>demo</multiStrings>
+  </ExtendedTypesTestsProfile:StereotypeWithFeaturesToSet>
+</xmi:XMI>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.extendedtypes.tests/src/org/eclipse/papyrus/infra/extendedtypes/tests/ExtendedTypesRegistryTests.java b/tests/junit/plugins/core/org.eclipse.papyrus.infra.extendedtypes.tests/src/org/eclipse/papyrus/infra/extendedtypes/tests/ExtendedTypesRegistryTests.java
index 8e9d00df06c..1f9afca5a0b 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.extendedtypes.tests/src/org/eclipse/papyrus/infra/extendedtypes/tests/ExtendedTypesRegistryTests.java
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.extendedtypes.tests/src/org/eclipse/papyrus/infra/extendedtypes/tests/ExtendedTypesRegistryTests.java
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Copyright (c) 2010 CEA LIST.
+ * Copyright (c) 2010, 2014 CEA LIST and others.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -8,6 +8,8 @@
  *
  * Contributors:
  *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
+ *  Christian W. Damus (CEA) - bug 431953 (fix test to prevent Model Repair dialog on unrecognized profile schema)
+ *  
  *****************************************************************************/
 package org.eclipse.papyrus.infra.extendedtypes.tests;
 
@@ -47,6 +49,7 @@ import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Ignore;
 import org.junit.Test;
+import org.osgi.framework.Bundle;
 
 
 /**
@@ -87,9 +90,11 @@ public class ExtendedTypesRegistryTests implements ITestConstants {
 			fail(e.getMessage());
 		}
 
-		// import test model
+		// import test model and profile
 		try {
-			copyPapyrusModel = PapyrusProjectUtils.copyPapyrusModel(createProject, Platform.getBundle("org.eclipse.papyrus.infra.extendedtypes.tests"), "/model/", "model");
+			Bundle bundle = Platform.getBundle("org.eclipse.papyrus.infra.extendedtypes.tests");
+			copyPapyrusModel = PapyrusProjectUtils.copyPapyrusModel(createProject, bundle, "/model/", "model");
+			PapyrusProjectUtils.copyPapyrusModel(createProject, bundle, "/model/", "ExtendedTypesTestsProfile.profile");
 		} catch (CoreException e) {
 			fail(e.getMessage());
 		} catch (IOException e) {