Implementation of contextual tooltips

1) add tooltips for CHANGE, ADD, DELETE, MOVE actions
2) add default implementation
3) add basic implementation for uml and diagram diffs
4) add unit tests

Change-Id: I9cbfa42ca256b94a1a5d530d13d993170a67073a
Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>

40 files changed, 445 insertions, 17 deletions

diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/AbstractDynamicProfileTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/AbstractDynamicProfileTest.java
index d6941ffd2..fbd742f4f 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/AbstractDynamicProfileTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/AbstractDynamicProfileTest.java
@@ -15,8 +15,6 @@ import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.compare.uml2.profile.test.uml2comparetestprofile.UML2CompareTestProfilePackage;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.uml2.uml.UMLPlugin;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
 
 public abstract class AbstractDynamicProfileTest extends AbstractUMLProfileTest {
 
@@ -24,8 +22,12 @@ public abstract class AbstractDynamicProfileTest extends AbstractUMLProfileTest
 
 	static Object registeredPackage;
 
-	@BeforeClass
+	/**
+	 * Each sublass of AbstractUMLTest have to call this method in a @BeforeClass annotated method. This allow
+	 * each test to customize its context.
+	 */
 	public static void initEPackageNsURIToProfileLocationMap() {
+		addProfilePathmap();
 		if (!EMFPlugin.IS_ECLIPSE_RUNNING) {
 			// It is required to link the EPackage to the UML package of the UML Profile
 			UMLPlugin
@@ -39,7 +41,10 @@ public abstract class AbstractDynamicProfileTest extends AbstractUMLProfileTest
 		}
 	}
 
-	@AfterClass
+	/**
+	 * Each sublass of AbstractUMLTest have to call this method in a @BeforeClass annotated method. This allow
+	 * each test to safely delete its context.
+	 */
 	public static void resetEPackageNsURIToProfileLocationMap() {
 		if (!EMFPlugin.IS_ECLIPSE_RUNNING) {
 			UMLPlugin.getEPackageNsURIToProfileLocationMap().remove(
@@ -49,5 +54,6 @@ public abstract class AbstractDynamicProfileTest extends AbstractUMLProfileTest
 					registeredURI);
 			EPackage.Registry.INSTANCE.put(UML2CompareTestProfilePackage.eNS_URI, registeredPackage);
 		}
+		resetProfilePathmap();
 	}
 }
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/AbstractStaticProfileTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/AbstractStaticProfileTest.java
index 50e967342..d7d6182c5 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/AbstractStaticProfileTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/AbstractStaticProfileTest.java
@@ -17,13 +17,15 @@ import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.compare.uml2.profile.test.uml2comparetestprofile.UML2CompareTestProfilePackage;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.uml2.uml.UMLPlugin;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
 
 public abstract class AbstractStaticProfileTest extends AbstractUMLProfileTest {
 
-	@BeforeClass
+	/**
+	 * Each sublass of AbstractUMLTest have to call this method in a @BeforeClass annotated method. This allow
+	 * each test to customize its context.
+	 */
 	public static void fillRegistriesForStatic() {
+		addProfilePathmap();
 		if (!EMFPlugin.IS_ECLIPSE_RUNNING) {
 			EPackage.Registry.INSTANCE.put(UML2CompareTestProfilePackage.eNS_URI,
 					UML2CompareTestProfilePackage.eINSTANCE); // registers
@@ -38,11 +40,15 @@ public abstract class AbstractStaticProfileTest extends AbstractUMLProfileTest {
 		}
 	}
 
-	@AfterClass
+	/**
+	 * Each sublass of AbstractUMLTest have to call this method in a @BeforeClass annotated method. This allow
+	 * each test to safely delete its context.
+	 */
 	public static void resetRegistriesForStatic() {
 		if (!EMFPlugin.IS_ECLIPSE_RUNNING) {
 			UMLPlugin.getEPackageNsURIToProfileLocationMap().remove(UML2CompareTestProfilePackage.eNS_URI);
 			EPackage.Registry.INSTANCE.remove(UML2CompareTestProfilePackage.eNS_URI);
 		}
+		resetProfilePathmap();
 	}
 }
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/AbstractUMLProfileTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/AbstractUMLProfileTest.java
index cae36f7d9..892ae80f4 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/AbstractUMLProfileTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/AbstractUMLProfileTest.java
@@ -16,13 +16,15 @@ import org.eclipse.emf.common.EMFPlugin;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.resource.URIConverter;
 import org.eclipse.uml2.uml.resources.ResourcesPlugin;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
 
 public abstract class AbstractUMLProfileTest extends AbstractUMLTest {
 
-	@BeforeClass
+	/**
+	 * Each sublass of AbstractUMLTest have to call this method in a @BeforeClass annotated method. This allow
+	 * each test to customize its context.
+	 */
 	public static void addProfilePathmap() {
+		fillRegistries();
 		if (!EMFPlugin.IS_ECLIPSE_RUNNING) {
 			final URL UMLJarredFileLocation = ResourcesPlugin.class.getResource("ResourcesPlugin.class");
 			String UMLJarPath = UMLJarredFileLocation.toString();
@@ -32,11 +34,15 @@ public abstract class AbstractUMLProfileTest extends AbstractUMLTest {
 		}
 	}
 
-	@AfterClass
+	/**
+	 * Each sublass of AbstractUMLTest have to call this method in a @BeforeClass annotated method. This allow
+	 * each test to safely delete its context.
+	 */
 	public static void resetProfilePathmap() {
 		if (!EMFPlugin.IS_ECLIPSE_RUNNING) {
 			URIConverter.URI_MAP.remove(URI.createURI("pathmap://UML_COMPARE_TESTS_PROFILE/"));
 		}
+		resetRegistries();
 	}
 
 	protected static String getProfilePath() {
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/AbstractUMLTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/AbstractUMLTest.java
index dd252f74b..a9b6bb3c7 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/AbstractUMLTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/AbstractUMLTest.java
@@ -65,9 +65,7 @@ import org.eclipse.emf.ecore.xmi.impl.EcoreResourceFactoryImpl;
 import org.eclipse.uml2.uml.UMLPackage;
 import org.eclipse.uml2.uml.internal.resource.UMLResourceFactoryImpl;
 import org.junit.After;
-import org.junit.AfterClass;
 import org.junit.Before;
-import org.junit.BeforeClass;
 
 /**
  * @author <a href="mailto:cedric.notot@obeo.fr">Cedric Notot</a>
@@ -75,11 +73,14 @@ import org.junit.BeforeClass;
 @SuppressWarnings("nls")
 public abstract class AbstractUMLTest {
 
-	private EMFCompare emfCompare;
+	protected EMFCompare emfCompare;
 
 	private IMerger.Registry mergerRegistry;
 
-	@BeforeClass
+	/**
+	 * Each sublass of AbstractUMLTest have to call this method in a @BeforeClass annotated method. This allow
+	 * each test to customize its context.
+	 */
 	public static void fillRegistries() {
 		if (!EMFPlugin.IS_ECLIPSE_RUNNING) {
 			EPackage.Registry.INSTANCE.put(EcorePackage.eNS_URI, EcorePackage.eINSTANCE);
@@ -93,7 +94,10 @@ public abstract class AbstractUMLTest {
 		}
 	}
 
-	@AfterClass
+	/**
+	 * Each sublass of AbstractUMLTest have to call this method in a @BeforeClass annotated method. This allow
+	 * each test to safely delete its context.
+	 */
 	public static void resetRegistries() {
 		if (!EMFPlugin.IS_ECLIPSE_RUNNING) {
 			Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().remove("uml");
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/association/AddAssociation2Test.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/association/AddAssociation2Test.java
index 2bc2a0754..3fb9e82b0 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/association/AddAssociation2Test.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/association/AddAssociation2Test.java
@@ -38,6 +38,8 @@ import org.eclipse.emf.compare.uml2.tests.AbstractUMLInputData;
 import org.eclipse.emf.compare.uml2.tests.AbstractUMLTest;
 import org.eclipse.emf.compare.uml2.tests.association.data.AssociationInputData;
 import org.eclipse.emf.ecore.resource.Resource;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 @SuppressWarnings("nls")
@@ -45,6 +47,16 @@ public class AddAssociation2Test extends AbstractUMLTest {
 
 	private AssociationInputData input = new AssociationInputData();
 
+	@BeforeClass
+	public static void setupClass() {
+		fillRegistries();
+	}
+
+	@AfterClass
+	public static void teardownClass() {
+		resetRegistries();
+	}
+
 	@Test
 	public void testA30UseCase() throws IOException {
 		final Resource left = input.getA3Left();
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/association/AddAssociation3Test.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/association/AddAssociation3Test.java
index 983239ef1..0ce97f232 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/association/AddAssociation3Test.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/association/AddAssociation3Test.java
@@ -38,6 +38,8 @@ import org.eclipse.emf.compare.uml2.tests.AbstractUMLInputData;
 import org.eclipse.emf.compare.uml2.tests.AbstractUMLTest;
 import org.eclipse.emf.compare.uml2.tests.association.data.AssociationInputData;
 import org.eclipse.emf.ecore.resource.Resource;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 @SuppressWarnings("nls")
@@ -45,6 +47,16 @@ public class AddAssociation3Test extends AbstractUMLTest {
 
 	private AssociationInputData input = new AssociationInputData();
 
+	@BeforeClass
+	public static void setupClass() {
+		fillRegistries();
+	}
+
+	@AfterClass
+	public static void teardownClass() {
+		resetRegistries();
+	}
+
 	@Test
 	public void testA40UseCase() throws IOException {
 		final Resource left = input.getA4Left();
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/association/AddAssociationTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/association/AddAssociationTest.java
index 94e978b94..ec43a5d68 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/association/AddAssociationTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/association/AddAssociationTest.java
@@ -38,6 +38,8 @@ import org.eclipse.emf.compare.uml2.tests.AbstractUMLInputData;
 import org.eclipse.emf.compare.uml2.tests.AbstractUMLTest;
 import org.eclipse.emf.compare.uml2.tests.association.data.AssociationInputData;
 import org.eclipse.emf.ecore.resource.Resource;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 @SuppressWarnings("nls")
@@ -45,6 +47,16 @@ public class AddAssociationTest extends AbstractUMLTest {
 
 	private AssociationInputData input = new AssociationInputData();
 
+	@BeforeClass
+	public static void setupClass() {
+		fillRegistries();
+	}
+
+	@AfterClass
+	public static void teardownClass() {
+		resetRegistries();
+	}
+
 	@Test
 	public void testA10UseCase() throws IOException {
 		final Resource left = input.getA1Left();
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/association/ChangeAssociationTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/association/ChangeAssociationTest.java
index 7c141e716..705e07ed3 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/association/ChangeAssociationTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/association/ChangeAssociationTest.java
@@ -37,6 +37,8 @@ import org.eclipse.emf.compare.uml2.tests.AbstractUMLInputData;
 import org.eclipse.emf.compare.uml2.tests.AbstractUMLTest;
 import org.eclipse.emf.compare.uml2.tests.association.data.AssociationInputData;
 import org.eclipse.emf.ecore.resource.Resource;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 @SuppressWarnings("nls")
@@ -44,6 +46,16 @@ public class ChangeAssociationTest extends AbstractUMLTest {
 
 	private AssociationInputData input = new AssociationInputData();
 
+	@BeforeClass
+	public static void setupClass() {
+		fillRegistries();
+	}
+
+	@AfterClass
+	public static void teardownClass() {
+		resetRegistries();
+	}
+
 	@Test
 	public void testA20UseCase() throws IOException {
 		final Resource left = input.getA2Left();
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/conflict/PseudoConflictTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/conflict/PseudoConflictTest.java
index 68e4e6d73..a3957820e 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/conflict/PseudoConflictTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/conflict/PseudoConflictTest.java
@@ -30,6 +30,8 @@ import org.eclipse.emf.compare.uml2.tests.AbstractUMLInputData;
 import org.eclipse.emf.compare.uml2.tests.AbstractUMLTest;
 import org.eclipse.emf.compare.uml2.tests.conflict.data.ConflictInputData;
 import org.eclipse.emf.ecore.resource.Resource;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 /**
@@ -44,6 +46,16 @@ public class PseudoConflictTest extends AbstractUMLTest {
 	 */
 	private ConflictInputData input = new ConflictInputData();
 
+	@BeforeClass
+	public static void setupClass() {
+		fillRegistries();
+	}
+
+	@AfterClass
+	public static void teardownClass() {
+		resetRegistries();
+	}
+
 	/**
 	 * Tests if EMF Compare uses the {@link PseudoConflictMerger} when merging pseudo conflicts of UML models.
 	 * 
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddAbstractionTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddAbstractionTest.java
index 41ca190fc..a94b152d1 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddAbstractionTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddAbstractionTest.java
@@ -36,12 +36,24 @@ import org.eclipse.emf.compare.uml2.tests.AbstractUMLInputData;
 import org.eclipse.emf.compare.uml2.tests.AbstractUMLTest;
 import org.eclipse.emf.compare.uml2.tests.dependency.data.DependencyInputData;
 import org.eclipse.emf.ecore.resource.Resource;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 // TODO To extend from AddDependencyTest and change only descriptions.
 @SuppressWarnings("nls")
 public class AddAbstractionTest extends AbstractUMLTest {
 
+	@BeforeClass
+	public static void setupClass() {
+		fillRegistries();
+	}
+
+	@AfterClass
+	public static void teardownClass() {
+		resetRegistries();
+	}
+
 	private DependencyInputData input = new DependencyInputData();
 
 	@Test
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddDependencyTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddDependencyTest.java
index 4a1074414..f7502142c 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddDependencyTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddDependencyTest.java
@@ -36,6 +36,8 @@ import org.eclipse.emf.compare.uml2.tests.AbstractUMLInputData;
 import org.eclipse.emf.compare.uml2.tests.AbstractUMLTest;
 import org.eclipse.emf.compare.uml2.tests.dependency.data.DependencyInputData;
 import org.eclipse.emf.ecore.resource.Resource;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 @SuppressWarnings("nls")
@@ -43,6 +45,16 @@ public class AddDependencyTest extends AbstractUMLTest {
 
 	protected DependencyInputData input = new DependencyInputData();
 
+	@BeforeClass
+	public static void setupClass() {
+		fillRegistries();
+	}
+
+	@AfterClass
+	public static void teardownClass() {
+		resetRegistries();
+	}
+
 	@Test
 	public void testA10UseCase() throws IOException {
 		final Resource left = input.getA1Left();
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddInterfaceRealizationTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddInterfaceRealizationTest.java
index 1ca2a7070..ee9658a3f 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddInterfaceRealizationTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddInterfaceRealizationTest.java
@@ -35,6 +35,8 @@ import org.eclipse.emf.compare.uml2.tests.AbstractUMLInputData;
 import org.eclipse.emf.compare.uml2.tests.AbstractUMLTest;
 import org.eclipse.emf.compare.uml2.tests.dependency.data.DependencyInputData;
 import org.eclipse.emf.ecore.resource.Resource;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 @SuppressWarnings("nls")
@@ -42,6 +44,16 @@ public class AddInterfaceRealizationTest extends AbstractUMLTest {
 
 	private DependencyInputData input = new DependencyInputData();
 
+	@BeforeClass
+	public static void setupClass() {
+		fillRegistries();
+	}
+
+	@AfterClass
+	public static void teardownClass() {
+		resetRegistries();
+	}
+
 	@Test
 	public void testA50UseCase() throws IOException {
 		final Resource left = input.getA5Left();
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddRealizationTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddRealizationTest.java
index c4f442b3c..93bd28b99 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddRealizationTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddRealizationTest.java
@@ -36,6 +36,8 @@ import org.eclipse.emf.compare.uml2.tests.AbstractUMLInputData;
 import org.eclipse.emf.compare.uml2.tests.AbstractUMLTest;
 import org.eclipse.emf.compare.uml2.tests.dependency.data.DependencyInputData;
 import org.eclipse.emf.ecore.resource.Resource;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 //TODO To extend from AddDependencyTest and change only descriptions.
@@ -44,6 +46,16 @@ public class AddRealizationTest extends AbstractUMLTest {
 
 	private DependencyInputData input = new DependencyInputData();
 
+	@BeforeClass
+	public static void setupClass() {
+		fillRegistries();
+	}
+
+	@AfterClass
+	public static void teardownClass() {
+		resetRegistries();
+	}
+
 	@Test
 	public void testA60UseCase() throws IOException {
 		final Resource left = input.getA6Left();
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddSubstitutionTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddSubstitutionTest.java
index 5c84604c8..379963319 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddSubstitutionTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddSubstitutionTest.java
@@ -35,6 +35,8 @@ import org.eclipse.emf.compare.uml2.tests.AbstractUMLInputData;
 import org.eclipse.emf.compare.uml2.tests.AbstractUMLTest;
 import org.eclipse.emf.compare.uml2.tests.dependency.data.DependencyInputData;
 import org.eclipse.emf.ecore.resource.Resource;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 //TODO To extend from AddInterfaceRealizationTest and change only descriptions.
@@ -44,6 +46,16 @@ public class AddSubstitutionTest extends AbstractUMLTest {
 
 	private DependencyInputData input = new DependencyInputData();
 
+	@BeforeClass
+	public static void setupClass() {
+		fillRegistries();
+	}
+
+	@AfterClass
+	public static void teardownClass() {
+		resetRegistries();
+	}
+
 	@Test
 	public void testA70UseCase() throws IOException {
 		final Resource left = input.getA7Left();
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddUsageTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddUsageTest.java
index f2ef71c14..b9c32c051 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddUsageTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddUsageTest.java
@@ -36,6 +36,8 @@ import org.eclipse.emf.compare.uml2.tests.AbstractUMLInputData;
 import org.eclipse.emf.compare.uml2.tests.AbstractUMLTest;
 import org.eclipse.emf.compare.uml2.tests.dependency.data.DependencyInputData;
 import org.eclipse.emf.ecore.resource.Resource;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 //TODO To extend from ChangeDependencyTest and change only descriptions.
@@ -44,6 +46,16 @@ public class AddUsageTest extends AbstractUMLTest {
 
 	private DependencyInputData input = new DependencyInputData();
 
+	@BeforeClass
+	public static void setupClass() {
+		fillRegistries();
+	}
+
+	@AfterClass
+	public static void teardownClass() {
+		resetRegistries();
+	}
+
 	@Test
 	public void testA80UseCase() throws IOException {
 		final Resource left = input.getA8Left();
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/ChangeDependencyTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/ChangeDependencyTest.java
index 0247f23f7..cbf07a701 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/ChangeDependencyTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/ChangeDependencyTest.java
@@ -33,6 +33,8 @@ import org.eclipse.emf.compare.uml2.tests.AbstractUMLInputData;
 import org.eclipse.emf.compare.uml2.tests.AbstractUMLTest;
 import org.eclipse.emf.compare.uml2.tests.dependency.data.DependencyInputData;
 import org.eclipse.emf.ecore.resource.Resource;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 @SuppressWarnings("nls")
@@ -40,6 +42,16 @@ public class ChangeDependencyTest extends AbstractUMLTest {
 
 	private DependencyInputData input = new DependencyInputData();
 
+	@BeforeClass
+	public static void setupClass() {
+		fillRegistries();
+	}
+
+	@AfterClass
+	public static void teardownClass() {
+		resetRegistries();
+	}
+
 	@Test
 	public void testA30UseCase() throws IOException {
 		final Resource left = input.getA3Left();
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/ChangeUsageTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/ChangeUsageTest.java
index d6e8de398..e6a3db04f 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/ChangeUsageTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/ChangeUsageTest.java
@@ -33,6 +33,8 @@ import org.eclipse.emf.compare.uml2.tests.AbstractUMLInputData;
 import org.eclipse.emf.compare.uml2.tests.AbstractUMLTest;
 import org.eclipse.emf.compare.uml2.tests.dependency.data.DependencyInputData;
 import org.eclipse.emf.ecore.resource.Resource;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 //TODO To extend from ChangeDependencyTest and change only descriptions.
@@ -41,6 +43,16 @@ public class ChangeUsageTest extends AbstractUMLTest {
 
 	private DependencyInputData input = new DependencyInputData();
 
+	@BeforeClass
+	public static void setupClass() {
+		fillRegistries();
+	}
+
+	@AfterClass
+	public static void teardownClass() {
+		resetRegistries();
+	}
+
 	@Test
 	public void testA40UseCase() throws IOException {
 		final Resource left = input.getA4Left();
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/edit/provider/DynamicStereotypedElementItemProviderTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/edit/provider/DynamicStereotypedElementItemProviderTest.java
index 9bcb41dad..9fedb0d73 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/edit/provider/DynamicStereotypedElementItemProviderTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/edit/provider/DynamicStereotypedElementItemProviderTest.java
@@ -19,6 +19,8 @@ import org.eclipse.emf.compare.uml2.tests.AbstractDynamicProfileTest;
 import org.eclipse.emf.compare.uml2.tests.AbstractUMLInputData;
 import org.eclipse.emf.compare.uml2.tests.edit.provider.data.ModelInputData;
 import org.eclipse.emf.ecore.resource.Resource;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 /**
@@ -30,6 +32,16 @@ public class DynamicStereotypedElementItemProviderTest extends AbstractDynamicPr
 
 	private ModelInputData inputData = new ModelInputData();
 
+	@BeforeClass
+	public static void setupClass() {
+		initEPackageNsURIToProfileLocationMap();
+	}
+
+	@AfterClass
+	public static void teardownClass() {
+		resetEPackageNsURIToProfileLocationMap();
+	}
+
 	@Override
 	protected AbstractUMLInputData getInput() {
 		return inputData;
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/edit/provider/StaticStereotypedElementItemProviderTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/edit/provider/StaticStereotypedElementItemProviderTest.java
index 7d0bb52f9..37d64a876 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/edit/provider/StaticStereotypedElementItemProviderTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/edit/provider/StaticStereotypedElementItemProviderTest.java
@@ -26,7 +26,9 @@ import org.eclipse.emf.compare.uml2.tests.AbstractUMLInputData;
 import org.eclipse.emf.compare.uml2.tests.edit.provider.data.ModelInputData;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.junit.AfterClass;
 import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 /**
@@ -38,6 +40,16 @@ public class StaticStereotypedElementItemProviderTest extends AbstractStaticProf
 
 	private ModelInputData inputData = new ModelInputData();
 
+	@BeforeClass
+	public static void setupClass() {
+		fillRegistriesForStatic();
+	}
+
+	@AfterClass
+	public static void teardownClass() {
+		resetRegistriesForStatic();
+	}
+
 	@Override
 	protected AbstractUMLInputData getInput() {
 		return inputData;
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/executionSpecification/AddActionExecutionSpecificationTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/executionSpecification/AddActionExecutionSpecificationTest.java
index 039b80d7e..e728b4341 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/executionSpecification/AddActionExecutionSpecificationTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/executionSpecification/AddActionExecutionSpecificationTest.java
@@ -36,6 +36,8 @@ import org.eclipse.emf.compare.uml2.tests.AbstractUMLInputData;
 import org.eclipse.emf.compare.uml2.tests.AbstractUMLTest;
 import org.eclipse.emf.compare.uml2.tests.executionSpecification.data.ExecutionSpecificationInputData;
 import org.eclipse.emf.ecore.resource.Resource;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 @SuppressWarnings("nls")
@@ -43,6 +45,16 @@ public class AddActionExecutionSpecificationTest extends AbstractUMLTest {
 
 	private ExecutionSpecificationInputData input = new ExecutionSpecificationInputData();
 
+	@BeforeClass
+	public static void setupClass() {
+		fillRegistries();
+	}
+
+	@AfterClass
+	public static void teardownClass() {
+		resetRegistries();
+	}
+
 	@Test
 	public void testA10UseCase() throws IOException {
 		final Resource left = input.getA1Left();
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/executionSpecification/AddBehaviorExecutionSpecificationTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/executionSpecification/AddBehaviorExecutionSpecificationTest.java
index 2bd7c2356..a7fd9eccf 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/executionSpecification/AddBehaviorExecutionSpecificationTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/executionSpecification/AddBehaviorExecutionSpecificationTest.java
@@ -36,6 +36,8 @@ import org.eclipse.emf.compare.uml2.tests.AbstractUMLInputData;
 import org.eclipse.emf.compare.uml2.tests.AbstractUMLTest;
 import org.eclipse.emf.compare.uml2.tests.executionSpecification.data.ExecutionSpecificationInputData;
 import org.eclipse.emf.ecore.resource.Resource;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 @SuppressWarnings("nls")
@@ -43,6 +45,16 @@ public class AddBehaviorExecutionSpecificationTest extends AbstractUMLTest {
 
 	private ExecutionSpecificationInputData input = new ExecutionSpecificationInputData();
 
+	@BeforeClass
+	public static void setupClass() {
+		fillRegistries();
+	}
+
+	@AfterClass
+	public static void teardownClass() {
+		resetRegistries();
+	}
+
 	@Test
 	public void testA20UseCase() throws IOException {
 		final Resource left = input.getA2Left();
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/extend/AddExtendTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/extend/AddExtendTest.java
index 40f0d2547..cf26bb649 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/extend/AddExtendTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/extend/AddExtendTest.java
@@ -36,6 +36,8 @@ import org.eclipse.emf.compare.uml2.tests.AbstractUMLInputData;
 import org.eclipse.emf.compare.uml2.tests.AbstractUMLTest;
 import org.eclipse.emf.compare.uml2.tests.extend.data.ExtendInputData;
 import org.eclipse.emf.ecore.resource.Resource;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 @SuppressWarnings("nls")
@@ -43,6 +45,16 @@ public class AddExtendTest extends AbstractUMLTest {
 
 	private ExtendInputData input = new ExtendInputData();
 
+	@BeforeClass
+	public static void setupClass() {
+		fillRegistries();
+	}
+
+	@AfterClass
+	public static void teardownClass() {
+		resetRegistries();
+	}
+
 	@Test
 	public void testA10UseCase() throws IOException {
 		final Resource left = input.getA1Left();
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/generalizationSet/AddGeneralizationSetTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/generalizationSet/AddGeneralizationSetTest.java
index 999e41e44..a33b939a4 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/generalizationSet/AddGeneralizationSetTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/generalizationSet/AddGeneralizationSetTest.java
@@ -37,6 +37,8 @@ import org.eclipse.emf.compare.uml2.tests.generalizationSet.data.GeneralizationS
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.uml2.uml.UMLPackage;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 @SuppressWarnings("nls")
@@ -44,6 +46,16 @@ public class AddGeneralizationSetTest extends AbstractUMLTest {
 
 	private GeneralizationSetInputData input = new GeneralizationSetInputData();
 
+	@BeforeClass
+	public static void setupClass() {
+		fillRegistries();
+	}
+
+	@AfterClass
+	public static void teardownClass() {
+		resetRegistries();
+	}
+
 	@Test
 	public void testA10UseCase() throws IOException {
 		final Resource left = input.getA1Left();
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/implications/ImplicationsAssociationTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/implications/ImplicationsAssociationTest.java
index d2445f749..603fdeba3 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/implications/ImplicationsAssociationTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/implications/ImplicationsAssociationTest.java
@@ -39,6 +39,8 @@ import org.eclipse.emf.compare.uml2.tests.AbstractUMLInputData;
 import org.eclipse.emf.compare.uml2.tests.AbstractUMLTest;
 import org.eclipse.emf.compare.uml2.tests.implications.data.ImplicationsInputData;
 import org.eclipse.emf.ecore.resource.Resource;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 @SuppressWarnings("nls")
@@ -48,6 +50,16 @@ public class ImplicationsAssociationTest extends AbstractUMLTest {
 
 	private ImplicationsInputData input = new ImplicationsInputData();
 
+	@BeforeClass
+	public static void setupClass() {
+		fillRegistries();
+	}
+
+	@AfterClass
+	public static void teardownClass() {
+		resetRegistries();
+	}
+
 	private DiffsOfInterest getDiffs(Comparison comparison, TestKind kind) {
 		final List<Diff> differences = comparison.getDifferences();
 		Predicate<? super Diff> addAssociationDescription = null;
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/implications/ImplicationsInterfaceRealizationTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/implications/ImplicationsInterfaceRealizationTest.java
index 86d3630c6..f5b59c9da 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/implications/ImplicationsInterfaceRealizationTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/implications/ImplicationsInterfaceRealizationTest.java
@@ -34,6 +34,8 @@ import org.eclipse.emf.compare.uml2.tests.AbstractUMLTest;
 import org.eclipse.emf.compare.uml2.tests.implications.data.ImplicationsInputData;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.uml2.uml.UMLPackage;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 @SuppressWarnings("nls")
@@ -43,6 +45,16 @@ public class ImplicationsInterfaceRealizationTest extends AbstractUMLTest {
 
 	private ImplicationsInputData input = new ImplicationsInputData();
 
+	@BeforeClass
+	public static void setupClass() {
+		fillRegistries();
+	}
+
+	@AfterClass
+	public static void teardownClass() {
+		resetRegistries();
+	}
+
 	private DiffsOfInterest getDiffs(Comparison comparison, TestKind kind) {
 		final List<Diff> differences = comparison.getDifferences();
 
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/implications/ImplicationsTransitionTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/implications/ImplicationsTransitionTest.java
index f28c53f4d..1705205f8 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/implications/ImplicationsTransitionTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/implications/ImplicationsTransitionTest.java
@@ -32,6 +32,8 @@ import org.eclipse.emf.compare.uml2.tests.AbstractUMLInputData;
 import org.eclipse.emf.compare.uml2.tests.AbstractUMLTest;
 import org.eclipse.emf.compare.uml2.tests.implications.data.ImplicationsInputData;
 import org.eclipse.emf.ecore.resource.Resource;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 @SuppressWarnings("nls")
@@ -41,6 +43,16 @@ public class ImplicationsTransitionTest extends AbstractUMLTest {
 
 	private ImplicationsInputData input = new ImplicationsInputData();
 
+	@BeforeClass
+	public static void setupClass() {
+		fillRegistries();
+	}
+
+	@AfterClass
+	public static void teardownClass() {
+		resetRegistries();
+	}
+
 	private DiffsOfInterest getDiffs(Comparison comparison, TestKind kind) {
 		final List<Diff> differences = comparison.getDifferences();
 		Predicate<? super Diff> addTransitionDescription = null;
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/include/AddIncludeTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/include/AddIncludeTest.java
index f20aca97b..e0f1657c6 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/include/AddIncludeTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/include/AddIncludeTest.java
@@ -34,6 +34,8 @@ import org.eclipse.emf.compare.uml2.tests.AbstractUMLInputData;
 import org.eclipse.emf.compare.uml2.tests.AbstractUMLTest;
 import org.eclipse.emf.compare.uml2.tests.include.data.IncludeInputData;
 import org.eclipse.emf.ecore.resource.Resource;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 @SuppressWarnings("nls")
@@ -41,6 +43,16 @@ public class AddIncludeTest extends AbstractUMLTest {
 
 	private IncludeInputData input = new IncludeInputData();
 
+	@BeforeClass
+	public static void setupClass() {
+		fillRegistries();
+	}
+
+	@AfterClass
+	public static void teardownClass() {
+		resetRegistries();
+	}
+
 	@Test
 	public void testA10UseCase() throws IOException {
 		final Resource left = input.getA1Left();
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/merge/ExtensionMergeTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/merge/ExtensionMergeTest.java
index a44e04a74..2fe23bce0 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/merge/ExtensionMergeTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/merge/ExtensionMergeTest.java
@@ -32,12 +32,24 @@ import org.eclipse.emf.compare.uml2.tests.AbstractUMLInputData;
 import org.eclipse.emf.compare.uml2.tests.AbstractUMLTest;
 import org.eclipse.emf.compare.uml2.tests.association.data.AssociationInputData;
 import org.eclipse.emf.ecore.resource.Resource;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 @SuppressWarnings("nls")
 public class ExtensionMergeTest extends AbstractUMLTest {
 	private AssociationInputData input = new AssociationInputData();
 
+	@BeforeClass
+	public static void setupClass() {
+		fillRegistries();
+	}
+
+	@AfterClass
+	public static void teardownClass() {
+		resetRegistries();
+	}
+
 	@Test
 	public void testInstantiationMerger() throws IOException {
 		final Resource left = input.getA1Left();
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/message/AddMessageTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/message/AddMessageTest.java
index cb0f0ddc1..d98e97270 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/message/AddMessageTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/message/AddMessageTest.java
@@ -40,6 +40,8 @@ import org.eclipse.emf.compare.uml2.tests.AbstractUMLInputData;
 import org.eclipse.emf.compare.uml2.tests.AbstractUMLTest;
 import org.eclipse.emf.compare.uml2.tests.message.data.MessageInputData;
 import org.eclipse.emf.ecore.resource.Resource;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 @SuppressWarnings("nls")
@@ -47,6 +49,16 @@ public class AddMessageTest extends AbstractUMLTest {
 
 	private MessageInputData input = new MessageInputData();
 
+	@BeforeClass
+	public static void setupClass() {
+		fillRegistries();
+	}
+
+	@AfterClass
+	public static void teardownClass() {
+		resetRegistries();
+	}
+
 	@Test
 	public void testA10UseCase() throws IOException {
 		final Resource left = input.getA1Left();
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/opaque/OpaqueElementBodyChangeDiffTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/opaque/OpaqueElementBodyChangeDiffTest.java
index b27fdf260..59f079583 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/opaque/OpaqueElementBodyChangeDiffTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/opaque/OpaqueElementBodyChangeDiffTest.java
@@ -38,6 +38,8 @@ import org.eclipse.emf.compare.uml2.tests.AbstractUMLTest;
 import org.eclipse.emf.compare.uml2.tests.opaque.data.OpaqueInputData;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.uml2.uml.OpaqueAction;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 /**
@@ -58,6 +60,16 @@ public class OpaqueElementBodyChangeDiffTest extends AbstractUMLTest {
 
 	private OpaqueInputData input = new OpaqueInputData();
 
+	@BeforeClass
+	public static void setupClass() {
+		fillRegistries();
+	}
+
+	@AfterClass
+	public static void teardownClass() {
+		resetRegistries();
+	}
+
 	@Test
 	public void testA1UseCaseLeft() throws IOException {
 		Resource origin = input.getA1Origin();
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/opaque/OpaqueElementBodyChangeMergeTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/opaque/OpaqueElementBodyChangeMergeTest.java
index 5ba901019..b705e5ccb 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/opaque/OpaqueElementBodyChangeMergeTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/opaque/OpaqueElementBodyChangeMergeTest.java
@@ -40,6 +40,8 @@ import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.uml2.uml.OpaqueAction;
 import org.eclipse.uml2.uml.OpaqueBehavior;
 import org.eclipse.uml2.uml.OpaqueExpression;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 /**
@@ -120,6 +122,16 @@ public class OpaqueElementBodyChangeMergeTest extends AbstractUMLTest {
 
 	private OpaqueInputData input = new OpaqueInputData();
 
+	@BeforeClass
+	public static void setupClass() {
+		fillRegistries();
+	}
+
+	@AfterClass
+	public static void teardownClass() {
+		resetRegistries();
+	}
+
 	@Test
 	public void testA1UseCaseRtoL() throws IOException {
 		Resource origin = input.getA1Origin();
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/DynamicProfileTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/DynamicProfileTest.java
index 204fc4e05..db7e86066 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/DynamicProfileTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/DynamicProfileTest.java
@@ -35,6 +35,8 @@ import org.eclipse.emf.compare.uml2.tests.profiles.data.dynamic.DynamicProfileIn
 import org.eclipse.emf.ecore.EcorePackage;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.uml2.uml.UMLPackage;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 @SuppressWarnings("nls")
@@ -42,6 +44,16 @@ public class DynamicProfileTest extends AbstractDynamicProfileTest {
 
 	private DynamicProfileInputData input = new DynamicProfileInputData();
 
+	@BeforeClass
+	public static void setupClass() {
+		initEPackageNsURIToProfileLocationMap();
+	}
+
+	@AfterClass
+	public static void teardownClass() {
+		resetEPackageNsURIToProfileLocationMap();
+	}
+
 	@Test
 	public void testDynamicA10UseCase() throws IOException {
 		final Resource left = input.getA1Left();
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/StaticProfileTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/StaticProfileTest.java
index 49f594da8..a6ab510dd 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/StaticProfileTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/StaticProfileTest.java
@@ -35,6 +35,8 @@ import org.eclipse.emf.compare.uml2.tests.profiles.data.static_.StaticProfileInp
 import org.eclipse.emf.ecore.EcorePackage;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.uml2.uml.UMLPackage;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 @SuppressWarnings("nls")
@@ -42,6 +44,16 @@ public class StaticProfileTest extends AbstractStaticProfileTest {
 
 	private StaticProfileInputData input = new StaticProfileInputData();
 
+	@BeforeClass
+	public static void setupClass() {
+		fillRegistriesForStatic();
+	}
+
+	@AfterClass
+	public static void teardownClass() {
+		resetRegistriesForStatic();
+	}
+
 	@Test
 	public void testStaticA10UseCase() throws IOException {
 		final Resource left = input.getA1Left();
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/AbstractStereotypedElementChangeTests.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/AbstractStereotypedElementChangeTests.java
index 4cd278d1c..149fe88d5 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/AbstractStereotypedElementChangeTests.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/AbstractStereotypedElementChangeTests.java
@@ -57,6 +57,22 @@ import org.eclipse.uml2.uml.util.UMLUtil;
  */
 public abstract class AbstractStereotypedElementChangeTests extends AbstractUMLProfileTest {
 
+	/**
+	 * Each sublass of AbstractUMLTest have to call this method in a @BeforeClass annotated method. This allow
+	 * each test to customize its context.
+	 */
+	public static void beforeClass() {
+		addProfilePathmap();
+	}
+
+	/**
+	 * Each sublass of AbstractUMLTest have to call this method in a @BeforeClass annotated method. This allow
+	 * each test to safely delete its context.
+	 */
+	public static void afterClass() {
+		resetProfilePathmap();
+	}
+
 	@Override
 	protected void registerPostProcessors(
 			org.eclipse.emf.compare.postprocessor.IPostProcessor.Descriptor.Registry<String> postProcessorRegistry) {
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/DanglingStereotypeApplicationTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/DanglingStereotypeApplicationTest.java
index 8f59b03c1..ab56f98c8 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/DanglingStereotypeApplicationTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/DanglingStereotypeApplicationTest.java
@@ -43,6 +43,7 @@ public class DanglingStereotypeApplicationTest extends AbstractUMLProfileTest {
 
 	@BeforeClass
 	public static void fillRegistriesForStatic() {
+		addProfilePathmap();
 		if (!EMFPlugin.IS_ECLIPSE_RUNNING) {
 			EPackage.Registry.INSTANCE.put(UML2CompareTestProfilePackage.eNS_URI,
 					UML2CompareTestProfilePackage.eINSTANCE); // registers
@@ -63,6 +64,7 @@ public class DanglingStereotypeApplicationTest extends AbstractUMLProfileTest {
 			UMLPlugin.getEPackageNsURIToProfileLocationMap().remove(UML2CompareTestProfilePackage.eNS_URI);
 			EPackage.Registry.INSTANCE.remove(UML2CompareTestProfilePackage.eNS_URI);
 		}
+		resetProfilePathmap();
 	}
 
 	@Before
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/DynamicStereotypeTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/DynamicStereotypeTest.java
index 8d18df470..ebc68504c 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/DynamicStereotypeTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/DynamicStereotypeTest.java
@@ -45,6 +45,8 @@ import org.eclipse.emf.compare.uml2.tests.stereotypes.data.dynamic.DynamicStereo
 import org.eclipse.emf.ecore.EcorePackage;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.uml2.uml.UMLPackage;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 @SuppressWarnings("nls")
@@ -52,6 +54,16 @@ public class DynamicStereotypeTest extends AbstractDynamicProfileTest {
 
 	private DynamicStereotypeInputData input = new DynamicStereotypeInputData();
 
+	@BeforeClass
+	public static void setupClass() {
+		initEPackageNsURIToProfileLocationMap();
+	}
+
+	@AfterClass
+	public static void teardownClass() {
+		resetEPackageNsURIToProfileLocationMap();
+	}
+
 	@Test
 	public void testA10UseCase() throws IOException {
 		final Resource left = input.getA1Left();
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/DynamicStereotypedElementChangeTests.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/DynamicStereotypedElementChangeTests.java
index 705195322..908521e84 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/DynamicStereotypedElementChangeTests.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/DynamicStereotypedElementChangeTests.java
@@ -46,6 +46,7 @@ public class DynamicStereotypedElementChangeTests extends AbstractStereotypedEle
 
 	@BeforeClass
 	public static void initEPackageNsURIToProfileLocationMap() {
+		beforeClass();
 		if (!EMFPlugin.IS_ECLIPSE_RUNNING) {
 			// It is required to link the EPackage to the UML package of the UML Profile
 			UMLPlugin
@@ -69,6 +70,7 @@ public class DynamicStereotypedElementChangeTests extends AbstractStereotypedEle
 					registeredURI);
 			EPackage.Registry.INSTANCE.put(UML2CompareTestProfilePackage.eNS_URI, registeredPackage);
 		}
+		afterClass();
 	}
 
 	@Before
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/StaticStereotypeTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/StaticStereotypeTest.java
index ac26e38da..8855923e5 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/StaticStereotypeTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/StaticStereotypeTest.java
@@ -45,6 +45,8 @@ import org.eclipse.emf.compare.uml2.tests.stereotypes.data.static_.StaticStereot
 import org.eclipse.emf.ecore.EcorePackage;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.uml2.uml.UMLPackage;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 @SuppressWarnings("nls")
@@ -52,6 +54,16 @@ public class StaticStereotypeTest extends AbstractStaticProfileTest {
 
 	private StaticStereotypeInputData input = new StaticStereotypeInputData();
 
+	@BeforeClass
+	public static void setupClass() {
+		fillRegistriesForStatic();
+	}
+
+	@AfterClass
+	public static void teardownClass() {
+		resetRegistriesForStatic();
+	}
+
 	@Test
 	public void testB10UseCase() throws IOException {
 		final Resource left = input.getB1Left();
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/StaticStereotypedElementChangeTests.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/StaticStereotypedElementChangeTests.java
index ad9700aba..5a7bc702a 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/StaticStereotypedElementChangeTests.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/StaticStereotypedElementChangeTests.java
@@ -43,6 +43,7 @@ public class StaticStereotypedElementChangeTests extends AbstractStereotypedElem
 
 	@BeforeClass
 	public static void fillRegistriesForStatic() {
+		beforeClass();
 		if (!EMFPlugin.IS_ECLIPSE_RUNNING) {
 			EPackage.Registry.INSTANCE.put(UML2CompareTestProfilePackage.eNS_URI,
 					UML2CompareTestProfilePackage.eINSTANCE); // registers
@@ -63,6 +64,7 @@ public class StaticStereotypedElementChangeTests extends AbstractStereotypedElem
 			UMLPlugin.getEPackageNsURIToProfileLocationMap().remove(UML2CompareTestProfilePackage.eNS_URI);
 			EPackage.Registry.INSTANCE.remove(UML2CompareTestProfilePackage.eNS_URI);
 		}
+		afterClass();
 	}
 
 	@Before
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/timeConstraint/AddTimeConstraintTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/timeConstraint/AddTimeConstraintTest.java
index c2e691280..de0436982 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/timeConstraint/AddTimeConstraintTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/timeConstraint/AddTimeConstraintTest.java
@@ -36,6 +36,8 @@ import org.eclipse.emf.compare.uml2.tests.AbstractUMLInputData;
 import org.eclipse.emf.compare.uml2.tests.AbstractUMLTest;
 import org.eclipse.emf.compare.uml2.tests.timeConstraint.data.TimeConstraintInputData;
 import org.eclipse.emf.ecore.resource.Resource;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 @SuppressWarnings("nls")
@@ -43,6 +45,16 @@ public class AddTimeConstraintTest extends AbstractUMLTest {
 
 	private TimeConstraintInputData input = new TimeConstraintInputData();
 
+	@BeforeClass
+	public static void setupClass() {
+		fillRegistries();
+	}
+
+	@AfterClass
+	public static void teardownClass() {
+		resetRegistries();
+	}
+
 	@Test
 	public void testA10UseCase() throws IOException {
 		final Resource left = input.getA1Left();