Fixing tests

4 files changed, 123 insertions, 51 deletions

diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/equi/EquiComputingTest.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/equi/EquiComputingTest.java
index b63958866..c8f5137cd 100644
--- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/equi/EquiComputingTest.java
+++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/equi/EquiComputingTest.java
@@ -478,7 +478,7 @@ public class EquiComputingTest {
 		final Resource left = input.getA1Left();

 		final Resource right = input.getA1Right();

 

-		final IComparisonScope scope = EMFCompare.createDefaultScope(left, right);

+		final IComparisonScope scope = EMFCompare.createDefaultScope(right, left);

 		Comparison comparison = EMFCompare.newComparator(scope).compare();

 

 		testA1(TestKind.RIGHT, comparison);

@@ -489,7 +489,7 @@ public class EquiComputingTest {
 		final Resource left = input.getA2Left();

 		final Resource right = input.getA2Right();

 

-		final IComparisonScope scope = EMFCompare.createDefaultScope(left, right);

+		final IComparisonScope scope = EMFCompare.createDefaultScope(right, left);

 		Comparison comparison = EMFCompare.newComparator(scope).compare();

 

 		testA2(TestKind.RIGHT, comparison);

@@ -500,7 +500,7 @@ public class EquiComputingTest {
 		final Resource left = input.getA3Left();

 		final Resource right = input.getA3Right();

 

-		final IComparisonScope scope = EMFCompare.createDefaultScope(left, right);

+		final IComparisonScope scope = EMFCompare.createDefaultScope(right, left);

 		Comparison comparison = EMFCompare.newComparator(scope).compare();

 

 		testA3(TestKind.RIGHT, comparison);

@@ -511,7 +511,7 @@ public class EquiComputingTest {
 		final Resource left = input.getA4Left();

 		final Resource right = input.getA4Right();

 

-		final IComparisonScope scope = EMFCompare.createDefaultScope(left, right);

+		final IComparisonScope scope = EMFCompare.createDefaultScope(right, left);

 		Comparison comparison = EMFCompare.newComparator(scope).compare();

 

 		testA4(TestKind.RIGHT, comparison);

@@ -522,7 +522,7 @@ public class EquiComputingTest {
 		final Resource left = input.getA5Left();

 		final Resource right = input.getA5Right();

 

-		final IComparisonScope scope = EMFCompare.createDefaultScope(left, right);

+		final IComparisonScope scope = EMFCompare.createDefaultScope(right, left);

 		Comparison comparison = EMFCompare.newComparator(scope).compare();

 

 		testA5(TestKind.RIGHT, comparison);

diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/IndividualMergeOutOfScopeValuesTest.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/IndividualMergeOutOfScopeValuesTest.java
index 42c841e3a..dc7994a2d 100644
--- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/IndividualMergeOutOfScopeValuesTest.java
+++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/IndividualMergeOutOfScopeValuesTest.java
@@ -131,7 +131,7 @@ public class IndividualMergeOutOfScopeValuesTest {
 		final Resource right = input.getReferenceMonoChangeRightOutOfScope();

 		final Resource origin = input.getReferenceMonoChangeOriginOutOfScope();

 

-		final IComparisonScope scope = EMFCompare.createDefaultScope(left, right, origin);

+		IComparisonScope scope = EMFCompare.createDefaultScope(left, right, origin);

 		Comparison comparison = EMFCompare.newComparator(scope).compare();

 

 		final List<Diff> differences = comparison.getDifferences();

@@ -173,6 +173,8 @@ public class IndividualMergeOutOfScopeValuesTest {
 		assertFalse(((InternalEObject)leftValue).eProxyURI().equals(

 				((InternalEObject)originValue).eProxyURI()));

 

+		// We should have no difference between left and right ... though they might be different from origin

+		scope = EMFCompare.createDefaultScope(left, right);

 		comparison = EMFCompare.newComparator(scope).compare();

 		assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size()));

 	}

@@ -287,7 +289,7 @@ public class IndividualMergeOutOfScopeValuesTest {
 		final Resource right = input.getReferenceMonoChangeLeftOutOfScope();

 		final Resource origin = input.getReferenceMonoChangeOriginOutOfScope();

 

-		final IComparisonScope scope = EMFCompare.createDefaultScope(left, right, origin);

+		IComparisonScope scope = EMFCompare.createDefaultScope(left, right, origin);

 		Comparison comparison = EMFCompare.newComparator(scope).compare();

 

 		final List<Diff> differences = comparison.getDifferences();

@@ -329,6 +331,8 @@ public class IndividualMergeOutOfScopeValuesTest {
 		assertFalse(((InternalEObject)leftValue).eProxyURI().equals(

 				((InternalEObject)originValue).eProxyURI()));

 

+		// We should have no difference between left and right ... though they might be different from origin

+		scope = EMFCompare.createDefaultScope(left, right);

 		comparison = EMFCompare.newComparator(scope).compare();

 		assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size()));

 	}

@@ -423,7 +427,7 @@ public class IndividualMergeOutOfScopeValuesTest {
 		final Resource right = input.getReferenceMonoSetRightOutOfScope();

 		final Resource origin = input.getReferenceMonoSetOriginOutOfScope();

 

-		final IComparisonScope scope = EMFCompare.createDefaultScope(left, right, origin);

+		IComparisonScope scope = EMFCompare.createDefaultScope(left, right, origin);

 		Comparison comparison = EMFCompare.newComparator(scope).compare();

 

 		final List<Diff> differences = comparison.getDifferences();

@@ -461,6 +465,8 @@ public class IndividualMergeOutOfScopeValuesTest {
 

 		assertEquals(((InternalEObject)leftValue).eProxyURI(), ((InternalEObject)rightValue).eProxyURI());

 

+		// We should have no difference between left and right ... though they might be different from origin

+		scope = EMFCompare.createDefaultScope(left, right);

 		comparison = EMFCompare.newComparator(scope).compare();

 		assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size()));

 	}

@@ -565,7 +571,7 @@ public class IndividualMergeOutOfScopeValuesTest {
 		final Resource right = input.getReferenceMonoSetLeftOutOfScope();

 		final Resource origin = input.getReferenceMonoSetOriginOutOfScope();

 

-		final IComparisonScope scope = EMFCompare.createDefaultScope(left, right, origin);

+		IComparisonScope scope = EMFCompare.createDefaultScope(left, right, origin);

 		Comparison comparison = EMFCompare.newComparator(scope).compare();

 

 		final List<Diff> differences = comparison.getDifferences();

@@ -603,6 +609,8 @@ public class IndividualMergeOutOfScopeValuesTest {
 

 		assertEquals(((InternalEObject)leftValue).eProxyURI(), ((InternalEObject)rightValue).eProxyURI());

 

+		// We should have no difference between left and right ... though they might be different from origin

+		scope = EMFCompare.createDefaultScope(left, right);

 		comparison = EMFCompare.newComparator(scope).compare();

 		assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size()));

 	}

@@ -697,7 +705,7 @@ public class IndividualMergeOutOfScopeValuesTest {
 		final Resource right = input.getReferenceMonoUnsetRightOutOfScope();

 		final Resource origin = input.getReferenceMonoUnsetOriginOutOfScope();

 

-		final IComparisonScope scope = EMFCompare.createDefaultScope(left, right, origin);

+		IComparisonScope scope = EMFCompare.createDefaultScope(left, right, origin);

 		Comparison comparison = EMFCompare.newComparator(scope).compare();

 

 		final List<Diff> differences = comparison.getDifferences();

@@ -733,6 +741,8 @@ public class IndividualMergeOutOfScopeValuesTest {
 		assertNull(rightValue);

 		assertTrue(originValue.eIsProxy());

 

+		// We should have no difference between left and right ... though they might be different from origin

+		scope = EMFCompare.createDefaultScope(left, right);

 		comparison = EMFCompare.newComparator(scope).compare();

 		assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size()));

 	}

@@ -841,7 +851,7 @@ public class IndividualMergeOutOfScopeValuesTest {
 		final Resource right = input.getReferenceMonoUnsetLeftOutOfScope();

 		final Resource origin = input.getReferenceMonoUnsetOriginOutOfScope();

 

-		final IComparisonScope scope = EMFCompare.createDefaultScope(left, right, origin);

+		IComparisonScope scope = EMFCompare.createDefaultScope(left, right, origin);

 		Comparison comparison = EMFCompare.newComparator(scope).compare();

 

 		final List<Diff> differences = comparison.getDifferences();

@@ -877,6 +887,8 @@ public class IndividualMergeOutOfScopeValuesTest {
 		assertNull(rightValue);

 		assertTrue(originValue.eIsProxy());

 

+		// We should have no difference between left and right ... though they might be different from origin

+		scope = EMFCompare.createDefaultScope(left, right);

 		comparison = EMFCompare.newComparator(scope).compare();

 		assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size()));

 	}

@@ -1006,7 +1018,7 @@ public class IndividualMergeOutOfScopeValuesTest {
 		final Resource right = input.getReferenceMultiAddRightOutOfScope();

 		final Resource origin = input.getReferenceMultiAddOriginOutOfScope();

 

-		final IComparisonScope scope = EMFCompare.createDefaultScope(left, right, origin);

+		IComparisonScope scope = EMFCompare.createDefaultScope(left, right, origin);

 		Comparison comparison = EMFCompare.newComparator(scope).compare();

 

 		final List<Diff> differences = comparison.getDifferences();

@@ -1069,6 +1081,8 @@ public class IndividualMergeOutOfScopeValuesTest {
 		assertEquals(-1, originProxyIndex);

 		assertEquals(leftProxyIndex, rightProxyIndex);

 

+		// We should have no difference between left and right ... though they might be different from origin

+		scope = EMFCompare.createDefaultScope(left, right);

 		comparison = EMFCompare.newComparator(scope).compare();

 		assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size()));

 	}

@@ -1225,7 +1239,7 @@ public class IndividualMergeOutOfScopeValuesTest {
 		final Resource right = input.getReferenceMultiAddLeftOutOfScope();

 		final Resource origin = input.getReferenceMultiAddOriginOutOfScope();

 

-		final IComparisonScope scope = EMFCompare.createDefaultScope(left, right, origin);

+		IComparisonScope scope = EMFCompare.createDefaultScope(left, right, origin);

 		Comparison comparison = EMFCompare.newComparator(scope).compare();

 

 		final List<Diff> differences = comparison.getDifferences();

@@ -1288,6 +1302,8 @@ public class IndividualMergeOutOfScopeValuesTest {
 		assertEquals(-1, originProxyIndex);

 		assertEquals(leftProxyIndex, rightProxyIndex);

 

+		// We should have no difference between left and right ... though they might be different from origin

+		scope = EMFCompare.createDefaultScope(left, right);

 		comparison = EMFCompare.newComparator(scope).compare();

 		assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size()));

 	}

@@ -1417,7 +1433,7 @@ public class IndividualMergeOutOfScopeValuesTest {
 		final Resource right = input.getReferenceMultiDelRightOutOfScope();

 		final Resource origin = input.getReferenceMultiDelOriginOutOfScope();

 

-		final IComparisonScope scope = EMFCompare.createDefaultScope(left, right, origin);

+		IComparisonScope scope = EMFCompare.createDefaultScope(left, right, origin);

 		Comparison comparison = EMFCompare.newComparator(scope).compare();

 

 		final List<Diff> differences = comparison.getDifferences();

@@ -1480,6 +1496,8 @@ public class IndividualMergeOutOfScopeValuesTest {
 		// "deleted" value is the third (0-based)

 		assertEquals(2, originProxyIndex);

 

+		// We should have no difference between left and right ... though they might be different from origin

+		scope = EMFCompare.createDefaultScope(left, right);

 		comparison = EMFCompare.newComparator(scope).compare();

 		assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size()));

 	}

@@ -1491,7 +1509,7 @@ public class IndividualMergeOutOfScopeValuesTest {
 		final Resource right = input.getReferenceMultiDelLeftOutOfScope();

 		final Resource origin = input.getReferenceMultiDelOriginOutOfScope();

 

-		final IComparisonScope scope = EMFCompare.createDefaultScope(left, right, origin);

+		IComparisonScope scope = EMFCompare.createDefaultScope(left, right, origin);

 		Comparison comparison = EMFCompare.newComparator(scope).compare();

 

 		final List<Diff> differences = comparison.getDifferences();

@@ -1554,6 +1572,8 @@ public class IndividualMergeOutOfScopeValuesTest {
 		// "deleted" value is the third (0-based)

 		assertEquals(2, originProxyIndex);

 

+		// We should have no difference between left and right ... though they might be different from origin

+		scope = EMFCompare.createDefaultScope(left, right);

 		comparison = EMFCompare.newComparator(scope).compare();

 		assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size()));

 	}

@@ -1837,7 +1857,7 @@ public class IndividualMergeOutOfScopeValuesTest {
 		final Resource right = input.getReferenceMultiMoveRightOutOfScope();

 		final Resource origin = input.getReferenceMultiMoveOriginOutOfScope();

 

-		final IComparisonScope scope = EMFCompare.createDefaultScope(left, right);

+		IComparisonScope scope = EMFCompare.createDefaultScope(left, right, origin);

 		Comparison comparison = EMFCompare.newComparator(scope).compare();

 

 		final List<Diff> differences = comparison.getDifferences();

@@ -1902,6 +1922,8 @@ public class IndividualMergeOutOfScopeValuesTest {
 		assertEquals(leftProxyIndex, rightProxyIndex);

 		assertFalse(leftProxyIndex == originProxyIndex);

 

+		// We should have no difference between left and right ... though they might be different from origin

+		scope = EMFCompare.createDefaultScope(left, right);

 		comparison = EMFCompare.newComparator(scope).compare();

 		assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size()));

 	}

@@ -1912,7 +1934,7 @@ public class IndividualMergeOutOfScopeValuesTest {
 		final Resource right = input.getReferenceMultiMoveRightOutOfScope();

 		final Resource origin = input.getReferenceMultiMoveOriginOutOfScope();

 

-		final IComparisonScope scope = EMFCompare.createDefaultScope(left, right);

+		final IComparisonScope scope = EMFCompare.createDefaultScope(left, right, origin);

 		Comparison comparison = EMFCompare.newComparator(scope).compare();

 

 		final List<Diff> differences = comparison.getDifferences();

@@ -1988,7 +2010,7 @@ public class IndividualMergeOutOfScopeValuesTest {
 		final Resource right = input.getReferenceMultiMoveLeftOutOfScope();

 		final Resource origin = input.getReferenceMultiMoveOriginOutOfScope();

 

-		final IComparisonScope scope = EMFCompare.createDefaultScope(left, right);

+		final IComparisonScope scope = EMFCompare.createDefaultScope(left, right, origin);

 		Comparison comparison = EMFCompare.newComparator(scope).compare();

 

 		final List<Diff> differences = comparison.getDifferences();

@@ -2064,7 +2086,7 @@ public class IndividualMergeOutOfScopeValuesTest {
 		final Resource right = input.getReferenceMultiMoveLeftOutOfScope();

 		final Resource origin = input.getReferenceMultiMoveOriginOutOfScope();

 

-		final IComparisonScope scope = EMFCompare.createDefaultScope(left, right);

+		IComparisonScope scope = EMFCompare.createDefaultScope(left, right, origin);

 		Comparison comparison = EMFCompare.newComparator(scope).compare();

 

 		final List<Diff> differences = comparison.getDifferences();

@@ -2129,6 +2151,8 @@ public class IndividualMergeOutOfScopeValuesTest {
 		assertEquals(leftProxyIndex, rightProxyIndex);

 		assertFalse(leftProxyIndex == originProxyIndex);

 

+		// We should have no difference between left and right ... though they might be different from origin

+		scope = EMFCompare.createDefaultScope(left, right);

 		comparison = EMFCompare.newComparator(scope).compare();

 		assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size()));

 	}

diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/IndividualMergeTest.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/IndividualMergeTest.java
index bd9b59575..fc7d29ea9 100644
--- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/IndividualMergeTest.java
+++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/IndividualMergeTest.java
@@ -111,7 +111,7 @@ public class IndividualMergeTest {
 		final Resource right = input.getAttributeMonoChangeRight();

 		final Resource origin = input.getAttributeMonoChangeOrigin();

 

-		final IComparisonScope scope = EMFCompare.createDefaultScope(left, right, origin);

+		IComparisonScope scope = EMFCompare.createDefaultScope(left, right, origin);

 		Comparison comparison = EMFCompare.newComparator(scope).compare();

 

 		final List<Diff> differences = comparison.getDifferences();

@@ -129,6 +129,8 @@ public class IndividualMergeTest {
 

 		assertEquals("leftValue", originNode.eGet(feature));

 

+		// We should have no difference between left and right ... though they might be different from origin

+		scope = EMFCompare.createDefaultScope(left, right);

 		comparison = EMFCompare.newComparator(scope).compare();

 		assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size()));

 	}

@@ -197,7 +199,7 @@ public class IndividualMergeTest {
 		final Resource right = input.getAttributeMonoChangeLeft();

 		final Resource origin = input.getAttributeMonoChangeOrigin();

 

-		final IComparisonScope scope = EMFCompare.createDefaultScope(left, right, origin);

+		IComparisonScope scope = EMFCompare.createDefaultScope(left, right, origin);

 		Comparison comparison = EMFCompare.newComparator(scope).compare();

 

 		final List<Diff> differences = comparison.getDifferences();

@@ -215,6 +217,8 @@ public class IndividualMergeTest {
 

 		assertEquals("leftValue", originNode.eGet(feature));

 

+		// We should have no difference between left and right ... though they might be different from origin

+		scope = EMFCompare.createDefaultScope(left, right);

 		comparison = EMFCompare.newComparator(scope).compare();

 		assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size()));

 	}

@@ -279,7 +283,7 @@ public class IndividualMergeTest {
 		final Resource right = input.getAttributeMonoSetRight();

 		final Resource origin = input.getAttributeMonoSetOrigin();

 

-		final IComparisonScope scope = EMFCompare.createDefaultScope(left, right, origin);

+		IComparisonScope scope = EMFCompare.createDefaultScope(left, right, origin);

 		Comparison comparison = EMFCompare.newComparator(scope).compare();

 

 		final List<Diff> differences = comparison.getDifferences();

@@ -297,6 +301,8 @@ public class IndividualMergeTest {
 

 		assertEquals("leftValue", originNode.eGet(feature));

 

+		// We should have no difference between left and right ... though they might be different from origin

+		scope = EMFCompare.createDefaultScope(left, right);

 		comparison = EMFCompare.newComparator(scope).compare();

 		assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size()));

 	}

@@ -365,7 +371,7 @@ public class IndividualMergeTest {
 		final Resource right = input.getAttributeMonoSetLeft();

 		final Resource origin = input.getAttributeMonoSetOrigin();

 

-		final IComparisonScope scope = EMFCompare.createDefaultScope(left, right, origin);

+		IComparisonScope scope = EMFCompare.createDefaultScope(left, right, origin);

 		Comparison comparison = EMFCompare.newComparator(scope).compare();

 

 		final List<Diff> differences = comparison.getDifferences();

@@ -383,6 +389,8 @@ public class IndividualMergeTest {
 

 		assertEquals("leftValue", originNode.eGet(feature));

 

+		// We should have no difference between left and right ... though they might be different from origin

+		scope = EMFCompare.createDefaultScope(left, right);

 		comparison = EMFCompare.newComparator(scope).compare();

 		assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size()));

 	}

@@ -447,7 +455,7 @@ public class IndividualMergeTest {
 		final Resource right = input.getAttributeMonoUnsetRight();

 		final Resource origin = input.getAttributeMonoUnsetOrigin();

 

-		final IComparisonScope scope = EMFCompare.createDefaultScope(left, right, origin);

+		IComparisonScope scope = EMFCompare.createDefaultScope(left, right, origin);

 		Comparison comparison = EMFCompare.newComparator(scope).compare();

 

 		final List<Diff> differences = comparison.getDifferences();

@@ -465,6 +473,8 @@ public class IndividualMergeTest {
 

 		assertNull(originNode.eGet(feature));

 

+		// We should have no difference between left and right ... though they might be different from origin

+		scope = EMFCompare.createDefaultScope(left, right);

 		comparison = EMFCompare.newComparator(scope).compare();

 		assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size()));

 	}

@@ -533,7 +543,7 @@ public class IndividualMergeTest {
 		final Resource right = input.getAttributeMonoUnsetLeft();

 		final Resource origin = input.getAttributeMonoUnsetOrigin();

 

-		final IComparisonScope scope = EMFCompare.createDefaultScope(left, right, origin);

+		IComparisonScope scope = EMFCompare.createDefaultScope(left, right, origin);

 		Comparison comparison = EMFCompare.newComparator(scope).compare();

 

 		final List<Diff> differences = comparison.getDifferences();

@@ -551,6 +561,8 @@ public class IndividualMergeTest {
 

 		assertNull(originNode.eGet(feature));

 

+		// We should have no difference between left and right ... though they might be different from origin

+		scope = EMFCompare.createDefaultScope(left, right);

 		comparison = EMFCompare.newComparator(scope).compare();

 		assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size()));

 	}

@@ -619,7 +631,7 @@ public class IndividualMergeTest {
 		final Resource right = input.getAttributeMultiAddRight();

 		final Resource origin = input.getAttributeMultiAddOrigin();

 

-		final IComparisonScope scope = EMFCompare.createDefaultScope(left, right, origin);

+		IComparisonScope scope = EMFCompare.createDefaultScope(left, right, origin);

 		Comparison comparison = EMFCompare.newComparator(scope).compare();

 

 		final List<Diff> differences = comparison.getDifferences();

@@ -639,6 +651,8 @@ public class IndividualMergeTest {
 		assertTrue(featureValue instanceof Collection<?>);

 		assertTrue(((Collection<?>)featureValue).contains("value1"));

 

+		// We should have no difference between left and right ... though they might be different from origin

+		scope = EMFCompare.createDefaultScope(left, right);

 		comparison = EMFCompare.newComparator(scope).compare();

 		assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size()));

 	}

@@ -711,7 +725,7 @@ public class IndividualMergeTest {
 		final Resource right = input.getAttributeMultiAddLeft();

 		final Resource origin = input.getAttributeMultiAddOrigin();

 

-		final IComparisonScope scope = EMFCompare.createDefaultScope(left, right, origin);

+		IComparisonScope scope = EMFCompare.createDefaultScope(left, right, origin);

 		Comparison comparison = EMFCompare.newComparator(scope).compare();

 

 		final List<Diff> differences = comparison.getDifferences();

@@ -731,6 +745,8 @@ public class IndividualMergeTest {
 		assertTrue(featureValue instanceof Collection<?>);

 		assertTrue(((Collection<?>)featureValue).contains("value1"));

 

+		// We should have no difference between left and right ... though they might be different from origin

+		scope = EMFCompare.createDefaultScope(left, right);

 		comparison = EMFCompare.newComparator(scope).compare();

 		assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size()));

 	}

@@ -769,7 +785,7 @@ public class IndividualMergeTest {
 		final Resource left = input.getAttributeMultiDelLeft();

 		final Resource right = input.getAttributeMultiDelRight();

 

-		final IComparisonScope scope = EMFCompare.createDefaultScope(left, right);

+		IComparisonScope scope = EMFCompare.createDefaultScope(left, right);

 		Comparison comparison = EMFCompare.newComparator(scope).compare();

 

 		final List<Diff> differences = comparison.getDifferences();

@@ -799,7 +815,7 @@ public class IndividualMergeTest {
 		final Resource right = input.getAttributeMultiDelRight();

 		final Resource origin = input.getAttributeMultiDelOrigin();

 

-		final IComparisonScope scope = EMFCompare.createDefaultScope(left, right, origin);

+		IComparisonScope scope = EMFCompare.createDefaultScope(left, right, origin);

 		Comparison comparison = EMFCompare.newComparator(scope).compare();

 

 		final List<Diff> differences = comparison.getDifferences();

@@ -819,6 +835,8 @@ public class IndividualMergeTest {
 		assertTrue(featureValue instanceof Collection<?>);

 		assertFalse(((Collection<?>)featureValue).contains("value1"));

 

+		// We should have no difference between left and right ... though they might be different from origin

+		scope = EMFCompare.createDefaultScope(left, right);

 		comparison = EMFCompare.newComparator(scope).compare();

 		assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size()));

 	}

@@ -829,7 +847,7 @@ public class IndividualMergeTest {
 		final Resource right = input.getAttributeMultiDelRight();

 		final Resource origin = input.getAttributeMultiDelOrigin();

 

-		final IComparisonScope scope = EMFCompare.createDefaultScope(left, right, origin);

+		IComparisonScope scope = EMFCompare.createDefaultScope(left, right, origin);

 		Comparison comparison = EMFCompare.newComparator(scope).compare();

 

 		final List<Diff> differences = comparison.getDifferences();

@@ -860,7 +878,7 @@ public class IndividualMergeTest {
 		final Resource right = input.getAttributeMultiDelLeft();

 		final Resource origin = input.getAttributeMultiDelOrigin();

 

-		final IComparisonScope scope = EMFCompare.createDefaultScope(left, right, origin);

+		IComparisonScope scope = EMFCompare.createDefaultScope(left, right, origin);

 		Comparison comparison = EMFCompare.newComparator(scope).compare();

 

 		final List<Diff> differences = comparison.getDifferences();

@@ -891,7 +909,7 @@ public class IndividualMergeTest {
 		final Resource right = input.getAttributeMultiDelLeft();

 		final Resource origin = input.getAttributeMultiDelOrigin();

 

-		final IComparisonScope scope = EMFCompare.createDefaultScope(left, right, origin);

+		IComparisonScope scope = EMFCompare.createDefaultScope(left, right, origin);

 		Comparison comparison = EMFCompare.newComparator(scope).compare();

 

 		final List<Diff> differences = comparison.getDifferences();

@@ -911,6 +929,8 @@ public class IndividualMergeTest {
 		assertTrue(featureValue instanceof Collection<?>);

 		assertFalse(((Collection<?>)featureValue).contains("value1"));

 

+		// We should have no difference between left and right ... though they might be different from origin

+		scope = EMFCompare.createDefaultScope(left, right);

 		comparison = EMFCompare.newComparator(scope).compare();

 		assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size()));

 	}

@@ -921,7 +941,7 @@ public class IndividualMergeTest {
 		final Resource left = input.getAttributeMultiMoveLeft();

 		final Resource right = input.getAttributeMultiMoveRight();

 

-		final IComparisonScope scope = EMFCompare.createDefaultScope(left, right);

+		IComparisonScope scope = EMFCompare.createDefaultScope(left, right);

 		Comparison comparison = EMFCompare.newComparator(scope).compare();

 

 		final List<Diff> differences = comparison.getDifferences();

@@ -990,7 +1010,7 @@ public class IndividualMergeTest {
 		final Resource right = input.getAttributeMultiMoveRight();

 		final Resource origin = input.getAttributeMultiMoveOrigin();

 

-		final IComparisonScope scope = EMFCompare.createDefaultScope(left, right, origin);

+		IComparisonScope scope = EMFCompare.createDefaultScope(left, right, origin);

 		Comparison comparison = EMFCompare.newComparator(scope).compare();

 

 		final List<Diff> differences = comparison.getDifferences();

@@ -1014,6 +1034,8 @@ public class IndividualMergeTest {
 		assertTrue(sourceFeatureValue instanceof List<?>);

 		assertEqualContents(((List<Object>)targetFeatureValue), ((List<Object>)sourceFeatureValue));

 

+		// We should have no difference between left and right ... though they might be different from origin

+		scope = EMFCompare.createDefaultScope(left, right);

 		comparison = EMFCompare.newComparator(scope).compare();

 		assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size()));

 	}

@@ -1025,7 +1047,7 @@ public class IndividualMergeTest {
 		final Resource right = input.getAttributeMultiMoveRight();

 		final Resource origin = input.getAttributeMultiMoveOrigin();

 

-		final IComparisonScope scope = EMFCompare.createDefaultScope(left, right, origin);

+		IComparisonScope scope = EMFCompare.createDefaultScope(left, right, origin);

 		Comparison comparison = EMFCompare.newComparator(scope).compare();

 

 		final List<Diff> differences = comparison.getDifferences();

@@ -1061,7 +1083,7 @@ public class IndividualMergeTest {
 		final Resource right = input.getAttributeMultiMoveLeft();

 		final Resource origin = input.getAttributeMultiMoveOrigin();

 

-		final IComparisonScope scope = EMFCompare.createDefaultScope(left, right, origin);

+		IComparisonScope scope = EMFCompare.createDefaultScope(left, right, origin);

 		Comparison comparison = EMFCompare.newComparator(scope).compare();

 

 		final List<Diff> differences = comparison.getDifferences();

@@ -1097,7 +1119,7 @@ public class IndividualMergeTest {
 		final Resource right = input.getAttributeMultiMoveLeft();

 		final Resource origin = input.getAttributeMultiMoveOrigin();

 

-		final IComparisonScope scope = EMFCompare.createDefaultScope(left, right, origin);

+		IComparisonScope scope = EMFCompare.createDefaultScope(left, right, origin);

 		Comparison comparison = EMFCompare.newComparator(scope).compare();

 

 		final List<Diff> differences = comparison.getDifferences();

@@ -1121,6 +1143,8 @@ public class IndividualMergeTest {
 		assertTrue(sourceFeatureValue instanceof List<?>);

 		assertEqualContents(((List<Object>)targetFeatureValue), ((List<Object>)sourceFeatureValue));

 

+		// We should have no difference between left and right ... though they might be different from origin

+		scope = EMFCompare.createDefaultScope(left, right);

 		comparison = EMFCompare.newComparator(scope).compare();

 		assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size()));

 	}

@@ -1189,10 +1213,10 @@ public class IndividualMergeTest {
 		final Resource right = input.getReferenceMonoChangeRight();

 		final Resource origin = input.getReferenceMonoChangeOrigin();

 

-		final IComparisonScope scope = EMFCompare.createDefaultScope(left, right, origin);

+		IComparisonScope scope = EMFCompare.createDefaultScope(left, right, origin);

 		Comparison comparison = EMFCompare.newComparator(scope).compare();

 

-		final List<Diff> differences = comparison.getDifferences();

+		List<Diff> differences = comparison.getDifferences();

 		assertSame(Integer.valueOf(1), Integer.valueOf(differences.size()));

 

 		final String featureName = "singleValuedReference";

@@ -1209,6 +1233,8 @@ public class IndividualMergeTest {
 

 		assertSame(targetNode, originNode.eGet(feature));

 

+		// We should have no difference between left and right ... though they might be different from origin

+		scope = EMFCompare.createDefaultScope(left, right);

 		comparison = EMFCompare.newComparator(scope).compare();

 		assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size()));

 	}

@@ -1281,7 +1307,7 @@ public class IndividualMergeTest {
 		final Resource right = input.getReferenceMonoChangeLeft();

 		final Resource origin = input.getReferenceMonoChangeOrigin();

 

-		final IComparisonScope scope = EMFCompare.createDefaultScope(left, right, origin);

+		IComparisonScope scope = EMFCompare.createDefaultScope(left, right, origin);

 		Comparison comparison = EMFCompare.newComparator(scope).compare();

 

 		final List<Diff> differences = comparison.getDifferences();

@@ -1301,6 +1327,8 @@ public class IndividualMergeTest {
 

 		assertSame(targetNode, originNode.eGet(feature));

 

+		// We should have no difference between left and right ... though they might be different from origin

+		scope = EMFCompare.createDefaultScope(left, right);

 		comparison = EMFCompare.newComparator(scope).compare();

 		assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size()));

 	}

@@ -1367,7 +1395,7 @@ public class IndividualMergeTest {
 		final Resource right = input.getReferenceMonoSetRight();

 		final Resource origin = input.getReferenceMonoSetOrigin();

 

-		final IComparisonScope scope = EMFCompare.createDefaultScope(left, right, origin);

+		IComparisonScope scope = EMFCompare.createDefaultScope(left, right, origin);

 		Comparison comparison = EMFCompare.newComparator(scope).compare();

 

 		final List<Diff> differences = comparison.getDifferences();

@@ -1387,6 +1415,8 @@ public class IndividualMergeTest {
 

 		assertSame(targetNode, originNode.eGet(feature));

 

+		// We should have no difference between left and right ... though they might be different from origin

+		scope = EMFCompare.createDefaultScope(left, right);

 		comparison = EMFCompare.newComparator(scope).compare();

 		assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size()));

 	}

@@ -1455,7 +1485,7 @@ public class IndividualMergeTest {
 		final Resource right = input.getReferenceMonoSetLeft();

 		final Resource origin = input.getReferenceMonoSetOrigin();

 

-		final IComparisonScope scope = EMFCompare.createDefaultScope(left, right, origin);

+		IComparisonScope scope = EMFCompare.createDefaultScope(left, right, origin);

 		Comparison comparison = EMFCompare.newComparator(scope).compare();

 

 		final List<Diff> differences = comparison.getDifferences();

@@ -1475,6 +1505,8 @@ public class IndividualMergeTest {
 

 		assertSame(targetNode, originNode.eGet(feature));

 

+		// We should have no difference between left and right ... though they might be different from origin

+		scope = EMFCompare.createDefaultScope(left, right);

 		comparison = EMFCompare.newComparator(scope).compare();

 		assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size()));

 	}

@@ -1541,7 +1573,7 @@ public class IndividualMergeTest {
 		final Resource right = input.getReferenceMonoUnsetRight();

 		final Resource origin = input.getReferenceMonoUnsetOrigin();

 

-		final IComparisonScope scope = EMFCompare.createDefaultScope(left, right, origin);

+		IComparisonScope scope = EMFCompare.createDefaultScope(left, right, origin);

 		Comparison comparison = EMFCompare.newComparator(scope).compare();

 

 		final List<Diff> differences = comparison.getDifferences();

@@ -1559,6 +1591,8 @@ public class IndividualMergeTest {
 

 		assertNull(originNode.eGet(feature));

 

+		// We should have no difference between left and right ... though they might be different from origin

+		scope = EMFCompare.createDefaultScope(left, right);

 		comparison = EMFCompare.newComparator(scope).compare();

 		assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size()));

 	}

@@ -1631,7 +1665,7 @@ public class IndividualMergeTest {
 		final Resource right = input.getReferenceMonoUnsetLeft();

 		final Resource origin = input.getReferenceMonoUnsetOrigin();

 

-		final IComparisonScope scope = EMFCompare.createDefaultScope(left, right, origin);

+		IComparisonScope scope = EMFCompare.createDefaultScope(left, right, origin);

 		Comparison comparison = EMFCompare.newComparator(scope).compare();

 

 		final List<Diff> differences = comparison.getDifferences();

@@ -1649,6 +1683,8 @@ public class IndividualMergeTest {
 

 		assertNull(originNode.eGet(feature));

 

+		// We should have no difference between left and right ... though they might be different from origin

+		scope = EMFCompare.createDefaultScope(left, right);

 		comparison = EMFCompare.newComparator(scope).compare();

 		assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size()));

 	}

@@ -1721,7 +1757,7 @@ public class IndividualMergeTest {
 		final Resource right = input.getReferenceMultiAddRight();

 		final Resource origin = input.getReferenceMultiAddOrigin();

 

-		final IComparisonScope scope = EMFCompare.createDefaultScope(left, right, origin);

+		IComparisonScope scope = EMFCompare.createDefaultScope(left, right, origin);

 		Comparison comparison = EMFCompare.newComparator(scope).compare();

 

 		final List<Diff> differences = comparison.getDifferences();

@@ -1743,6 +1779,8 @@ public class IndividualMergeTest {
 		assertTrue(featureValue instanceof Collection<?>);

 		assertTrue(((Collection<?>)featureValue).contains(targetNode));

 

+		// We should have no difference between left and right ... though they might be different from origin

+		scope = EMFCompare.createDefaultScope(left, right);

 		comparison = EMFCompare.newComparator(scope).compare();

 		assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size()));

 	}

@@ -1819,7 +1857,7 @@ public class IndividualMergeTest {
 		final Resource right = input.getReferenceMultiAddLeft();

 		final Resource origin = input.getReferenceMultiAddOrigin();

 

-		final IComparisonScope scope = EMFCompare.createDefaultScope(left, right, origin);

+		IComparisonScope scope = EMFCompare.createDefaultScope(left, right, origin);

 		Comparison comparison = EMFCompare.newComparator(scope).compare();

 

 		final List<Diff> differences = comparison.getDifferences();

@@ -1841,6 +1879,8 @@ public class IndividualMergeTest {
 		assertTrue(featureValue instanceof Collection<?>);

 		assertTrue(((Collection<?>)featureValue).contains(targetNode));

 

+		// We should have no difference between left and right ... though they might be different from origin

+		scope = EMFCompare.createDefaultScope(left, right);

 		comparison = EMFCompare.newComparator(scope).compare();

 		assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size()));

 	}

@@ -1913,7 +1953,7 @@ public class IndividualMergeTest {
 		final Resource right = input.getReferenceMultiDelRight();

 		final Resource origin = input.getReferenceMultiDelOrigin();

 

-		final IComparisonScope scope = EMFCompare.createDefaultScope(left, right, origin);

+		IComparisonScope scope = EMFCompare.createDefaultScope(left, right, origin);

 		Comparison comparison = EMFCompare.newComparator(scope).compare();

 

 		final List<Diff> differences = comparison.getDifferences();

@@ -1935,6 +1975,8 @@ public class IndividualMergeTest {
 		assertTrue(featureValue instanceof Collection<?>);

 		assertFalse(((Collection<?>)featureValue).contains(targetNode));

 

+		// We should have no difference between left and right ... though they might be different from origin

+		scope = EMFCompare.createDefaultScope(left, right);

 		comparison = EMFCompare.newComparator(scope).compare();

 		assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size()));

 	}

@@ -2011,7 +2053,7 @@ public class IndividualMergeTest {
 		final Resource right = input.getReferenceMultiDelLeft();

 		final Resource origin = input.getReferenceMultiDelOrigin();

 

-		final IComparisonScope scope = EMFCompare.createDefaultScope(left, right, origin);

+		IComparisonScope scope = EMFCompare.createDefaultScope(left, right, origin);

 		Comparison comparison = EMFCompare.newComparator(scope).compare();

 

 		final List<Diff> differences = comparison.getDifferences();

@@ -2033,6 +2075,8 @@ public class IndividualMergeTest {
 		assertTrue(featureValue instanceof Collection<?>);

 		assertFalse(((Collection<?>)featureValue).contains(targetNode));

 

+		// We should have no difference between left and right ... though they might be different from origin

+		scope = EMFCompare.createDefaultScope(left, right);

 		comparison = EMFCompare.newComparator(scope).compare();

 		assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size()));

 	}

@@ -2114,7 +2158,7 @@ public class IndividualMergeTest {
 		final Resource right = input.getReferenceMultiMoveRight();

 		final Resource origin = input.getReferenceMultiMoveOrigin();

 

-		final IComparisonScope scope = EMFCompare.createDefaultScope(left, right, origin);

+		IComparisonScope scope = EMFCompare.createDefaultScope(left, right, origin);

 		Comparison comparison = EMFCompare.newComparator(scope).compare();

 

 		final List<Diff> differences = comparison.getDifferences();

@@ -2139,6 +2183,8 @@ public class IndividualMergeTest {
 		assertEqualContents(comparison, ((List<EObject>)targetFeatureValue),

 				((List<EObject>)sourceFeatureValue));

 

+		// We should have no difference between left and right ... though they might be different from origin

+		scope = EMFCompare.createDefaultScope(left, right);

 		comparison = EMFCompare.newComparator(scope).compare();

 		assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size()));

 	}

@@ -2224,7 +2270,7 @@ public class IndividualMergeTest {
 		final Resource right = input.getReferenceMultiMoveLeft();

 		final Resource origin = input.getReferenceMultiMoveOrigin();

 

-		final IComparisonScope scope = EMFCompare.createDefaultScope(left, right, origin);

+		IComparisonScope scope = EMFCompare.createDefaultScope(left, right, origin);

 		Comparison comparison = EMFCompare.newComparator(scope).compare();

 

 		final List<Diff> differences = comparison.getDifferences();

@@ -2249,6 +2295,8 @@ public class IndividualMergeTest {
 		assertEqualContents(comparison, ((List<EObject>)targetFeatureValue),

 				((List<EObject>)sourceFeatureValue));

 

+		// We should have no difference between left and right ... though they might be different from origin

+		scope = EMFCompare.createDefaultScope(left, right);

 		comparison = EMFCompare.newComparator(scope).compare();

 		assertSame(Integer.valueOf(0), Integer.valueOf(comparison.getDifferences().size()));

 	}

diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/req/ReqComputingTest.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/req/ReqComputingTest.java
index 8d37f6810..3904397ed 100644
--- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/req/ReqComputingTest.java
+++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/req/ReqComputingTest.java
@@ -163,7 +163,7 @@ public class ReqComputingTest {
 		final Resource left = input.getA1Left();

 		final Resource right = input.getA1Right();

 

-		final IComparisonScope scope = EMFCompare.createDefaultScope(left, right);

+		final IComparisonScope scope = EMFCompare.createDefaultScope(right, left);

 		final Comparison comparison = EMFCompare.newComparator(scope).compare();

 		testAB1(TestKind.ADD, comparison);

 	}