[Tests refactoring] Fix remaining issues

85 files changed, 381 insertions, 2500 deletions

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/META-INF/MANIFEST.MF
index 2796d73c86a..6920b3374be 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/META-INF/MANIFEST.MF
@@ -1,6 +1,7 @@
 Manifest-Version: 1.0

 Require-Bundle: org.junit;bundle-version="4.10.0",

- org.eclipse.papyrus.junit.framework;bundle-version="1.0.0"

+ org.eclipse.papyrus.junit.framework;bundle-version="1.0.0",

+ org.eclipse.papyrus.infra.core.sasheditor.tests;bundle-version="1.0.0"

 Bundle-Vendor: %Bundle-Vendor

 Fragment-Host: org.eclipse.papyrus.infra.core.sasheditor.di;bundle-ver

  sion="0.10.0"

@@ -10,4 +11,8 @@ Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.infra.core.sasheditor.di.test

  s

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Export-Package: org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider,

+ org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.internal,

+ org.eclipse.papyrus.infra.core.sasheditor.di.sashmodel.query,

+ org.eclipse.papyrus.infra.core.sasheditor.di.tests

 

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/META-INF/MANIFEST.MF
index 6369a07258f..959fcb9b344 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/META-INF/MANIFEST.MF
@@ -3,12 +3,23 @@ Require-Bundle: org.eclipse.ui.editors;bundle-version="3.8.0",
  org.eclipse.jface.text;bundle-version="3.8.0",

  org.eclipse.ui.ide;bundle-version="3.8.0",

  org.eclipse.core.resources;bundle-version="3.8.0",

- org.junit;bundle-version="4.10.0"

+ org.junit;bundle-version="4.10.0",

+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.0",

+ org.eclipse.ui;bundle-version="3.106.0",

+ org.eclipse.ui.workbench.texteditor;bundle-version="3.9.0",

+ org.eclipse.core.runtime;bundle-version="3.10.0"

 Export-Package: org.eclipse.papyrus.infra.core.sasheditor.contentprovider,

- org.eclipse.papyrus.infra.core.sasheditor.pagesmodel

+ org.eclipse.papyrus.infra.core.sasheditor.contentprovider.simple,

+ org.eclipse.papyrus.infra.core.sasheditor.editor,

+ org.eclipse.papyrus.infra.core.sasheditor.internal,

+ org.eclipse.papyrus.infra.core.sasheditor.pagesmodel,

+ org.eclipse.papyrus.infra.core.sasheditor.tests,

+ org.eclipse.papyrus.infra.core.sasheditor.tests.texteditor,

+ org.eclipse.papyrus.infra.core.sasheditor.tests.utils,

+ org.eclipse.papyrus.infra.core.sasheditor.tests.utils.memoryleak,

+ org.eclipse.papyrus.infra.core.sasheditor.tests.utils.trace,

+ org.eclipse.papyrus.infra.core.sasheditor.utils

 Bundle-Vendor: %providerName

-Fragment-Host: org.eclipse.papyrus.infra.core.sasheditor;bundle-versio

- n="0.10.0"

 Bundle-Version: 1.0.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: fragment

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/build.properties b/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/build.properties
index 266dcb24bf6..424c27d7514 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/build.properties
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/build.properties
@@ -5,4 +5,4 @@ bin.includes = META-INF/,\
                org.eclipse.papyrus.infra.core.sasheditor.tests.launch,\

                fragment.properties,\

                about.html,\

-               fragment.xml

+               plugin.xml

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/org.eclipse.papyrus.infra.core.sasheditor.tests.launch b/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/org.eclipse.papyrus.infra.core.sasheditor.tests.launch
index ee8116d51a3..8bb91f42500 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/org.eclipse.papyrus.infra.core.sasheditor.tests.launch
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/org.eclipse.papyrus.infra.core.sasheditor.tests.launch
@@ -14,7 +14,7 @@
 <booleanAttribute key="includeOptional" value="true"/>

 <stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>

 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">

-<listEntry value="/org.eclipse.papyrus.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/AllTests.java"/>

+<listEntry value="/org.eclipse.papyrus.infra.core.sasheditor.tests/test/org/eclipse/papyrus/infra/core/sasheditor/tests/AllTests.java"/>

 </listAttribute>

 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">

 <listEntry value="1"/>

@@ -25,7 +25,7 @@
 <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.core.sasheditor.tests.AllTests"/>

 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>

-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.sasheditor.tests"/>

+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.infra.core.sasheditor.tests"/>

 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>

 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -Xms40m -Xmx512m"/>

 <stringAttribute key="pde.version" value="3.3"/>

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/fragment.xml b/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/plugin.xml
index 882b613cbe1..882b613cbe1 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/fragment.xml
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.tests/plugin.xml
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/META-INF/MANIFEST.MF
index df32ede7fef..36f171768c4 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/META-INF/MANIFEST.MF
@@ -12,6 +12,6 @@ Bundle-Version: 1.0.0.qualifier
 Bundle-Name: %pluginName

 Bundle-Localization: fragment

 Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.core.tests;singleton:=true

+Bundle-SymbolicName: org.eclipse.papyrus.infra.core.tests;singleton:=true

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

 

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/pom.xml b/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/pom.xml
index 729b217b511..91d25d9daf0 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/pom.xml
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/pom.xml
@@ -9,7 +9,7 @@
     <relativePath>../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
-  <artifactId>org.eclipse.papyrus.core.tests</artifactId>
+  <artifactId>org.eclipse.papyrus.infra.core.tests</artifactId>
   <version>1.0.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/tests/AllTests.java b/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/tests/AllTests.java
index f19ba7c4588..44cc9fcf3a8 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/tests/AllTests.java
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/test/org/eclipse/papyrus/infra/core/tests/AllTests.java
@@ -45,5 +45,5 @@ AdapterUtilsTest.class
  * Suite Class for all tests in the plugin

  */

 public class AllTests {

-

+	//Junit 4 Test suite

 }

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.tests/.classpath b/tests/junit/plugins/core/org.eclipse.papyrus.tests/.classpath
index 046bda900d2..b84b0cee1dc 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.tests/.classpath
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.tests/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <classpath>

-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>

 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

 	<classpathentry kind="src" path="test"/>

 	<classpathentry kind="output" path="bin"/>

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/core/org.eclipse.papyrus.tests/.settings/org.eclipse.jdt.core.prefs
index 37093296dcd..f287d53cf45 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.tests/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,7 @@
-#Mon Nov 15 14:11:42 CET 2010

 eclipse.preferences.version=1

 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5

-org.eclipse.jdt.core.compiler.compliance=1.5

+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6

+org.eclipse.jdt.core.compiler.compliance=1.6

 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

-org.eclipse.jdt.core.compiler.source=1.5

+org.eclipse.jdt.core.compiler.source=1.6

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/core/org.eclipse.papyrus.tests/META-INF/MANIFEST.MF
index 0097d36f510..67905e08747 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.tests/META-INF/MANIFEST.MF
@@ -10,7 +10,6 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.uml.diagram.clazz.tests;bundle-version="1.0.0",
  org.eclipse.papyrus.bundles.tests;bundle-version="1.0.0",
  org.eclipse.papyrus.views.modelexplorer.tests;bundle-version="1.0.0",
- org.eclipse.papyrus.uml.modelexplorer.tests;bundle-version="1.0.0",
  org.eclipse.papyrus.uml.diagram.activity.tests;bundle-version="1.0.0",
  org.eclipse.papyrus.uml.diagram.deployment.tests;bundle-version="1.0.0",
  org.eclipse.papyrus.uml.diagram.component.tests;bundle-version="1.0.0",
@@ -38,7 +37,6 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.uml.tools.tests;bundle-version="1.0.0",
  org.eclipse.papyrus.uml.tools.utils.tests;bundle-version="1.0.0",
  org.eclipse.papyrus.uml.nattable.tests;bundle-version="1.0.0",
- org.eclipse.papyrus.sysml.nattable.requirement.tests;bundle-version="1.0.0",
  org.eclipse.papyrus.infra.nattable.model.editor.tests;bundle-version="1.0.0",
  org.eclipse.papyrus.uml.diagram.sequence.tests;bundle-version="1.0.0",
  org.eclipse.papyrus.uml.diagram.interactionoverview.tests;bundle-version="1.0.0",
@@ -59,7 +57,10 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.sysml.nattable.allocation.tests;bundle-version="1.0.0",
  org.eclipse.papyrus.infra.nattable.views.tests;bundle-version="1.0.0",
  org.eclipse.papyrus.uml.nattable.generic.tests;bundle-version="1.0.0",
- org.eclipse.papyrus.sysml.modelexplorer.tests;bundle-version="1.0.0"
+ org.eclipse.papyrus.sysml.modelexplorer.tests;bundle-version="1.0.0",
+ org.eclipse.papyrus.infra.core.sasheditor.tests;bundle-version="1.0.0",
+ org.eclipse.papyrus.uml.modelexplorer.tests;bundle-version="1.0.0",
+ org.eclipse.papyrus.sysml.nattable.requirement.tests;bundle-version="1.0.0"
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
 Bundle-Version: 1.0.0.qualifier
@@ -68,5 +69,20 @@ Bundle-Localization: plugin
 Bundle-ManifestVersion: 2
 Bundle-Activator: org.eclipse.papyrus.tests.Activator
 Bundle-SymbolicName: org.eclipse.papyrus.tests
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Import-Package: org.eclipse.papyrus.uml.modelrepair.tests,
+ org.eclipse.papyrus.uml.service.types.tests.suites,
+ org.eclipse.papyrus.infra.core.sasheditor.di.tests,
+ org.eclipse.papyrus.infra.core.tests,
+ org.eclipse.papyrus.infra.emf.readonly.tests,
+ org.eclipse.papyrus.infra.emf.tests,
+ org.eclipse.papyrus.infra.gmfdiag.commands.tests,
+ org.eclipse.papyrus.infra.gmfdiag.common.tests,
+ org.eclipse.papyrus.infra.services.edit.tests,
+ org.eclipse.papyrus.infra.services.resourceloading.tests,
+ org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.suites,
+ org.eclipse.papyrus.sysml.diagram.internalblock.tests.suites,
+ org.eclipse.papyrus.sysml.diagram.parametric.tests.suites,
+ org.eclipse.papyrus.sysml.service.types.tests.suites
+ 
 
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllSysMLTests.java b/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllSysMLTests.java
index 7221ce655b0..b8238bac961 100755
--- a/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllSysMLTests.java
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllSysMLTests.java
@@ -22,7 +22,7 @@ public class AllSysMLTests {
 		/* sysml */

 		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.sysml.tests.SysmlAllTests.class));

 		suiteClasses.add(new FragmentTestSuiteClass(org.eclipse.papyrus.sysml.service.types.Activator.PLUGIN_ID, "org.eclipse.papyrus.sysml.service.types.tests.suites.AllTests"));

-		suiteClasses.add(new FragmentTestSuiteClass("org.eclipse.papyrus.sysml.modelexplorer", "org.eclipse.papyrus.sysml.modelexplorer.tests.suites.AllTests"));

+		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.sysml.modelexplorer.tests.suites.AllTests.class));

 		suiteClasses.add(new FragmentTestSuiteClass(org.eclipse.papyrus.sysml.diagram.internalblock.Activator.PLUGIN_ID, "org.eclipse.papyrus.sysml.diagram.internalblock.tests.suites.AllTests"));

 		suiteClasses.add(new FragmentTestSuiteClass("org.eclipse.papyrus.sysml.diagram.blockdefinition", "org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.suites.AllTests"));

 		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.sysml.diagram.requirement.test.AllTests.class));

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllTests.java b/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllTests.java
index 1f5b3740e49..fdaaeece5af 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllTests.java
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllTests.java
@@ -58,7 +58,7 @@ public class AllTests {
 
 		/* core */
 		suiteClasses.add(new FragmentTestSuiteClass(org.eclipse.papyrus.infra.core.Activator.PLUGIN_ID, "org.eclipse.papyrus.infra.core.tests.AllTests"));
-		suiteClasses.add(new FragmentTestSuiteClass(org.eclipse.papyrus.infra.core.sasheditor.Activator.PLUGIN_ID, "org.eclipse.papyrus.infra.core.sasheditor.tests.AllTests"));
+		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.core.sasheditor.tests.AllTests.class));
 		suiteClasses.add(new FragmentTestSuiteClass("org.eclipse.papyrus.infra.core.sasheditor.di", "org.eclipse.papyrus.infra.core.sasheditor.di.tests.AllTests"));
 		suiteClasses.add(new FragmentTestSuiteClass(org.eclipse.papyrus.infra.services.resourceloading.Activator.PLUGIN_ID, "org.eclipse.papyrus.infra.services.resourceloading.tests.AllTests"));
 
@@ -95,7 +95,7 @@ public class AllTests {
 		}
 
 		/* uml */
-		suiteClasses.add(new FragmentTestSuiteClass(org.eclipse.papyrus.uml.diagram.common.Activator.ID, "org.eclipse.papyrus.uml.diagram.common.tests.AllTests"));
+		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.common.tests.tests.AllTests.class));
 		suiteClasses.add(new FragmentTestSuiteClass(org.eclipse.papyrus.uml.service.types.Activator.PLUGIN_ID, "org.eclipse.papyrus.uml.service.types.tests.suites.AllTests"));
 		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.modelexplorer.tests.AllTests.class));
 		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.dnd.tests.tests.AllTests.class));
@@ -150,16 +150,11 @@ public class AllTests {
 			super(clazz, getSuites());
 
 			for(String arg : Platform.getApplicationArgs()) {
-				System.out.println("Arg = " + arg);
 				if(arg.contains("-testConfig=")) {
-					System.out.println("Found testConfig: " + arg);
 					String configName = arg.substring("-testConfig=".length());
-					System.out.println("ConfigName = " + configName);
 					Set<TestCategory> testsConfig = availableConfigs.get(configName);
 					if(testsConfig != null) {
 						ClassificationConfig.setTestsConfiguration(testsConfig);
-					} else {
-						System.out.println("Invalid configName");
 					}
 					break;
 				}
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/launcher/FragmentTestSuiteClass.java b/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/launcher/FragmentTestSuiteClass.java
index b6f29e8251c..bf845040c55 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/launcher/FragmentTestSuiteClass.java
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/launcher/FragmentTestSuiteClass.java
@@ -42,6 +42,7 @@ public class FragmentTestSuiteClass implements ITestSuiteClass {
 	/**

 	 * {@inheritDoc}

 	 */

+	@Override

 	public Class<?> getMainTestSuiteClass() {

 		Bundle bundle = Platform.getBundle(hostBundleId);

 		if(bundle == null) {

diff --git a/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/build.properties b/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/build.properties
index 785a40c0ec7..fdd2cc92d34 100644
--- a/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/build.properties
+++ b/tests/junit/plugins/customization/org.eclipse.papyrus.customization.properties.tests/build.properties
@@ -2,5 +2,6 @@ source.. = src/
 output.. = bin/

 bin.includes = META-INF/,\

                .,\

-               about.html

+               about.html,\

+               resources/

 src.includes = about.html

diff --git a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly.tests/META-INF/MANIFEST.MF
index 3a8ebdbf114..ee493610f7f 100644
--- a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly.tests/META-INF/MANIFEST.MF
@@ -14,3 +14,5 @@ Require-Bundle: org.junit;bundle-version="4.10.0",
  org.eclipse.gmf.runtime.notation;bundle-version="1.7.0",
  org.eclipse.papyrus.junit.framework;bundle-version="1.0.0",
  org.eclipse.papyrus.junit.utils;bundle-version="1.0.0"
+Export-Package: org.eclipse.papyrus.infra.emf.readonly,
+ org.eclipse.papyrus.infra.emf.readonly.tests
diff --git a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/META-INF/MANIFEST.MF
index 8578dd0f972..f250b36542b 100644
--- a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Require-Bundle: org.eclipse.emf.ecore.xmi;bundle-version="2.8.0",
  org.eclipse.papyrus.junit.framework;bundle-version="1.0.0",

  org.eclipse.papyrus.junit.utils;bundle-version="1.0.0"

 Bundle-Vendor: %providerName

-Fragment-Host: org.eclipse.papyrus.infra.emf;bundle-version="0.10.0"

+Fragment-Host: org.eclipse.papyrus.infra.emf;bundle-version="1.0.0"

 Bundle-Version: 1.0.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/META-INF/MANIFEST.MF
index 3bb10a97465..6548d9c4c7a 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common.tests/META-INF/MANIFEST.MF
@@ -9,3 +9,5 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-Localization: fragment
 Require-Bundle: org.junit;bundle-version="4.10.0",
  org.eclipse.papyrus.junit.framework;bundle-version="1.0.0"
+Export-Package: org.eclipse.papyrus.infra.gmfdiag.common.tests,
+ org.eclipse.papyrus.infra.gmfdiag.common.utils
diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor.tests/pom.xml b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/pom.xml
index a05308ffcd5..0016833a928 100644
--- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.editor.tests/pom.xml
+++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/pom.xml
@@ -9,7 +9,7 @@
     <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
   </parent>
   <groupId>org.eclipse.papyrus</groupId>
-  <artifactId>org.eclipse.papyrus.infra.nattable.views.editor.tests</artifactId>
+  <artifactId>org.eclipse.papyrus.infra.nattable.tests</artifactId>
   <version>1.0.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/build.properties b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/build.properties
index 7e4e23cbf09..d0a17ebd1ca 100755
--- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/build.properties
+++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/build.properties
@@ -4,6 +4,5 @@ bin.includes = META-INF/,\
                .,\

                about.html,\

                resources/,\

-               OSGI-INF/,\

                plugin.properties

 src.includes = about.html

diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/pom.xml b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/pom.xml
new file mode 100644
index 00000000000..e0a02e971c0
--- /dev/null
+++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.views.tests/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.eclipse.papyrus</groupId>
+    <artifactId>org.eclipse.papyrus</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
+  </parent>
+  <groupId>org.eclipse.papyrus</groupId>
+  <artifactId>org.eclipse.papyrus.infra.nattable.views.tests</artifactId>
+  <version>1.0.0-SNAPSHOT</version>
+  <packaging>eclipse-test-plugin</packaging>
+</project>
diff --git a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/pom.xml b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/pom.xml
new file mode 100644
index 00000000000..6132ef49395
--- /dev/null
+++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.eclipse.papyrus</groupId>
+    <artifactId>org.eclipse.papyrus</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../../../../../releng/top-pom-main-tests.xml</relativePath>
+  </parent>
+  <groupId>org.eclipse.papyrus</groupId>
+  <artifactId>org.eclipse.papyrus.infra.tools.tests</artifactId>
+  <version>1.0.0-SNAPSHOT</version>
+  <packaging>eclipse-test-plugin</packaging>
+</project>
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/pom.xml b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/pom.xml
new file mode 100644
index 00000000000..3ff568872d3
--- /dev/null
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.eclipse.papyrus</groupId>
+    <artifactId>org.eclipse.papyrus</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
+  </parent>
+  <groupId>org.eclipse.papyrus</groupId>
+  <artifactId>org.eclipse.papyrus.infra.services.controlmode.tests</artifactId>
+  <version>1.0.0-SNAPSHOT</version>
+  <packaging>eclipse-test-plugin</packaging>
+</project>
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/META-INF/MANIFEST.MF
index f315999f724..b60077d0eae 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/META-INF/MANIFEST.MF
@@ -16,4 +16,12 @@ Bundle-Localization: plugin
 Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.infra.services.edit.tests

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Export-Package: org.eclipse.papyrus.infra.services.edit.tests,

+ org.eclipse.papyrus.infra.services.edit.tests.commands,

+ org.eclipse.papyrus.infra.services.edit.tests.context,

+ org.eclipse.papyrus.infra.services.edit.tests.edit.advice,

+ org.eclipse.papyrus.infra.services.edit.tests.edit.helper,

+ org.eclipse.papyrus.infra.services.edit.tests.service,

+ org.eclipse.papyrus.infra.services.edit.tests.suites,

+ org.eclipse.papyrus.infra.services.edit.tests.utils

 

diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/META-INF/MANIFEST.MF
index 7a867365ca5..64677875aa4 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.tests/META-INF/MANIFEST.MF
@@ -14,4 +14,7 @@ Bundle-Localization: fragment
 Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.infra.services.resourceloading.tests

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Export-Package: org.eclipse.papyrus.infra.services.resourceloading.tests,

+ org.eclipse.papyrus.infra.services.resourceloading.tests.testModel1,

+ org.eclipse.papyrus.infra.services.resourceloading.tests.testModel2

 

diff --git a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/META-INF/MANIFEST.MF b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/META-INF/MANIFEST.MF
index 5dd5530a49a..ec59f6d10b7 100644
--- a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Conditional Junit Annotations (Incubation)
+Bundle-Name: Conditional Junit Annotations
 Bundle-SymbolicName: org.eclipse.papyrus.junit.framework
 Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: Eclipse Modeling Project
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.stereotypeproperty.tests/about.html b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/about.html
index 82d49bf5f81..209103075a7 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.stereotypeproperty.tests/about.html
+++ b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/about.html
@@ -8,7 +8,7 @@
 <body lang="EN-US">

 <h2>About This Content</h2>

  

-<p>June 5, 2007</p>	

+<p>November 14, 2008</p>	

 <h3>License</h3>

 

 <p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

@@ -22,7 +22,7 @@ being redistributed by another party (&quot;Redistributor&quot;) and different t
 apply to your use of any object code in the Content.  Check the Redistributor's license that was 

 provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

 indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

+and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>

 

 </body>

-</html>

+</html>
\ No newline at end of file
diff --git a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/build.properties b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/build.properties
index 41eb6ade2b4..785a40c0ec7 100644
--- a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/build.properties
+++ b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.framework/build.properties
@@ -1,4 +1,6 @@
 source.. = src/

 output.. = bin/

 bin.includes = META-INF/,\

-               .

+               .,\

+               about.html

+src.includes = about.html

diff --git a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/META-INF/MANIFEST.MF
index a0282a51ae3..0a95a1296e4 100644
--- a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/META-INF/MANIFEST.MF
@@ -12,4 +12,5 @@ Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.sysml.diagram.blockdefinition

  .tests

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Export-Package: org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.suites

 

diff --git a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/build.properties b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/build.properties
index 785a40c0ec7..4e910046ed0 100644
--- a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/build.properties
+++ b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/build.properties
@@ -2,5 +2,7 @@ source.. = src/
 output.. = bin/

 bin.includes = META-INF/,\

                .,\

-               about.html

+               about.html,\

+               model/,\

+               plugin.properties

 src.includes = about.html

diff --git a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/META-INF/MANIFEST.MF
index 1b6c537f0a0..25cc05a2f15 100644
--- a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/META-INF/MANIFEST.MF
@@ -4,8 +4,7 @@ Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.0
  org.eclipse.papyrus.junit.framework;bundle-version="1.0.0",

  org.eclipse.papyrus.junit.utils;bundle-version="1.0.0"

 Bundle-Vendor: %providerName

-Fragment-Host: org.eclipse.papyrus.sysml.diagram.internalblock;bundle-

- version="0.10.0"

+Fragment-Host: org.eclipse.papyrus.sysml.diagram.internalblock;bundle-version="1.0.0"

 Bundle-Version: 1.0.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

@@ -13,4 +12,5 @@ Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.sysml.diagram.internalblock.t

  ests

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Export-Package: org.eclipse.papyrus.sysml.diagram.internalblock.tests.suites

 

diff --git a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric.tests/META-INF/MANIFEST.MF
index e9846b1dbd4..4d0d9a9bdca 100644
--- a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric.tests/META-INF/MANIFEST.MF
@@ -13,4 +13,5 @@ Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.sysml.diagram.parametric.test

  s

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Export-Package: org.eclipse.papyrus.sysml.diagram.parametric.tests.suites

 

diff --git a/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.tests/build.properties b/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.tests/build.properties
index 9ecde845c11..d0a17ebd1ca 100755
--- a/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.tests/build.properties
+++ b/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.tests/build.properties
@@ -2,7 +2,6 @@ source.. = src/
 output.. = bin/

 bin.includes = META-INF/,\

                .,\

-               OSGI-INF/,\

                about.html,\

                resources/,\

                plugin.properties

diff --git a/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.tests/pom.xml b/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.tests/pom.xml
new file mode 100644
index 00000000000..ce49de3815d
--- /dev/null
+++ b/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.tests/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.eclipse.papyrus</groupId>
+    <artifactId>org.eclipse.papyrus</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
+  </parent>
+  <groupId>org.eclipse.papyrus</groupId>
+  <artifactId>org.eclipse.papyrus.sysml.nattable.allocation.tests</artifactId>
+  <version>1.0.0-SNAPSHOT</version>
+  <packaging>eclipse-test-plugin</packaging>
+</project>
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/META-INF/MANIFEST.MF
index 90932d525d9..a8cd000457e 100644
--- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/META-INF/MANIFEST.MF
@@ -30,4 +30,10 @@ Bundle-Activator: org.eclipse.papyrus.sysml.modelexplorer.tests.Activato
  r
 Bundle-SymbolicName: org.eclipse.papyrus.sysml.modelexplorer.tests
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Export-Package: org.eclipse.papyrus.sysml.modelexplorer.tests,
+ org.eclipse.papyrus.sysml.modelexplorer.tests.common,
+ org.eclipse.papyrus.sysml.modelexplorer.tests.copypaste,
+ org.eclipse.papyrus.sysml.modelexplorer.tests.dragdrop,
+ org.eclipse.papyrus.sysml.modelexplorer.tests.suites,
+ org.eclipse.papyrus.sysml.modelexplorer.tests.utils
 
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.service.types.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.service.types.tests/META-INF/MANIFEST.MF
index 8887fd704e9..41d71fbe469 100644
--- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.service.types.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.service.types.tests/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
 Require-Bundle: org.junit;bundle-version="4.10.0",

  org.eclipse.papyrus.junit.framework;bundle-version="1.0.0"

 Bundle-Vendor: %providerName

-Fragment-Host: org.eclipse.papyrus.sysml.service.types;bundle-version=

- "0.10.0"

+Fragment-Host: org.eclipse.papyrus.sysml.service.types;bundle-version="1.0.0"

 Bundle-Version: 1.0.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.sysml.service.types.tests

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Export-Package: org.eclipse.papyrus.sysml.service.types.tests.suites

 

diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.service.types.tests/build.properties b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.service.types.tests/build.properties
index 785a40c0ec7..1b08f841b5e 100644
--- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.service.types.tests/build.properties
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.service.types.tests/build.properties
@@ -2,5 +2,6 @@ source.. = src/
 output.. = bin/

 bin.includes = META-INF/,\

                .,\

-               about.html

+               about.html,\

+               plugin.properties

 src.includes = about.html

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.stereotypeproperty.tests/.classpath b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.stereotypeproperty.tests/.classpath
deleted file mode 100644
index 2d1a4302f04..00000000000
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.stereotypeproperty.tests/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="src" path="src"/>

-	<classpathentry kind="output" path="bin"/>

-</classpath>

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.stereotypeproperty.tests/.project b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.stereotypeproperty.tests/.project
deleted file mode 100644
index c55d52ee379..00000000000
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.stereotypeproperty.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.uml.diagram.stereotypeproperty.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/uml/diagram/org.eclipse.papyrus.diagram.stereotypeproperty.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.stereotypeproperty.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 44217f8c068..00000000000
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.stereotypeproperty.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1

-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5

-org.eclipse.jdt.core.compiler.compliance=1.5

-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

-org.eclipse.jdt.core.compiler.source=1.5

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.stereotypeproperty.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.stereotypeproperty.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index c567f3ed601..00000000000
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.stereotypeproperty.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,35 +0,0 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.core.runtime,

- org.eclipse.papyrus.infra.core;bundle-version="1.0.0",

- org.eclipse.papyrus.editor;bundle-version="1.0.0",

- org.eclipse.papyrus.uml.diagram.clazz;bundle-version="1.0.0",

- org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.0.0",

- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.0.0",

- org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.0.0",

- org.eclipse.papyrus.uml.tools;bundle-version="1.0.0",

- org.eclipse.uml2.uml;bundle-version="4.0.0",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.0",

- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.0.0",

- org.eclipse.ui.ide;bundle-version="3.8.0",

- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.0.0",

- org.eclipse.papyrus.infra.widgets;bundle-version="1.0.0",

- org.eclipse.papyrus.uml.diagram.stereotype.edition;bundle-version="1.0.0",

- org.junit;bundle-version="4.10.0",

- org.eclipse.papyrus.uml.appearance;bundle-version="1.0.0",

- org.eclipse.papyrus.junit.framework;bundle-version="1.0.0",

- org.eclipse.papyrus.infra.emf;bundle-version="1.0.0",

- org.eclipse.papyrus.junit.utils;bundle-version="1.0.0"

-Export-Package: org.eclipse.papyrus.uml.diagram.stereotypeproperty

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.0.0.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.uml.diagram.stereotypeproperty.Activator

-Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.stereotypeproperty.te

- sts;singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

-

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.stereotypeproperty.tests/build.properties b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.stereotypeproperty.tests/build.properties
deleted file mode 100644
index 3036be7431a..00000000000
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.stereotypeproperty.tests/build.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               plugin.xml,\

-               plugin.properties,\

-               resource/,\

-               about.html

-src.includes = about.html

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.stereotypeproperty.tests/org.eclipse.papyrus.diagram.stereotypeproperty.tests.launch b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.stereotypeproperty.tests/org.eclipse.papyrus.diagram.stereotypeproperty.tests.launch
deleted file mode 100644
index 78086784bb0..00000000000
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.stereotypeproperty.tests/org.eclipse.papyrus.diagram.stereotypeproperty.tests.launch
+++ /dev/null
@@ -1,41 +0,0 @@
-<?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.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/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.uml.diagram.stereotypeproperty.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.uml.diagram.stereotypeproperty.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 -Xms1024m -Xmx4086m -XX:MaxPermSize=1024M"/>

-<stringAttribute key="pde.version" value="3.3"/>

-<stringAttribute key="product" value="org.eclipse.platform.ide"/>

-<booleanAttribute key="run_in_ui_thread" value="true"/>

-<booleanAttribute key="show_selected_only" value="false"/>

-<booleanAttribute key="tracing" value="false"/>

-<booleanAttribute key="useCustomFeatures" value="false"/>

-<booleanAttribute key="useDefaultConfig" value="true"/>

-<booleanAttribute key="useDefaultConfigArea" value="false"/>

-<booleanAttribute key="useProduct" value="true"/>

-</launchConfiguration>

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.stereotypeproperty.tests/plugin.properties b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.stereotypeproperty.tests/plugin.properties
deleted file mode 100644
index b1bfcee3ed3..00000000000
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.stereotypeproperty.tests/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-#################################################################################
-# Copyright (c) 2008 CEA LIST.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - initial API and implementation
-##################################################################################
-pluginName=Papyrus Diagram stereotype property Test
-providerName=Eclipse Modeling Project
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.stereotypeproperty.tests/plugin.xml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.stereotypeproperty.tests/plugin.xml
deleted file mode 100644
index edc72b45ede..00000000000
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.stereotypeproperty.tests/plugin.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.4"?>

-<plugin>

-  <extension

-         point="org.eclipse.emf.ecore.uri_mapping">

- 

-      <mapping

-            source="pathmap://Test_PROFILES/"

-            target="platform:/plugin/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/resource/">

-      </mapping>

-   </extension>

-   

-   <extension

-         point="org.eclipse.papyrus.uml.extensionpoints.UMLProfile">

-      <profile

-            description="Test profile use to test papyrus"

-            name="TestProfile"

-            path="pathmap://Test_PROFILES/testProfile.profile.uml"

-            provider="Eclipse.org">

-      </profile>

-   </extension>

-</plugin>

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.stereotypeproperty.tests/resource/testProfile.profile.di b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.stereotypeproperty.tests/resource/testProfile.profile.di
deleted file mode 100644
index 098618c9cbb..00000000000
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.stereotypeproperty.tests/resource/testProfile.profile.di
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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="testProfile.profile.notation#_lN77kHc8EeGEMdTf3PnPPg"/>

-    </availablePage>

-  </pageList>

-  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

-    <windows>

-      <children xsi:type="di:TabFolder">

-        <children>

-          <emfPageIdentifier href="testProfile.profile.notation#_lN77kHc8EeGEMdTf3PnPPg"/>

-        </children>

-      </children>

-    </windows>

-  </sashModel>

-</di:SashWindowsMngr>

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.stereotypeproperty.tests/resource/testProfile.profile.notation b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.stereotypeproperty.tests/resource/testProfile.profile.notation
deleted file mode 100644
index fc3080a3ccd..00000000000
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.stereotypeproperty.tests/resource/testProfile.profile.notation
+++ /dev/null
@@ -1,103 +0,0 @@
-<?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="_lN77kHc8EeGEMdTf3PnPPg" type="PapyrusUMLProfileDiagram" name="ProfileDiagram" measurementUnit="Pixel">

-  <children xmi:type="notation:Shape" xmi:id="_Ij0egM0eEeKwCqQbxnBb_w" type="1026">

-    <children xmi:type="notation:DecorationNode" xmi:id="_Ij9ocM0eEeKwCqQbxnBb_w" type="1034"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_IkHZcM0eEeKwCqQbxnBb_w" type="1071">

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

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

-      </eAnnotations>

-      <children xmi:type="notation:Shape" xmi:id="_KA8j0M0eEeKwCqQbxnBb_w" type="3002">

-        <element xmi:type="uml:Property" href="testProfile.profile.uml#_dcMxQGkdEeGGJOTenKBKAg"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_KA8j0c0eEeKwCqQbxnBb_w" x="44" y="24"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_KCliks0eEeKwCqQbxnBb_w" type="3002">

-        <element xmi:type="uml:Property" href="testProfile.profile.uml#_meyzIGkdEeGGJOTenKBKAg"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_KClik80eEeKwCqQbxnBb_w" x="44" y="24"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_KCvTkM0eEeKwCqQbxnBb_w" type="3002">

-        <element xmi:type="uml:Property" href="testProfile.profile.uml#_wshLYGkdEeGGJOTenKBKAg"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_KCvTkc0eEeKwCqQbxnBb_w" x="44" y="24"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_KCvTks0eEeKwCqQbxnBb_w" type="3002">

-        <element xmi:type="uml:Property" href="testProfile.profile.uml#_1ta5cGkdEeGGJOTenKBKAg"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_KCvTk80eEeKwCqQbxnBb_w" x="44" y="24"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_KCvTlM0eEeKwCqQbxnBb_w" type="3002">

-        <element xmi:type="uml:Property" href="testProfile.profile.uml#_71vikGkdEeGGJOTenKBKAg"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_KCvTlc0eEeKwCqQbxnBb_w" x="44" y="24"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_KC4dgM0eEeKwCqQbxnBb_w" type="3002">

-        <element xmi:type="uml:Property" href="testProfile.profile.uml#_BfRW4GkeEeGGJOTenKBKAg"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_KC4dgc0eEeKwCqQbxnBb_w" x="44" y="24"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_KC4dgs0eEeKwCqQbxnBb_w" type="3002">

-        <element xmi:type="uml:Property" href="testProfile.profile.uml#_Lb0QgGz4EeGEKeJyQaxg3g"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_KC4dg80eEeKwCqQbxnBb_w" x="44" y="24"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_KC4dhM0eEeKwCqQbxnBb_w" type="3002">

-        <element xmi:type="uml:Property" href="testProfile.profile.uml#_jAiq8G38EeGag98Jn1kDVw"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_KC4dhc0eEeKwCqQbxnBb_w" x="44" y="24"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_RfkRgM0eEeKwCqQbxnBb_w" type="3002">

-        <element xmi:type="uml:Property" href="testProfile.profile.uml#_Re-boM0eEeKwCqQbxnBb_w"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_RfkRgc0eEeKwCqQbxnBb_w"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_Y4iDIM0eEeKwCqQbxnBb_w" type="3002">

-        <element xmi:type="uml:Property" href="testProfile.profile.uml#_Y4YSIM0eEeKwCqQbxnBb_w"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Y4iDIc0eEeKwCqQbxnBb_w"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_ZvIT8M0eEeKwCqQbxnBb_w" type="3002">

-        <element xmi:type="uml:Property" href="testProfile.profile.uml#_Zu-i8M0eEeKwCqQbxnBb_w"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_ZvIT8c0eEeKwCqQbxnBb_w"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_aEaAYM0eEeKwCqQbxnBb_w" type="3002">

-        <element xmi:type="uml:Property" href="testProfile.profile.uml#_aEQPYM0eEeKwCqQbxnBb_w"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_aEaAYc0eEeKwCqQbxnBb_w"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_aXJWMM0eEeKwCqQbxnBb_w" type="3002">

-        <element xmi:type="uml:Property" href="testProfile.profile.uml#_aXAMQM0eEeKwCqQbxnBb_w"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_aXJWMc0eEeKwCqQbxnBb_w"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_vILVIM0eEeKwCqQbxnBb_w" type="3002">

-        <element xmi:type="uml:Property" href="testProfile.profile.uml#_vH4aMM0eEeKwCqQbxnBb_w"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_vILVIc0eEeKwCqQbxnBb_w"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_VEXbsM0jEeKjW9KkdY00_w" type="3002">

-        <element xmi:type="uml:Property" href="testProfile.profile.uml#_VDBX4M0jEeKjW9KkdY00_w"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_VEXbsc0jEeKjW9KkdY00_w"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_Si-4gM0tEeKjW9KkdY00_w" type="3002">

-        <element xmi:type="uml:Property" href="testProfile.profile.uml#_SivA4M0tEeKjW9KkdY00_w"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_Si-4gc0tEeKjW9KkdY00_w"/>

-      </children>

-      <children xmi:type="notation:Shape" xmi:id="_VD9AcM0tEeKjW9KkdY00_w" type="3002">

-        <element xmi:type="uml:Property" href="testProfile.profile.uml#_VDuW8M0tEeKjW9KkdY00_w"/>

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_VD9Acc0tEeKjW9KkdY00_w"/>

-      </children>

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

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

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

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

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_IkHZdc0eEeKwCqQbxnBb_w" visible="false" type="1019">

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

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

-      </eAnnotations>

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

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

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

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

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_In1b0M0eEeKwCqQbxnBb_w" visible="false" type="compartment_shape_display">

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

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

-      </eAnnotations>

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

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

-    </children>

-    <element xmi:type="uml:Stereotype" href="testProfile.profile.uml#_WJYD4GkdEeGGJOTenKBKAg"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ij0egc0eEeKwCqQbxnBb_w" x="215" y="95"/>

-  </children>

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

-  <element xmi:type="uml:Profile" href="testProfile.profile.uml#_UVrRoGkdEeGGJOTenKBKAg"/>

-</notation:Diagram>

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.stereotypeproperty.tests/resource/testProfile.profile.uml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.stereotypeproperty.tests/resource/testProfile.profile.uml
deleted file mode 100644
index d98c45e0609..00000000000
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.stereotypeproperty.tests/resource/testProfile.profile.uml
+++ /dev/null
@@ -1,452 +0,0 @@
-<?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="_UVrRoGkdEeGGJOTenKBKAg" name="testProfile" metaclassReference="_YcYBQGkdEeGGJOTenKBKAg">

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

-    <contents xmi:type="ecore:EPackage" xmi:id="_dqAQQM0tEeKjW9KkdY00_w" name="testProfile" nsURI="http:///schemas/testProfile/_dg9pAM0tEeKjW9KkdY00_w/4" nsPrefix="testProfile">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_dq95kM0tEeKjW9KkdY00_w" source="PapyrusVersion">

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

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_dq95ks0tEeKjW9KkdY00_w" key="Comment" value="update profile for multi evaluation"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_dq95k80tEeKjW9KkdY00_w" key="Copyright" value="CEA LIST"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_dq95lM0tEeKjW9KkdY00_w" key="Date" value="2013-06-04"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_dq95lc0tEeKjW9KkdY00_w" key="Author" value="P. Tessier"/>

-      </eAnnotations>

-      <eClassifiers xmi:type="ecore:EClass" xmi:id="_dqAQQc0tEeKjW9KkdY00_w" name="Stereotype1">

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

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_dqAQQ80tEeKjW9KkdY00_w" name="testReftoStereotype2" ordered="false" upperBound="-1" eType="_dqAQZ80tEeKjW9KkdY00_w"/>

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

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

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_dqAQR80tEeKjW9KkdY00_w" name="testUnaryReftoStereotype2" ordered="false" eType="_dqAQZ80tEeKjW9KkdY00_w"/>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_dqAQSc0tEeKjW9KkdY00_w" name="testDataType" ordered="false" lowerBound="1" eType="_dqAQa80tEeKjW9KkdY00_w" containment="true"/>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_dqAQS80tEeKjW9KkdY00_w" name="testMyPrimituveType" ordered="false" lowerBound="1" eType="_dqAQbc0tEeKjW9KkdY00_w"/>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_dqAQTc0tEeKjW9KkdY00_w" name="testInt" ordered="false" unique="false">

-          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/4.0.0/Types#//Integer"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_dqAQT80tEeKjW9KkdY00_w" name="testMultiString" ordered="false" unique="false" upperBound="-1">

-          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/4.0.0/Types#//String"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_dqAQUc0tEeKjW9KkdY00_w" name="testRefToMetaclass" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_dqAQU80tEeKjW9KkdY00_w" name="testRefToEnumeration" ordered="false" lowerBound="1" eType="_dqAQb80tEeKjW9KkdY00_w"/>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_dqAQVc0tEeKjW9KkdY00_w" name="testMultiDataType" ordered="false" upperBound="-1" eType="_dqAQa80tEeKjW9KkdY00_w" containment="true"/>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_dqAQV80tEeKjW9KkdY00_w" name="testMultiprimitiveType" ordered="false" upperBound="-1" eType="_dqAQbc0tEeKjW9KkdY00_w"/>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_dqAQWc0tEeKjW9KkdY00_w" name="testMultiInt" ordered="false" upperBound="-1">

-          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/4.0.0/Types#//Integer"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_dqAQW80tEeKjW9KkdY00_w" name="testMultiEnumeration" ordered="false" unique="false" upperBound="-1" eType="_dqAQb80tEeKjW9KkdY00_w"/>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_dqAQXc0tEeKjW9KkdY00_w" name="testBoolean" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/4.0.0/Types#//Boolean"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_dqAQX80tEeKjW9KkdY00_w" name="testMultiBoolean" ordered="false" unique="false" upperBound="-1">

-          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/4.0.0/Types#//Boolean"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_dqAQYc0tEeKjW9KkdY00_w" name="testString" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/4.0.0/Types#//String"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_dqAQY80tEeKjW9KkdY00_w" name="testReal" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/4.0.0/Types#//Real"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_dqAQZc0tEeKjW9KkdY00_w" name="testMultiReal" ordered="false" upperBound="-1">

-          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/4.0.0/Types#//Real"/>

-        </eStructuralFeatures>

-      </eClassifiers>

-      <eClassifiers xmi:type="ecore:EClass" xmi:id="_dqAQZ80tEeKjW9KkdY00_w" name="Stereotype2">

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

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_dqAQac0tEeKjW9KkdY00_w" 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="_dqAQa80tEeKjW9KkdY00_w" name="DataType1">

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

-      </eClassifiers>

-      <eClassifiers xmi:type="ecore:EDataType" xmi:id="_dqAQbc0tEeKjW9KkdY00_w" name="MyPrimitiveType" instanceClassName="java.lang.String">

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

-      </eClassifiers>

-      <eClassifiers xmi:type="ecore:EEnum" xmi:id="_dqAQb80tEeKjW9KkdY00_w" name="Enumeration1">

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

-        <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_dqAQcc0tEeKjW9KkdY00_w" name="EnumerationLiteral1"/>

-        <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_dqAQcs0tEeKjW9KkdY00_w" name="EnumerationLiteral2" value="1"/>

-        <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_dqAQc80tEeKjW9KkdY00_w" name="EnumerationLiteral3" value="2"/>

-      </eClassifiers>

-    </contents>

-    <contents xmi:type="ecore:EPackage" xmi:id="_4y4JwM0nEeKjW9KkdY00_w" name="testProfile" nsURI="http:///schemas/testProfile/_4qj7QM0nEeKjW9KkdY00_w/3" nsPrefix="testProfile">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4zxhoM0nEeKjW9KkdY00_w" source="PapyrusVersion">

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

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4zxhos0nEeKjW9KkdY00_w" key="Comment" value="update profile for multi evaluation"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4zxho80nEeKjW9KkdY00_w" key="Copyright" value="CEA LIST"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4zxhpM0nEeKjW9KkdY00_w" key="Date" value="2013-06-04"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4zxhpc0nEeKjW9KkdY00_w" key="Author" value="P. Tessier"/>

-      </eAnnotations>

-      <eClassifiers xmi:type="ecore:EClass" xmi:id="_4y4Jwc0nEeKjW9KkdY00_w" name="Stereotype1">

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

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_4y4Jw80nEeKjW9KkdY00_w" name="testReftoStereotype2" ordered="false" upperBound="-1" eType="_4y4J480nEeKjW9KkdY00_w"/>

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

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

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_4y4Jx80nEeKjW9KkdY00_w" name="testUnaryReftoStereotype2" ordered="false" eType="_4y4J480nEeKjW9KkdY00_w"/>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_4y4Jyc0nEeKjW9KkdY00_w" name="testDataType" ordered="false" lowerBound="1" eType="_4y4J580nEeKjW9KkdY00_w" containment="true"/>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_4y4Jy80nEeKjW9KkdY00_w" name="testMyPrimituveType" ordered="false" lowerBound="1" eType="_4y4J6c0nEeKjW9KkdY00_w"/>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_4y4Jzc0nEeKjW9KkdY00_w" name="testInt" ordered="false" unique="false">

-          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/4.0.0/Types#//Integer"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_4y4Jz80nEeKjW9KkdY00_w" name="testMultiString" ordered="false" unique="false" upperBound="-1">

-          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/4.0.0/Types#//String"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_4y4J0c0nEeKjW9KkdY00_w" name="testRefToMetaclass" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_4y4J080nEeKjW9KkdY00_w" name="testRefToEnumeration" ordered="false" lowerBound="1" eType="_4y4J680nEeKjW9KkdY00_w"/>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_4y4J1c0nEeKjW9KkdY00_w" name="testMultiDataType" ordered="false" upperBound="-1" eType="_4y4J580nEeKjW9KkdY00_w" containment="true"/>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_4y4J180nEeKjW9KkdY00_w" name="testMultiprimitiveType" ordered="false" upperBound="-1" eType="_4y4J6c0nEeKjW9KkdY00_w"/>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_4y4J2c0nEeKjW9KkdY00_w" name="testMultiInt" ordered="false" upperBound="-1">

-          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/4.0.0/Types#//Integer"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_4y4J280nEeKjW9KkdY00_w" name="testMultiEnumeration" ordered="false" unique="false" upperBound="-1" eType="_4y4J680nEeKjW9KkdY00_w"/>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_4y4J3c0nEeKjW9KkdY00_w" name="testBoolean" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/4.0.0/Types#//Boolean"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_4y4J380nEeKjW9KkdY00_w" name="testMultiBoolean" ordered="false" unique="false" upperBound="-1">

-          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/4.0.0/Types#//Boolean"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_4y4J4c0nEeKjW9KkdY00_w" name="testString" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/4.0.0/Types#//String"/>

-        </eStructuralFeatures>

-      </eClassifiers>

-      <eClassifiers xmi:type="ecore:EClass" xmi:id="_4y4J480nEeKjW9KkdY00_w" name="Stereotype2">

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

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_4y4J5c0nEeKjW9KkdY00_w" 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="_4y4J580nEeKjW9KkdY00_w" name="DataType1">

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

-      </eClassifiers>

-      <eClassifiers xmi:type="ecore:EDataType" xmi:id="_4y4J6c0nEeKjW9KkdY00_w" name="MyPrimitiveType" instanceClassName="java.lang.String">

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

-      </eClassifiers>

-      <eClassifiers xmi:type="ecore:EEnum" xmi:id="_4y4J680nEeKjW9KkdY00_w" name="Enumeration1">

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

-        <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_4y4J7c0nEeKjW9KkdY00_w" name="EnumerationLiteral1"/>

-        <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_4y4J7s0nEeKjW9KkdY00_w" name="EnumerationLiteral2" value="1"/>

-        <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_4y4J780nEeKjW9KkdY00_w" name="EnumerationLiteral3" value="2"/>

-      </eClassifiers>

-    </contents>

-    <contents xmi:type="ecore:EPackage" xmi:id="_bx4ckM0jEeKjW9KkdY00_w" name="testProfile" nsURI="http:///schemas/testProfile/_bs09cM0jEeKjW9KkdY00_w/2" nsPrefix="testProfile">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_by6-YM0jEeKjW9KkdY00_w" source="PapyrusVersion">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_by6-Yc0jEeKjW9KkdY00_w" key="Version" value="0.0.3"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_by6-Ys0jEeKjW9KkdY00_w" key="Comment" value="add test"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_by6-Y80jEeKjW9KkdY00_w" key="Copyright" value="CEA LIST"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_by6-ZM0jEeKjW9KkdY00_w" key="Date" value="2013-06-04"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_by6-Zc0jEeKjW9KkdY00_w" key="Author" value="P. Tessier"/>

-      </eAnnotations>

-      <eClassifiers xmi:type="ecore:EClass" xmi:id="_bx4ckc0jEeKjW9KkdY00_w" name="Stereotype1">

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

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_bx4ck80jEeKjW9KkdY00_w" name="testReftoStereotype2" ordered="false" upperBound="-1" eType="_bx4cs80jEeKjW9KkdY00_w"/>

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

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

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_bx4cl80jEeKjW9KkdY00_w" name="testUnaryReftoStereotype2" ordered="false" eType="_bx4cs80jEeKjW9KkdY00_w"/>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_bx4cmc0jEeKjW9KkdY00_w" name="testDataType" ordered="false" lowerBound="1" eType="_bx4ct80jEeKjW9KkdY00_w" containment="true"/>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_bx4cm80jEeKjW9KkdY00_w" name="testMyPrimituveType" ordered="false" lowerBound="1" eType="_bx4cuc0jEeKjW9KkdY00_w"/>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_bx4cnc0jEeKjW9KkdY00_w" name="testInt" ordered="false" unique="false">

-          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/4.0.0/Types#//Integer"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_bx4cn80jEeKjW9KkdY00_w" name="testMultiString" ordered="false" unique="false" upperBound="-1">

-          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/4.0.0/Types#//String"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_bx4coc0jEeKjW9KkdY00_w" name="testRefToMetaclass" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_bx4co80jEeKjW9KkdY00_w" name="testRefToEnumeration" ordered="false" lowerBound="1" eType="_bx4cu80jEeKjW9KkdY00_w"/>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_bx4cpc0jEeKjW9KkdY00_w" name="testMultiDataType" ordered="false" upperBound="-1" eType="_bx4ct80jEeKjW9KkdY00_w" containment="true"/>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_bx4cp80jEeKjW9KkdY00_w" name="testMultiprimitiveType" ordered="false" upperBound="-1" eType="_bx4cuc0jEeKjW9KkdY00_w"/>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_bx4cqc0jEeKjW9KkdY00_w" name="testMultiInt" ordered="false" upperBound="-1">

-          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/4.0.0/Types#//Integer"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_bx4cq80jEeKjW9KkdY00_w" name="testMultiEnumeration" ordered="false" upperBound="-1" eType="_bx4cu80jEeKjW9KkdY00_w"/>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_bx4crc0jEeKjW9KkdY00_w" name="testBoolean" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/4.0.0/Types#//Boolean"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_bx4cr80jEeKjW9KkdY00_w" name="testMultiBoolean" ordered="false" upperBound="-1">

-          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/4.0.0/Types#//Boolean"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_bx4csc0jEeKjW9KkdY00_w" name="testString" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/4.0.0/Types#//String"/>

-        </eStructuralFeatures>

-      </eClassifiers>

-      <eClassifiers xmi:type="ecore:EClass" xmi:id="_bx4cs80jEeKjW9KkdY00_w" name="Stereotype2">

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

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_bx4ctc0jEeKjW9KkdY00_w" 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="_bx4ct80jEeKjW9KkdY00_w" name="DataType1">

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

-      </eClassifiers>

-      <eClassifiers xmi:type="ecore:EDataType" xmi:id="_bx4cuc0jEeKjW9KkdY00_w" name="MyPrimitiveType" instanceClassName="java.lang.String">

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

-      </eClassifiers>

-      <eClassifiers xmi:type="ecore:EEnum" xmi:id="_bx4cu80jEeKjW9KkdY00_w" name="Enumeration1">

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

-        <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_bx4cvc0jEeKjW9KkdY00_w" name="EnumerationLiteral1"/>

-        <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_bx4cvs0jEeKjW9KkdY00_w" name="EnumerationLiteral2" value="1"/>

-        <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_bx4cv80jEeKjW9KkdY00_w" name="EnumerationLiteral3" value="2"/>

-      </eClassifiers>

-    </contents>

-    <contents xmi:type="ecore:EPackage" xmi:id="_4q5okM0eEeKwCqQbxnBb_w" name="testProfile" nsURI="http:///schemas/testProfile/_4lZdgM0eEeKwCqQbxnBb_w/1" nsPrefix="testProfile">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4r8xcM0eEeKwCqQbxnBb_w" source="PapyrusVersion">

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

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4r8xcs0eEeKwCqQbxnBb_w" key="Comment" value="Add new Test"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4r8xc80eEeKwCqQbxnBb_w" key="Copyright" value="CEA LIST"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4r8xdM0eEeKwCqQbxnBb_w" key="Date" value="2013-06-04"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4r8xdc0eEeKwCqQbxnBb_w" key="Author" value="P. Tessier"/>

-      </eAnnotations>

-      <eClassifiers xmi:type="ecore:EClass" xmi:id="_4q5okc0eEeKwCqQbxnBb_w" name="Stereotype1">

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

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_4q5ok80eEeKwCqQbxnBb_w" name="testReftoStereotype2" ordered="false" upperBound="-1" eType="_4q5osc0eEeKwCqQbxnBb_w"/>

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

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

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_4q5ol80eEeKwCqQbxnBb_w" name="testUnaryReftoStereotype2" ordered="false" eType="_4q5osc0eEeKwCqQbxnBb_w"/>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_4q5omc0eEeKwCqQbxnBb_w" name="testDataType" ordered="false" lowerBound="1" eType="_4q5otc0eEeKwCqQbxnBb_w" containment="true"/>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_4q5om80eEeKwCqQbxnBb_w" name="testMyPrimituveType" ordered="false" lowerBound="1" eType="_4q5ot80eEeKwCqQbxnBb_w"/>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_4q5onc0eEeKwCqQbxnBb_w" name="testInt" ordered="false" unique="false">

-          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/4.0.0/Types#//Integer"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_4q5on80eEeKwCqQbxnBb_w" name="testMultiString" ordered="false" unique="false" upperBound="-1">

-          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/4.0.0/Types#//String"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_4q5ooc0eEeKwCqQbxnBb_w" name="testRefToMetaclass" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_4q5oo80eEeKwCqQbxnBb_w" name="testRefToEnumeration" ordered="false" lowerBound="1" eType="_4q5ouc0eEeKwCqQbxnBb_w"/>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_4q5opc0eEeKwCqQbxnBb_w" name="testMultiDataType" ordered="false" upperBound="-1" eType="_4q5otc0eEeKwCqQbxnBb_w" containment="true"/>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_4q5op80eEeKwCqQbxnBb_w" name="testMultiprimitiveType" ordered="false" upperBound="-1" eType="_4q5ot80eEeKwCqQbxnBb_w"/>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_4q5oqc0eEeKwCqQbxnBb_w" name="testMultiInt" ordered="false" upperBound="-1">

-          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/4.0.0/Types#//Integer"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_4q5oq80eEeKwCqQbxnBb_w" name="testMultiEnumeration" ordered="false" upperBound="-1" eType="_4q5ouc0eEeKwCqQbxnBb_w"/>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_4q5orc0eEeKwCqQbxnBb_w" name="testBoolean" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/4.0.0/Types#//Boolean"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_4q5or80eEeKwCqQbxnBb_w" name="testMultiBoolean" ordered="false" upperBound="-1">

-          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/4.0.0/Types#//Boolean"/>

-        </eStructuralFeatures>

-      </eClassifiers>

-      <eClassifiers xmi:type="ecore:EClass" xmi:id="_4q5osc0eEeKwCqQbxnBb_w" name="Stereotype2">

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

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_4q5os80eEeKwCqQbxnBb_w" 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="_4q5otc0eEeKwCqQbxnBb_w" name="DataType1">

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

-      </eClassifiers>

-      <eClassifiers xmi:type="ecore:EDataType" xmi:id="_4q5ot80eEeKwCqQbxnBb_w" name="MyPrimitiveType" instanceClassName="java.lang.String">

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

-      </eClassifiers>

-      <eClassifiers xmi:type="ecore:EEnum" xmi:id="_4q5ouc0eEeKwCqQbxnBb_w" name="Enumeration1">

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

-        <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_4q5ou80eEeKwCqQbxnBb_w" name="EnumerationLiteral1"/>

-        <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_4q5ovM0eEeKwCqQbxnBb_w" name="EnumerationLiteral2" value="1"/>

-        <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_4q5ovc0eEeKwCqQbxnBb_w" name="EnumerationLiteral3" value="2"/>

-      </eClassifiers>

-    </contents>

-    <contents xmi:type="ecore:EPackage" xmi:id="_sVoXAHc8EeGEMdTf3PnPPg" name="testProfile" nsURI="http:///schemas/testProfile/_rNfDMHc8EeGEMdTf3PnPPg/0" nsPrefix="testProfile">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_v37ZEXc8EeGEMdTf3PnPPg" source="PapyrusVersion">

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

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_v37ZE3c8EeGEMdTf3PnPPg" key="Comment" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_v37ZFHc8EeGEMdTf3PnPPg" key="Copyright" value=""/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_v37ZFXc8EeGEMdTf3PnPPg" key="Date" value="2012-03-26"/>

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_v37ZFnc8EeGEMdTf3PnPPg" key="Author" value=""/>

-      </eAnnotations>

-      <eClassifiers xmi:type="ecore:EClass" xmi:id="_sVoXAXc8EeGEMdTf3PnPPg" name="Stereotype1">

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

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_sVo-EHc8EeGEMdTf3PnPPg" name="testReftoStereotype2" ordered="false" upperBound="-1" eType="_sVqMMnc8EeGEMdTf3PnPPg"/>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_sVo-Enc8EeGEMdTf3PnPPg" name="base_Element" ordered="false" lowerBound="1">

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

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_sVo-FHc8EeGEMdTf3PnPPg" name="testUnaryReftoStereotype2" ordered="false" eType="_sVqMMnc8EeGEMdTf3PnPPg"/>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_sVplIHc8EeGEMdTf3PnPPg" name="testMyPrimituveType" ordered="false" lowerBound="1" eType="_sVqzQHc8EeGEMdTf3PnPPg"/>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_sVplInc8EeGEMdTf3PnPPg" name="testInt" ordered="false" unique="false">

-          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/4.0.0/Types#//Integer"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_sVplJHc8EeGEMdTf3PnPPg" name="testMultiString" ordered="false" unique="false" upperBound="-1">

-          <eType xmi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/4.0.0/Types#//String"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_sVplJnc8EeGEMdTf3PnPPg" name="testRefToMetaclass" ordered="false" lowerBound="1">

-          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/>

-        </eStructuralFeatures>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_sVqMMHc8EeGEMdTf3PnPPg" name="testRefToEnumeration" ordered="false" lowerBound="1" eType="_sVqzQnc8EeGEMdTf3PnPPg"/>

-        <eStructuralFeatures xmi:type="ecore:EAttribute" xmi:id="_v33HoHc8EeGEMdTf3PnPPg" name="testDataType" ordered="false" lowerBound="1" eType="_v33usHc8EeGEMdTf3PnPPg"/>

-      </eClassifiers>

-      <eClassifiers xmi:type="ecore:EClass" xmi:id="_sVqMMnc8EeGEMdTf3PnPPg" name="Stereotype2">

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

-        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_sVqMNHc8EeGEMdTf3PnPPg" 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:EDataType" xmi:id="_sVqzQHc8EeGEMdTf3PnPPg" name="MyPrimitiveType" instanceClassName="java.lang.String">

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

-      </eClassifiers>

-      <eClassifiers xmi:type="ecore:EEnum" xmi:id="_sVqzQnc8EeGEMdTf3PnPPg" name="Enumeration1">

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

-        <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_sVqzRHc8EeGEMdTf3PnPPg" name="EnumerationLiteral1"/>

-        <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_sVqzRXc8EeGEMdTf3PnPPg" name="EnumerationLiteral2" value="1"/>

-        <eLiterals xmi:type="ecore:EEnumLiteral" xmi:id="_sVqzRnc8EeGEMdTf3PnPPg" name="EnumerationLiteral3" value="2"/>

-      </eClassifiers>

-      <eClassifiers xmi:type="ecore:EDataType" xmi:id="_v33usHc8EeGEMdTf3PnPPg" name="DataType1" instanceClassName="java.lang.String">

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

-      </eClassifiers>

-    </contents>

-  </eAnnotations>

-  <elementImport xmi:type="uml:ElementImport" xmi:id="_YcYBQGkdEeGGJOTenKBKAg" alias="Element">

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

-  </elementImport>

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

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

-  </packageImport>

-  <packagedElement xmi:type="uml:Stereotype" xmi:id="_WJYD4GkdEeGGJOTenKBKAg" name="Stereotype1">

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_dcMxQGkdEeGGJOTenKBKAg" name="testReftoStereotype2" type="_WxelsGkdEeGGJOTenKBKAg">

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_jnpm4GkdEeGGJOTenKBKAg"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_jnpm4WkdEeGGJOTenKBKAg" value="*"/>

-    </ownedAttribute>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_erNiEGkdEeGGJOTenKBKAg" name="base_Element" association="_erNiEWkdEeGGJOTenKBKAg">

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

-    </ownedAttribute>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_meyzIGkdEeGGJOTenKBKAg" name="testUnaryReftoStereotype2" visibility="public" type="_WxelsGkdEeGGJOTenKBKAg">

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_vekKgGkdEeGGJOTenKBKAg"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_vekKgWkdEeGGJOTenKBKAg" value="1"/>

-      <defaultValue xmi:type="uml:LiteralString" xmi:id="_vetUcGkdEeGGJOTenKBKAg">

-        <value xsi:nil="true"/>

-      </defaultValue>

-    </ownedAttribute>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_wshLYGkdEeGGJOTenKBKAg" name="testDataType" visibility="public" type="_aNRXIGkdEeGGJOTenKBKAg">

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_1DBRkGkdEeGGJOTenKBKAg" value="1"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1DBRkWkdEeGGJOTenKBKAg" value="1"/>

-      <defaultValue xmi:type="uml:LiteralString" xmi:id="_1DBRkmkdEeGGJOTenKBKAg">

-        <value xsi:nil="true"/>

-      </defaultValue>

-    </ownedAttribute>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_1ta5cGkdEeGGJOTenKBKAg" name="testMyPrimituveType" visibility="public" type="_apMeIGkdEeGGJOTenKBKAg">

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_7KKO8GkdEeGGJOTenKBKAg" value="1"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_7KKO8WkdEeGGJOTenKBKAg" value="1"/>

-      <defaultValue xmi:type="uml:LiteralString" xmi:id="_7KTY4GkdEeGGJOTenKBKAg">

-        <value xsi:nil="true"/>

-      </defaultValue>

-    </ownedAttribute>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_71vikGkdEeGGJOTenKBKAg" name="testInt" visibility="public" isUnique="false">

-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_AhPBUGkeEeGGJOTenKBKAg"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_AhPBUWkeEeGGJOTenKBKAg" value="1"/>

-      <defaultValue xmi:type="uml:LiteralString" xmi:id="_AhPBUmkeEeGGJOTenKBKAg">

-        <value xsi:nil="true"/>

-      </defaultValue>

-    </ownedAttribute>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_BfRW4GkeEeGGJOTenKBKAg" name="testMultiString" visibility="public" isUnique="false">

-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_HnmnEGkeEeGGJOTenKBKAg"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_HnmnEWkeEeGGJOTenKBKAg" value="*"/>

-      <defaultValue xmi:type="uml:LiteralString" xmi:id="_HnmnEmkeEeGGJOTenKBKAg">

-        <value xsi:nil="true"/>

-      </defaultValue>

-    </ownedAttribute>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_Lb0QgGz4EeGEKeJyQaxg3g" name="testRefToMetaclass">

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

-    </ownedAttribute>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_jAiq8G38EeGag98Jn1kDVw" name="testRefToEnumeration" visibility="public" type="_Zym0YGkdEeGGJOTenKBKAg">

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_jQ6CMG38EeGag98Jn1kDVw" value="1"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_jQ6CMW38EeGag98Jn1kDVw" value="1"/>

-      <defaultValue xmi:type="uml:LiteralString" xmi:id="_jQ6CMm38EeGag98Jn1kDVw">

-        <value xsi:nil="true"/>

-      </defaultValue>

-    </ownedAttribute>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_Re-boM0eEeKwCqQbxnBb_w" name="testMultiDataType" visibility="public" type="_aNRXIGkdEeGGJOTenKBKAg">

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_XjIWcM0eEeKwCqQbxnBb_w"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_XjSHcM0eEeKwCqQbxnBb_w" value="*"/>

-      <defaultValue xmi:type="uml:LiteralString" xmi:id="_XjlCYM0eEeKwCqQbxnBb_w">

-        <value xsi:nil="true"/>

-      </defaultValue>

-    </ownedAttribute>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_Y4YSIM0eEeKwCqQbxnBb_w" name="testMultiprimitiveType" visibility="public" type="_apMeIGkdEeGGJOTenKBKAg">

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_e4YFsM0eEeKwCqQbxnBb_w"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_e4hPoM0eEeKwCqQbxnBb_w" value="*"/>

-      <defaultValue xmi:type="uml:LiteralString" xmi:id="_e40KkM0eEeKwCqQbxnBb_w">

-        <value xsi:nil="true"/>

-      </defaultValue>

-    </ownedAttribute>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_Zu-i8M0eEeKwCqQbxnBb_w" name="testMultiInt" visibility="public">

-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_jNivIM0eEeKwCqQbxnBb_w"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_jNivIc0eEeKwCqQbxnBb_w" value="*"/>

-      <defaultValue xmi:type="uml:LiteralString" xmi:id="_jN1qEM0eEeKwCqQbxnBb_w">

-        <value xsi:nil="true"/>

-      </defaultValue>

-    </ownedAttribute>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_aEQPYM0eEeKwCqQbxnBb_w" name="testMultiEnumeration" visibility="public" type="_Zym0YGkdEeGGJOTenKBKAg" isUnique="false">

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_or6cUM0eEeKwCqQbxnBb_w"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_or6cUc0eEeKwCqQbxnBb_w" value="*"/>

-      <defaultValue xmi:type="uml:LiteralString" xmi:id="_osNXQM0eEeKwCqQbxnBb_w">

-        <value xsi:nil="true"/>

-      </defaultValue>

-    </ownedAttribute>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_aXAMQM0eEeKwCqQbxnBb_w" name="testBoolean" visibility="public">

-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ujbpUM0eEeKwCqQbxnBb_w" value="1"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ujkzQM0eEeKwCqQbxnBb_w" value="1"/>

-      <defaultValue xmi:type="uml:LiteralString" xmi:id="_uj3uMM0eEeKwCqQbxnBb_w">

-        <value xsi:nil="true"/>

-      </defaultValue>

-    </ownedAttribute>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_vH4aMM0eEeKwCqQbxnBb_w" name="testMultiBoolean" visibility="public" isUnique="false">

-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0qj_oM0eEeKwCqQbxnBb_w"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0qtwoM0eEeKwCqQbxnBb_w" value="*"/>

-      <defaultValue xmi:type="uml:LiteralString" xmi:id="_0rArkM0eEeKwCqQbxnBb_w">

-        <value xsi:nil="true"/>

-      </defaultValue>

-    </ownedAttribute>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_VDBX4M0jEeKjW9KkdY00_w" name="testString" visibility="public">

-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_YNNb8M0jEeKjW9KkdY00_w" value="1"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_YNg98M0jEeKjW9KkdY00_w" value="1"/>

-      <defaultValue xmi:type="uml:LiteralString" xmi:id="_YOGz0M0jEeKjW9KkdY00_w">

-        <value xsi:nil="true"/>

-      </defaultValue>

-    </ownedAttribute>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_SivA4M0tEeKjW9KkdY00_w" name="testReal" visibility="public">

-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Real"/>

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_UppDAM0tEeKjW9KkdY00_w" value="1"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Upxl4M0tEeKjW9KkdY00_w" value="1"/>

-      <defaultValue xmi:type="uml:LiteralString" xmi:id="_UqG9EM0tEeKjW9KkdY00_w">

-        <value xsi:nil="true"/>

-      </defaultValue>

-    </ownedAttribute>

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_VDuW8M0tEeKjW9KkdY00_w" name="testMultiReal" visibility="public">

-      <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Real"/>

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Z-yiwM0tEeKjW9KkdY00_w"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Z-53gM0tEeKjW9KkdY00_w" value="*"/>

-      <defaultValue xmi:type="uml:LiteralString" xmi:id="_Z_MLYM0tEeKjW9KkdY00_w">

-        <value xsi:nil="true"/>

-      </defaultValue>

-    </ownedAttribute>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Stereotype" xmi:id="_WxelsGkdEeGGJOTenKBKAg" name="Stereotype2">

-    <ownedAttribute xmi:type="uml:Property" xmi:id="_fTFaYGkdEeGGJOTenKBKAg" name="base_Element" association="_fTFaYWkdEeGGJOTenKBKAg">

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

-    </ownedAttribute>

-  </packagedElement>

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

-    <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_fc4W8G38EeGag98Jn1kDVw" name="EnumerationLiteral1"/>

-    <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_f6NMIG38EeGag98Jn1kDVw" name="EnumerationLiteral2"/>

-    <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_gPCzsG38EeGag98Jn1kDVw" name="EnumerationLiteral3"/>

-  </packagedElement>

-  <packagedElement xmi:type="uml:DataType" xmi:id="_aNRXIGkdEeGGJOTenKBKAg" name="DataType1"/>

-  <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_apMeIGkdEeGGJOTenKBKAg" name="MyPrimitiveType"/>

-  <packagedElement xmi:type="uml:Extension" xmi:id="_erNiEWkdEeGGJOTenKBKAg" name="E_Stereotype1_Element1" memberEnd="_erNiEmkdEeGGJOTenKBKAg _erNiEGkdEeGGJOTenKBKAg">

-    <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_erNiEmkdEeGGJOTenKBKAg" name="extension_Stereotype1" type="_WJYD4GkdEeGGJOTenKBKAg" aggregation="composite" association="_erNiEWkdEeGGJOTenKBKAg"/>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Extension" xmi:id="_fTFaYWkdEeGGJOTenKBKAg" name="E_Stereotype2_Element1" memberEnd="_fTFaYmkdEeGGJOTenKBKAg _fTFaYGkdEeGGJOTenKBKAg">

-    <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_fTFaYmkdEeGGJOTenKBKAg" name="extension_Stereotype2" type="_WxelsGkdEeGGJOTenKBKAg" aggregation="composite" association="_fTFaYWkdEeGGJOTenKBKAg"/>

-  </packagedElement>

-</uml:Profile>

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/AbstractPapyrusTestCase.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/AbstractPapyrusTestCase.java
deleted file mode 100644
index 741d93a6d83..00000000000
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/AbstractPapyrusTestCase.java
+++ /dev/null
@@ -1,207 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012, 2014 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *  Christian W. Damus (CEA) - bug 434993

- *  Christian W. Damus (CEA) - bug 436047

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.stereotypeproperty;

-

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IProject;

-import org.eclipse.core.runtime.NullProgressMonitor;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.commands.ICreationCommand;

-import org.eclipse.papyrus.infra.core.editor.IMultiDiagramEditor;

-import org.eclipse.papyrus.infra.core.resource.ModelSet;

-import org.eclipse.papyrus.infra.core.services.ExtensionServicesRegistry;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.core.services.ServicesRegistry;

-import org.eclipse.papyrus.infra.core.utils.DiResourceSet;

-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;

-import org.eclipse.papyrus.junit.utils.rules.HouseKeeper;

-import org.eclipse.papyrus.uml.diagram.clazz.CreateClassDiagramCommand;

-import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditor;

-import org.eclipse.papyrus.uml.diagram.common.commands.CreateUMLModelCommand;

-import org.eclipse.uml2.uml.Element;

-import org.junit.After;

-import org.junit.Assert;

-import org.junit.Before;

-import org.junit.Rule;

-

-

-/**

- * The Class AbstractPapyrusTestCase.

- */

-@SuppressWarnings("deprecation")

-public abstract class AbstractPapyrusTestCase extends AbstractPapyrusTest {

-

-	@Rule

-	public final HouseKeeper houseKeeper = new HouseKeeper();

-

-	/** The Constant CREATION. */

-	protected static final String CREATION = "CREATION:";

-

-	/** The Constant CONTAINER_CREATION. */

-	protected static final String CONTAINER_CREATION = "CONTAINER CREATION: ";

-

-	/** The Constant DROP. */

-	protected static final String DROP = "DROP: ";

-

-	/** The Constant DESTROY_DELETION. */

-	protected static final String DESTROY_DELETION = "DESTROY DELETION: ";

-

-	/** The Constant COMMAND_NULL. */

-	protected static final String COMMAND_NULL = " command null";

-

-	/** The Constant VIEW_DELETION. */

-	protected static final String VIEW_DELETION = "VIEW DELETION: ";

-

-	/** The Constant TEST_THE_REDO. */

-	protected static final String TEST_THE_REDO = "test the redo";

-

-	/** The Constant TEST_THE_UNDO. */

-	protected static final String TEST_THE_UNDO = "test the undo";

-

-	/** The Constant TEST_THE_EXECUTION. */

-	protected static final String TEST_THE_EXECUTION = "test the execution";

-

-	/** The Constant TEST_IF_THE_COMMAND_CAN_BE_EXECUTED. */

-	protected static final String TEST_IF_THE_COMMAND_CAN_BE_EXECUTED = "test if the command can be executed";

-

-	/** The Constant TEST_IF_THE_COMMAND_IS_CREATED. */

-	protected static final String TEST_IF_THE_COMMAND_IS_CREATED = "test if the command is created";

-

-	/** The Constant INITIALIZATION_TEST. */

-	protected static final String INITIALIZATION_TEST = "Intitial State";

-

-	/** The Constant CHANGE_CONTAINER. */

-	protected static final String CHANGE_CONTAINER = "CHANGE CONTAINER";

-

-	/** The papyrus editor. */

-	protected IMultiDiagramEditor papyrusEditor;

-

-	/** The di resource set. */

-	protected ModelSet diResourceSet;

-

-	/** The project. */

-	protected IProject project;

-

-	/** The file. */

-	protected IFile file;

-

-	/** The diagram editor. */

-	protected UMLDiagramEditor diagramEditor = null;

-

-	/** The clazzdiagramedit part. */

-	protected DiagramEditPart clazzdiagrameditPart;

-

-

-	/**

-	 * @see junit.framework.TestCase#setUp()

-	 *

-	 * @throws Exception

-	 */

-	@Before

-	public void setUp() throws Exception {

-		projectCreation();

-

-		//		while( !(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor()instanceof IMultiDiagramEditor)){}

-		//		IEditorPart editorPart = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();

-		//		papyrusEditor=((PapyrusMultiDiagramEditor)editorPart);

-	}

-

-	/**

-	 * Gets the root view.

-	 *

-	 * @return the root view

-	 */

-	protected View getRootView() {

-		return getDiagramEditPart().getDiagramView();

-	}

-

-	/**

-	 * Gets the root semantic model.

-	 *

-	 * @return the root semantic model

-	 */

-	protected Element getRootSemanticModel() {

-		return (Element)getRootView().getElement();

-	}

-

-	/**

-	 * @see junit.framework.TestCase#tearDown()

-	 *

-	 * @throws Exception

-	 */

-	@After

-	public void tearDown() throws Exception {

-		papyrusEditor.doSave(new NullProgressMonitor());

-		//diResourceSet.save( new NullProgressMonitor());

-		//diagramEditor.close(true);

-		papyrusEditor = null;

-	}

-

-	/**

-	 * Gets the diagram edit part.

-	 *

-	 * @return the diagram edit part

-	 */

-	protected DiagramEditPart getDiagramEditPart() {

-		if(clazzdiagrameditPart == null) {

-			diagramEditor = (UMLDiagramEditor)papyrusEditor.getActiveEditor();

-			clazzdiagrameditPart = (DiagramEditPart)papyrusEditor.getAdapter(DiagramEditPart.class);

-			Assert.assertNotNull("Cannot find the diagram editor", diagramEditor);

-			Assert.assertNotNull("Cannot find the Diagram edit part", clazzdiagrameditPart);

-		}

-		return clazzdiagrameditPart;

-	}

-

-	/**

-	 * Project creation.

-	 */

-	protected void projectCreation() throws Exception {

-		project = houseKeeper.createProject("StereotypePropertyTests");

-		file = project.getFile("StereotypePropertyTests.di");

-		this.diResourceSet = houseKeeper.cleanUpLater(new DiResourceSet());

-

-		//at this point, no resources have been created

-		if(file.exists()) {

-			file.delete(true, new NullProgressMonitor());

-		}

-

-		if(!file.exists()) {

-			// Don't create a zero-byte file. Create an empty XMI document

-			Resource diResource = diResourceSet.createResource(URI.createPlatformResourceURI(file.getFullPath().toString(), true));

-			diResource.save(null);

-			diResource.unload();

-			diResourceSet.createsModels(file);

-			new CreateUMLModelCommand().createModel(this.diResourceSet);

-			ServicesRegistry registry = new ExtensionServicesRegistry(org.eclipse.papyrus.infra.core.Activator.PLUGIN_ID);

-			try {

-				registry.add(ModelSet.class, Integer.MAX_VALUE, diResourceSet); //High priority to override all contributions

-				registry.startRegistry();

-			} catch (ServiceException ex) {

-				//Ignore exceptions

-			}

-			// diResourceSet.createsModels(file);

-			ICreationCommand command = new CreateClassDiagramCommand();

-			command.createDiagram(diResourceSet, null, "ClazzDiagram");

-			diResourceSet.save(new NullProgressMonitor());

-		}

-

-		papyrusEditor = houseKeeper.openPapyrusEditor(file);

-		Assert.assertNotNull(papyrusEditor);

-	}

-

-}

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/Activator.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/Activator.java
deleted file mode 100644
index 0ceff47b51e..00000000000
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/Activator.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012 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:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.stereotypeproperty;

-

-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.uml.diagram.stereotypeproperty.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/uml/diagram/org.eclipse.papyrus.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/AllTests.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/AllTests.java
deleted file mode 100644
index 85ca237d1af..00000000000
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/AllTests.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012 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:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.stereotypeproperty;

-

-import org.junit.runner.RunWith;

-import org.junit.runners.Suite;

-import org.junit.runners.Suite.SuiteClasses;

-

-/**

- * All tests together.

- */

-@RunWith(Suite.class)

-@SuiteClasses({

-	// canonical

-TestProfileApplication.class,

-TestStereotypeApplication.class,

-TestLayoutWithStereotype.class

-

-})

-public class AllTests {

-

-}

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/AppliedProfileCommand.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/AppliedProfileCommand.java
deleted file mode 100644
index 604a69cdeef..00000000000
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/AppliedProfileCommand.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012 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:

- *  CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.stereotypeproperty;

-

-import java.util.Collections;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;

-import org.eclipse.papyrus.uml.tools.utils.PackageUtil;

-import org.eclipse.uml2.uml.Package;

-import org.eclipse.uml2.uml.Profile;

-

-

-public class AppliedProfileCommand extends AbstractTransactionalCommand {

-

-	private Profile profile;

-	private Package model;

-

-	public AppliedProfileCommand(TransactionalEditingDomain domain, Package model, Profile profile) {

-		super(domain, "Apply profile", Collections.EMPTY_LIST);

-		this.model=model;

-		this.profile=profile;

-		

-	}

-

-	@Override

-	protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-		PackageUtil.applyProfile(model, profile, false);

-		System.out.println("test");

-		return null;

-	}

-}

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/TestLayoutWithStereotype.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/TestLayoutWithStereotype.java
deleted file mode 100644
index 842c855f093..00000000000
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/TestLayoutWithStereotype.java
+++ /dev/null
@@ -1,808 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012, 2014 CEA LIST and others.

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *  Christian W. Damus (CEA) - bug 422257

- *  Christian W. Damus (CEA) - bug 434594

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.stereotypeproperty;

-

-import static org.junit.Assert.assertEquals;

-import static org.junit.Assert.assertNotNull;

-import static org.junit.Assert.assertTrue;

-

-import java.util.ArrayList;

-

-import org.eclipse.draw2d.Label;

-import org.eclipse.draw2d.RectangleFigure;

-import org.eclipse.draw2d.geometry.Rectangle;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.transaction.RecordingCommand;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.commands.SetBoundsCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.figures.BorderedNodeFigure;

-import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;

-import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

-import org.eclipse.gmf.runtime.draw2d.ui.text.TextFlowEx;

-import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.core.utils.ServiceUtils;

-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IShapeCompartmentEditPart;

-import org.eclipse.papyrus.junit.framework.classification.InvalidTest;

-import org.eclipse.papyrus.uml.appearance.helper.AppliedStereotypeHelper;

-import org.eclipse.papyrus.uml.appearance.helper.UMLVisualInformationPapyrusConstant;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.AutomaticCompartmentLayoutManager;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.ClassifierFigure;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.EditingFlowPage;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.PackageFigure;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.StereotypePropertiesCompartment;

-import org.eclipse.papyrus.uml.diagram.stereotype.edition.editpart.AppliedStereotypeCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.stereotype.edition.editpart.AppliedStereotypeMultilinePropertyEditPart;

-import org.eclipse.papyrus.uml.extensionpoints.profile.IRegisteredProfile;

-import org.eclipse.papyrus.uml.extensionpoints.profile.RegisteredProfile;

-import org.eclipse.papyrus.uml.tools.commands.ApplyStereotypeCommand;

-import org.eclipse.uml2.uml.Element;

-import org.eclipse.uml2.uml.Model;

-import org.eclipse.uml2.uml.Profile;

-import org.eclipse.uml2.uml.Stereotype;

-import org.junit.Before;

-import org.junit.Test;

-

-/**

- * the purpose of this class is to test the layout

- *

- */

-public class TestLayoutWithStereotype extends AbstractPapyrusTestCase {

-

-	protected static final String ST_LEFT = String.valueOf("\u00AB");

-

-	protected static final String ST_RIGHT = String.valueOf("\u00BB");

-

-	private static final String TEST_PROFILE_STEREOTYPE1 = "testProfile::Stereotype1";

-

-	@InvalidTest("Works on Windows, Fails on Linux. To be investigated further")

-	@Test

-	public void testLayoutStereotypeApplicationOnClass() {

-		testToCreateANode(UMLElementTypes.Class_2008);

-	}

-

-	@Test

-	public void testLayoutStereotypeApplicationOnPackage() {

-		//testToCreateAPackage(UMLElementTypes.Package_2007);

-

-	}

-

-	/**

-	 * Test to create a node.

-	 *

-	 * @param type

-	 *        the type

-	 */

-	public void testToCreateANode(IElementType type) {

-

-		//VARIABLES

-		org.eclipse.uml2.uml.Class class1 = null;

-		//stereotype that is applied on class1

-		Stereotype stereotypeTest = null;

-		//view of the class

-		View NotationClass1 = null;

-		ClassifierFigure class1figure = null;

-		//editpart of class1

-		GraphicalEditPart classEditPart = null;

-		//compartment of stereotype

-		View appliedStereotypeCompartmentNotation = null;

-		//compartment Shape

-		View shapeCompartmentView = null;

-		//the view of the applied stereotype property

-		View stereotypePropertyView = null;

-		GraphicalEditPart stereotypeCompartmentEdipart = null;

-		GraphicalEditPart stereotypePropertyEdipart = null;

-

-

-		//CREATION

-		assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 0);

-

-		assertTrue(CREATION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 1);

-		//1 element element due to the reference to the profile

-		assertTrue(CREATION + INITIALIZATION_TEST, ((Model)getRootSemanticModel()).getAllAppliedProfiles().size() == 1);

-

-

-		{//execution of the command

-			CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(type, getDiagramEditPart().getDiagramPreferencesHint());

-			Command command = getDiagramEditPart().getCommand(requestcreation);

-			assertNotNull(CREATION + COMMAND_NULL, command);

-			assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-			assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);

-			diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-			assertTrue(CREATION + TEST_THE_EXECUTION, getRootView().getChildren().size() == 1);

-		}

-

-

-

-		//get the created Class

-		class1 = (org.eclipse.uml2.uml.Class)((org.eclipse.uml2.uml.Package)getRootSemanticModel()).getPackagedElement("Class1");

-		assertNotNull("created class must be not null", class1);

-		//look for the editpart that the class

-		classEditPart = (ClassEditPart)getDiagramEditPart().getChildren().get(0);

-		//test if stereotype can be applied

-		assertTrue("stereotype1 must be applicable on class1", class1.getApplicableStereotype(TEST_PROFILE_STEREOTYPE1) != null);

-

-

-		//look for the applied stereotype compartment

-		NotationClass1 = classEditPart.getNotationView();

-		{//execution of the command

-			SetBoundsCommand resizeCommand = new SetBoundsCommand(diagramEditor.getEditingDomain(), "resize", new EObjectAdapter(NotationClass1), new Rectangle(0, 0, 200, 200));

-

-			assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, resizeCommand.canExecute() == true);

-			diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(new ICommandProxy(resizeCommand));

-		}

-		{//test about the layout

-			org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SVGNodePlateFigure nodePlate = (org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SVGNodePlateFigure)((BorderedNodeFigure)classEditPart.getFigure()).getChildren().get(0);

-			// now verify position of each subfigure

-			class1figure = ((ClassifierFigure)nodePlate.getChildren().get(0));

-			class1figure.setBounds(new Rectangle(0, 0, 200, 200));

-			assertTrue("The figure of class1 is not an automaticCompartmentLayoutManager", class1figure.getLayoutManager() instanceof AutomaticCompartmentLayoutManager);

-			class1figure.getLayoutManager().layout(class1figure);

-			assertEquals("The figure of the Class has not the good X coordinate", class1figure.getBounds().x, 0);

-			assertEquals("The figure of the Class has not the good Y coordinate", class1figure.getBounds().y, 0);

-			assertEquals("The figure of the Class has not the good width coordinate", class1figure.getBounds().width, 200);

-			assertEquals("The figure of the Class has not the good height coordinate", class1figure.getBounds().height, 200);

-

-			// At this moment the class figure must contain 4 sub-figures 1label+ 3compartments

-			assertEquals("The number of figure children must be equal to 4", class1figure.getChildren().size(), 4);

-

-			//wrappinglabel for name

-			assertTrue("The sub figure [0] is not a wrapping label", class1figure.getChildren().get(0) instanceof WrappingLabel);

-			WrappingLabel labelClass = (WrappingLabel)class1figure.getChildren().get(0);

-

-			assertEquals("The label of the Class has not the good X coordinate", labelClass.getBounds().x, 1);

-			assertEquals("The label of the Class has not the good Y coordinate", labelClass.getBounds().y, 3);

-			assertEquals("The label of the Class has not the good width coordinate", labelClass.getBounds().width, 200);

-			assertEquals("The label of the Class has not the good heightcoordinate", labelClass.getBounds().height, 16);

-			assertEquals("The label of the Class does not display Class1", labelClass.getText(), "Class1");

-

-			assertTrue("The sub figure [0] is not a compartment", class1figure.getChildren().get(1) instanceof RectangleFigure);

-			RectangleFigure propertiesClass = (RectangleFigure)class1figure.getChildren().get(1);

-			assertTrue("The sub figure [0] is not the attribute compartment is not a ResizableCompartmentFigure", propertiesClass.getChildren().get(0) instanceof ResizableCompartmentFigure);

-

-			// compartment for attribute

-			assertEquals("The compartment attribute of the Class has not the good X coordinate", propertiesClass.getBounds().x, 1);

-			assertEquals("The compartment attribute of the Class has not the good Y coordinate", propertiesClass.getBounds().y, 20);

-			assertEquals("The compartment attribute of the Class has not the good width coordinate", propertiesClass.getBounds().width, 200);

-			assertEquals("The compartment attribute of the Class has not the good height coordinate", propertiesClass.getBounds().height, 59);

-

-

-			//compartment for operation

-			assertTrue("The figure of class1 is not an automaticCompartmentLayoutManager", class1figure.getChildren().get(2) instanceof RectangleFigure);

-			RectangleFigure operationsClass = (RectangleFigure)class1figure.getChildren().get(2);

-			assertTrue("The sub figure [0] is not the operation compartment is not a ResizableCompartmentFigure", operationsClass.getChildren().get(0) instanceof ResizableCompartmentFigure);

-			assertEquals("The compartment operation of the Class has not the good X coordinate", operationsClass.getBounds().x, 1);

-			assertEquals("The compartment operation of the Class has not the good y coordinate", operationsClass.getBounds().y, 80);

-			assertEquals("The compartment operation of the Class has not the good width coordinate", operationsClass.getBounds().width, 200);

-			assertEquals("The compartment operation of the Class has not the good height coordinate", operationsClass.getBounds().height, 59);

-

-

-			// compartment for nested classifier

-			assertTrue("The figure of class1 is not an automaticCompartmentLayoutManager", class1figure.getChildren().get(3) instanceof RectangleFigure);

-			RectangleFigure innerclassifiersClass = (RectangleFigure)class1figure.getChildren().get(3);

-			assertTrue("The sub figure [0] is not the nested Classifier compartment is not a ResizableCompartmentFigure", innerclassifiersClass.getChildren().get(0) instanceof ResizableCompartmentFigure);

-			assertEquals("The compartment nested classifier of the Class has not the good X coordinate", innerclassifiersClass.getBounds().x, 1);

-			assertEquals("The compartment nested classifier of the Class has not the good Y coordinate", innerclassifiersClass.getBounds().y, 140);

-			assertEquals("The compartment nested classifier of the Class has not the good width coordinate", innerclassifiersClass.getBounds().width, 200);

-			assertEquals("The compartment nested classifier of the Class has not the good Height coordinate", innerclassifiersClass.getBounds().height, 59);

-

-		}

-

-		{// execution of the application of the stereotype

-			ArrayList<Stereotype> stereotypeslist = new ArrayList<Stereotype>();

-			stereotypeslist.add(class1.getApplicableStereotype(TEST_PROFILE_STEREOTYPE1));

-			ApplyStereotypeCommand applyStereotypeCommand = new ApplyStereotypeCommand(((Element)classEditPart.resolveSemanticElement()), stereotypeslist, diagramEditor.getEditingDomain());

-			diagramEditor.getEditingDomain().getCommandStack().execute(applyStereotypeCommand);

-			assertTrue("No applied stereotype found on the element ", class1.getAppliedStereotypes().size() != 0);

-		}

-

-

-

-		for(int i = 0; i < NotationClass1.getTransientChildren().size(); i++) {

-			View view = (View)NotationClass1.getTransientChildren().get(i);

-			if(view.getType().equals(AppliedStereotypeCompartmentEditPart.ID)) {

-				appliedStereotypeCompartmentNotation = view;

-			}

-			if(view.getType().equals(IShapeCompartmentEditPart.VIEW_TYPE)) {

-				shapeCompartmentView = view;

-			}

-		}

-		// the mechanism of stereotype display is running.

-		//the thread is synchronous

-		assertTrue("No stereotype Compartment found in the notation", appliedStereotypeCompartmentNotation != null);

-		assertTrue("No stereotype  shape Compartment found in the notation", shapeCompartmentView != null);

-

-		//now display stereotypes

-		stereotypeTest = class1.getAppliedStereotypes().get(0);

-

-		{//display stereotype1

-			RecordingCommand displayStereotypeCommand = AppliedStereotypeHelper.getAppliedStereotypeToDisplayCommand(diagramEditor.getEditingDomain(), NotationClass1, stereotypeTest.getQualifiedName(), UMLVisualInformationPapyrusConstant.STEREOTYPE_COMPARTMENT_LOCATION);

-

-			diagramEditor.getEditingDomain().getCommandStack().execute(displayStereotypeCommand);

-			org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SVGNodePlateFigure nodePlate = (org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SVGNodePlateFigure)((BorderedNodeFigure)classEditPart.getFigure()).getChildren().get(0);

-

-			//get the label

-			org.eclipse.draw2d.Label stereotypeLabel = ((ClassifierFigure)nodePlate.getChildren().get(0)).getStereotypesLabel();

-			assertTrue("stereotype label must be not null", stereotypeLabel != null);

-			assertEquals("text of stereotype label be equals to " + ST_LEFT + "stereotype1" + ST_RIGHT, stereotypeLabel.getText(), ST_LEFT + "stereotype1" + ST_RIGHT);

-		}

-

-		{//test about the layout

-			org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SVGNodePlateFigure nodePlate = (org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SVGNodePlateFigure)((BorderedNodeFigure)classEditPart.getFigure()).getChildren().get(0);

-			// now verify position of each subfigure

-			class1figure = ((ClassifierFigure)nodePlate.getChildren().get(0));

-			class1figure.setBounds(new Rectangle(0, 0, 200, 200));

-			assertTrue("The figure of «stereotype1»Class1 is not an automaticCompartmentLayoutManager", class1figure.getLayoutManager() instanceof AutomaticCompartmentLayoutManager);

-			class1figure.getLayoutManager().layout(class1figure);

-			assertEquals("The figure of the  «stereotype1»Class1 has not the good X coordinate", class1figure.getBounds().x, 0);

-			assertEquals("The figure of the  «stereotype1»Class1 has not the good Y coordinate", class1figure.getBounds().y, 0);

-			assertEquals("The figure of the  «stereotype1»Class1 has not the good width coordinate", class1figure.getBounds().width, 200);

-			assertEquals("The figure of the  «stereotype1»Class1 has not the good height coordinate", class1figure.getBounds().height, 200);

-

-			// At this moment the class figure must contain 5 sub-figures 1 label for stereotype+ 1label for name+ 3compartments

-			assertEquals("The number of children «stereotype1»Class1 is not equals to 5", class1figure.getChildren().size(), 5);

-

-

-			//wrappingLabel for stereotype

-			assertTrue("The sub figure [0] of «stereotype1»Class1 is not a label", class1figure.getChildren().get(0) instanceof Label);

-			Label stereotypelabelClass = (Label)class1figure.getChildren().get(0);

-

-			assertEquals("The label of the Class has not the good X coordinate", stereotypelabelClass.getBounds().x, 1);

-			assertEquals("The label of the Class has not the good Y coordinate", stereotypelabelClass.getBounds().y, 3);

-			assertEquals("The label of the Class has not the good width coordinate", stereotypelabelClass.getBounds().width, 200);

-			assertEquals("The label of the Class has not the good heightcoordinate", stereotypelabelClass.getBounds().height, 15);

-			assertEquals("The label of the Class does not display " + ST_LEFT + "stereotype1" + ST_RIGHT, stereotypelabelClass.getText(), ST_LEFT + "stereotype1" + ST_RIGHT);

-

-

-			//wrappingLabel for name

-			assertTrue("The sub figure [1] of «stereotype1»Class1 is not a wrapping label", class1figure.getChildren().get(1) instanceof WrappingLabel);

-			WrappingLabel labelClass = (WrappingLabel)class1figure.getChildren().get(1);

-

-			assertEquals("The label of the Class has not the good X coordinate", labelClass.getBounds().x, 1);

-			assertEquals("The label of the Class has not the good Y coordinate", labelClass.getBounds().y, 19);

-			assertEquals("The label of the Class has not the good width coordinate", labelClass.getBounds().width, 200);

-			assertEquals("The label of the Class has not the good heightcoordinate", labelClass.getBounds().height, 16);

-			assertEquals("The label of the Class does not display Class1", labelClass.getText(), "Class1");

-

-			// compartment for property of stereotype

-			assertTrue("The sub figure [0] of «stereotype1»Class1 is not a compartment", class1figure.getChildren().get(2) instanceof RectangleFigure);

-			RectangleFigure stereotypePropertiesClass = (RectangleFigure)class1figure.getChildren().get(2);

-			assertTrue("The sub figure [0] is not the attribute compartment is not a ResizableCompartmentFigure", stereotypePropertiesClass.getChildren().get(0) instanceof ResizableCompartmentFigure);

-

-

-			assertEquals("The compartment attribute of the Class has not the good X coordinate", stereotypePropertiesClass.getBounds().x, 1);

-			assertEquals("The compartment attribute of the Class has not the good Y coordinate", stereotypePropertiesClass.getBounds().y, 36);

-			assertEquals("The compartment attribute of the Class has not the good width coordinate", stereotypePropertiesClass.getBounds().width, 200);

-			assertEquals("The compartment attribute of the Class has not the good height coordinate", stereotypePropertiesClass.getBounds().height, 54);

-

-

-			// compartment attribute

-			assertTrue("The sub figure [0] of «stereotype1»Class1 is not a compartment", class1figure.getChildren().get(2) instanceof RectangleFigure);

-			RectangleFigure propertiesClass = (RectangleFigure)class1figure.getChildren().get(2);

-			assertTrue("The sub figure [0] is not the attribute compartment is not a ResizableCompartmentFigure", propertiesClass.getChildren().get(0) instanceof ResizableCompartmentFigure);

-

-

-			assertEquals("The compartment attribute of the Class has not the good X coordinate", propertiesClass.getBounds().x, 1);

-			assertEquals("The compartment attribute of the Class has not the good Y coordinate", propertiesClass.getBounds().y, 36);

-			assertEquals("The compartment attribute of the Class has not the good width coordinate", propertiesClass.getBounds().width, 200);

-			assertEquals("The compartment attribute of the Class has not the good height coordinate", propertiesClass.getBounds().height, 54);

-

-

-			//compartment for operation

-			assertTrue("The sub figure [2] of «stereotype1»Class1 is not a compartment", class1figure.getChildren().get(3) instanceof RectangleFigure);

-			RectangleFigure operationsClass = (RectangleFigure)class1figure.getChildren().get(3);

-			assertTrue("The sub figure [2] is not the operation compartment is not a ResizableCompartmentFigure", operationsClass.getChildren().get(0) instanceof ResizableCompartmentFigure);

-			assertEquals("The compartment operation of the Class has not the good X coordinate", operationsClass.getBounds().x, 1);

-			assertEquals("The compartment operation of the Class has not the good y coordinate", operationsClass.getBounds().y, 91);

-			assertEquals("The compartment operation of the Class has not the good width coordinate", operationsClass.getBounds().width, 200);

-			assertEquals("The compartment operation of the Class has not the good height coordinate", operationsClass.getBounds().height, 54);

-

-			//compartment for nested classifier

-			assertTrue("The figure of class1 is not an automaticCompartmentLayoutManager", class1figure.getChildren().get(4) instanceof RectangleFigure);

-			RectangleFigure innerclassifiersClass = (RectangleFigure)class1figure.getChildren().get(4);

-			assertTrue("The sub figure [0] is not the nested Classifier compartment is not a ResizableCompartmentFigure", innerclassifiersClass.getChildren().get(0) instanceof ResizableCompartmentFigure);

-			assertEquals("The compartment nested classifier of the Class has not the good X coordinate", innerclassifiersClass.getBounds().x, 1);

-			assertEquals("The compartment nested classifier of the Class has not the good Y coordinate", innerclassifiersClass.getBounds().y, 146);

-			assertEquals("The compartment nested classifier of the Class has not the good width coordinate", innerclassifiersClass.getBounds().width, 200);

-			assertEquals("The compartment nested classifier of the Class has not the good Height coordinate", innerclassifiersClass.getBounds().height, 54);

-

-		}

-

-

-

-

-

-		{//test display of property of stereotype in compartment

-			RecordingCommand displayPropertyStereotypeCommand = AppliedStereotypeHelper.getAddAppliedStereotypePropertiesCommand(diagramEditor.getEditingDomain(), NotationClass1, stereotypeTest.getQualifiedName() + ".testInt");

-			diagramEditor.getEditingDomain().getCommandStack().execute(displayPropertyStereotypeCommand);

-

-			//the compartment must be visible

-			assertTrue("the compartment must be visible", appliedStereotypeCompartmentNotation.isVisible() == true);

-			//look for view that represents the property of the applied stereotype

-			stereotypePropertyView = (View)appliedStereotypeCompartmentNotation.getChildren().get(0);

-			assertNotNull("the view of the applied stereotype property must be created", stereotypePropertyView);

-			//look for the editpart that represents the property of applied stereotype

-			stereotypeCompartmentEdipart = (GraphicalEditPart)classEditPart.getChildBySemanticHint(AppliedStereotypeCompartmentEditPart.ID);

-			stereotypePropertyEdipart = (GraphicalEditPart)stereotypeCompartmentEdipart.getChildBySemanticHint(AppliedStereotypeMultilinePropertyEditPart.ID);

-			assertNotNull("the editpart of the applied stereotype compartment must be created", stereotypeCompartmentEdipart);

-			assertNotNull("the editpart of the applied stereotype property must be created", stereotypePropertyEdipart);

-			EditingFlowPage textarea = (EditingFlowPage)stereotypePropertyEdipart.getFigure();

-			assertEquals("text of stereotype label be equals to «stereotype1» ", ((TextFlowEx)textarea.getChildren().get(0)).getText(), "testInt=0");

-		}

-

-		{//test about the layout

-			org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SVGNodePlateFigure nodePlate = (org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SVGNodePlateFigure)((BorderedNodeFigure)classEditPart.getFigure()).getChildren().get(0);

-			// now verify position of each subfigure

-			class1figure = ((ClassifierFigure)nodePlate.getChildren().get(0));

-			class1figure.setBounds(new Rectangle(0, 0, 200, 200));

-			assertTrue("The figure of «stereotype1»Class1 is not an automaticCompartmentLayoutManager", class1figure.getLayoutManager() instanceof AutomaticCompartmentLayoutManager);

-			class1figure.getLayoutManager().layout(class1figure);

-			assertEquals("The figure of the  «stereotype1»Class1 has not the good X coordinate", class1figure.getBounds().x, 0);

-			assertEquals("The figure of the  «stereotype1»Class1 has not the good Y coordinate", class1figure.getBounds().y, 0);

-			assertEquals("The figure of the  «stereotype1»Class1 has not the good width coordinate", class1figure.getBounds().width, 200);

-			assertEquals("The figure of the  «stereotype1»Class1 has not the good height coordinate", class1figure.getBounds().height, 200);

-

-			// At this moment the class figure must contain 5 sub-figures 1 label for stereotype+ 1label for name+ compartment of stereotypes+ 3compartments

-			assertEquals("The number of children «stereotype1»Class1 is not equals to 6", class1figure.getChildren().size(), 6);

-

-

-			//label for stereotype

-			assertTrue("The sub figure [0] of «stereotype1»Class1 is not a label", class1figure.getChildren().get(0) instanceof Label);

-			Label stereotypelabelClass = (Label)class1figure.getChildren().get(0);

-

-			assertEquals("The label of the Class has not the good X coordinate", stereotypelabelClass.getBounds().x, 1);

-			assertEquals("The label of the Class has not the good Y coordinate", stereotypelabelClass.getBounds().y, 3);

-			assertEquals("The label of the Class has not the good width coordinate", stereotypelabelClass.getBounds().width, 200);

-			assertEquals("The label of the Class has not the good heightcoordinate", stereotypelabelClass.getBounds().height, 15);

-			assertEquals("The label of the Class does not display " + ST_LEFT + "stereotype1" + ST_RIGHT, stereotypelabelClass.getText(), ST_LEFT + "stereotype1" + ST_RIGHT);

-

-

-			//wrappingLabel for name

-			assertTrue("The sub figure [1] of «stereotype1»Class1 is not a wrapping label", class1figure.getChildren().get(1) instanceof WrappingLabel);

-			WrappingLabel labelClass = (WrappingLabel)class1figure.getChildren().get(1);

-

-			assertEquals("The label of the Class has not the good X coordinate", labelClass.getBounds().x, 1);

-			assertEquals("The label of the Class has not the good Y coordinate", labelClass.getBounds().y, 19);

-			assertEquals("The label of the Class has not the good width coordinate", labelClass.getBounds().width, 200);

-			assertEquals("The label of the Class has not the good heightcoordinate", labelClass.getBounds().height, 16);

-			assertEquals("The label of the Class does not display Class1", labelClass.getText(), "Class1");

-

-

-			// compartment for property of stereotypes

-			assertTrue("The sub figure [2] of «stereotype1»Class1 is not a compartment", class1figure.getChildren().get(2) instanceof StereotypePropertiesCompartment);

-			StereotypePropertiesCompartment sterotypesPropertiesClass = (StereotypePropertiesCompartment)class1figure.getChildren().get(2);

-

-			assertTrue("the stereotype properties compartment does not conent the compartment for a stereotype", sterotypesPropertiesClass.getChildren().get(0) instanceof ResizableCompartmentFigure);

-			ResizableCompartmentFigure compartmentFigure = (ResizableCompartmentFigure)sterotypesPropertiesClass.getChildren().get(0);

-			assertTrue("The content of the sterotype properties compartment is not an EditingFlowPage", compartmentFigure.getContentPane().getChildren().get(0) instanceof EditingFlowPage);

-			EditingFlowPage stereotypeProperty = (EditingFlowPage)compartmentFigure.getContentPane().getChildren().get(0);

-			assertTrue("text of stereotype label be equals to «stereotype1» ", ((TextFlowEx)stereotypeProperty.getChildren().get(0)).getText().equals("testInt=0"));

-

-			assertEquals("The compartment property of stereotypes of the Class has not the good X coordinate", sterotypesPropertiesClass.getBounds().x, 1);

-			assertEquals("The compartment property of stereotypes of the Class has not the good Y coordinate", sterotypesPropertiesClass.getBounds().y, 36);

-			assertEquals("The compartment property of stereotypes of the Class has not the good width coordinate", sterotypesPropertiesClass.getBounds().width, 200);

-			assertEquals("The compartment property of stereotypes of the Class has not the good height coordinate", sterotypesPropertiesClass.getBounds().height, 51);

-

-			//compartment for attribute

-			assertTrue("The sub figure [2] of «stereotype1»Class1 is not a compartment", class1figure.getChildren().get(3) instanceof RectangleFigure);

-			RectangleFigure propertiesClass = (RectangleFigure)class1figure.getChildren().get(3);

-			assertTrue("The sub figure [2] is not the attribute compartment is not a ResizableCompartmentFigure", propertiesClass.getChildren().get(0) instanceof ResizableCompartmentFigure);

-

-			assertEquals("The compartment attribute of the Class has not the good X coordinate", propertiesClass.getBounds().x, 1);

-			assertEquals("The compartment attribute of the Class has not the good Y coordinate", propertiesClass.getBounds().y, 88);

-			assertEquals("The compartment attribute of the Class has not the good width coordinate", propertiesClass.getBounds().width, 200);

-			assertEquals("The compartment attribute of the Class has not the good height coordinate", propertiesClass.getBounds().height, 37);

-

-

-			//compartment for operation

-			assertTrue("The sub figure [2] of «stereotype1»Class1 is not a compartment", class1figure.getChildren().get(4) instanceof RectangleFigure);

-			RectangleFigure operationsClass = (RectangleFigure)class1figure.getChildren().get(4);

-			assertTrue("The sub figure [2] is not the operation compartment is not a ResizableCompartmentFigure", operationsClass.getChildren().get(0) instanceof ResizableCompartmentFigure);

-			assertEquals("The compartment operation of the Class has not the good X coordinate", operationsClass.getBounds().x, 1);

-			assertEquals("The compartment operation of the Class has not the good y coordinate", operationsClass.getBounds().y, 126);

-			assertEquals("The compartment operation of the Class has not the good width coordinate", operationsClass.getBounds().width, 200);

-			assertEquals("The compartment operation of the Class has not the good height coordinate", operationsClass.getBounds().height, 37);

-

-			//compartment for nested classifier

-			assertTrue("The figure of class1 is not an automaticCompartmentLayoutManager", class1figure.getChildren().get(5) instanceof RectangleFigure);

-			RectangleFigure innerclassifiersClass = (RectangleFigure)class1figure.getChildren().get(5);

-			assertTrue("The sub figure [0] is not the nested Classifier compartment is not a ResizableCompartmentFigure", innerclassifiersClass.getChildren().get(0) instanceof ResizableCompartmentFigure);

-			assertEquals("The compartment nested classifier of the Class has not the good X coordinate", innerclassifiersClass.getBounds().x, 1);

-			assertEquals("The compartment nested classifier of the Class has not the good Y coordinate", innerclassifiersClass.getBounds().y, 164);

-			assertEquals("The compartment nested classifier of the Class has not the good width coordinate", innerclassifiersClass.getBounds().width, 200);

-			assertEquals("The compartment nested classifier of the Class has not the good Height coordinate", innerclassifiersClass.getBounds().height, 37);

-

-		}

-	}

-

-	/**

-	 * Test to create a node.

-	 *

-	 * @param type

-	 *        the type

-	 */

-	public void testToCreateAPackage(IElementType type) {

-

-		//VARIABLES

-		org.eclipse.uml2.uml.Package package1 = null;

-		//stereotype that is applied on class1

-		Stereotype stereotypeTest = null;

-		//view of the class

-		View NotationPackage1 = null;

-		PackageFigure package1figure = null;

-		//editpart of class1

-		GraphicalEditPart packageEditPart = null;

-		//compartment of stereotype

-		View appliedStereotypeCompartmentNotation = null;

-		//compartment Shape

-		View shapeCompartmentView = null;

-		//the view of the applied stereotype property

-		View stereotypePropertyView = null;

-		GraphicalEditPart stereotypeCompartmentEdipart = null;

-		GraphicalEditPart stereotypePropertyEdipart = null;

-

-

-		//CREATION

-		assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 0);

-

-		assertTrue(CREATION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 1);

-		//1 element element due to the reference to the profile

-		assertTrue(CREATION + INITIALIZATION_TEST, ((Model)getRootSemanticModel()).getAllAppliedProfiles().size() == 1);

-

-

-		{//execution of the command

-			CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(type, getDiagramEditPart().getDiagramPreferencesHint());

-			Command command = getDiagramEditPart().getCommand(requestcreation);

-			assertNotNull(CREATION + COMMAND_NULL, command);

-			assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-			assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);

-			diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-			assertTrue(CREATION + TEST_THE_EXECUTION, getRootView().getChildren().size() == 1);

-		}

-

-

-

-		//get the created Class

-		package1 = (org.eclipse.uml2.uml.Package)((org.eclipse.uml2.uml.Package)getRootSemanticModel()).getPackagedElement("Package1");

-		assertNotNull("created class must be not null", package1);

-		//look for the editpart that the class

-		packageEditPart = (PackageEditPart)getDiagramEditPart().getChildren().get(0);

-		//test if stereotype can be applied

-		assertTrue("stereotype1 must be applicable on class1", package1.getApplicableStereotype(TEST_PROFILE_STEREOTYPE1) != null);

-

-

-		//look for the applied stereotype compartment

-		NotationPackage1 = packageEditPart.getNotationView();

-		{//execution of the command

-			SetBoundsCommand resizeCommand = new SetBoundsCommand(diagramEditor.getEditingDomain(), "resize", new EObjectAdapter(NotationPackage1), new Rectangle(0, 0, 200, 200));

-

-			assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, resizeCommand.canExecute() == true);

-			diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(new ICommandProxy(resizeCommand));

-		}

-		{//test about the layout

-			org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SVGNodePlateFigure nodePlate = (org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SVGNodePlateFigure)((BorderedNodeFigure)packageEditPart.getFigure()).getChildren().get(0);

-			// now verify position of each subfigure

-			package1figure = ((PackageFigure)nodePlate.getChildren().get(0));

-			package1figure.setBounds(new Rectangle(0, 0, 200, 200));

-			assertTrue("The figure of package1 is not an automaticCompartmentLayoutManager", package1figure.getLayoutManager() instanceof Package);

-			package1figure.getLayoutManager().layout(package1figure);

-			assertTrue("The figure of the Class has not the good X coordinate", package1figure.getBounds().x == 0);

-			assertTrue("The figure of the Class has not the good Y coordinate", package1figure.getBounds().y == 0);

-			assertTrue("The figure of the Class has not the good width coordinate", package1figure.getBounds().width == 200);

-			assertTrue("The figure of the Class has not the good height coordinate", package1figure.getBounds().height == 200);

-

-			// At this moment the class figure must contain 4 sub-figures 1label+ 3compartments

-			assertTrue("The number of figure children must be equal to 4", package1figure.getChildren().size() == 4);

-

-			//wrappinglabel for name

-			assertTrue("The sub figure [0] is not a wrapping label", package1figure.getChildren().get(0) instanceof WrappingLabel);

-			WrappingLabel labelClass = (WrappingLabel)package1figure.getChildren().get(0);

-

-			assertTrue("The label of the Class has not the good X coordinate", labelClass.getBounds().x == 1);

-			assertTrue("The label of the Class has not the good Y coordinate", labelClass.getBounds().y == 3);

-			assertTrue("The label of the Class has not the good width coordinate", labelClass.getBounds().width == 200);

-			assertTrue("The label of the Class has not the good heightcoordinate", labelClass.getBounds().height == 16);

-			assertEquals("The label of the Class does not display Class1", labelClass.getText(), "Class1");

-

-			assertTrue("The sub figure [0] is not a compartment", package1figure.getChildren().get(1) instanceof RectangleFigure);

-			RectangleFigure propertiesClass = (RectangleFigure)package1figure.getChildren().get(1);

-			assertTrue("The sub figure [0] is not the attribute compartment is not a ResizableCompartmentFigure", propertiesClass.getChildren().get(0) instanceof ResizableCompartmentFigure);

-

-			// compartment for attribute

-			assertTrue("The compartment attribute of the Class has not the good X coordinate", propertiesClass.getBounds().x == 1);

-			assertTrue("The compartment attribute of the Class has not the good Y coordinate", propertiesClass.getBounds().y == 20);

-			assertTrue("The compartment attribute of the Class has not the good width coordinate", propertiesClass.getBounds().width == 200);

-			assertTrue("The compartment attribute of the Class has not the good height coordinate", propertiesClass.getBounds().height == 59);

-

-

-			//compartment for operation

-			assertTrue("The figure of class1 is not an automaticCompartmentLayoutManager", package1figure.getChildren().get(2) instanceof RectangleFigure);

-			RectangleFigure operationsClass = (RectangleFigure)package1figure.getChildren().get(2);

-			assertTrue("The sub figure [0] is not the operation compartment is not a ResizableCompartmentFigure", operationsClass.getChildren().get(0) instanceof ResizableCompartmentFigure);

-			assertTrue("The compartment operation of the Class has not the good X coordinate", operationsClass.getBounds().x == 1);

-			assertTrue("The compartment operation of the Class has not the good y coordinate", operationsClass.getBounds().y == 80);

-			assertTrue("The compartment operation of the Class has not the good width coordinate", operationsClass.getBounds().width == 200);

-			assertTrue("The compartment operation of the Class has not the good height coordinate", operationsClass.getBounds().height == 59);

-

-

-			// compartment for nested classifier

-			assertTrue("The figure of class1 is not an automaticCompartmentLayoutManager", package1figure.getChildren().get(3) instanceof RectangleFigure);

-			RectangleFigure innerclassifiersClass = (RectangleFigure)package1figure.getChildren().get(3);

-			assertTrue("The sub figure [0] is not the nested Classifier compartment is not a ResizableCompartmentFigure", innerclassifiersClass.getChildren().get(0) instanceof ResizableCompartmentFigure);

-			assertTrue("The compartment nested classifier of the Class has not the good X coordinate", innerclassifiersClass.getBounds().x == 1);

-			assertTrue("The compartment nested classifier of the Class has not the good Y coordinate", innerclassifiersClass.getBounds().y == 140);

-			assertTrue("The compartment nested classifier of the Class has not the good width coordinate", innerclassifiersClass.getBounds().width == 200);

-			assertTrue("The compartment nested classifier of the Class has not the good Height coordinate", innerclassifiersClass.getBounds().height == 59);

-

-		}

-

-		{// execution of the application of the stereotype

-			ArrayList<Stereotype> stereotypeslist = new ArrayList<Stereotype>();

-			stereotypeslist.add(package1.getApplicableStereotype(TEST_PROFILE_STEREOTYPE1));

-			ApplyStereotypeCommand applyStereotypeCommand = new ApplyStereotypeCommand(((Element)packageEditPart.resolveSemanticElement()), stereotypeslist, diagramEditor.getEditingDomain());

-			diagramEditor.getEditingDomain().getCommandStack().execute(applyStereotypeCommand);

-			assertTrue("No applied stereotype found on the element ", package1.getAppliedStereotypes().size() != 0);

-		}

-

-

-

-		for(int i = 0; i < NotationPackage1.getTransientChildren().size(); i++) {

-			View view = (View)NotationPackage1.getTransientChildren().get(i);

-			if(view.getType().equals(AppliedStereotypeCompartmentEditPart.ID)) {

-				appliedStereotypeCompartmentNotation = view;

-			}

-			if(view.getType().equals(IShapeCompartmentEditPart.VIEW_TYPE)) {

-				shapeCompartmentView = view;

-			}

-		}

-		// the mechanism of stereotype display is running.

-		//the thread is synchronous

-		assertTrue("No stereotype Compartment found in the notation", appliedStereotypeCompartmentNotation != null);

-		assertTrue("No stereotype  shape Compartment found in the notation", shapeCompartmentView != null);

-

-		//now display stereotypes

-		stereotypeTest = package1.getAppliedStereotypes().get(0);

-

-		{//display stereotype1

-			RecordingCommand displayStereotypeCommand = AppliedStereotypeHelper.getAppliedStereotypeToDisplayCommand(diagramEditor.getEditingDomain(), NotationPackage1, stereotypeTest.getQualifiedName(), UMLVisualInformationPapyrusConstant.STEREOTYPE_COMPARTMENT_LOCATION);

-

-			diagramEditor.getEditingDomain().getCommandStack().execute(displayStereotypeCommand);

-			org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SVGNodePlateFigure nodePlate = (org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SVGNodePlateFigure)((BorderedNodeFigure)packageEditPart.getFigure()).getChildren().get(0);

-

-			//get the label

-			org.eclipse.draw2d.Label stereotypeLabel = ((ClassifierFigure)nodePlate.getChildren().get(0)).getStereotypesLabel();

-			assertTrue("stereotype label must be not null", stereotypeLabel != null);

-			assertTrue("text of stereotype label be equals to " + ST_LEFT + "stereotype1" + ST_RIGHT, stereotypeLabel.getText().equals(ST_LEFT + "stereotype1" + ST_RIGHT));

-		}

-

-		{//test about the layout

-			org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SVGNodePlateFigure nodePlate = (org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SVGNodePlateFigure)((BorderedNodeFigure)packageEditPart.getFigure()).getChildren().get(0);

-			// now verify position of each subfigure

-			package1figure = ((PackageFigure)nodePlate.getChildren().get(0));

-			package1figure.setBounds(new Rectangle(0, 0, 200, 200));

-			assertTrue("The figure of «stereotype1»Class1 is not an automaticCompartmentLayoutManager", package1figure.getLayoutManager() instanceof AutomaticCompartmentLayoutManager);

-			package1figure.getLayoutManager().layout(package1figure);

-			assertTrue("The figure of the  «stereotype1»Class1 has not the good X coordinate", package1figure.getBounds().x == 0);

-			assertTrue("The figure of the  «stereotype1»Class1 has not the good Y coordinate", package1figure.getBounds().y == 0);

-			assertTrue("The figure of the  «stereotype1»Class1 has not the good width coordinate", package1figure.getBounds().width == 200);

-			assertTrue("The figure of the  «stereotype1»Class1 has not the good height coordinate", package1figure.getBounds().height == 200);

-

-			// At this moment the class figure must contain 5 sub-figures 1 label for stereotype+ 1label for name+ 3compartments

-			assertTrue("The number of children «stereotype1»Class1 is not equals to 6", package1figure.getChildren().size() == 5);

-

-

-			//wrappingLabel for stereotype

-			assertTrue("The sub figure [0] of «stereotype1»Class1 is not a label", package1figure.getChildren().get(0) instanceof Label);

-			Label stereotypelabelClass = (Label)package1figure.getChildren().get(0);

-

-			assertTrue("The label of the Class has not the good X coordinate", stereotypelabelClass.getBounds().x == 1);

-			assertTrue("The label of the Class has not the good Y coordinate", stereotypelabelClass.getBounds().y == 3);

-			assertTrue("The label of the Class has not the good width coordinate", stereotypelabelClass.getBounds().width == 200);

-			assertTrue("The label of the Class has not the good heightcoordinate", stereotypelabelClass.getBounds().height == 15);

-			assertEquals("The label of the Class does not display " + ST_LEFT + "stereotype1" + ST_RIGHT, stereotypelabelClass.getText(), ST_LEFT + "stereotype1" + ST_RIGHT);

-

-

-			//wrappingLabel for name

-			assertTrue("The sub figure [1] of «stereotype1»Class1 is not a wrapping label", package1figure.getChildren().get(1) instanceof WrappingLabel);

-			WrappingLabel labelClass = (WrappingLabel)package1figure.getChildren().get(1);

-

-			assertTrue("The label of the Class has not the good X coordinate", labelClass.getBounds().x == 1);

-			assertTrue("The label of the Class has not the good Y coordinate", labelClass.getBounds().y == 19);

-			assertTrue("The label of the Class has not the good width coordinate", labelClass.getBounds().width == 200);

-			assertTrue("The label of the Class has not the good heightcoordinate", labelClass.getBounds().height == 16);

-			assertEquals("The label of the Class does not display Class1", labelClass.getText(), "Class1");

-

-			// compartment for property of stereotype

-			assertTrue("The sub figure [0] of «stereotype1»Class1 is not a compartment", package1figure.getChildren().get(2) instanceof RectangleFigure);

-			RectangleFigure stereotypePropertiesClass = (RectangleFigure)package1figure.getChildren().get(2);

-			assertTrue("The sub figure [0] is not the attribute compartment is not a ResizableCompartmentFigure", stereotypePropertiesClass.getChildren().get(0) instanceof ResizableCompartmentFigure);

-

-

-			assertTrue("The compartment attribute of the Class has not the good X coordinate", stereotypePropertiesClass.getBounds().x == 1);

-			assertTrue("The compartment attribute of the Class has not the good Y coordinate", stereotypePropertiesClass.getBounds().y == 36);

-			assertTrue("The compartment attribute of the Class has not the good width coordinate", stereotypePropertiesClass.getBounds().width == 200);

-			assertTrue("The compartment attribute of the Class has not the good height coordinate", stereotypePropertiesClass.getBounds().height == 54);

-

-

-			// compartment attribute

-			assertTrue("The sub figure [0] of «stereotype1»Class1 is not a compartment", package1figure.getChildren().get(2) instanceof RectangleFigure);

-			RectangleFigure propertiesClass = (RectangleFigure)package1figure.getChildren().get(2);

-			assertTrue("The sub figure [0] is not the attribute compartment is not a ResizableCompartmentFigure", propertiesClass.getChildren().get(0) instanceof ResizableCompartmentFigure);

-

-

-			assertTrue("The compartment attribute of the Class has not the good X coordinate", propertiesClass.getBounds().x == 1);

-			assertTrue("The compartment attribute of the Class has not the good Y coordinate", propertiesClass.getBounds().y == 36);

-			assertTrue("The compartment attribute of the Class has not the good width coordinate", propertiesClass.getBounds().width == 200);

-			assertTrue("The compartment attribute of the Class has not the good height coordinate", propertiesClass.getBounds().height == 54);

-

-

-			//compartment for operation

-			assertTrue("The sub figure [2] of «stereotype1»Class1 is not a compartment", package1figure.getChildren().get(3) instanceof RectangleFigure);

-			RectangleFigure operationsClass = (RectangleFigure)package1figure.getChildren().get(3);

-			assertTrue("The sub figure [2] is not the operation compartment is not a ResizableCompartmentFigure", operationsClass.getChildren().get(0) instanceof ResizableCompartmentFigure);

-			assertTrue("The compartment operation of the Class has not the good X coordinate", operationsClass.getBounds().x == 1);

-			assertTrue("The compartment operation of the Class has not the good y coordinate", operationsClass.getBounds().y == 91);

-			assertTrue("The compartment operation of the Class has not the good width coordinate", operationsClass.getBounds().width == 200);

-			assertTrue("The compartment operation of the Class has not the good height coordinate", operationsClass.getBounds().height == 54);

-

-			//compartment for nested classifier

-			assertTrue("The figure of class1 is not an automaticCompartmentLayoutManager", package1figure.getChildren().get(4) instanceof RectangleFigure);

-			RectangleFigure innerclassifiersClass = (RectangleFigure)package1figure.getChildren().get(4);

-			assertTrue("The sub figure [0] is not the nested Classifier compartment is not a ResizableCompartmentFigure", innerclassifiersClass.getChildren().get(0) instanceof ResizableCompartmentFigure);

-			assertTrue("The compartment nested classifier of the Class has not the good X coordinate", innerclassifiersClass.getBounds().x == 1);

-			assertTrue("The compartment nested classifier of the Class has not the good Y coordinate", innerclassifiersClass.getBounds().y == 146);

-			assertTrue("The compartment nested classifier of the Class has not the good width coordinate", innerclassifiersClass.getBounds().width == 200);

-			assertTrue("The compartment nested classifier of the Class has not the good Height coordinate", innerclassifiersClass.getBounds().height == 54);

-

-		}

-

-

-

-

-

-		{//test display of property of stereotype in compartment

-			RecordingCommand displayPropertyStereotypeCommand = AppliedStereotypeHelper.getAddAppliedStereotypePropertiesCommand(diagramEditor.getEditingDomain(), NotationPackage1, stereotypeTest.getQualifiedName() + ".testInt");

-			diagramEditor.getEditingDomain().getCommandStack().execute(displayPropertyStereotypeCommand);

-

-			//the compartment must be visible

-			assertTrue("the compartment must be visible", appliedStereotypeCompartmentNotation.isVisible() == true);

-			//look for view that represents the property of the applied stereotype

-			stereotypePropertyView = (View)appliedStereotypeCompartmentNotation.getChildren().get(0);

-			assertNotNull("the view of the applied stereotype property must be created", stereotypePropertyView);

-			//look for the editpart that represents the property of applied stereotype

-			stereotypeCompartmentEdipart = (GraphicalEditPart)packageEditPart.getChildBySemanticHint(AppliedStereotypeCompartmentEditPart.ID);

-			stereotypePropertyEdipart = (GraphicalEditPart)stereotypeCompartmentEdipart.getChildBySemanticHint(AppliedStereotypeMultilinePropertyEditPart.ID);

-			assertNotNull("the editpart of the applied stereotype compartment must be created", stereotypeCompartmentEdipart);

-			assertNotNull("the editpart of the applied stereotype property must be created", stereotypePropertyEdipart);

-			EditingFlowPage textarea = (EditingFlowPage)stereotypePropertyEdipart.getFigure();

-			assertTrue("text of stereotype label be equals to «stereotype1» ", ((TextFlowEx)textarea.getChildren().get(0)).getText().equals("testInt=0"));

-		}

-

-		{//test about the layout

-			org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SVGNodePlateFigure nodePlate = (org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SVGNodePlateFigure)((BorderedNodeFigure)packageEditPart.getFigure()).getChildren().get(0);

-			// now verify position of each subfigure

-			package1figure = ((PackageFigure)nodePlate.getChildren().get(0));

-			package1figure.setBounds(new Rectangle(0, 0, 200, 200));

-			assertTrue("The figure of «stereotype1»Class1 is not an automaticCompartmentLayoutManager", package1figure.getLayoutManager() instanceof AutomaticCompartmentLayoutManager);

-			package1figure.getLayoutManager().layout(package1figure);

-			assertTrue("The figure of the  «stereotype1»Class1 has not the good X coordinate", package1figure.getBounds().x == 0);

-			assertTrue("The figure of the  «stereotype1»Class1 has not the good Y coordinate", package1figure.getBounds().y == 0);

-			assertTrue("The figure of the  «stereotype1»Class1 has not the good width coordinate", package1figure.getBounds().width == 200);

-			assertTrue("The figure of the  «stereotype1»Class1 has not the good height coordinate", package1figure.getBounds().height == 200);

-

-			// At this moment the class figure must contain 5 sub-figures 1 label for stereotype+ 1label for name+ compartment of stereotypes+ 3compartments

-			assertTrue("The number of children «stereotype1»Class1 is not equals to 6", package1figure.getChildren().size() == 6);

-

-

-			//label for stereotype

-			assertTrue("The sub figure [0] of «stereotype1»Class1 is not a label", package1figure.getChildren().get(0) instanceof Label);

-			Label stereotypelabelClass = (Label)package1figure.getChildren().get(0);

-

-			assertTrue("The label of the Class has not the good X coordinate", stereotypelabelClass.getBounds().x == 1);

-			assertTrue("The label of the Class has not the good Y coordinate", stereotypelabelClass.getBounds().y == 3);

-			assertTrue("The label of the Class has not the good width coordinate", stereotypelabelClass.getBounds().width == 200);

-			assertTrue("The label of the Class has not the good heightcoordinate", stereotypelabelClass.getBounds().height == 15);

-			assertEquals("The label of the Class does not display " + ST_LEFT + "stereotype1" + ST_RIGHT, stereotypelabelClass.getText(), ST_LEFT + "stereotype1" + ST_RIGHT);

-

-

-			//wrappingLabel for name

-			assertTrue("The sub figure [1] of «stereotype1»Class1 is not a wrapping label", package1figure.getChildren().get(1) instanceof WrappingLabel);

-			WrappingLabel labelClass = (WrappingLabel)package1figure.getChildren().get(1);

-

-			assertTrue("The label of the Class has not the good X coordinate", labelClass.getBounds().x == 1);

-			assertTrue("The label of the Class has not the good Y coordinate", labelClass.getBounds().y == 19);

-			assertTrue("The label of the Class has not the good width coordinate", labelClass.getBounds().width == 200);

-			assertTrue("The label of the Class has not the good heightcoordinate", labelClass.getBounds().height == 16);

-			assertEquals("The label of the Class does not display Class1", labelClass.getText(), "Class1");

-

-

-			// compartment for property of stereotypes

-			assertTrue("The sub figure [2] of «stereotype1»Class1 is not a compartment", package1figure.getChildren().get(2) instanceof StereotypePropertiesCompartment);

-			StereotypePropertiesCompartment sterotypesPropertiesClass = (StereotypePropertiesCompartment)package1figure.getChildren().get(2);

-

-			assertTrue("the stereotype properties compartment does not conent the compartment for a stereotype", sterotypesPropertiesClass.getChildren().get(0) instanceof ResizableCompartmentFigure);

-			ResizableCompartmentFigure compartmentFigure = (ResizableCompartmentFigure)sterotypesPropertiesClass.getChildren().get(0);

-			assertTrue("The content of the sterotype properties compartment is not an EditingFlowPage", compartmentFigure.getContentPane().getChildren().get(0) instanceof EditingFlowPage);

-			EditingFlowPage stereotypeProperty = (EditingFlowPage)compartmentFigure.getContentPane().getChildren().get(0);

-			assertTrue("text of stereotype label be equals to «stereotype1» ", ((TextFlowEx)stereotypeProperty.getChildren().get(0)).getText().equals("testInt=0"));

-

-			assertTrue("The compartment property of stereotypes of the Class has not the good X coordinate", sterotypesPropertiesClass.getBounds().x == 1);

-			assertTrue("The compartment property of stereotypes of the Class has not the good Y coordinate", sterotypesPropertiesClass.getBounds().y == 36);

-			assertTrue("The compartment property of stereotypes of the Class has not the good width coordinate", sterotypesPropertiesClass.getBounds().width == 200);

-			assertTrue("The compartment property of stereotypes of the Class has not the good height coordinate", sterotypesPropertiesClass.getBounds().height == 51);

-

-			//compartment for attribute

-			assertTrue("The sub figure [2] of «stereotype1»Class1 is not a compartment", package1figure.getChildren().get(3) instanceof RectangleFigure);

-			RectangleFigure propertiesClass = (RectangleFigure)package1figure.getChildren().get(3);

-			assertTrue("The sub figure [2] is not the attribute compartment is not a ResizableCompartmentFigure", propertiesClass.getChildren().get(0) instanceof ResizableCompartmentFigure);

-

-			assertTrue("The compartment attribute of the Class has not the good X coordinate", propertiesClass.getBounds().x == 1);

-			assertTrue("The compartment attribute of the Class has not the good Y coordinate", propertiesClass.getBounds().y == 88);

-			assertTrue("The compartment attribute of the Class has not the good width coordinate", propertiesClass.getBounds().width == 200);

-			assertTrue("The compartment attribute of the Class has not the good height coordinate", propertiesClass.getBounds().height == 37);

-

-

-			//compartment for operation

-			assertTrue("The sub figure [2] of «stereotype1»Class1 is not a compartment", package1figure.getChildren().get(4) instanceof RectangleFigure);

-			RectangleFigure operationsClass = (RectangleFigure)package1figure.getChildren().get(4);

-			assertTrue("The sub figure [2] is not the operation compartment is not a ResizableCompartmentFigure", operationsClass.getChildren().get(0) instanceof ResizableCompartmentFigure);

-			assertTrue("The compartment operation of the Class has not the good X coordinate", operationsClass.getBounds().x == 1);

-			assertTrue("The compartment operation of the Class has not the good y coordinate", operationsClass.getBounds().y == 126);

-			assertTrue("The compartment operation of the Class has not the good width coordinate", operationsClass.getBounds().width == 200);

-			assertTrue("The compartment operation of the Class has not the good height coordinate", operationsClass.getBounds().height == 37);

-

-			//compartment for nested classifier

-			assertTrue("The figure of class1 is not an automaticCompartmentLayoutManager", package1figure.getChildren().get(5) instanceof RectangleFigure);

-			RectangleFigure innerclassifiersClass = (RectangleFigure)package1figure.getChildren().get(5);

-			assertTrue("The sub figure [0] is not the nested Classifier compartment is not a ResizableCompartmentFigure", innerclassifiersClass.getChildren().get(0) instanceof ResizableCompartmentFigure);

-			assertTrue("The compartment nested classifier of the Class has not the good X coordinate", innerclassifiersClass.getBounds().x == 1);

-			assertTrue("The compartment nested classifier of the Class has not the good Y coordinate", innerclassifiersClass.getBounds().y == 164);

-			assertTrue("The compartment nested classifier of the Class has not the good width coordinate", innerclassifiersClass.getBounds().width == 200);

-			assertTrue("The compartment nested classifier of the Class has not the good Height coordinate", innerclassifiersClass.getBounds().height == 37);

-

-		}

-	}

-

-

-	@Before

-	@Override

-	public void setUp() throws Exception {

-		super.setUp();

-		IRegisteredProfile registeredProfile = RegisteredProfile.getRegisteredProfile("TestProfile");

-		final Model root = ((Model)getDiagramEditPart().resolveSemanticElement());

-		URI modelUri = registeredProfile.getUri();

-		final Resource modelResource = EMFHelper.getResourceSet(root).getResource(modelUri, true);

-		final Profile profile = (Profile)modelResource.getContents().get(0);

-		//	PackageUtil.applyProfile(root,profile, false);

-		final TransactionalEditingDomain domain = ServiceUtils.getInstance().getTransactionalEditingDomain(papyrusEditor.getServicesRegistry());

-		AppliedProfileCommand appliedProfileCommand = new AppliedProfileCommand(domain, root, profile);

-		domain.getCommandStack().execute(new GMFtoEMFCommandWrapper(appliedProfileCommand));

-

-

-	}

-}

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/TestProfileApplication.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/TestProfileApplication.java
deleted file mode 100644
index 19e236b40c2..00000000000
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/TestProfileApplication.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012, 2014 CEA LIST and others.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *  Christian W. Damus (CEA) - bug 422257

- *  Christian W. Damus (CEA) - bug 434594

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.stereotypeproperty;

-

-import static org.junit.Assert.assertTrue;

-

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.core.utils.ServiceUtils;

-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

-import org.eclipse.papyrus.uml.extensionpoints.profile.IRegisteredProfile;

-import org.eclipse.papyrus.uml.extensionpoints.profile.RegisteredProfile;

-import org.eclipse.uml2.uml.Model;

-import org.eclipse.uml2.uml.Profile;

-import org.junit.Test;

-

-

-public class TestProfileApplication extends AbstractPapyrusTestCase {

-

-	@Test

-	public void testProfileApplicationOnModel() throws ServiceException {

-		IRegisteredProfile registeredProfile = RegisteredProfile.getRegisteredProfile("TestProfile");

-		final Model root = ((Model)getDiagramEditPart().resolveSemanticElement());

-		assertTrue("Registered profile not found", registeredProfile != null);

-		URI modelUri = registeredProfile.getUri();

-		final Resource modelResource = EMFHelper.getResourceSet(root).getResource(modelUri, true);

-		assertTrue("the registered profile is not a profile", (modelResource.getContents().get(0) instanceof Profile));

-		assertTrue("strange profile", ("".equals(registeredProfile.getQualifiedNames())));

-		final Profile profile = (Profile)modelResource.getContents().get(0);

-		//	PackageUtil.applyProfile(root,profile, false);

-		final TransactionalEditingDomain domain = ServiceUtils.getInstance().getTransactionalEditingDomain(papyrusEditor.getServicesRegistry());

-		AppliedProfileCommand appliedProfileCommand = new AppliedProfileCommand(domain, root, profile);

-		domain.getCommandStack().execute(new GMFtoEMFCommandWrapper(appliedProfileCommand));

-

-		assertTrue("Profile not applied", root.getAllAppliedProfiles().size() == 1);

-

-	}

-}

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/TestStereotypeApplication.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/TestStereotypeApplication.java
deleted file mode 100644
index e5fcca53098..00000000000
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/TestStereotypeApplication.java
+++ /dev/null
@@ -1,319 +0,0 @@
-/*****************************************************************************

- * Copyright (c) 2012, 2014 CEA LIST and others.

- *

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *  CEA LIST - Initial API and implementation

- *  Christian W. Damus (CEA) - bug 422257

- *  Christian W. Damus (CEA) - bug 434594

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.stereotypeproperty;

-

-import static org.junit.Assert.assertNotNull;

-import static org.junit.Assert.assertTrue;

-

-import java.util.ArrayList;

-

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.transaction.RecordingCommand;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gef.commands.UnexecutableCommand;

-import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;

-import org.eclipse.gmf.runtime.diagram.ui.figures.BorderedNodeFigure;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;

-import org.eclipse.gmf.runtime.draw2d.ui.text.TextFlowEx;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.core.utils.ServiceUtils;

-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

-import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IShapeCompartmentEditPart;

-import org.eclipse.papyrus.uml.appearance.helper.AppliedStereotypeHelper;

-import org.eclipse.papyrus.uml.appearance.helper.UMLVisualInformationPapyrusConstant;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.PackageEditPart;

-import org.eclipse.papyrus.uml.diagram.clazz.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.ClassifierFigure;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.EditingFlowPage;

-import org.eclipse.papyrus.uml.diagram.common.figure.node.PackageFigure;

-import org.eclipse.papyrus.uml.diagram.stereotype.edition.editpart.AppliedStereotypeCompartmentEditPart;

-import org.eclipse.papyrus.uml.diagram.stereotype.edition.editpart.AppliedStereotypeMultilinePropertyEditPart;

-import org.eclipse.papyrus.uml.extensionpoints.profile.IRegisteredProfile;

-import org.eclipse.papyrus.uml.extensionpoints.profile.RegisteredProfile;

-import org.eclipse.papyrus.uml.tools.commands.ApplyStereotypeCommand;

-import org.eclipse.uml2.uml.Element;

-import org.eclipse.uml2.uml.Model;

-import org.eclipse.uml2.uml.Profile;

-import org.eclipse.uml2.uml.Stereotype;

-import org.junit.Before;

-import org.junit.Test;

-

-

-public class TestStereotypeApplication extends AbstractPapyrusTestCase {

-

-

-	protected static final String ST_LEFT = String.valueOf("\u00AB");

-

-	protected static final String ST_RIGHT = String.valueOf("\u00BB");

-

-	private static final String TEST_PROFILE_STEREOTYPE1 = "testProfile::Stereotype1";

-

-	@Test

-	public void testStereotypeApplicationOnClass() {

-		testToCreateANode(UMLElementTypes.Class_2008);

-

-	}

-

-	@Test

-	public void testStereotypeApplicationOnPackage() {

-		testToCreateAPackage(UMLElementTypes.Package_2007);

-

-	}

-

-	/**

-	 * Test to create a node.

-	 *

-	 * @param type

-	 *        the type

-	 */

-	public void testToCreateANode(IElementType type) {

-

-		//VARIABLES

-		org.eclipse.uml2.uml.Class class1 = null;

-		//stereotype that is applied on class1

-		Stereotype stereotypeTest = null;

-		//view of the class

-		View NotationClass1 = null;

-		//editpart of class1

-		GraphicalEditPart classEditPart = null;

-		//compartment of stereotype

-		View appliedStereotypeCompartmentNotation = null;

-		//compartment Shape

-		View shapeCompartmentView = null;

-		//the view of the applied stereotype property

-		View stereotypePropertyView = null;

-		GraphicalEditPart stereotypeCompartmentEdipart = null;

-		GraphicalEditPart stereotypePropertyEdipart = null;

-

-		//CREATION

-		assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 0);

-

-		assertTrue(CREATION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 1);

-		//1 element element due to the reference to the profile

-		assertTrue(CREATION + INITIALIZATION_TEST, ((Model)getRootSemanticModel()).getAllAppliedProfiles().size() == 1);

-

-

-		{//execution of the command

-			CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(type, getDiagramEditPart().getDiagramPreferencesHint());

-			Command command = getDiagramEditPart().getCommand(requestcreation);

-			assertNotNull(CREATION + COMMAND_NULL, command);

-			assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-			assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);

-			diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-			assertTrue(CREATION + TEST_THE_EXECUTION, getRootView().getChildren().size() == 1);

-		}

-

-		//get the created Class

-		class1 = (org.eclipse.uml2.uml.Class)((org.eclipse.uml2.uml.Package)getRootSemanticModel()).getPackagedElement("Class1");

-		assertNotNull("created class must be not null", class1);

-		//look for the editpart that the class

-		classEditPart = (ClassEditPart)getDiagramEditPart().getChildren().get(0);

-		//test if stereotype can be applied

-		assertTrue("stereotype1 must be applicable on class1", class1.getApplicableStereotype(TEST_PROFILE_STEREOTYPE1) != null);

-

-		{// execution of the application of the stereotype

-			ArrayList<Stereotype> stereotypeslist = new ArrayList<Stereotype>();

-			stereotypeslist.add(class1.getApplicableStereotype(TEST_PROFILE_STEREOTYPE1));

-			ApplyStereotypeCommand applyStereotypeCommand = new ApplyStereotypeCommand(((Element)classEditPart.resolveSemanticElement()), stereotypeslist, diagramEditor.getEditingDomain());

-			diagramEditor.getEditingDomain().getCommandStack().execute(applyStereotypeCommand);

-			assertTrue("No applied stereotype found on the element ", class1.getAppliedStereotypes().size() != 0);

-		}

-

-		//look for the applied stereotype compartment

-		NotationClass1 = classEditPart.getNotationView();

-

-		for(int i = 0; i < NotationClass1.getTransientChildren().size(); i++) {

-			View view = (View)NotationClass1.getTransientChildren().get(i);

-			if(view.getType().equals(AppliedStereotypeCompartmentEditPart.ID)) {

-				appliedStereotypeCompartmentNotation = view;

-			}

-			if(view.getType().equals(IShapeCompartmentEditPart.VIEW_TYPE)) {

-				shapeCompartmentView = view;

-			}

-		}

-		// the mechanism of stereotype display is running.

-		//the thread is synchronous

-		assertTrue("No stereotype Compartment found in the notation", appliedStereotypeCompartmentNotation != null);

-		assertTrue("No stereotype  shape Compartment found in the notation", shapeCompartmentView != null);

-

-		//now display stereotypes

-		stereotypeTest = class1.getAppliedStereotypes().get(0);

-

-		{//display stereotype1

-			RecordingCommand displayStereotypeCommand = AppliedStereotypeHelper.getAppliedStereotypeToDisplayCommand(diagramEditor.getEditingDomain(), NotationClass1, stereotypeTest.getQualifiedName(), UMLVisualInformationPapyrusConstant.STEREOTYPE_COMPARTMENT_LOCATION);

-

-			diagramEditor.getEditingDomain().getCommandStack().execute(displayStereotypeCommand);

-			org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SVGNodePlateFigure nodePlate = (org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SVGNodePlateFigure)((BorderedNodeFigure)classEditPart.getFigure()).getChildren().get(0);

-

-			//get the label

-			org.eclipse.draw2d.Label stereotypeLabel = ((ClassifierFigure)nodePlate.getChildren().get(0)).getStereotypesLabel();

-			assertTrue("stereotype label must be not null", stereotypeLabel != null);

-			assertTrue("text of stereotype label be equals to" + ST_LEFT + "stereotype1" + ST_RIGHT, stereotypeLabel.getText().equals(ST_LEFT + "stereotype1" + ST_RIGHT));

-		}

-

-		{//test display of property of stereotype in compartment

-			RecordingCommand displayPropertyStereotypeCommand = AppliedStereotypeHelper.getAddAppliedStereotypePropertiesCommand(diagramEditor.getEditingDomain(), NotationClass1, stereotypeTest.getQualifiedName() + ".testInt");

-			diagramEditor.getEditingDomain().getCommandStack().execute(displayPropertyStereotypeCommand);

-

-			//the compartment must be visible

-			assertTrue("the compartment must be visible", appliedStereotypeCompartmentNotation.isVisible() == true);

-			//look for view that represents the property of the applied stereotype

-			stereotypePropertyView = (View)appliedStereotypeCompartmentNotation.getChildren().get(0);

-			assertNotNull("the view of the applied stereotype property must be created", stereotypePropertyView);

-			//look for the editpart that represents the property of applied stereotype

-			stereotypeCompartmentEdipart = (GraphicalEditPart)classEditPart.getChildBySemanticHint(AppliedStereotypeCompartmentEditPart.ID);

-			stereotypePropertyEdipart = (GraphicalEditPart)stereotypeCompartmentEdipart.getChildBySemanticHint(AppliedStereotypeMultilinePropertyEditPart.ID);

-			assertNotNull("the editpart of the applied stereotype compartment must be created", stereotypeCompartmentEdipart);

-			assertNotNull("the editpart of the applied stereotype property must be created", stereotypePropertyEdipart);

-			EditingFlowPage textarea = (EditingFlowPage)stereotypePropertyEdipart.getFigure();

-			assertTrue("text of stereotype label be equals to «stereotype1» ", ((TextFlowEx)textarea.getChildren().get(0)).getText().equals("testInt=0"));

-		}

-	}

-

-	@Before

-	@Override

-	public void setUp() throws Exception {

-		super.setUp();

-		IRegisteredProfile registeredProfile = RegisteredProfile.getRegisteredProfile("TestProfile");

-		final Model root = ((Model)getDiagramEditPart().resolveSemanticElement());

-		URI modelUri = registeredProfile.getUri();

-		final Resource modelResource = EMFHelper.getResourceSet(root).getResource(modelUri, true);

-		final Profile profile = (Profile)modelResource.getContents().get(0);

-		//	PackageUtil.applyProfile(root,profile, false);

-		final TransactionalEditingDomain domain = ServiceUtils.getInstance().getTransactionalEditingDomain(papyrusEditor.getServicesRegistry());

-		AppliedProfileCommand appliedProfileCommand = new AppliedProfileCommand(domain, root, profile);

-		domain.getCommandStack().execute(new GMFtoEMFCommandWrapper(appliedProfileCommand));

-

-

-	}

-

-	/**

-	 * Test to create a node.

-	 *

-	 * @param type

-	 *        the type

-	 */

-	public void testToCreateAPackage(IElementType type) {

-

-		//VARIABLES

-		org.eclipse.uml2.uml.Package package1 = null;

-		//stereotype that is applied on class1

-		Stereotype stereotypeTest = null;

-		//view of the class

-		View Notationpackage1 = null;

-		//editpart of class1

-		GraphicalEditPart package1EditPart = null;

-		//compartment of stereotype

-		View appliedStereotypeCompartmentNotation = null;

-		//compartment Shape

-		View shapeCompartmentView = null;

-		//the view of the applied stereotype property

-		View stereotypePropertyView = null;

-		GraphicalEditPart stereotypeCompartmentEdipart = null;

-		GraphicalEditPart stereotypePropertyEdipart = null;

-

-		//CREATION

-		assertTrue(CREATION + INITIALIZATION_TEST, getDiagramEditPart().getChildren().size() == 0);

-

-		assertTrue(CREATION + INITIALIZATION_TEST, getRootSemanticModel().getOwnedElements().size() == 1);

-		//1 element element due to the reference to the profile

-		assertTrue(CREATION + INITIALIZATION_TEST, ((Model)getRootSemanticModel()).getAllAppliedProfiles().size() == 1);

-

-

-		{//execution of the command

-			CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(type, getDiagramEditPart().getDiagramPreferencesHint());

-			Command command = getDiagramEditPart().getCommand(requestcreation);

-			assertNotNull(CREATION + COMMAND_NULL, command);

-			assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);

-			assertTrue("CREATION: " + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);

-			diagramEditor.getDiagramEditDomain().getDiagramCommandStack().execute(command);

-			assertTrue(CREATION + TEST_THE_EXECUTION, getRootView().getChildren().size() == 1);

-		}

-

-		//get the created Class

-		package1 = (org.eclipse.uml2.uml.Package)((org.eclipse.uml2.uml.Package)getRootSemanticModel()).getPackagedElement("Package1");

-		assertNotNull("created class must be not null", package1);

-		//look for the editpart that the class

-		package1EditPart = (PackageEditPart)getDiagramEditPart().getChildren().get(0);

-		//test if stereotype can be applied

-		assertTrue("stereotype1 must be applicable on class1", package1.getApplicableStereotype(TEST_PROFILE_STEREOTYPE1) != null);

-

-		{// execution of the application of the stereotype

-			ArrayList<Stereotype> stereotypeslist = new ArrayList<Stereotype>();

-			stereotypeslist.add(package1.getApplicableStereotype(TEST_PROFILE_STEREOTYPE1));

-			ApplyStereotypeCommand applyStereotypeCommand = new ApplyStereotypeCommand(((Element)package1EditPart.resolveSemanticElement()), stereotypeslist, diagramEditor.getEditingDomain());

-			diagramEditor.getEditingDomain().getCommandStack().execute(applyStereotypeCommand);

-			assertTrue("No applied stereotype found on the element ", package1.getAppliedStereotypes().size() != 0);

-		}

-

-		//look for the applied stereotype compartment

-		Notationpackage1 = package1EditPart.getNotationView();

-

-		for(int i = 0; i < Notationpackage1.getTransientChildren().size(); i++) {

-			View view = (View)Notationpackage1.getTransientChildren().get(i);

-			if(view.getType().equals(AppliedStereotypeCompartmentEditPart.ID)) {

-				appliedStereotypeCompartmentNotation = view;

-			}

-			if(view.getType().equals(IShapeCompartmentEditPart.VIEW_TYPE)) {

-				shapeCompartmentView = view;

-			}

-		}

-		// the mechanism of stereotype display is running.

-		//the thread is synchronous

-		assertTrue("No stereotype Compartment found in the notation", appliedStereotypeCompartmentNotation != null);

-		assertTrue("No stereotype  shape Compartment found in the notation", shapeCompartmentView != null);

-

-		//now display stereotypes

-		stereotypeTest = package1.getAppliedStereotypes().get(0);

-

-		{//display stereotype1

-			RecordingCommand displayStereotypeCommand = AppliedStereotypeHelper.getAppliedStereotypeToDisplayCommand(diagramEditor.getEditingDomain(), Notationpackage1, stereotypeTest.getQualifiedName(), UMLVisualInformationPapyrusConstant.STEREOTYPE_COMPARTMENT_LOCATION);

-

-			diagramEditor.getEditingDomain().getCommandStack().execute(displayStereotypeCommand);

-			org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SVGNodePlateFigure nodePlate = (org.eclipse.papyrus.infra.gmfdiag.common.figure.node.SVGNodePlateFigure)((BorderedNodeFigure)package1EditPart.getFigure()).getChildren().get(0);

-

-			//get the label

-			org.eclipse.draw2d.Label stereotypeLabel = ((PackageFigure)nodePlate.getChildren().get(0)).getStereotypesLabel();

-			assertTrue("stereotype label must be not null", stereotypeLabel != null);

-			assertTrue("text of stereotype label be equals to " + ST_LEFT + "stereotype1" + ST_RIGHT, stereotypeLabel.getText().equals(ST_LEFT + "stereotype1" + ST_RIGHT));

-		}

-

-		{//test display of property of stereotype in compartment

-			RecordingCommand displayPropertyStereotypeCommand = AppliedStereotypeHelper.getAddAppliedStereotypePropertiesCommand(diagramEditor.getEditingDomain(), Notationpackage1, stereotypeTest.getQualifiedName() + ".testInt");

-			diagramEditor.getEditingDomain().getCommandStack().execute(displayPropertyStereotypeCommand);

-

-			//the compartment must be visible

-			assertTrue("the compartment must be visible", appliedStereotypeCompartmentNotation.isVisible() == true);

-			//look for view that represents the property of the applied stereotype

-			stereotypePropertyView = (View)appliedStereotypeCompartmentNotation.getChildren().get(0);

-			assertNotNull("the view of the applied stereotype property must be created", stereotypePropertyView);

-			//look for the editpart that represents the property of applied stereotype

-			stereotypeCompartmentEdipart = (GraphicalEditPart)package1EditPart.getChildBySemanticHint(AppliedStereotypeCompartmentEditPart.ID);

-			stereotypePropertyEdipart = (GraphicalEditPart)stereotypeCompartmentEdipart.getChildBySemanticHint(AppliedStereotypeMultilinePropertyEditPart.ID);

-			assertNotNull("the editpart of the applied stereotype compartment must be created", stereotypeCompartmentEdipart);

-			assertNotNull("the editpart of the applied stereotype property must be created", stereotypePropertyEdipart);

-			EditingFlowPage textarea = (EditingFlowPage)stereotypePropertyEdipart.getFigure();

-			assertTrue("text of stereotype label be equals to " + ST_LEFT + "stereotype1" + ST_RIGHT, ((TextFlowEx)textarea.getChildren().get(0)).getText().equals("testInt=0"));

-		}

-	}

-

-}

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/build.properties b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/build.properties
index 1b08f841b5e..d813dff9979 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/build.properties
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/build.properties
@@ -3,5 +3,6 @@ output.. = bin/
 bin.includes = META-INF/,\

                .,\

                about.html,\

-               plugin.properties

+               plugin.properties,\

+               content/

 src.includes = about.html

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/TestActivityGroup.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/TestActivityGroup.java
index d6124d3630a..25d4ba623a0 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/TestActivityGroup.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/canonical/TestActivityGroup.java
@@ -56,21 +56,15 @@ import org.junit.Assert;
 import org.junit.Test;
 
 /**
- * This class test graphical and semantic part of {@link ActivityGroup} elements: 
- * {@link StructuredActivityNode}
- * {@link ConditionalNode}
- * {@link ExpansionRegion}
- * {@link LoopNode}
- * {@link SequenceNode}
- * {@link InterruptibleActivityRegion}
- * {@link ActivityPartition}
- * 
+ * This class test graphical and semantic part of {@link ActivityGroup} elements: {@link StructuredActivityNode} {@link ConditionalNode}
+ * {@link ExpansionRegion} {@link LoopNode} {@link SequenceNode} {@link InterruptibleActivityRegion} {@link ActivityPartition}
+ *
  * For each {@link ActivityGroup} elements test:
- * 1) created child {@link ActivityNode} in {@link ActivityGroup} and drag-drop child to {@link Activity}
- * 2) created child {@link ActivityNode} in {@link Activity} and drag-drop child to {@link ActivityGroup} element
+ * 1) created child {@link ActivityNode} in {@link ActivityGroup} and drag-drop child to {@link Activity} 2) created child {@link ActivityNode} in
+ * {@link Activity} and drag-drop child to {@link ActivityGroup} element
  */
 public class TestActivityGroup extends AbstractPapyrusTestCase {
-	
+
 	@Override
 	protected String getProjectName() {
 		return IActivityDiagramTestsConstants.PROJECT_NAME;
@@ -84,7 +78,7 @@ public class TestActivityGroup extends AbstractPapyrusTestCase {
 	public DiagramUpdater getDiagramUpdater() {
 		return UMLDiagramUpdater.TYPED_INSTANCE;
 	}
-	
+
 	/**
 	 * create childNodeEditPart in parentEditPart
 	 */
@@ -97,200 +91,200 @@ public class TestActivityGroup extends AbstractPapyrusTestCase {
 		executeOnUIThread(cmd);
 		return findChildBySemanticHint(container, childVID);
 	}
-	
+
 	private IGraphicalEditPart findChildBySemanticHint(IGraphicalEditPart parent, int vid) {
 		IGraphicalEditPart childEP = parent.getChildBySemanticHint(Integer.toString(vid));
 		assertNotNull("Parent " + parent + ", type " + parent.getNotationView() + " looking for: " + vid, childEP);
 		return childEP;
 	}
-	
+
 	protected IGraphicalEditPart getActivityCompartmentEditPart() {
 		IGraphicalEditPart activityEP = findChildBySemanticHint(getDiagramEditPart(), ActivityEditPart.VISUAL_ID);
 		return findChildBySemanticHint(activityEP, ActivityActivityContentCompartmentEditPart.VISUAL_ID);
 	}
-	
+
 	@FailingTest("Bug 440239")
 	@Test
 	public void testFromInterruptibleActivityRegionToActivity() {
 		IGraphicalEditPart regionEP = createChild(InterruptibleActivityRegionEditPart.VISUAL_ID, getActivityCompartmentEditPart());
 		IGraphicalEditPart regionCompartmentEP = findChildBySemanticHint(regionEP, InterruptibleActivityRegionInterruptibleActivityRegionContentCompartmentEditPart.VISUAL_ID);
 		IGraphicalEditPart opaqueEP = createChild(OpaqueActionEditPart.VISUAL_ID, regionCompartmentEP);
-		
+
 		DragDropSequence dd = new BeetwenInterruptibleRegionAndActivity(regionCompartmentEP, opaqueEP, getActivityCompartmentEditPart());
 		dd.doTest();
 	}
-	
+
 	@FailingTest("Bug 440239")
 	@Test
 	public void testFromActivityToInterruptibleActivityRegion() {
 		IGraphicalEditPart regionEP = createChild(InterruptibleActivityRegionEditPart.VISUAL_ID, getActivityCompartmentEditPart());
 		IGraphicalEditPart regionCompartmentEP = findChildBySemanticHint(regionEP, InterruptibleActivityRegionInterruptibleActivityRegionContentCompartmentEditPart.VISUAL_ID);
 		IGraphicalEditPart opaqueEP = createChild(OpaqueActionEditPart.VISUAL_ID, getActivityCompartmentEditPart());
-		
+
 		DragDropSequence dd = new BeetwenInterruptibleRegionAndActivity(getActivityCompartmentEditPart(), opaqueEP, regionCompartmentEP);
 		dd.doTest();
 	}
-	
+
 	@FailingTest("Bug 440276")
 	@Test
 	public void testFromActivityPartitionToActivity() {
 		IGraphicalEditPart partitionEP = createChild(ActivityPartitionEditPart.VISUAL_ID, getActivityCompartmentEditPart());
 		IGraphicalEditPart partitionCompartmentEP = findChildBySemanticHint(partitionEP, ActivityPartitionActivityPartitionContentCompartmentEditPart.VISUAL_ID);
 		IGraphicalEditPart opaqueEP = createChild(OpaqueActionEditPart.VISUAL_ID, partitionCompartmentEP);
-		
+
 		DragDropSequence dd = new BeetwenPartitionAndActivity(partitionCompartmentEP, opaqueEP, getActivityCompartmentEditPart());
 		dd.doTest();
 	}
-	
+
 	@Test
 	public void testFromActivityToActivityPartition() {
 		IGraphicalEditPart partitionEP = createChild(ActivityPartitionEditPart.VISUAL_ID, getActivityCompartmentEditPart());
 		IGraphicalEditPart partitionCompartmentEP = findChildBySemanticHint(partitionEP, ActivityPartitionActivityPartitionContentCompartmentEditPart.VISUAL_ID);
 		IGraphicalEditPart opaqueEP = createChild(OpaqueActionEditPart.VISUAL_ID, getActivityCompartmentEditPart());
-		
+
 		DragDropSequence dd = new BeetwenPartitionAndActivity(getActivityCompartmentEditPart(), opaqueEP, partitionCompartmentEP);
 		dd.doTest();
 	}
-	
+
 	@Test
 	public void testFromStructuredNodeToActivity() {
 		IGraphicalEditPart structuredEP = createChild(StructuredActivityNodeEditPart.VISUAL_ID, getActivityCompartmentEditPart());
 		IGraphicalEditPart structuredCompartmentEP = findChildBySemanticHint(structuredEP, StructuredActivityNodeStructuredActivityNodeContentCompartmentEditPart.VISUAL_ID);
 		IGraphicalEditPart loopNodeEP = createChild(LoopNodeEditPart.VISUAL_ID, structuredCompartmentEP);
-		
+
 		DragDropSequence dd = new BeetwenContainmentNodeAndActivity(structuredCompartmentEP, loopNodeEP, getActivityCompartmentEditPart());
-		
+
 		dd.doTest();
 	}
-	
+
 	@Test
 	public void testFromActivityToStructuredNode() {
 		IGraphicalEditPart structuredEP = createChild(StructuredActivityNodeEditPart.VISUAL_ID, getActivityCompartmentEditPart());
 		IGraphicalEditPart structuredCompartmentEP = findChildBySemanticHint(structuredEP, StructuredActivityNodeStructuredActivityNodeContentCompartmentEditPart.VISUAL_ID);
 		IGraphicalEditPart decisionNodeEP = createChild(DecisionNodeEditPart.VISUAL_ID, getActivityCompartmentEditPart());
-		
+
 		DragDropSequence dd = new BeetwenContainmentNodeAndActivity(getActivityCompartmentEditPart(), decisionNodeEP, structuredCompartmentEP);
-		
+
 		dd.doTest();
 	}
-	
+
 	@Test
 	public void testFromConditionalNodeToActivity() {
 		IGraphicalEditPart conditionalEP = createChild(ConditionalNodeEditPart.VISUAL_ID, getActivityCompartmentEditPart());
 		IGraphicalEditPart conditionalCompartmentEP = findChildBySemanticHint(conditionalEP, ConditionalNodeStructuredActivityNodeContentCompartmentEditPart.VISUAL_ID);
 		IGraphicalEditPart expansionRegionEP = createChild(ExpansionRegionEditPart.VISUAL_ID, conditionalCompartmentEP);
-		
+
 		DragDropSequence dd = new BeetwenContainmentNodeAndActivity(conditionalCompartmentEP, expansionRegionEP, getActivityCompartmentEditPart());
-		
+
 		dd.doTest();
 	}
-	
+
 	@Test
 	public void testFromActivityToConditionalNode() {
 		IGraphicalEditPart conditionalEP = createChild(ConditionalNodeEditPart.VISUAL_ID, getActivityCompartmentEditPart());
 		IGraphicalEditPart conditionalCompartmentEP = findChildBySemanticHint(conditionalEP, ConditionalNodeStructuredActivityNodeContentCompartmentEditPart.VISUAL_ID);
 		IGraphicalEditPart forkNodeEP = createChild(ForkNodeEditPart.VISUAL_ID, getActivityCompartmentEditPart());
-		
+
 		DragDropSequence dd = new BeetwenContainmentNodeAndActivity(getActivityCompartmentEditPart(), forkNodeEP, conditionalCompartmentEP);
-		
+
 		dd.doTest();
 	}
-	
+
 	@Test
 	public void testFromExpansionRegionToActivity() {
 		IGraphicalEditPart expansionRegionEP = createChild(ExpansionRegionEditPart.VISUAL_ID, getActivityCompartmentEditPart());
 		IGraphicalEditPart expansionRegionCompartmentEP = findChildBySemanticHint(expansionRegionEP, ExpansionRegionStructuredActivityNodeContentCompartmentEditPart.VISUAL_ID);
 		IGraphicalEditPart conditionalNodeEP = createChild(ConditionalNodeEditPart.VISUAL_ID, expansionRegionCompartmentEP);
-		
+
 		DragDropSequence dd = new BeetwenContainmentNodeAndActivity(expansionRegionCompartmentEP, conditionalNodeEP, getActivityCompartmentEditPart());
-		
+
 		dd.doTest();
 	}
-	
+
 	@Test
 	public void testFromActivityToExpansionRegion() {
 		IGraphicalEditPart expansionRegionEP = createChild(ExpansionRegionEditPart.VISUAL_ID, getActivityCompartmentEditPart());
 		IGraphicalEditPart expansionRegionCompartmentEP = findChildBySemanticHint(expansionRegionEP, ExpansionRegionStructuredActivityNodeContentCompartmentEditPart.VISUAL_ID);
 		IGraphicalEditPart valueSpecifivationActionEP = createChild(ValueSpecificationActionEditPart.VISUAL_ID, getActivityCompartmentEditPart());
-		
+
 		DragDropSequence dd = new BeetwenContainmentNodeAndActivity(getActivityCompartmentEditPart(), valueSpecifivationActionEP, expansionRegionCompartmentEP);
-		
+
 		dd.doTest();
 	}
-	
+
 	@Test
 	public void testFromLoopNodeToActivity() {
 		IGraphicalEditPart loopEP = createChild(LoopNodeEditPart.VISUAL_ID, getActivityCompartmentEditPart());
 		IGraphicalEditPart loopCompartmentEP = findChildBySemanticHint(loopEP, LoopNodeStructuredActivityNodeContentCompartmentEditPart.VISUAL_ID);
 		IGraphicalEditPart structuredNodeEP = createChild(StructuredActivityNodeEditPart.VISUAL_ID, loopCompartmentEP);
-		
+
 		DragDropSequence dd = new BeetwenContainmentNodeAndActivity(loopCompartmentEP, structuredNodeEP, getActivityCompartmentEditPart());
-		
+
 		dd.doTest();
 	}
-	
+
 	@Test
 	public void testFromActivityToLoop() {
 		IGraphicalEditPart loopEP = createChild(LoopNodeEditPart.VISUAL_ID, getActivityCompartmentEditPart());
 		IGraphicalEditPart loopCompartmentEP = findChildBySemanticHint(loopEP, LoopNodeStructuredActivityNodeContentCompartmentEditPart.VISUAL_ID);
 		IGraphicalEditPart mergeNodeEP = createChild(MergeNodeEditPart.VISUAL_ID, getActivityCompartmentEditPart());
-		
+
 		DragDropSequence dd = new BeetwenContainmentNodeAndActivity(getActivityCompartmentEditPart(), mergeNodeEP, loopCompartmentEP);
-		
+
 		dd.doTest();
 	}
-	
+
 	@Test
 	public void testFromSequenceNodeToActivity() {
 		IGraphicalEditPart sequenceNodeEP = createChild(SequenceNodeEditPart.VISUAL_ID, getActivityCompartmentEditPart());
 		IGraphicalEditPart sequenceCompartmentEP = findChildBySemanticHint(sequenceNodeEP, SequenceNodeStructuredActivityNodeContentCompartmentEditPart.VISUAL_ID);
 		IGraphicalEditPart dataStoreNodeEP = createChild(LoopNodeEditPart.VISUAL_ID, sequenceCompartmentEP);
-		
+
 		DragDropSequence dd = new BeetwenContainmentNodeAndActivity(sequenceCompartmentEP, dataStoreNodeEP, getActivityCompartmentEditPart());
-		
+
 		dd.doTest();
 	}
-	
+
 	@Test
 	public void testFromActivityToSequenceNode() {
 		IGraphicalEditPart sequenceNodeEP = createChild(SequenceNodeEditPart.VISUAL_ID, getActivityCompartmentEditPart());
 		IGraphicalEditPart sequenceCompartmentEP = findChildBySemanticHint(sequenceNodeEP, SequenceNodeStructuredActivityNodeContentCompartmentEditPart.VISUAL_ID);
 		IGraphicalEditPart opaqueActionEP = createChild(OpaqueActionEditPart.VISUAL_ID, getActivityCompartmentEditPart());
-		
+
 		DragDropSequence dd = new BeetwenContainmentNodeAndActivity(getActivityCompartmentEditPart(), opaqueActionEP, sequenceCompartmentEP);
-		
+
 		dd.doTest();
 	}
-	
+
 	public abstract class DragDropSequence extends Assert {
-		
+
 		private final IGraphicalEditPart myParentEP;
-		
+
 		private final IGraphicalEditPart myChildEP;
-		
+
 		private final IGraphicalEditPart myTargetEP;
 
 		public DragDropSequence(IGraphicalEditPart parentEP, IGraphicalEditPart childEP, IGraphicalEditPart targetEP) {
 			assertNotNull(parentEP);
 			assertNotNull(childEP);
 			assertNotNull(targetEP);
-			
+
 			myParentEP = parentEP;
 			myChildEP = childEP;
 			myTargetEP = targetEP;
-			
+
 			assertNotEquals(getParentEP(), getChildEP());
 			assertNotEquals(getParentEP(), getTargetEP());
 			assertNotEquals(getTargetEP(), getChildEP());
 		}
-		
+
 		public void checkBeforeDD() {
 			checkGraphicalParent(getChildEP(), getParentEP());
 			checkSemantic(getChildEP(), getParentEP());
 		}
-		
+
 		protected abstract void checkSemantic(IGraphicalEditPart childEP, IGraphicalEditPart currentParent);
-		
+
 		public IGraphicalEditPart doDD() {
 			int childVID = UMLVisualIDRegistry.getVisualID(getChildEP().getNotationView());
 			Command ddCommand = createChangeBoundCommand(getChildEP(), getTargetEP());
@@ -299,34 +293,34 @@ public class TestActivityGroup extends AbstractPapyrusTestCase {
 			IGraphicalEditPart ddChild = findChildBySemanticHint(getTargetEP(), childVID);
 			return ddChild;
 		}
-		
+
 		public void checkAfterDD(IGraphicalEditPart newChildEP) {
 			checkGraphicalParent(newChildEP, getTargetEP());
 			checkSemantic(newChildEP, getTargetEP());
 		}
-		
+
 		public void doTest() {
 			checkBeforeDD();
 			IGraphicalEditPart ddChild = doDD();
 			checkAfterDD(ddChild);
 		}
-		
+
 		public void checkSemanticContainer(IGraphicalEditPart childEP, EObject expectedParent) {
 			assertEquals(childEP.getPrimaryView().getElement().eContainer(), expectedParent);
 		}
-		
+
 		protected ActivityNode getActivityNodeSemantic(IGraphicalEditPart activityNodeEP) {
 			EObject activityNode = getSemanticElement(activityNodeEP);
 			assertTrue("ActivityNode expected", UMLPackage.eINSTANCE.getActivityNode().isSuperTypeOf(activityNode.eClass()));
-			return (ActivityNode) activityNode;
+			return (ActivityNode)activityNode;
 		}
-		
+
 		protected EObject getSemanticElement(IGraphicalEditPart ep) {
 			EObject activityNode = ep.resolveSemanticElement();
 			assertNotNull("Primary view of " + ep.getNotationView() + " must have EObject element", activityNode);
 			return activityNode;
 		}
-		
+
 		private Command createChangeBoundCommand(IGraphicalEditPart child, IGraphicalEditPart newParent) {
 			CompoundCommand c = new CompoundCommand();
 			ChangeBoundsRequest changeBoundsRequest = new ChangeBoundsRequest(org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants.REQ_DRAG);
@@ -338,24 +332,24 @@ public class TestActivityGroup extends AbstractPapyrusTestCase {
 			c.add(newParent.getCommand(changeBoundsRequest));
 			return c;
 		}
-		
+
 		public IGraphicalEditPart getParentEP() {
 			return myParentEP;
 		}
-		
+
 		public IGraphicalEditPart getChildEP() {
 			return myChildEP;
 		}
-		
+
 		public IGraphicalEditPart getTargetEP() {
 			return myTargetEP;
 		}
 	}
-	
+
 	public static void checkGraphicalParent(IGraphicalEditPart child, IGraphicalEditPart expectedPArent) {
 		assertEquals(child.getParent(), expectedPArent);
 	}
-	
+
 	public class BeetwenInterruptibleRegionAndActivity extends DragDropSequence {
 
 		public BeetwenInterruptibleRegionAndActivity(IGraphicalEditPart parentEP, IGraphicalEditPart childEP, IGraphicalEditPart targetEP) {
@@ -365,7 +359,7 @@ public class TestActivityGroup extends AbstractPapyrusTestCase {
 		@Override
 		protected void checkSemantic(IGraphicalEditPart childEP, IGraphicalEditPart parentEP) {
 			ActivityNode activityNode = getActivityNodeSemantic(childEP);
-			if (parentEP.resolveSemanticElement() instanceof InterruptibleActivityRegion) {
+			if(parentEP.resolveSemanticElement() instanceof InterruptibleActivityRegion) {
 				assertEquals(activityNode.getInInterruptibleRegions().size(), 1);
 			} else {
 				assertEquals(activityNode.getInInterruptibleRegions().size(), 0);
@@ -373,7 +367,7 @@ public class TestActivityGroup extends AbstractPapyrusTestCase {
 			assertTrue(UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(activityNode.eContainer().eClass()));
 		}
 	}
-	
+
 	public class BeetwenPartitionAndActivity extends DragDropSequence {
 
 		public BeetwenPartitionAndActivity(IGraphicalEditPart parentEP, IGraphicalEditPart childEP, IGraphicalEditPart targetEP) {
@@ -383,15 +377,15 @@ public class TestActivityGroup extends AbstractPapyrusTestCase {
 		@Override
 		protected void checkSemantic(IGraphicalEditPart childEP, IGraphicalEditPart parentEP) {
 			ActivityNode activityNode = getActivityNodeSemantic(childEP);
-			if (parentEP.resolveSemanticElement() instanceof ActivityPartition) {
+			if(parentEP.resolveSemanticElement() instanceof ActivityPartition) {
 				assertEquals(activityNode.getInPartitions().size(), 1);
 			} else {
 				assertEquals(activityNode.getInPartitions().size(), 0);
 			}
 			assertTrue(UMLPackage.eINSTANCE.getActivity().isSuperTypeOf(activityNode.eContainer().eClass()));
 		}
-	}	
-	
+	}
+
 	public class BeetwenContainmentNodeAndActivity extends DragDropSequence {
 
 		public BeetwenContainmentNodeAndActivity(IGraphicalEditPart parentEP, IGraphicalEditPart childEP, IGraphicalEditPart targetEP) {
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/build.properties b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/build.properties
index fd6934cc081..464fedcccae 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/build.properties
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/build.properties
@@ -4,5 +4,6 @@ output.. = bin/
 bin.includes = META-INF/,\

                .,\

                about.html,\

-               plugin.properties

+               plugin.properties,\

+               model/

 src.includes = about.html

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/Activator.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/Activator.java
index d24df4f6bed..6e852dc7eed 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/Activator.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/test/org/eclipse/papyrus/uml/diagram/clazz/test/Activator.java
@@ -1,7 +1,7 @@
 /*****************************************************************************

  * Copyright (c) 2013 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

@@ -21,7 +21,7 @@ import org.osgi.framework.BundleContext;
 public class Activator extends AbstractUIPlugin {

 

 	// The plug-in ID

-	public static final String PLUGIN_ID = "org.eclipse.papyrus.diagram.clazz.tests";

+	public static final String PLUGIN_ID = "org.eclipse.papyrus.uml.diagram.clazz.tests";

 

 	// The shared instance

 	private static Activator plugin;

@@ -34,7 +34,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)

 	 */

 	@Override

@@ -45,7 +45,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)

 	 */

 	@Override

@@ -56,7 +56,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/**

 	 * Returns the shared instance

-	 * 

+	 *

 	 * @return the shared instance

 	 */

 	public static Activator getDefault() {

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/META-INF/MANIFEST.MF
index 47f0751d3a3..cf6b0e1314a 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.tests/META-INF/MANIFEST.MF
@@ -25,4 +25,7 @@ Bundle-Vendor: %Bundle-Vendor
 Bundle-Name: %Bundle-Name
 Bundle-Localization: plugin
 Bundle-Description: This plugin provides tests for the papyrus plugin UML Diagram Common
-Export-Package: org.eclipse.papyrus.uml.diagram.common.tests.tests
+Export-Package: org.eclipse.papyrus.uml.diagram.common.tests,
+ org.eclipse.papyrus.uml.diagram.common.tests.css,
+ org.eclipse.papyrus.uml.diagram.common.tests.parser,
+ org.eclipse.papyrus.uml.diagram.common.tests.tests
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/pom.xml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/pom.xml
new file mode 100644
index 00000000000..f4298e2cb2c
--- /dev/null
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication.tests/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.eclipse.papyrus</groupId>
+    <artifactId>org.eclipse.papyrus</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
+  </parent>
+  <groupId>org.eclipse.papyrus</groupId>
+  <artifactId>org.eclipse.papyrus.uml.diagram.communication.tests</artifactId>
+  <version>1.0.0-SNAPSHOT</version>
+  <packaging>eclipse-test-plugin</packaging>
+</project>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/pom.xml b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/pom.xml
new file mode 100644
index 00000000000..528014d0362
--- /dev/null
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine.tests/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.eclipse.papyrus</groupId>
+    <artifactId>org.eclipse.papyrus</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
+  </parent>
+  <groupId>org.eclipse.papyrus</groupId>
+  <artifactId>org.eclipse.papyrus.uml.diagram.statemachine.tests</artifactId>
+  <version>1.0.0-SNAPSHOT</version>
+  <packaging>eclipse-test-plugin</packaging>
+</project>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.stereotypeproperty.tests/.settings/org.eclipse.core.resources.prefs b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/.settings/org.eclipse.core.resources.prefs
index ea0cd6a4171..ea0cd6a4171 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.diagram.stereotypeproperty.tests/.settings/org.eclipse.core.resources.prefs
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/.settings/org.eclipse.core.resources.prefs
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/META-INF/MANIFEST.MF
index bd673bdce54..c567f3ed601 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/META-INF/MANIFEST.MF
@@ -18,6 +18,8 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.papyrus.uml.diagram.stereotype.edition;bundle-version="1.0.0",

  org.junit;bundle-version="4.10.0",

  org.eclipse.papyrus.uml.appearance;bundle-version="1.0.0",

+ org.eclipse.papyrus.junit.framework;bundle-version="1.0.0",

+ org.eclipse.papyrus.infra.emf;bundle-version="1.0.0",

  org.eclipse.papyrus.junit.utils;bundle-version="1.0.0"

 Export-Package: org.eclipse.papyrus.uml.diagram.stereotypeproperty

 Bundle-Vendor: %providerName

@@ -27,6 +29,7 @@ Bundle-Name: %pluginName
 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.uml.diagram.stereotypeproperty.Activator

-Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests;singleton:=true

+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.stereotypeproperty.te

+ sts;singleton:=true

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

 

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/plugin.properties b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/plugin.properties
index f1b3d0eb354..b1bfcee3ed3 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/plugin.properties
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/plugin.properties
@@ -8,5 +8,5 @@
 # Contributors:
 #     Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - initial API and implementation
 ##################################################################################
-pluginName=Papyrus Diagram stereotype property Test (Incubation)
+pluginName=Papyrus Diagram stereotype property Test
 providerName=Eclipse Modeling Project
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/AbstractPapyrusTestCase.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/AbstractPapyrusTestCase.java
index b8b86aff681..741d93a6d83 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/AbstractPapyrusTestCase.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/AbstractPapyrusTestCase.java
@@ -1,6 +1,5 @@
 /*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

+ * Copyright (c) 2012, 2014 CEA LIST and others.

  *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

@@ -9,40 +8,36 @@
  *

  * Contributors:

  *  CEA LIST - Initial API and implementation

+ *  Christian W. Damus (CEA) - bug 434993

+ *  Christian W. Damus (CEA) - bug 436047

  *

  *****************************************************************************/

 package org.eclipse.papyrus.uml.diagram.stereotypeproperty;

 

-import java.io.ByteArrayInputStream;

-

 import org.eclipse.core.resources.IFile;

 import org.eclipse.core.resources.IProject;

-import org.eclipse.core.resources.IWorkspace;

-import org.eclipse.core.resources.IWorkspaceRoot;

-import org.eclipse.core.resources.ResourcesPlugin;

 import org.eclipse.core.runtime.NullProgressMonitor;

+import org.eclipse.emf.common.util.URI;

+import org.eclipse.emf.ecore.resource.Resource;

 import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;

 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.commands.ICreationCommand;

-import org.eclipse.papyrus.editor.PapyrusMultiDiagramEditor;

 import org.eclipse.papyrus.infra.core.editor.IMultiDiagramEditor;

 import org.eclipse.papyrus.infra.core.resource.ModelSet;

 import org.eclipse.papyrus.infra.core.services.ExtensionServicesRegistry;

 import org.eclipse.papyrus.infra.core.services.ServiceException;

 import org.eclipse.papyrus.infra.core.services.ServicesRegistry;

 import org.eclipse.papyrus.infra.core.utils.DiResourceSet;

-import org.eclipse.papyrus.junit.utils.tests.AbstractPapyrusTest;

+import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;

+import org.eclipse.papyrus.junit.utils.rules.HouseKeeper;

 import org.eclipse.papyrus.uml.diagram.clazz.CreateClassDiagramCommand;

 import org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditor;

 import org.eclipse.papyrus.uml.diagram.common.commands.CreateUMLModelCommand;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.ui.IWorkbenchPage;

-import org.eclipse.ui.PlatformUI;

-import org.eclipse.ui.part.FileEditorInput;

 import org.eclipse.uml2.uml.Element;

 import org.junit.After;

 import org.junit.Assert;

 import org.junit.Before;

+import org.junit.Rule;

 

 

 /**

@@ -51,6 +46,8 @@ import org.junit.Before;
 @SuppressWarnings("deprecation")

 public abstract class AbstractPapyrusTestCase extends AbstractPapyrusTest {

 

+	@Rule

+	public final HouseKeeper houseKeeper = new HouseKeeper();

 

 	/** The Constant CREATION. */

 	protected static final String CREATION = "CREATION:";

@@ -103,12 +100,6 @@ public abstract class AbstractPapyrusTestCase extends AbstractPapyrusTest {
 	/** The file. */

 	protected IFile file;

 

-	/** The root. */

-	protected IWorkspaceRoot root;

-

-	/** The page. */

-	protected IWorkbenchPage page;

-

 	/** The diagram editor. */

 	protected UMLDiagramEditor diagramEditor = null;

 

@@ -159,14 +150,6 @@ public abstract class AbstractPapyrusTestCase extends AbstractPapyrusTest {
 		//diResourceSet.save( new NullProgressMonitor());

 		//diagramEditor.close(true);

 		papyrusEditor = null;

-		Display.getDefault().syncExec(new Runnable() {

-

-			public void run() {

-				page.closeAllEditors(true);

-			}

-		});

-

-		project.delete(true, new NullProgressMonitor());

 	}

 

 	/**

@@ -188,26 +171,20 @@ public abstract class AbstractPapyrusTestCase extends AbstractPapyrusTest {
 	 * Project creation.

 	 */

 	protected void projectCreation() throws Exception {

-		IWorkspace workspace = ResourcesPlugin.getWorkspace();

-		root = workspace.getRoot();

-		project = root.getProject("StereotypePropertyTests");

+		project = houseKeeper.createProject("StereotypePropertyTests");

 		file = project.getFile("StereotypePropertyTests.di");

-		this.diResourceSet = new DiResourceSet();

+		this.diResourceSet = houseKeeper.cleanUpLater(new DiResourceSet());

 

 		//at this point, no resources have been created

-		if(!project.exists()) {

-			project.create(null);

-		}

-		if(!project.isOpen()) {

-			project.open(null);

-		}

-

 		if(file.exists()) {

 			file.delete(true, new NullProgressMonitor());

 		}

 

 		if(!file.exists()) {

-			file.create(new ByteArrayInputStream(new byte[0]), true, new NullProgressMonitor());

+			// Don't create a zero-byte file. Create an empty XMI document

+			Resource diResource = diResourceSet.createResource(URI.createPlatformResourceURI(file.getFullPath().toString(), true));

+			diResource.save(null);

+			diResource.unload();

 			diResourceSet.createsModels(file);

 			new CreateUMLModelCommand().createModel(this.diResourceSet);

 			ServicesRegistry registry = new ExtensionServicesRegistry(org.eclipse.papyrus.infra.core.Activator.PLUGIN_ID);

@@ -223,18 +200,7 @@ public abstract class AbstractPapyrusTestCase extends AbstractPapyrusTest {
 			diResourceSet.save(new NullProgressMonitor());

 		}

 

-		Display.getDefault().syncExec(new Runnable() {

-

-			public void run() {

-				try {

-					page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();

-					papyrusEditor = (IMultiDiagramEditor)page.openEditor(new FileEditorInput(file), PapyrusMultiDiagramEditor.EDITOR_ID);

-				} catch (Exception ex) {

-					ex.printStackTrace(System.out);

-				}

-			}

-		});

-

+		papyrusEditor = houseKeeper.openPapyrusEditor(file);

 		Assert.assertNotNull(papyrusEditor);

 	}

 

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/TestLayoutWithStereotype.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/TestLayoutWithStereotype.java
index 84feb0f055d..842c855f093 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/TestLayoutWithStereotype.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/TestLayoutWithStereotype.java
@@ -1,6 +1,5 @@
 /*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

- *

+ * Copyright (c) 2012, 2014 CEA LIST and others.

  *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

@@ -9,6 +8,8 @@
  *

  * Contributors:

  *  CEA LIST - Initial API and implementation

+ *  Christian W. Damus (CEA) - bug 422257

+ *  Christian W. Damus (CEA) - bug 434594

  *

  *****************************************************************************/

 package org.eclipse.papyrus.uml.diagram.stereotypeproperty;

@@ -42,8 +43,9 @@ import org.eclipse.gmf.runtime.emf.type.core.IElementType;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;

 import org.eclipse.papyrus.infra.core.utils.ServiceUtils;

+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IShapeCompartmentEditPart;

-import org.eclipse.papyrus.junit.utils.classification.InvalidTest;

+import org.eclipse.papyrus.junit.framework.classification.InvalidTest;

 import org.eclipse.papyrus.uml.appearance.helper.AppliedStereotypeHelper;

 import org.eclipse.papyrus.uml.appearance.helper.UMLVisualInformationPapyrusConstant;

 import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart;

@@ -56,8 +58,8 @@ import org.eclipse.papyrus.uml.diagram.common.figure.node.PackageFigure;
 import org.eclipse.papyrus.uml.diagram.common.figure.node.StereotypePropertiesCompartment;

 import org.eclipse.papyrus.uml.diagram.stereotype.edition.editpart.AppliedStereotypeCompartmentEditPart;

 import org.eclipse.papyrus.uml.diagram.stereotype.edition.editpart.AppliedStereotypeMultilinePropertyEditPart;

+import org.eclipse.papyrus.uml.extensionpoints.profile.IRegisteredProfile;

 import org.eclipse.papyrus.uml.extensionpoints.profile.RegisteredProfile;

-import org.eclipse.papyrus.uml.extensionpoints.utils.Util;

 import org.eclipse.papyrus.uml.tools.commands.ApplyStereotypeCommand;

 import org.eclipse.uml2.uml.Element;

 import org.eclipse.uml2.uml.Model;

@@ -791,11 +793,10 @@ public class TestLayoutWithStereotype extends AbstractPapyrusTestCase {
 	@Override

 	public void setUp() throws Exception {

 		super.setUp();

-		RegisteredProfile registeredProfile = RegisteredProfile.getRegisteredProfile("TestProfile");

+		IRegisteredProfile registeredProfile = RegisteredProfile.getRegisteredProfile("TestProfile");

 		final Model root = ((Model)getDiagramEditPart().resolveSemanticElement());

-		URI modelUri = registeredProfile.uri;

-		@SuppressWarnings("deprecation")

-		final Resource modelResource = Util.getResourceSet(root).getResource(modelUri, true);

+		URI modelUri = registeredProfile.getUri();

+		final Resource modelResource = EMFHelper.getResourceSet(root).getResource(modelUri, true);

 		final Profile profile = (Profile)modelResource.getContents().get(0);

 		//	PackageUtil.applyProfile(root,profile, false);

 		final TransactionalEditingDomain domain = ServiceUtils.getInstance().getTransactionalEditingDomain(papyrusEditor.getServicesRegistry());

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/TestProfileApplication.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/TestProfileApplication.java
index 6fb1f576f16..19e236b40c2 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/TestProfileApplication.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/TestProfileApplication.java
@@ -1,5 +1,5 @@
 /*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

+ * Copyright (c) 2012, 2014 CEA LIST and others.

  *

  *

  * All rights reserved. This program and the accompanying materials

@@ -9,6 +9,8 @@
  *

  * Contributors:

  *  CEA LIST - Initial API and implementation

+ *  Christian W. Damus (CEA) - bug 422257

+ *  Christian W. Damus (CEA) - bug 434594

  *

  *****************************************************************************/

 package org.eclipse.papyrus.uml.diagram.stereotypeproperty;

@@ -21,8 +23,9 @@ import org.eclipse.emf.transaction.TransactionalEditingDomain;
 import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;

 import org.eclipse.papyrus.infra.core.services.ServiceException;

 import org.eclipse.papyrus.infra.core.utils.ServiceUtils;

+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

+import org.eclipse.papyrus.uml.extensionpoints.profile.IRegisteredProfile;

 import org.eclipse.papyrus.uml.extensionpoints.profile.RegisteredProfile;

-import org.eclipse.papyrus.uml.extensionpoints.utils.Util;

 import org.eclipse.uml2.uml.Model;

 import org.eclipse.uml2.uml.Profile;

 import org.junit.Test;

@@ -32,14 +35,13 @@ public class TestProfileApplication extends AbstractPapyrusTestCase {
 

 	@Test

 	public void testProfileApplicationOnModel() throws ServiceException {

-		RegisteredProfile registeredProfile = RegisteredProfile.getRegisteredProfile("TestProfile");

+		IRegisteredProfile registeredProfile = RegisteredProfile.getRegisteredProfile("TestProfile");

 		final Model root = ((Model)getDiagramEditPart().resolveSemanticElement());

 		assertTrue("Registered profile not found", registeredProfile != null);

-		URI modelUri = registeredProfile.uri;

-		@SuppressWarnings("deprecation")

-		final Resource modelResource = Util.getResourceSet(root).getResource(modelUri, true);

+		URI modelUri = registeredProfile.getUri();

+		final Resource modelResource = EMFHelper.getResourceSet(root).getResource(modelUri, true);

 		assertTrue("the registered profile is not a profile", (modelResource.getContents().get(0) instanceof Profile));

-		assertTrue("strange profile", ("".equals(registeredProfile.qualifiednames)));

+		assertTrue("strange profile", ("".equals(registeredProfile.getQualifiedNames())));

 		final Profile profile = (Profile)modelResource.getContents().get(0);

 		//	PackageUtil.applyProfile(root,profile, false);

 		final TransactionalEditingDomain domain = ServiceUtils.getInstance().getTransactionalEditingDomain(papyrusEditor.getServicesRegistry());

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/TestStereotypeApplication.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/TestStereotypeApplication.java
index a25ae63cf21..e5fcca53098 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/TestStereotypeApplication.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests/src/org/eclipse/papyrus/uml/diagram/stereotypeproperty/TestStereotypeApplication.java
@@ -1,5 +1,5 @@
 /*****************************************************************************

- * Copyright (c) 2012 CEA LIST.

+ * Copyright (c) 2012, 2014 CEA LIST and others.

  *

  *

  * All rights reserved. This program and the accompanying materials

@@ -9,6 +9,8 @@
  *

  * Contributors:

  *  CEA LIST - Initial API and implementation

+ *  Christian W. Damus (CEA) - bug 422257

+ *  Christian W. Damus (CEA) - bug 434594

  *

  *****************************************************************************/

 package org.eclipse.papyrus.uml.diagram.stereotypeproperty;

@@ -33,6 +35,7 @@ import org.eclipse.gmf.runtime.emf.type.core.IElementType;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;

 import org.eclipse.papyrus.infra.core.utils.ServiceUtils;

+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

 import org.eclipse.papyrus.infra.gmfdiag.common.editpart.IShapeCompartmentEditPart;

 import org.eclipse.papyrus.uml.appearance.helper.AppliedStereotypeHelper;

 import org.eclipse.papyrus.uml.appearance.helper.UMLVisualInformationPapyrusConstant;

@@ -44,8 +47,8 @@ import org.eclipse.papyrus.uml.diagram.common.figure.node.EditingFlowPage;
 import org.eclipse.papyrus.uml.diagram.common.figure.node.PackageFigure;

 import org.eclipse.papyrus.uml.diagram.stereotype.edition.editpart.AppliedStereotypeCompartmentEditPart;

 import org.eclipse.papyrus.uml.diagram.stereotype.edition.editpart.AppliedStereotypeMultilinePropertyEditPart;

+import org.eclipse.papyrus.uml.extensionpoints.profile.IRegisteredProfile;

 import org.eclipse.papyrus.uml.extensionpoints.profile.RegisteredProfile;

-import org.eclipse.papyrus.uml.extensionpoints.utils.Util;

 import org.eclipse.papyrus.uml.tools.commands.ApplyStereotypeCommand;

 import org.eclipse.uml2.uml.Element;

 import org.eclipse.uml2.uml.Model;

@@ -190,11 +193,10 @@ public class TestStereotypeApplication extends AbstractPapyrusTestCase {
 	@Override

 	public void setUp() throws Exception {

 		super.setUp();

-		RegisteredProfile registeredProfile = RegisteredProfile.getRegisteredProfile("TestProfile");

+		IRegisteredProfile registeredProfile = RegisteredProfile.getRegisteredProfile("TestProfile");

 		final Model root = ((Model)getDiagramEditPart().resolveSemanticElement());

-		URI modelUri = registeredProfile.uri;

-		@SuppressWarnings("deprecation")

-		final Resource modelResource = Util.getResourceSet(root).getResource(modelUri, true);

+		URI modelUri = registeredProfile.getUri();

+		final Resource modelResource = EMFHelper.getResourceSet(root).getResource(modelUri, true);

 		final Profile profile = (Profile)modelResource.getContents().get(0);

 		//	PackageUtil.applyProfile(root,profile, false);

 		final TransactionalEditingDomain domain = ServiceUtils.getInstance().getTransactionalEditingDomain(papyrusEditor.getServicesRegistry());

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.synchronizeview.test/build.properties b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.synchronizeview.test/build.properties
index 41eb6ade2b4..1b08f841b5e 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.synchronizeview.test/build.properties
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.synchronizeview.test/build.properties
@@ -1,4 +1,7 @@
 source.. = src/

 output.. = bin/

 bin.includes = META-INF/,\

-               .

+               .,\

+               about.html,\

+               plugin.properties

+src.includes = about.html

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/build.properties b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/build.properties
index 4743fd91a00..1fb9d118af1 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/build.properties
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/build.properties
@@ -4,5 +4,6 @@ bin.includes = META-INF/,\
                .,\

                about.html,\

                build.properties,\

-               plugin.properties

+               plugin.properties,\

+               resources/

 src.includes = about.html

diff --git a/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/META-INF/MANIFEST.MF
index 5a2d851e769..787f27f3580 100644
--- a/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/META-INF/MANIFEST.MF
@@ -25,7 +25,7 @@ Export-Package: org.eclipse.papyrus.uml.modelexplorer.tests,
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
 Bundle-Version: 1.0.0.qualifier
-Bundle-Name: %pluginNam
+Bundle-Name: %pluginName
 Bundle-Localization: plugin
 Bundle-ManifestVersion: 2
 Bundle-Activator: org.eclipse.papyrus.uml.modelexplorer.tests.Activato
diff --git a/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/plugin.properties b/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/plugin.properties
index 25964c88ece..b2eb1858763 100644
--- a/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/plugin.properties
+++ b/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/plugin.properties
@@ -1,3 +1,3 @@
 #Properties file for org.eclipse.papyrus.uml.modelexplorer.tests

 providerName = Eclipse Modeling Project

-pluginNam = JUnit Tests for uml ModelExplorer
\ No newline at end of file
+pluginName = JUnit Tests for uml ModelExplorer
\ No newline at end of file
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/build.properties b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/build.properties
index 7e4e23cbf09..d0a17ebd1ca 100755
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/build.properties
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/build.properties
@@ -4,6 +4,5 @@ bin.includes = META-INF/,\
                .,\

                about.html,\

                resources/,\

-               OSGI-INF/,\

                plugin.properties

 src.includes = about.html

diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/pom.xml b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/pom.xml
new file mode 100644
index 00000000000..f2fad9a11cc
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.eclipse.papyrus</groupId>
+    <artifactId>org.eclipse.papyrus</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
+  </parent>
+  <groupId>org.eclipse.papyrus</groupId>
+  <artifactId>org.eclipse.papyrus.uml.nattable.generic.tests</artifactId>
+  <version>1.0.0-SNAPSHOT</version>
+  <packaging>eclipse-test-plugin</packaging>
+</project>
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/.classpath b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/.classpath
index ad32c83a788..8a8f1668cdc 100644
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/.classpath
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/.classpath
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>

+<classpath>

+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>

+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

+	<classpathentry kind="src" path="src"/>

+	<classpathentry kind="output" path="bin"/>

+</classpath>

diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/META-INF/MANIFEST.MF
index 91eb3823fa6..dc1cf0083b9 100644
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/META-INF/MANIFEST.MF
@@ -10,3 +10,5 @@ Bundle-Localization: fragment
 Require-Bundle: org.junit;bundle-version="4.10.0",
  org.eclipse.papyrus.junit.framework;bundle-version="1.0.0",
  org.eclipse.papyrus.junit.utils;bundle-version="1.0.0"
+Export-Package: org.eclipse.papyrus.uml.modelrepair.internal.stereotypes,
+ org.eclipse.papyrus.uml.modelrepair.tests
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/fragment.properties b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/fragment.properties
index 022d8c14829..0ac2bce5947 100644
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/fragment.properties
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/fragment.properties
@@ -12,4 +12,3 @@
 
 providerName=Eclipse Modeling Project
 pluginName= UML Model Repair Tests
-
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/src/org/eclipse/papyrus/uml/modelrepair/tests/AllTests.java b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/src/org/eclipse/papyrus/uml/modelrepair/tests/AllTests.java
index 4c1680dea60..fc69cd385ae 100644
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/src/org/eclipse/papyrus/uml/modelrepair/tests/AllTests.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.modelrepair.tests/src/org/eclipse/papyrus/uml/modelrepair/tests/AllTests.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2014 CEA and others.
- * 
+ *
  * 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
@@ -25,9 +25,5 @@ import org.junit.runners.Suite.SuiteClasses;
 @RunWith(Suite.class)
 @SuiteClasses({ StereotypeApplicationRepairSnippetTest.class, StereotypeRepairRegressionTest.class })
 public class AllTests {
-
-	public AllTests() {
-		super();
-	}
-
+	//JUnit 4 Test Suite
 }
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/.classpath b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/.classpath
index 2d1a4302f04..8a8f1668cdc 100644
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/.classpath
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <classpath>

-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>

 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

 	<classpathentry kind="src" path="src"/>

 	<classpathentry kind="output" path="bin"/>

diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/.settings/org.eclipse.jdt.core.prefs
index 63ea330d31d..f287d53cf45 100644
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,7 @@
-#Wed Jun 15 11:24:40 CEST 2011

 eclipse.preferences.version=1

 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5

-org.eclipse.jdt.core.compiler.compliance=1.5

+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6

+org.eclipse.jdt.core.compiler.compliance=1.6

 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

-org.eclipse.jdt.core.compiler.source=1.5

+org.eclipse.jdt.core.compiler.source=1.6

diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/META-INF/MANIFEST.MF
index 039c3b115a4..1de81f1b296 100644
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/META-INF/MANIFEST.MF
@@ -1,20 +1,18 @@
 Manifest-Version: 1.0

 Require-Bundle: org.junit;bundle-version="4.10.0",

  org.eclipse.papyrus.junit.framework;bundle-version="1.0.0",

- org.eclipse.uml2.uml.edit;bundle-version="4.0.100",

- org.eclipse.ui,

  org.eclipse.papyrus.junit.utils;bundle-version="1.0.0"

 Export-Package: org.eclipse.papyrus.uml.service.types.tests.creation,

+ org.eclipse.papyrus.uml.service.types.tests.deletion,

  org.eclipse.papyrus.uml.service.types.tests.registry,

  org.eclipse.papyrus.uml.service.types.tests.suites

 Bundle-Vendor: %providerName

-Fragment-Host: org.eclipse.papyrus.uml.service.types;bundle-version="0

- .9.0"

+Fragment-Host: org.eclipse.papyrus.uml.service.types;bundle-version="1.0.0"

 Bundle-Version: 1.0.0.qualifier

 Bundle-Name: %pluginName

 Bundle-Localization: plugin

 Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.uml.service.types.tests;singl

  eton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Bundle-RequiredExecutionEnvironment: JavaSE-1.6

 

diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/build.properties b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/build.properties
index abeedb102cf..487d2801fbc 100644
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/build.properties
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/build.properties
@@ -4,5 +4,6 @@ bin.includes = META-INF/,\
                .,\

                about.html,\

                plugin.properties,\

-               resource/

+               resource/,\

+               icons/

 src.includes = about.html

diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/src/org/eclipse/papyrus/uml/service/types/tests/suites/AllTests.java b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/src/org/eclipse/papyrus/uml/service/types/tests/suites/AllTests.java
index 33a78e5094d..81f96de6c51 100644
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/src/org/eclipse/papyrus/uml/service/types/tests/suites/AllTests.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/src/org/eclipse/papyrus/uml/service/types/tests/suites/AllTests.java
@@ -18,5 +18,5 @@ import org.junit.runners.Suite.SuiteClasses;
 	DeletePureUMLElementTest.class,

 	})

 public class AllTests {

-

+	//JUnit 4 Test Suite

 }

diff --git a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils.tests/pom.xml b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils.tests/pom.xml
new file mode 100644
index 00000000000..e6ed54a691e
--- /dev/null
+++ b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.utils.tests/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.eclipse.papyrus</groupId>
+    <artifactId>org.eclipse.papyrus</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../../../../../../releng/top-pom-main-tests.xml</relativePath>
+  </parent>
+  <groupId>org.eclipse.papyrus</groupId>
+  <artifactId>org.eclipse.papyrus.uml.tools.utils.tests</artifactId>
+  <version>1.0.0-SNAPSHOT</version>
+  <packaging>eclipse-test-plugin</packaging>
+</project>