383880: [UML Compare] Profile and stereotyped element management

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

Complete the tests for the profile and the stereotype
test XMI ID

14 files changed, 188 insertions, 45 deletions

diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/AbstractCompareTest.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/AbstractCompareTest.java
index 940cb9f5234..8dfad61af82 100644
--- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/AbstractCompareTest.java
+++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/AbstractCompareTest.java
@@ -261,23 +261,25 @@ public abstract class AbstractCompareTest {
 	@AfterClass

 	public static final void closeAll() {

 		//useful ?

-		final List<Resource> resources = new ArrayList<Resource>(set.getResources());

-		for(Resource current : resources) {

-			current.setTrackingModification(false);

-			set.getResources().remove(current);

-			TransactionUtil.disconnectFromEditingDomain(current);

-			current.unload();

-		}

-		resources.clear();

-		if(servicesRegistry != null) {

-			try {

-				servicesRegistry.disposeRegistry();

-			} catch (ServiceMultiException e) {

-				log.error(e);

+		if(set != null) {

+			final List<Resource> resources = new ArrayList<Resource>(set.getResources());

+			for(Resource current : resources) {

+				current.setTrackingModification(false);

+				set.getResources().remove(current);

+				TransactionUtil.disconnectFromEditingDomain(current);

+				current.unload();

+			}

+			resources.clear();

+			if(servicesRegistry != null) {

+				try {

+					servicesRegistry.disposeRegistry();

+				} catch (ServiceMultiException e) {

+					log.error(e);

+				}

 			}

+			//we close all the editors

+			GenericUtils.closeAllEditors();

 		}

-		//we close all the editors

-		GenericUtils.closeAllEditors();

 	}

 

 	/**

diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/AllTests.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/AllTests.java
index 6e52252695a..40798757914 100644
--- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/AllTests.java
+++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/AllTests.java
@@ -43,8 +43,32 @@ import org.eclipse.papyrus.uml.compare.diff.tests.standalone.UpdateReferenceTest
 import org.eclipse.papyrus.uml.compare.diff.tests.standalone.UpdateReferenceTest_1_RightToLeft;

 import org.eclipse.papyrus.uml.compare.diff.tests.standalone.UpdateReferenceTest_2_LeftToRight;

 import org.eclipse.papyrus.uml.compare.diff.tests.standalone.UpdateReferenceTest_2_RightToLeft;

+import org.eclipse.papyrus.uml.compare.diff.tests.uml.profile.standalone.UMLProfileApplicationAddition_1_LeftToRight;

+import org.eclipse.papyrus.uml.compare.diff.tests.uml.profile.standalone.UMLProfileApplicationAddition_1_RightToLeft;

+import org.eclipse.papyrus.uml.compare.diff.tests.uml.profile.standalone.UMLProfileApplicationRemoval_1_LeftToRight;

+import org.eclipse.papyrus.uml.compare.diff.tests.uml.profile.standalone.UMLProfileApplicationRemoval_1_RightToLeft;

+import org.eclipse.papyrus.uml.compare.diff.tests.uml.profile.standalone.UMLStereotypeApplicationAddition_1_LeftToRight;

+import org.eclipse.papyrus.uml.compare.diff.tests.uml.profile.standalone.UMLStereotypeApplicationAddition_1_RightToLeft;

+import org.eclipse.papyrus.uml.compare.diff.tests.uml.profile.standalone.UMLStereotypeApplicationRemoval_1_LeftToRight;

+import org.eclipse.papyrus.uml.compare.diff.tests.uml.profile.standalone.UMLStereotypeApplicationRemoval_1_RightToLeft;

+import org.eclipse.papyrus.uml.compare.diff.tests.uml.profile.standalone.UMLStereotypeAttributeChangeLeftTarget_1_LeftToRight;

+import org.eclipse.papyrus.uml.compare.diff.tests.uml.profile.standalone.UMLStereotypeAttributeChangeLeftTarget_1_RightToLeft;

+import org.eclipse.papyrus.uml.compare.diff.tests.uml.profile.standalone.UMLStereotypeAttributeChangeRightTarget_1_LeftToRight;

+import org.eclipse.papyrus.uml.compare.diff.tests.uml.profile.standalone.UMLStereotypeAttributeChangeRightTarget_1_RightToLeft;

+import org.eclipse.papyrus.uml.compare.diff.tests.uml.profile.standalone.UMLStereotypeReferenceChangeLeftTarget_1_LeftToRight;

+import org.eclipse.papyrus.uml.compare.diff.tests.uml.profile.standalone.UMLStereotypeReferenceChangeLeftTarget_1_RightToLeft;

+import org.eclipse.papyrus.uml.compare.diff.tests.uml.profile.standalone.UMLStereotypeReferenceChangeRightTarget_1_LeftToRight;

+import org.eclipse.papyrus.uml.compare.diff.tests.uml.profile.standalone.UMLStereotypeReferenceChangeRightTarget_1_RightToLeft;

+import org.eclipse.papyrus.uml.compare.diff.tests.uml.profile.standalone.UMLStereotypeReferenceOrderChange_1_LeftToRight;

+import org.eclipse.papyrus.uml.compare.diff.tests.uml.profile.standalone.UMLStereotypeReferenceOrderChange_1_RightToLeft;

+import org.eclipse.papyrus.uml.compare.diff.tests.uml.profile.standalone.UMLStereotypeUpdateAttribute_1_LeftToRight;

+import org.eclipse.papyrus.uml.compare.diff.tests.uml.profile.standalone.UMLStereotypeUpdateAttribute_1_RightToLeft;

+import org.eclipse.papyrus.uml.compare.diff.tests.uml.profile.standalone.UMLStereotypeUpdateReference_1_LeftToRight;

+import org.eclipse.papyrus.uml.compare.diff.tests.uml.profile.standalone.UMLStereotypeUpdateReference_1_RightToLeft;

 import org.eclipse.papyrus.uml.compare.diff.tests.uml.standalone.GeneralizationSourceChangedTest_1_LeftToRight;

 import org.eclipse.papyrus.uml.compare.diff.tests.uml.standalone.GeneralizationSourceChangedTest_1_RightToLeft;

+import org.eclipse.papyrus.uml.compare.diff.tests.uml.standalone.GeneralizationTargetChangedTest_1_LeftToRight;

+import org.eclipse.papyrus.uml.compare.diff.tests.uml.standalone.GeneralizationTargetChangedTest_1_RightToLeft;

 import org.junit.runner.RunWith;

 import org.junit.runners.Suite;

 import org.junit.runners.Suite.SuiteClasses;

@@ -82,7 +106,31 @@ UpdateReferenceTest_1_LeftToRight.class, UpdateReferenceTest_1_RightToLeft.class
 

 UpdateReferenceTest_2_LeftToRight.class, UpdateReferenceTest_2_RightToLeft.class,

 

-GeneralizationSourceChangedTest_1_LeftToRight.class, GeneralizationSourceChangedTest_1_RightToLeft.class })

+GeneralizationSourceChangedTest_1_LeftToRight.class, GeneralizationSourceChangedTest_1_RightToLeft.class,

+

+GeneralizationTargetChangedTest_1_LeftToRight.class, GeneralizationTargetChangedTest_1_RightToLeft.class,

+

+UMLProfileApplicationAddition_1_LeftToRight.class, UMLProfileApplicationAddition_1_RightToLeft.class,

+

+UMLProfileApplicationRemoval_1_LeftToRight.class, UMLProfileApplicationRemoval_1_RightToLeft.class,

+

+UMLStereotypeApplicationAddition_1_LeftToRight.class, UMLStereotypeApplicationAddition_1_RightToLeft.class,

+

+UMLStereotypeApplicationRemoval_1_LeftToRight.class, UMLStereotypeApplicationRemoval_1_RightToLeft.class,

+

+UMLStereotypeAttributeChangeLeftTarget_1_LeftToRight.class, UMLStereotypeAttributeChangeLeftTarget_1_RightToLeft.class,

+

+UMLStereotypeAttributeChangeRightTarget_1_LeftToRight.class, UMLStereotypeAttributeChangeRightTarget_1_RightToLeft.class,

+

+UMLStereotypeReferenceChangeLeftTarget_1_LeftToRight.class, UMLStereotypeReferenceChangeLeftTarget_1_RightToLeft.class,

+

+UMLStereotypeReferenceChangeRightTarget_1_LeftToRight.class, UMLStereotypeReferenceChangeRightTarget_1_RightToLeft.class,

+

+UMLStereotypeReferenceOrderChange_1_LeftToRight.class, UMLStereotypeReferenceOrderChange_1_RightToLeft.class,

+

+UMLStereotypeUpdateAttribute_1_LeftToRight.class, UMLStereotypeUpdateAttribute_1_RightToLeft.class,

+

+UMLStereotypeUpdateReference_1_LeftToRight.class, UMLStereotypeUpdateReference_1_RightToLeft.class, })

 public class AllTests {

 	// JUnit 4 test suite

 }

diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLProfileApplicationAddition_1_LeftToRight.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLProfileApplicationAddition_1_LeftToRight.java
index 648e29113fd..8f802f09d96 100644
--- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLProfileApplicationAddition_1_LeftToRight.java
+++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLProfileApplicationAddition_1_LeftToRight.java
@@ -21,10 +21,13 @@ import org.eclipse.emf.compare.diff.metamodel.AbstractDiffExtension;
 import org.eclipse.emf.compare.diff.metamodel.DiffElement;

 import org.eclipse.emf.compare.diff.metamodel.ModelElementChangeLeftTarget;

 import org.eclipse.emf.compare.uml2diff.UMLProfileApplicationAddition;

+import org.eclipse.emf.ecore.EAnnotation;

 import org.eclipse.osgi.util.NLS;

 import org.eclipse.papyrus.infra.core.resource.ModelMultiException;

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

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

 import org.eclipse.uml2.uml.Model;

+import org.eclipse.uml2.uml.ProfileApplication;

 import org.junit.Assert;

 import org.junit.BeforeClass;

 import org.junit.Test;

@@ -105,7 +108,22 @@ public class UMLProfileApplicationAddition_1_LeftToRight extends AbstractUMLStan
 	@Override

 	@Test

 	public void testXMIID() {

-		//nothing to do

+		final Model leftModel = (Model)leftElement;

+		final Model rightModel = (Model)rightElement;

+		final ProfileApplication leftApplication = leftModel.getProfileApplications().get(0);

+		final ProfileApplication rightApplication = rightModel.getProfileApplications().get(0);

+		Assert.assertNotNull(leftApplication);

+		Assert.assertNotNull(rightApplication);

+		final EAnnotation leftEAnnotation = leftApplication.getEAnnotation("http://www.eclipse.org/uml2/2.0.0/UML");

+		final EAnnotation rightEAnnotation = rightApplication.getEAnnotation("http://www.eclipse.org/uml2/2.0.0/UML");

+

+		Assert.assertNotNull(leftEAnnotation);

+		Assert.assertNotNull(rightEAnnotation);

+

+

+		//the test itself

+		Assert.assertEquals("The ID of the ProfileApplication has not been correctly merged", EMFHelper.getXMIID(leftApplication), EMFHelper.getXMIID(rightApplication));

+		Assert.assertEquals("The ID of the ProfileApplication has not been correctly merged", EMFHelper.getXMIID(leftEAnnotation), EMFHelper.getXMIID(rightEAnnotation));

 	}

 

 	@Override

diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLProfileApplicationAddition_1_RightToLeft.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLProfileApplicationAddition_1_RightToLeft.java
index a9a1f979f42..7c372ad29b5 100644
--- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLProfileApplicationAddition_1_RightToLeft.java
+++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLProfileApplicationAddition_1_RightToLeft.java
@@ -84,7 +84,6 @@ public class UMLProfileApplicationAddition_1_RightToLeft extends AbstractUMLStan
 	@Test

 	public void testModificationOnUMLFile() {

 		super.testModificationOnUMLFile(true);

-		super.testModificationOnUMLFile(true);

 		final Model model = (Model)leftElement;

 		Assert.assertTrue("The applied profile has not been correctly merged", model.getAppliedProfile("SysML::Blocks") == null);

 	}

diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLProfileApplicationRemoval_1_LeftToRight.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLProfileApplicationRemoval_1_LeftToRight.java
index e5db0ba41e6..e389a0f6d36 100644
--- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLProfileApplicationRemoval_1_LeftToRight.java
+++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLProfileApplicationRemoval_1_LeftToRight.java
@@ -24,6 +24,7 @@ import org.eclipse.emf.compare.uml2diff.UMLProfileApplicationRemoval;
 import org.eclipse.osgi.util.NLS;

 import org.eclipse.papyrus.infra.core.resource.ModelMultiException;

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

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

 import org.junit.Assert;

 import org.junit.BeforeClass;

 import org.junit.Test;

@@ -76,13 +77,15 @@ public class UMLProfileApplicationRemoval_1_LeftToRight extends AbstractUMLStand
 

 	@Test

 	public void testModificationOnNotationFile() {

-		Assert.fail();

+		super.testModificationOnNotationFile(false);

 	}

 

 

 	@Test

 	public void testModificationOnUMLFile() {

-		Assert.fail();

+		super.testModificationOnUMLFile(true);

+		final Model model = (Model)rightElement;

+		Assert.assertTrue("The applied profile has not been correctly merged", model.getAppliedProfile("SysML::Blocks") == null);

 	}

 

 

diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLProfileApplicationRemoval_1_RightToLeft.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLProfileApplicationRemoval_1_RightToLeft.java
index c57c28ae435..70736c5907b 100644
--- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLProfileApplicationRemoval_1_RightToLeft.java
+++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLProfileApplicationRemoval_1_RightToLeft.java
@@ -21,9 +21,13 @@ import org.eclipse.emf.compare.diff.metamodel.AbstractDiffExtension;
 import org.eclipse.emf.compare.diff.metamodel.DiffElement;

 import org.eclipse.emf.compare.diff.metamodel.ModelElementChangeRightTarget;

 import org.eclipse.emf.compare.uml2diff.UMLProfileApplicationRemoval;

+import org.eclipse.emf.ecore.EAnnotation;

 import org.eclipse.osgi.util.NLS;

 import org.eclipse.papyrus.infra.core.resource.ModelMultiException;

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

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

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

+import org.eclipse.uml2.uml.ProfileApplication;

 import org.junit.Assert;

 import org.junit.BeforeClass;

 import org.junit.Test;

@@ -76,13 +80,15 @@ public class UMLProfileApplicationRemoval_1_RightToLeft extends AbstractUMLStand
 

 	@Test

 	public void testModificationOnNotationFile() {

-		Assert.fail();

+		super.testModificationOnNotationFile(false);

 	}

 

 

 	@Test

 	public void testModificationOnUMLFile() {

-		Assert.fail();

+		super.testModificationOnUMLFile(true);

+		final Model model = (Model)leftElement;

+		Assert.assertTrue("The applied profile has not been correctly merged", model.getAppliedProfile("SysML::Blocks") != null);

 	}

 

 

@@ -102,7 +108,22 @@ public class UMLProfileApplicationRemoval_1_RightToLeft extends AbstractUMLStand
 	@Override

 	@Test

 	public void testXMIID() {

-		//nothing to do

+		final Model leftModel = (Model)leftElement;

+		final Model rightModel = (Model)rightElement;

+		final ProfileApplication leftApplication = leftModel.getProfileApplications().get(0);

+		final ProfileApplication rightApplication = rightModel.getProfileApplications().get(0);

+		Assert.assertNotNull(leftApplication);

+		Assert.assertNotNull(rightApplication);

+		final EAnnotation leftEAnnotation = leftApplication.getEAnnotation("http://www.eclipse.org/uml2/2.0.0/UML");

+		final EAnnotation rightEAnnotation = rightApplication.getEAnnotation("http://www.eclipse.org/uml2/2.0.0/UML");

+

+		Assert.assertNotNull(leftEAnnotation);

+		Assert.assertNotNull(rightEAnnotation);

+

+

+		//the test itself

+		Assert.assertEquals("The ID of the ProfileApplication has not been correctly merged", EMFHelper.getXMIID(rightApplication), EMFHelper.getXMIID(leftApplication));

+		Assert.assertEquals("The ID of the ProfileApplication has not been correctly merged", EMFHelper.getXMIID(rightEAnnotation), EMFHelper.getXMIID(leftEAnnotation));

 	}

 

 	@Override

diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeApplicationAddition_1_LeftToRight.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeApplicationAddition_1_LeftToRight.java
index e44194b2748..49f0fe24e2e 100644
--- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeApplicationAddition_1_LeftToRight.java
+++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeApplicationAddition_1_LeftToRight.java
@@ -22,9 +22,14 @@ import org.eclipse.emf.compare.diff.metamodel.DiffElement;
 import org.eclipse.emf.compare.diff.metamodel.DiffGroup;
 import org.eclipse.emf.compare.diff.metamodel.ModelElementChangeLeftTarget;
 import org.eclipse.emf.compare.uml2diff.UMLStereotypeApplicationAddition;
+import org.eclipse.emf.ecore.EObject;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.papyrus.infra.core.resource.ModelMultiException;
 import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.uml2.uml.Class;
+import org.eclipse.uml2.uml.Model;
+import org.eclipse.uml2.uml.Stereotype;
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -85,13 +90,17 @@ public class UMLStereotypeApplicationAddition_1_LeftToRight extends AbstractUMLS
 
 	@Test
 	public void testModificationOnNotationFile() {
-		Assert.fail();
+		super.testModificationOnNotationFile(false);
 	}
 
 
 	@Test
 	public void testModificationOnUMLFile() {
-		Assert.fail();
+		super.testModificationOnUMLFile(true);
+		final Model model = (Model)rightElement;
+		Class myClass = (Class)model.getOwnedMember("Class1");
+		Stereotype ste = myClass.getAppliedStereotype("SysML::Blocks::Block");
+		Assert.assertNotNull("The stereotype application has not been correctly merged", ste);
 	}
 
 
@@ -111,7 +120,18 @@ public class UMLStereotypeApplicationAddition_1_LeftToRight extends AbstractUMLS
 	@Override
 	@Test
 	public void testXMIID() {
-		//nothing to do
+		final Model leftModel = (Model)leftElement;
+		final Model rightModel = (Model)rightElement;
+		final Class leftClass = (Class)leftModel.getOwnedMember("Class1");
+		final Class rightClass = (Class)rightModel.getOwnedMember("Class1");
+		final EObject leftStereotypeApplication = leftClass.getStereotypeApplications().get(0);
+		final EObject rightStereotypeApplication = rightClass.getStereotypeApplications().get(0);
+
+		Assert.assertNotNull(leftStereotypeApplication);
+		Assert.assertNotNull(rightStereotypeApplication);
+
+		//the test itself
+		Assert.assertEquals("The ID of the ProfileApplication has not been correctly merged", EMFHelper.getXMIID(leftStereotypeApplication), EMFHelper.getXMIID(rightStereotypeApplication));
 	}
 
 	@Override
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeApplicationAddition_1_RightToLeft.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeApplicationAddition_1_RightToLeft.java
index 71cb5db2a30..7b61acc4132 100644
--- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeApplicationAddition_1_RightToLeft.java
+++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeApplicationAddition_1_RightToLeft.java
@@ -25,6 +25,9 @@ import org.eclipse.emf.compare.uml2diff.UMLStereotypeApplicationAddition;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.papyrus.infra.core.resource.ModelMultiException;
 import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.uml2.uml.Class;
+import org.eclipse.uml2.uml.Model;
+import org.eclipse.uml2.uml.Stereotype;
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -85,13 +88,17 @@ public class UMLStereotypeApplicationAddition_1_RightToLeft extends AbstractUMLS
 
 	@Test
 	public void testModificationOnNotationFile() {
-		Assert.fail();
+		super.testModificationOnNotationFile(false);
 	}
 
 
 	@Test
 	public void testModificationOnUMLFile() {
-		Assert.fail();
+		super.testModificationOnUMLFile(true);
+		final Model model = (Model)leftElement;
+		Class myClass = (Class)model.getOwnedMember("Class1");
+		Stereotype ste = myClass.getAppliedStereotype("SysML::Blocks::Block");
+		Assert.assertNull("The stereotype application has not been correctly merged", ste);
 	}
 
 
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeApplicationRemoval_1_LeftToRight.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeApplicationRemoval_1_LeftToRight.java
index 8aefa355784..2e34908fdf7 100644
--- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeApplicationRemoval_1_LeftToRight.java
+++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeApplicationRemoval_1_LeftToRight.java
@@ -25,6 +25,9 @@ import org.eclipse.emf.compare.uml2diff.UMLStereotypeApplicationRemoval;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.papyrus.infra.core.resource.ModelMultiException;
 import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.uml2.uml.Class;
+import org.eclipse.uml2.uml.Model;
+import org.eclipse.uml2.uml.Stereotype;
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -85,13 +88,17 @@ public class UMLStereotypeApplicationRemoval_1_LeftToRight extends AbstractUMLSt
 
 	@Test
 	public void testModificationOnNotationFile() {
-		Assert.fail();
+		super.testModificationOnNotationFile(false);
 	}
 
 
 	@Test
 	public void testModificationOnUMLFile() {
-		Assert.fail();
+		super.testModificationOnUMLFile(true);
+		final Model model = (Model)rightElement;
+		Class myClass = (Class)model.getOwnedMember("Class1");
+		Stereotype ste = myClass.getAppliedStereotype("SysML::Blocks::Block");
+		Assert.assertNull("The stereotype application has not been correctly merged", ste);
 	}
 
 
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeApplicationRemoval_1_RightToLeft.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeApplicationRemoval_1_RightToLeft.java
index d9599871c92..952fdacc2da 100644
--- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeApplicationRemoval_1_RightToLeft.java
+++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeApplicationRemoval_1_RightToLeft.java
@@ -22,9 +22,14 @@ import org.eclipse.emf.compare.diff.metamodel.DiffElement;
 import org.eclipse.emf.compare.diff.metamodel.DiffGroup;
 import org.eclipse.emf.compare.diff.metamodel.ModelElementChangeRightTarget;
 import org.eclipse.emf.compare.uml2diff.UMLStereotypeApplicationRemoval;
+import org.eclipse.emf.ecore.EObject;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.papyrus.infra.core.resource.ModelMultiException;
 import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.uml2.uml.Class;
+import org.eclipse.uml2.uml.Model;
+import org.eclipse.uml2.uml.Stereotype;
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -85,16 +90,21 @@ public class UMLStereotypeApplicationRemoval_1_RightToLeft extends AbstractUMLSt
 
 	@Test
 	public void testModificationOnNotationFile() {
-		Assert.fail();
+		super.testModificationOnNotationFile(false);
 	}
 
 
 	@Test
 	public void testModificationOnUMLFile() {
-		Assert.fail();
+		super.testModificationOnUMLFile(true);
+		final Model model = (Model)leftElement;
+		Class myClass = (Class)model.getOwnedMember("Class1");
+		Stereotype ste = myClass.getAppliedStereotype("SysML::Blocks::Block");
+		Assert.assertNotNull("The stereotype application has not been correctly merged", ste);
 	}
 
 
+
 	@Override
 	@Test
 	public void saveTest() throws IOException {
@@ -111,7 +121,18 @@ public class UMLStereotypeApplicationRemoval_1_RightToLeft extends AbstractUMLSt
 	@Override
 	@Test
 	public void testXMIID() {
-		//nothing to do
+		final Model leftModel = (Model)leftElement;
+		final Model rightModel = (Model)rightElement;
+		final Class leftClass = (Class)leftModel.getOwnedMember("Class1");
+		final Class rightClass = (Class)rightModel.getOwnedMember("Class1");
+		final EObject leftStereotypeApplication = leftClass.getStereotypeApplications().get(0);
+		final EObject rightStereotypeApplication = rightClass.getStereotypeApplications().get(0);
+
+		Assert.assertNotNull(leftStereotypeApplication);
+		Assert.assertNotNull(rightStereotypeApplication);
+
+		//the test itself
+		Assert.assertEquals("The ID of the StereotypeApplication has not been correctly merged", EMFHelper.getXMIID(rightStereotypeApplication), EMFHelper.getXMIID(leftStereotypeApplication));
 	}
 
 	@Override
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeUpdateAttribute_1_LeftToRight.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeUpdateAttribute_1_LeftToRight.java
index 5db46de8930..00d4665766f 100644
--- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeUpdateAttribute_1_LeftToRight.java
+++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeUpdateAttribute_1_LeftToRight.java
@@ -24,10 +24,9 @@ import org.eclipse.emf.compare.uml2diff.UMLStereotypeUpdateAttribute;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.papyrus.infra.core.resource.ModelMultiException;
 import org.eclipse.papyrus.infra.core.services.ServiceException;
-import org.eclipse.uml2.uml.InstanceSpecification;
+import org.eclipse.uml2.uml.Class;
 import org.eclipse.uml2.uml.Model;
 import org.eclipse.uml2.uml.Stereotype;
-import org.eclipse.uml2.uml.Class;
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeUpdateAttribute_1_RightToLeft.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeUpdateAttribute_1_RightToLeft.java
index c21d41f7590..0e633b5d6bc 100644
--- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeUpdateAttribute_1_RightToLeft.java
+++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeUpdateAttribute_1_RightToLeft.java
@@ -99,7 +99,7 @@ public class UMLStereotypeUpdateAttribute_1_RightToLeft extends AbstractUMLStand
 
 		final String blockStereotypeName = "SysML::Blocks::Block";
 		final Stereotype blockSte;
-		final Model model = (Model)rightElement;
+		final Model model = (Model)leftElement;
 		myClass = (Class)model.getOwnedMember("Class1");
 		Assert.assertNotNull(myClass);
 		blockSte = myClass.getAppliedStereotype(blockStereotypeName);
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeUpdateReference_1_LeftToRight.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeUpdateReference_1_LeftToRight.java
index baa507a39f7..f08eeb98a66 100644
--- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeUpdateReference_1_LeftToRight.java
+++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeUpdateReference_1_LeftToRight.java
@@ -108,17 +108,17 @@ public class UMLStereotypeUpdateReference_1_LeftToRight extends AbstractUMLStand
 		final Model model = (Model)rightElement;

 		unit = (InstanceSpecification)model.getOwnedMember(unitName);

 		dimension = (InstanceSpecification)model.getOwnedMember(dimensionName);

-		

+

 		Assert.assertNotNull(unit);

 		Assert.assertNotNull(dimension);

 		unitSte = unit.getAppliedStereotype(unitStereotypeName);

 		dimSte = dimension.getAppliedStereotype(dimentsionStereotypeName);

 		Assert.assertNotNull(unitSte);

 		Assert.assertNotNull(dimSte);

-		

+

 		//the test itself

 		Object value = unit.getValue(unitSte, "dimension");

-		Assert.assertTrue("The stererotype property has not been correctly merged", value==null);

+		Assert.assertTrue("The stererotype property has not been correctly merged", value == null);

 	}

 

 

diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeUpdateReference_1_RightToLeft.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeUpdateReference_1_RightToLeft.java
index 3f7b129f510..09482cc854e 100644
--- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeUpdateReference_1_RightToLeft.java
+++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeUpdateReference_1_RightToLeft.java
@@ -17,7 +17,6 @@ import java.io.IOException;
 import java.util.List;

 

 import org.eclipse.core.runtime.CoreException;

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

 import org.eclipse.emf.compare.diff.metamodel.DiffElement;

 import org.eclipse.emf.compare.diff.metamodel.DiffGroup;

 import org.eclipse.emf.compare.diff.metamodel.UpdateReference;

@@ -26,7 +25,6 @@ import org.eclipse.emf.compare.uml2diff.UMLStereotypeUpdateReference;
 import org.eclipse.osgi.util.NLS;

 import org.eclipse.papyrus.infra.core.resource.ModelMultiException;

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

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

 import org.eclipse.uml2.uml.InstanceSpecification;

 import org.eclipse.uml2.uml.Model;

 import org.eclipse.uml2.uml.Stereotype;

@@ -106,20 +104,20 @@ public class UMLStereotypeUpdateReference_1_RightToLeft extends AbstractUMLStand
 		final String dimensionName = "myDimension";

 		final Stereotype unitSte;

 		final Stereotype dimSte;

-		final Model model = (Model)rightElement;

+		final Model model = (Model)leftElement;

 		unit = (InstanceSpecification)model.getOwnedMember(unitName);

 		dimension = (InstanceSpecification)model.getOwnedMember(dimensionName);

-		

+

 		Assert.assertNotNull(unit);

 		Assert.assertNotNull(dimension);

 		unitSte = unit.getAppliedStereotype(unitStereotypeName);

 		dimSte = dimension.getAppliedStereotype(dimentsionStereotypeName);

 		Assert.assertNotNull(unitSte);

 		Assert.assertNotNull(dimSte);

-		

+

 		//the test itself

 		Object value = unit.getValue(unitSte, "dimension");

-		Assert.assertTrue("The stererotype property has not been correctly merged", value==dimension.getStereotypeApplication(dimSte));

+		Assert.assertTrue("The stererotype property has not been correctly merged", value == dimension.getStereotypeApplication(dimSte));

 

 	}