From b37f338f143571d5ac41de393a5ee53fd0a1ffc6 Mon Sep 17 00:00:00 2001 From: Cedric Notot Date: Sun, 9 Jun 2013 23:30:48 +0200 Subject: Fix requirement link between a unit difference and a macroscopic change. It is required to build a requirement link between a unit difference and a macroscopic change to delete all impacted objects (in a macro object) by a delete of a unit object. For example, the delete of a UML Class involves the delete of the "element" reference coming from a GMF Node. This last difference is embedded in a macroscopic change (the delete of the set of the related GMF nodes representing a graphical object). So, the delete of the unit UML Class requires the delete of the macroscopic graphical object. This link is built in the same way as the one between 2 macroscopic changes. Change-Id: I2dac280c573ac7805a0080b0044c749bfab5fc02 --- .../emf/compare/uml2/tests/stereotypes/DynamicStereotypeTest.java | 4 ++-- .../emf/compare/uml2/tests/stereotypes/StaticStereotypeTest.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'plugins/org.eclipse.emf.compare.uml2.tests') 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 6a6310b65..93f56c2c0 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 @@ -814,9 +814,9 @@ public class DynamicStereotypeTest extends AbstractTest { assertSame(Integer.valueOf(1), Integer.valueOf(addReferencesInUMLAnnotation.getRequires().size())); assertTrue(addReferencesInUMLAnnotation.getRequires().contains(addUMLAnnotation)); - assertSame(Integer.valueOf(0), Integer.valueOf(addUMLProfileApplication.getRequires().size())); + assertSame(Integer.valueOf(1), Integer.valueOf(addUMLProfileApplication.getRequires().size())); - assertSame(Integer.valueOf(1), Integer.valueOf(addUMLStereotypeApplication.getRequires().size())); + assertSame(Integer.valueOf(2), Integer.valueOf(addUMLStereotypeApplication.getRequires().size())); assertTrue(addUMLStereotypeApplication.getRequires().contains(addUMLProfileApplication)); } else { 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 be6fd8706..5b00a4e75 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 @@ -970,9 +970,9 @@ public class StaticStereotypeTest extends AbstractTest { assertSame(Integer.valueOf(1), Integer.valueOf(addReferencesInUMLAnnotation.getRequires().size())); assertTrue(addReferencesInUMLAnnotation.getRequires().contains(addUMLAnnotation)); - assertSame(Integer.valueOf(0), Integer.valueOf(addUMLProfileApplication.getRequires().size())); + assertSame(Integer.valueOf(1), Integer.valueOf(addUMLProfileApplication.getRequires().size())); - assertSame(Integer.valueOf(1), Integer.valueOf(addUMLStereotypeApplication.getRequires().size())); + assertSame(Integer.valueOf(2), Integer.valueOf(addUMLStereotypeApplication.getRequires().size())); assertTrue(addUMLStereotypeApplication.getRequires().contains(addUMLProfileApplication)); } else { -- cgit v1.2.3