Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCedric Notot2013-06-09 17:30:48 -0400
committerCedric Notot2013-06-19 10:45:34 -0400
commitb37f338f143571d5ac41de393a5ee53fd0a1ffc6 (patch)
tree577c04896a11b0fbca86cbe78c15433e6f660b9d /plugins/org.eclipse.emf.compare.uml2.tests
parent4dff57de2128cb9e0220651059496bb6e106132c (diff)
downloadorg.eclipse.emf.compare-b37f338f143571d5ac41de393a5ee53fd0a1ffc6.tar.gz
org.eclipse.emf.compare-b37f338f143571d5ac41de393a5ee53fd0a1ffc6.tar.xz
org.eclipse.emf.compare-b37f338f143571d5ac41de393a5ee53fd0a1ffc6.zip
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
Diffstat (limited to 'plugins/org.eclipse.emf.compare.uml2.tests')
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/DynamicStereotypeTest.java4
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/StaticStereotypeTest.java4
2 files changed, 4 insertions, 4 deletions
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 {

Back to the top