Refine the accurate differences for UML Diff extensions.

This will make association changes and interface realization changes to
refine the proper differences. Still needs to be done for the other UML
extensions.

We also now ignore the clientDependency changes.

All impacted tests were updated to reflect these changes.

6 files changed, 26 insertions, 116 deletions

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 5ccf4bb79..79b1df8aa 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
@@ -91,25 +91,20 @@ public class AddAbstractionTest extends AbstractTest {
 		final List<Diff> differences = comparison.getDifferences();

 

 		// We should have no less and no more than 5 differences

-		assertSame(Integer.valueOf(5), Integer.valueOf(differences.size()));

+		assertSame(Integer.valueOf(4), Integer.valueOf(differences.size()));

 

 		Predicate<? super Diff> addAbstractionDescription = null;

-		Predicate<? super Diff> addRefAbstractionInClass1Description = null;

 		Predicate<? super Diff> addRefClass1InAbstractionDescription = null;

 		Predicate<? super Diff> addRefClass0InAbstractionDescription = null;

 

 		if (kind.equals(TestKind.DELETE)) {

 			addAbstractionDescription = removed("model.Abstraction0"); //$NON-NLS-1$

-			addRefAbstractionInClass1Description = removedFromReference("model.Class1", "clientDependency",

-					"model.Abstraction0");

 			addRefClass1InAbstractionDescription = removedFromReference("model.Abstraction0", "client",

 					"model.Class1");

 			addRefClass0InAbstractionDescription = removedFromReference("model.Abstraction0", "supplier",

 					"model.Class0");

 		} else {

 			addAbstractionDescription = added("model.Abstraction0"); //$NON-NLS-1$

-			addRefAbstractionInClass1Description = addedToReference("model.Class1", "clientDependency",

-					"model.Abstraction0");

 			addRefClass1InAbstractionDescription = addedToReference("model.Abstraction0", "client",

 					"model.Class1");

 			addRefClass0InAbstractionDescription = addedToReference("model.Abstraction0", "supplier",

@@ -117,15 +112,12 @@ public class AddAbstractionTest extends AbstractTest {
 		}

 

 		final Diff addAbstraction = Iterators.find(differences.iterator(), addAbstractionDescription);

-		final Diff addRefAbstractionInClass1 = Iterators.find(differences.iterator(),

-				addRefAbstractionInClass1Description);

 		final Diff addRefClass1InAbstraction = Iterators.find(differences.iterator(),

 				addRefClass1InAbstractionDescription);

 		final Diff addRefClass0InAbstraction = Iterators.find(differences.iterator(),

 				addRefClass0InAbstractionDescription);

 

 		assertNotNull(addAbstraction);

-		assertNotNull(addRefAbstractionInClass1);

 		assertNotNull(addRefClass1InAbstraction);

 		assertNotNull(addRefClass0InAbstraction);

 

@@ -155,9 +147,6 @@ public class AddAbstractionTest extends AbstractTest {
 			assertSame(Integer.valueOf(1), Integer.valueOf(addRefClass0InAbstraction.getRequires().size()));

 			assertTrue(addRefClass0InAbstraction.getRequires().contains(addAbstraction));

 

-			assertSame(Integer.valueOf(1), Integer.valueOf(addRefAbstractionInClass1.getRequires().size()));

-			assertTrue(addRefAbstractionInClass1.getRequires().contains(addAbstraction));

-

 			assertSame(Integer.valueOf(0), Integer.valueOf(addAbstraction.getRequires().size()));

 			assertSame(Integer.valueOf(0), Integer.valueOf(addUMLDependency.getRequires().size()));

 		} else {

@@ -165,12 +154,9 @@ public class AddAbstractionTest extends AbstractTest {
 

 			assertSame(Integer.valueOf(0), Integer.valueOf(addRefClass0InAbstraction.getRequires().size()));

 

-			assertSame(Integer.valueOf(0), Integer.valueOf(addRefAbstractionInClass1.getRequires().size()));

-

-			assertSame(Integer.valueOf(3), Integer.valueOf(addAbstraction.getRequires().size()));

+			assertSame(Integer.valueOf(2), Integer.valueOf(addAbstraction.getRequires().size()));

 			assertTrue(addAbstraction.getRequires().contains(addRefClass1InAbstraction));

 			assertTrue(addAbstraction.getRequires().contains(addRefClass0InAbstraction));

-			assertTrue(addAbstraction.getRequires().contains(addRefAbstractionInClass1));

 

 			assertSame(Integer.valueOf(0), Integer.valueOf(addUMLDependency.getRequires().size()));

 		}

@@ -178,11 +164,10 @@ public class AddAbstractionTest extends AbstractTest {
 		// CHECK EQUIVALENCE

 		assertSame(Integer.valueOf(1), Integer.valueOf(comparison.getEquivalences().size()));

 

+		// opposite of an ignored reference

 		assertNotNull(addRefClass1InAbstraction.getEquivalence());

-		assertSame(Integer.valueOf(2), Integer.valueOf(addRefClass1InAbstraction.getEquivalence()

+		assertSame(Integer.valueOf(1), Integer.valueOf(addRefClass1InAbstraction.getEquivalence()

 				.getDifferences().size()));

-		assertTrue(addRefClass1InAbstraction.getEquivalence().getDifferences().contains(

-				addRefAbstractionInClass1));

 

 	}

 

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 768efe1cd..74524bced 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
@@ -90,25 +90,20 @@ public class AddDependencyTest extends AbstractTest {
 		final List<Diff> differences = comparison.getDifferences();

 

 		// We should have no less and no more than 5 differences

-		assertSame(Integer.valueOf(5), Integer.valueOf(differences.size()));

+		assertSame(Integer.valueOf(4), Integer.valueOf(differences.size()));

 

 		Predicate<? super Diff> addDependencyDescription = null;

-		Predicate<? super Diff> addRefDependencyInClass0Description = null;

 		Predicate<? super Diff> addRefClass1InDependencyDescription = null;

 		Predicate<? super Diff> addRefClass0InDependencyDescription = null;

 

 		if (kind.equals(TestKind.DELETE)) {

 			addDependencyDescription = removed("model.Dependency0"); //$NON-NLS-1$

-			addRefDependencyInClass0Description = removedFromReference("model.Class0", "clientDependency",

-					"model.Dependency0");

 			addRefClass0InDependencyDescription = removedFromReference("model.Dependency0", "client",

 					"model.Class0");

 			addRefClass1InDependencyDescription = removedFromReference("model.Dependency0", "supplier",

 					"model.Class1");

 		} else {

 			addDependencyDescription = added("model.Dependency0"); //$NON-NLS-1$

-			addRefDependencyInClass0Description = addedToReference("model.Class0", "clientDependency",

-					"model.Dependency0");

 			addRefClass0InDependencyDescription = addedToReference("model.Dependency0", "client",

 					"model.Class0");

 			addRefClass1InDependencyDescription = addedToReference("model.Dependency0", "supplier",

@@ -116,15 +111,12 @@ public class AddDependencyTest extends AbstractTest {
 		}

 

 		final Diff addDependency = Iterators.find(differences.iterator(), addDependencyDescription);

-		final Diff addRefDependencyInClass0 = Iterators.find(differences.iterator(),

-				addRefDependencyInClass0Description);

 		final Diff addRefClass0InDependency = Iterators.find(differences.iterator(),

 				addRefClass0InDependencyDescription);

 		final Diff addRefClass1InDependency = Iterators.find(differences.iterator(),

 				addRefClass1InDependencyDescription);

 

 		assertNotNull(addDependency);

-		assertNotNull(addRefDependencyInClass0);

 		assertNotNull(addRefClass0InDependency);

 		assertNotNull(addRefClass1InDependency);

 

@@ -154,9 +146,6 @@ public class AddDependencyTest extends AbstractTest {
 			assertSame(Integer.valueOf(1), Integer.valueOf(addRefClass1InDependency.getRequires().size()));

 			assertTrue(addRefClass1InDependency.getRequires().contains(addDependency));

 

-			assertSame(Integer.valueOf(1), Integer.valueOf(addRefDependencyInClass0.getRequires().size()));

-			assertTrue(addRefDependencyInClass0.getRequires().contains(addDependency));

-

 			assertSame(Integer.valueOf(0), Integer.valueOf(addDependency.getRequires().size()));

 			assertSame(Integer.valueOf(0), Integer.valueOf(addUMLDependency.getRequires().size()));

 		} else {

@@ -164,12 +153,9 @@ public class AddDependencyTest extends AbstractTest {
 

 			assertSame(Integer.valueOf(0), Integer.valueOf(addRefClass1InDependency.getRequires().size()));

 

-			assertSame(Integer.valueOf(0), Integer.valueOf(addRefDependencyInClass0.getRequires().size()));

-

-			assertSame(Integer.valueOf(3), Integer.valueOf(addDependency.getRequires().size()));

+			assertSame(Integer.valueOf(2), Integer.valueOf(addDependency.getRequires().size()));

 			assertTrue(addDependency.getRequires().contains(addRefClass0InDependency));

 			assertTrue(addDependency.getRequires().contains(addRefClass1InDependency));

-			assertTrue(addDependency.getRequires().contains(addRefDependencyInClass0));

 

 			assertSame(Integer.valueOf(0), Integer.valueOf(addUMLDependency.getRequires().size()));

 		}

@@ -177,11 +163,10 @@ public class AddDependencyTest extends AbstractTest {
 		// CHECK EQUIVALENCE

 		assertSame(Integer.valueOf(1), Integer.valueOf(comparison.getEquivalences().size()));

 

+		// This one is an eopposite of an ignored reference (a subset-superset...)

 		assertNotNull(addRefClass0InDependency.getEquivalence());

-		assertSame(Integer.valueOf(2), Integer.valueOf(addRefClass0InDependency.getEquivalence()

+		assertSame(Integer.valueOf(1), Integer.valueOf(addRefClass0InDependency.getEquivalence()

 				.getDifferences().size()));

-		assertTrue(addRefClass0InDependency.getEquivalence().getDifferences().contains(

-				addRefDependencyInClass0));

 

 	}

 

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 f380588fb..ae1dfd13a 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
@@ -89,10 +89,9 @@ public class AddInterfaceRealizationTest extends AbstractTest {
 		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()));

+		assertSame(Integer.valueOf(5), Integer.valueOf(differences.size()));

 

 		Predicate<? super Diff> addInterfaceRealizationDescription = null;

-		Predicate<? super Diff> addClientDependencyInClass0Description = null;

 		Predicate<? super Diff> addClientInInterfaceRealizationDescription = null;

 		Predicate<? super Diff> addSupplierInInterfaceRealizationDescription = null;

 		Predicate<? super Diff> addContractInInterfaceRealizationDescription = null;

@@ -101,8 +100,6 @@ public class AddInterfaceRealizationTest extends AbstractTest {
 			//addInterfaceRealizationDescription = removed("model.Class0.InterfaceRealization0"); //$NON-NLS-1$

 			addInterfaceRealizationDescription = removedFromReference("model.Class0", "interfaceRealization",

 					"model.Class0.InterfaceRealization0");

-			addClientDependencyInClass0Description = removedFromReference("model.Class0", "clientDependency",

-					"model.Class0.InterfaceRealization0");

 			addClientInInterfaceRealizationDescription = removedFromReference(

 					"model.Class0.InterfaceRealization0", "client", "model.Class0");

 			addSupplierInInterfaceRealizationDescription = removedFromReference(

@@ -113,8 +110,6 @@ public class AddInterfaceRealizationTest extends AbstractTest {
 			//addInterfaceRealizationDescription = added("model.Class0.InterfaceRealization0"); //$NON-NLS-1$

 			addInterfaceRealizationDescription = addedToReference(

 					"model.Class0", "interfaceRealization", "model.Class0.InterfaceRealization0"); //$NON-NLS-1$

-			addClientDependencyInClass0Description = addedToReference("model.Class0", "clientDependency",

-					"model.Class0.InterfaceRealization0");

 			addClientInInterfaceRealizationDescription = addedToReference(

 					"model.Class0.InterfaceRealization0", "client", "model.Class0");

 			addSupplierInInterfaceRealizationDescription = addedToReference(

@@ -125,8 +120,6 @@ public class AddInterfaceRealizationTest extends AbstractTest {
 

 		final Diff addInterfaceRealization = Iterators.find(differences.iterator(),

 				addInterfaceRealizationDescription);

-		final Diff addClientDependencyInClass0 = Iterators.find(differences.iterator(),

-				addClientDependencyInClass0Description);

 		final Diff addClientInInterfaceRealization = Iterators.find(differences.iterator(),

 				addClientInInterfaceRealizationDescription);

 		final Diff addSupplierInInterfaceRealization = Iterators.find(differences.iterator(),

@@ -135,7 +128,6 @@ public class AddInterfaceRealizationTest extends AbstractTest {
 				addContractInInterfaceRealizationDescription);

 

 		assertNotNull(addInterfaceRealization);

-		assertNotNull(addClientDependencyInClass0);

 		assertNotNull(addClientInInterfaceRealization);

 		assertNotNull(addSupplierInInterfaceRealization);

 		assertNotNull(addContractInInterfaceRealization);

@@ -147,7 +139,8 @@ public class AddInterfaceRealizationTest extends AbstractTest {
 			addUMLDependency = Iterators.find(differences.iterator(), and(

 					instanceOf(InterfaceRealizationChange.class), ofKind(DifferenceKind.ADD)));

 			assertNotNull(addUMLDependency);

-			assertSame(Integer.valueOf(3), Integer.valueOf(addUMLDependency.getRefinedBy().size()));

+			assertSame(Integer.valueOf(4), Integer.valueOf(addUMLDependency.getRefinedBy().size()));

+			assertTrue(addUMLDependency.getRefinedBy().contains(addInterfaceRealization));

 			assertTrue(addUMLDependency.getRefinedBy().contains(addClientInInterfaceRealization));

 			assertTrue(addUMLDependency.getRefinedBy().contains(addSupplierInInterfaceRealization));

 			assertTrue(addUMLDependency.getRefinedBy().contains(addContractInInterfaceRealization));

@@ -171,9 +164,6 @@ public class AddInterfaceRealizationTest extends AbstractTest {
 					.size()));

 			assertTrue(addContractInInterfaceRealization.getRequires().contains(addInterfaceRealization));

 

-			assertSame(Integer.valueOf(1), Integer.valueOf(addClientDependencyInClass0.getRequires().size()));

-			assertTrue(addClientDependencyInClass0.getRequires().contains(addInterfaceRealization));

-

 			assertSame(Integer.valueOf(0), Integer.valueOf(addInterfaceRealization.getRequires().size()));

 			assertSame(Integer.valueOf(0), Integer.valueOf(addUMLDependency.getRequires().size()));

 		} else {

@@ -183,13 +173,11 @@ public class AddInterfaceRealizationTest extends AbstractTest {
 					.size()));

 			assertSame(Integer.valueOf(0), Integer.valueOf(addContractInInterfaceRealization.getRequires()

 					.size()));

-			assertSame(Integer.valueOf(0), Integer.valueOf(addClientDependencyInClass0.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()));

 		}

@@ -198,12 +186,11 @@ public class AddInterfaceRealizationTest extends AbstractTest {
 		assertSame(Integer.valueOf(1), Integer.valueOf(comparison.getEquivalences().size()));

 

 		assertNotNull(addClientInInterfaceRealization.getEquivalence());

-		assertSame(Integer.valueOf(2), Integer.valueOf(addClientInInterfaceRealization.getEquivalence()

+		// This one is an opposite of an ignored reference, thus the "1"

+		assertSame(Integer.valueOf(1), Integer.valueOf(addClientInInterfaceRealization.getEquivalence()

 				.getDifferences().size()));

 		assertTrue(addClientInInterfaceRealization.getEquivalence().getDifferences().contains(

 				addClientInInterfaceRealization));

-		assertTrue(addClientInInterfaceRealization.getEquivalence().getDifferences().contains(

-				addClientDependencyInClass0));

 

 	}

 

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 84cc9edd5..0371385e2 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
@@ -91,25 +91,20 @@ public class AddRealizationTest extends AbstractTest {
 		final List<Diff> differences = comparison.getDifferences();

 

 		// We should have no less and no more than 5 differences

-		assertSame(Integer.valueOf(5), Integer.valueOf(differences.size()));

+		assertSame(Integer.valueOf(4), Integer.valueOf(differences.size()));

 

 		Predicate<? super Diff> addRealizationDescription = null;

-		Predicate<? super Diff> addRefRealizationInClass0Description = null;

 		Predicate<? super Diff> addRefClass1InRealizationDescription = null;

 		Predicate<? super Diff> addRefClass0InRealizationDescription = null;

 

 		if (kind.equals(TestKind.DELETE)) {

 			addRealizationDescription = removed("model.Realization0"); //$NON-NLS-1$

-			addRefRealizationInClass0Description = removedFromReference("model.Class0", "clientDependency",

-					"model.Realization0");

 			addRefClass0InRealizationDescription = removedFromReference("model.Realization0", "client",

 					"model.Class0");

 			addRefClass1InRealizationDescription = removedFromReference("model.Realization0", "supplier",

 					"model.Class1");

 		} else {

 			addRealizationDescription = added("model.Realization0"); //$NON-NLS-1$

-			addRefRealizationInClass0Description = addedToReference("model.Class0", "clientDependency",

-					"model.Realization0");

 			addRefClass0InRealizationDescription = addedToReference("model.Realization0", "client",

 					"model.Class0");

 			addRefClass1InRealizationDescription = addedToReference("model.Realization0", "supplier",

@@ -117,15 +112,12 @@ public class AddRealizationTest extends AbstractTest {
 		}

 

 		final Diff addDependency = Iterators.find(differences.iterator(), addRealizationDescription);

-		final Diff addRefDependencyInClass0 = Iterators.find(differences.iterator(),

-				addRefRealizationInClass0Description);

 		final Diff addRefClass0InDependency = Iterators.find(differences.iterator(),

 				addRefClass0InRealizationDescription);

 		final Diff addRefClass1InDependency = Iterators.find(differences.iterator(),

 				addRefClass1InRealizationDescription);

 

 		assertNotNull(addDependency);

-		assertNotNull(addRefDependencyInClass0);

 		assertNotNull(addRefClass0InDependency);

 		assertNotNull(addRefClass1InDependency);

 

@@ -155,9 +147,6 @@ public class AddRealizationTest extends AbstractTest {
 			assertSame(Integer.valueOf(1), Integer.valueOf(addRefClass1InDependency.getRequires().size()));

 			assertTrue(addRefClass1InDependency.getRequires().contains(addDependency));

 

-			assertSame(Integer.valueOf(1), Integer.valueOf(addRefDependencyInClass0.getRequires().size()));

-			assertTrue(addRefDependencyInClass0.getRequires().contains(addDependency));

-

 			assertSame(Integer.valueOf(0), Integer.valueOf(addDependency.getRequires().size()));

 			assertSame(Integer.valueOf(0), Integer.valueOf(addUMLDependency.getRequires().size()));

 		} else {

@@ -165,12 +154,9 @@ public class AddRealizationTest extends AbstractTest {
 

 			assertSame(Integer.valueOf(0), Integer.valueOf(addRefClass1InDependency.getRequires().size()));

 

-			assertSame(Integer.valueOf(0), Integer.valueOf(addRefDependencyInClass0.getRequires().size()));

-

-			assertSame(Integer.valueOf(3), Integer.valueOf(addDependency.getRequires().size()));

+			assertSame(Integer.valueOf(2), Integer.valueOf(addDependency.getRequires().size()));

 			assertTrue(addDependency.getRequires().contains(addRefClass0InDependency));

 			assertTrue(addDependency.getRequires().contains(addRefClass1InDependency));

-			assertTrue(addDependency.getRequires().contains(addRefDependencyInClass0));

 

 			assertSame(Integer.valueOf(0), Integer.valueOf(addUMLDependency.getRequires().size()));

 		}

@@ -178,12 +164,10 @@ public class AddRealizationTest extends AbstractTest {
 		// CHECK EQUIVALENCE

 		assertSame(Integer.valueOf(1), Integer.valueOf(comparison.getEquivalences().size()));

 

+		// Opposite of an ignored reference

 		assertNotNull(addRefClass0InDependency.getEquivalence());

-		assertSame(Integer.valueOf(2), Integer.valueOf(addRefClass0InDependency.getEquivalence()

+		assertSame(Integer.valueOf(1), Integer.valueOf(addRefClass0InDependency.getEquivalence()

 				.getDifferences().size()));

-		assertTrue(addRefClass0InDependency.getEquivalence().getDifferences().contains(

-				addRefDependencyInClass0));

-

 	}

 

 	@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 4d3c04921..8111b2345 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
@@ -91,10 +91,9 @@ public class AddSubstitutionTest extends AbstractTest {
 		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()));

+		assertSame(Integer.valueOf(5), Integer.valueOf(differences.size()));

 

 		Predicate<? super Diff> addInterfaceRealizationDescription = null;

-		Predicate<? super Diff> addClientDependencyInClass0Description = null;

 		Predicate<? super Diff> addClientInInterfaceRealizationDescription = null;

 		Predicate<? super Diff> addSupplierInInterfaceRealizationDescription = null;

 		Predicate<? super Diff> addContractInInterfaceRealizationDescription = null;

@@ -103,8 +102,6 @@ public class AddSubstitutionTest extends AbstractTest {
 			//addInterfaceRealizationDescription = removed("model.Class0.Substitution0"); //$NON-NLS-1$

 			addInterfaceRealizationDescription = removedFromReference("model.Class0", "substitution",

 					"model.Class0.Substitution0");

-			addClientDependencyInClass0Description = removedFromReference("model.Class0", "clientDependency",

-					"model.Class0.Substitution0");

 			addClientInInterfaceRealizationDescription = removedFromReference("model.Class0.Substitution0",

 					"client", "model.Class0");

 			addSupplierInInterfaceRealizationDescription = removedFromReference("model.Class0.Substitution0",

@@ -115,8 +112,6 @@ public class AddSubstitutionTest extends AbstractTest {
 			//addInterfaceRealizationDescription = added("model.Class0.Substitution0"); //$NON-NLS-1$

 			addInterfaceRealizationDescription = addedToReference(

 					"model.Class0", "substitution", "model.Class0.Substitution0"); //$NON-NLS-1$

-			addClientDependencyInClass0Description = addedToReference("model.Class0", "clientDependency",

-					"model.Class0.Substitution0");

 			addClientInInterfaceRealizationDescription = addedToReference("model.Class0.Substitution0",

 					"client", "model.Class0");

 			addSupplierInInterfaceRealizationDescription = addedToReference("model.Class0.Substitution0",

@@ -127,8 +122,6 @@ public class AddSubstitutionTest extends AbstractTest {
 

 		final Diff addInterfaceRealization = Iterators.find(differences.iterator(),

 				addInterfaceRealizationDescription);

-		final Diff addClientDependencyInClass0 = Iterators.find(differences.iterator(),

-				addClientDependencyInClass0Description);

 		final Diff addClientInInterfaceRealization = Iterators.find(differences.iterator(),

 				addClientInInterfaceRealizationDescription);

 		final Diff addSupplierInInterfaceRealization = Iterators.find(differences.iterator(),

@@ -137,7 +130,6 @@ public class AddSubstitutionTest extends AbstractTest {
 				addContractInInterfaceRealizationDescription);

 

 		assertNotNull(addInterfaceRealization);

-		assertNotNull(addClientDependencyInClass0);

 		assertNotNull(addClientInInterfaceRealization);

 		assertNotNull(addSupplierInInterfaceRealization);

 		assertNotNull(addContractInInterfaceRealization);

@@ -173,9 +165,6 @@ public class AddSubstitutionTest extends AbstractTest {
 					.size()));

 			assertTrue(addContractInInterfaceRealization.getRequires().contains(addInterfaceRealization));

 

-			assertSame(Integer.valueOf(1), Integer.valueOf(addClientDependencyInClass0.getRequires().size()));

-			assertTrue(addClientDependencyInClass0.getRequires().contains(addInterfaceRealization));

-

 			assertSame(Integer.valueOf(0), Integer.valueOf(addInterfaceRealization.getRequires().size()));

 			assertSame(Integer.valueOf(0), Integer.valueOf(addUMLDependency.getRequires().size()));

 		} else {

@@ -185,13 +174,11 @@ public class AddSubstitutionTest extends AbstractTest {
 					.size()));

 			assertSame(Integer.valueOf(0), Integer.valueOf(addContractInInterfaceRealization.getRequires()

 					.size()));

-			assertSame(Integer.valueOf(0), Integer.valueOf(addClientDependencyInClass0.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()));

 		}

@@ -199,14 +186,12 @@ public class AddSubstitutionTest extends AbstractTest {
 		// CHECK EQUIVALENCE

 		assertSame(Integer.valueOf(1), Integer.valueOf(comparison.getEquivalences().size()));

 

+		// Opposite of an ignored

 		assertNotNull(addClientInInterfaceRealization.getEquivalence());

-		assertSame(Integer.valueOf(2), Integer.valueOf(addClientInInterfaceRealization.getEquivalence()

+		assertSame(Integer.valueOf(1), Integer.valueOf(addClientInInterfaceRealization.getEquivalence()

 				.getDifferences().size()));

 		assertTrue(addClientInInterfaceRealization.getEquivalence().getDifferences().contains(

 				addClientInInterfaceRealization));

-		assertTrue(addClientInInterfaceRealization.getEquivalence().getDifferences().contains(

-				addClientDependencyInClass0));

-

 	}

 

 	@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 82ad2b6f4..c7eccbd12 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
@@ -91,39 +91,31 @@ public class AddUsageTest extends AbstractTest {
 		final List<Diff> differences = comparison.getDifferences();

 

 		// We should have no less and no more than 5 differences

-		assertSame(Integer.valueOf(5), Integer.valueOf(differences.size()));

+		assertSame(Integer.valueOf(4), Integer.valueOf(differences.size()));

 

 		Predicate<? super Diff> addDependencyDescription = null;

-		Predicate<? super Diff> addRefDependencyInClass0Description = null;

 		Predicate<? super Diff> addRefClass1InDependencyDescription = null;

 		Predicate<? super Diff> addRefClass0InDependencyDescription = null;

 

 		if (kind.equals(TestKind.DELETE)) {

 			addDependencyDescription = removed("model.Usage0"); //$NON-NLS-1$

-			addRefDependencyInClass0Description = removedFromReference("model.Class0", "clientDependency",

-					"model.Usage0");

 			addRefClass0InDependencyDescription = removedFromReference("model.Usage0", "client",

 					"model.Class0");

 			addRefClass1InDependencyDescription = removedFromReference("model.Usage0", "supplier",

 					"model.Class1");

 		} else {

 			addDependencyDescription = added("model.Usage0"); //$NON-NLS-1$

-			addRefDependencyInClass0Description = addedToReference("model.Class0", "clientDependency",

-					"model.Usage0");

 			addRefClass0InDependencyDescription = addedToReference("model.Usage0", "client", "model.Class0");

 			addRefClass1InDependencyDescription = addedToReference("model.Usage0", "supplier", "model.Class1");

 		}

 

 		final Diff addDependency = Iterators.find(differences.iterator(), addDependencyDescription);

-		final Diff addRefDependencyInClass0 = Iterators.find(differences.iterator(),

-				addRefDependencyInClass0Description);

 		final Diff addRefClass0InDependency = Iterators.find(differences.iterator(),

 				addRefClass0InDependencyDescription);

 		final Diff addRefClass1InDependency = Iterators.find(differences.iterator(),

 				addRefClass1InDependencyDescription);

 

 		assertNotNull(addDependency);

-		assertNotNull(addRefDependencyInClass0);

 		assertNotNull(addRefClass0InDependency);

 		assertNotNull(addRefClass1InDependency);

 

@@ -153,9 +145,6 @@ public class AddUsageTest extends AbstractTest {
 			assertSame(Integer.valueOf(1), Integer.valueOf(addRefClass1InDependency.getRequires().size()));

 			assertTrue(addRefClass1InDependency.getRequires().contains(addDependency));

 

-			assertSame(Integer.valueOf(1), Integer.valueOf(addRefDependencyInClass0.getRequires().size()));

-			assertTrue(addRefDependencyInClass0.getRequires().contains(addDependency));

-

 			assertSame(Integer.valueOf(0), Integer.valueOf(addDependency.getRequires().size()));

 			assertSame(Integer.valueOf(0), Integer.valueOf(addUMLDependency.getRequires().size()));

 		} else {

@@ -163,12 +152,9 @@ public class AddUsageTest extends AbstractTest {
 

 			assertSame(Integer.valueOf(0), Integer.valueOf(addRefClass1InDependency.getRequires().size()));

 

-			assertSame(Integer.valueOf(0), Integer.valueOf(addRefDependencyInClass0.getRequires().size()));

-

-			assertSame(Integer.valueOf(3), Integer.valueOf(addDependency.getRequires().size()));

+			assertSame(Integer.valueOf(2), Integer.valueOf(addDependency.getRequires().size()));

 			assertTrue(addDependency.getRequires().contains(addRefClass0InDependency));

 			assertTrue(addDependency.getRequires().contains(addRefClass1InDependency));

-			assertTrue(addDependency.getRequires().contains(addRefDependencyInClass0));

 

 			assertSame(Integer.valueOf(0), Integer.valueOf(addUMLDependency.getRequires().size()));

 		}

@@ -176,12 +162,10 @@ public class AddUsageTest extends AbstractTest {
 		// CHECK EQUIVALENCE

 		assertSame(Integer.valueOf(1), Integer.valueOf(comparison.getEquivalences().size()));

 

+		// Opposite of an ignored reference

 		assertNotNull(addRefClass0InDependency.getEquivalence());

-		assertSame(Integer.valueOf(2), Integer.valueOf(addRefClass0InDependency.getEquivalence()

+		assertSame(Integer.valueOf(1), Integer.valueOf(addRefClass0InDependency.getEquivalence()

 				.getDifferences().size()));

-		assertTrue(addRefClass0InDependency.getEquivalence().getDifferences().contains(

-				addRefDependencyInClass0));

-

 	}

 

 	@Override