diff options
Diffstat (limited to 'plugins/org.eclipse.emf.compare.rcp.ui.tests/src/org/eclipse/emf/compare/rcp/ui/tests/structuremergeviewer/groups/ConflictsGroupWithRefinedDiffTestScenario.java')
-rw-r--r-- | plugins/org.eclipse.emf.compare.rcp.ui.tests/src/org/eclipse/emf/compare/rcp/ui/tests/structuremergeviewer/groups/ConflictsGroupWithRefinedDiffTestScenario.java | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/plugins/org.eclipse.emf.compare.rcp.ui.tests/src/org/eclipse/emf/compare/rcp/ui/tests/structuremergeviewer/groups/ConflictsGroupWithRefinedDiffTestScenario.java b/plugins/org.eclipse.emf.compare.rcp.ui.tests/src/org/eclipse/emf/compare/rcp/ui/tests/structuremergeviewer/groups/ConflictsGroupWithRefinedDiffTestScenario.java index e271b0288..95f973a3c 100644 --- a/plugins/org.eclipse.emf.compare.rcp.ui.tests/src/org/eclipse/emf/compare/rcp/ui/tests/structuremergeviewer/groups/ConflictsGroupWithRefinedDiffTestScenario.java +++ b/plugins/org.eclipse.emf.compare.rcp.ui.tests/src/org/eclipse/emf/compare/rcp/ui/tests/structuremergeviewer/groups/ConflictsGroupWithRefinedDiffTestScenario.java @@ -19,6 +19,23 @@ import org.eclipse.emf.compare.Diff; import org.eclipse.emf.compare.DifferenceSource; import org.eclipse.emf.compare.Match; +/** + * This test scenario creates a comparison like this: + * <ul> + * <li>diff1 (LEFT), refined by + * <ul> + * <li>diff1a (LEFT)</li> + * <li>diff1b (RIGHT)</li> + * </ul> + * </li> + * <li>diff2 (RIGHT), refined by + * <ul> + * <li>diff2a (LEFT)</li> + * <li>diff2b (RIGHT)</li> + * </ul> + * </li> + * </ul> + */ public class ConflictsGroupWithRefinedDiffTestScenario { private static final CompareFactory FACTORY = CompareFactory.eINSTANCE; @@ -73,6 +90,14 @@ public class ConflictsGroupWithRefinedDiffTestScenario { comparison.getMatches().add(match1); } + /** + * Add a conflict between 2 existing differences of this scenario's comparison. + * + * @param conflictingDiff1 + * @param conflictingDiff2 + * @param kind + * @return The created conflict. + */ Conflict addConflict(Diff conflictingDiff1, Diff conflictingDiff2, ConflictKind kind) { final Conflict conflict = FACTORY.createConflict(); conflict.getDifferences().add(conflictingDiff1); |