Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrschnekenbu2013-12-18 03:57:22 -0500
committerrschnekenbu2013-12-18 03:57:22 -0500
commit46f10891f0bbd1242fca82b042ab90878d80bf58 (patch)
treecedf84bcf141532ecf4722a8700a6a8146ca6a05 /tests/junit/plugins/core
parenta2d767fcdba8a2fd7c4f37777d6b0318ca62fa35 (diff)
downloadorg.eclipse.papyrus-46f10891f0bbd1242fca82b042ab90878d80bf58.tar.gz
org.eclipse.papyrus-46f10891f0bbd1242fca82b042ab90878d80bf58.tar.xz
org.eclipse.papyrus-46f10891f0bbd1242fca82b042ab90878d80bf58.zip
424305: [Core] Papyrus shall provide runtime model based configuration
for Element Types framework https://bugs.eclipse.org/bugs/show_bug.cgi?id=424305 - first refactor of the extended types : -- new models to configure extended types -- no more extended registry to add/remove types, they are added in the GMF singleton registry -- first examples for the container invariants
Diffstat (limited to 'tests/junit/plugins/core')
-rw-r--r--tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/.project56
-rw-r--r--tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/META-INF/MANIFEST.MF40
-rw-r--r--tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/build.properties18
-rw-r--r--tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/fragment.xml15
-rw-r--r--tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/icons/M.gifbin0 -> 912 bytes
-rw-r--r--tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/icons/O.gifbin0 -> 912 bytes
-rw-r--r--tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/icons/Values.gifbin0 -> 361 bytes
-rw-r--r--tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/model/ExtendedTypesTestsProfile.profile.di17
-rw-r--r--tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/model/ExtendedTypesTestsProfile.profile.notation175
-rw-r--r--tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/model/ExtendedTypesTestsProfile.profile.uml181
-rw-r--r--tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/model/Test.extendedtypes15
-rw-r--r--tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/model/Test.palette.xml12
-rw-r--r--tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/model/Test1.extendedtypes15
-rw-r--r--tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/model/TestMenu.xmi12
-rw-r--r--tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/model/model.di37
-rw-r--r--tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/model/model.notation150
-rw-r--r--tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/model/model.uml99
-rw-r--r--tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/org.eclipse.papyrus.infra.extendedtypes.tests.launch (renamed from tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/org.eclipse.papyrus.extendedtypes.tests.launch)81
-rw-r--r--tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/plugin.properties (renamed from tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/fragment.properties)0
-rw-r--r--tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/plugin.xml36
-rw-r--r--tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/src/org/eclipse/papyrus/infra/extendedtypes/ExtendedEditHelperAdviceTests.java218
-rw-r--r--tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/src/org/eclipse/papyrus/infra/extendedtypes/ExtendedTypesRegistryTests.java128
-rw-r--r--tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/src/org/eclipse/papyrus/infra/extendedtypes/ITestConstants.java53
-rw-r--r--tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/src/org/eclipse/papyrus/infra/extendedtypes/preferences/ExtendedTypesPreferencesTests.java104
-rw-r--r--tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/src/org/eclipse/papyrus/infra/extendedtypes/tests/Activator.java50
-rw-r--r--tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/src/org/eclipse/papyrus/infra/extendedtypes/tests/AllTests.java (renamed from tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/src/org/eclipse/papyrus/infra/extendedtypes/AllTests.java)53
-rw-r--r--tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/src/org/eclipse/papyrus/infra/extendedtypes/tests/ExtendedEditHelperAdviceTests.java200
-rw-r--r--tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/src/org/eclipse/papyrus/infra/extendedtypes/tests/ExtendedTypesRegistryTests.java224
-rw-r--r--tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/src/org/eclipse/papyrus/infra/extendedtypes/tests/ITestConstants.java25
29 files changed, 1298 insertions, 716 deletions
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/.project b/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/.project
index f32f0dff98c..11857429c80 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/.project
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/.project
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.extendedtypes.tests</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.papyrus.infra.extendedtypes.tests.tests</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/META-INF/MANIFEST.MF
index 80f5bcce193..7e3743e3e37 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/META-INF/MANIFEST.MF
@@ -1,15 +1,25 @@
-Manifest-Version: 1.0
-Require-Bundle: org.eclipse.papyrus.uml.service.types;bundle-version="0.10.1",
- org.junit;bundle-version="4.10.0"
-Export-Package: org.eclipse.papyrus.infra.extendedtypes
-Bundle-Vendor: %providerName
-Fragment-Host: org.eclipse.papyrus.infra.extendedtypes;bundle-version=
- "0.10.0"
-Bundle-Version: 0.10.1.qualifier
-Bundle-Name: %fragmentName
-Bundle-Localization: fragment
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.extendedtypes.tests;singleton
- :=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-
+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.papyrus.uml.service.types;bundle-version="0.10.1",
+ org.junit;bundle-version="4.10.0",
+ org.eclipse.papyrus.junit.utils;bundle-version="0.10.1",
+ org.eclipse.papyrus.uml.tools;bundle-version="0.10.1",
+ org.eclipse.papyrus.infra.newchild,
+ org.eclipse.papyrus.uml.diagram.common,
+ org.eclipse.papyrus.infra.core;bundle-version="0.10.1",
+ org.eclipse.emf.transaction;bundle-version="1.4.0",
+ org.eclipse.gmf.runtime.emf.core;bundle-version="1.7.0",
+ org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.7.0",
+ org.eclipse.gmf.runtime.diagram.ui
+Export-Package: org.eclipse.papyrus.infra.extendedtypes.tests
+Bundle-Vendor: %providerName
+Bundle-Version: 0.10.1.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.extendedtypes.tests;singleton:=true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-ActivationPolicy: lazy
+Bundle-Activator: org.eclipse.papyrus.infra.extendedtypes.tests.Activator
+
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/build.properties b/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/build.properties
index 28d3b56ba7d..89abf6ef7cc 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/build.properties
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/build.properties
@@ -1,9 +1,9 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- fragment.xml,\
- icons/,\
- model/,\
- fragment.properties,\
- about.html
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+ .,\
+ plugin.xml,\
+ icons/,\
+ model/,\
+ plugin.properties,\
+ about.html
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/fragment.xml b/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/fragment.xml
deleted file mode 100644
index 323f3e28aca..00000000000
--- a/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/fragment.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<fragment>
- <extension
- point="org.eclipse.papyrus.infra.extendedtypes.extendedTypesSetConfiguration">
- <configuration
- description="Test - Model for Extended Element Type Set"
- icon="icons/debug.gif"
- name="Test1 Model for Extended Element Type Set"
- path="model/Test1.extendedtypes"
- id="org.eclipse.papyrus.infra.extendedtypes.tests.test1">
- </configuration>
- </extension>
-
-</fragment>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/icons/M.gif b/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/icons/M.gif
new file mode 100644
index 00000000000..f9a5b239d6c
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/icons/M.gif
Binary files differ
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/icons/O.gif b/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/icons/O.gif
new file mode 100644
index 00000000000..e6ce0916227
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/icons/O.gif
Binary files differ
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/icons/Values.gif b/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/icons/Values.gif
new file mode 100644
index 00000000000..f1f019535ea
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/icons/Values.gif
Binary files differ
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/model/ExtendedTypesTestsProfile.profile.di b/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/model/ExtendedTypesTestsProfile.profile.di
new file mode 100644
index 00000000000..2f52d7be634
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/model/ExtendedTypesTestsProfile.profile.di
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">
+ <pageList>
+ <availablePage>
+ <emfPageIdentifier href="ExtendedTypesTestsProfile.profile.notation#_sK_p8Gb7EeOyHY5evmQkxA"/>
+ </availablePage>
+ </pageList>
+ <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
+ <windows>
+ <children xsi:type="di:TabFolder">
+ <children>
+ <emfPageIdentifier href="ExtendedTypesTestsProfile.profile.notation#_sK_p8Gb7EeOyHY5evmQkxA"/>
+ </children>
+ </children>
+ </windows>
+ </sashModel>
+</di:SashWindowsMngr>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/model/ExtendedTypesTestsProfile.profile.notation b/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/model/ExtendedTypesTestsProfile.profile.notation
new file mode 100644
index 00000000000..42057e704c1
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/model/ExtendedTypesTestsProfile.profile.notation
@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_sK_p8Gb7EeOyHY5evmQkxA" type="PapyrusUMLProfileDiagram" name="Main" measurementUnit="Pixel">
+ <children xmi:type="notation:Shape" xmi:id="_VqWqYGcCEeO5043Nsj3xUw" type="1031">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_VqgbYmcCEeO5043Nsj3xUw" source="Stereotype_Annotation">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_VqgbY2cCEeO5043Nsj3xUw" key="StereotypeWithQualifiedNameList" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_VqgbZGcCEeO5043Nsj3xUw" key="StereotypeList" value="StandardProfileL2::Metaclass"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_VqgbZWcCEeO5043Nsj3xUw" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_VqgbZmcCEeO5043Nsj3xUw" key="PropStereoDisplay" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_VqgbZ2cCEeO5043Nsj3xUw" key="StereotypePropertyLocation" value="Compartment"/>
+ </eAnnotations>
+ <children xmi:type="notation:DecorationNode" xmi:id="_VqgbYGcCEeO5043Nsj3xUw" type="1084"/>
+ <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VqgbYWcCEeO5043Nsj3xUw" x="422" y="304"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_WnzKEGcCEeO5043Nsj3xUw" type="1026">
+ <children xmi:type="notation:DecorationNode" xmi:id="_WnzKEmcCEeO5043Nsj3xUw" type="1034"/>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_Wn8UAGcCEeO5043Nsj3xUw" type="1071">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Wn8UCmcCEeO5043Nsj3xUw" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Wn8UC2cCEeO5043Nsj3xUw" key="showTitle" value="true"/>
+ </eAnnotations>
+ <styles xmi:type="notation:TitleStyle" xmi:id="_Wn8UAWcCEeO5043Nsj3xUw"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_Wn8UAmcCEeO5043Nsj3xUw"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_Wn8UA2cCEeO5043Nsj3xUw"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Wn8UBGcCEeO5043Nsj3xUw"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_Wn8UBWcCEeO5043Nsj3xUw" visible="false" type="1019">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Wn8UDGcCEeO5043Nsj3xUw" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Wn8UDWcCEeO5043Nsj3xUw" key="showTitle" value="true"/>
+ </eAnnotations>
+ <styles xmi:type="notation:TitleStyle" xmi:id="_Wn8UBmcCEeO5043Nsj3xUw"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_Wn8UB2cCEeO5043Nsj3xUw"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_Wn8UCGcCEeO5043Nsj3xUw"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Wn8UCWcCEeO5043Nsj3xUw"/>
+ </children>
+ <element xmi:type="uml:Stereotype" href="ExtendedTypesTestsProfile.profile.uml#_WnpZEGcCEeO5043Nsj3xUw"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WnzKEWcCEeO5043Nsj3xUw" x="251" y="496" width="213" height="88"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_ZAb1YWcCEeO5043Nsj3xUw" type="1026">
+ <children xmi:type="notation:DecorationNode" xmi:id="_ZAb1Y2cCEeO5043Nsj3xUw" type="1034"/>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_ZAb1ZGcCEeO5043Nsj3xUw" type="1071">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ZAb1bmcCEeO5043Nsj3xUw" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZAb1b2cCEeO5043Nsj3xUw" key="showTitle" value="true"/>
+ </eAnnotations>
+ <children xmi:type="notation:Shape" xmi:id="_em-nIGcCEeO5043Nsj3xUw" type="3002">
+ <element xmi:type="uml:Property" href="ExtendedTypesTestsProfile.profile.uml#_ekTGkGcCEeO5043Nsj3xUw"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_em-nIWcCEeO5043Nsj3xUw"/>
+ </children>
+ <styles xmi:type="notation:TitleStyle" xmi:id="_ZAb1ZWcCEeO5043Nsj3xUw"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_ZAb1ZmcCEeO5043Nsj3xUw"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_ZAb1Z2cCEeO5043Nsj3xUw"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZAb1aGcCEeO5043Nsj3xUw"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_ZAb1aWcCEeO5043Nsj3xUw" visible="false" type="1019">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ZAb1cGcCEeO5043Nsj3xUw" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZAb1cWcCEeO5043Nsj3xUw" key="showTitle" value="true"/>
+ </eAnnotations>
+ <styles xmi:type="notation:TitleStyle" xmi:id="_ZAb1amcCEeO5043Nsj3xUw"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_ZAb1a2cCEeO5043Nsj3xUw"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_ZAb1bGcCEeO5043Nsj3xUw"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZAb1bWcCEeO5043Nsj3xUw"/>
+ </children>
+ <element xmi:type="uml:Stereotype" href="ExtendedTypesTestsProfile.profile.uml#_ZAb1YGcCEeO5043Nsj3xUw"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZAb1YmcCEeO5043Nsj3xUw" x="477" y="496" width="241" height="96"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_hWruoGcCEeO5043Nsj3xUw" type="2006">
+ <children xmi:type="notation:DecorationNode" xmi:id="_hWruomcCEeO5043Nsj3xUw" type="5023"/>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_hWruo2cCEeO5043Nsj3xUw" type="1063">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_hW04kGcCEeO5043Nsj3xUw" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_hW04kWcCEeO5043Nsj3xUw" key="showTitle" value="true"/>
+ </eAnnotations>
+ <children xmi:type="notation:Shape" xmi:id="_ixk_UGcCEeO5043Nsj3xUw" type="1037">
+ <element xmi:type="uml:EnumerationLiteral" href="ExtendedTypesTestsProfile.profile.uml#_ixb1YGcCEeO5043Nsj3xUw"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_ixk_UWcCEeO5043Nsj3xUw"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_pLd5kGcCEeO5043Nsj3xUw" type="1037">
+ <element xmi:type="uml:EnumerationLiteral" href="ExtendedTypesTestsProfile.profile.uml#_motB4GcCEeO5043Nsj3xUw"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_pLd5kWcCEeO5043Nsj3xUw" x="70" y="56"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_pLd5kmcCEeO5043Nsj3xUw" type="1037">
+ <element xmi:type="uml:EnumerationLiteral" href="ExtendedTypesTestsProfile.profile.uml#_n328oGcCEeO5043Nsj3xUw"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_pLd5k2cCEeO5043Nsj3xUw" x="70" y="56"/>
+ </children>
+ <styles xmi:type="notation:TitleStyle" xmi:id="_hWrupGcCEeO5043Nsj3xUw"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_hWrupWcCEeO5043Nsj3xUw"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_hWrupmcCEeO5043Nsj3xUw"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hWrup2cCEeO5043Nsj3xUw"/>
+ </children>
+ <element xmi:type="uml:Enumeration" href="ExtendedTypesTestsProfile.profile.uml#_hWh9oGcCEeO5043Nsj3xUw"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hWruoWcCEeO5043Nsj3xUw" x="971" y="246" width="119" height="166"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_vpg7EWcCEeO5043Nsj3xUw" type="1031">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_vpg7FWcCEeO5043Nsj3xUw" source="Stereotype_Annotation">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_vpg7FmcCEeO5043Nsj3xUw" key="StereotypeWithQualifiedNameList" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_vpg7F2cCEeO5043Nsj3xUw" key="StereotypeList" value="StandardProfileL2::Metaclass"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_vpg7GGcCEeO5043Nsj3xUw" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_vpg7GWcCEeO5043Nsj3xUw" key="PropStereoDisplay" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_vpg7GmcCEeO5043Nsj3xUw" key="StereotypePropertyLocation" value="Compartment"/>
+ </eAnnotations>
+ <children xmi:type="notation:DecorationNode" xmi:id="_vpg7E2cCEeO5043Nsj3xUw" type="1084"/>
+ <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vpg7FGcCEeO5043Nsj3xUw" x="1180" y="272" width="185" height="75"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_xUCjMWcCEeO5043Nsj3xUw" type="1026">
+ <children xmi:type="notation:DecorationNode" xmi:id="_xUCjM2cCEeO5043Nsj3xUw" type="1034"/>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_xUCjNGcCEeO5043Nsj3xUw" type="1071">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xUCjPmcCEeO5043Nsj3xUw" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xULtIGcCEeO5043Nsj3xUw" key="showTitle" value="true"/>
+ </eAnnotations>
+ <styles xmi:type="notation:TitleStyle" xmi:id="_xUCjNWcCEeO5043Nsj3xUw"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_xUCjNmcCEeO5043Nsj3xUw"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_xUCjN2cCEeO5043Nsj3xUw"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xUCjOGcCEeO5043Nsj3xUw"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_xUCjOWcCEeO5043Nsj3xUw" visible="false" type="1019">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_xULtIWcCEeO5043Nsj3xUw" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_xULtImcCEeO5043Nsj3xUw" key="showTitle" value="true"/>
+ </eAnnotations>
+ <styles xmi:type="notation:TitleStyle" xmi:id="_xUCjOmcCEeO5043Nsj3xUw"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_xUCjO2cCEeO5043Nsj3xUw"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_xUCjPGcCEeO5043Nsj3xUw"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xUCjPWcCEeO5043Nsj3xUw"/>
+ </children>
+ <element xmi:type="uml:Stereotype" href="ExtendedTypesTestsProfile.profile.uml#_xUCjMGcCEeO5043Nsj3xUw"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xUCjMmcCEeO5043Nsj3xUw" x="1180" y="470" width="188" height="94"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_75QOYWcCEeO5043Nsj3xUw" type="1026">
+ <children xmi:type="notation:DecorationNode" xmi:id="_75QOY2cCEeO5043Nsj3xUw" type="1034"/>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_75QOZGcCEeO5043Nsj3xUw" type="1071">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_75QObmcCEeO5043Nsj3xUw" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_75QOb2cCEeO5043Nsj3xUw" key="showTitle" value="true"/>
+ </eAnnotations>
+ <styles xmi:type="notation:TitleStyle" xmi:id="_75QOZWcCEeO5043Nsj3xUw"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_75QOZmcCEeO5043Nsj3xUw"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_75QOZ2cCEeO5043Nsj3xUw"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_75QOaGcCEeO5043Nsj3xUw"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_75QOaWcCEeO5043Nsj3xUw" visible="false" type="1019">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_75QOcGcCEeO5043Nsj3xUw" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_75QOcWcCEeO5043Nsj3xUw" key="showTitle" value="true"/>
+ </eAnnotations>
+ <styles xmi:type="notation:TitleStyle" xmi:id="_75QOamcCEeO5043Nsj3xUw"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_75QOa2cCEeO5043Nsj3xUw"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_75QObGcCEeO5043Nsj3xUw"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_75QObWcCEeO5043Nsj3xUw"/>
+ </children>
+ <element xmi:type="uml:Stereotype" href="ExtendedTypesTestsProfile.profile.uml#_75QOYGcCEeO5043Nsj3xUw"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_75QOYmcCEeO5043Nsj3xUw" x="1420" y="469" width="211" height="102"/>
+ </children>
+ <styles xmi:type="notation:DiagramStyle" xmi:id="_sK_p8Wb7EeOyHY5evmQkxA"/>
+ <element xmi:type="uml:Profile" href="ExtendedTypesTestsProfile.profile.uml#_sK148Gb7EeOyHY5evmQkxA"/>
+ <edges xmi:type="notation:Connector" xmi:id="_tmJVIGcCEeO5043Nsj3xUw" type="1013" source="_WnzKEGcCEeO5043Nsj3xUw" target="_VqWqYGcCEeO5043Nsj3xUw">
+ <styles xmi:type="notation:FontStyle" xmi:id="_tmJVIWcCEeO5043Nsj3xUw"/>
+ <element xmi:type="uml:Extension" href="ExtendedTypesTestsProfile.profile.uml#_tmALMWcCEeO5043Nsj3xUw"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_tmJVImcCEeO5043Nsj3xUw" points="[2, -4, -81, 167]$[91, -146, 8, 25]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tmcQEGcCEeO5043Nsj3xUw" id="(0.647887323943662,0.045454545454545456)"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_uA7MoGcCEeO5043Nsj3xUw" type="1013" source="_ZAb1YWcCEeO5043Nsj3xUw" target="_VqWqYGcCEeO5043Nsj3xUw">
+ <styles xmi:type="notation:FontStyle" xmi:id="_uA7MoWcCEeO5043Nsj3xUw"/>
+ <element xmi:type="uml:Extension" href="ExtendedTypesTestsProfile.profile.uml#_uAyCsWcCEeO5043Nsj3xUw"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_uA7MomcCEeO5043Nsj3xUw" points="[-10, -15, 102, 167]$[-109, -157, 3, 25]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uA7Mo2cCEeO5043Nsj3xUw" id="(0.44398340248962653,0.15625)"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_-iHHAGcCEeO5043Nsj3xUw" type="1013" source="_xUCjMWcCEeO5043Nsj3xUw" target="_vpg7EWcCEeO5043Nsj3xUw">
+ <styles xmi:type="notation:FontStyle" xmi:id="_-iHHAWcCEeO5043Nsj3xUw"/>
+ <element xmi:type="uml:Extension" href="ExtendedTypesTestsProfile.profile.uml#_-h9WAWcCEeO5043Nsj3xUw"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_-iHHAmcCEeO5043Nsj3xUw" points="[1, -14, -7, 161]$[13, -137, 5, 38]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-iHHA2cCEeO5043Nsj3xUw" id="(0.44680851063829785,0.14893617021276595)"/>
+ </edges>
+ <edges xmi:type="notation:Connector" xmi:id="_-4uQMGcCEeO5043Nsj3xUw" type="1013" source="_75QOYWcCEeO5043Nsj3xUw" target="_vpg7EWcCEeO5043Nsj3xUw">
+ <styles xmi:type="notation:FontStyle" xmi:id="_-4uQMWcCEeO5043Nsj3xUw"/>
+ <element xmi:type="uml:Extension" href="ExtendedTypesTestsProfile.profile.uml#_-4kfMWcCEeO5043Nsj3xUw"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_-4uQMmcCEeO5043Nsj3xUw" points="[0, -15, 246, 160]$[0, -72, 246, 103]$[-246, -72, 0, 103]$[-246, -137, 0, 38]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-4uQM2cCEeO5043Nsj3xUw" id="(0.46445497630331756,0.14705882352941177)"/>
+ </edges>
+</notation:Diagram>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/model/ExtendedTypesTestsProfile.profile.uml b/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/model/ExtendedTypesTestsProfile.profile.uml
new file mode 100644
index 00000000000..b3609aeb2b7
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/model/ExtendedTypesTestsProfile.profile.uml
@@ -0,0 +1,181 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Profile xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_sK148Gb7EeOyHY5evmQkxA" name="ExtendedTypesTestsProfile" metaclassReference="_VqM5YGcCEeO5043Nsj3xUw _vpg7EGcCEeO5043Nsj3xUw" metamodelReference="_sK148Wb7EeOyHY5evmQkxA">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CwRwkWcDEeO5043Nsj3xUw" source="http://www.eclipse.org/uml2/2.0.0/UML">
+ <contents xmi:type="ecore:EPackage" xmi:id="_5IfFAWcEEeO5043Nsj3xUw" name="ExtendedTypesTestsProfile" nsURI="http:///schemas/ExtendedTypesTestsProfile/_5IfFAGcEEeO5043Nsj3xUw/2" nsPrefix="ExtendedTypesTestsProfile">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_5IgTJGcEEeO5043Nsj3xUw" source="PapyrusVersion">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_5IgTJWcEEeO5043Nsj3xUw" key="Version" value="0.0.3"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_5IgTJmcEEeO5043Nsj3xUw" key="Comment" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_5IgTJ2cEEeO5043Nsj3xUw" key="Copyright" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_5IgTKGcEEeO5043Nsj3xUw" key="Date" value="2013-12-17"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_5IgTKWcEEeO5043Nsj3xUw" key="Author" value=""/>
+ </eAnnotations>
+ <eClassifiers xmi:type="ecore:EClass" xmi:id="_5IfFAmcEEeO5043Nsj3xUw" name="PackageWithComponents">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_5IfFA2cEEeO5043Nsj3xUw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_WnpZEGcCEeO5043Nsj3xUw"/>
+ <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_5IfFBGcEEeO5043Nsj3xUw" name="base_Element" ordered="false" lowerBound="1">
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/>
+ </eStructuralFeatures>
+ </eClassifiers>
+ <eClassifiers xmi:type="ecore:EClass" xmi:id="_5IfFBmcEEeO5043Nsj3xUw" name="Module">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_5IfFB2cEEeO5043Nsj3xUw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_ZAb1YGcCEeO5043Nsj3xUw"/>
+ <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_5IfFCGcEEeO5043Nsj3xUw" name="kind" ordered="false" lowerBound="1" eType="_5IfFDGcEEeO5043Nsj3xUw"/>
+ <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_5IfFCmcEEeO5043Nsj3xUw" name="base_Element" ordered="false" lowerBound="1">
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/>
+ </eStructuralFeatures>
+ </eClassifiers>
+ <eClassifiers xmi:type="ecore:EEnum" xmi:id="_5IfFDGcEEeO5043Nsj3xUw" name="ModuleKind">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_5IfFDWcEEeO5043Nsj3xUw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_hWh9oGcCEeO5043Nsj3xUw"/>
+ <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_5IfFDmcEEeO5043Nsj3xUw" name="Mechanical"/>
+ <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_5IfsEGcEEeO5043Nsj3xUw" name="Electrical" value="1"/>
+ <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_5IfsEWcEEeO5043Nsj3xUw" name="Hydraulic" value="2"/>
+ </eClassifiers>
+ <eClassifiers xmi:type="ecore:EClass" xmi:id="_5IfsEmcEEeO5043Nsj3xUw" name="BlockExtension">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_5IfsE2cEEeO5043Nsj3xUw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_xUCjMGcCEeO5043Nsj3xUw"/>
+ <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_5IfsFGcEEeO5043Nsj3xUw" name="base_Class" ordered="false" lowerBound="1">
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/>
+ </eStructuralFeatures>
+ </eClassifiers>
+ <eClassifiers xmi:type="ecore:EClass" xmi:id="_5IfsFmcEEeO5043Nsj3xUw" name="ClassExtension">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_5IfsF2cEEeO5043Nsj3xUw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_75QOYGcCEeO5043Nsj3xUw"/>
+ <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_5IfsGGcEEeO5043Nsj3xUw" name="base_Class" ordered="false" lowerBound="1">
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/>
+ </eStructuralFeatures>
+ </eClassifiers>
+ </contents>
+ <contents xmi:type="ecore:EPackage" xmi:id="_CD2S8WcEEeO5043Nsj3xUw" name="ExtendedTypesTestsProfile" nsURI="http:///schemas/ExtendedTypesTestsProfile/_CD2S8GcEEeO5043Nsj3xUw/1" nsPrefix="ExtendedTypesTestsProfile">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CD2TDWcEEeO5043Nsj3xUw" source="PapyrusVersion">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CD2TDmcEEeO5043Nsj3xUw" key="Version" value="0.0.2"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CD2TD2cEEeO5043Nsj3xUw" key="Comment" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CD2TEGcEEeO5043Nsj3xUw" key="Copyright" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CD2TEWcEEeO5043Nsj3xUw" key="Date" value="2013-12-17"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CD2TEmcEEeO5043Nsj3xUw" key="Author" value=""/>
+ </eAnnotations>
+ <eClassifiers xmi:type="ecore:EClass" xmi:id="_CD2S8mcEEeO5043Nsj3xUw" name="PackageWithComponent">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CD2S82cEEeO5043Nsj3xUw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_WnpZEGcCEeO5043Nsj3xUw"/>
+ <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_CD2S9GcEEeO5043Nsj3xUw" name="base_Element" ordered="false" lowerBound="1">
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/>
+ </eStructuralFeatures>
+ </eClassifiers>
+ <eClassifiers xmi:type="ecore:EClass" xmi:id="_CD2S9mcEEeO5043Nsj3xUw" name="Module">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CD2S92cEEeO5043Nsj3xUw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_ZAb1YGcCEeO5043Nsj3xUw"/>
+ <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_CD2S-GcEEeO5043Nsj3xUw" name="kind" ordered="false" lowerBound="1" eType="_CD2S_GcEEeO5043Nsj3xUw"/>
+ <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_CD2S-mcEEeO5043Nsj3xUw" name="base_Element" ordered="false" lowerBound="1">
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/>
+ </eStructuralFeatures>
+ </eClassifiers>
+ <eClassifiers xmi:type="ecore:EEnum" xmi:id="_CD2S_GcEEeO5043Nsj3xUw" name="ModuleKind">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CD2S_WcEEeO5043Nsj3xUw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_hWh9oGcCEeO5043Nsj3xUw"/>
+ <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_CD2S_mcEEeO5043Nsj3xUw" name="Mechanical"/>
+ <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_CD2S_2cEEeO5043Nsj3xUw" name="Electrical" value="1"/>
+ <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_CD2TAGcEEeO5043Nsj3xUw" name="Hydraulic" value="2"/>
+ </eClassifiers>
+ <eClassifiers xmi:type="ecore:EClass" xmi:id="_CD2TAWcEEeO5043Nsj3xUw" name="BlockExtension">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CD2TAmcEEeO5043Nsj3xUw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_xUCjMGcCEeO5043Nsj3xUw"/>
+ <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_CD2TA2cEEeO5043Nsj3xUw" name="base_Class" ordered="false" lowerBound="1">
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/>
+ </eStructuralFeatures>
+ </eClassifiers>
+ <eClassifiers xmi:type="ecore:EClass" xmi:id="_CD2TBWcEEeO5043Nsj3xUw" name="ClassExtension">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CD2TBmcEEeO5043Nsj3xUw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_75QOYGcCEeO5043Nsj3xUw"/>
+ <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_CD2TB2cEEeO5043Nsj3xUw" name="base_Class" ordered="false" lowerBound="1">
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/>
+ </eStructuralFeatures>
+ </eClassifiers>
+ </contents>
+ <contents xmi:type="ecore:EPackage" xmi:id="_CwRwkmcDEeO5043Nsj3xUw" name="Profile" nsURI="http:///schemas/Profile/_CwRwkGcDEeO5043Nsj3xUw/0" nsPrefix="Profile">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CwbhlGcDEeO5043Nsj3xUw" source="PapyrusVersion">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CwbhlWcDEeO5043Nsj3xUw" key="Version" value="0.0.1"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CwbhlmcDEeO5043Nsj3xUw" key="Comment" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Cwbhl2cDEeO5043Nsj3xUw" key="Copyright" value=""/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CwbhmGcDEeO5043Nsj3xUw" key="Date" value="2013-12-17"/>
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CwbhmWcDEeO5043Nsj3xUw" key="Author" value=""/>
+ </eAnnotations>
+ <eClassifiers xmi:type="ecore:EClass" xmi:id="_CwRwk2cDEeO5043Nsj3xUw" name="PackageWithComponent">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CwRwlGcDEeO5043Nsj3xUw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_WnpZEGcCEeO5043Nsj3xUw"/>
+ <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_CwRwlWcDEeO5043Nsj3xUw" name="base_Element" ordered="false" lowerBound="1">
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/>
+ </eStructuralFeatures>
+ </eClassifiers>
+ <eClassifiers xmi:type="ecore:EClass" xmi:id="_CwRwl2cDEeO5043Nsj3xUw" name="Module">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CwRwmGcDEeO5043Nsj3xUw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_ZAb1YGcCEeO5043Nsj3xUw"/>
+ <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_CwRwmWcDEeO5043Nsj3xUw" name="kind" ordered="false" lowerBound="1" eType="_CwRwnWcDEeO5043Nsj3xUw"/>
+ <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_CwRwm2cDEeO5043Nsj3xUw" name="base_Element" ordered="false" lowerBound="1">
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/>
+ </eStructuralFeatures>
+ </eClassifiers>
+ <eClassifiers xmi:type="ecore:EEnum" xmi:id="_CwRwnWcDEeO5043Nsj3xUw" name="ModuleKind">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CwRwnmcDEeO5043Nsj3xUw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_hWh9oGcCEeO5043Nsj3xUw"/>
+ <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_CwRwn2cDEeO5043Nsj3xUw" name="Mechanical"/>
+ <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_CwRwoGcDEeO5043Nsj3xUw" name="Electrical" value="1"/>
+ <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_CwRwoWcDEeO5043Nsj3xUw" name="Hydraulic" value="2"/>
+ </eClassifiers>
+ <eClassifiers xmi:type="ecore:EClass" xmi:id="_CwRwomcDEeO5043Nsj3xUw" name="BlockExtension">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CwRwo2cDEeO5043Nsj3xUw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_xUCjMGcCEeO5043Nsj3xUw"/>
+ <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_CwRwpGcDEeO5043Nsj3xUw" name="base_Class" ordered="false" lowerBound="1">
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/>
+ </eStructuralFeatures>
+ </eClassifiers>
+ <eClassifiers xmi:type="ecore:EClass" xmi:id="_CwRwpmcDEeO5043Nsj3xUw" name="ClassExtension">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CwRwp2cDEeO5043Nsj3xUw" source="http://www.eclipse.org/uml2/2.0.0/UML" references="_75QOYGcCEeO5043Nsj3xUw"/>
+ <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_CwRwqGcDEeO5043Nsj3xUw" name="base_Class" ordered="false" lowerBound="1">
+ <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/>
+ </eStructuralFeatures>
+ </eClassifiers>
+ </contents>
+ </eAnnotations>
+ <elementImport xmi:type="uml:ElementImport" xmi:id="_VqM5YGcCEeO5043Nsj3xUw" alias="Element">
+ <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/>
+ </elementImport>
+ <elementImport xmi:type="uml:ElementImport" xmi:id="_vpg7EGcCEeO5043Nsj3xUw" alias="Class">
+ <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
+ </elementImport>
+ <packageImport xmi:type="uml:PackageImport" xmi:id="_sK148Wb7EeOyHY5evmQkxA">
+ <importedPackage xmi:type="uml:Model" href="pathmap://UML_METAMODELS/UML.metamodel.uml#_0"/>
+ </packageImport>
+ <packageImport xmi:type="uml:PackageImport" xmi:id="_sK148mb7EeOyHY5evmQkxA">
+ <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
+ </packageImport>
+ <packagedElement xmi:type="uml:Stereotype" xmi:id="_WnpZEGcCEeO5043Nsj3xUw" name="PackageWithComponents">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_tmALMGcCEeO5043Nsj3xUw" name="base_Element" association="_tmALMWcCEeO5043Nsj3xUw">
+ <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/>
+ </ownedAttribute>
+ </packagedElement>
+ <packagedElement xmi:type="uml:Stereotype" xmi:id="_ZAb1YGcCEeO5043Nsj3xUw" name="Module">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_ekTGkGcCEeO5043Nsj3xUw" name="kind" visibility="public" type="_hWh9oGcCEeO5043Nsj3xUw">
+ <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_BtVF0GcDEeO5043Nsj3xUw" value="1"/>
+ <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_BtVF0WcDEeO5043Nsj3xUw" value="1"/>
+ <defaultValue xmi:type="uml:LiteralString" xmi:id="_BtVF0mcDEeO5043Nsj3xUw">
+ <value xsi:nil="true"/>
+ </defaultValue>
+ </ownedAttribute>
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_uAyCsGcCEeO5043Nsj3xUw" name="base_Element" association="_uAyCsWcCEeO5043Nsj3xUw">
+ <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/>
+ </ownedAttribute>
+ </packagedElement>
+ <packagedElement xmi:type="uml:Enumeration" xmi:id="_hWh9oGcCEeO5043Nsj3xUw" name="ModuleKind">
+ <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ixb1YGcCEeO5043Nsj3xUw" name="Mechanical"/>
+ <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_motB4GcCEeO5043Nsj3xUw" name="Electrical"/>
+ <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_n328oGcCEeO5043Nsj3xUw" name="Hydraulic"/>
+ </packagedElement>
+ <packagedElement xmi:type="uml:Extension" xmi:id="_tmALMWcCEeO5043Nsj3xUw" name="E_PackageWithComponents_Element1" memberEnd="_tmALMmcCEeO5043Nsj3xUw _tmALMGcCEeO5043Nsj3xUw">
+ <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_tmALMmcCEeO5043Nsj3xUw" name="extension_PackageWithComponents" type="_WnpZEGcCEeO5043Nsj3xUw" aggregation="composite" association="_tmALMWcCEeO5043Nsj3xUw"/>
+ </packagedElement>
+ <packagedElement xmi:type="uml:Extension" xmi:id="_uAyCsWcCEeO5043Nsj3xUw" name="E_Module_Element1" memberEnd="_uAyCsmcCEeO5043Nsj3xUw _uAyCsGcCEeO5043Nsj3xUw">
+ <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_uAyCsmcCEeO5043Nsj3xUw" name="extension_Module" type="_ZAb1YGcCEeO5043Nsj3xUw" aggregation="composite" association="_uAyCsWcCEeO5043Nsj3xUw"/>
+ </packagedElement>
+ <packagedElement xmi:type="uml:Stereotype" xmi:id="_xUCjMGcCEeO5043Nsj3xUw" name="BlockExtension">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_-h9WAGcCEeO5043Nsj3xUw" name="base_Class" association="_-h9WAWcCEeO5043Nsj3xUw">
+ <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
+ </ownedAttribute>
+ </packagedElement>
+ <packagedElement xmi:type="uml:Stereotype" xmi:id="_75QOYGcCEeO5043Nsj3xUw" name="ClassExtension">
+ <ownedAttribute xmi:type="uml:Property" xmi:id="_-4kfMGcCEeO5043Nsj3xUw" name="base_Class" association="_-4kfMWcCEeO5043Nsj3xUw">
+ <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Class"/>
+ </ownedAttribute>
+ </packagedElement>
+ <packagedElement xmi:type="uml:Extension" xmi:id="_-h9WAWcCEeO5043Nsj3xUw" name="E_BlockExtension_Class1" memberEnd="_-h9WAmcCEeO5043Nsj3xUw _-h9WAGcCEeO5043Nsj3xUw">
+ <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_-h9WAmcCEeO5043Nsj3xUw" name="extension_BlockExtension" type="_xUCjMGcCEeO5043Nsj3xUw" aggregation="composite" association="_-h9WAWcCEeO5043Nsj3xUw"/>
+ </packagedElement>
+ <packagedElement xmi:type="uml:Extension" xmi:id="_-4kfMWcCEeO5043Nsj3xUw" name="E_ClassExtension_Class1" memberEnd="_-4kfMmcCEeO5043Nsj3xUw _-4kfMGcCEeO5043Nsj3xUw">
+ <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_-4kfMmcCEeO5043Nsj3xUw" name="extension_ClassExtension" type="_75QOYGcCEeO5043Nsj3xUw" aggregation="composite" association="_-4kfMWcCEeO5043Nsj3xUw"/>
+ </packagedElement>
+</uml:Profile>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/model/Test.extendedtypes b/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/model/Test.extendedtypes
new file mode 100644
index 00000000000..b7220d6d310
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/model/Test.extendedtypes
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<extendedtypes:ExtendedElementTypeSet xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:extendedtypes="http://www.eclipse.org/papyrus/infra/extendedtypes/1.0" xmlns:invariantcontainerconfiguration="http://www.eclipse.org/papyrus/infra/extendedtypes/semantictype/invariant/container/1.0" xmlns:invariantsemantictypeconfiguration="http://www.eclipse.org/papyrus/infra/extendedtypes/semantictype/invariant/1.0" xmlns:invariantstereotypeconfiguration="http://www.eclipse.org/papyrus/infra/extendedtypes/semantictype/invariant/stereotype/1.0" name="Tests extended types" identifier="org.eclipse.papyrus.infra.extendedtypes.tests.tests">
+ <elementType xsi:type="invariantsemantictypeconfiguration:InvariantSemanticTypeConfiguration" name="Component in specific package only" identifier="org.eclipse.papyrus.infra.extendedtypes.tests.specificcomponent">
+ <iconEntry iconPath="icons/full/obj16/add_obj.gif" bundleId="org.eclipse.ui"/>
+ <specializedTypesID>org.eclipse.papyrus.uml.Component</specializedTypesID>
+ <invariantRuleConfiguration xsi:type="invariantcontainerconfiguration:InvariantContainerConfiguration">
+ <permissions childType="org.eclipse.papyrus.uml.Package"/>
+ <permissions childType="org.eclipse.papyrus.infra.extendedtypes.tests.packagewithcomponentsonly" isPermitted="true" isStrict="true"/>
+ </invariantRuleConfiguration>
+ </elementType>
+ <elementType xsi:type="invariantsemantictypeconfiguration:InvariantSemanticTypeConfiguration" name="PackageWithComponentsOnly" description="Package that can contain only components" identifier="org.eclipse.papyrus.infra.extendedtypes.tests.packagewithcomponentsonly">
+ <specializedTypesID>org.eclipse.papyrus.uml.Package</specializedTypesID>
+ <invariantRuleConfiguration xsi:type="invariantstereotypeconfiguration:InvariantStereotypeConfiguration" stereotypeQualifiedName="ExtendedTypesTestsProfile::PackageWithComponents"/>
+ </elementType>
+</extendedtypes:ExtendedElementTypeSet>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/model/Test.palette.xml b/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/model/Test.palette.xml
new file mode 100644
index 00000000000..809b6ce6015
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/model/Test.palette.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<paletteDefinition>
+ <content>
+ <drawer iconpath="/icons/drawer.gif" id="ExtendedTypesTests_Drawer"
+ name="Extended Types">
+ <aspectTool description="Create a new Restricted Component"
+ iconpath="platform:/plugin/org.eclipse.papyrus.sysml/icons/blocks/Block.gif"
+ id="extendedtypestests.restrictedcomponent" name="Restricted Component"
+ refToolId="org.eclipse.papyrus.infra.extendedtypes.tests.specificcomponent"></aspectTool>
+ </drawer>
+ </content>
+</paletteDefinition> \ No newline at end of file
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/model/Test1.extendedtypes b/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/model/Test1.extendedtypes
deleted file mode 100644
index 9eca2d787d3..00000000000
--- a/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/model/Test1.extendedtypes
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<extendedtypes:ExtendedElementTypeSet xmlns:configuration="http://www.eclipse.org/papyrus/core/queries/0.7" xmlns:extendedtypes="http://www.eclipse.org/papyrus/diagram/types/extendedtypes/0.7" id="org.eclipse.papyrus.infra.extendedtypes.tests.test1">
- <elementType name="TestClass1ExtendedElementType " id="org.eclipse.papyrus.infra.extendedtypes.tests.Class1" preValidation="configuration:ModiscoQueryConfiguration ../../org.eclipse.papyrus.core.queries.test/resources/IsNameLongerThanQueryConfiguration1.configuration#/">
- <iconEntry iconPath="/icons/full/obj16/Class.gif" bundleId="org.eclipse.uml2.uml.edit"/>
- <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>
- </elementType>
- <elementType name="TestClassInPackageExtendedElementType " id="org.eclipse.papyrus.infra.extendedtypes.tests.ClassInPackageOnly" preValidation="configuration:ModiscoQueryConfiguration ../../org.eclipse.papyrus.core.queries.test/resources/IsNameLongerThanQueryConfiguration1.configuration#/ configuration:ModiscoQueryConfiguration ../../org.eclipse.papyrus.core.queries.test/resources/IsStrictInstanceOfPackage.configuration#/">
- <iconEntry iconPath="/icons/full/obj16/Class.gif" bundleId="org.eclipse.uml2.uml.edit"/>
- <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>
- </elementType>
- <elementType name="TestClassInModelExtendedElementType " id="org.eclipse.papyrus.infra.extendedtypes.tests.ClassInModelOnly" preValidation="configuration:ModiscoQueryConfiguration ../../org.eclipse.papyrus.core.queries.test/resources/IsStrictInstanceOfModel.configuration#/ configuration:ModiscoQueryConfiguration ../../org.eclipse.papyrus.core.queries.test/resources/IsNameLongerThanQueryConfiguration1.configuration#/">
- <iconEntry iconPath="/icons/full/obj16/Class.gif" bundleId="org.eclipse.uml2.uml.edit"/>
- <specializedTypesID>org.eclipse.papyrus.uml.Class</specializedTypesID>
- </elementType>
-</extendedtypes:ExtendedElementTypeSet>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/model/TestMenu.xmi b/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/model/TestMenu.xmi
new file mode 100644
index 00000000000..8a211a6f7de
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/model/TestMenu.xmi
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="ASCII"?>
+<ElementCreationMenuModel:Folder
+ xmi:version="2.0"
+ xmlns:xmi="http://www.omg.org/XMI"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ElementCreationMenuModel="http://ElementCreationMenuModel"
+ label="Test For Extended Types">
+ <menu xsi:type="ElementCreationMenuModel:CreationMenu"
+ label="specific Component"
+ icon=""
+ elementTypeIdRef="org.eclipse.papyrus.infra.extendedtypes.tests.specificcomponent"/>
+</ElementCreationMenuModel:Folder>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/model/model.di b/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/model/model.di
index 65f88a8052c..d8872ffde77 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/model/model.di
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/model/model.di
@@ -1,17 +1,20 @@
-<?xml version="1.0" encoding="ASCII"?>
-<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi" xmi:id="_YCELMP1VEd-WkaQf4YgINA">
- <pageList xmi:id="_YCELMf1VEd-WkaQf4YgINA">
- <availablePage xmi:id="_YCg3IP1VEd-WkaQf4YgINA">
- <emfPageIdentifier href="model.notation#_X_rlkP1VEd-WkaQf4YgINA"/>
- </availablePage>
- </pageList>
- <sashModel xmi:id="_YCELMv1VEd-WkaQf4YgINA" currentSelection="_YCELNP1VEd-WkaQf4YgINA">
- <windows xmi:id="_YCELM_1VEd-WkaQf4YgINA">
- <children xsi:type="di:TabFolder" xmi:id="_YCELNP1VEd-WkaQf4YgINA">
- <children xmi:id="_YCg3If1VEd-WkaQf4YgINA">
- <emfPageIdentifier href="model.notation#_X_rlkP1VEd-WkaQf4YgINA"/>
- </children>
- </children>
- </windows>
- </sashModel>
-</di:SashWindowsMngr>
+<?xml version="1.0" encoding="UTF-8"?>
+<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi" xmi:id="_YCELMP1VEd-WkaQf4YgINA">
+ <pageList xmi:id="_YCELMf1VEd-WkaQf4YgINA">
+ <availablePage>
+ <emfPageIdentifier href="model.notation#_B7UjoGe1EeOCxY1uxkJbkw"/>
+ </availablePage>
+ <availablePage>
+ <emfPageIdentifier href="model.notation#_MSbgYGfAEeOeZsTtUeHY9w"/>
+ </availablePage>
+ </pageList>
+ <sashModel xmi:id="_YCELMv1VEd-WkaQf4YgINA" currentSelection="_YCELNP1VEd-WkaQf4YgINA">
+ <windows xmi:id="_YCELM_1VEd-WkaQf4YgINA">
+ <children xsi:type="di:TabFolder" xmi:id="_YCELNP1VEd-WkaQf4YgINA">
+ <children>
+ <emfPageIdentifier href="model.notation#_MSbgYGfAEeOeZsTtUeHY9w"/>
+ </children>
+ </children>
+ </windows>
+ </sashModel>
+</di:SashWindowsMngr>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/model/model.notation b/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/model/model.notation
index 6780a566229..592c5c74870 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/model/model.notation
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/model/model.notation
@@ -1,39 +1,111 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/3.0.0/UML" xmi:id="_X_rlkP1VEd-WkaQf4YgINA" type="PapyrusUMLClassDiagram" name="Main" measurementUnit="Pixel">
- <children xmi:type="notation:Shape" xmi:id="_b3oukP1VEd-WkaQf4YgINA" type="2007" fontHeight="8" lineColor="0">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_b41BYP1VEd-WkaQf4YgINA" source="ShadowFigure">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_b41BYf1VEd-WkaQf4YgINA" key="ShadowFigure_Value" value="false"/>
- </eAnnotations>
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_b4-yYP1VEd-WkaQf4YgINA" source="displayNameLabelIcon">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_b4-yYf1VEd-WkaQf4YgINA" key="displayNameLabelIcon_value" value="false"/>
- </eAnnotations>
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_b4-yYv1VEd-WkaQf4YgINA" source="QualifiedName">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_b4-yY_1VEd-WkaQf4YgINA" key="QualifiedNameDepth" value="1000"/>
- </eAnnotations>
- <children xmi:type="notation:DecorationNode" xmi:id="_b5H8UP1VEd-WkaQf4YgINA" type="5026"/>
- <children xmi:type="notation:DecorationNode" xmi:id="_b5H8Uf1VEd-WkaQf4YgINA" type="7016">
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b5H8Uv1VEd-WkaQf4YgINA"/>
- </children>
- <element xmi:type="uml:Package" href="model.uml#_b1QI8P1VEd-WkaQf4YgINA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_b3oukf1VEd-WkaQf4YgINA" x="91" y="133" width="173" height="144"/>
- </children>
- <children xmi:type="notation:Shape" xmi:id="_dHWqAf1VEd-WkaQf4YgINA" type="2007" fontHeight="8" lineColor="0">
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_dHWqA_1VEd-WkaQf4YgINA" source="ShadowFigure">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_dHWqBP1VEd-WkaQf4YgINA" key="ShadowFigure_Value" value="false"/>
- </eAnnotations>
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_dHWqBf1VEd-WkaQf4YgINA" source="displayNameLabelIcon">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_dHWqBv1VEd-WkaQf4YgINA" key="displayNameLabelIcon_value" value="false"/>
- </eAnnotations>
- <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_dHWqB_1VEd-WkaQf4YgINA" source="QualifiedName">
- <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_dHgbAP1VEd-WkaQf4YgINA" key="QualifiedNameDepth" value="1000"/>
- </eAnnotations>
- <children xmi:type="notation:DecorationNode" xmi:id="_dHgbAf1VEd-WkaQf4YgINA" type="5026"/>
- <children xmi:type="notation:DecorationNode" xmi:id="_dHgbAv1VEd-WkaQf4YgINA" type="7016">
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dHgbA_1VEd-WkaQf4YgINA"/>
- </children>
- <element xmi:type="uml:Package" href="model.uml#_dHWqAP1VEd-WkaQf4YgINA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dHWqAv1VEd-WkaQf4YgINA" x="392" y="127" width="228" height="183"/>
- </children>
- <styles xmi:type="notation:DiagramStyle" xmi:id="_X_rlkf1VEd-WkaQf4YgINA"/>
- <element xmi:type="uml:Model" href="model.uml#_X66aUf1VEd-WkaQf4YgINA"/>
-</notation:Diagram>
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML">
+ <notation:Diagram xmi:id="_B7UjoGe1EeOCxY1uxkJbkw" type="BlockDefinition" name="Main" measurementUnit="Pixel">
+ <styles xmi:type="notation:DiagramStyle" xmi:id="_B7UjoWe1EeOCxY1uxkJbkw"/>
+ <element xmi:type="uml:Model" href="model.uml#_X66aUf1VEd-WkaQf4YgINA"/>
+ </notation:Diagram>
+ <notation:Diagram xmi:id="_MSbgYGfAEeOeZsTtUeHY9w" type="PapyrusUMLClassDiagram" name="ClassDiagram" measurementUnit="Pixel">
+ <children xmi:type="notation:Shape" xmi:id="_NqqeoGfAEeOeZsTtUeHY9w" type="2007">
+ <children xmi:type="notation:DecorationNode" xmi:id="_NqqeomfAEeOeZsTtUeHY9w" type="5026"/>
+ <children xmi:type="notation:DecorationNode" xmi:id="_Nqqeo2fAEeOeZsTtUeHY9w" type="7016">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_NqwlQGfAEeOeZsTtUeHY9w" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NqwlQWfAEeOeZsTtUeHY9w" key="showTitle" value="true"/>
+ </eAnnotations>
+ <children xmi:type="notation:Shape" xmi:id="_SYI6YGfAEeOeZsTtUeHY9w" type="3021">
+ <children xmi:type="notation:DecorationNode" xmi:id="_SYI6YmfAEeOeZsTtUeHY9w" type="5043"/>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_SYJhcGfAEeOeZsTtUeHY9w" type="7023">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_SYL9sGfAEeOeZsTtUeHY9w" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_SYL9sWfAEeOeZsTtUeHY9w" key="showTitle" value="true"/>
+ </eAnnotations>
+ <styles xmi:type="notation:TitleStyle" xmi:id="_SYJhcWfAEeOeZsTtUeHY9w"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_SYJhcmfAEeOeZsTtUeHY9w"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_SYJhc2fAEeOeZsTtUeHY9w"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SYJhdGfAEeOeZsTtUeHY9w"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_SYJhdWfAEeOeZsTtUeHY9w" type="7024">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_SYMkwGfAEeOeZsTtUeHY9w" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_SYMkwWfAEeOeZsTtUeHY9w" key="showTitle" value="true"/>
+ </eAnnotations>
+ <styles xmi:type="notation:TitleStyle" xmi:id="_SYJhdmfAEeOeZsTtUeHY9w"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_SYJhd2fAEeOeZsTtUeHY9w"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_SYJheGfAEeOeZsTtUeHY9w"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SYJheWfAEeOeZsTtUeHY9w"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_SYJhemfAEeOeZsTtUeHY9w" type="7025">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_SYNL0GfAEeOeZsTtUeHY9w" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_SYNL0WfAEeOeZsTtUeHY9w" key="showTitle" value="true"/>
+ </eAnnotations>
+ <styles xmi:type="notation:TitleStyle" xmi:id="_SYJhe2fAEeOeZsTtUeHY9w"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_SYJhfGfAEeOeZsTtUeHY9w"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_SYJhfWfAEeOeZsTtUeHY9w"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SYJhfmfAEeOeZsTtUeHY9w"/>
+ </children>
+ <element xmi:type="uml:Component" href="model.uml#_TCAGQGc9EeOeFPMFS4Wv8Q"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SYI6YWfAEeOeZsTtUeHY9w" x="45" y="15"/>
+ </children>
+ <styles xmi:type="notation:TitleStyle" xmi:id="_NqqepGfAEeOeZsTtUeHY9w"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NqqepWfAEeOeZsTtUeHY9w"/>
+ </children>
+ <element xmi:type="uml:Package" href="model.uml#_Caa0gGczEeO-Gf1_f5pJdw"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NqqeoWfAEeOeZsTtUeHY9w" x="186" y="281" width="355" height="168"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_Oclq0GfAEeOeZsTtUeHY9w" type="2007">
+ <children xmi:type="notation:DecorationNode" xmi:id="_OcmR4GfAEeOeZsTtUeHY9w" type="5026"/>
+ <children xmi:type="notation:DecorationNode" xmi:id="_OcmR4WfAEeOeZsTtUeHY9w" type="7016">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_OcmR5GfAEeOeZsTtUeHY9w" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Ocm48GfAEeOeZsTtUeHY9w" key="showTitle" value="true"/>
+ </eAnnotations>
+ <styles xmi:type="notation:TitleStyle" xmi:id="_OcmR4mfAEeOeZsTtUeHY9w"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OcmR42fAEeOeZsTtUeHY9w"/>
+ </children>
+ <element xmi:type="uml:Package" href="model.uml#_dHWqAP1VEd-WkaQf4YgINA"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Oclq0WfAEeOeZsTtUeHY9w" x="523" y="99" width="339" height="146"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_Pf9zYGfAEeOeZsTtUeHY9w" type="2007">
+ <children xmi:type="notation:DecorationNode" xmi:id="_Pf9zYmfAEeOeZsTtUeHY9w" type="5026"/>
+ <children xmi:type="notation:DecorationNode" xmi:id="_Pf9zY2fAEeOeZsTtUeHY9w" type="7016">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Pf-acGfAEeOeZsTtUeHY9w" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Pf-acWfAEeOeZsTtUeHY9w" key="showTitle" value="true"/>
+ </eAnnotations>
+ <children xmi:type="notation:Shape" xmi:id="_M-FFcGfAEeOeZsTtUeHY9w" type="2002">
+ <children xmi:type="notation:DecorationNode" xmi:id="_M-JW4GfAEeOeZsTtUeHY9w" type="5005"/>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_M-OPYGfAEeOeZsTtUeHY9w" type="7002">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_M-q7UGfAEeOeZsTtUeHY9w" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_M-riYGfAEeOeZsTtUeHY9w" key="showTitle" value="true"/>
+ </eAnnotations>
+ <styles xmi:type="notation:TitleStyle" xmi:id="_M-OPYWfAEeOeZsTtUeHY9w"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_M-OPYmfAEeOeZsTtUeHY9w"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_M-OPY2fAEeOeZsTtUeHY9w"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_M-OPZGfAEeOeZsTtUeHY9w"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_M-OPZWfAEeOeZsTtUeHY9w" type="7003">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_M-sJcGfAEeOeZsTtUeHY9w" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_M-sJcWfAEeOeZsTtUeHY9w" key="showTitle" value="true"/>
+ </eAnnotations>
+ <styles xmi:type="notation:TitleStyle" xmi:id="_M-OPZmfAEeOeZsTtUeHY9w"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_M-OPZ2fAEeOeZsTtUeHY9w"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_M-OPaGfAEeOeZsTtUeHY9w"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_M-OPaWfAEeOeZsTtUeHY9w"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_M-O2cGfAEeOeZsTtUeHY9w" type="7004">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_M-swgGfAEeOeZsTtUeHY9w" source="PapyrusCSSForceValue">
+ <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_M-swgWfAEeOeZsTtUeHY9w" key="showTitle" value="true"/>
+ </eAnnotations>
+ <styles xmi:type="notation:TitleStyle" xmi:id="_M-O2cWfAEeOeZsTtUeHY9w"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_M-O2cmfAEeOeZsTtUeHY9w"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_M-O2c2fAEeOeZsTtUeHY9w"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_M-O2dGfAEeOeZsTtUeHY9w"/>
+ </children>
+ <element xmi:type="uml:Component" href="model.uml#_M9hEwGfAEeOeZsTtUeHY9w"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_M-FFcWfAEeOeZsTtUeHY9w" x="31" y="18"/>
+ </children>
+ <styles xmi:type="notation:TitleStyle" xmi:id="_Pf9zZGfAEeOeZsTtUeHY9w"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Pf9zZWfAEeOeZsTtUeHY9w"/>
+ </children>
+ <element xmi:type="uml:Package" href="model.uml#_b1QI8P1VEd-WkaQf4YgINA"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Pf9zYWfAEeOeZsTtUeHY9w" x="188" y="74" width="269" height="191"/>
+ </children>
+ <styles xmi:type="notation:DiagramStyle" xmi:id="_MScHcGfAEeOeZsTtUeHY9w"/>
+ <element xmi:type="uml:Model" href="model.uml#_X66aUf1VEd-WkaQf4YgINA"/>
+ </notation:Diagram>
+</xmi:XMI>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/model/model.uml b/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/model/model.uml
index acc9d86ef26..03d6a008002 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/model/model.uml
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/model/model.uml
@@ -1,8 +1,91 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<uml:Model xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:uml="http://www.eclipse.org/uml2/3.0.0/UML" xmi:id="_X66aUf1VEd-WkaQf4YgINA" name="Model">
- <packageImport xmi:id="_X66aUv1VEd-WkaQf4YgINA">
- <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
- </packageImport>
- <packagedElement xmi:type="uml:Package" xmi:id="_b1QI8P1VEd-WkaQf4YgINA" name="P1"/>
- <packagedElement xmi:type="uml:Package" xmi:id="_dHWqAP1VEd-WkaQf4YgINA" name="Package 2"/>
-</uml:Model>
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ExtendedTypesTestsProfile="http:///schemas/ExtendedTypesTestsProfile/_5IfFAGcEEeO5043Nsj3xUw/2" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xsi:schemaLocation="http:///schemas/ExtendedTypesTestsProfile/_5IfFAGcEEeO5043Nsj3xUw/2 ExtendedTypesTestsProfile.profile.uml#_5IfFAWcEEeO5043Nsj3xUw">
+ <uml:Model xmi:id="_X66aUf1VEd-WkaQf4YgINA" name="Model">
+ <packageImport xmi:type="uml:PackageImport" xmi:id="_X66aUv1VEd-WkaQf4YgINA">
+ <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
+ </packageImport>
+ <packagedElement xmi:type="uml:Package" xmi:id="_b1QI8P1VEd-WkaQf4YgINA" name="PackageWithComponents">
+ <packagedElement xmi:type="uml:Component" xmi:id="_Y-QksGe-EeOeZsTtUeHY9w" name="Component2"/>
+ <packagedElement xmi:type="uml:Component" xmi:id="_M9hEwGfAEeOeZsTtUeHY9w" name="Component1"/>
+ </packagedElement>
+ <packagedElement xmi:type="uml:Package" xmi:id="_dHWqAP1VEd-WkaQf4YgINA" name="PackageWithAllElements"/>
+ <packagedElement xmi:type="uml:Package" xmi:id="_Caa0gGczEeO-Gf1_f5pJdw" name="OtherPackageWithComponents">
+ <packagedElement xmi:type="uml:Component" xmi:id="_8PG7EGctEeOYUqC_A3tTEw" name="Component"/>
+ <packagedElement xmi:type="uml:Component" xmi:id="_TCAGQGc9EeOeFPMFS4Wv8Q" name="Component1"/>
+ </packagedElement>
+ <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_dj-KoGcFEeOea9k8XF7uAg">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_dkH7oGcFEeOea9k8XF7uAg" source="http://www.eclipse.org/uml2/2.0.0/UML">
+ <references xmi:type="ecore:EPackage" href="ExtendedTypesTestsProfile.profile.uml#_5IfFAWcEEeO5043Nsj3xUw"/>
+ </eAnnotations>
+ <appliedProfile xmi:type="uml:Profile" href="ExtendedTypesTestsProfile.profile.uml#_sK148Gb7EeOyHY5evmQkxA"/>
+ </profileApplication>
+ <profileApplication xmi:type="uml:ProfileApplication" xmi:id="__7kSYGe0EeOCxY1uxkJbkw">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__8L9cGe0EeOCxY1uxkJbkw" source="http://www.eclipse.org/uml2/2.0.0/UML">
+ <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/0.7.0/SysML#/"/>
+ </eAnnotations>
+ <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML_PROFILES/SysML.profile.uml#_TZ_nULU5EduiKqCzJMWbGw"/>
+ </profileApplication>
+ <profileApplication xmi:type="uml:ProfileApplication" xmi:id="__8L9cWe0EeOCxY1uxkJbkw">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__8e4YGe0EeOCxY1uxkJbkw" source="http://www.eclipse.org/uml2/2.0.0/UML">
+ <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/0.7.0/SysML#//modelelements"/>
+ </eAnnotations>
+ <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML_PROFILES/SysML.profile.uml#_Gx8MgLX7EduFmqQsrNB9lw"/>
+ </profileApplication>
+ <profileApplication xmi:type="uml:ProfileApplication" xmi:id="__8e4YWe0EeOCxY1uxkJbkw">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__8opYGe0EeOCxY1uxkJbkw" source="http://www.eclipse.org/uml2/2.0.0/UML">
+ <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/0.7.0/SysML#//blocks"/>
+ </eAnnotations>
+ <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML_PROFILES/SysML.profile.uml#_fSw28LX7EduFmqQsrNB9lw"/>
+ </profileApplication>
+ <profileApplication xmi:type="uml:ProfileApplication" xmi:id="__8opYWe0EeOCxY1uxkJbkw">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__87kUGe0EeOCxY1uxkJbkw" source="http://www.eclipse.org/uml2/2.0.0/UML">
+ <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/0.7.0/SysML#//portandflows"/>
+ </eAnnotations>
+ <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML_PROFILES/SysML.profile.uml#_rpx28LX7EduFmqQsrNB9lw"/>
+ </profileApplication>
+ <profileApplication xmi:type="uml:ProfileApplication" xmi:id="__87kUWe0EeOCxY1uxkJbkw">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__9OfQGe0EeOCxY1uxkJbkw" source="http://www.eclipse.org/uml2/2.0.0/UML">
+ <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/0.7.0/SysML#//constraints"/>
+ </eAnnotations>
+ <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML_PROFILES/SysML.profile.uml#_5WYJ0LX7EduFmqQsrNB9lw"/>
+ </profileApplication>
+ <profileApplication xmi:type="uml:ProfileApplication" xmi:id="__9OfQWe0EeOCxY1uxkJbkw">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__9YQQGe0EeOCxY1uxkJbkw" source="http://www.eclipse.org/uml2/2.0.0/UML">
+ <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/0.7.0/SysML#//activities"/>
+ </eAnnotations>
+ <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML_PROFILES/SysML.profile.uml#_C2zXMLX8EduFmqQsrNB9lw"/>
+ </profileApplication>
+ <profileApplication xmi:type="uml:ProfileApplication" xmi:id="__9YQQWe0EeOCxY1uxkJbkw">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__9rLMGe0EeOCxY1uxkJbkw" source="http://www.eclipse.org/uml2/2.0.0/UML">
+ <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/0.7.0/SysML#//allocations"/>
+ </eAnnotations>
+ <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML_PROFILES/SysML.profile.uml#_NxdG4LX8EduFmqQsrNB9lw"/>
+ </profileApplication>
+ <profileApplication xmi:type="uml:ProfileApplication" xmi:id="__9rLMWe0EeOCxY1uxkJbkw">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__90VIGe0EeOCxY1uxkJbkw" source="http://www.eclipse.org/uml2/2.0.0/UML">
+ <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/0.7.0/SysML#//requirements"/>
+ </eAnnotations>
+ <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML_PROFILES/SysML.profile.uml#_OOJC4LX8EduFmqQsrNB9lw"/>
+ </profileApplication>
+ <profileApplication xmi:type="uml:ProfileApplication" xmi:id="__90VIWe0EeOCxY1uxkJbkw">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__-H3IGe0EeOCxY1uxkJbkw" source="http://www.eclipse.org/uml2/2.0.0/UML">
+ <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/0.7.0/SysML#//interactions"/>
+ </eAnnotations>
+ <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML_PROFILES/SysML.profile.uml#_meOioLX8EduFmqQsrNB9lw"/>
+ </profileApplication>
+ <profileApplication xmi:type="uml:ProfileApplication" xmi:id="__-H3IWe0EeOCxY1uxkJbkw">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__-RBEGe0EeOCxY1uxkJbkw" source="http://www.eclipse.org/uml2/2.0.0/UML">
+ <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/0.7.0/SysML#//statemachines"/>
+ </eAnnotations>
+ <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML_PROFILES/SysML.profile.uml#_nAF5kLX8EduFmqQsrNB9lw"/>
+ </profileApplication>
+ <profileApplication xmi:type="uml:ProfileApplication" xmi:id="__-RBEWe0EeOCxY1uxkJbkw">
+ <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__-ayEGe0EeOCxY1uxkJbkw" source="http://www.eclipse.org/uml2/2.0.0/UML">
+ <references xmi:type="ecore:EPackage" href="http://www.eclipse.org/papyrus/0.7.0/SysML#//usecases"/>
+ </eAnnotations>
+ <appliedProfile xmi:type="uml:Profile" href="pathmap://SysML_PROFILES/SysML.profile.uml#_neZmMLX8EduFmqQsrNB9lw"/>
+ </profileApplication>
+ </uml:Model>
+ <ExtendedTypesTestsProfile:PackageWithComponents xmi:id="_keWi0GcFEeOea9k8XF7uAg" base_Element="_b1QI8P1VEd-WkaQf4YgINA"/>
+ <ExtendedTypesTestsProfile:PackageWithComponents xmi:id="_FHOZAGczEeO-Gf1_f5pJdw" base_Element="_Caa0gGczEeO-Gf1_f5pJdw"/>
+</xmi:XMI>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/org.eclipse.papyrus.extendedtypes.tests.launch b/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/org.eclipse.papyrus.infra.extendedtypes.tests.launch
index cbfc9a9841f..869cd7daab0 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/org.eclipse.papyrus.extendedtypes.tests.launch
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/org.eclipse.papyrus.infra.extendedtypes.tests.launch
@@ -1,40 +1,41 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
-<booleanAttribute key="append.args" value="true"/>
-<booleanAttribute key="askclear" value="false"/>
-<booleanAttribute key="automaticAdd" value="true"/>
-<booleanAttribute key="automaticValidate" value="false"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="clearConfig" value="true"/>
-<booleanAttribute key="clearws" value="true"/>
-<booleanAttribute key="clearwslog" value="false"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
-<booleanAttribute key="default" value="true"/>
-<booleanAttribute key="includeOptional" value="true"/>
-<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.papyrus.infra.extendedtypes.tests/src/org/eclipse/papyrus/infra/extendedtypes/AllTests.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.infra.extendedtypes.AllTests"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.infra.extendedtypes.tests"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -Xms40m -Xmx512m"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<stringAttribute key="product" value="org.eclipse.platform.ide"/>
-<booleanAttribute key="run_in_ui_thread" value="false"/>
-<booleanAttribute key="show_selected_only" value="false"/>
-<booleanAttribute key="tracing" value="false"/>
-<booleanAttribute key="useCustomFeatures" value="false"/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<booleanAttribute key="useDefaultConfigArea" value="false"/>
-<booleanAttribute key="useProduct" value="true"/>
-</launchConfiguration>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
+<booleanAttribute key="append.args" value="true"/>
+<booleanAttribute key="askclear" value="false"/>
+<booleanAttribute key="automaticAdd" value="true"/>
+<booleanAttribute key="automaticValidate" value="false"/>
+<stringAttribute key="bootstrap" value=""/>
+<stringAttribute key="checked" value="[NONE]"/>
+<booleanAttribute key="clearConfig" value="true"/>
+<booleanAttribute key="clearws" value="true"/>
+<booleanAttribute key="clearwslog" value="false"/>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
+<booleanAttribute key="default" value="true"/>
+<booleanAttribute key="includeOptional" value="true"/>
+<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.eclipse.papyrus.infra.extendedtypes.tests/src/org/eclipse/papyrus/infra/extendedtypes/tests/AllTests.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.infra.extendedtypes.tests.AllTests"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.infra.extendedtypes.tests"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -Xms40m -Xmx1024m -XX:PermSize=256M -XX:MaxPermSize=512M"/>
+<stringAttribute key="pde.version" value="3.3"/>
+<stringAttribute key="product" value="org.eclipse.platform.ide"/>
+<booleanAttribute key="run_in_ui_thread" value="false"/>
+<booleanAttribute key="show_selected_only" value="false"/>
+<booleanAttribute key="tracing" value="false"/>
+<booleanAttribute key="useCustomFeatures" value="false"/>
+<booleanAttribute key="useDefaultConfig" value="true"/>
+<booleanAttribute key="useDefaultConfigArea" value="false"/>
+<booleanAttribute key="useProduct" value="true"/>
+</launchConfiguration>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/fragment.properties b/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/plugin.properties
index 374016923b4..374016923b4 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/fragment.properties
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/plugin.properties
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/plugin.xml b/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/plugin.xml
new file mode 100644
index 00000000000..6384bcf86d9
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/plugin.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+ <extension
+ point="org.eclipse.papyrus.infra.extendedtypes.extendedElementTypeSet">
+ <extendedTypesSet
+ icon="icons/debug.gif"
+ id="org.eclipse.papyrus.infra.extendedtypes.tests.set1"
+ name="Test extended type set"
+ path="model/Test.extendedtypes">
+ </extendedTypesSet>
+ </extension>
+ <extension
+ point="org.eclipse.papyrus.infra.newchild">
+ <menuCreationModel
+ model="model/TestMenu.xmi">
+ </menuCreationModel>
+ </extension>
+ <extension
+ point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition">
+ <paletteDefinition
+ ID="org.eclipse.papyrus.infra.extendedtypes.tests.palette"
+ class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
+ icon="icons/debug.gif"
+ name="Test Palette For Extended Types"
+ path="model/Test.palette.xml"
+ provider="Eclipse Modeling Project">
+ <Priority
+ name="Medium">
+ </Priority>
+ <editor
+ id="org.eclipse.papyrus.sysml.diagram.blockdefinition">
+ </editor>
+ </paletteDefinition>
+ </extension>
+</plugin>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/src/org/eclipse/papyrus/infra/extendedtypes/ExtendedEditHelperAdviceTests.java b/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/src/org/eclipse/papyrus/infra/extendedtypes/ExtendedEditHelperAdviceTests.java
deleted file mode 100644
index 2e1300cb9f6..00000000000
--- a/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/src/org/eclipse/papyrus/infra/extendedtypes/ExtendedEditHelperAdviceTests.java
+++ /dev/null
@@ -1,218 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2010 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.extendedtypes;
-
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
-import org.eclipse.papyrus.infra.extendedtypes.ExtendedEditHelperAdvice;
-import org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeConfiguration;
-import org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeSet;
-import org.eclipse.papyrus.infra.extendedtypes.ExtendedTypesRegistry;
-import org.eclipse.uml2.uml.Model;
-import org.eclipse.uml2.uml.Package;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-
-/**
- * Test class for extended edit helper advice
- */
-public class ExtendedEditHelperAdviceTests implements ITestConstants {
-
- /** test class1 element type */
- private static IElementType class1ElementType;
-
- /** test class in package element type */
- private static IElementType classInPackageElementType;
-
- /** test class in model element type */
- private static IElementType classInModelElementType;
-
- /** class1 configuration element type */
- private static ExtendedElementTypeConfiguration class1ElementTypeConfiguration;
-
- /** class in package configuration element type */
- private static ExtendedElementTypeConfiguration classInPackageElementTypeConfiguration;
-
- /** class in model configuration element type */
- private static ExtendedElementTypeConfiguration classInModelElementTypeConfiguration;
-
- /** extended edit helper advice for class1 */
- private static ExtendedEditHelperAdvice extendedClass1EditHelperAdvice;
-
- /** extended edit helper advice for class in package */
- private static ExtendedEditHelperAdvice extendedClassInPackageEditHelperAdvice;
-
- /** extended edit helper advice for class in model */
- private static ExtendedEditHelperAdvice extendedClassInModelEditHelperAdvice;
-
- /** package with short name */
- private static org.eclipse.uml2.uml.Package shortNamePackage;
-
- /** package with long name */
- private static org.eclipse.uml2.uml.Package longNamePackage;
-
- /** model with short Name */
- private static Package shortNameModel;
-
- /** model with long name */
- private static Package longNameModel;
-
- /**
- * @throws java.lang.Exception
- */
- @BeforeClass
- public static void setUpBeforeClass() throws Exception {
- // create the configuration passes as argument
- class1ElementType = ExtendedTypesRegistry.getInstance().getType(CLASS1_TEST_TYPE_ID);
- assertNotNull("Class1 element type should not be null", class1ElementType);
- classInPackageElementType = ExtendedTypesRegistry.getInstance().getType(CLASS_IN_PACKAGE_TEST_TYPE_ID);
- assertNotNull("Class in package element type should not be null", classInPackageElementType);
- classInModelElementType = ExtendedTypesRegistry.getInstance().getType(CLASS_IN_MODEL_TEST_TYPE_ID);
- assertNotNull("Class in model element type should not be null", classInModelElementType);
-
- ExtendedElementTypeSet set = ExtendedTypesRegistry.getInstance().getExtendedElementTypeSet(TEST1_CONFIGURATION_SET_ID, TEST1_MODEL_PATH, org.eclipse.papyrus.infra.extendedtypes.Activator.PLUGIN_ID);
- assertNotNull("extended type set should not be null", set);
- for(ExtendedElementTypeConfiguration configuration : set.getElementType()) {
- if(CLASS1_TEST_TYPE_CONFIGURATION_ID.equals(configuration.getId())) {
- class1ElementTypeConfiguration = configuration;
- } else if(CLASS_IN_PACKAGE_TEST_TYPE_CONFIGURATION_ID.equals(configuration.getId())) {
- classInPackageElementTypeConfiguration = configuration;
- } else if(CLASS_IN_MODEL_TEST_TYPE_CONFIGURATION_ID.equals(configuration.getId())) {
- classInModelElementTypeConfiguration = configuration;
- }
- }
- assertNotNull("extended type configuration should not be null", class1ElementTypeConfiguration);
- assertNotNull("extended type configuration should not be null", classInPackageElementTypeConfiguration);
- assertNotNull("extended type configuration should not be null", classInModelElementTypeConfiguration);
- extendedClass1EditHelperAdvice = new ExtendedEditHelperAdvice();
- extendedClassInPackageEditHelperAdvice = new ExtendedEditHelperAdvice();
- extendedClassInModelEditHelperAdvice = new ExtendedEditHelperAdvice();
-
- // create Test Model
- Model model1 = UMLFactory.eINSTANCE.createModel();
- model1.setName("Model1");
- shortNamePackage = model1.createNestedPackage("P");
- longNamePackage = model1.createNestedPackage("veryLongPackage");
- shortNameModel = model1.createNestedPackage("tinyM", UMLPackage.eINSTANCE.getModel());
- longNameModel = model1.createNestedPackage("veryLongModel", UMLPackage.eINSTANCE.getModel());
-
- }
-
- /**
- * @throws java.lang.Exception
- */
- @AfterClass
- public static void tearDownAfterClass() throws Exception {
- class1ElementType = null;
- class1ElementTypeConfiguration = null;
- extendedClass1EditHelperAdvice = null;
- shortNamePackage = null;
- longNamePackage = null;
- shortNameModel = null;
- longNameModel = null;
- }
-
- /**
- * @throws java.lang.Exception
- */
- @Before
- public void setUp() throws Exception {
- }
-
- /**
- * @throws java.lang.Exception
- */
- @After
- public void tearDown() throws Exception {
- }
-
- /**
- * Test method for
- * {@link org.eclipse.papyrus.infra.extendedtypes.ExtendedEditHelperAdvice#ExtendedEditHelperAdvice(org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeConfiguration)}
- * .
- */
- @Test
- public final void testExtendedEditHelperAdvice() {
- assertNotNull("edit helper advice should not be null", extendedClass1EditHelperAdvice);
- }
-
- /**
- * Test method for
- * {@link org.eclipse.papyrus.infra.extendedtypes.ExtendedEditHelperAdvice#approveRequest(org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest)}
- * .
- */
- @Test
- public final void testApproveRequestIEditCommandRequest() {
- // get the request: create a class on the test packages
-
- // simple test: test if it the name of the container is long or not enough
- CreateElementRequest inShortPackageCreateRequest = new CreateElementRequest(shortNamePackage, class1ElementType);
- boolean resultShort = extendedClass1EditHelperAdvice.approveRequest(inShortPackageCreateRequest);
- assertTrue("request should always be approved", resultShort);
-
- // simple test: test if it the name of the container is long or not enough
- CreateElementRequest inLongPackageCreateRequest = new CreateElementRequest(longNamePackage, class1ElementType);
- boolean resultLong = extendedClass1EditHelperAdvice.approveRequest(inLongPackageCreateRequest);
- assertTrue("request should always be approved", resultLong);
-
- // advanced tests: 2 queries at the same time (test true&false; false&false, false&true, true&true)
- // false & false
- CreateElementRequest requestShortPackageModel = new CreateElementRequest(shortNamePackage, classInModelElementType);
- boolean shortPackageModel = extendedClassInModelEditHelperAdvice.approveRequest(requestShortPackageModel);
- assertTrue("request should always be approved", shortPackageModel);
-
- // true & false
- CreateElementRequest requestLongPackageModel = new CreateElementRequest(longNamePackage, classInModelElementType);
- boolean longPackageModel = extendedClassInModelEditHelperAdvice.approveRequest(requestLongPackageModel);
- assertTrue("request should always be approved", longPackageModel);
-
- // false & true
- CreateElementRequest requestShortPackagePackage = new CreateElementRequest(shortNamePackage, classInPackageElementType);
- boolean shortPackagePackage = extendedClassInPackageEditHelperAdvice.approveRequest(requestShortPackagePackage);
- assertTrue("request should always be approved", shortPackagePackage);
-
- // true & true
- CreateElementRequest requestlongPackagePackage = new CreateElementRequest(longNamePackage, classInPackageElementType);
- boolean longPackagePackage = extendedClassInPackageEditHelperAdvice.approveRequest(requestlongPackagePackage);
- assertTrue("request should always be approved", longPackagePackage);
- }
-
- /**
- * Test method for
- * {@link org.eclipse.papyrus.infra.extendedtypes.ExtendedEditHelperAdvice#getBeforeCreateCommand(org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest)}
- * .
- */
- @Test
- public final void testGetBeforeCreateCommandCreateElementRequest() {
- // not test here for now...
- }
-
- /**
- * Test method for
- * {@link org.eclipse.papyrus.infra.extendedtypes.ExtendedEditHelperAdvice#getAfterCreateCommand(org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest)}
- * .
- */
- @Test
- public final void testGetAfterCreateCommandCreateElementRequest() {
- // test in {oep}.diagram.extendedtypes.uml.tests fragment
- }
-
-}
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/src/org/eclipse/papyrus/infra/extendedtypes/ExtendedTypesRegistryTests.java b/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/src/org/eclipse/papyrus/infra/extendedtypes/ExtendedTypesRegistryTests.java
deleted file mode 100644
index 1bc78e0d106..00000000000
--- a/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/src/org/eclipse/papyrus/infra/extendedtypes/ExtendedTypesRegistryTests.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2010 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.extendedtypes;
-
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-import java.util.List;
-
-import junit.framework.Assert;
-
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-
-/**
- * Tests for {@link ExtendedTypesRegistry}
- */
-public class ExtendedTypesRegistryTests implements ITestConstants {
-
- /**
- * @throws java.lang.Exception
- */
- @BeforeClass
- public static void setUpBeforeClass() throws Exception {
- }
-
- /**
- * @throws java.lang.Exception
- */
- @AfterClass
- public static void tearDownAfterClass() throws Exception {
- }
-
- /**
- * @throws java.lang.Exception
- */
- @Before
- public void setUp() throws Exception {
- }
-
- /**
- * @throws java.lang.Exception
- */
- @After
- public void tearDown() throws Exception {
- }
-
- /**
- * Test method for {@link org.eclipse.papyrus.infra.extendedtypes.ExtendedTypesRegistry#getInstance()}.
- */
- @Test
- public final void testGetInstance() {
- Assert.assertNotNull("The singleton instance should not be null", ExtendedTypesRegistry.getInstance());
- }
-
- /**
- * Test method for {@link org.eclipse.papyrus.infra.extendedtypes.ExtendedTypesRegistry#loadExtendedTypeSets()}.
- */
- @Test
- public final void testLoadExtendedTypeSets() {
- List<ExtendedElementTypeSet> result = ExtendedTypesRegistry.getInstance().loadExtendedTypeSets();
-
-
- assertNotNull("The list of extended type sets should not be null after loading", result);
- assertTrue("The list of extended type sets should not be empty after loading", result.size() > 0);
-
- boolean found = false;
- for(ExtendedElementTypeSet set : result) {
- if(ExtendedTypeSetName_Test1.equals(set.getId())) {
- found = true;
- }
- }
- assertTrue("The list should contain Extended Type Set from Test1: " + ExtendedTypeSetName_Test1, found);
- }
-
- /**
- * Test method for {@link org.eclipse.papyrus.infra.extendedtypes.ExtendedTypesRegistry#createResourceSet()}.
- */
- @Test
- public final void testCreateResourceSet() {
- ResourceSet set = ExtendedTypesRegistry.getInstance().createResourceSet();
- assertNotNull("Resource set should not be null", set);
- }
-
- /**
- * Test method for {@link org.eclipse.papyrus.infra.extendedtypes.ExtendedTypesRegistry#getExtendedElementTypeSet(java.lang.String, java.lang.String)}.
- */
- @Test
- public final void testGetExtendedElementTypeSet() {
- ExtendedElementTypeSet set = ExtendedTypesRegistry.getInstance().getExtendedElementTypeSet(TEST1_CONFIGURATION_SET_ID, TEST1_MODEL_PATH, Activator.PLUGIN_ID);
- assertNotNull("Element type model file set should be found", set);
-
- ExtendedElementTypeSet set2 = ExtendedTypesRegistry.getInstance().getExtendedElementTypeSet("null", NO_FILE, Activator.PLUGIN_ID);
- assertNull("Element type model file set should not be found", set2);
- }
-
- /**
- * Test method for {@link org.eclipse.papyrus.infra.extendedtypes.ExtendedTypesRegistry#getType(java.lang.String)}.
- */
- @Test
- public final void testGetType() {
- IElementType classType = ExtendedTypesRegistry.getInstance().getType(UMLElementTypes.CLASS.getId());
- assertNotNull("element Type for class should be found", classType);
-
- IElementType extendedClassType = ExtendedTypesRegistry.getInstance().getType(CLASS1_TEST_TYPE_ID);
- assertNotNull("element Type for class should be found", extendedClassType);
-
- IElementType noType = ExtendedTypesRegistry.getInstance().getType(NO_TYPE);
- assertNull("element Type for class should not be found", noType);
- }
-}
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/src/org/eclipse/papyrus/infra/extendedtypes/ITestConstants.java b/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/src/org/eclipse/papyrus/infra/extendedtypes/ITestConstants.java
deleted file mode 100644
index 5a12b52ceb7..00000000000
--- a/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/src/org/eclipse/papyrus/infra/extendedtypes/ITestConstants.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2010 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.extendedtypes;
-
-
-/**
- * Constants for test classes
- */
-public interface ITestConstants {
-
- /** element type id for test1::Class1 */
- public static final String CLASS1_TEST_TYPE_ID = "org.eclipse.papyrus.infra.extendedtypes.tests.Class1";
-
- /** element type id for test1::ClassInPackage */
- public static final String CLASS_IN_PACKAGE_TEST_TYPE_ID = "org.eclipse.papyrus.infra.extendedtypes.tests.ClassInPackageOnly";
-
- /** element type id for test1::ClassInModel */
- public static final String CLASS_IN_MODEL_TEST_TYPE_ID = "org.eclipse.papyrus.infra.extendedtypes.tests.ClassInModelOnly";
-
-
- /** name of the extended type set in Test1 */
- public final static String ExtendedTypeSetName_Test1 = "org.eclipse.papyrus.infra.extendedtypes.tests.test1";
-
- /** path to a non existing file */
- public static final String NO_FILE = "no_file";
-
- /** path to a right model file */
- public static final String TEST1_MODEL_PATH = "/model/Test1.extendedtypes";
-
- /** identifier of the extende type set configuration */
- public static final String TEST1_CONFIGURATION_SET_ID = "org.eclipse.papyrus.infra.extendedtypes.tests.test1";
-
- /** no type identifier */
- public static final String NO_TYPE = "no_type";
-
- /** configuration name for test1::Class1 */
- public static final String CLASS1_TEST_TYPE_CONFIGURATION_ID = "org.eclipse.papyrus.infra.extendedtypes.tests.Class1";
-
- /** configuration name for test1::Class1 */
- public static final String CLASS_IN_PACKAGE_TEST_TYPE_CONFIGURATION_ID = CLASS_IN_PACKAGE_TEST_TYPE_ID;
-
- /** configuration name for test1::Class1 */
- public static final String CLASS_IN_MODEL_TEST_TYPE_CONFIGURATION_ID = CLASS_IN_MODEL_TEST_TYPE_ID;
-}
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/src/org/eclipse/papyrus/infra/extendedtypes/preferences/ExtendedTypesPreferencesTests.java b/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/src/org/eclipse/papyrus/infra/extendedtypes/preferences/ExtendedTypesPreferencesTests.java
deleted file mode 100644
index e8f25397ccf..00000000000
--- a/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/src/org/eclipse/papyrus/infra/extendedtypes/preferences/ExtendedTypesPreferencesTests.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2010 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.infra.extendedtypes.preferences;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-import org.eclipse.papyrus.infra.extendedtypes.preferences.ExtendedTypesPreferences;
-import org.eclipse.ui.IMemento;
-import org.eclipse.ui.XMLMemento;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-
-/**
- * Test class for {@link ExtendedTypesPreferences}
- */
-public class ExtendedTypesPreferencesTests extends ExtendedTypesPreferences {
-
- /** id of the extended type set for tests */
- private final static String EXTENDED_TYPES_TEST_ID = "testExtendedTypes";
-
- /**
- * @throws java.lang.Exception
- * exception thrown in case of issues
- */
- @BeforeClass
- public static void setUpBeforeClass() throws Exception {
- }
-
- /**
- * @throws java.lang.Exception
- * exception thrown in case of issues
- */
- @AfterClass
- public static void tearDownAfterClass() throws Exception {
- }
-
- /**
- * @throws java.lang.Exception
- * exception thrown in case of issues
- */
- @Before
- public void setUp() throws Exception {
- }
-
- /**
- * @throws java.lang.Exception
- * exception thrown in case of issues
- */
- @After
- public void tearDown() throws Exception {
- }
-
- /**
- * Test for local definitions of Palette in preferences
- */
- @Test
- public final void testLocalRedefinitions() {
- // 1. saves the root memento
- XMLMemento rootMemento = getLocalRedefinitions();
- IMemento[] extendedTypesRedefinitions = rootMemento.getChildren(EXTENDED_TYPES_REDEFINITION);
-
- int initialLength = extendedTypesRedefinitions.length;
-
- // 2. test add
- // be sure not already existing
- String path = getExtendedTypesRedefinition(EXTENDED_TYPES_TEST_ID);
- assertNull("There should be no test extendedTypes yet", path);
-
- registerLocalRedefinition(EXTENDED_TYPES_TEST_ID, "testAdd.xml");
-
- int newLength = initialLength + 1;
- XMLMemento newMemento = getLocalRedefinitions();
- IMemento[] newPaletteRedefinitions = newMemento.getChildren(EXTENDED_TYPES_REDEFINITION);
- assertTrue("There should be " + newLength + " elements, currently " + newPaletteRedefinitions.length, newLength == newPaletteRedefinitions.length);
- String newPath = getExtendedTypesRedefinition(EXTENDED_TYPES_TEST_ID);
- assertEquals("There should be a new path for the extendedTypes id", "testAdd.xml", newPath);
-
- // 3. test remove
- unregisterLocalRedefinition(EXTENDED_TYPES_TEST_ID);
- newMemento = getLocalRedefinitions();
- newPaletteRedefinitions = newMemento.getChildren(EXTENDED_TYPES_REDEFINITION);
- assertTrue("There should be " + newLength + " elements", newPaletteRedefinitions.length == initialLength);
- newPath = getExtendedTypesRedefinition(EXTENDED_TYPES_TEST_ID);
- assertNull("There should be no path for the extendedTypes id", newPath);
-
- }
-}
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/src/org/eclipse/papyrus/infra/extendedtypes/tests/Activator.java b/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/src/org/eclipse/papyrus/infra/extendedtypes/tests/Activator.java
new file mode 100644
index 00000000000..6c7df711a20
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/src/org/eclipse/papyrus/infra/extendedtypes/tests/Activator.java
@@ -0,0 +1,50 @@
+package org.eclipse.papyrus.infra.extendedtypes.tests;
+
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class Activator extends AbstractUIPlugin {
+
+ // The plug-in ID
+ public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.extendedtypes.tests"; //$NON-NLS-1$
+
+ // The shared instance
+ private static Activator plugin;
+
+ /**
+ * The constructor
+ */
+ public Activator() {
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+ */
+ public void start(BundleContext context) throws Exception {
+ super.start(context);
+ plugin = this;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+ */
+ public void stop(BundleContext context) throws Exception {
+ plugin = null;
+ super.stop(context);
+ }
+
+ /**
+ * Returns the shared instance
+ *
+ * @return the shared instance
+ */
+ public static Activator getDefault() {
+ return plugin;
+ }
+
+}
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/src/org/eclipse/papyrus/infra/extendedtypes/AllTests.java b/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/src/org/eclipse/papyrus/infra/extendedtypes/tests/AllTests.java
index 00b90d48b4b..d29666206a8 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/src/org/eclipse/papyrus/infra/extendedtypes/AllTests.java
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/src/org/eclipse/papyrus/infra/extendedtypes/tests/AllTests.java
@@ -1,27 +1,26 @@
-/*****************************************************************************
- * Copyright (c) 2010 CEA LIST.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.infra.extendedtypes;
-
-import org.eclipse.papyrus.infra.extendedtypes.preferences.ExtendedTypesPreferencesTests;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-import org.junit.runners.Suite.SuiteClasses;
-
-
-/**
- * All tests for this fragment
- */
-@RunWith(Suite.class)
-@SuiteClasses({ ExtendedTypesRegistryTests.class, ExtendedEditHelperAdviceTests.class, ExtendedTypesPreferencesTests.class })
-public class AllTests {
-
-}
+/*****************************************************************************
+ * Copyright (c) 2010 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.extendedtypes.tests;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
+
+
+/**
+ * All tests for this fragment
+ */
+@RunWith(Suite.class)
+@SuiteClasses({ ExtendedTypesRegistryTests.class, })
+public class AllTests {
+
+}
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/src/org/eclipse/papyrus/infra/extendedtypes/tests/ExtendedEditHelperAdviceTests.java b/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/src/org/eclipse/papyrus/infra/extendedtypes/tests/ExtendedEditHelperAdviceTests.java
new file mode 100644
index 00000000000..382c670411e
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/src/org/eclipse/papyrus/infra/extendedtypes/tests/ExtendedEditHelperAdviceTests.java
@@ -0,0 +1,200 @@
+/*****************************************************************************
+ * Copyright (c) 2010 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.extendedtypes.tests;
+
+
+
+/**
+ * Test class for extended edit helper advice
+ */
+public class ExtendedEditHelperAdviceTests implements ITestConstants {
+
+// /** test class1 element type */
+// private static IElementType class1ElementType;
+//
+// /** test class in package element type */
+// private static IElementType classInPackageElementType;
+//
+// /** test class in model element type */
+// private static IElementType classInModelElementType;
+//
+// /** class1 configuration element type */
+// private static ExtendedElementTypeConfiguration class1ElementTypeConfiguration;
+//
+// /** class in package configuration element type */
+// private static ExtendedElementTypeConfiguration classInPackageElementTypeConfiguration;
+//
+// /** class in model configuration element type */
+// private static ExtendedElementTypeConfiguration classInModelElementTypeConfiguration;
+//
+// /** extended edit helper advice for class1 */
+// private static ExtendedEditHelperAdvice extendedClass1EditHelperAdvice;
+//
+// /** extended edit helper advice for class in package */
+// private static ExtendedEditHelperAdvice extendedClassInPackageEditHelperAdvice;
+//
+// /** extended edit helper advice for class in model */
+// private static ExtendedEditHelperAdvice extendedClassInModelEditHelperAdvice;
+//
+// /** package with short name */
+// private static org.eclipse.uml2.uml.Package shortNamePackage;
+//
+// /** package with long name */
+// private static org.eclipse.uml2.uml.Package longNamePackage;
+//
+// /** model with short Name */
+// private static Package shortNameModel;
+//
+// /** model with long name */
+// private static Package longNameModel;
+//
+// /**
+// * @throws java.lang.Exception
+// */
+// @BeforeClass
+// public static void setUpBeforeClass() throws Exception {
+// // create the configuration passes as argument
+// class1ElementType = ExtendedTypesRegistry.getInstance().getType(CLASS1_TEST_TYPE_ID);
+// assertNotNull("Class1 element type should not be null", class1ElementType);
+// classInPackageElementType = ExtendedTypesRegistry.getInstance().getType(CLASS_IN_PACKAGE_TEST_TYPE_ID);
+// assertNotNull("Class in package element type should not be null", classInPackageElementType);
+// classInModelElementType = ExtendedTypesRegistry.getInstance().getType(CLASS_IN_MODEL_TEST_TYPE_ID);
+// assertNotNull("Class in model element type should not be null", classInModelElementType);
+//
+// ExtendedElementTypeSet set = ExtendedTypesRegistry.getInstance().getExtendedElementTypeSet(TEST1_CONFIGURATION_SET_ID, TEST1_MODEL_PATH, org.eclipse.papyrus.infra.extendedtypes.tests.Activator.PLUGIN_ID);
+// assertNotNull("extended type set should not be null", set);
+// for(ExtendedElementTypeConfiguration configuration : set.getElementType()) {
+// if(CLASS1_TEST_TYPE_CONFIGURATION_ID.equals(configuration.getId())) {
+// class1ElementTypeConfiguration = configuration;
+// } else if(CLASS_IN_PACKAGE_TEST_TYPE_CONFIGURATION_ID.equals(configuration.getId())) {
+// classInPackageElementTypeConfiguration = configuration;
+// } else if(CLASS_IN_MODEL_TEST_TYPE_CONFIGURATION_ID.equals(configuration.getId())) {
+// classInModelElementTypeConfiguration = configuration;
+// }
+// }
+// assertNotNull("extended type configuration should not be null", class1ElementTypeConfiguration);
+// assertNotNull("extended type configuration should not be null", classInPackageElementTypeConfiguration);
+// assertNotNull("extended type configuration should not be null", classInModelElementTypeConfiguration);
+// extendedClass1EditHelperAdvice = new ExtendedEditHelperAdvice();
+// extendedClassInPackageEditHelperAdvice = new ExtendedEditHelperAdvice();
+// extendedClassInModelEditHelperAdvice = new ExtendedEditHelperAdvice();
+//
+// // create Test Model
+// Model model1 = UMLFactory.eINSTANCE.createModel();
+// model1.setName("Model1");
+// shortNamePackage = model1.createNestedPackage("P");
+// longNamePackage = model1.createNestedPackage("veryLongPackage");
+// shortNameModel = model1.createNestedPackage("tinyM", UMLPackage.eINSTANCE.getModel());
+// longNameModel = model1.createNestedPackage("veryLongModel", UMLPackage.eINSTANCE.getModel());
+//
+// }
+//
+// /**
+// * @throws java.lang.Exception
+// */
+// @AfterClass
+// public static void tearDownAfterClass() throws Exception {
+// class1ElementType = null;
+// class1ElementTypeConfiguration = null;
+// extendedClass1EditHelperAdvice = null;
+// shortNamePackage = null;
+// longNamePackage = null;
+// shortNameModel = null;
+// longNameModel = null;
+// }
+//
+// /**
+// * @throws java.lang.Exception
+// */
+// @Before
+// public void setUp() throws Exception {
+// }
+//
+// /**
+// * @throws java.lang.Exception
+// */
+// @After
+// public void tearDown() throws Exception {
+// }
+//
+// /**
+// * Test method for
+// * {@link org.eclipse.papyrus.infra.extendedtypes.tests.ExtendedEditHelperAdvice#ExtendedEditHelperAdvice(org.eclipse.papyrus.infra.extendedtypes.tests.ExtendedElementTypeConfiguration)}
+// * .
+// */
+// @Test
+// public final void testExtendedEditHelperAdvice() {
+// assertNotNull("edit helper advice should not be null", extendedClass1EditHelperAdvice);
+// }
+//
+// /**
+// * Test method for
+// * {@link org.eclipse.papyrus.infra.extendedtypes.tests.ExtendedEditHelperAdvice#approveRequest(org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest)}
+// * .
+// */
+// @Test
+// public final void testApproveRequestIEditCommandRequest() {
+// // get the request: create a class on the test packages
+//
+// // simple test: test if it the name of the container is long or not enough
+// CreateElementRequest inShortPackageCreateRequest = new CreateElementRequest(shortNamePackage, class1ElementType);
+// boolean resultShort = extendedClass1EditHelperAdvice.approveRequest(inShortPackageCreateRequest);
+// assertTrue("request should always be approved", resultShort);
+//
+// // simple test: test if it the name of the container is long or not enough
+// CreateElementRequest inLongPackageCreateRequest = new CreateElementRequest(longNamePackage, class1ElementType);
+// boolean resultLong = extendedClass1EditHelperAdvice.approveRequest(inLongPackageCreateRequest);
+// assertTrue("request should always be approved", resultLong);
+//
+// // advanced tests: 2 queries at the same time (test true&false; false&false, false&true, true&true)
+// // false & false
+// CreateElementRequest requestShortPackageModel = new CreateElementRequest(shortNamePackage, classInModelElementType);
+// boolean shortPackageModel = extendedClassInModelEditHelperAdvice.approveRequest(requestShortPackageModel);
+// assertTrue("request should always be approved", shortPackageModel);
+//
+// // true & false
+// CreateElementRequest requestLongPackageModel = new CreateElementRequest(longNamePackage, classInModelElementType);
+// boolean longPackageModel = extendedClassInModelEditHelperAdvice.approveRequest(requestLongPackageModel);
+// assertTrue("request should always be approved", longPackageModel);
+//
+// // false & true
+// CreateElementRequest requestShortPackagePackage = new CreateElementRequest(shortNamePackage, classInPackageElementType);
+// boolean shortPackagePackage = extendedClassInPackageEditHelperAdvice.approveRequest(requestShortPackagePackage);
+// assertTrue("request should always be approved", shortPackagePackage);
+//
+// // true & true
+// CreateElementRequest requestlongPackagePackage = new CreateElementRequest(longNamePackage, classInPackageElementType);
+// boolean longPackagePackage = extendedClassInPackageEditHelperAdvice.approveRequest(requestlongPackagePackage);
+// assertTrue("request should always be approved", longPackagePackage);
+// }
+//
+// /**
+// * Test method for
+// * {@link org.eclipse.papyrus.infra.extendedtypes.tests.ExtendedEditHelperAdvice#getBeforeCreateCommand(org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest)}
+// * .
+// */
+// @Test
+// public final void testGetBeforeCreateCommandCreateElementRequest() {
+// // not test here for now...
+// }
+//
+// /**
+// * Test method for
+// * {@link org.eclipse.papyrus.infra.extendedtypes.tests.ExtendedEditHelperAdvice#getAfterCreateCommand(org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest)}
+// * .
+// */
+// @Test
+// public final void testGetAfterCreateCommandCreateElementRequest() {
+// // test in {oep}.diagram.extendedtypes.uml.tests fragment
+// }
+
+}
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/src/org/eclipse/papyrus/infra/extendedtypes/tests/ExtendedTypesRegistryTests.java b/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/src/org/eclipse/papyrus/infra/extendedtypes/tests/ExtendedTypesRegistryTests.java
new file mode 100644
index 00000000000..55b808bd860
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/src/org/eclipse/papyrus/infra/extendedtypes/tests/ExtendedTypesRegistryTests.java
@@ -0,0 +1,224 @@
+/*****************************************************************************
+ * Copyright (c) 2010 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.extendedtypes.tests;
+
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.io.IOException;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.papyrus.infra.core.editor.IMultiDiagramEditor;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.resource.ModelUtils;
+import org.eclipse.papyrus.infra.core.resource.NotFoundException;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeSetRegistry;
+import org.eclipse.papyrus.infra.extendedtypes.ExtendedTypeRegistryService;
+import org.eclipse.papyrus.junit.utils.EditorUtils;
+import org.eclipse.papyrus.junit.utils.PapyrusProjectUtils;
+import org.eclipse.papyrus.junit.utils.ProjectUtils;
+import org.eclipse.papyrus.uml.tools.model.UmlModel;
+import org.eclipse.papyrus.uml.tools.model.UmlUtils;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.uml2.uml.Activity;
+import org.eclipse.uml2.uml.Class;
+import org.eclipse.uml2.uml.Model;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Tests for {@link ExtendedTypesRegistry}
+ */
+public class ExtendedTypesRegistryTests implements ITestConstants {
+
+ private static IProject createProject;
+
+ private static IFile copyPapyrusModel;
+
+ private static IMultiDiagramEditor openPapyrusEditor;
+
+ private static ModelSet modelset;
+
+ private static UmlModel umlIModel;
+
+ private static Model rootModel;
+
+ private static Activity testActivity;
+
+ private static TransactionalEditingDomain transactionalEditingDomain;
+
+ private static Class testClass;
+
+ private static Activity testActivityWithNode;
+
+ /**
+ * Init test class
+ */
+ @BeforeClass
+ public static void initCreateElementTest() {
+
+ // create Project
+ try {
+ createProject = ProjectUtils.createProject("ExtendedTypes");
+ } catch (CoreException e) {
+ fail(e.getMessage());
+ }
+
+ // import test model
+ try {
+ copyPapyrusModel = PapyrusProjectUtils.copyPapyrusModel(createProject, Platform.getBundle("org.eclipse.papyrus.infra.extendedtypes.tests"), "/model/", "model");
+ } catch (CoreException e) {
+ fail(e.getMessage());
+ } catch (IOException e) {
+ fail(e.getMessage());
+ }
+
+ // open project
+ Display.getDefault().syncExec(new Runnable() {
+
+ public void run() {
+ try {
+ openPapyrusEditor = EditorUtils.openPapyrusEditor(copyPapyrusModel);
+ } catch (PartInitException e) {
+ fail(e.getMessage());
+ }
+ }
+ });
+
+ transactionalEditingDomain = (TransactionalEditingDomain)openPapyrusEditor.getAdapter(TransactionalEditingDomain.class);
+ assertTrue("Impossible to init editing domain", transactionalEditingDomain instanceof TransactionalEditingDomain);
+
+ // retrieve UML model from this editor
+ try {
+ modelset = ModelUtils.getModelSetChecked(openPapyrusEditor.getServicesRegistry());
+ umlIModel = UmlUtils.getUmlModel(modelset);
+ rootModel = (Model)umlIModel.lookupRoot();
+
+ Assert.assertNotNull("root model should not be null", rootModel);
+
+ } catch (ServiceException e) {
+ fail(e.getMessage());
+ } catch (NotFoundException e) {
+ fail(e.getMessage());
+ } catch (ClassCastException e) {
+ fail(e.getMessage());
+ }
+ try {
+ initExistingElements();
+ } catch (Exception e) {
+ fail(e.getMessage());
+ }
+
+ }
+
+ /**
+ * Init fields corresponding to element in the test model
+ */
+ private static void initExistingElements() throws Exception {
+
+
+ }
+
+ /**
+ * @throws java.lang.Exception
+ */
+ @AfterClass
+ public static void tearDownAfterClass() throws Exception {
+ }
+
+ /**
+ * @throws java.lang.Exception
+ */
+ @Before
+ public void setUp() throws Exception {
+ }
+
+ /**
+ * @throws java.lang.Exception
+ */
+ @After
+ public void tearDown() throws Exception {
+ }
+
+ /**
+ * Test method for {@link ExtendedElementTypeSetRegistry#getInstance()}
+ */
+ @Test
+ @Ignore
+ public final void testGetInstance() {
+ ExtendedTypeRegistryService service = null;
+ try {
+ service = openPapyrusEditor.getServicesRegistry().getService(ExtendedTypeRegistryService.class);
+ } catch (ServiceException e) {
+ fail(e.getMessage());
+ }
+ Assert.assertNotNull("Extended type service should not be null", service);
+
+ // retrieve registry from this service
+ Assert.assertNotNull("Extended type registry singleton should not be null", service.getExtendedElementTypeSetRegistry());
+ }
+
+
+ /**
+ * Test method for {@link org.eclipse.papyrus.infra.extendedtypes.tests.ExtendedTypesRegistry#createResourceSet()}.
+ */
+ @Test
+ public final void testGetTypeRegisteredInplugin() {
+ // check standard class
+ IElementType classType = ElementTypeRegistry.getInstance().getType("org.eclipse.papyrus.uml.Class");
+ Assert.assertNotNull("Element type should be registered", classType);
+
+ IElementType restrictedClassType = ElementTypeRegistry.getInstance().getType(CLASS_ONLY_IN_MODEL_ID);
+ Assert.assertNotNull("Element type should be registered", restrictedClassType);
+ }
+
+// /**
+// * Test method for {@link org.eclipse.papyrus.infra.extendedtypes.tests.ExtendedTypesRegistry#getExtendedElementTypeSet(java.lang.String, java.lang.String)}.
+// */
+// @Test
+// public final void testGetExtendedElementTypeSet() {
+// ExtendedElementTypeSet set = ExtendedTypesRegistry.getInstance().getExtendedElementTypeSet(TEST1_CONFIGURATION_SET_ID, TEST1_MODEL_PATH, Activator.PLUGIN_ID);
+// assertNotNull("Element type model file set should be found", set);
+//
+// ExtendedElementTypeSet set2 = ExtendedTypesRegistry.getInstance().getExtendedElementTypeSet("null", NO_FILE, Activator.PLUGIN_ID);
+// assertNull("Element type model file set should not be found", set2);
+// }
+//
+// /**
+// * Test method for {@link org.eclipse.papyrus.infra.extendedtypes.tests.ExtendedTypesRegistry#getType(java.lang.String)}.
+// */
+// @Test
+// public final void testGetType() {
+// IElementType classType = ExtendedTypesRegistry.getInstance().getType(UMLElementTypes.CLASS.getId());
+// assertNotNull("element Type for class should be found", classType);
+//
+// IElementType extendedClassType = ExtendedTypesRegistry.getInstance().getType(CLASS1_TEST_TYPE_ID);
+// assertNotNull("element Type for class should be found", extendedClassType);
+//
+// IElementType noType = ExtendedTypesRegistry.getInstance().getType(NO_TYPE);
+// assertNull("element Type for class should not be found", noType);
+// }
+}
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/src/org/eclipse/papyrus/infra/extendedtypes/tests/ITestConstants.java b/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/src/org/eclipse/papyrus/infra/extendedtypes/tests/ITestConstants.java
new file mode 100644
index 00000000000..fbdc4c829ab
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.extendedtypes.tests/src/org/eclipse/papyrus/infra/extendedtypes/tests/ITestConstants.java
@@ -0,0 +1,25 @@
+/*****************************************************************************
+ * Copyright (c) 2010 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.extendedtypes.tests;
+
+
+/**
+ * Constants for test classes
+ */
+public interface ITestConstants {
+
+ public final static String CLASS_ONLY_IN_MODEL_ID = "org.eclipse.papyrus.infra.extendedtypes.tests.classonlyinmodel"; //$NON-NLS-1$
+ /** name of the extended type set in Test1 */
+ public final static String ExtendedTypeSetName_Test1 = "org.eclipse.papyrus.infra.extendedtypes.tests.tests.test1";
+
+
+}

Back to the top