diff options
Diffstat (limited to 'plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddSubstitutionTest.java')
| -rw-r--r-- | plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddSubstitutionTest.java | 40 |
1 files changed, 13 insertions, 27 deletions
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 47ea9ee87..62da2f0e2 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 @@ -2,13 +2,15 @@ package org.eclipse.emf.compare.uml2.tests.dependency; import static com.google.common.base.Predicates.and; import static com.google.common.base.Predicates.instanceOf; -import static junit.framework.Assert.assertNotNull; -import static junit.framework.Assert.assertSame; -import static junit.framework.Assert.assertTrue; import static org.eclipse.emf.compare.utils.EMFComparePredicates.addedToReference; import static org.eclipse.emf.compare.utils.EMFComparePredicates.changedReference; import static org.eclipse.emf.compare.utils.EMFComparePredicates.ofKind; import static org.eclipse.emf.compare.utils.EMFComparePredicates.removedFromReference; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; import com.google.common.base.Predicate; import com.google.common.collect.Iterators; @@ -20,8 +22,8 @@ import org.eclipse.emf.compare.Comparison; import org.eclipse.emf.compare.Diff; import org.eclipse.emf.compare.DifferenceKind; import org.eclipse.emf.compare.uml2.internal.DirectedRelationshipChange; -import org.eclipse.emf.compare.uml2.tests.AbstractUMLTest; 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.Test; @@ -84,14 +86,14 @@ public class AddSubstitutionTest extends AbstractUMLTest { private void testAB1(TestKind kind, final Comparison comparison) { final List<Diff> differences = comparison.getDifferences(); - // We should have no less and no more than 6 differences - assertSame(Integer.valueOf(6), Integer.valueOf(differences.size())); + // We should have no less and no more than 5 differences + // Was 6 with UML 4.0 but NamedElement::clientDependency has been made derived in UML 5.0 + assertEquals(5, differences.size()); Predicate<? super Diff> addInterfaceRealizationDescription = null; Predicate<? super Diff> addClientInInterfaceRealizationDescription = null; Predicate<? super Diff> addSupplierInInterfaceRealizationDescription = null; Predicate<? super Diff> addContractInInterfaceRealizationDescription = null; - Predicate<? super Diff> addClientDependencyInClass0Description = null; if (kind.equals(TestKind.DELETE)) { addInterfaceRealizationDescription = removedFromReference("model.Class0", "substitution", @@ -102,8 +104,6 @@ public class AddSubstitutionTest extends AbstractUMLTest { "supplier", "model.Class1"); addContractInInterfaceRealizationDescription = changedReference("model.Class0.Substitution0", "contract", "model.Class1", null); - addClientDependencyInClass0Description = removedFromReference("model.Class0", "clientDependency", - "model.Class0.Substitution0"); } else { addInterfaceRealizationDescription = addedToReference( "model.Class0", "substitution", "model.Class0.Substitution0"); //$NON-NLS-1$ @@ -113,8 +113,6 @@ public class AddSubstitutionTest extends AbstractUMLTest { "supplier", "model.Class1"); addContractInInterfaceRealizationDescription = changedReference("model.Class0.Substitution0", "contract", null, "model.Class1"); - addClientDependencyInClass0Description = addedToReference("model.Class0", "clientDependency", - "model.Class0.Substitution0"); } final Diff addInterfaceRealization = Iterators.find(differences.iterator(), @@ -125,14 +123,11 @@ public class AddSubstitutionTest extends AbstractUMLTest { addSupplierInInterfaceRealizationDescription); final Diff addContractInInterfaceRealization = Iterators.find(differences.iterator(), addContractInInterfaceRealizationDescription); - final Diff addClientDependencyInClass0 = Iterators.find(differences.iterator(), - addClientDependencyInClass0Description); assertNotNull(addInterfaceRealization); assertNotNull(addClientInInterfaceRealization); assertNotNull(addSupplierInInterfaceRealization); assertNotNull(addContractInInterfaceRealization); - assertNotNull(addClientDependencyInClass0); // CHECK EXTENSION assertSame(Integer.valueOf(1), count(differences, instanceOf(DirectedRelationshipChange.class))); @@ -145,12 +140,11 @@ public class AddSubstitutionTest extends AbstractUMLTest { instanceOf(DirectedRelationshipChange.class), ofKind(DifferenceKind.DELETE))); } assertNotNull(addUMLDependency); - assertSame(Integer.valueOf(5), Integer.valueOf(addUMLDependency.getRefinedBy().size())); + assertSame(Integer.valueOf(4), Integer.valueOf(addUMLDependency.getRefinedBy().size())); assertTrue(addUMLDependency.getRefinedBy().contains(addClientInInterfaceRealization)); assertTrue(addUMLDependency.getRefinedBy().contains(addSupplierInInterfaceRealization)); assertTrue(addUMLDependency.getRefinedBy().contains(addContractInInterfaceRealization)); assertTrue(addUMLDependency.getRefinedBy().contains(addInterfaceRealization)); - assertTrue(addUMLDependency.getRefinedBy().contains(addClientDependencyInClass0)); // CHECK REQUIREMENT if (kind.equals(TestKind.ADD)) { @@ -174,25 +168,17 @@ public class AddSubstitutionTest extends AbstractUMLTest { assertSame(Integer.valueOf(0), Integer.valueOf(addContractInInterfaceRealization.getRequires() .size())); - assertSame(Integer.valueOf(4), Integer.valueOf(addInterfaceRealization.getRequires().size())); + assertSame(Integer.valueOf(3), Integer.valueOf(addInterfaceRealization.getRequires().size())); assertTrue(addInterfaceRealization.getRequires().contains(addClientInInterfaceRealization)); assertTrue(addInterfaceRealization.getRequires().contains(addSupplierInInterfaceRealization)); assertTrue(addInterfaceRealization.getRequires().contains(addContractInInterfaceRealization)); - assertTrue(addInterfaceRealization.getRequires().contains(addClientDependencyInClass0)); assertSame(Integer.valueOf(0), Integer.valueOf(addUMLDependency.getRequires().size())); } // CHECK EQUIVALENCE - assertSame(Integer.valueOf(1), Integer.valueOf(comparison.getEquivalences().size())); - - assertNotNull(addClientInInterfaceRealization.getEquivalence()); - assertSame(Integer.valueOf(2), Integer.valueOf(addClientInInterfaceRealization.getEquivalence() - .getDifferences().size())); - assertTrue(addClientInInterfaceRealization.getEquivalence().getDifferences().contains( - addClientInInterfaceRealization)); - assertTrue(addClientInInterfaceRealization.getEquivalence().getDifferences().contains( - addClientDependencyInClass0)); + assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getEquivalences().size())); + assertNull(addClientInInterfaceRealization.getEquivalence()); testIntersections(comparison); } |