Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Goubet2013-06-19 05:28:43 -0400
committerLaurent Goubet2013-06-19 08:13:24 -0400
commit4dff57de2128cb9e0220651059496bb6e106132c (patch)
tree115dd1c469ad46f4891bddafdd325315e71ac8a8 /plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/diff
parent3284cfba4bf142bcc98459084f7ef0c9d3b05a64 (diff)
downloadorg.eclipse.emf.compare-4dff57de2128cb9e0220651059496bb6e106132c.tar.gz
org.eclipse.emf.compare-4dff57de2128cb9e0220651059496bb6e106132c.tar.xz
org.eclipse.emf.compare-4dff57de2128cb9e0220651059496bb6e106132c.zip
Deprecate use of EMFCompare#createDefaultScope(...)
Diffstat (limited to 'plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/diff')
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/diff/DiffUtilTest.java5
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/diff/LCSPerformanceTest.java7
2 files changed, 7 insertions, 5 deletions
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/diff/DiffUtilTest.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/diff/DiffUtilTest.java
index eeb145f90..34cb0b6a7 100644
--- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/diff/DiffUtilTest.java
+++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/diff/DiffUtilTest.java
@@ -32,6 +32,7 @@ import org.eclipse.emf.compare.Diff;
import org.eclipse.emf.compare.DifferenceKind;
import org.eclipse.emf.compare.DifferenceSource;
import org.eclipse.emf.compare.EMFCompare;
+import org.eclipse.emf.compare.scope.DefaultComparisonScope;
import org.eclipse.emf.compare.scope.IComparisonScope;
import org.eclipse.emf.compare.tests.fullcomparison.data.identifier.IdentifierMatchInputData;
import org.eclipse.emf.compare.utils.DiffUtil;
@@ -485,7 +486,7 @@ public class DiffUtilTest {
final Resource right = inputData.getExtlibraryRight();
// 2-way
- IComparisonScope scope = EMFCompare.createDefaultScope(left, right);
+ IComparisonScope scope = new DefaultComparisonScope(left, right, null);
Comparison comparison = EMFCompare.builder().build().compare(scope);
List<Diff> differences = comparison.getDifferences();
@@ -521,7 +522,7 @@ public class DiffUtilTest {
assertEquals(5, Iterables.size(subDiffs));
// 3-way
- scope = EMFCompare.createDefaultScope(left, right, origin);
+ scope = new DefaultComparisonScope(left, right, origin);
comparison = EMFCompare.builder().build().compare(scope);
differences = comparison.getDifferences();
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/diff/LCSPerformanceTest.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/diff/LCSPerformanceTest.java
index a6bc4ab15..19feebab1 100644
--- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/diff/LCSPerformanceTest.java
+++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/diff/LCSPerformanceTest.java
@@ -26,6 +26,7 @@ import org.eclipse.emf.compare.EMFCompare;
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.scope.DefaultComparisonScope;
import org.eclipse.emf.compare.scope.IComparisonScope;
import org.eclipse.emf.compare.tests.nodes.Node;
import org.eclipse.emf.compare.tests.nodes.NodesFactory;
@@ -70,7 +71,7 @@ public class LCSPerformanceTest {
final Node rightRoot = (Node)right.getContents().get(0);
assertTrue(rightRoot.eContents().size() == 200);
- IComparisonScope scope = EMFCompare.createDefaultScope(left, right);
+ IComparisonScope scope = new DefaultComparisonScope(left, right, null);
Comparison comparison = EMFCompare.builder().build().compare(scope);
final List<Diff> additions = Lists.newArrayList();
@@ -106,7 +107,7 @@ public class LCSPerformanceTest {
@Ignore
@Test(timeout = 40000)
public void copyLeftToRight() {
- IComparisonScope scope = EMFCompare.createDefaultScope(left, right);
+ IComparisonScope scope = new DefaultComparisonScope(left, right, null);
Comparison comparison = EMFCompare.builder().build().compare(scope);
final IMerger.Registry registry = IMerger.RegistryImpl.createStandaloneInstance();
@@ -130,7 +131,7 @@ public class LCSPerformanceTest {
@Ignore
@Test(timeout = 3000)
public void copyRightToLeft() {
- IComparisonScope scope = EMFCompare.createDefaultScope(left, right);
+ IComparisonScope scope = new DefaultComparisonScope(left, right, null);
Comparison comparison = EMFCompare.builder().build().compare(scope);
final IMerger.Registry registry = IMerger.RegistryImpl.createStandaloneInstance();

Back to the top