Bug 526009 - [Matrix][Filter] add new UML Expressions to manage the case

of inherited Stereotype

* change pom.xml

* remove reexport from manisfest.mf
* add doc
* use API Baseline to increment the plugins version and update all
depending plugins versions too
* add icons to both added uml expressions
* reset to platform:/plugin in ctx file

* update the uml expressions MM
* re generate code
* add custom code
* update properties
* add junit test

Change-Id: I42eceb584011d267488da517ad799fe542566824
Signed-off-by: Asma Smaoui <asma.smaoui@cea.fr>

8 files changed, 1109 insertions, 417 deletions

diff --git a/tests/junit/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.tests/META-INF/MANIFEST.MF
index c3ca066c89b..bc3838dea68 100755
--- a/tests/junit/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.tests/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-Vendor: %Bundle-Vendor
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
  org.eclipse.papyrus.infra.emf.expressions;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.papyrus.uml.expressions;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.papyrus.uml.expressions;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.papyrus.editor.integration.tests;bundle-version="[1.2.0,2.0.0)",
  org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
diff --git a/tests/junit/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.tests/resources/expressionModelTest.notation b/tests/junit/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.tests/resources/expressionModelTest.notation
index c939569f559..62958366c24 100755
--- a/tests/junit/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.tests/resources/expressionModelTest.notation
+++ b/tests/junit/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.tests/resources/expressionModelTest.notation
@@ -1,127 +1,171 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:gmfdiagrepresentation="http://www.eclipse.org/papyrus/infra/gmfdiag/representation" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/gmfdiag/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_S-8MECgzEeeoAJG6t_MwCA" type="PapyrusUMLClassDiagram" name="ClassDiagram" measurementUnit="Pixel">
-  <children xmi:type="notation:Shape" xmi:id="_UsONQCgzEeeoAJG6t_MwCA" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_UsO0UCgzEeeoAJG6t_MwCA" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_UsO0USgzEeeoAJG6t_MwCA" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_UsO0UigzEeeoAJG6t_MwCA" y="15"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_UsO0UygzEeeoAJG6t_MwCA" type="Class_AttributeCompartment">
-      <children xmi:type="notation:Shape" xmi:id="_V3wMQCgzEeeoAJG6t_MwCA" type="Property_ClassAttributeLabel">
-        <element xmi:type="uml:Property" href="expressionModelTest.uml#_V3npYCgzEeeoAJG6t_MwCA"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_V3wMQSgzEeeoAJG6t_MwCA"/>
-      </children>
-      <styles xmi:type="notation:TitleStyle" xmi:id="_UsO0VCgzEeeoAJG6t_MwCA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_UsO0VSgzEeeoAJG6t_MwCA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_UsO0VigzEeeoAJG6t_MwCA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UsO0VygzEeeoAJG6t_MwCA"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_UsPbYCgzEeeoAJG6t_MwCA" type="Class_OperationCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_UsPbYSgzEeeoAJG6t_MwCA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_UsPbYigzEeeoAJG6t_MwCA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_UsPbYygzEeeoAJG6t_MwCA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UsPbZCgzEeeoAJG6t_MwCA"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_UsPbZSgzEeeoAJG6t_MwCA" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_UsPbZigzEeeoAJG6t_MwCA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_UsPbZygzEeeoAJG6t_MwCA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_UsPbaCgzEeeoAJG6t_MwCA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UsPbaSgzEeeoAJG6t_MwCA"/>
-    </children>
-    <element xmi:type="uml:Class" href="expressionModelTest.uml#_UsJ70CgzEeeoAJG6t_MwCA"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UsONQSgzEeeoAJG6t_MwCA" x="120" y="60" width="201" height="141"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_daXpICgzEeeoAJG6t_MwCA" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_daYQMCgzEeeoAJG6t_MwCA" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_daYQMSgzEeeoAJG6t_MwCA" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_daYQMigzEeeoAJG6t_MwCA" y="15"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_daYQMygzEeeoAJG6t_MwCA" type="Class_AttributeCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_daYQNCgzEeeoAJG6t_MwCA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_daYQNSgzEeeoAJG6t_MwCA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_daYQNigzEeeoAJG6t_MwCA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_daYQNygzEeeoAJG6t_MwCA"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_daYQOCgzEeeoAJG6t_MwCA" type="Class_OperationCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_daYQOSgzEeeoAJG6t_MwCA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_daYQOigzEeeoAJG6t_MwCA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_daY3QCgzEeeoAJG6t_MwCA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_daY3QSgzEeeoAJG6t_MwCA"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_daY3QigzEeeoAJG6t_MwCA" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_daY3QygzEeeoAJG6t_MwCA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_daY3RCgzEeeoAJG6t_MwCA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_daY3RSgzEeeoAJG6t_MwCA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_daY3RigzEeeoAJG6t_MwCA"/>
-    </children>
-    <element xmi:type="uml:Class" href="expressionModelTest.uml#_daTXsCgzEeeoAJG6t_MwCA"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_daXpISgzEeeoAJG6t_MwCA" x="120" y="240" width="201" height="101"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_TLBLIC0TEee42cCIRX36lw" type="Class_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_TLDAUC0TEee42cCIRX36lw" type="Class_NameLabel"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_TLDAUS0TEee42cCIRX36lw" type="Class_FloatingNameLabel">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_TLDAUi0TEee42cCIRX36lw" y="15"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_TLEOcC0TEee42cCIRX36lw" type="Class_AttributeCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_TLEOcS0TEee42cCIRX36lw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_TLEOci0TEee42cCIRX36lw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_TLEOcy0TEee42cCIRX36lw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TLEOdC0TEee42cCIRX36lw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_TLEOdS0TEee42cCIRX36lw" type="Class_OperationCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_TLEOdi0TEee42cCIRX36lw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_TLEOdy0TEee42cCIRX36lw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_TLEOeC0TEee42cCIRX36lw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TLEOeS0TEee42cCIRX36lw"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_TLEOei0TEee42cCIRX36lw" type="Class_NestedClassifierCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_TLEOey0TEee42cCIRX36lw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_TLEOfC0TEee42cCIRX36lw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_TLEOfS0TEee42cCIRX36lw"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TLEOfi0TEee42cCIRX36lw"/>
-    </children>
-    <element xmi:type="uml:Class" href="expressionModelTest.uml#_TK3aIC0TEee42cCIRX36lw"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TLBLIS0TEee42cCIRX36lw" x="480" y="60" width="201" height="141"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_3ooXsC0TEee42cCIRX36lw" type="StereotypeComment">
-    <styles xmi:type="notation:TitleStyle" xmi:id="_3ooXsS0TEee42cCIRX36lw"/>
-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_3ooXsy0TEee42cCIRX36lw" name="BASE_ELEMENT">
-      <eObjectValue xmi:type="uml:Class" href="expressionModelTest.uml#_TK3aIC0TEee42cCIRX36lw"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3ooXsi0TEee42cCIRX36lw" x="680" y="60"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_A6ngdC0UEee42cCIRX36lw" type="StereotypeComment">
-    <styles xmi:type="notation:TitleStyle" xmi:id="_A6ngdS0UEee42cCIRX36lw"/>
-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_A6ngdy0UEee42cCIRX36lw" name="BASE_ELEMENT">
-      <eObjectValue xmi:type="uml:Class" href="expressionModelTest.uml#_UsJ70CgzEeeoAJG6t_MwCA"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_A6ngdi0UEee42cCIRX36lw" x="320" y="60"/>
-  </children>
-  <styles xmi:type="notation:StringValueStyle" xmi:id="_S-8MESgzEeeoAJG6t_MwCA" name="diagram_compatibility_version" stringValue="1.3.0"/>
-  <styles xmi:type="notation:DiagramStyle" xmi:id="_S-8MEigzEeeoAJG6t_MwCA"/>
-  <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_S-8MEygzEeeoAJG6t_MwCA" diagramKindId="org.eclipse.papyrus.uml.diagram.class">
-    <owner xmi:type="uml:Model" href="expressionModelTest.uml#_8TUvwCgyEeeoAJG6t_MwCA"/>
-  </styles>
-  <element xmi:type="uml:Model" href="expressionModelTest.uml#_8TUvwCgyEeeoAJG6t_MwCA"/>
-  <edges xmi:type="notation:Connector" xmi:id="_3ooXtC0TEee42cCIRX36lw" type="StereotypeCommentLink" source="_TLBLIC0TEee42cCIRX36lw" target="_3ooXsC0TEee42cCIRX36lw">
-    <styles xmi:type="notation:FontStyle" xmi:id="_3ooXtS0TEee42cCIRX36lw"/>
-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_3ooXuS0TEee42cCIRX36lw" name="BASE_ELEMENT">
-      <eObjectValue xmi:type="uml:Class" href="expressionModelTest.uml#_TK3aIC0TEee42cCIRX36lw"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3ooXti0TEee42cCIRX36lw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3ooXty0TEee42cCIRX36lw"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3ooXuC0TEee42cCIRX36lw"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_A6oHgC0UEee42cCIRX36lw" type="StereotypeCommentLink" source="_UsONQCgzEeeoAJG6t_MwCA" target="_A6ngdC0UEee42cCIRX36lw">
-    <styles xmi:type="notation:FontStyle" xmi:id="_A6oHgS0UEee42cCIRX36lw"/>
-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_A6oHhS0UEee42cCIRX36lw" name="BASE_ELEMENT">
-      <eObjectValue xmi:type="uml:Class" href="expressionModelTest.uml#_UsJ70CgzEeeoAJG6t_MwCA"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_A6oHgi0UEee42cCIRX36lw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_A6oHgy0UEee42cCIRX36lw"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_A6oHhC0UEee42cCIRX36lw"/>
-  </edges>
-</notation:Diagram>
+<?xml version="1.0" encoding="UTF-8"?>

+<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.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/gmfdiag/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_S-8MECgzEeeoAJG6t_MwCA" type="PapyrusUMLClassDiagram" name="ClassDiagram" measurementUnit="Pixel">

+  <children xmi:type="notation:Shape" xmi:id="_UsONQCgzEeeoAJG6t_MwCA" type="Class_Shape">

+    <children xmi:type="notation:DecorationNode" xmi:id="_UsO0UCgzEeeoAJG6t_MwCA" type="Class_NameLabel"/>

+    <children xmi:type="notation:DecorationNode" xmi:id="_UsO0USgzEeeoAJG6t_MwCA" type="Class_FloatingNameLabel">

+      <layoutConstraint xmi:type="notation:Location" xmi:id="_UsO0UigzEeeoAJG6t_MwCA" y="15"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_UsO0UygzEeeoAJG6t_MwCA" type="Class_AttributeCompartment">

+      <children xmi:type="notation:Shape" xmi:id="_V3wMQCgzEeeoAJG6t_MwCA" type="Property_ClassAttributeLabel">

+        <element xmi:type="uml:Property" href="expressionModelTest.uml#_V3npYCgzEeeoAJG6t_MwCA"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_V3wMQSgzEeeoAJG6t_MwCA"/>

+      </children>

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

+      <styles xmi:type="notation:SortingStyle" xmi:id="_UsO0VSgzEeeoAJG6t_MwCA"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_UsO0VigzEeeoAJG6t_MwCA"/>

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

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_UsPbYCgzEeeoAJG6t_MwCA" type="Class_OperationCompartment">

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

+      <styles xmi:type="notation:SortingStyle" xmi:id="_UsPbYigzEeeoAJG6t_MwCA"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_UsPbYygzEeeoAJG6t_MwCA"/>

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

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_UsPbZSgzEeeoAJG6t_MwCA" type="Class_NestedClassifierCompartment">

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

+      <styles xmi:type="notation:SortingStyle" xmi:id="_UsPbZygzEeeoAJG6t_MwCA"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_UsPbaCgzEeeoAJG6t_MwCA"/>

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

+    </children>

+    <element xmi:type="uml:Class" href="expressionModelTest.uml#_UsJ70CgzEeeoAJG6t_MwCA"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UsONQSgzEeeoAJG6t_MwCA" x="120" y="60" width="201" height="141"/>

+  </children>

+  <children xmi:type="notation:Shape" xmi:id="_daXpICgzEeeoAJG6t_MwCA" type="Class_Shape">

+    <children xmi:type="notation:DecorationNode" xmi:id="_daYQMCgzEeeoAJG6t_MwCA" type="Class_NameLabel"/>

+    <children xmi:type="notation:DecorationNode" xmi:id="_daYQMSgzEeeoAJG6t_MwCA" type="Class_FloatingNameLabel">

+      <layoutConstraint xmi:type="notation:Location" xmi:id="_daYQMigzEeeoAJG6t_MwCA" y="15"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_daYQMygzEeeoAJG6t_MwCA" type="Class_AttributeCompartment">

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

+      <styles xmi:type="notation:SortingStyle" xmi:id="_daYQNSgzEeeoAJG6t_MwCA"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_daYQNigzEeeoAJG6t_MwCA"/>

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

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_daYQOCgzEeeoAJG6t_MwCA" type="Class_OperationCompartment">

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

+      <styles xmi:type="notation:SortingStyle" xmi:id="_daYQOigzEeeoAJG6t_MwCA"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_daY3QCgzEeeoAJG6t_MwCA"/>

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

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_daY3QigzEeeoAJG6t_MwCA" type="Class_NestedClassifierCompartment">

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

+      <styles xmi:type="notation:SortingStyle" xmi:id="_daY3RCgzEeeoAJG6t_MwCA"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_daY3RSgzEeeoAJG6t_MwCA"/>

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

+    </children>

+    <element xmi:type="uml:Class" href="expressionModelTest.uml#_daTXsCgzEeeoAJG6t_MwCA"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_daXpISgzEeeoAJG6t_MwCA" x="120" y="240" width="201" height="101"/>

+  </children>

+  <children xmi:type="notation:Shape" xmi:id="_TLBLIC0TEee42cCIRX36lw" type="Class_Shape">

+    <children xmi:type="notation:DecorationNode" xmi:id="_TLDAUC0TEee42cCIRX36lw" type="Class_NameLabel"/>

+    <children xmi:type="notation:DecorationNode" xmi:id="_TLDAUS0TEee42cCIRX36lw" type="Class_FloatingNameLabel">

+      <layoutConstraint xmi:type="notation:Location" xmi:id="_TLDAUi0TEee42cCIRX36lw" y="15"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_TLEOcC0TEee42cCIRX36lw" type="Class_AttributeCompartment">

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

+      <styles xmi:type="notation:SortingStyle" xmi:id="_TLEOci0TEee42cCIRX36lw"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_TLEOcy0TEee42cCIRX36lw"/>

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

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_TLEOdS0TEee42cCIRX36lw" type="Class_OperationCompartment">

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

+      <styles xmi:type="notation:SortingStyle" xmi:id="_TLEOdy0TEee42cCIRX36lw"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_TLEOeC0TEee42cCIRX36lw"/>

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

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_TLEOei0TEee42cCIRX36lw" type="Class_NestedClassifierCompartment">

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

+      <styles xmi:type="notation:SortingStyle" xmi:id="_TLEOfC0TEee42cCIRX36lw"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_TLEOfS0TEee42cCIRX36lw"/>

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

+    </children>

+    <element xmi:type="uml:Class" href="expressionModelTest.uml#_TK3aIC0TEee42cCIRX36lw"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TLBLIS0TEee42cCIRX36lw" x="480" y="60" width="201" height="141"/>

+  </children>

+  <children xmi:type="notation:Shape" xmi:id="_3ooXsC0TEee42cCIRX36lw" type="StereotypeComment">

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

+    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_3ooXsy0TEee42cCIRX36lw" name="BASE_ELEMENT">

+      <eObjectValue xmi:type="uml:Class" href="expressionModelTest.uml#_TK3aIC0TEee42cCIRX36lw"/>

+    </styles>

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

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3ooXsi0TEee42cCIRX36lw" x="680" y="60"/>

+  </children>

+  <children xmi:type="notation:Shape" xmi:id="_A6ngdC0UEee42cCIRX36lw" type="StereotypeComment">

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

+    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_A6ngdy0UEee42cCIRX36lw" name="BASE_ELEMENT">

+      <eObjectValue xmi:type="uml:Class" href="expressionModelTest.uml#_UsJ70CgzEeeoAJG6t_MwCA"/>

+    </styles>

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

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_A6ngdi0UEee42cCIRX36lw" x="320" y="60"/>

+  </children>

+  <children xmi:type="notation:Shape" xmi:id="_vI_ZULAiEee43bo6S9i5Mw" type="Class_Shape">

+    <children xmi:type="notation:DecorationNode" xmi:id="_vJAAYLAiEee43bo6S9i5Mw" type="Class_NameLabel"/>

+    <children xmi:type="notation:DecorationNode" xmi:id="_vJAAYbAiEee43bo6S9i5Mw" type="Class_FloatingNameLabel">

+      <layoutConstraint xmi:type="notation:Location" xmi:id="_vJAncLAiEee43bo6S9i5Mw" y="15"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_vJAncbAiEee43bo6S9i5Mw" type="Class_AttributeCompartment">

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

+      <styles xmi:type="notation:SortingStyle" xmi:id="_vJAnc7AiEee43bo6S9i5Mw"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_vJAndLAiEee43bo6S9i5Mw"/>

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

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_vJAndrAiEee43bo6S9i5Mw" type="Class_OperationCompartment">

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

+      <styles xmi:type="notation:SortingStyle" xmi:id="_vJAneLAiEee43bo6S9i5Mw"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_vJAnebAiEee43bo6S9i5Mw"/>

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

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_vJBOgLAiEee43bo6S9i5Mw" type="Class_NestedClassifierCompartment">

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

+      <styles xmi:type="notation:SortingStyle" xmi:id="_vJBOgrAiEee43bo6S9i5Mw"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_vJBOg7AiEee43bo6S9i5Mw"/>

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

+    </children>

+    <element xmi:type="uml:Class" href="expressionModelTest.uml#_vI55wLAiEee43bo6S9i5Mw"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vI_ZUbAiEee43bo6S9i5Mw" x="480" y="240" width="201" height="101"/>

+  </children>

+  <children xmi:type="notation:Shape" xmi:id="_BKFAMLAjEee43bo6S9i5Mw" type="StereotypeComment">

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

+    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_BKFnQLAjEee43bo6S9i5Mw" name="BASE_ELEMENT">

+      <eObjectValue xmi:type="uml:Class" href="expressionModelTest.uml#_vI55wLAiEee43bo6S9i5Mw"/>

+    </styles>

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

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BKFAMrAjEee43bo6S9i5Mw" x="680" y="240"/>

+  </children>

+  <styles xmi:type="notation:StringValueStyle" xmi:id="_S-8MESgzEeeoAJG6t_MwCA" name="diagram_compatibility_version" stringValue="1.3.0"/>

+  <styles xmi:type="notation:DiagramStyle" xmi:id="_S-8MEigzEeeoAJG6t_MwCA"/>

+  <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_S-8MEygzEeeoAJG6t_MwCA" diagramKindId="org.eclipse.papyrus.uml.diagram.class">

+    <owner xmi:type="uml:Model" href="expressionModelTest.uml#_8TUvwCgyEeeoAJG6t_MwCA"/>

+  </styles>

+  <element xmi:type="uml:Model" href="expressionModelTest.uml#_8TUvwCgyEeeoAJG6t_MwCA"/>

+  <edges xmi:type="notation:Connector" xmi:id="_3ooXtC0TEee42cCIRX36lw" type="StereotypeCommentLink" source="_TLBLIC0TEee42cCIRX36lw" target="_3ooXsC0TEee42cCIRX36lw">

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

+    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_3ooXuS0TEee42cCIRX36lw" name="BASE_ELEMENT">

+      <eObjectValue xmi:type="uml:Class" href="expressionModelTest.uml#_TK3aIC0TEee42cCIRX36lw"/>

+    </styles>

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

+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3ooXti0TEee42cCIRX36lw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3ooXty0TEee42cCIRX36lw"/>

+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3ooXuC0TEee42cCIRX36lw"/>

+  </edges>

+  <edges xmi:type="notation:Connector" xmi:id="_A6oHgC0UEee42cCIRX36lw" type="StereotypeCommentLink" source="_UsONQCgzEeeoAJG6t_MwCA" target="_A6ngdC0UEee42cCIRX36lw">

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

+    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_A6oHhS0UEee42cCIRX36lw" name="BASE_ELEMENT">

+      <eObjectValue xmi:type="uml:Class" href="expressionModelTest.uml#_UsJ70CgzEeeoAJG6t_MwCA"/>

+    </styles>

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

+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_A6oHgi0UEee42cCIRX36lw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_A6oHgy0UEee42cCIRX36lw"/>

+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_A6oHhC0UEee42cCIRX36lw"/>

+  </edges>

+  <edges xmi:type="notation:Connector" xmi:id="_BKGOULAjEee43bo6S9i5Mw" type="StereotypeCommentLink" source="_vI_ZULAiEee43bo6S9i5Mw" target="_BKFAMLAjEee43bo6S9i5Mw">

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

+    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_BKGOVbAjEee43bo6S9i5Mw" name="BASE_ELEMENT">

+      <eObjectValue xmi:type="uml:Class" href="expressionModelTest.uml#_vI55wLAiEee43bo6S9i5Mw"/>

+    </styles>

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

+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_BKGOUrAjEee43bo6S9i5Mw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_BKGOU7AjEee43bo6S9i5Mw"/>

+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_BKGOVLAjEee43bo6S9i5Mw"/>

+  </edges>

+</notation:Diagram>

diff --git a/tests/junit/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.tests/resources/expressionModelTest.uml b/tests/junit/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.tests/resources/expressionModelTest.uml
index fefa215f7cf..e3f97da73f1 100755
--- a/tests/junit/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.tests/resources/expressionModelTest.uml
+++ b/tests/junit/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.tests/resources/expressionModelTest.uml
@@ -1,39 +1,41 @@
-<?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:RootElement="http:///schemas/RootElement/_AgCXgC8oEeexfKc2E3OwJQ/4" xmlns:RootElement_1="papyrusExpressionProfile" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http:///schemas/RootElement/_AgCXgC8oEeexfKc2E3OwJQ/4 expressionProfileWithoutURI.profile.uml#_AgGB4C8oEeexfKc2E3OwJQ papyrusExpressionProfile expressionProfileWithURI.profile.uml#_CjQMcC8oEeexfKc2E3OwJQ">
-  <uml:Model xmi:id="_8TUvwCgyEeeoAJG6t_MwCA" name="RootElement">
-    <packagedElement xmi:type="uml:Class" xmi:id="_UsJ70CgzEeeoAJG6t_MwCA" name="StereotypedWithURIClass">
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_V3npYCgzEeeoAJG6t_MwCA" name="StereotypedWithURIProperty" visibility="public"/>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Class" xmi:id="_daTXsCgzEeeoAJG6t_MwCA" name="NoStereotypedClass"/>
-    <packagedElement xmi:type="uml:Class" xmi:id="_TK3aIC0TEee42cCIRX36lw" name="StereotypedWithoutURIClass"/>
-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_L-vxsC0TEee42cCIRX36lw">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EAGk8C8oEeexfKc2E3OwJQ" source="PapyrusVersion">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EAGk8S8oEeexfKc2E3OwJQ" key="Version" value="0.0.5"/>
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EAGk8i8oEeexfKc2E3OwJQ" key="Comment" value=""/>
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EAGk8y8oEeexfKc2E3OwJQ" key="Copyright" value=""/>
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EAGk9C8oEeexfKc2E3OwJQ" key="Date" value="2017-05-02"/>
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EAGk9S8oEeexfKc2E3OwJQ" key="Author" value=""/>
-      </eAnnotations>
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_L-0DIC0TEee42cCIRX36lw" source="http://www.eclipse.org/uml2/2.0.0/UML">
-        <references xmi:type="ecore:EPackage" href="expressionProfileWithoutURI.profile.uml#_AgGB4C8oEeexfKc2E3OwJQ"/>
-      </eAnnotations>
-      <appliedProfile xmi:type="uml:Profile" href="expressionProfileWithoutURI.profile.uml#_ozrgMCgyEeeoAJG6t_MwCA"/>
-    </profileApplication>
-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_xKl9QC0TEee42cCIRX36lw">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EAHzEC8oEeexfKc2E3OwJQ" source="PapyrusVersion">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EAHzES8oEeexfKc2E3OwJQ" key="Version" value="0.0.8"/>
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EAHzEi8oEeexfKc2E3OwJQ" key="Comment" value=""/>
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EAHzEy8oEeexfKc2E3OwJQ" key="Copyright" value=""/>
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EAHzFC8oEeexfKc2E3OwJQ" key="Date" value="2017-05-02"/>
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EAHzFS8oEeexfKc2E3OwJQ" key="Author" value=""/>
-      </eAnnotations>
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xKmkUC0TEee42cCIRX36lw" source="http://www.eclipse.org/uml2/2.0.0/UML">
-        <references xmi:type="ecore:EPackage" href="expressionProfileWithURI.profile.uml#_CjQMcC8oEeexfKc2E3OwJQ"/>
-      </eAnnotations>
-      <appliedProfile xmi:type="uml:Profile" href="expressionProfileWithURI.profile.uml#_ozrgMCgyEeeoAJG6t_MwCA"/>
-    </profileApplication>
-  </uml:Model>
-  <RootElement:ANiceStereotypeForElement xmi:id="_3objYC0TEee42cCIRX36lw" base_Element="_TK3aIC0TEee42cCIRX36lw"/>
-  <RootElement_1:ANiceStereotypeForElement xmi:id="_A6WasC0UEee42cCIRX36lw" base_Element="_UsJ70CgzEeeoAJG6t_MwCA"/>
-  <RootElement:ANiceStereotypeForProperty xmi:id="_0vazsC8oEeexfKc2E3OwJQ" base_Property="_V3npYCgzEeeoAJG6t_MwCA"/>
-</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:RootElement="http:///schemas/RootElement/_dHIWYLAiEee43bo6S9i5Mw/5" xmlns:RootElement_1="papyrusExpressionProfile" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http:///schemas/RootElement/_dHIWYLAiEee43bo6S9i5Mw/5 expressionProfileWithoutURI.profile.uml#_dHQ5QLAiEee43bo6S9i5Mw papyrusExpressionProfile expressionProfileWithURI.profile.uml#_CjQMcC8oEeexfKc2E3OwJQ">

+  <uml:Model xmi:id="_8TUvwCgyEeeoAJG6t_MwCA" name="RootElement">

+    <packagedElement xmi:type="uml:Class" xmi:id="_UsJ70CgzEeeoAJG6t_MwCA" name="StereotypedWithURIClass">

+      <ownedAttribute xmi:type="uml:Property" xmi:id="_V3npYCgzEeeoAJG6t_MwCA" name="StereotypedWithURIProperty" visibility="public"/>

+    </packagedElement>

+    <packagedElement xmi:type="uml:Class" xmi:id="_daTXsCgzEeeoAJG6t_MwCA" name="NoStereotypedClass"/>

+    <packagedElement xmi:type="uml:Class" xmi:id="_TK3aIC0TEee42cCIRX36lw" name="StereotypedWithoutURIClass"/>

+    <packagedElement xmi:type="uml:Class" xmi:id="_vI55wLAiEee43bo6S9i5Mw" name="StereotypedWithChildStereotype"/>

+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_L-vxsC0TEee42cCIRX36lw">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_9S7vgLAiEee43bo6S9i5Mw" source="PapyrusVersion">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_9S7vgbAiEee43bo6S9i5Mw" key="Version" value="0.0.6"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_9S7vgrAiEee43bo6S9i5Mw" key="Comment" value=""/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_9S7vg7AiEee43bo6S9i5Mw" key="Copyright" value=""/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_9S7vhLAiEee43bo6S9i5Mw" key="Date" value="2017-10-13"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_9S7vhbAiEee43bo6S9i5Mw" key="Author" value=""/>

+      </eAnnotations>

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

+        <references xmi:type="ecore:EPackage" href="expressionProfileWithoutURI.profile.uml#_dHQ5QLAiEee43bo6S9i5Mw"/>

+      </eAnnotations>

+      <appliedProfile xmi:type="uml:Profile" href="expressionProfileWithoutURI.profile.uml#_ozrgMCgyEeeoAJG6t_MwCA"/>

+    </profileApplication>

+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_xKl9QC0TEee42cCIRX36lw">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EAHzEC8oEeexfKc2E3OwJQ" source="PapyrusVersion">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EAHzES8oEeexfKc2E3OwJQ" key="Version" value="0.0.8"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EAHzEi8oEeexfKc2E3OwJQ" key="Comment" value=""/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EAHzEy8oEeexfKc2E3OwJQ" key="Copyright" value=""/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EAHzFC8oEeexfKc2E3OwJQ" key="Date" value="2017-05-02"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EAHzFS8oEeexfKc2E3OwJQ" key="Author" value=""/>

+      </eAnnotations>

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

+        <references xmi:type="ecore:EPackage" href="expressionProfileWithURI.profile.uml#_CjQMcC8oEeexfKc2E3OwJQ"/>

+      </eAnnotations>

+      <appliedProfile xmi:type="uml:Profile" href="expressionProfileWithURI.profile.uml#_ozrgMCgyEeeoAJG6t_MwCA"/>

+    </profileApplication>

+  </uml:Model>

+  <RootElement:ANiceStereotypeForElement xmi:id="_3objYC0TEee42cCIRX36lw" base_Element="_TK3aIC0TEee42cCIRX36lw"/>

+  <RootElement_1:ANiceStereotypeForElement xmi:id="_A6WasC0UEee42cCIRX36lw" base_Element="_UsJ70CgzEeeoAJG6t_MwCA"/>

+  <RootElement:ANiceStereotypeForProperty xmi:id="_0vazsC8oEeexfKc2E3OwJQ" base_Property="_V3npYCgzEeeoAJG6t_MwCA"/>

+  <RootElement:AChildNiceStereotypeForElement xmi:id="_BJua4LAjEee43bo6S9i5Mw" base_Element="_vI55wLAiEee43bo6S9i5Mw"/>

+</xmi:XMI>

diff --git a/tests/junit/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.tests/resources/expressionProfileWithoutURI.profile.notation b/tests/junit/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.tests/resources/expressionProfileWithoutURI.profile.notation
index c1ea329c48c..8e75cbea0a6 100755
--- a/tests/junit/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.tests/resources/expressionProfileWithoutURI.profile.notation
+++ b/tests/junit/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.tests/resources/expressionProfileWithoutURI.profile.notation
@@ -1,117 +1,144 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:gmfdiagrepresentation="http://www.eclipse.org/papyrus/infra/gmfdiag/representation" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/gmfdiag/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_o0MdkCgyEeeoAJG6t_MwCA" type="PapyrusUMLProfileDiagram" name="Profile Diagram" measurementUnit="Pixel">
-  <children xmi:type="notation:Shape" xmi:id="_tPCRMCgyEeeoAJG6t_MwCA" type="Class_MetaclassShape">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tPI-4CgyEeeoAJG6t_MwCA" source="Stereotype_Annotation">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tPI-4SgyEeeoAJG6t_MwCA" key="StereotypeWithQualifiedNameList" value=""/>
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tPI-4igyEeeoAJG6t_MwCA" key="StereotypeList" value="StandardProfile::Metaclass"/>
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tPI-4ygyEeeoAJG6t_MwCA" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tPI-5CgyEeeoAJG6t_MwCA" key="PropStereoDisplay" value=""/>
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tPI-5SgyEeeoAJG6t_MwCA" key="StereotypePropertyLocation" value="Compartment"/>
-    </eAnnotations>
-    <children xmi:type="notation:DecorationNode" xmi:id="_tPHwwCgyEeeoAJG6t_MwCA" type="Class_MetaclassNameLabel"/>
-    <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tPIX0CgyEeeoAJG6t_MwCA" x="80" y="60" width="201" height="61"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_tP8QICgyEeeoAJG6t_MwCA" type="StereotypeComment">
-    <styles xmi:type="notation:TitleStyle" xmi:id="_tP8QISgyEeeoAJG6t_MwCA"/>
-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_tP8QIygyEeeoAJG6t_MwCA" name="BASE_ELEMENT">
-      <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tP8QIigyEeeoAJG6t_MwCA" x="460" y="60"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_t8oXACgyEeeoAJG6t_MwCA" type="Stereotype_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_t8tPgCgyEeeoAJG6t_MwCA" type="Stereotype_NameLabel"/>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_t8tPgSgyEeeoAJG6t_MwCA" type="Stereotype_AttributeCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_t8tPgigyEeeoAJG6t_MwCA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_t8tPgygyEeeoAJG6t_MwCA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_t8tPhCgyEeeoAJG6t_MwCA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_t8tPhSgyEeeoAJG6t_MwCA"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_t8tPhigyEeeoAJG6t_MwCA" type="Stereotype_OperationCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_t8tPhygyEeeoAJG6t_MwCA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_t8tPiCgyEeeoAJG6t_MwCA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_t8tPiSgyEeeoAJG6t_MwCA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_t8tPiigyEeeoAJG6t_MwCA"/>
-    </children>
-    <element xmi:type="uml:Stereotype" href="expressionProfileWithoutURI.profile.uml#_t8ksoCgyEeeoAJG6t_MwCA"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_t8oXASgyEeeoAJG6t_MwCA" x="80" y="280" width="201"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_yoxWACgyEeeoAJG6t_MwCA" type="Stereotype_Shape">
-    <children xmi:type="notation:DecorationNode" xmi:id="_yox9ECgyEeeoAJG6t_MwCA" type="Stereotype_NameLabel"/>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_yox9ESgyEeeoAJG6t_MwCA" type="Stereotype_AttributeCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_yox9EigyEeeoAJG6t_MwCA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_yox9EygyEeeoAJG6t_MwCA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_yox9FCgyEeeoAJG6t_MwCA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yox9FSgyEeeoAJG6t_MwCA"/>
-    </children>
-    <children xmi:type="notation:BasicCompartment" xmi:id="_yox9FigyEeeoAJG6t_MwCA" type="Stereotype_OperationCompartment">
-      <styles xmi:type="notation:TitleStyle" xmi:id="_yox9FygyEeeoAJG6t_MwCA"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_yox9GCgyEeeoAJG6t_MwCA"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_yox9GSgyEeeoAJG6t_MwCA"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yox9GigyEeeoAJG6t_MwCA"/>
-    </children>
-    <element xmi:type="uml:Stereotype" href="expressionProfileWithoutURI.profile.uml#_yokhsCgyEeeoAJG6t_MwCA"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yoxWASgyEeeoAJG6t_MwCA" x="440" y="280" width="201"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_1_0KUCgyEeeoAJG6t_MwCA" type="Class_MetaclassShape">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1_0xYCgyEeeoAJG6t_MwCA" source="Stereotype_Annotation">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1_0xYSgyEeeoAJG6t_MwCA" key="StereotypeWithQualifiedNameList" value=""/>
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1_0xYigyEeeoAJG6t_MwCA" key="StereotypeList" value="StandardProfile::Metaclass"/>
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1_0xYygyEeeoAJG6t_MwCA" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1_0xZCgyEeeoAJG6t_MwCA" key="PropStereoDisplay" value=""/>
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1_0xZSgyEeeoAJG6t_MwCA" key="StereotypePropertyLocation" value="Compartment"/>
-    </eAnnotations>
-    <children xmi:type="notation:DecorationNode" xmi:id="_1_0KUigyEeeoAJG6t_MwCA" type="Class_MetaclassNameLabel"/>
-    <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1_0KUygyEeeoAJG6t_MwCA" x="440" y="60" width="201" height="61"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_1_-iYygyEeeoAJG6t_MwCA" type="StereotypeComment">
-    <styles xmi:type="notation:TitleStyle" xmi:id="_1_-iZCgyEeeoAJG6t_MwCA"/>
-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1_-iZigyEeeoAJG6t_MwCA" name="BASE_ELEMENT">
-      <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1_-iZSgyEeeoAJG6t_MwCA" x="700" y="60"/>
-  </children>
-  <styles xmi:type="notation:StringValueStyle" xmi:id="_o0MdkSgyEeeoAJG6t_MwCA" name="diagram_compatibility_version" stringValue="1.3.0"/>
-  <styles xmi:type="notation:DiagramStyle" xmi:id="_o0MdkigyEeeoAJG6t_MwCA"/>
-  <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_o0MdkygyEeeoAJG6t_MwCA" diagramKindId="org.eclipse.papyrus.uml.diagram.profile">
-    <owner xmi:type="uml:Profile" href="expressionProfileWithoutURI.profile.uml#_ozrgMCgyEeeoAJG6t_MwCA"/>
-  </styles>
-  <element xmi:type="uml:Profile" href="expressionProfileWithoutURI.profile.uml#_ozrgMCgyEeeoAJG6t_MwCA"/>
-  <edges xmi:type="notation:Connector" xmi:id="_tP83MCgyEeeoAJG6t_MwCA" type="StereotypeCommentLink" source="_tPCRMCgyEeeoAJG6t_MwCA" target="_tP8QICgyEeeoAJG6t_MwCA">
-    <styles xmi:type="notation:FontStyle" xmi:id="_tP83MSgyEeeoAJG6t_MwCA"/>
-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_tP9eQSgyEeeoAJG6t_MwCA" name="BASE_ELEMENT">
-      <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_tP83MigyEeeoAJG6t_MwCA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tP83MygyEeeoAJG6t_MwCA"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tP9eQCgyEeeoAJG6t_MwCA"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_1_-iZygyEeeoAJG6t_MwCA" type="StereotypeCommentLink" source="_1_0KUCgyEeeoAJG6t_MwCA" target="_1_-iYygyEeeoAJG6t_MwCA">
-    <styles xmi:type="notation:FontStyle" xmi:id="_1_-iaCgyEeeoAJG6t_MwCA"/>
-    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1__JcCgyEeeoAJG6t_MwCA" name="BASE_ELEMENT">
-      <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>
-    </styles>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1_-iaSgyEeeoAJG6t_MwCA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1_-iaigyEeeoAJG6t_MwCA"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1_-iaygyEeeoAJG6t_MwCA"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_3g-bECgyEeeoAJG6t_MwCA" type="Extension_Edge" source="_t8oXACgyEeeoAJG6t_MwCA" target="_tPCRMCgyEeeoAJG6t_MwCA">
-    <styles xmi:type="notation:FontStyle" xmi:id="_3g-bESgyEeeoAJG6t_MwCA"/>
-    <element xmi:type="uml:Extension" href="expressionProfileWithoutURI.profile.uml#_3gxmwCgyEeeoAJG6t_MwCA"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3g-bEigyEeeoAJG6t_MwCA" points="[140, 280, -643984, -643984]$[140, 110, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3hUZUCgyEeeoAJG6t_MwCA" id="(0.4975124378109453,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3hUZUSgyEeeoAJG6t_MwCA" id="(0.4975124378109453,1.0)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_4GY1QCgyEeeoAJG6t_MwCA" type="Extension_Edge" source="_yoxWACgyEeeoAJG6t_MwCA" target="_1_0KUCgyEeeoAJG6t_MwCA">
-    <styles xmi:type="notation:FontStyle" xmi:id="_4GY1QSgyEeeoAJG6t_MwCA"/>
-    <element xmi:type="uml:Extension" href="expressionProfileWithoutURI.profile.uml#_4GMA8CgyEeeoAJG6t_MwCA"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_4GY1QigyEeeoAJG6t_MwCA" points="[500, 280, -643984, -643984]$[500, 110, -643984, -643984]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4Gm3sCgyEeeoAJG6t_MwCA" id="(0.4975124378109453,0.0)"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4Gm3sSgyEeeoAJG6t_MwCA" id="(0.4975124378109453,1.0)"/>
-  </edges>
-</notation:Diagram>
+<?xml version="1.0" encoding="UTF-8"?>

+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/gmfdiag/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_o0MdkCgyEeeoAJG6t_MwCA" type="PapyrusUMLProfileDiagram" name="Profile Diagram" measurementUnit="Pixel">

+  <children xmi:type="notation:Shape" xmi:id="_tPCRMCgyEeeoAJG6t_MwCA" type="Class_MetaclassShape">

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tPI-4CgyEeeoAJG6t_MwCA" source="Stereotype_Annotation">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tPI-4SgyEeeoAJG6t_MwCA" key="StereotypeWithQualifiedNameList" value=""/>

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tPI-4igyEeeoAJG6t_MwCA" key="StereotypeList" value="StandardProfile::Metaclass"/>

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tPI-4ygyEeeoAJG6t_MwCA" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tPI-5CgyEeeoAJG6t_MwCA" key="PropStereoDisplay" value=""/>

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tPI-5SgyEeeoAJG6t_MwCA" key="StereotypePropertyLocation" value="Compartment"/>

+    </eAnnotations>

+    <children xmi:type="notation:DecorationNode" xmi:id="_tPHwwCgyEeeoAJG6t_MwCA" type="Class_MetaclassNameLabel"/>

+    <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tPIX0CgyEeeoAJG6t_MwCA" x="80" y="60" width="201" height="61"/>

+  </children>

+  <children xmi:type="notation:Shape" xmi:id="_tP8QICgyEeeoAJG6t_MwCA" type="StereotypeComment">

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

+    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_tP8QIygyEeeoAJG6t_MwCA" name="BASE_ELEMENT">

+      <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/>

+    </styles>

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

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tP8QIigyEeeoAJG6t_MwCA" x="460" y="60"/>

+  </children>

+  <children xmi:type="notation:Shape" xmi:id="_t8oXACgyEeeoAJG6t_MwCA" type="Stereotype_Shape">

+    <children xmi:type="notation:DecorationNode" xmi:id="_t8tPgCgyEeeoAJG6t_MwCA" type="Stereotype_NameLabel"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_t8tPgSgyEeeoAJG6t_MwCA" type="Stereotype_AttributeCompartment">

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

+      <styles xmi:type="notation:SortingStyle" xmi:id="_t8tPgygyEeeoAJG6t_MwCA"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_t8tPhCgyEeeoAJG6t_MwCA"/>

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

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_t8tPhigyEeeoAJG6t_MwCA" type="Stereotype_OperationCompartment">

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

+      <styles xmi:type="notation:SortingStyle" xmi:id="_t8tPiCgyEeeoAJG6t_MwCA"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_t8tPiSgyEeeoAJG6t_MwCA"/>

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

+    </children>

+    <element xmi:type="uml:Stereotype" href="expressionProfileWithoutURI.profile.uml#_t8ksoCgyEeeoAJG6t_MwCA"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_t8oXASgyEeeoAJG6t_MwCA" x="80" y="280" width="201"/>

+  </children>

+  <children xmi:type="notation:Shape" xmi:id="_yoxWACgyEeeoAJG6t_MwCA" type="Stereotype_Shape">

+    <children xmi:type="notation:DecorationNode" xmi:id="_yox9ECgyEeeoAJG6t_MwCA" type="Stereotype_NameLabel"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_yox9ESgyEeeoAJG6t_MwCA" type="Stereotype_AttributeCompartment">

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

+      <styles xmi:type="notation:SortingStyle" xmi:id="_yox9EygyEeeoAJG6t_MwCA"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_yox9FCgyEeeoAJG6t_MwCA"/>

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

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_yox9FigyEeeoAJG6t_MwCA" type="Stereotype_OperationCompartment">

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

+      <styles xmi:type="notation:SortingStyle" xmi:id="_yox9GCgyEeeoAJG6t_MwCA"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_yox9GSgyEeeoAJG6t_MwCA"/>

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

+    </children>

+    <element xmi:type="uml:Stereotype" href="expressionProfileWithoutURI.profile.uml#_yokhsCgyEeeoAJG6t_MwCA"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yoxWASgyEeeoAJG6t_MwCA" x="440" y="280" width="201"/>

+  </children>

+  <children xmi:type="notation:Shape" xmi:id="_1_0KUCgyEeeoAJG6t_MwCA" type="Class_MetaclassShape">

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_1_0xYCgyEeeoAJG6t_MwCA" source="Stereotype_Annotation">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1_0xYSgyEeeoAJG6t_MwCA" key="StereotypeWithQualifiedNameList" value=""/>

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1_0xYigyEeeoAJG6t_MwCA" key="StereotypeList" value="StandardProfile::Metaclass"/>

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1_0xYygyEeeoAJG6t_MwCA" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1_0xZCgyEeeoAJG6t_MwCA" key="PropStereoDisplay" value=""/>

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_1_0xZSgyEeeoAJG6t_MwCA" key="StereotypePropertyLocation" value="Compartment"/>

+    </eAnnotations>

+    <children xmi:type="notation:DecorationNode" xmi:id="_1_0KUigyEeeoAJG6t_MwCA" type="Class_MetaclassNameLabel"/>

+    <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1_0KUygyEeeoAJG6t_MwCA" x="440" y="60" width="201" height="61"/>

+  </children>

+  <children xmi:type="notation:Shape" xmi:id="_1_-iYygyEeeoAJG6t_MwCA" type="StereotypeComment">

+    <styles xmi:type="notation:TitleStyle" xmi:id="_1_-iZCgyEeeoAJG6t_MwCA"/>

+    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1_-iZigyEeeoAJG6t_MwCA" name="BASE_ELEMENT">

+      <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>

+    </styles>

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

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1_-iZSgyEeeoAJG6t_MwCA" x="700" y="60"/>

+  </children>

+  <children xmi:type="notation:Shape" xmi:id="_WW-4QLAiEee43bo6S9i5Mw" type="Stereotype_Shape">

+    <children xmi:type="notation:DecorationNode" xmi:id="_WXDwwLAiEee43bo6S9i5Mw" type="Stereotype_NameLabel"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_WXDwwbAiEee43bo6S9i5Mw" type="Stereotype_AttributeCompartment">

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

+      <styles xmi:type="notation:SortingStyle" xmi:id="_WXDww7AiEee43bo6S9i5Mw"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_WXDwxLAiEee43bo6S9i5Mw"/>

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

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_WXEX0LAiEee43bo6S9i5Mw" type="Stereotype_OperationCompartment">

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

+      <styles xmi:type="notation:SortingStyle" xmi:id="_WXEX0rAiEee43bo6S9i5Mw"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_WXEX07AiEee43bo6S9i5Mw"/>

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

+    </children>

+    <element xmi:type="uml:Stereotype" href="expressionProfileWithoutURI.profile.uml#_WW0gMLAiEee43bo6S9i5Mw"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WW-4QbAiEee43bo6S9i5Mw" x="80" y="520" width="201"/>

+  </children>

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

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

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

+    <owner xmi:type="uml:Profile" href="expressionProfileWithoutURI.profile.uml#_ozrgMCgyEeeoAJG6t_MwCA"/>

+  </styles>

+  <element xmi:type="uml:Profile" href="expressionProfileWithoutURI.profile.uml#_ozrgMCgyEeeoAJG6t_MwCA"/>

+  <edges xmi:type="notation:Connector" xmi:id="_tP83MCgyEeeoAJG6t_MwCA" type="StereotypeCommentLink" source="_tPCRMCgyEeeoAJG6t_MwCA" target="_tP8QICgyEeeoAJG6t_MwCA">

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

+    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_tP9eQSgyEeeoAJG6t_MwCA" name="BASE_ELEMENT">

+      <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/>

+    </styles>

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

+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_tP83MigyEeeoAJG6t_MwCA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tP83MygyEeeoAJG6t_MwCA"/>

+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tP9eQCgyEeeoAJG6t_MwCA"/>

+  </edges>

+  <edges xmi:type="notation:Connector" xmi:id="_1_-iZygyEeeoAJG6t_MwCA" type="StereotypeCommentLink" source="_1_0KUCgyEeeoAJG6t_MwCA" target="_1_-iYygyEeeoAJG6t_MwCA">

+    <styles xmi:type="notation:FontStyle" xmi:id="_1_-iaCgyEeeoAJG6t_MwCA"/>

+    <styles xmi:type="notation:EObjectValueStyle" xmi:id="_1__JcCgyEeeoAJG6t_MwCA" name="BASE_ELEMENT">

+      <eObjectValue xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>

+    </styles>

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

+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1_-iaSgyEeeoAJG6t_MwCA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>

+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1_-iaigyEeeoAJG6t_MwCA"/>

+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1_-iaygyEeeoAJG6t_MwCA"/>

+  </edges>

+  <edges xmi:type="notation:Connector" xmi:id="_3g-bECgyEeeoAJG6t_MwCA" type="Extension_Edge" source="_t8oXACgyEeeoAJG6t_MwCA" target="_tPCRMCgyEeeoAJG6t_MwCA">

+    <styles xmi:type="notation:FontStyle" xmi:id="_3g-bESgyEeeoAJG6t_MwCA"/>

+    <element xmi:type="uml:Extension" href="expressionProfileWithoutURI.profile.uml#_3gxmwCgyEeeoAJG6t_MwCA"/>

+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3g-bEigyEeeoAJG6t_MwCA" points="[140, 280, -643984, -643984]$[140, 110, -643984, -643984]"/>

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

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

+  </edges>

+  <edges xmi:type="notation:Connector" xmi:id="_4GY1QCgyEeeoAJG6t_MwCA" type="Extension_Edge" source="_yoxWACgyEeeoAJG6t_MwCA" target="_1_0KUCgyEeeoAJG6t_MwCA">

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

+    <element xmi:type="uml:Extension" href="expressionProfileWithoutURI.profile.uml#_4GMA8CgyEeeoAJG6t_MwCA"/>

+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_4GY1QigyEeeoAJG6t_MwCA" points="[500, 280, -643984, -643984]$[500, 110, -643984, -643984]"/>

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

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

+  </edges>

+  <edges xmi:type="notation:Connector" xmi:id="_Xeq5ELAiEee43bo6S9i5Mw" type="Generalization_Edge" source="_WW-4QLAiEee43bo6S9i5Mw" target="_t8oXACgyEeeoAJG6t_MwCA">

+    <children xmi:type="notation:DecorationNode" xmi:id="_XergILAiEee43bo6S9i5Mw" type="Generalization_StereotypeLabel">

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

+    </children>

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

+    <element xmi:type="uml:Generalization" href="expressionProfileWithoutURI.profile.uml#_XeTssLAiEee43bo6S9i5Mw"/>

+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Xeq5ErAiEee43bo6S9i5Mw" points="[160, 520, -643984, -643984]$[160, 380, -643984, -643984]"/>

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

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

+  </edges>

+</notation:Diagram>

diff --git a/tests/junit/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.tests/resources/expressionProfileWithoutURI.profile.uml b/tests/junit/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.tests/resources/expressionProfileWithoutURI.profile.uml
index 80f816e44a9..f4f8c0089ba 100755
--- a/tests/junit/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.tests/resources/expressionProfileWithoutURI.profile.uml
+++ b/tests/junit/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.tests/resources/expressionProfileWithoutURI.profile.uml
@@ -1,132 +1,159 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<uml:Profile xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_ozrgMCgyEeeoAJG6t_MwCA" name="RootElement" metaclassReference="_tOxygCgyEeeoAJG6t_MwCA _1_y8MCgyEeeoAJG6t_MwCA">
-  <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_41FuUCgyEeeoAJG6t_MwCA" source="http://www.eclipse.org/uml2/2.0.0/UML">
-    <contents xmi:type="ecore:EPackage" xmi:id="_AgGB4C8oEeexfKc2E3OwJQ" name="RootElement" nsURI="http:///schemas/RootElement/_AgCXgC8oEeexfKc2E3OwJQ/4" nsPrefix="RootElement">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_AgH3Ei8oEeexfKc2E3OwJQ" source="PapyrusVersion">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_AgIeIC8oEeexfKc2E3OwJQ" key="Version" value="0.0.5"/>
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_AgIeIS8oEeexfKc2E3OwJQ" key="Comment" value=""/>
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_AgIeIi8oEeexfKc2E3OwJQ" key="Copyright" value=""/>
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_AgIeIy8oEeexfKc2E3OwJQ" key="Date" value="2017-05-02"/>
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_AgIeJC8oEeexfKc2E3OwJQ" key="Author" value=""/>
-      </eAnnotations>
-      <eClassifiers xmi:type="ecore:EClass" xmi:id="_AgGB4S8oEeexfKc2E3OwJQ" name="ANiceStereotypeForElement">
-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_AgGB4i8oEeexfKc2E3OwJQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_t8ksoCgyEeeoAJG6t_MwCA"/>
-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_AgGB4y8oEeexfKc2E3OwJQ" name="base_Element" ordered="false" lowerBound="1">
-          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-        </eStructuralFeatures>
-      </eClassifiers>
-      <eClassifiers xmi:type="ecore:EClass" xmi:id="_AgGB5S8oEeexfKc2E3OwJQ" name="ANiceStereotypeForProperty">
-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_AgGB5i8oEeexfKc2E3OwJQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_yokhsCgyEeeoAJG6t_MwCA"/>
-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_AgGB5y8oEeexfKc2E3OwJQ" name="base_Property" ordered="false" lowerBound="1">
-          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-        </eStructuralFeatures>
-      </eClassifiers>
-    </contents>
-    <contents xmi:type="ecore:EPackage" xmi:id="_uDXtoC0TEee42cCIRX36lw" name="ProfileWithoutURI" nsURI="http:///schemas/ProfileWithoutURI/_uDXGkC0TEee42cCIRX36lw/3" nsPrefix="ProfileWithoutURI">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uDYUsS0TEee42cCIRX36lw" source="PapyrusVersion">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uDYUsi0TEee42cCIRX36lw" key="Version" value="0.0.4"/>
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uDYUsy0TEee42cCIRX36lw" key="Comment" value=""/>
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uDYUtC0TEee42cCIRX36lw" key="Copyright" value=""/>
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uDYUtS0TEee42cCIRX36lw" key="Date" value="2017-04-29"/>
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uDYUti0TEee42cCIRX36lw" key="Author" value=""/>
-      </eAnnotations>
-      <eClassifiers xmi:type="ecore:EClass" xmi:id="_uDXtoS0TEee42cCIRX36lw" name="ANiceStereotypeForElement">
-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uDXtoi0TEee42cCIRX36lw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_t8ksoCgyEeeoAJG6t_MwCA"/>
-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_uDXtoy0TEee42cCIRX36lw" name="base_Element" ordered="false" lowerBound="1">
-          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-        </eStructuralFeatures>
-      </eClassifiers>
-      <eClassifiers xmi:type="ecore:EClass" xmi:id="_uDXtpS0TEee42cCIRX36lw" name="ANiceStereotypeForProperty">
-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uDXtpi0TEee42cCIRX36lw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_yokhsCgyEeeoAJG6t_MwCA"/>
-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_uDXtpy0TEee42cCIRX36lw" name="base_Property" ordered="false" lowerBound="1">
-          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-        </eStructuralFeatures>
-      </eClassifiers>
-    </contents>
-    <contents xmi:type="ecore:EPackage" xmi:id="_8NYKsC0SEee42cCIRX36lw" name="ProfileWithoutNsURI" nsURI="http:///schemas/ProfileWithoutNsURI/_8NWVgC0SEee42cCIRX36lw/2" nsPrefix="ProfileWithoutNsURI">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8Nam8S0SEee42cCIRX36lw" source="PapyrusVersion">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8Nam8i0SEee42cCIRX36lw" key="Version" value="0.0.3"/>
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8Nam8y0SEee42cCIRX36lw" key="Comment" value=""/>
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8Nam9C0SEee42cCIRX36lw" key="Copyright" value=""/>
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8Nam9S0SEee42cCIRX36lw" key="Date" value="2017-04-29"/>
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8Nam9i0SEee42cCIRX36lw" key="Author" value=""/>
-      </eAnnotations>
-      <eClassifiers xmi:type="ecore:EClass" xmi:id="_8NYKsS0SEee42cCIRX36lw" name="ANiceStereotypeForElement">
-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8NYKsi0SEee42cCIRX36lw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_t8ksoCgyEeeoAJG6t_MwCA"/>
-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_8NYKsy0SEee42cCIRX36lw" name="base_Element" ordered="false" lowerBound="1">
-          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-        </eStructuralFeatures>
-      </eClassifiers>
-      <eClassifiers xmi:type="ecore:EClass" xmi:id="_8NYKtS0SEee42cCIRX36lw" name="ANiceStereotypeForProperty">
-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8NYKti0SEee42cCIRX36lw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_yokhsCgyEeeoAJG6t_MwCA"/>
-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_8NYKty0SEee42cCIRX36lw" name="base_Property" ordered="false" lowerBound="1">
-          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-        </eStructuralFeatures>
-      </eClassifiers>
-    </contents>
-    <contents xmi:type="ecore:EPackage" xmi:id="_PrrrkSgzEeeoAJG6t_MwCA" name="RootElement" nsURI="http:///schemas/RootElement/_PrrrkCgzEeeoAJG6t_MwCA/1" nsPrefix="RootElement">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PrsSoigzEeeoAJG6t_MwCA" source="PapyrusVersion">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PrsSoygzEeeoAJG6t_MwCA" key="Version" value="0.0.2"/>
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PrsSpCgzEeeoAJG6t_MwCA" key="Comment" value=""/>
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PrsSpSgzEeeoAJG6t_MwCA" key="Copyright" value=""/>
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PrsSpigzEeeoAJG6t_MwCA" key="Date" value="2017-04-23"/>
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PrsSpygzEeeoAJG6t_MwCA" key="Author" value=""/>
-      </eAnnotations>
-      <eClassifiers xmi:type="ecore:EClass" xmi:id="_PrrrkigzEeeoAJG6t_MwCA" name="ANiceStereotypeForElement">
-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PrrrkygzEeeoAJG6t_MwCA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_t8ksoCgyEeeoAJG6t_MwCA"/>
-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_PrrrlCgzEeeoAJG6t_MwCA" name="base_Element" ordered="false" lowerBound="1">
-          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-        </eStructuralFeatures>
-      </eClassifiers>
-      <eClassifiers xmi:type="ecore:EClass" xmi:id="_PrrrligzEeeoAJG6t_MwCA" name="ANiceStereotypeForProperty">
-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PrrrlygzEeeoAJG6t_MwCA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_yokhsCgyEeeoAJG6t_MwCA"/>
-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_PrrrmCgzEeeoAJG6t_MwCA" name="base_Property" ordered="false" lowerBound="1">
-          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-        </eStructuralFeatures>
-      </eClassifiers>
-    </contents>
-    <contents xmi:type="ecore:EPackage" xmi:id="_41FuUSgyEeeoAJG6t_MwCA" name="RootElement" nsURI="http:///schemas/RootElement/_41CrACgyEeeoAJG6t_MwCA/0" nsPrefix="RootElement">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_41HjgigyEeeoAJG6t_MwCA" source="PapyrusVersion">
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_41HjgygyEeeoAJG6t_MwCA" key="Version" value="0.0.1"/>
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_41HjhCgyEeeoAJG6t_MwCA" key="Comment" value=""/>
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_41HjhSgyEeeoAJG6t_MwCA" key="Copyright" value=""/>
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_41HjhigyEeeoAJG6t_MwCA" key="Date" value="2017-04-23"/>
-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_41HjhygyEeeoAJG6t_MwCA" key="Author" value=""/>
-      </eAnnotations>
-      <eClassifiers xmi:type="ecore:EClass" xmi:id="_41FuUigyEeeoAJG6t_MwCA" name="ANiceStereotypeForElement">
-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_41FuUygyEeeoAJG6t_MwCA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_t8ksoCgyEeeoAJG6t_MwCA"/>
-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_41FuVCgyEeeoAJG6t_MwCA" name="base_Element" ordered="false" lowerBound="1">
-          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>
-        </eStructuralFeatures>
-      </eClassifiers>
-      <eClassifiers xmi:type="ecore:EClass" xmi:id="_41FuVigyEeeoAJG6t_MwCA" name="ANiceStereotypeForProperty">
-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_41FuVygyEeeoAJG6t_MwCA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_yokhsCgyEeeoAJG6t_MwCA"/>
-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_41FuWCgyEeeoAJG6t_MwCA" name="base_Property" ordered="false" lowerBound="1">
-          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>
-        </eStructuralFeatures>
-      </eClassifiers>
-    </contents>
-  </eAnnotations>
-  <elementImport xmi:type="uml:ElementImport" xmi:id="_tOxygCgyEeeoAJG6t_MwCA" alias="Element">
-    <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/>
-  </elementImport>
-  <elementImport xmi:type="uml:ElementImport" xmi:id="_1_y8MCgyEeeoAJG6t_MwCA" alias="Property">
-    <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>
-  </elementImport>
-  <packagedElement xmi:type="uml:Stereotype" xmi:id="_t8ksoCgyEeeoAJG6t_MwCA" name="ANiceStereotypeForElement">
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_3g1RISgyEeeoAJG6t_MwCA" name="base_Element" association="_3gxmwCgyEeeoAJG6t_MwCA">
-      <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/>
-    </ownedAttribute>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Stereotype" xmi:id="_yokhsCgyEeeoAJG6t_MwCA" name="ANiceStereotypeForProperty">
-    <ownedAttribute xmi:type="uml:Property" xmi:id="_4GNPECgyEeeoAJG6t_MwCA" name="base_Property" association="_4GMA8CgyEeeoAJG6t_MwCA">
-      <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>
-    </ownedAttribute>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Extension" xmi:id="_3gxmwCgyEeeoAJG6t_MwCA" name="E_ANiceStereotypeForElement_Element1" memberEnd="_3g1RICgyEeeoAJG6t_MwCA _3g1RISgyEeeoAJG6t_MwCA">
-    <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_3g1RICgyEeeoAJG6t_MwCA" name="extension_ANiceStereotypeForElement" type="_t8ksoCgyEeeoAJG6t_MwCA" aggregation="composite" association="_3gxmwCgyEeeoAJG6t_MwCA"/>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Extension" xmi:id="_4GMA8CgyEeeoAJG6t_MwCA" name="E_ANiceStereotypeForProperty_Property1" memberEnd="_4GMoACgyEeeoAJG6t_MwCA _4GNPECgyEeeoAJG6t_MwCA">
-    <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_4GMoACgyEeeoAJG6t_MwCA" name="extension_ANiceStereotypeForProperty" type="_yokhsCgyEeeoAJG6t_MwCA" aggregation="composite" association="_4GMA8CgyEeeoAJG6t_MwCA"/>
-  </packagedElement>
-</uml:Profile>
+<?xml version="1.0" encoding="UTF-8"?>

+<uml:Profile xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_ozrgMCgyEeeoAJG6t_MwCA" name="RootElement" metaclassReference="_tOxygCgyEeeoAJG6t_MwCA _1_y8MCgyEeeoAJG6t_MwCA">

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

+    <contents xmi:type="ecore:EPackage" xmi:id="_dHQ5QLAiEee43bo6S9i5Mw" name="RootElement" nsURI="http:///schemas/RootElement/_dHIWYLAiEee43bo6S9i5Mw/5" nsPrefix="RootElement">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_dHT8kLAiEee43bo6S9i5Mw" source="PapyrusVersion">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_dHT8kbAiEee43bo6S9i5Mw" key="Version" value="0.0.6"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_dHT8krAiEee43bo6S9i5Mw" key="Comment" value=""/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_dHT8k7AiEee43bo6S9i5Mw" key="Copyright" value=""/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_dHT8lLAiEee43bo6S9i5Mw" key="Date" value="2017-10-13"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_dHT8lbAiEee43bo6S9i5Mw" key="Author" value=""/>

+      </eAnnotations>

+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_dHQ5QbAiEee43bo6S9i5Mw" name="ANiceStereotypeForElement">

+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_dHQ5QrAiEee43bo6S9i5Mw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_t8ksoCgyEeeoAJG6t_MwCA"/>

+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_dHQ5Q7AiEee43bo6S9i5Mw" name="base_Element" ordered="false" lowerBound="1">

+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>

+        </eStructuralFeatures>

+      </eClassifiers>

+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_dHQ5RbAiEee43bo6S9i5Mw" name="ANiceStereotypeForProperty">

+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_dHQ5RrAiEee43bo6S9i5Mw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_yokhsCgyEeeoAJG6t_MwCA"/>

+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_dHQ5R7AiEee43bo6S9i5Mw" name="base_Property" ordered="false" lowerBound="1">

+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>

+        </eStructuralFeatures>

+      </eClassifiers>

+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_dHQ5SbAiEee43bo6S9i5Mw" name="AChildNiceStereotypeForElement" eSuperTypes="_dHQ5QbAiEee43bo6S9i5Mw">

+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_dHQ5SrAiEee43bo6S9i5Mw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_WW0gMLAiEee43bo6S9i5Mw"/>

+      </eClassifiers>

+    </contents>

+    <contents xmi:type="ecore:EPackage" xmi:id="_AgGB4C8oEeexfKc2E3OwJQ" name="RootElement" nsURI="http:///schemas/RootElement/_AgCXgC8oEeexfKc2E3OwJQ/4" nsPrefix="RootElement">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_AgH3Ei8oEeexfKc2E3OwJQ" source="PapyrusVersion">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_AgIeIC8oEeexfKc2E3OwJQ" key="Version" value="0.0.5"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_AgIeIS8oEeexfKc2E3OwJQ" key="Comment" value=""/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_AgIeIi8oEeexfKc2E3OwJQ" key="Copyright" value=""/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_AgIeIy8oEeexfKc2E3OwJQ" key="Date" value="2017-05-02"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_AgIeJC8oEeexfKc2E3OwJQ" key="Author" value=""/>

+      </eAnnotations>

+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_AgGB4S8oEeexfKc2E3OwJQ" name="ANiceStereotypeForElement">

+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_AgGB4i8oEeexfKc2E3OwJQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_t8ksoCgyEeeoAJG6t_MwCA"/>

+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_AgGB4y8oEeexfKc2E3OwJQ" name="base_Element" ordered="false" lowerBound="1">

+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>

+        </eStructuralFeatures>

+      </eClassifiers>

+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_AgGB5S8oEeexfKc2E3OwJQ" name="ANiceStereotypeForProperty">

+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_AgGB5i8oEeexfKc2E3OwJQ" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_yokhsCgyEeeoAJG6t_MwCA"/>

+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_AgGB5y8oEeexfKc2E3OwJQ" name="base_Property" ordered="false" lowerBound="1">

+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>

+        </eStructuralFeatures>

+      </eClassifiers>

+    </contents>

+    <contents xmi:type="ecore:EPackage" xmi:id="_uDXtoC0TEee42cCIRX36lw" name="ProfileWithoutURI" nsURI="http:///schemas/ProfileWithoutURI/_uDXGkC0TEee42cCIRX36lw/3" nsPrefix="ProfileWithoutURI">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uDYUsS0TEee42cCIRX36lw" source="PapyrusVersion">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uDYUsi0TEee42cCIRX36lw" key="Version" value="0.0.4"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uDYUsy0TEee42cCIRX36lw" key="Comment" value=""/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uDYUtC0TEee42cCIRX36lw" key="Copyright" value=""/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uDYUtS0TEee42cCIRX36lw" key="Date" value="2017-04-29"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_uDYUti0TEee42cCIRX36lw" key="Author" value=""/>

+      </eAnnotations>

+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_uDXtoS0TEee42cCIRX36lw" name="ANiceStereotypeForElement">

+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uDXtoi0TEee42cCIRX36lw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_t8ksoCgyEeeoAJG6t_MwCA"/>

+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_uDXtoy0TEee42cCIRX36lw" name="base_Element" ordered="false" lowerBound="1">

+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>

+        </eStructuralFeatures>

+      </eClassifiers>

+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_uDXtpS0TEee42cCIRX36lw" name="ANiceStereotypeForProperty">

+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_uDXtpi0TEee42cCIRX36lw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_yokhsCgyEeeoAJG6t_MwCA"/>

+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_uDXtpy0TEee42cCIRX36lw" name="base_Property" ordered="false" lowerBound="1">

+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>

+        </eStructuralFeatures>

+      </eClassifiers>

+    </contents>

+    <contents xmi:type="ecore:EPackage" xmi:id="_8NYKsC0SEee42cCIRX36lw" name="ProfileWithoutNsURI" nsURI="http:///schemas/ProfileWithoutNsURI/_8NWVgC0SEee42cCIRX36lw/2" nsPrefix="ProfileWithoutNsURI">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8Nam8S0SEee42cCIRX36lw" source="PapyrusVersion">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8Nam8i0SEee42cCIRX36lw" key="Version" value="0.0.3"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8Nam8y0SEee42cCIRX36lw" key="Comment" value=""/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8Nam9C0SEee42cCIRX36lw" key="Copyright" value=""/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8Nam9S0SEee42cCIRX36lw" key="Date" value="2017-04-29"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8Nam9i0SEee42cCIRX36lw" key="Author" value=""/>

+      </eAnnotations>

+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_8NYKsS0SEee42cCIRX36lw" name="ANiceStereotypeForElement">

+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8NYKsi0SEee42cCIRX36lw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_t8ksoCgyEeeoAJG6t_MwCA"/>

+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_8NYKsy0SEee42cCIRX36lw" name="base_Element" ordered="false" lowerBound="1">

+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>

+        </eStructuralFeatures>

+      </eClassifiers>

+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_8NYKtS0SEee42cCIRX36lw" name="ANiceStereotypeForProperty">

+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8NYKti0SEee42cCIRX36lw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_yokhsCgyEeeoAJG6t_MwCA"/>

+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_8NYKty0SEee42cCIRX36lw" name="base_Property" ordered="false" lowerBound="1">

+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>

+        </eStructuralFeatures>

+      </eClassifiers>

+    </contents>

+    <contents xmi:type="ecore:EPackage" xmi:id="_PrrrkSgzEeeoAJG6t_MwCA" name="RootElement" nsURI="http:///schemas/RootElement/_PrrrkCgzEeeoAJG6t_MwCA/1" nsPrefix="RootElement">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PrsSoigzEeeoAJG6t_MwCA" source="PapyrusVersion">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PrsSoygzEeeoAJG6t_MwCA" key="Version" value="0.0.2"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PrsSpCgzEeeoAJG6t_MwCA" key="Comment" value=""/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PrsSpSgzEeeoAJG6t_MwCA" key="Copyright" value=""/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PrsSpigzEeeoAJG6t_MwCA" key="Date" value="2017-04-23"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_PrsSpygzEeeoAJG6t_MwCA" key="Author" value=""/>

+      </eAnnotations>

+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_PrrrkigzEeeoAJG6t_MwCA" name="ANiceStereotypeForElement">

+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PrrrkygzEeeoAJG6t_MwCA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_t8ksoCgyEeeoAJG6t_MwCA"/>

+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_PrrrlCgzEeeoAJG6t_MwCA" name="base_Element" ordered="false" lowerBound="1">

+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>

+        </eStructuralFeatures>

+      </eClassifiers>

+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_PrrrligzEeeoAJG6t_MwCA" name="ANiceStereotypeForProperty">

+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_PrrrlygzEeeoAJG6t_MwCA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_yokhsCgyEeeoAJG6t_MwCA"/>

+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_PrrrmCgzEeeoAJG6t_MwCA" name="base_Property" ordered="false" lowerBound="1">

+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>

+        </eStructuralFeatures>

+      </eClassifiers>

+    </contents>

+    <contents xmi:type="ecore:EPackage" xmi:id="_41FuUSgyEeeoAJG6t_MwCA" name="RootElement" nsURI="http:///schemas/RootElement/_41CrACgyEeeoAJG6t_MwCA/0" nsPrefix="RootElement">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_41HjgigyEeeoAJG6t_MwCA" source="PapyrusVersion">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_41HjgygyEeeoAJG6t_MwCA" key="Version" value="0.0.1"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_41HjhCgyEeeoAJG6t_MwCA" key="Comment" value=""/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_41HjhSgyEeeoAJG6t_MwCA" key="Copyright" value=""/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_41HjhigyEeeoAJG6t_MwCA" key="Date" value="2017-04-23"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_41HjhygyEeeoAJG6t_MwCA" key="Author" value=""/>

+      </eAnnotations>

+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_41FuUigyEeeoAJG6t_MwCA" name="ANiceStereotypeForElement">

+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_41FuUygyEeeoAJG6t_MwCA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_t8ksoCgyEeeoAJG6t_MwCA"/>

+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_41FuVCgyEeeoAJG6t_MwCA" name="base_Element" ordered="false" lowerBound="1">

+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element"/>

+        </eStructuralFeatures>

+      </eClassifiers>

+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_41FuVigyEeeoAJG6t_MwCA" name="ANiceStereotypeForProperty">

+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_41FuVygyEeeoAJG6t_MwCA" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_yokhsCgyEeeoAJG6t_MwCA"/>

+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_41FuWCgyEeeoAJG6t_MwCA" name="base_Property" ordered="false" lowerBound="1">

+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Property"/>

+        </eStructuralFeatures>

+      </eClassifiers>

+    </contents>

+  </eAnnotations>

+  <elementImport xmi:type="uml:ElementImport" xmi:id="_tOxygCgyEeeoAJG6t_MwCA" alias="Element">

+    <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/>

+  </elementImport>

+  <elementImport xmi:type="uml:ElementImport" xmi:id="_1_y8MCgyEeeoAJG6t_MwCA" alias="Property">

+    <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>

+  </elementImport>

+  <packagedElement xmi:type="uml:Stereotype" xmi:id="_t8ksoCgyEeeoAJG6t_MwCA" name="ANiceStereotypeForElement">

+    <ownedAttribute xmi:type="uml:Property" xmi:id="_3g1RISgyEeeoAJG6t_MwCA" name="base_Element" association="_3gxmwCgyEeeoAJG6t_MwCA">

+      <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/>

+    </ownedAttribute>

+  </packagedElement>

+  <packagedElement xmi:type="uml:Stereotype" xmi:id="_yokhsCgyEeeoAJG6t_MwCA" name="ANiceStereotypeForProperty">

+    <ownedAttribute xmi:type="uml:Property" xmi:id="_4GNPECgyEeeoAJG6t_MwCA" name="base_Property" association="_4GMA8CgyEeeoAJG6t_MwCA">

+      <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>

+    </ownedAttribute>

+  </packagedElement>

+  <packagedElement xmi:type="uml:Extension" xmi:id="_3gxmwCgyEeeoAJG6t_MwCA" name="E_ANiceStereotypeForElement_Element1" memberEnd="_3g1RICgyEeeoAJG6t_MwCA _3g1RISgyEeeoAJG6t_MwCA">

+    <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_3g1RICgyEeeoAJG6t_MwCA" name="extension_ANiceStereotypeForElement" type="_t8ksoCgyEeeoAJG6t_MwCA" aggregation="composite" association="_3gxmwCgyEeeoAJG6t_MwCA"/>

+  </packagedElement>

+  <packagedElement xmi:type="uml:Extension" xmi:id="_4GMA8CgyEeeoAJG6t_MwCA" name="E_ANiceStereotypeForProperty_Property1" memberEnd="_4GMoACgyEeeoAJG6t_MwCA _4GNPECgyEeeoAJG6t_MwCA">

+    <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_4GMoACgyEeeoAJG6t_MwCA" name="extension_ANiceStereotypeForProperty" type="_yokhsCgyEeeoAJG6t_MwCA" aggregation="composite" association="_4GMA8CgyEeeoAJG6t_MwCA"/>

+  </packagedElement>

+  <packagedElement xmi:type="uml:Stereotype" xmi:id="_WW0gMLAiEee43bo6S9i5Mw" name="AChildNiceStereotypeForElement">

+    <generalization xmi:type="uml:Generalization" xmi:id="_XeTssLAiEee43bo6S9i5Mw" general="_t8ksoCgyEeeoAJG6t_MwCA"/>

+  </packagedElement>

+</uml:Profile>

diff --git a/tests/junit/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.tests/src/org/eclipse/papyrus/uml/expressions/tests/IsKindOfStereotypeExpressionTests.java b/tests/junit/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.tests/src/org/eclipse/papyrus/uml/expressions/tests/IsKindOfStereotypeExpressionTests.java
new file mode 100644
index 00000000000..8937ed5a842
--- /dev/null
+++ b/tests/junit/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.tests/src/org/eclipse/papyrus/uml/expressions/tests/IsKindOfStereotypeExpressionTests.java
@@ -0,0 +1,308 @@
+/**
+ * Copyright (c) 2017 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:
+ * 	Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.uml.expressions.tests;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EcoreFactory;
+import org.eclipse.papyrus.junit.utils.rules.PapyrusEditorFixture;
+import org.eclipse.papyrus.junit.utils.rules.PluginResource;
+import org.eclipse.papyrus.uml.expressions.umlexpressions.IsKindOfStereotypeExpression;
+import org.eclipse.papyrus.uml.expressions.umlexpressions.UMLExpressionsFactory;
+import org.eclipse.uml2.uml.Class;
+import org.eclipse.uml2.uml.Property;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+/**
+ * 
+ * Tests for {@link IsKindOfStereotypeExpression}
+ *
+ */
+@PluginResource("resources/expressionModelTest.di") //$NON-NLS-1$
+public class IsKindOfStereotypeExpressionTests {
+
+	private final EObject dummyEObject = EcoreFactory.eINSTANCE.createEClass();
+
+	private final String INVALID_STRING_QN = "Invalid::Qualified::Name"; //$NON-NLS-1$
+
+	private final String STEREOTYPED_CLASS_WITH_URI_NAME = "StereotypedWithURIClass"; //$NON-NLS-1$
+
+	private final String STEREOTYPED_CLASS_WITHOUT_URI_NAME = "StereotypedWithoutURIClass"; //$NON-NLS-1$
+
+	private final String STEREOTYPED_PROPERTY = "StereotypedWithURIProperty"; //$NON-NLS-1$
+	
+	private final String STEREOTYPED_CLASS_WITH_CHILD_STEREOTYPE = "StereotypedWithChildStereotype"; //$NON-NLS-1$
+
+	private final String NOT_STEREOTYPED_CLASS_NAME = "NoStereotypedClass"; //$NON-NLS-1$
+
+	private final String ELEMENT_STEREOTYPE_QUALIFIED_NAME = "RootElement::ANiceStereotypeForElement"; //$NON-NLS-1$
+	
+	private final String ELEMENT_CHILD_STEREOTYPE_QUALIFIED_NAME = "RootElement::AChildNiceStereotypeForElement"; //$NON-NLS-1$
+	
+
+	private final String PROPERTY_STEREOTYPED_QUALIFIED_NAME = "RootElement::ANiceStereotypeForProperty"; //$NON-NLS-1$
+
+	private Class stereotypedClassWithURI;
+
+	private Class stereotypedClassWithoutURI;
+
+	private Class notStereotypedClass;
+	
+	private Class childStereotypedClass;
+
+	private Property stereotypedProperty;
+
+	private final String PROFILE_URI = "papyrusExpressionProfile"; //$NON-NLS-1$
+
+	@Rule
+	public final PapyrusEditorFixture fixture = new PapyrusEditorFixture();
+
+
+	@Before
+	public void init() {
+		stereotypedClassWithURI = (Class) fixture.getModel().getMember(STEREOTYPED_CLASS_WITH_URI_NAME);
+		stereotypedClassWithoutURI = (Class) fixture.getModel().getMember(STEREOTYPED_CLASS_WITHOUT_URI_NAME);
+		notStereotypedClass = (Class) fixture.getModel().getMember(NOT_STEREOTYPED_CLASS_NAME);
+		stereotypedProperty = (Property) stereotypedClassWithURI.getOwnedMember(STEREOTYPED_PROPERTY);
+		childStereotypedClass = (Class) fixture.getModel().getMember(STEREOTYPED_CLASS_WITH_CHILD_STEREOTYPE);
+	}
+
+	/**
+	 * The evaluate method must return <code>false</code> for these elements
+	 * 
+	 * <ul>
+	 * <li>profileURI is <code>null</code>
+	 * <li>
+	 * <li>stereotypeQN is <code>null</code></li>
+	 * <li>context is <code>null</code></li>
+	 * </ul>
+	 */
+	@Test
+	public void IsKindOfStereotypeExpression_Test1() {
+		final IsKindOfStereotypeExpression exp = UMLExpressionsFactory.eINSTANCE.createIsKindOfStereotypeExpression();
+		Assert.assertFalse(exp.evaluate(null));
+	}
+
+	/**
+	 * The evaluate method must return <code>false</code> for these elements
+	 * 
+	 * <ul>
+	 * <li>profileURI is <code>null</code></li>
+	 * <li>stereotypeQN is <code>null</code></li>
+	 * <li>context is an EObject, but not an UML Element</li>
+	 * </ul>
+	 */
+	@Test
+	public void IsKindOfStereotypeExpression_Test2() {
+		final IsKindOfStereotypeExpression exp = UMLExpressionsFactory.eINSTANCE.createIsKindOfStereotypeExpression();
+		Assert.assertFalse(exp.evaluate(dummyEObject));
+	}
+
+
+	/**
+	 * The evaluate method must return <code>false</code> for these elements
+	 * 
+	 * <ul>
+	 * <li>profileURI is <code>null</code></li>
+	 * <li>stereotypeQN is invalid</li>
+	 * <li>context is <code>null</code></li>
+	 * </ul>
+	 */
+	@Test
+	public void IsKindOfStereotypeExpression_Test3() {
+		final IsKindOfStereotypeExpression exp = UMLExpressionsFactory.eINSTANCE.createIsKindOfStereotypeExpression();
+		exp.setStereotypeQualifiedName(INVALID_STRING_QN);
+		Assert.assertFalse(exp.evaluate(null));
+	}
+
+	/**
+	 * The evaluate method must return <code>false</code> for these elements
+	 * 
+	 * <ul>
+	 * <li>profileURI is <code>null</code></li>
+	 * <li>stereotypeQN is invalid</li>
+	 * <li>context is an EObject, but not an UML Element</li>
+	 * </ul>
+	 */
+	@Test
+	public void IsKindOfStereotypeExpression_Test4() {
+		final IsKindOfStereotypeExpression exp = UMLExpressionsFactory.eINSTANCE.createIsKindOfStereotypeExpression();
+		exp.setStereotypeQualifiedName(INVALID_STRING_QN);
+		Assert.assertFalse(exp.evaluate(dummyEObject));
+	}
+
+	/**
+	 * The evaluate method must return <code>true</code> for these elements
+	 * 
+	 * <ul>
+	 * <li>profileURI is <code>null</code></li>
+	 * <li>stereotypeQN is valid</li>
+	 * <li>context is UML Stereotyped element with the expected stereotype</li>
+	 * </ul>
+	 */
+	@Test
+	public void IsKindOfStereotypeExpression_Test5() {
+		final IsKindOfStereotypeExpression exp = UMLExpressionsFactory.eINSTANCE.createIsKindOfStereotypeExpression();
+		exp.setStereotypeQualifiedName(ELEMENT_STEREOTYPE_QUALIFIED_NAME);
+		Assert.assertTrue(exp.evaluate(this.stereotypedClassWithURI));
+	}
+
+	/**
+	 * The evaluate method must return <code>false</code> for these elements
+	 * 
+	 * <ul>
+	 * <li>profileURI is <code>null</code></li>
+	 * <li>stereotypeQN is valid</li>
+	 * <li>context is UML Stereotyped element but not with the expected property</li>
+	 * </ul>
+	 */
+	@Test
+	public void IsKindOfStereotypeExpression_Test6() {
+		final IsKindOfStereotypeExpression exp = UMLExpressionsFactory.eINSTANCE.createIsKindOfStereotypeExpression();
+		exp.setStereotypeQualifiedName(ELEMENT_STEREOTYPE_QUALIFIED_NAME);
+		Assert.assertFalse(exp.evaluate(stereotypedProperty));
+	}
+
+	/**
+	 * The evaluate method must return <code>false</code> for these elements
+	 * 
+	 * <ul>
+	 * <li>profileURI is <code>null</code></li>
+	 * <li>stereotypeQN is valid</li>
+	 * <li>context is UML element not stereotyped</li>
+	 * </ul>
+	 */
+	@Test
+	public void IsKindOfStereotypeExpression_Test7() {
+		final IsKindOfStereotypeExpression exp = UMLExpressionsFactory.eINSTANCE.createIsKindOfStereotypeExpression();
+		exp.setStereotypeQualifiedName(ELEMENT_STEREOTYPE_QUALIFIED_NAME);
+		Assert.assertFalse(exp.evaluate(notStereotypedClass));
+	}
+
+	/**
+	 * The evaluate method must return <code>false</code> for these elements
+	 * 
+	 * <ul>
+	 * <li>profileURI is <code>null</code></li>
+	 * <li>stereotypeQN is valid</li>
+	 * <li>context is UML element, but the stereotyped with the expected stereotype</li>
+	 * </ul>
+	 */
+	@Test
+	public void IsKindOfStereotypeExpression_Test8() {
+		final IsKindOfStereotypeExpression exp = UMLExpressionsFactory.eINSTANCE.createIsKindOfStereotypeExpression();
+		exp.setStereotypeQualifiedName(PROPERTY_STEREOTYPED_QUALIFIED_NAME);
+		Assert.assertFalse(exp.evaluate(stereotypedClassWithURI));
+	}
+
+	/**
+	 * The evaluate method must return <code>true</code> for these elements
+	 * 
+	 * <ul>
+	 * <li>profileURI is <code>null</code></li>
+	 * <li>stereotypeQN is valid</li>
+	 * <li>context is UML element, stereotyped with the expected stereotype</li>
+	 * </ul>
+	 */
+	@Test
+	public void IsKindOfStereotypeExpression_Test9() {
+		final IsKindOfStereotypeExpression exp = UMLExpressionsFactory.eINSTANCE.createIsKindOfStereotypeExpression();
+		exp.setStereotypeQualifiedName(PROPERTY_STEREOTYPED_QUALIFIED_NAME);
+		Assert.assertTrue(exp.evaluate(stereotypedProperty));
+	}
+
+	/**
+	 * The evaluate method must return <code>true</code> for these elements
+	 * 
+	 * <ul>
+	 * <li>profileURI is not <code>null</code></li>, but empty
+	 * <li>stereotypeQN is valid</li>
+	 * <li>context is UML element, stereotyped with the expected stereotype</li>
+	 * </ul>
+	 */
+	@Test
+	public void IsKindOfStereotypeExpression_Test10() {
+		final IsKindOfStereotypeExpression exp = UMLExpressionsFactory.eINSTANCE.createIsKindOfStereotypeExpression();
+		exp.setProfileURI(""); //$NON-NLS-1$
+		exp.setStereotypeQualifiedName(PROPERTY_STEREOTYPED_QUALIFIED_NAME);
+		Assert.assertTrue(exp.evaluate(stereotypedProperty));
+	}
+
+	/**
+	 * The evaluate method must return <code>false</code> for these elements
+	 * 
+	 * <ul>
+	 * <li>profileURI is <code>null</code></li>
+	 * <li>stereotypeQN is valid</li>
+	 * <li>context is UML element,nto stereotyped</li>
+	 * </ul>
+	 */
+	@Test
+	public void IsKindOfStereotypeExpression_Test11() {
+		final IsKindOfStereotypeExpression exp = UMLExpressionsFactory.eINSTANCE.createIsKindOfStereotypeExpression();
+		exp.setStereotypeQualifiedName(PROPERTY_STEREOTYPED_QUALIFIED_NAME);
+		Assert.assertFalse(exp.evaluate(notStereotypedClass));
+	}
+
+	/**
+	 * The evaluate method must return <code>false</code> for these elements
+	 * 
+	 * <ul>
+	 * <li>profileURI is <code>null</code></li>
+	 * <li>stereotypeQN is valid</li>
+	 * <li>context is UML element stereotyped by a stereotype with the expected qualified name, but from the bas profile</li>
+	 * </ul>
+	 */
+	@Test
+	public void IsKindOfStereotypeExpression_Test12() {
+		final IsKindOfStereotypeExpression exp = UMLExpressionsFactory.eINSTANCE.createIsKindOfStereotypeExpression();
+		exp.setStereotypeQualifiedName(ELEMENT_STEREOTYPE_QUALIFIED_NAME);
+		exp.setProfileURI(PROFILE_URI);
+		Assert.assertFalse(exp.evaluate(this.stereotypedClassWithoutURI));
+	}
+
+	/**
+	 * The evaluate method must return <code>true</code> for these elements
+	 * 
+	 * <ul>
+	 * <li>profileURI is <code>null</code></li>
+	 * <li>stereotypeQN is valid</li>
+	 * <li>context is UML element stereotyped by a stereotype with the expected qualified name, but from the bas profile</li>
+	 * </ul>
+	 */
+	@Test
+	public void IsKindOfStereotypeExpression_Test13() {
+		final IsKindOfStereotypeExpression exp = UMLExpressionsFactory.eINSTANCE.createIsKindOfStereotypeExpression();
+		exp.setStereotypeQualifiedName(ELEMENT_STEREOTYPE_QUALIFIED_NAME);
+		exp.setProfileURI(PROFILE_URI);
+		Assert.assertTrue(exp.evaluate(this.stereotypedClassWithURI));
+	}
+	
+	/**
+	 * The evaluate method must return <code>true</code> for these elements
+	 * 
+	 * <ul>
+	 * <li>profileURI is <code>null</code></li>
+	 * <li>stereotypeQN is valid</li>
+	 * <li>context is UML element stereotyped by a child stereotype and the parent stereotype is defined for the qualified name</li>
+	 * </ul>
+	 */
+	@Test
+	public void IsKindOfStereotypeExpression_Test14() {
+		final IsKindOfStereotypeExpression exp = UMLExpressionsFactory.eINSTANCE.createIsKindOfStereotypeExpression();
+		exp.setStereotypeQualifiedName(ELEMENT_STEREOTYPE_QUALIFIED_NAME);
+		Assert.assertTrue(exp.evaluate(this.childStereotypedClass));
+	}
+}
diff --git a/tests/junit/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.tests/src/org/eclipse/papyrus/uml/expressions/tests/IsTypeOfStereotypeExpressionTests.java b/tests/junit/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.tests/src/org/eclipse/papyrus/uml/expressions/tests/IsTypeOfStereotypeExpressionTests.java
new file mode 100644
index 00000000000..30a43d92170
--- /dev/null
+++ b/tests/junit/plugins/uml/expressions/org.eclipse.papyrus.uml.expressions.tests/src/org/eclipse/papyrus/uml/expressions/tests/IsTypeOfStereotypeExpressionTests.java
@@ -0,0 +1,284 @@
+/**
+ * Copyright (c) 2017 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:
+ * 	Asma Smaoui (CEA LIST) asma.smaoui@cea.fr - Initial API and implementation
+ */
+package org.eclipse.papyrus.uml.expressions.tests;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EcoreFactory;
+import org.eclipse.papyrus.junit.utils.rules.PapyrusEditorFixture;
+import org.eclipse.papyrus.junit.utils.rules.PluginResource;
+import org.eclipse.papyrus.uml.expressions.umlexpressions.IsTypeOfStereotypeExpression;
+import org.eclipse.papyrus.uml.expressions.umlexpressions.UMLExpressionsFactory;
+import org.eclipse.uml2.uml.Class;
+import org.eclipse.uml2.uml.Property;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+/**
+ * 
+ * Tests for {@link IsTypeOfStereotypeExpression}
+ *
+ */
+@PluginResource("resources/expressionModelTest.di") //$NON-NLS-1$
+public class IsTypeOfStereotypeExpressionTests {
+
+	private final EObject dummyEObject = EcoreFactory.eINSTANCE.createEClass();
+
+	private final String INVALID_STRING_QN = "Invalid::Qualified::Name"; //$NON-NLS-1$
+
+	private final String STEREOTYPED_CLASS_WITH_URI_NAME = "StereotypedWithURIClass"; //$NON-NLS-1$
+
+	private final String STEREOTYPED_CLASS_WITHOUT_URI_NAME = "StereotypedWithoutURIClass"; //$NON-NLS-1$
+
+	private final String STEREOTYPED_PROPERTY = "StereotypedWithURIProperty"; //$NON-NLS-1$
+
+	private final String NOT_STEREOTYPED_CLASS_NAME = "NoStereotypedClass"; //$NON-NLS-1$
+
+	private final String ELEMENT_STEREOTYPE_QUALIFIED_NAME = "RootElement::ANiceStereotypeForElement"; //$NON-NLS-1$
+
+	private final String PROPERTY_STEREOTYPED_QUALIFIED_NAME = "RootElement::ANiceStereotypeForProperty"; //$NON-NLS-1$
+
+	private Class stereotypedClassWithURI;
+
+	private Class stereotypedClassWithoutURI;
+
+	private Class notStereotypedClass;
+
+	private Property stereotypedProperty;
+
+	private final String PROFILE_URI = "papyrusExpressionProfile"; //$NON-NLS-1$
+
+	@Rule
+	public final PapyrusEditorFixture fixture = new PapyrusEditorFixture();
+
+
+	@Before
+	public void init() {
+		stereotypedClassWithURI = (Class) fixture.getModel().getMember(STEREOTYPED_CLASS_WITH_URI_NAME);
+		stereotypedClassWithoutURI = (Class) fixture.getModel().getMember(STEREOTYPED_CLASS_WITHOUT_URI_NAME);
+		notStereotypedClass = (Class) fixture.getModel().getMember(NOT_STEREOTYPED_CLASS_NAME);
+		stereotypedProperty = (Property) stereotypedClassWithURI.getOwnedMember(STEREOTYPED_PROPERTY);
+	}
+
+	/**
+	 * The evaluate method must return <code>false</code> for these elements
+	 * 
+	 * <ul>
+	 * <li>profileURI is <code>null</code>
+	 * <li>
+	 * <li>stereotypeQN is <code>null</code></li>
+	 * <li>context is <code>null</code></li>
+	 * </ul>
+	 */
+	@Test
+	public void IsTypeOfStereotypeExpression_Test1() {
+		final IsTypeOfStereotypeExpression exp = UMLExpressionsFactory.eINSTANCE.createIsTypeOfStereotypeExpression();
+		Assert.assertFalse(exp.evaluate(null));
+	}
+
+	/**
+	 * The evaluate method must return <code>false</code> for these elements
+	 * 
+	 * <ul>
+	 * <li>profileURI is <code>null</code></li>
+	 * <li>stereotypeQN is <code>null</code></li>
+	 * <li>context is an EObject, but not an UML Element</li>
+	 * </ul>
+	 */
+	@Test
+	public void IsTypeOfStereotypeExpression_Test2() {
+		final IsTypeOfStereotypeExpression exp = UMLExpressionsFactory.eINSTANCE.createIsTypeOfStereotypeExpression();
+		Assert.assertFalse(exp.evaluate(dummyEObject));
+	}
+
+
+	/**
+	 * The evaluate method must return <code>false</code> for these elements
+	 * 
+	 * <ul>
+	 * <li>profileURI is <code>null</code></li>
+	 * <li>stereotypeQN is invalid</li>
+	 * <li>context is <code>null</code></li>
+	 * </ul>
+	 */
+	@Test
+	public void IsTypeOfStereotypeExpression_Test3() {
+		final IsTypeOfStereotypeExpression exp = UMLExpressionsFactory.eINSTANCE.createIsTypeOfStereotypeExpression();
+		exp.setStereotypeQualifiedName(INVALID_STRING_QN);
+		Assert.assertFalse(exp.evaluate(null));
+	}
+
+	/**
+	 * The evaluate method must return <code>false</code> for these elements
+	 * 
+	 * <ul>
+	 * <li>profileURI is <code>null</code></li>
+	 * <li>stereotypeQN is invalid</li>
+	 * <li>context is an EObject, but not an UML Element</li>
+	 * </ul>
+	 */
+	@Test
+	public void IsTypeOfStereotypeExpression_Test4() {
+		final IsTypeOfStereotypeExpression exp = UMLExpressionsFactory.eINSTANCE.createIsTypeOfStereotypeExpression();
+		exp.setStereotypeQualifiedName(INVALID_STRING_QN);
+		Assert.assertFalse(exp.evaluate(dummyEObject));
+	}
+
+	/**
+	 * The evaluate method must return <code>true</code> for these elements
+	 * 
+	 * <ul>
+	 * <li>profileURI is <code>null</code></li>
+	 * <li>stereotypeQN is valid</li>
+	 * <li>context is UML Stereotyped element with the expected stereotype</li>
+	 * </ul>
+	 */
+	@Test
+	public void IsTypeOfStereotypeExpression_Test5() {
+		final IsTypeOfStereotypeExpression exp = UMLExpressionsFactory.eINSTANCE.createIsTypeOfStereotypeExpression();
+		exp.setStereotypeQualifiedName(ELEMENT_STEREOTYPE_QUALIFIED_NAME);
+		Assert.assertTrue(exp.evaluate(this.stereotypedClassWithURI));
+	}
+
+	/**
+	 * The evaluate method must return <code>false</code> for these elements
+	 * 
+	 * <ul>
+	 * <li>profileURI is <code>null</code></li>
+	 * <li>stereotypeQN is valid</li>
+	 * <li>context is UML Stereotyped element but not with the expected property</li>
+	 * </ul>
+	 */
+	@Test
+	public void IsTypeOfStereotypeExpression_Test6() {
+		final IsTypeOfStereotypeExpression exp = UMLExpressionsFactory.eINSTANCE.createIsTypeOfStereotypeExpression();
+		exp.setStereotypeQualifiedName(ELEMENT_STEREOTYPE_QUALIFIED_NAME);
+		Assert.assertFalse(exp.evaluate(stereotypedProperty));
+	}
+
+	/**
+	 * The evaluate method must return <code>false</code> for these elements
+	 * 
+	 * <ul>
+	 * <li>profileURI is <code>null</code></li>
+	 * <li>stereotypeQN is valid</li>
+	 * <li>context is UML element not stereotyped</li>
+	 * </ul>
+	 */
+	@Test
+	public void IsTypeOfStereotypeExpression_Test7() {
+		final IsTypeOfStereotypeExpression exp = UMLExpressionsFactory.eINSTANCE.createIsTypeOfStereotypeExpression();
+		exp.setStereotypeQualifiedName(ELEMENT_STEREOTYPE_QUALIFIED_NAME);
+		Assert.assertFalse(exp.evaluate(notStereotypedClass));
+	}
+
+	/**
+	 * The evaluate method must return <code>false</code> for these elements
+	 * 
+	 * <ul>
+	 * <li>profileURI is <code>null</code></li>
+	 * <li>stereotypeQN is valid</li>
+	 * <li>context is UML element, but the stereotyped with the expected stereotype</li>
+	 * </ul>
+	 */
+	@Test
+	public void IsTypeOfStereotypeExpression_Test8() {
+		final IsTypeOfStereotypeExpression exp = UMLExpressionsFactory.eINSTANCE.createIsTypeOfStereotypeExpression();
+		exp.setStereotypeQualifiedName(PROPERTY_STEREOTYPED_QUALIFIED_NAME);
+		Assert.assertFalse(exp.evaluate(stereotypedClassWithURI));
+	}
+
+	/**
+	 * The evaluate method must return <code>true</code> for these elements
+	 * 
+	 * <ul>
+	 * <li>profileURI is <code>null</code></li>
+	 * <li>stereotypeQN is valid</li>
+	 * <li>context is UML element, stereotyped with the expected stereotype</li>
+	 * </ul>
+	 */
+	@Test
+	public void IsTypeOfStereotypeExpression_Test9() {
+		final IsTypeOfStereotypeExpression exp = UMLExpressionsFactory.eINSTANCE.createIsTypeOfStereotypeExpression();
+		exp.setStereotypeQualifiedName(PROPERTY_STEREOTYPED_QUALIFIED_NAME);
+		Assert.assertTrue(exp.evaluate(stereotypedProperty));
+	}
+
+	/**
+	 * The evaluate method must return <code>true</code> for these elements
+	 * 
+	 * <ul>
+	 * <li>profileURI is not <code>null</code></li>, but empty
+	 * <li>stereotypeQN is valid</li>
+	 * <li>context is UML element, stereotyped with the expected stereotype</li>
+	 * </ul>
+	 */
+	@Test
+	public void IsTypeOfStereotypeExpression_Test10() {
+		final IsTypeOfStereotypeExpression exp = UMLExpressionsFactory.eINSTANCE.createIsTypeOfStereotypeExpression();
+		exp.setProfileURI(""); //$NON-NLS-1$
+		exp.setStereotypeQualifiedName(PROPERTY_STEREOTYPED_QUALIFIED_NAME);
+		Assert.assertTrue(exp.evaluate(stereotypedProperty));
+	}
+
+	/**
+	 * The evaluate method must return <code>false</code> for these elements
+	 * 
+	 * <ul>
+	 * <li>profileURI is <code>null</code></li>
+	 * <li>stereotypeQN is valid</li>
+	 * <li>context is UML element,nto stereotyped</li>
+	 * </ul>
+	 */
+	@Test
+	public void IsTypeOfStereotypeExpression_Test11() {
+		final IsTypeOfStereotypeExpression exp = UMLExpressionsFactory.eINSTANCE.createIsTypeOfStereotypeExpression();
+		exp.setStereotypeQualifiedName(PROPERTY_STEREOTYPED_QUALIFIED_NAME);
+		Assert.assertFalse(exp.evaluate(notStereotypedClass));
+	}
+
+	/**
+	 * The evaluate method must return <code>false</code> for these elements
+	 * 
+	 * <ul>
+	 * <li>profileURI is <code>null</code></li>
+	 * <li>stereotypeQN is valid</li>
+	 * <li>context is UML element stereotyped by a stereotype with the expected qualified name, but from the bas profile</li>
+	 * </ul>
+	 */
+	@Test
+	public void IsTypeOfStereotypeExpression_Test12() {
+		final IsTypeOfStereotypeExpression exp = UMLExpressionsFactory.eINSTANCE.createIsTypeOfStereotypeExpression();
+		exp.setStereotypeQualifiedName(ELEMENT_STEREOTYPE_QUALIFIED_NAME);
+		exp.setProfileURI(PROFILE_URI);
+		Assert.assertFalse(exp.evaluate(this.stereotypedClassWithoutURI));
+	}
+
+	/**
+	 * The evaluate method must return <code>true</code> for these elements
+	 * 
+	 * <ul>
+	 * <li>profileURI is <code>null</code></li>
+	 * <li>stereotypeQN is valid</li>
+	 * <li>context is UML element stereotyped by a stereotype with the expected qualified name, but from the bas profile</li>
+	 * </ul>
+	 */
+	@Test
+	public void IsTypeOfStereotypeExpression_Test13() {
+		final IsTypeOfStereotypeExpression exp = UMLExpressionsFactory.eINSTANCE.createIsTypeOfStereotypeExpression();
+		exp.setStereotypeQualifiedName(ELEMENT_STEREOTYPE_QUALIFIED_NAME);
+		exp.setProfileURI(PROFILE_URI);
+		Assert.assertTrue(exp.evaluate(this.stereotypedClassWithURI));
+	}
+}
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.matrix.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.matrix.tests/META-INF/MANIFEST.MF
index ac9f11d8a0e..c0e9d15c960 100755
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.matrix.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.matrix.tests/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)",
  org.eclipse.papyrus.junit.utils;bundle-version="[2.1.0,3.0.0)",
  org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)",
- org.eclipse.papyrus.uml.expressions;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.papyrus.uml.expressions;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.papyrus.infra.emf.expressions;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.gef;bundle-version="[3.11.0,4.0.0)",
  org.eclipse.papyrus.infra.services.edit;bundle-version="[3.0.0,4.0.0)",