Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAxel Richard2015-06-03 09:23:35 -0400
committerAxel RICHARD2015-06-10 05:53:00 -0400
commitebabf7d84960a3f18cfb2c9e8e806444f5c49da3 (patch)
tree75cd6e140b5f28d9712a899a3a025c0686105474 /plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/suite
parent7bdc3d62a8b80947f0476326998330809dabea14 (diff)
downloadorg.eclipse.emf.compare-ebabf7d84960a3f18cfb2c9e8e806444f5c49da3.tar.gz
org.eclipse.emf.compare-ebabf7d84960a3f18cfb2c9e8e806444f5c49da3.tar.xz
org.eclipse.emf.compare-ebabf7d84960a3f18cfb2c9e8e806444f5c49da3.zip
[469237] Merge Refining diffs if all refined diffs have been merged
If a diff refines another, we have to check if the "macro" diff has to be merged with it. Also add test case. Bug: 469237 Change-Id: Ieb6cf681c7f6e0255eb061da9b69605a513aa655 Signed-off-by: Axel Richard <axel.richard@obeo.fr>
Diffstat (limited to 'plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/suite')
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/suite/AllTests.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/suite/AllTests.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/suite/AllTests.java
index 5ea30df1d..ed7d9e2c5 100644
--- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/suite/AllTests.java
+++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/suite/AllTests.java
@@ -51,6 +51,7 @@ import org.eclipse.emf.compare.tests.merge.IndividualMergeTest;
import org.eclipse.emf.compare.tests.merge.MultiLineAttributeMergeTest;
import org.eclipse.emf.compare.tests.merge.MultipleMergeTest;
import org.eclipse.emf.compare.tests.merge.PseudoConflictMergeTest;
+import org.eclipse.emf.compare.tests.merge.RefineMergeTest;
import org.eclipse.emf.compare.tests.merge.ThreeWayBatchMergingTest;
import org.eclipse.emf.compare.tests.merge.TwoWayBatchMergingTest;
import org.eclipse.emf.compare.tests.monitor.MonitorCancelTest;
@@ -89,7 +90,7 @@ import org.junit.runners.Suite.SuiteClasses;
FeatureFilterTest.class, ThreeWayBatchMergingTest.class,
MultiLineAttributeConflictDetectionTest.class, ThreeWayTextDiffTest.class,
MultiLineAttributeMergeTest.class, MonitorCancelTest.class, IdentifierEObjectMatcherTest.class,
- MatchUtilFeatureContainsTest.class })
+ MatchUtilFeatureContainsTest.class, RefineMergeTest.class })
public class AllTests {
/**
* Standalone launcher for all of compare's tests.

Back to the top