Deprecate use of EMFCompare#createDefaultScope(...)

Change-Id: Ie4af0c2180a6df04bad8edeba038e6dd1141cf63

24 files changed, 190 insertions, 402 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 bfe11bced..2791e82ac 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
@@ -34,6 +34,7 @@ import org.eclipse.emf.compare.merge.BatchMerger;
 import org.eclipse.emf.compare.merge.IBatchMerger;
 import org.eclipse.emf.compare.merge.IMerger;
 import org.eclipse.emf.compare.postprocessor.PostProcessorDescriptorRegistryImpl;
+import org.eclipse.emf.compare.scope.DefaultComparisonScope;
 import org.eclipse.emf.compare.scope.IComparisonScope;
 import org.eclipse.emf.compare.tests.framework.AbstractInputData;
 import org.eclipse.emf.compare.tests.postprocess.data.TestPostProcessor;
@@ -81,6 +82,15 @@ public abstract class AbstractTest {
 		return emfCompare;
 	}
 
+	protected Comparison compare(Notifier left, Notifier right) {
+		return compare(left, right, null);
+	}
+
+	protected Comparison compare(Notifier left, Notifier right, Notifier origin) {
+		IComparisonScope scope = new DefaultComparisonScope(left, right, origin);
+		return getCompare().compare(scope);
+	}
+
 	protected enum TestKind {
 		ADD, DELETE;
 	}
@@ -131,7 +141,7 @@ public abstract class AbstractTest {
 	protected abstract AbstractInputData getInput();
 
 	protected void testMergeLeftToRight(Notifier left, Notifier right, Notifier origin) {
-		final IComparisonScope scope = EMFCompare.createDefaultScope(left, right, origin);
+		final IComparisonScope scope = new DefaultComparisonScope(left, right, origin);
 		final Comparison comparisonBefore = getCompare().compare(scope);
 		EList<Diff> differences = comparisonBefore.getDifferences();
 		final IBatchMerger merger = new BatchMerger(mergerRegistry);
@@ -142,7 +152,7 @@ public abstract class AbstractTest {
 	}
 
 	protected void testMergeRightToLeft(Notifier left, Notifier right, Notifier origin) {
-		final IComparisonScope scope = EMFCompare.createDefaultScope(left, right, origin);
+		final IComparisonScope scope = new DefaultComparisonScope(left, right, origin);
 		final Comparison comparisonBefore = getCompare().compare(scope);
 		EList<Diff> differences = comparisonBefore.getDifferences();
 		final IBatchMerger merger = new BatchMerger(mergerRegistry);
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 9d4a55b49..48608cd3f 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
@@ -23,8 +23,6 @@ import java.util.List;
 import org.eclipse.emf.compare.Comparison;

 import org.eclipse.emf.compare.Diff;

 import org.eclipse.emf.compare.DifferenceKind;

-import org.eclipse.emf.compare.EMFCompare;

-import org.eclipse.emf.compare.scope.IComparisonScope;

 import org.eclipse.emf.compare.tests.framework.AbstractInputData;

 import org.eclipse.emf.compare.uml2.internal.AssociationChange;

 import org.eclipse.emf.compare.uml2.tests.AbstractTest;

@@ -42,8 +40,7 @@ public class AddAssociation2Test extends AbstractTest {
 		final Resource left = input.getA3Left();

 		final Resource right = input.getA3Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right);

 		testAB1(TestKind.ADD, comparison);

 	}

 

@@ -68,8 +65,7 @@ public class AddAssociation2Test extends AbstractTest {
 		final Resource left = input.getA3Left();

 		final Resource right = input.getA3Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(right, left);

 		testAB1(TestKind.DELETE, comparison);

 	}

 

@@ -94,8 +90,7 @@ public class AddAssociation2Test extends AbstractTest {
 		final Resource left = input.getA3Left();

 		final Resource right = input.getA3Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right, right);

 		testAB1(TestKind.ADD, comparison);

 	}

 

@@ -120,8 +115,7 @@ public class AddAssociation2Test extends AbstractTest {
 		final Resource left = input.getA3Left();

 		final Resource right = input.getA3Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right, left);

 		testAB1(TestKind.DELETE, comparison);

 	}

 

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 58a6c827e..9bb96f65b 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
@@ -23,8 +23,6 @@ import java.util.List;
 import org.eclipse.emf.compare.Comparison;

 import org.eclipse.emf.compare.Diff;

 import org.eclipse.emf.compare.DifferenceKind;

-import org.eclipse.emf.compare.EMFCompare;

-import org.eclipse.emf.compare.scope.IComparisonScope;

 import org.eclipse.emf.compare.tests.framework.AbstractInputData;

 import org.eclipse.emf.compare.uml2.internal.AssociationChange;

 import org.eclipse.emf.compare.uml2.tests.AbstractTest;

@@ -42,8 +40,7 @@ public class AddAssociation3Test extends AbstractTest {
 		final Resource left = input.getA4Left();

 		final Resource right = input.getA4Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right);

 		testAB1(TestKind.ADD, comparison);

 	}

 

@@ -68,8 +65,7 @@ public class AddAssociation3Test extends AbstractTest {
 		final Resource left = input.getA4Left();

 		final Resource right = input.getA4Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(right, left);

 		testAB1(TestKind.DELETE, comparison);

 	}

 

@@ -94,8 +90,7 @@ public class AddAssociation3Test extends AbstractTest {
 		final Resource left = input.getA4Left();

 		final Resource right = input.getA4Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right, right);

 		testAB1(TestKind.ADD, comparison);

 	}

 

@@ -120,8 +115,7 @@ public class AddAssociation3Test extends AbstractTest {
 		final Resource left = input.getA4Left();

 		final Resource right = input.getA4Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right, left);

 		testAB1(TestKind.DELETE, comparison);

 	}

 

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 b8a2f9b4d..12b001d0b 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
@@ -23,8 +23,6 @@ import java.util.List;
 import org.eclipse.emf.compare.Comparison;

 import org.eclipse.emf.compare.Diff;

 import org.eclipse.emf.compare.DifferenceKind;

-import org.eclipse.emf.compare.EMFCompare;

-import org.eclipse.emf.compare.scope.IComparisonScope;

 import org.eclipse.emf.compare.tests.framework.AbstractInputData;

 import org.eclipse.emf.compare.uml2.internal.AssociationChange;

 import org.eclipse.emf.compare.uml2.tests.AbstractTest;

@@ -43,8 +41,7 @@ public class AddAssociationTest extends AbstractTest {
 		final Resource left = input.getA1Left();

 		final Resource right = input.getA1Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right);

 		testAB1(TestKind.ADD, comparison);

 	}

 

@@ -71,8 +68,7 @@ public class AddAssociationTest extends AbstractTest {
 		final Resource left = input.getA1Right();

 		final Resource right = input.getA1Left();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right);

 		testAB1(TestKind.DELETE, comparison);

 	}

 

@@ -99,8 +95,7 @@ public class AddAssociationTest extends AbstractTest {
 		final Resource left = input.getA1Left();

 		final Resource right = input.getA1Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right, right);

 		testAB1(TestKind.ADD, comparison);

 	}

 

@@ -127,8 +122,7 @@ public class AddAssociationTest extends AbstractTest {
 		final Resource left = input.getA1Left();

 		final Resource right = input.getA1Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right, left);

 		testAB1(TestKind.DELETE, 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 631202624..45b1e1bc0 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
@@ -22,8 +22,6 @@ import java.util.List;
 import org.eclipse.emf.compare.Comparison;

 import org.eclipse.emf.compare.Diff;

 import org.eclipse.emf.compare.DifferenceKind;

-import org.eclipse.emf.compare.EMFCompare;

-import org.eclipse.emf.compare.scope.IComparisonScope;

 import org.eclipse.emf.compare.tests.framework.AbstractInputData;

 import org.eclipse.emf.compare.uml2.internal.AssociationChange;

 import org.eclipse.emf.compare.uml2.tests.AbstractTest;

@@ -41,8 +39,7 @@ public class ChangeAssociationTest extends AbstractTest {
 		final Resource left = input.getA2Left();

 		final Resource right = input.getA2Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right);

 		testAB1(TestKind.ADD, comparison);

 	}

 

@@ -67,8 +64,7 @@ public class ChangeAssociationTest extends AbstractTest {
 		final Resource left = input.getA2Left();

 		final Resource right = input.getA2Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(right, left);

 		testAB1(TestKind.DELETE, comparison);

 	}

 

@@ -93,8 +89,7 @@ public class ChangeAssociationTest extends AbstractTest {
 		final Resource left = input.getA2Left();

 		final Resource right = input.getA2Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right, right);

 		testAB1(TestKind.ADD, comparison);

 	}

 

@@ -119,8 +114,7 @@ public class ChangeAssociationTest extends AbstractTest {
 		final Resource left = input.getA2Left();

 		final Resource right = input.getA2Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right, left);

 		testAB1(TestKind.DELETE, comparison);

 	}

 

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 b4405a5de..b5f4c9771 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
@@ -20,8 +20,6 @@ import java.util.List;
 import org.eclipse.emf.compare.Comparison;

 import org.eclipse.emf.compare.Diff;

 import org.eclipse.emf.compare.DifferenceKind;

-import org.eclipse.emf.compare.EMFCompare;

-import org.eclipse.emf.compare.scope.IComparisonScope;

 import org.eclipse.emf.compare.tests.framework.AbstractInputData;

 import org.eclipse.emf.compare.uml2.internal.DependencyChange;

 import org.eclipse.emf.compare.uml2.tests.AbstractTest;

@@ -40,8 +38,7 @@ public class AddAbstractionTest extends AbstractTest {
 		final Resource left = input.getA2Left();

 		final Resource right = input.getA2Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right);

 		testAB1(TestKind.ADD, comparison);

 

 		testMergeLeftToRight(left, right, null);

@@ -53,8 +50,7 @@ public class AddAbstractionTest extends AbstractTest {
 		final Resource left = input.getA2Left();

 		final Resource right = input.getA2Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(right, left);

 		testAB1(TestKind.DELETE, comparison);

 

 		testMergeLeftToRight(right, left, null);

@@ -66,8 +62,7 @@ public class AddAbstractionTest extends AbstractTest {
 		final Resource left = input.getA2Left();

 		final Resource right = input.getA2Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right, right);

 		testAB1(TestKind.ADD, comparison);

 

 		testMergeLeftToRight(left, right, right);

@@ -79,8 +74,7 @@ public class AddAbstractionTest extends AbstractTest {
 		final Resource left = input.getA2Left();

 		final Resource right = input.getA2Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right, left);

 		testAB1(TestKind.DELETE, comparison);

 

 		testMergeLeftToRight(left, right, left);

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 75fac9033..b9580fe91 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
@@ -20,8 +20,6 @@ import java.util.List;
 import org.eclipse.emf.compare.Comparison;

 import org.eclipse.emf.compare.Diff;

 import org.eclipse.emf.compare.DifferenceKind;

-import org.eclipse.emf.compare.EMFCompare;

-import org.eclipse.emf.compare.scope.IComparisonScope;

 import org.eclipse.emf.compare.tests.framework.AbstractInputData;

 import org.eclipse.emf.compare.uml2.internal.DependencyChange;

 import org.eclipse.emf.compare.uml2.tests.AbstractTest;

@@ -39,8 +37,7 @@ public class AddDependencyTest extends AbstractTest {
 		final Resource left = input.getA1Left();

 		final Resource right = input.getA1Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right);

 		testAB1(TestKind.ADD, comparison);

 

 		testMergeLeftToRight(left, right, null);

@@ -52,8 +49,7 @@ public class AddDependencyTest extends AbstractTest {
 		final Resource left = input.getA1Left();

 		final Resource right = input.getA1Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(right, left);

 		testAB1(TestKind.DELETE, comparison);

 

 		testMergeLeftToRight(right, left, null);

@@ -65,8 +61,7 @@ public class AddDependencyTest extends AbstractTest {
 		final Resource left = input.getA1Left();

 		final Resource right = input.getA1Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right, right);

 		testAB1(TestKind.ADD, comparison);

 

 		testMergeLeftToRight(left, right, right);

@@ -78,8 +73,7 @@ public class AddDependencyTest extends AbstractTest {
 		final Resource left = input.getA1Left();

 		final Resource right = input.getA1Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right, left);

 		testAB1(TestKind.DELETE, comparison);

 

 		testMergeLeftToRight(left, right, left);

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 d85bb68f7..d017da1ee 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
@@ -19,8 +19,6 @@ import java.util.List;
 import org.eclipse.emf.compare.Comparison;

 import org.eclipse.emf.compare.Diff;

 import org.eclipse.emf.compare.DifferenceKind;

-import org.eclipse.emf.compare.EMFCompare;

-import org.eclipse.emf.compare.scope.IComparisonScope;

 import org.eclipse.emf.compare.tests.framework.AbstractInputData;

 import org.eclipse.emf.compare.uml2.internal.InterfaceRealizationChange;

 import org.eclipse.emf.compare.uml2.tests.AbstractTest;

@@ -38,8 +36,7 @@ public class AddInterfaceRealizationTest extends AbstractTest {
 		final Resource left = input.getA5Left();

 		final Resource right = input.getA5Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right);

 		testAB1(TestKind.ADD, comparison);

 

 		testMergeLeftToRight(left, right, null);

@@ -51,8 +48,7 @@ public class AddInterfaceRealizationTest extends AbstractTest {
 		final Resource left = input.getA5Left();

 		final Resource right = input.getA5Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(right, left);

 		testAB1(TestKind.DELETE, comparison);

 

 		testMergeLeftToRight(right, left, null);

@@ -64,8 +60,7 @@ public class AddInterfaceRealizationTest extends AbstractTest {
 		final Resource left = input.getA5Left();

 		final Resource right = input.getA5Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right, right);

 		testAB1(TestKind.ADD, comparison);

 

 		testMergeLeftToRight(left, right, right);

@@ -77,8 +72,7 @@ public class AddInterfaceRealizationTest extends AbstractTest {
 		final Resource left = input.getA5Left();

 		final Resource right = input.getA5Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right, left);

 		testAB1(TestKind.DELETE, comparison);

 

 		testMergeLeftToRight(left, right, left);

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 d28bae553..02cae718e 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
@@ -20,8 +20,6 @@ import java.util.List;
 import org.eclipse.emf.compare.Comparison;

 import org.eclipse.emf.compare.Diff;

 import org.eclipse.emf.compare.DifferenceKind;

-import org.eclipse.emf.compare.EMFCompare;

-import org.eclipse.emf.compare.scope.IComparisonScope;

 import org.eclipse.emf.compare.tests.framework.AbstractInputData;

 import org.eclipse.emf.compare.uml2.internal.DependencyChange;

 import org.eclipse.emf.compare.uml2.tests.AbstractTest;

@@ -40,8 +38,7 @@ public class AddRealizationTest extends AbstractTest {
 		final Resource left = input.getA6Left();

 		final Resource right = input.getA6Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right);

 		testAB1(TestKind.ADD, comparison);

 

 		testMergeLeftToRight(left, right, null);

@@ -53,8 +50,7 @@ public class AddRealizationTest extends AbstractTest {
 		final Resource left = input.getA6Left();

 		final Resource right = input.getA6Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(right, left);

 		testAB1(TestKind.DELETE, comparison);

 

 		testMergeLeftToRight(right, left, null);

@@ -66,8 +62,7 @@ public class AddRealizationTest extends AbstractTest {
 		final Resource left = input.getA6Left();

 		final Resource right = input.getA6Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right, right);

 		testAB1(TestKind.ADD, comparison);

 

 		testMergeLeftToRight(left, right, right);

@@ -79,8 +74,7 @@ public class AddRealizationTest extends AbstractTest {
 		final Resource left = input.getA6Left();

 		final Resource right = input.getA6Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right, left);

 		testAB1(TestKind.DELETE, comparison);

 

 		testMergeLeftToRight(left, right, left);

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 be85bfa4e..72ef88bdf 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
@@ -19,8 +19,6 @@ import java.util.List;
 import org.eclipse.emf.compare.Comparison;

 import org.eclipse.emf.compare.Diff;

 import org.eclipse.emf.compare.DifferenceKind;

-import org.eclipse.emf.compare.EMFCompare;

-import org.eclipse.emf.compare.scope.IComparisonScope;

 import org.eclipse.emf.compare.tests.framework.AbstractInputData;

 import org.eclipse.emf.compare.uml2.internal.SubstitutionChange;

 import org.eclipse.emf.compare.uml2.tests.AbstractTest;

@@ -40,8 +38,7 @@ public class AddSubstitutionTest extends AbstractTest {
 		final Resource left = input.getA7Left();

 		final Resource right = input.getA7Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right);

 		testAB1(TestKind.ADD, comparison);

 

 		testMergeLeftToRight(left, right, null);

@@ -53,8 +50,7 @@ public class AddSubstitutionTest extends AbstractTest {
 		final Resource left = input.getA7Left();

 		final Resource right = input.getA7Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(right, left);

 		testAB1(TestKind.DELETE, comparison);

 

 		testMergeLeftToRight(right, left, null);

@@ -66,8 +62,7 @@ public class AddSubstitutionTest extends AbstractTest {
 		final Resource left = input.getA7Left();

 		final Resource right = input.getA7Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right, right);

 		testAB1(TestKind.ADD, comparison);

 

 		testMergeLeftToRight(left, right, right);

@@ -79,8 +74,7 @@ public class AddSubstitutionTest extends AbstractTest {
 		final Resource left = input.getA7Left();

 		final Resource right = input.getA7Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right, left);

 		testAB1(TestKind.DELETE, comparison);

 

 		testMergeLeftToRight(left, right, left);

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 25b335bdb..09126bb13 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
@@ -20,8 +20,6 @@ import java.util.List;
 import org.eclipse.emf.compare.Comparison;

 import org.eclipse.emf.compare.Diff;

 import org.eclipse.emf.compare.DifferenceKind;

-import org.eclipse.emf.compare.EMFCompare;

-import org.eclipse.emf.compare.scope.IComparisonScope;

 import org.eclipse.emf.compare.tests.framework.AbstractInputData;

 import org.eclipse.emf.compare.uml2.internal.DependencyChange;

 import org.eclipse.emf.compare.uml2.tests.AbstractTest;

@@ -40,8 +38,7 @@ public class AddUsageTest extends AbstractTest {
 		final Resource left = input.getA8Left();

 		final Resource right = input.getA8Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right);

 		testAB1(TestKind.ADD, comparison);

 

 		testMergeLeftToRight(left, right, null);

@@ -53,8 +50,7 @@ public class AddUsageTest extends AbstractTest {
 		final Resource left = input.getA8Left();

 		final Resource right = input.getA8Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(right, left);

 		testAB1(TestKind.DELETE, comparison);

 

 		testMergeLeftToRight(right, left, null);

@@ -66,8 +62,7 @@ public class AddUsageTest extends AbstractTest {
 		final Resource left = input.getA8Left();

 		final Resource right = input.getA8Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right, right);

 		testAB1(TestKind.ADD, comparison);

 

 		testMergeLeftToRight(left, right, right);

@@ -79,8 +74,7 @@ public class AddUsageTest extends AbstractTest {
 		final Resource left = input.getA8Left();

 		final Resource right = input.getA8Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right, left);

 		testAB1(TestKind.DELETE, comparison);

 

 		testMergeLeftToRight(left, right, left);

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 a61b71e52..a4d6b4917 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
@@ -18,8 +18,6 @@ import java.util.List;
 import org.eclipse.emf.compare.Comparison;

 import org.eclipse.emf.compare.Diff;

 import org.eclipse.emf.compare.DifferenceKind;

-import org.eclipse.emf.compare.EMFCompare;

-import org.eclipse.emf.compare.scope.IComparisonScope;

 import org.eclipse.emf.compare.tests.framework.AbstractInputData;

 import org.eclipse.emf.compare.uml2.internal.DependencyChange;

 import org.eclipse.emf.compare.uml2.tests.AbstractTest;

@@ -37,8 +35,7 @@ public class ChangeDependencyTest extends AbstractTest {
 		final Resource left = input.getA3Left();

 		final Resource right = input.getA3Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right);

 		testAB1(TestKind.ADD, comparison);

 

 		testMergeLeftToRight(left, right, null);

@@ -50,8 +47,7 @@ public class ChangeDependencyTest extends AbstractTest {
 		final Resource left = input.getA3Left();

 		final Resource right = input.getA3Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(right, left);

 		testAB1(TestKind.DELETE, comparison);

 

 		testMergeLeftToRight(right, left, null);

@@ -63,8 +59,7 @@ public class ChangeDependencyTest extends AbstractTest {
 		final Resource left = input.getA3Left();

 		final Resource right = input.getA3Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right, right);

 		testAB1(TestKind.ADD, comparison);

 

 		testMergeLeftToRight(left, right, right);

@@ -76,8 +71,7 @@ public class ChangeDependencyTest extends AbstractTest {
 		final Resource left = input.getA3Left();

 		final Resource right = input.getA3Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right, left);

 		testAB1(TestKind.DELETE, comparison);

 

 		testMergeLeftToRight(left, right, left);

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 9e8c37f04..d77acb79a 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
@@ -18,8 +18,6 @@ import java.util.List;
 import org.eclipse.emf.compare.Comparison;

 import org.eclipse.emf.compare.Diff;

 import org.eclipse.emf.compare.DifferenceKind;

-import org.eclipse.emf.compare.EMFCompare;

-import org.eclipse.emf.compare.scope.IComparisonScope;

 import org.eclipse.emf.compare.tests.framework.AbstractInputData;

 import org.eclipse.emf.compare.uml2.internal.DependencyChange;

 import org.eclipse.emf.compare.uml2.tests.AbstractTest;

@@ -38,8 +36,7 @@ public class ChangeUsageTest extends AbstractTest {
 		final Resource left = input.getA4Left();

 		final Resource right = input.getA4Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right);

 		testAB1(TestKind.ADD, comparison);

 

 		testMergeLeftToRight(left, right, null);

@@ -51,8 +48,7 @@ public class ChangeUsageTest extends AbstractTest {
 		final Resource left = input.getA4Left();

 		final Resource right = input.getA4Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(right, left);

 		testAB1(TestKind.DELETE, comparison);

 

 		testMergeLeftToRight(right, left, null);

@@ -64,8 +60,7 @@ public class ChangeUsageTest extends AbstractTest {
 		final Resource left = input.getA4Left();

 		final Resource right = input.getA4Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right, right);

 		testAB1(TestKind.ADD, comparison);

 

 		testMergeLeftToRight(left, right, right);

@@ -77,8 +72,7 @@ public class ChangeUsageTest extends AbstractTest {
 		final Resource left = input.getA4Left();

 		final Resource right = input.getA4Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right, left);

 		testAB1(TestKind.DELETE, comparison);

 

 		testMergeLeftToRight(left, right, left);

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 e7cf00bc7..6c8c1e1f7 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
@@ -21,8 +21,6 @@ import java.util.List;
 import org.eclipse.emf.compare.Comparison;

 import org.eclipse.emf.compare.Diff;

 import org.eclipse.emf.compare.DifferenceKind;

-import org.eclipse.emf.compare.EMFCompare;

-import org.eclipse.emf.compare.scope.IComparisonScope;

 import org.eclipse.emf.compare.tests.framework.AbstractInputData;

 import org.eclipse.emf.compare.uml2.internal.ExecutionSpecificationChange;

 import org.eclipse.emf.compare.uml2.tests.AbstractTest;

@@ -40,8 +38,7 @@ public class AddActionExecutionSpecificationTest extends AbstractTest {
 		final Resource left = input.getA1Left();

 		final Resource right = input.getA1Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right);

 		testAB1(TestKind.ADD, comparison);

 

 		testMergeLeftToRight(left, right, null);

@@ -53,8 +50,7 @@ public class AddActionExecutionSpecificationTest extends AbstractTest {
 		final Resource left = input.getA1Left();

 		final Resource right = input.getA1Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(right, left);

 		testAB1(TestKind.DELETE, comparison);

 

 		testMergeLeftToRight(right, left, null);

@@ -66,8 +62,7 @@ public class AddActionExecutionSpecificationTest extends AbstractTest {
 		final Resource left = input.getA1Left();

 		final Resource right = input.getA1Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right, right);

 		testAB1(TestKind.ADD, comparison);

 

 		testMergeLeftToRight(left, right, right);

@@ -79,8 +74,7 @@ public class AddActionExecutionSpecificationTest extends AbstractTest {
 		final Resource left = input.getA1Left();

 		final Resource right = input.getA1Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right, left);

 		testAB1(TestKind.DELETE, comparison);

 

 		testMergeLeftToRight(left, right, left);

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 dae9f7815..b4213ae5c 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
@@ -21,8 +21,6 @@ import java.util.List;
 import org.eclipse.emf.compare.Comparison;

 import org.eclipse.emf.compare.Diff;

 import org.eclipse.emf.compare.DifferenceKind;

-import org.eclipse.emf.compare.EMFCompare;

-import org.eclipse.emf.compare.scope.IComparisonScope;

 import org.eclipse.emf.compare.tests.framework.AbstractInputData;

 import org.eclipse.emf.compare.uml2.internal.ExecutionSpecificationChange;

 import org.eclipse.emf.compare.uml2.tests.AbstractTest;

@@ -40,8 +38,7 @@ public class AddBehaviorExecutionSpecificationTest extends AbstractTest {
 		final Resource left = input.getA2Left();

 		final Resource right = input.getA2Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right);

 		testAB1(TestKind.ADD, comparison);

 

 		testMergeLeftToRight(left, right, null);

@@ -53,8 +50,7 @@ public class AddBehaviorExecutionSpecificationTest extends AbstractTest {
 		final Resource left = input.getA2Left();

 		final Resource right = input.getA2Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(right, left);

 		testAB1(TestKind.DELETE, comparison);

 

 		testMergeLeftToRight(right, left, null);

@@ -66,8 +62,7 @@ public class AddBehaviorExecutionSpecificationTest extends AbstractTest {
 		final Resource left = input.getA2Left();

 		final Resource right = input.getA2Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right, right);

 		testAB1(TestKind.ADD, comparison);

 

 		testMergeLeftToRight(left, right, right);

@@ -79,8 +74,7 @@ public class AddBehaviorExecutionSpecificationTest extends AbstractTest {
 		final Resource left = input.getA2Left();

 		final Resource right = input.getA2Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right, left);

 		testAB1(TestKind.DELETE, comparison);

 

 		testMergeLeftToRight(left, right, left);

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 8a41a7439..fb27d92bf 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
@@ -21,8 +21,6 @@ import java.util.List;
 import org.eclipse.emf.compare.Comparison;

 import org.eclipse.emf.compare.Diff;

 import org.eclipse.emf.compare.DifferenceKind;

-import org.eclipse.emf.compare.EMFCompare;

-import org.eclipse.emf.compare.scope.IComparisonScope;

 import org.eclipse.emf.compare.tests.framework.AbstractInputData;

 import org.eclipse.emf.compare.uml2.internal.ExtendChange;

 import org.eclipse.emf.compare.uml2.tests.AbstractTest;

@@ -40,8 +38,7 @@ public class AddExtendTest extends AbstractTest {
 		final Resource left = input.getA1Left();

 		final Resource right = input.getA1Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right);

 		testAB1(TestKind.ADD, comparison);

 

 		testMergeLeftToRight(left, right, null);

@@ -53,8 +50,7 @@ public class AddExtendTest extends AbstractTest {
 		final Resource left = input.getA1Left();

 		final Resource right = input.getA1Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(right, left);

 		testAB1(TestKind.DELETE, comparison);

 

 		testMergeLeftToRight(right, left, null);

@@ -66,8 +62,7 @@ public class AddExtendTest extends AbstractTest {
 		final Resource left = input.getA1Left();

 		final Resource right = input.getA1Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right, right);

 		testAB1(TestKind.ADD, comparison);

 

 		testMergeLeftToRight(left, right, right);

@@ -79,8 +74,7 @@ public class AddExtendTest extends AbstractTest {
 		final Resource left = input.getA1Left();

 		final Resource right = input.getA1Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right, left);

 		testAB1(TestKind.DELETE, comparison);

 

 		testMergeLeftToRight(left, right, left);

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 dd2f7df68..7dcb560e8 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
@@ -20,8 +20,6 @@ import java.util.List;
 import org.eclipse.emf.compare.Comparison;

 import org.eclipse.emf.compare.Diff;

 import org.eclipse.emf.compare.DifferenceKind;

-import org.eclipse.emf.compare.EMFCompare;

-import org.eclipse.emf.compare.scope.IComparisonScope;

 import org.eclipse.emf.compare.tests.framework.AbstractInputData;

 import org.eclipse.emf.compare.uml2.internal.GeneralizationSetChange;

 import org.eclipse.emf.compare.uml2.tests.AbstractTest;

@@ -41,8 +39,7 @@ public class AddGeneralizationSetTest extends AbstractTest {
 		final Resource left = input.getA1Left();

 		final Resource right = input.getA1Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right);

 		testAB1(TestKind.ADD, comparison);

 

 		testMergeLeftToRight(left, right, null);

@@ -54,8 +51,7 @@ public class AddGeneralizationSetTest extends AbstractTest {
 		final Resource left = input.getA1Left();

 		final Resource right = input.getA1Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(right, left);

 		testAB1(TestKind.DELETE, comparison);

 

 		testMergeLeftToRight(right, left, null);

@@ -67,8 +63,7 @@ public class AddGeneralizationSetTest extends AbstractTest {
 		final Resource left = input.getA1Left();

 		final Resource right = input.getA1Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right, right);

 		testAB1(TestKind.ADD, comparison);

 

 		testMergeLeftToRight(left, right, right);

@@ -80,8 +75,7 @@ public class AddGeneralizationSetTest extends AbstractTest {
 		final Resource left = input.getA1Left();

 		final Resource right = input.getA1Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right, left);

 		testAB1(TestKind.DELETE, comparison);

 

 		testMergeLeftToRight(left, right, left);

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 2aa8c618f..b05ff71fb 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
@@ -19,8 +19,6 @@ import java.util.List;
 import org.eclipse.emf.compare.Comparison;

 import org.eclipse.emf.compare.Diff;

 import org.eclipse.emf.compare.DifferenceKind;

-import org.eclipse.emf.compare.EMFCompare;

-import org.eclipse.emf.compare.scope.IComparisonScope;

 import org.eclipse.emf.compare.tests.framework.AbstractInputData;

 import org.eclipse.emf.compare.uml2.internal.IncludeChange;

 import org.eclipse.emf.compare.uml2.tests.AbstractTest;

@@ -38,8 +36,7 @@ public class AddIncludeTest extends AbstractTest {
 		final Resource left = input.getA1Left();

 		final Resource right = input.getA1Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right);

 		testAB1(TestKind.ADD, comparison);

 

 		testMergeLeftToRight(left, right, null);

@@ -51,8 +48,7 @@ public class AddIncludeTest extends AbstractTest {
 		final Resource left = input.getA1Left();

 		final Resource right = input.getA1Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(right, left);

 		testAB1(TestKind.DELETE, comparison);

 

 		testMergeLeftToRight(right, left, null);

@@ -64,8 +60,7 @@ public class AddIncludeTest extends AbstractTest {
 		final Resource left = input.getA1Left();

 		final Resource right = input.getA1Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right, right);

 		testAB1(TestKind.ADD, comparison);

 

 		testMergeLeftToRight(left, right, right);

@@ -77,8 +72,7 @@ public class AddIncludeTest extends AbstractTest {
 		final Resource left = input.getA1Left();

 		final Resource right = input.getA1Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right, left);

 		testAB1(TestKind.DELETE, comparison);

 

 		testMergeLeftToRight(left, right, left);

diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/merge/ExtensionMergeTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/merge/ExtensionMergeTest.java
index eca9b637e..e8efa31bd 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/merge/ExtensionMergeTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/merge/ExtensionMergeTest.java
@@ -19,12 +19,12 @@ import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.compare.AttributeChange;

 import org.eclipse.emf.compare.Comparison;

 import org.eclipse.emf.compare.Diff;

-import org.eclipse.emf.compare.EMFCompare;

 import org.eclipse.emf.compare.ReferenceChange;

 import org.eclipse.emf.compare.merge.AttributeChangeMerger;

 import org.eclipse.emf.compare.merge.IMerger;

 import org.eclipse.emf.compare.merge.ReferenceChangeMerger;

 import org.eclipse.emf.compare.merge.ResourceAttachmentChangeMerger;

+import org.eclipse.emf.compare.scope.DefaultComparisonScope;

 import org.eclipse.emf.compare.scope.IComparisonScope;

 import org.eclipse.emf.compare.tests.framework.AbstractInputData;

 import org.eclipse.emf.compare.uml2.internal.UMLDiff;

@@ -54,7 +54,7 @@ public class ExtensionMergeTest extends AbstractTest {
 	 */

 	@Override

 	protected void testMergeRightToLeft(Notifier left, Notifier right, Notifier origin) {

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

+		final IComparisonScope scope = new DefaultComparisonScope(left, right, origin);

 		final Comparison comparisonBefore = getCompare().compare(scope);

 		EList<Diff> differences = comparisonBefore.getDifferences();

 		final IMerger.Registry registry = IMerger.RegistryImpl.createStandaloneInstance();

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 8560d1dd0..6e9a5c029 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
@@ -25,8 +25,6 @@ import java.util.List;
 import org.eclipse.emf.compare.Comparison;

 import org.eclipse.emf.compare.Diff;

 import org.eclipse.emf.compare.DifferenceKind;

-import org.eclipse.emf.compare.EMFCompare;

-import org.eclipse.emf.compare.scope.IComparisonScope;

 import org.eclipse.emf.compare.tests.framework.AbstractInputData;

 import org.eclipse.emf.compare.uml2.internal.MessageChange;

 import org.eclipse.emf.compare.uml2.tests.AbstractTest;

@@ -44,8 +42,7 @@ public class AddMessageTest extends AbstractTest {
 		final Resource left = input.getA1Left();

 		final Resource right = input.getA1Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right);

 		testAB1(TestKind.ADD, comparison);

 

 		testMergeLeftToRight(left, right, null);

@@ -57,8 +54,7 @@ public class AddMessageTest extends AbstractTest {
 		final Resource left = input.getA1Left();

 		final Resource right = input.getA1Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(right, left);

 		testAB1(TestKind.DELETE, comparison);

 

 		testMergeLeftToRight(right, left, null);

@@ -70,8 +66,7 @@ public class AddMessageTest extends AbstractTest {
 		final Resource left = input.getA1Left();

 		final Resource right = input.getA1Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right, right);

 		testAB1(TestKind.ADD, comparison);

 

 		testMergeLeftToRight(left, right, right);

@@ -83,8 +78,7 @@ public class AddMessageTest extends AbstractTest {
 		final Resource left = input.getA1Left();

 		final Resource right = input.getA1Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right, left);

 		testAB1(TestKind.DELETE, comparison);

 

 		testMergeLeftToRight(left, right, left);

@@ -96,8 +90,7 @@ public class AddMessageTest extends AbstractTest {
 		final Resource left = input.getA2Left();

 		final Resource right = input.getA2Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right);

 		testAB2(TestKind.ADD, comparison);

 

 		testMergeLeftToRight(left, right, null);

@@ -109,8 +102,7 @@ public class AddMessageTest extends AbstractTest {
 		final Resource left = input.getA2Left();

 		final Resource right = input.getA2Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(right, left);

 		testAB2(TestKind.DELETE, comparison);

 

 		testMergeLeftToRight(right, left, null);

@@ -122,8 +114,7 @@ public class AddMessageTest extends AbstractTest {
 		final Resource left = input.getA2Left();

 		final Resource right = input.getA2Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right, right);

 		testAB2(TestKind.ADD, comparison);

 

 		testMergeLeftToRight(left, right, right);

@@ -135,8 +126,7 @@ public class AddMessageTest extends AbstractTest {
 		final Resource left = input.getA2Left();

 		final Resource right = input.getA2Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right, left);

 		testAB2(TestKind.DELETE, comparison);

 

 		testMergeLeftToRight(left, right, left);

@@ -148,8 +138,7 @@ public class AddMessageTest extends AbstractTest {
 		final Resource left = input.getA3Left();

 		final Resource right = input.getA3Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right);

 		testAB3(TestKind.ADD, comparison);

 

 		testMergeLeftToRight(left, right, null);

@@ -161,8 +150,7 @@ public class AddMessageTest extends AbstractTest {
 		final Resource left = input.getA3Left();

 		final Resource right = input.getA3Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(right, left);

 		testAB3(TestKind.DELETE, comparison);

 

 		testMergeLeftToRight(right, left, null);

@@ -174,8 +162,7 @@ public class AddMessageTest extends AbstractTest {
 		final Resource left = input.getA3Left();

 		final Resource right = input.getA3Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right, right);

 		testAB3(TestKind.ADD, comparison);

 

 		testMergeLeftToRight(left, right, right);

@@ -187,8 +174,7 @@ public class AddMessageTest extends AbstractTest {
 		final Resource left = input.getA3Left();

 		final Resource right = input.getA3Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right, left);

 		testAB3(TestKind.DELETE, comparison);

 

 		testMergeLeftToRight(left, right, left);

@@ -200,8 +186,7 @@ public class AddMessageTest extends AbstractTest {
 		final Resource left = input.getA4Left();

 		final Resource right = input.getA4Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right);

 		testAB1(TestKind.ADD, comparison);

 

 		testMergeLeftToRight(left, right, null);

@@ -213,8 +198,7 @@ public class AddMessageTest extends AbstractTest {
 		final Resource left = input.getA4Left();

 		final Resource right = input.getA4Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(right, left);

 		testAB1(TestKind.DELETE, comparison);

 

 		testMergeLeftToRight(right, left, null);

@@ -226,8 +210,7 @@ public class AddMessageTest extends AbstractTest {
 		final Resource left = input.getA4Left();

 		final Resource right = input.getA4Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right, right);

 		testAB1(TestKind.ADD, comparison);

 

 		testMergeLeftToRight(left, right, right);

@@ -239,8 +222,7 @@ public class AddMessageTest extends AbstractTest {
 		final Resource left = input.getA4Left();

 		final Resource right = input.getA4Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right, left);

 		testAB1(TestKind.DELETE, comparison);

 

 		testMergeLeftToRight(left, right, left);

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 7ee85a100..77ae11f0e 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
@@ -17,9 +17,7 @@ import java.util.List;
 import org.eclipse.emf.compare.Comparison;

 import org.eclipse.emf.compare.Diff;

 import org.eclipse.emf.compare.DifferenceKind;

-import org.eclipse.emf.compare.EMFCompare;

 import org.eclipse.emf.compare.ReferenceChange;

-import org.eclipse.emf.compare.scope.IComparisonScope;

 import org.eclipse.emf.compare.tests.framework.AbstractInputData;

 import org.eclipse.emf.compare.uml2.internal.ProfileApplicationChange;

 import org.eclipse.emf.compare.uml2.tests.AbstractTest;

@@ -60,8 +58,7 @@ public class ProfileTest extends AbstractTest {
 		final Resource left = staticInput.getA1Left();

 		final Resource right = staticInput.getA1Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right);

 		testAB1(TestKind.ADD, comparison);

 	}

 

@@ -86,8 +83,7 @@ public class ProfileTest extends AbstractTest {
 		final Resource left = staticInput.getA1Left();

 		final Resource right = staticInput.getA1Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(right, left);

 		testAB1(TestKind.DELETE, comparison);

 	}

 

@@ -112,8 +108,7 @@ public class ProfileTest extends AbstractTest {
 		final Resource left = staticInput.getA1Left();

 		final Resource right = staticInput.getA1Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right, right);

 		testAB1(TestKind.ADD, comparison);

 	}

 

@@ -138,8 +133,7 @@ public class ProfileTest extends AbstractTest {
 		final Resource left = staticInput.getA1Left();

 		final Resource right = staticInput.getA1Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right, left);

 		testAB1(TestKind.DELETE, comparison);

 	}

 

@@ -164,8 +158,7 @@ public class ProfileTest extends AbstractTest {
 		final Resource left = dynamicInput.getA1Left();

 		final Resource right = dynamicInput.getA1Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right);

 		testAB1(TestKind.ADD, comparison);

 	}

 

@@ -190,8 +183,7 @@ public class ProfileTest extends AbstractTest {
 		final Resource left = dynamicInput.getA1Left();

 		final Resource right = dynamicInput.getA1Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(right, left);

 		testAB1(TestKind.DELETE, comparison);

 	}

 

@@ -216,8 +208,7 @@ public class ProfileTest extends AbstractTest {
 		final Resource left = dynamicInput.getA1Left();

 		final Resource right = dynamicInput.getA1Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right, right);

 		testAB1(TestKind.ADD, comparison);

 	}

 

@@ -242,8 +233,7 @@ public class ProfileTest extends AbstractTest {
 		final Resource left = dynamicInput.getA1Left();

 		final Resource right = dynamicInput.getA1Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right, left);

 		testAB1(TestKind.DELETE, comparison);

 	}

 

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 228ac8d08..6a6310b65 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
@@ -22,10 +22,8 @@ import org.eclipse.emf.compare.AttributeChange;
 import org.eclipse.emf.compare.Comparison;

 import org.eclipse.emf.compare.Diff;

 import org.eclipse.emf.compare.DifferenceKind;

-import org.eclipse.emf.compare.EMFCompare;

 import org.eclipse.emf.compare.ReferenceChange;

 import org.eclipse.emf.compare.ResourceAttachmentChange;

-import org.eclipse.emf.compare.scope.IComparisonScope;

 import org.eclipse.emf.compare.tests.framework.AbstractInputData;

 import org.eclipse.emf.compare.uml2.internal.ProfileApplicationChange;

 import org.eclipse.emf.compare.uml2.internal.StereotypeApplicationChange;

@@ -58,8 +56,7 @@ public class DynamicStereotypeTest extends AbstractTest {
 		final Resource left = input.getA1Left();

 		final Resource right = input.getA1Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right);

 		testAB1(TestKind.ADD, comparison);

 

 		testMergeRightToLeft(left, right, null);

@@ -71,8 +68,7 @@ public class DynamicStereotypeTest extends AbstractTest {
 		final Resource left = input.getA1Left();

 		final Resource right = input.getA1Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(right, left);

 		testAB1(TestKind.DELETE, comparison);

 

 		testMergeRightToLeft(right, left, null);

@@ -84,8 +80,7 @@ public class DynamicStereotypeTest extends AbstractTest {
 		final Resource left = input.getA1Left();

 		final Resource right = input.getA1Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right, right);

 		testAB1(TestKind.ADD, comparison);

 

 		testMergeRightToLeft(left, right, right);

@@ -97,8 +92,7 @@ public class DynamicStereotypeTest extends AbstractTest {
 		final Resource left = input.getA1Left();

 		final Resource right = input.getA1Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right, left);

 		testAB1(TestKind.DELETE, comparison);

 

 		testMergeRightToLeft(left, right, left);

@@ -110,8 +104,7 @@ public class DynamicStereotypeTest extends AbstractTest {
 		final Resource left = input.getA2Left();

 		final Resource right = input.getA2Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right);

 		testAB2(TestKind.ADD, comparison);

 

 		testMergeRightToLeft(left, right, null);

@@ -123,8 +116,7 @@ public class DynamicStereotypeTest extends AbstractTest {
 		final Resource left = input.getA2Left();

 		final Resource right = input.getA2Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(right, left);

 		testAB2(TestKind.DELETE, comparison);

 

 		testMergeRightToLeft(right, left, null);

@@ -136,8 +128,7 @@ public class DynamicStereotypeTest extends AbstractTest {
 		final Resource left = input.getA2Left();

 		final Resource right = input.getA2Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right, right);

 		testAB2(TestKind.ADD, comparison);

 

 		testMergeRightToLeft(left, right, right);

@@ -149,8 +140,7 @@ public class DynamicStereotypeTest extends AbstractTest {
 		final Resource left = input.getA2Left();

 		final Resource right = input.getA2Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right, left);

 		testAB2(TestKind.DELETE, comparison);

 

 		testMergeRightToLeft(left, right, left);

@@ -162,8 +152,7 @@ public class DynamicStereotypeTest extends AbstractTest {
 		final Resource left = input.getA3Left();

 		final Resource right = input.getA3Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right);

 		testAB3(TestKind.ADD, comparison);

 

 		testMergeRightToLeft(left, right, null);

@@ -175,8 +164,7 @@ public class DynamicStereotypeTest extends AbstractTest {
 		final Resource left = input.getA3Left();

 		final Resource right = input.getA3Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(right, left);

 		testAB3(TestKind.DELETE, comparison);

 

 		testMergeRightToLeft(right, left, null);

@@ -188,8 +176,7 @@ public class DynamicStereotypeTest extends AbstractTest {
 		final Resource left = input.getA3Left();

 		final Resource right = input.getA3Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right, right);

 		testAB3(TestKind.ADD, comparison);

 

 		testMergeRightToLeft(left, right, right);

@@ -201,8 +188,7 @@ public class DynamicStereotypeTest extends AbstractTest {
 		final Resource left = input.getA3Left();

 		final Resource right = input.getA3Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right, left);

 		testAB3(TestKind.DELETE, comparison);

 

 		testMergeRightToLeft(left, right, left);

@@ -214,8 +200,7 @@ public class DynamicStereotypeTest extends AbstractTest {
 		final Resource left = input.getA4Left();

 		final Resource right = input.getA4Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right);

 		testAB4(TestKind.ADD, comparison);

 

 		testMergeRightToLeft(left, right, null);

@@ -227,8 +212,7 @@ public class DynamicStereotypeTest extends AbstractTest {
 		final Resource left = input.getA4Left();

 		final Resource right = input.getA4Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(right, left);

 		testAB4(TestKind.DELETE, comparison);

 

 		testMergeRightToLeft(right, left, null);

@@ -240,8 +224,7 @@ public class DynamicStereotypeTest extends AbstractTest {
 		final Resource left = input.getA4Left();

 		final Resource right = input.getA4Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right, right);

 		testAB4(TestKind.ADD, comparison);

 

 		testMergeRightToLeft(left, right, right);

@@ -253,8 +236,7 @@ public class DynamicStereotypeTest extends AbstractTest {
 		final Resource left = input.getA4Left();

 		final Resource right = input.getA4Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right, left);

 		testAB4(TestKind.DELETE, comparison);

 

 		testMergeRightToLeft(left, right, left);

@@ -266,8 +248,7 @@ public class DynamicStereotypeTest extends AbstractTest {
 		final Resource left = input.getA5Left();

 		final Resource right = input.getA5Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right);

 		testAB5(TestKind.ADD, comparison);

 

 		testMergeRightToLeft(left, right, null);

@@ -279,8 +260,7 @@ public class DynamicStereotypeTest extends AbstractTest {
 		final Resource left = input.getA5Left();

 		final Resource right = input.getA5Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(right, left);

 		testAB5(TestKind.DELETE, comparison);

 

 		testMergeRightToLeft(right, left, null);

@@ -292,8 +272,7 @@ public class DynamicStereotypeTest extends AbstractTest {
 		final Resource left = input.getA5Left();

 		final Resource right = input.getA5Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right, right);

 		testAB5(TestKind.ADD, comparison);

 

 		testMergeRightToLeft(left, right, right);

@@ -305,8 +284,7 @@ public class DynamicStereotypeTest extends AbstractTest {
 		final Resource left = input.getA5Left();

 		final Resource right = input.getA5Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right, left);

 		testAB5(TestKind.DELETE, comparison);

 

 		testMergeRightToLeft(left, right, left);

@@ -318,8 +296,7 @@ public class DynamicStereotypeTest extends AbstractTest {
 		final Resource left = input.getA6Left();

 		final Resource right = input.getA6Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right);

 		testAB6(TestKind.ADD, comparison);

 

 		testMergeRightToLeft(left, right, null);

@@ -331,8 +308,7 @@ public class DynamicStereotypeTest extends AbstractTest {
 		final Resource left = input.getA6Left();

 		final Resource right = input.getA6Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(right, left);

 		testAB6(TestKind.DELETE, comparison);

 

 		testMergeRightToLeft(right, left, null);

@@ -344,8 +320,7 @@ public class DynamicStereotypeTest extends AbstractTest {
 		final Resource left = input.getA6Left();

 		final Resource right = input.getA6Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right, right);

 		testAB6(TestKind.ADD, comparison);

 

 		testMergeRightToLeft(left, right, right);

@@ -357,8 +332,7 @@ public class DynamicStereotypeTest extends AbstractTest {
 		final Resource left = input.getA6Left();

 		final Resource right = input.getA6Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right, left);

 		testAB6(TestKind.DELETE, comparison);

 

 		testMergeRightToLeft(left, right, left);

@@ -370,8 +344,7 @@ public class DynamicStereotypeTest extends AbstractTest {
 		final Resource left = input.getA7Left();

 		final Resource right = input.getA7Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right);

 		testAB7(TestKind.ADD, comparison);

 

 		testMergeRightToLeft(left, right, null);

@@ -383,8 +356,7 @@ public class DynamicStereotypeTest extends AbstractTest {
 		final Resource left = input.getA7Left();

 		final Resource right = input.getA7Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(right, left);

 		testAB7(TestKind.DELETE, comparison);

 

 		testMergeRightToLeft(right, left, null);

@@ -396,8 +368,7 @@ public class DynamicStereotypeTest extends AbstractTest {
 		final Resource left = input.getA7Left();

 		final Resource right = input.getA7Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right, right);

 		testAB7(TestKind.ADD, comparison);

 

 		testMergeRightToLeft(left, right, right);

@@ -409,8 +380,7 @@ public class DynamicStereotypeTest extends AbstractTest {
 		final Resource left = input.getA7Left();

 		final Resource right = input.getA7Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right, left);

 		testAB7(TestKind.DELETE, comparison);

 

 		testMergeRightToLeft(left, right, left);

@@ -422,8 +392,7 @@ public class DynamicStereotypeTest extends AbstractTest {
 		final Resource left = input.getA8Left();

 		final Resource right = input.getA8Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right);

 		testAB8(TestKind.ADD, comparison);

 

 		testMergeRightToLeft(left, right, null);

@@ -435,8 +404,7 @@ public class DynamicStereotypeTest extends AbstractTest {
 		final Resource left = input.getA8Left();

 		final Resource right = input.getA8Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(right, left);

 		testAB8(TestKind.DELETE, comparison);

 

 		testMergeRightToLeft(right, left, null);

@@ -448,8 +416,7 @@ public class DynamicStereotypeTest extends AbstractTest {
 		final Resource left = input.getA8Left();

 		final Resource right = input.getA8Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right, right);

 		testAB8(TestKind.ADD, comparison);

 

 		testMergeRightToLeft(left, right, right);

@@ -461,8 +428,7 @@ public class DynamicStereotypeTest extends AbstractTest {
 		final Resource left = input.getA8Left();

 		final Resource right = input.getA8Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right, left);

 		testAB8(TestKind.DELETE, comparison);

 

 		testMergeRightToLeft(left, right, left);

@@ -474,8 +440,7 @@ public class DynamicStereotypeTest extends AbstractTest {
 		final Resource left = input.getA9Left();

 		final Resource right = input.getA9Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right);

 		testAB9(TestKind.ADD, comparison);

 

 		testMergeRightToLeft(left, right, null);

@@ -487,8 +452,7 @@ public class DynamicStereotypeTest extends AbstractTest {
 		final Resource left = input.getA9Left();

 		final Resource right = input.getA9Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(right, left);

 		testAB9(TestKind.DELETE, comparison);

 

 		testMergeRightToLeft(right, left, null);

@@ -500,8 +464,7 @@ public class DynamicStereotypeTest extends AbstractTest {
 		final Resource left = input.getA9Left();

 		final Resource right = input.getA9Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right, right);

 		testAB9(TestKind.ADD, comparison);

 

 		testMergeRightToLeft(left, right, right);

@@ -513,8 +476,7 @@ public class DynamicStereotypeTest extends AbstractTest {
 		final Resource left = input.getA9Left();

 		final Resource right = input.getA9Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right, left);

 		testAB9(TestKind.DELETE, comparison);

 

 		testMergeRightToLeft(left, right, left);

@@ -526,8 +488,7 @@ public class DynamicStereotypeTest extends AbstractTest {
 		final Resource left = input.getA10Left();

 		final Resource right = input.getA10Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right);

 		testAB10(TestKind.ADD, comparison);

 

 		testMergeRightToLeft(left, right, null);

@@ -539,8 +500,7 @@ public class DynamicStereotypeTest extends AbstractTest {
 		final Resource left = input.getA10Left();

 		final Resource right = input.getA10Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(right, left);

 		testAB10(TestKind.DELETE, comparison);

 

 		testMergeRightToLeft(right, left, null);

@@ -552,8 +512,7 @@ public class DynamicStereotypeTest extends AbstractTest {
 		final Resource left = input.getA10Left();

 		final Resource right = input.getA10Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right, right);

 		testAB10(TestKind.ADD, comparison);

 

 		testMergeRightToLeft(left, right, right);

@@ -565,8 +524,7 @@ public class DynamicStereotypeTest extends AbstractTest {
 		final Resource left = input.getA10Left();

 		final Resource right = input.getA10Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right, left);

 		testAB10(TestKind.DELETE, comparison);

 

 		testMergeRightToLeft(left, right, left);

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 fc193df58..be6fd8706 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
@@ -22,10 +22,8 @@ import org.eclipse.emf.compare.AttributeChange;
 import org.eclipse.emf.compare.Comparison;

 import org.eclipse.emf.compare.Diff;

 import org.eclipse.emf.compare.DifferenceKind;

-import org.eclipse.emf.compare.EMFCompare;

 import org.eclipse.emf.compare.ReferenceChange;

 import org.eclipse.emf.compare.ResourceAttachmentChange;

-import org.eclipse.emf.compare.scope.IComparisonScope;

 import org.eclipse.emf.compare.tests.framework.AbstractInputData;

 import org.eclipse.emf.compare.uml2.internal.ProfileApplicationChange;

 import org.eclipse.emf.compare.uml2.internal.StereotypeApplicationChange;

@@ -58,8 +56,7 @@ public class StaticStereotypeTest extends AbstractTest {
 		final Resource left = input.getB1Left();

 		final Resource right = input.getB1Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right);

 		testAB1(TestKind.ADD, comparison);

 	}

 

@@ -84,8 +81,7 @@ public class StaticStereotypeTest extends AbstractTest {
 		final Resource left = input.getB1Left();

 		final Resource right = input.getB1Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(right, left);

 		testAB1(TestKind.DELETE, comparison);

 	}

 

@@ -110,8 +106,7 @@ public class StaticStereotypeTest extends AbstractTest {
 		final Resource left = input.getB1Left();

 		final Resource right = input.getB1Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right, right);

 		testAB1(TestKind.ADD, comparison);

 	}

 

@@ -136,8 +131,7 @@ public class StaticStereotypeTest extends AbstractTest {
 		final Resource left = input.getB1Left();

 		final Resource right = input.getB1Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right, left);

 		testAB1(TestKind.DELETE, comparison);

 	}

 

@@ -162,8 +156,7 @@ public class StaticStereotypeTest extends AbstractTest {
 		final Resource left = input.getB2Left();

 		final Resource right = input.getB2Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right);

 		testAB2(TestKind.ADD, comparison);

 	}

 

@@ -188,8 +181,7 @@ public class StaticStereotypeTest extends AbstractTest {
 		final Resource left = input.getB2Left();

 		final Resource right = input.getB2Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(right, left);

 		testAB2(TestKind.DELETE, comparison);

 	}

 

@@ -214,8 +206,7 @@ public class StaticStereotypeTest extends AbstractTest {
 		final Resource left = input.getB2Left();

 		final Resource right = input.getB2Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right, right);

 		testAB2(TestKind.ADD, comparison);

 	}

 

@@ -240,8 +231,7 @@ public class StaticStereotypeTest extends AbstractTest {
 		final Resource left = input.getB2Left();

 		final Resource right = input.getB2Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right, left);

 		testAB2(TestKind.DELETE, comparison);

 	}

 

@@ -266,8 +256,7 @@ public class StaticStereotypeTest extends AbstractTest {
 		final Resource left = input.getB3Left();

 		final Resource right = input.getB3Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right);

 		testAB3(TestKind.ADD, comparison);

 	}

 

@@ -292,8 +281,7 @@ public class StaticStereotypeTest extends AbstractTest {
 		final Resource left = input.getB3Left();

 		final Resource right = input.getB3Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(right, left);

 		testAB3(TestKind.DELETE, comparison);

 	}

 

@@ -318,8 +306,7 @@ public class StaticStereotypeTest extends AbstractTest {
 		final Resource left = input.getB3Left();

 		final Resource right = input.getB3Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right, right);

 		testAB3(TestKind.ADD, comparison);

 	}

 

@@ -344,8 +331,7 @@ public class StaticStereotypeTest extends AbstractTest {
 		final Resource left = input.getB3Left();

 		final Resource right = input.getB3Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right, left);

 		testAB3(TestKind.DELETE, comparison);

 	}

 

@@ -370,8 +356,7 @@ public class StaticStereotypeTest extends AbstractTest {
 		final Resource left = input.getB4Left();

 		final Resource right = input.getB4Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right);

 		testAB4(TestKind.ADD, comparison);

 

 		testMergeRightToLeft(left, right, null);

@@ -383,8 +368,7 @@ public class StaticStereotypeTest extends AbstractTest {
 		final Resource left = input.getB4Left();

 		final Resource right = input.getB4Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(right, left);

 		testAB4(TestKind.DELETE, comparison);

 

 		testMergeRightToLeft(right, left, null);

@@ -396,8 +380,7 @@ public class StaticStereotypeTest extends AbstractTest {
 		final Resource left = input.getB4Left();

 		final Resource right = input.getB4Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right, right);

 		testAB4(TestKind.ADD, comparison);

 

 		testMergeRightToLeft(left, right, right);

@@ -409,8 +392,7 @@ public class StaticStereotypeTest extends AbstractTest {
 		final Resource left = input.getB4Left();

 		final Resource right = input.getB4Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right, left);

 		testAB4(TestKind.DELETE, comparison);

 

 		testMergeRightToLeft(left, right, left);

@@ -422,8 +404,7 @@ public class StaticStereotypeTest extends AbstractTest {
 		final Resource left = input.getB5Left();

 		final Resource right = input.getB5Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right);

 		testAB5(TestKind.ADD, comparison);

 

 		testMergeRightToLeft(left, right, null);

@@ -435,8 +416,7 @@ public class StaticStereotypeTest extends AbstractTest {
 		final Resource left = input.getB5Left();

 		final Resource right = input.getB5Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(right, left);

 		testAB5(TestKind.DELETE, comparison);

 

 		testMergeRightToLeft(right, left, null);

@@ -448,8 +428,7 @@ public class StaticStereotypeTest extends AbstractTest {
 		final Resource left = input.getB5Left();

 		final Resource right = input.getB5Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right, right);

 		testAB5(TestKind.ADD, comparison);

 

 		testMergeRightToLeft(left, right, right);

@@ -461,8 +440,7 @@ public class StaticStereotypeTest extends AbstractTest {
 		final Resource left = input.getB5Left();

 		final Resource right = input.getB5Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right, left);

 		testAB5(TestKind.DELETE, comparison);

 

 		testMergeRightToLeft(left, right, left);

@@ -474,8 +452,7 @@ public class StaticStereotypeTest extends AbstractTest {
 		final Resource left = input.getB6Left();

 		final Resource right = input.getB6Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right);

 		testAB6(TestKind.ADD, comparison);

 

 		testMergeRightToLeft(left, right, null);

@@ -487,8 +464,7 @@ public class StaticStereotypeTest extends AbstractTest {
 		final Resource left = input.getB6Left();

 		final Resource right = input.getB6Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(right, left);

 		testAB6(TestKind.DELETE, comparison);

 

 		testMergeRightToLeft(right, left, null);

@@ -500,8 +476,7 @@ public class StaticStereotypeTest extends AbstractTest {
 		final Resource left = input.getB6Left();

 		final Resource right = input.getB6Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right, right);

 		testAB6(TestKind.ADD, comparison);

 

 		testMergeRightToLeft(left, right, right);

@@ -513,8 +488,7 @@ public class StaticStereotypeTest extends AbstractTest {
 		final Resource left = input.getB6Left();

 		final Resource right = input.getB6Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right, left);

 		testAB6(TestKind.DELETE, comparison);

 

 		testMergeRightToLeft(left, right, left);

@@ -526,8 +500,7 @@ public class StaticStereotypeTest extends AbstractTest {
 		final Resource left = input.getB7Left();

 		final Resource right = input.getB7Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right);

 		testAB7(TestKind.ADD, comparison);

 

 		testMergeRightToLeft(left, right, null);

@@ -539,8 +512,7 @@ public class StaticStereotypeTest extends AbstractTest {
 		final Resource left = input.getB7Left();

 		final Resource right = input.getB7Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(right, left);

 		testAB7(TestKind.DELETE, comparison);

 

 		testMergeRightToLeft(right, left, null);

@@ -552,8 +524,7 @@ public class StaticStereotypeTest extends AbstractTest {
 		final Resource left = input.getB7Left();

 		final Resource right = input.getB7Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right, right);

 		testAB7(TestKind.ADD, comparison);

 

 		testMergeRightToLeft(left, right, right);

@@ -565,8 +536,7 @@ public class StaticStereotypeTest extends AbstractTest {
 		final Resource left = input.getB7Left();

 		final Resource right = input.getB7Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right, left);

 		testAB7(TestKind.DELETE, comparison);

 

 		testMergeRightToLeft(left, right, left);

@@ -578,8 +548,7 @@ public class StaticStereotypeTest extends AbstractTest {
 		final Resource left = input.getB8Left();

 		final Resource right = input.getB8Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right);

 		testAB8(TestKind.ADD, comparison);

 

 		testMergeRightToLeft(left, right, null);

@@ -591,8 +560,7 @@ public class StaticStereotypeTest extends AbstractTest {
 		final Resource left = input.getB8Left();

 		final Resource right = input.getB8Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(right, left);

 		testAB8(TestKind.DELETE, comparison);

 

 		testMergeRightToLeft(right, left, null);

@@ -604,8 +572,7 @@ public class StaticStereotypeTest extends AbstractTest {
 		final Resource left = input.getB8Left();

 		final Resource right = input.getB8Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right, right);

 		testAB8(TestKind.ADD, comparison);

 

 		testMergeRightToLeft(left, right, right);

@@ -617,8 +584,7 @@ public class StaticStereotypeTest extends AbstractTest {
 		final Resource left = input.getB8Left();

 		final Resource right = input.getB8Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right, left);

 		testAB8(TestKind.DELETE, comparison);

 

 		testMergeRightToLeft(left, right, left);

@@ -630,8 +596,7 @@ public class StaticStereotypeTest extends AbstractTest {
 		final Resource left = input.getB9Left();

 		final Resource right = input.getB9Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right);

 		testAB9(TestKind.ADD, comparison);

 

 		testMergeRightToLeft(left, right, null);

@@ -643,8 +608,7 @@ public class StaticStereotypeTest extends AbstractTest {
 		final Resource left = input.getB9Left();

 		final Resource right = input.getB9Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(right, left);

 		testAB9(TestKind.DELETE, comparison);

 

 		testMergeRightToLeft(right, left, null);

@@ -656,8 +620,7 @@ public class StaticStereotypeTest extends AbstractTest {
 		final Resource left = input.getB9Left();

 		final Resource right = input.getB9Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right, right);

 		testAB9(TestKind.ADD, comparison);

 

 		testMergeRightToLeft(left, right, right);

@@ -669,8 +632,7 @@ public class StaticStereotypeTest extends AbstractTest {
 		final Resource left = input.getB9Left();

 		final Resource right = input.getB9Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right, left);

 		testAB9(TestKind.DELETE, comparison);

 

 		testMergeRightToLeft(left, right, left);

@@ -682,8 +644,7 @@ public class StaticStereotypeTest extends AbstractTest {
 		final Resource left = input.getB10Left();

 		final Resource right = input.getB10Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right);

 		testAB10(TestKind.ADD, comparison);

 

 		testMergeRightToLeft(left, right, null);

@@ -695,8 +656,7 @@ public class StaticStereotypeTest extends AbstractTest {
 		final Resource left = input.getB10Left();

 		final Resource right = input.getB10Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(right, left);

 		testAB10(TestKind.DELETE, comparison);

 

 		testMergeRightToLeft(right, left, null);

@@ -708,8 +668,7 @@ public class StaticStereotypeTest extends AbstractTest {
 		final Resource left = input.getB10Left();

 		final Resource right = input.getB10Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right, right);

 		testAB10(TestKind.ADD, comparison);

 

 		testMergeRightToLeft(left, right, right);

@@ -721,8 +680,7 @@ public class StaticStereotypeTest extends AbstractTest {
 		final Resource left = input.getB10Left();

 		final Resource right = input.getB10Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right, left);

 		testAB10(TestKind.DELETE, comparison);

 

 		testMergeRightToLeft(left, right, left);

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 46cf66fc5..e1ad4563b 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
@@ -21,16 +21,12 @@ import java.util.List;
 import org.eclipse.emf.compare.Comparison;

 import org.eclipse.emf.compare.Diff;

 import org.eclipse.emf.compare.DifferenceKind;

-import org.eclipse.emf.compare.EMFCompare;

-import org.eclipse.emf.compare.scope.IComparisonScope;

 import org.eclipse.emf.compare.tests.framework.AbstractInputData;

 import org.eclipse.emf.compare.uml2.internal.IntervalConstraintChange;

 import org.eclipse.emf.compare.uml2.tests.AbstractTest;

 import org.eclipse.emf.compare.uml2.tests.timeConstraint.data.TimeConstraintInputData;

 import org.eclipse.emf.ecore.resource.Resource;

 import org.junit.Test;

-//import static org.eclipse.emf.compare.utils.EMFComparePredicates.added;

-//import static org.eclipse.emf.compare.utils.EMFComparePredicates.removed;

 

 @SuppressWarnings("nls")

 public class AddTimeConstraintTest extends AbstractTest {

@@ -42,8 +38,7 @@ public class AddTimeConstraintTest extends AbstractTest {
 		final Resource left = input.getA1Left();

 		final Resource right = input.getA1Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right);

 		testAB1(TestKind.ADD, comparison);

 

 		testMergeLeftToRight(left, right, null);

@@ -55,8 +50,7 @@ public class AddTimeConstraintTest extends AbstractTest {
 		final Resource left = input.getA1Left();

 		final Resource right = input.getA1Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(right, left);

 		testAB1(TestKind.DELETE, comparison);

 

 		testMergeLeftToRight(right, left, null);

@@ -68,8 +62,7 @@ public class AddTimeConstraintTest extends AbstractTest {
 		final Resource left = input.getA1Left();

 		final Resource right = input.getA1Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right, right);

 		testAB1(TestKind.ADD, comparison);

 

 		testMergeLeftToRight(left, right, right);

@@ -81,8 +74,7 @@ public class AddTimeConstraintTest extends AbstractTest {
 		final Resource left = input.getA1Left();

 		final Resource right = input.getA1Right();

 

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

-		final Comparison comparison = getCompare().compare(scope);

+		final Comparison comparison = compare(left, right, left);

 		testAB1(TestKind.DELETE, comparison);

 

 		testMergeLeftToRight(left, right, left);