Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCedric Notot2013-05-16 08:55:34 -0400
committerMikaƫl Barbero2013-05-24 09:35:44 -0400
commit5418a5d8c5c0dc1092316c3e91f23bc4e796a152 (patch)
treed31f06c23be9de81b8c25da65556886540825085 /plugins/org.eclipse.emf.compare.uml2.tests
parent415659a0e666d5702f6586e11fbf1a32a76766cb (diff)
downloadorg.eclipse.emf.compare-5418a5d8c5c0dc1092316c3e91f23bc4e796a152.tar.gz
org.eclipse.emf.compare-5418a5d8c5c0dc1092316c3e91f23bc4e796a152.tar.xz
org.eclipse.emf.compare-5418a5d8c5c0dc1092316c3e91f23bc4e796a152.zip
Add test to check intersections between macroscopic changes.
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/AbstractTest.java11
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/association/AddAssociation2Test.java3
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/association/AddAssociation3Test.java2
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/association/AddAssociationTest.java2
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/association/ChangeAssociationTest.java2
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddAbstractionTest.java2
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddDependencyTest.java2
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddInterfaceRealizationTest.java2
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddRealizationTest.java2
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddSubstitutionTest.java2
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddUsageTest.java1
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/ChangeDependencyTest.java2
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/ChangeUsageTest.java2
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/executionSpecification/AddActionExecutionSpecificationTest.java2
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/executionSpecification/AddBehaviorExecutionSpecificationTest.java2
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/extend/AddExtendTest.java2
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/generalizationSet/AddGeneralizationSetTest.java2
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/include/AddIncludeTest.java2
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/message/AddMessageTest.java6
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/ProfileTest.java2
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/DynamicStereotypeTest.java16
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/StaticStereotypeTest.java16
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/timeConstraint/AddTimeConstraintTest.java2
23 files changed, 87 insertions, 0 deletions
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/AbstractTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/AbstractTest.java
index b8d70ce9d..bfe11bced 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/AbstractTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/AbstractTest.java
@@ -10,9 +10,11 @@
*/
package org.eclipse.emf.compare.uml2.tests;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import com.google.common.base.Predicate;
+import com.google.common.collect.Iterables;
import com.google.common.collect.Iterators;
import java.util.Iterator;
@@ -149,4 +151,13 @@ public abstract class AbstractTest {
assertTrue("Comparison#getDifferences() must be empty after copyAllRightToLeft", comparisonAfter
.getDifferences().isEmpty());
}
+
+ protected void testIntersections(Comparison comparison) {
+ assertFalse(Iterables.any(comparison.getDifferences(), new Predicate<Diff>() {
+ public boolean apply(Diff input) {
+ return input.getRefines().size() > 1;
+ }
+ }));
+ }
+
}
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 0fbd001ec..9d4a55b49 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
@@ -346,6 +346,9 @@ public class AddAssociation2Test extends AbstractTest {
assertNotNull(addPropertyClass0InAssociation.getEquivalence());
assertTrue(addPropertyClass0InAssociation.getEquivalence().getDifferences().contains(
addRefAssociationInPropertyClass0));
+
+ testIntersections(comparison);
+
}
private static Predicate<? super Diff> addedLowerValueIn(final String qualifiedName) {
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 739114db4..58a6c827e 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
@@ -346,6 +346,8 @@ public class AddAssociation3Test extends AbstractTest {
assertNotNull(addPropertyClass1InAssociation.getEquivalence());
assertTrue(addPropertyClass1InAssociation.getEquivalence().getDifferences().contains(
addRefAssociationInPropertyClass1));
+
+ testIntersections(comparison);
}
private static Predicate<? super Diff> addedLowerValueIn(final String qualifiedName) {
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 dad42191b..b8a2f9b4d 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
@@ -376,6 +376,8 @@ public class AddAssociationTest extends AbstractTest {
assertSame(Integer.valueOf(0), Integer.valueOf(addUnlimitedNaturalInClass1.getRequires().size()));
assertSame(Integer.valueOf(0), Integer.valueOf(addLiteralIntegerInClass2.getRequires().size()));
assertSame(Integer.valueOf(0), Integer.valueOf(addUnlimitedNaturalInClass2.getRequires().size()));
+
+ testIntersections(comparison);
}
}
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 71acd83a5..631202624 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
@@ -237,6 +237,8 @@ public class ChangeAssociationTest extends AbstractTest {
assertSame(Integer.valueOf(0), Integer.valueOf(addLiteralIntegerInClass2.getRequires().size()));
assertSame(Integer.valueOf(0), Integer.valueOf(addUnlimitedNaturalInClass2.getRequires().size()));
}
+
+ testIntersections(comparison);
}
private static Predicate<? super Diff> addedLowerValueIn(final String qualifiedName) {
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 0151e6bd9..b4405a5de 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
@@ -183,6 +183,8 @@ public class AddAbstractionTest extends AbstractTest {
assertTrue(addRefClass1InAbstraction.getEquivalence().getDifferences().contains(
addRefAbstractionInClass1));
+ testIntersections(comparison);
+
}
@Override
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 8089c25e1..75fac9033 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
@@ -182,6 +182,8 @@ public class AddDependencyTest extends AbstractTest {
assertTrue(addRefClass0InDependency.getEquivalence().getDifferences().contains(
addRefDependencyInClass0));
+ testIntersections(comparison);
+
}
@Override
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 edeccc09f..d85bb68f7 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
@@ -191,6 +191,8 @@ public class AddInterfaceRealizationTest extends AbstractTest {
assertTrue(addClientInInterfaceRealization.getEquivalence().getDifferences().contains(
addInterfaceRealization));
// duplicate diff: NamedElement.clientDependency to InterfaceRealization0
+
+ testIntersections(comparison);
}
@Override
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 894a45a34..d28bae553 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
@@ -183,6 +183,8 @@ public class AddRealizationTest extends AbstractTest {
assertTrue(addRefClass0InDependency.getEquivalence().getDifferences().contains(
addRefDependencyInClass0));
+ testIntersections(comparison);
+
}
@Override
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 5f322aa75..be85bfa4e 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
@@ -193,6 +193,8 @@ public class AddSubstitutionTest extends AbstractTest {
assertTrue(addClientInInterfaceRealization.getEquivalence().getDifferences().contains(
addInterfaceRealization));
// duplicate diff NamedElement.clientDependency to Substitution0
+
+ testIntersections(comparison);
}
@Override
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 fd7efd622..25b335bdb 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
@@ -181,6 +181,7 @@ public class AddUsageTest extends AbstractTest {
assertTrue(addRefClass0InDependency.getEquivalence().getDifferences().contains(
addRefDependencyInClass0));
+ testIntersections(comparison);
}
@Override
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 9ac41b7fb..a61b71e52 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
@@ -121,6 +121,8 @@ public class ChangeDependencyTest extends AbstractTest {
// CHECK EQUIVALENCE
assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getEquivalences().size()));
+ testIntersections(comparison);
+
}
@Override
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 acc9902b1..9e8c37f04 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
@@ -121,6 +121,8 @@ public class ChangeUsageTest extends AbstractTest {
// CHECK EQUIVALENCE
assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getEquivalences().size()));
+ testIntersections(comparison);
+
}
@Override
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 f5e567aa1..e7cf00bc7 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
@@ -327,6 +327,8 @@ public class AddActionExecutionSpecificationTest extends AbstractTest {
assertTrue(addCoveredInActionExecSpec.getEquivalence().getDifferences().contains(
addCoveredByInLifeline1_3));
+ testIntersections(comparison);
+
}
@Override
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 6778d368f..dae9f7815 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
@@ -327,6 +327,8 @@ public class AddBehaviorExecutionSpecificationTest extends AbstractTest {
assertTrue(addCoveredInActionExecSpec.getEquivalence().getDifferences().contains(
addCoveredByInLifeline1_3));
+ testIntersections(comparison);
+
}
@Override
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 0daf7a9da..8a41a7439 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
@@ -171,6 +171,8 @@ public class AddExtendTest extends AbstractTest {
// CHECK EQUIVALENCE
assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getEquivalences().size()));
+ testIntersections(comparison);
+
}
@Override
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 0e8ad3d6b..dd2f7df68 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
@@ -222,6 +222,8 @@ public class AddGeneralizationSetTest extends AbstractTest {
assertTrue(addRefGeneralizationInGeneralizationSet2.getEquivalence().getDifferences().contains(
addRefGeneralizationSetInClass2));
+ testIntersections(comparison);
+
}
public static Predicate<? super Diff> removedFromReference1(final String qualifiedName,
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 96aecab46..2aa8c618f 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
@@ -145,6 +145,8 @@ public class AddIncludeTest extends AbstractTest {
// CHECK EQUIVALENCE
assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getEquivalences().size()));
+ testIntersections(comparison);
+
}
@Override
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 0c247b78a..8560d1dd0 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
@@ -457,6 +457,8 @@ public class AddMessageTest extends AbstractTest {
assertTrue(addCoveredInMessage0Recv0.getEquivalence().getDifferences().contains(
addCoveredByInLifeline1));
+ testIntersections(comparison);
+
}
private void testAB2(TestKind kind, final Comparison comparison) {
@@ -595,6 +597,8 @@ public class AddMessageTest extends AbstractTest {
assertFalse("No move expected", Iterators.filter(differences.iterator(), ofKind(DifferenceKind.MOVE))
.hasNext());
+
+ testIntersections(comparison);
}
private void testAB3(TestKind kind, final Comparison comparison) {
@@ -733,6 +737,8 @@ public class AddMessageTest extends AbstractTest {
assertFalse("No move expected", Iterators.filter(differences.iterator(), ofKind(DifferenceKind.MOVE))
.hasNext());
+
+ testIntersections(comparison);
}
@Override
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/ProfileTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/ProfileTest.java
index 514c4a128..7ee85a100 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/ProfileTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/ProfileTest.java
@@ -366,6 +366,8 @@ public class ProfileTest extends AbstractTest {
// CHECK EQUIVALENCE
assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getEquivalences().size()));
+ testIntersections(comparison);
+
}
@Override
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 4a65f181b..228ac8d08 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
@@ -708,6 +708,8 @@ public class DynamicStereotypeTest extends AbstractTest {
// CHECK EQUIVALENCE
assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getEquivalences().size()));
+ testIntersections(comparison);
+
}
private void testAB2(TestKind kind, final Comparison comparison) {
@@ -729,6 +731,8 @@ public class DynamicStereotypeTest extends AbstractTest {
final Diff addAttribute = Iterators.find(differences.iterator(), addAttributeDescription);
assertNotNull(addAttribute);
+ testIntersections(comparison);
+
}
private void testAB3(TestKind kind, final Comparison comparison) {
@@ -876,6 +880,8 @@ public class DynamicStereotypeTest extends AbstractTest {
// CHECK EQUIVALENCE
assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getEquivalences().size()));
+
+ testIntersections(comparison);
}
private void testAB4(TestKind kind, final Comparison comparison) {
@@ -906,6 +912,7 @@ public class DynamicStereotypeTest extends AbstractTest {
assertNotNull(addStereotypeApplication);
assertNotNull(addUMLStereotypeApplication);
+ testIntersections(comparison);
}
private void testAB5(TestKind kind, final Comparison comparison) {
@@ -934,6 +941,8 @@ public class DynamicStereotypeTest extends AbstractTest {
assertTrue(changeUMLStereotypeApplication.getRefinedBy().contains(changeAttribute1));
assertTrue(changeUMLStereotypeApplication.getRefinedBy().contains(changeAttribute2));
+ testIntersections(comparison);
+
}
private void testAB6(TestKind kind, final Comparison comparison) {
@@ -965,6 +974,8 @@ public class DynamicStereotypeTest extends AbstractTest {
assertSame(Integer.valueOf(1), Integer.valueOf(changeUMLStereotype.getRefinedBy().size()));
assertTrue(changeUMLStereotype.getRefinedBy().contains(addStereotypeRef));
+ testIntersections(comparison);
+
}
private void testAB7(TestKind kind, final Comparison comparison) {
@@ -991,6 +1002,8 @@ public class DynamicStereotypeTest extends AbstractTest {
assertSame(Integer.valueOf(1), Integer.valueOf(changeUMLStereotype.getRefinedBy().size()));
assertTrue(changeUMLStereotype.getRefinedBy().contains(moveStereotypeRef));
+ testIntersections(comparison);
+
}
private void testAB8(TestKind kind, final Comparison comparison) {
@@ -1025,6 +1038,7 @@ public class DynamicStereotypeTest extends AbstractTest {
assertSame(Integer.valueOf(1), Integer.valueOf(changeUMLStereotype.getRefinedBy().size()));
assertTrue(changeUMLStereotype.getRefinedBy().contains(changeStereotypeRef));
+ testIntersections(comparison);
}
private void testAB9(TestKind kind, final Comparison comparison) {
@@ -1053,6 +1067,7 @@ public class DynamicStereotypeTest extends AbstractTest {
assertSame(Integer.valueOf(1), Integer.valueOf(changeUMLStereotype.getRefinedBy().size()));
assertTrue(changeUMLStereotype.getRefinedBy().contains(changeStereotypeRef));
+ testIntersections(comparison);
}
private void testAB10(TestKind kind, final Comparison comparison) {
@@ -1086,6 +1101,7 @@ public class DynamicStereotypeTest extends AbstractTest {
assertSame(Integer.valueOf(1), Integer.valueOf(changeUMLStereotype.getRefinedBy().size()));
assertTrue(changeUMLStereotype.getRefinedBy().contains(changeStereotypeRef));
+ testIntersections(comparison);
}
@Override
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 129b0a359..fc193df58 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
@@ -864,6 +864,8 @@ public class StaticStereotypeTest extends AbstractTest {
// CHECK EQUIVALENCE
assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getEquivalences().size()));
+ testIntersections(comparison);
+
}
private void testAB2(TestKind kind, final Comparison comparison) {
@@ -885,6 +887,8 @@ public class StaticStereotypeTest extends AbstractTest {
final Diff addAttribute = Iterators.find(differences.iterator(), addAttributeDescription);
assertNotNull(addAttribute);
+ testIntersections(comparison);
+
}
private void testAB3(TestKind kind, final Comparison comparison) {
@@ -1032,6 +1036,8 @@ public class StaticStereotypeTest extends AbstractTest {
// CHECK EQUIVALENCE
assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getEquivalences().size()));
+
+ testIntersections(comparison);
}
private void testAB4(TestKind kind, final Comparison comparison) {
@@ -1062,6 +1068,8 @@ public class StaticStereotypeTest extends AbstractTest {
assertNotNull(addStereotypeApplication);
assertNotNull(addUMLStereotypeApplication);
+ testIntersections(comparison);
+
}
private void testAB5(TestKind kind, final Comparison comparison) {
@@ -1090,6 +1098,8 @@ public class StaticStereotypeTest extends AbstractTest {
assertTrue(changeUMLStereotypeApplication.getRefinedBy().contains(changeAttribute1));
assertTrue(changeUMLStereotypeApplication.getRefinedBy().contains(changeAttribute2));
+ testIntersections(comparison);
+
}
private void testAB6(TestKind kind, final Comparison comparison) {
@@ -1121,6 +1131,7 @@ public class StaticStereotypeTest extends AbstractTest {
assertSame(Integer.valueOf(1), Integer.valueOf(changeUMLStereotype.getRefinedBy().size()));
assertTrue(changeUMLStereotype.getRefinedBy().contains(addStereotypeRef));
+ testIntersections(comparison);
}
private void testAB7(TestKind kind, final Comparison comparison) {
@@ -1147,6 +1158,7 @@ public class StaticStereotypeTest extends AbstractTest {
assertSame(Integer.valueOf(1), Integer.valueOf(changeUMLStereotype.getRefinedBy().size()));
assertTrue(changeUMLStereotype.getRefinedBy().contains(moveStereotypeRef));
+ testIntersections(comparison);
}
private void testAB8(TestKind kind, final Comparison comparison) {
@@ -1181,6 +1193,7 @@ public class StaticStereotypeTest extends AbstractTest {
assertSame(Integer.valueOf(1), Integer.valueOf(changeUMLStereotype.getRefinedBy().size()));
assertTrue(changeUMLStereotype.getRefinedBy().contains(changeStereotypeRef));
+ testIntersections(comparison);
}
private void testAB9(TestKind kind, final Comparison comparison) {
@@ -1209,6 +1222,7 @@ public class StaticStereotypeTest extends AbstractTest {
assertSame(Integer.valueOf(1), Integer.valueOf(changeUMLStereotype.getRefinedBy().size()));
assertTrue(changeUMLStereotype.getRefinedBy().contains(changeStereotypeRef));
+ testIntersections(comparison);
}
private void testAB10(TestKind kind, final Comparison comparison) {
@@ -1242,6 +1256,8 @@ public class StaticStereotypeTest extends AbstractTest {
assertSame(Integer.valueOf(1), Integer.valueOf(changeUMLStereotype.getRefinedBy().size()));
assertTrue(changeUMLStereotype.getRefinedBy().contains(changeStereotypeRef));
+ testIntersections(comparison);
+
}
@Override
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 57c7df4e3..46cf66fc5 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
@@ -243,6 +243,8 @@ public class AddTimeConstraintTest extends AbstractTest {
// CHECK EQUIVALENCE
assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getEquivalences().size()));
+ testIntersections(comparison);
+
}
@Override

Back to the top