diff options
Diffstat (limited to 'plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/checkers/MergeDependenciesChecker.java')
| -rw-r--r-- | plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/checkers/MergeDependenciesChecker.java | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/checkers/MergeDependenciesChecker.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/checkers/MergeDependenciesChecker.java index 872a55dcb..e0e6d4055 100644 --- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/checkers/MergeDependenciesChecker.java +++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/checkers/MergeDependenciesChecker.java @@ -7,10 +7,10 @@ import com.google.common.collect.Sets; import java.util.Set; import org.eclipse.emf.compare.Diff; -import org.eclipse.emf.compare.internal.merge.MergeDependenciesUtil; +import org.eclipse.emf.compare.merge.DiffRelationshipComputer; +import org.eclipse.emf.compare.merge.IDiffRelationshipComputer; import org.eclipse.emf.compare.merge.IMerger; -@SuppressWarnings("restriction") public class MergeDependenciesChecker { private IMerger.Registry registry; @@ -58,10 +58,9 @@ public class MergeDependenciesChecker { } public void check() { - Set<Diff> allResultingMerges = MergeDependenciesUtil.getAllResultingMerges(diff, registry, - this.rightToLeft); - Set<Diff> allResultingRejections = MergeDependenciesUtil.getAllResultingRejections(diff, registry, - this.rightToLeft); + IDiffRelationshipComputer computer = new DiffRelationshipComputer(registry); + Set<Diff> allResultingMerges = computer.getAllResultingMerges(diff, this.rightToLeft); + Set<Diff> allResultingRejections = computer.getAllResultingRejections(diff, this.rightToLeft); assertEquals(this.nbMerges, Sets.difference(allResultingMerges, allResultingRejections).size()); assertEquals(this.nbRejections, allResultingRejections.size()); } |