diff options
| author | Laurent Delaigue | 2017-02-02 13:32:25 +0000 |
|---|---|---|
| committer | Laurent Delaigue | 2017-03-14 09:55:56 +0000 |
| commit | b1ff6cc006e1fb1160d4aeccd9bfdf49b1d39a92 (patch) | |
| tree | cdf058e62107da1de5840b9392d61a3b4828b60c /plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/structuremergeviewer/actions/TestBug470503.java | |
| parent | b599b8cd35475a5485b939ab0511f079484906e0 (diff) | |
| download | org.eclipse.emf.compare-b1ff6cc006e1fb1160d4aeccd9bfdf49b1d39a92.tar.gz org.eclipse.emf.compare-b1ff6cc006e1fb1160d4aeccd9bfdf49b1d39a92.tar.xz org.eclipse.emf.compare-b1ff6cc006e1fb1160d4aeccd9bfdf49b1d39a92.zip | |
Improve final state and MergeData when merging
Mergers now properly set the final state of diffs according to whether
they were accepted or rejected.
We now install a DiffStateAdapter on the comparison and all its diffs to
listen to diff state changes and update MergeData accordingly.
Change-Id: Ib0945557e4a90feab82280a773ab49237e31c0ce
Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>
Diffstat (limited to 'plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/structuremergeviewer/actions/TestBug470503.java')
| -rw-r--r-- | plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/structuremergeviewer/actions/TestBug470503.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/structuremergeviewer/actions/TestBug470503.java b/plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/structuremergeviewer/actions/TestBug470503.java index 73f74ffa4..206048cb8 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/structuremergeviewer/actions/TestBug470503.java +++ b/plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/structuremergeviewer/actions/TestBug470503.java @@ -112,13 +112,13 @@ public class TestBug470503 extends AbstractTestUITreeNodeItemProviderAdapter { action.updateSelection(new StructuredSelection(titledItemESuperTypesDelete)); setCascadingDifferencesFilterEnabled(cascadingFilter); action.run(); - assertEquals(DifferenceState.MERGED, titledItemESuperTypesDeleteDiff.getState()); + assertEquals(DifferenceState.DISCARDED, titledItemESuperTypesDeleteDiff.getState()); Diff titledItemEClassifiersDeleteDiff = (Diff)titledItemEClassifiersDelete.getData(); - assertEquals(DifferenceState.MERGED, titledItemEClassifiersDeleteDiff.getState()); + assertEquals(DifferenceState.DISCARDED, titledItemEClassifiersDeleteDiff.getState()); Diff titleESFDeleteDiff = (Diff)titleESFDelete.getData(); - assertEquals(DifferenceState.MERGED, titleESFDeleteDiff.getState()); + assertEquals(DifferenceState.DISCARDED, titleESFDeleteDiff.getState()); } @Test @@ -139,10 +139,10 @@ public class TestBug470503 extends AbstractTestUITreeNodeItemProviderAdapter { action.updateSelection(new StructuredSelection(titledItemESuperTypesDelete)); setCascadingDifferencesFilterEnabled(cascadingFilter); action.run(); - assertEquals(DifferenceState.MERGED, titledItemESuperTypesDeleteDiff.getState()); + assertEquals(DifferenceState.DISCARDED, titledItemESuperTypesDeleteDiff.getState()); Diff titledItemEClassifiersDeleteDiff = (Diff)titledItemEClassifiersDelete.getData(); - assertEquals(DifferenceState.MERGED, titledItemEClassifiersDeleteDiff.getState()); + assertEquals(DifferenceState.DISCARDED, titledItemEClassifiersDeleteDiff.getState()); Diff titleESFDeleteDiff = (Diff)titleESFDelete.getData(); assertEquals(DifferenceState.UNRESOLVED, titleESFDeleteDiff.getState()); |