Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAxel Richard2015-03-16 09:55:51 -0400
committerPhilip Langer2015-03-17 05:41:12 -0400
commita4164f67c1644846b4e863ed6607f0cb4ccd0390 (patch)
tree791fac89884e7d78c8f1dc9fd36b9021a98abe46 /plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/suite
parentc3bfdc0ec922dd129c3a6766287f64439fb32a7e (diff)
downloadorg.eclipse.emf.compare-a4164f67c1644846b4e863ed6607f0cb4ccd0390.tar.gz
org.eclipse.emf.compare-a4164f67c1644846b4e863ed6607f0cb4ccd0390.tar.xz
org.eclipse.emf.compare-a4164f67c1644846b4e863ed6607f0cb4ccd0390.zip
[462203] Child match appear as top-level match.
Reorganize matches in IdentifierEObjectMatcher class to avoid root matches that are actually child matches. Bug: 462203 Change-Id: I0045b96cbf7805c3e7e19f6e2fa4ed3bb6085c85 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 5e062a038..20767fe68 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
@@ -34,6 +34,7 @@ import org.eclipse.emf.compare.tests.fullcomparison.DynamicInstanceComparisonTes
import org.eclipse.emf.compare.tests.fullcomparison.ExtLibraryTest;
import org.eclipse.emf.compare.tests.fullcomparison.IdentifierComparisonTest;
import org.eclipse.emf.compare.tests.fullcomparison.ProximityComparisonTest;
+import org.eclipse.emf.compare.tests.match.IdentifierEObjectMatcherTest;
import org.eclipse.emf.compare.tests.match.MatchEngineFactoryRegistryTest;
import org.eclipse.emf.compare.tests.match.ProximityIndexTest;
import org.eclipse.emf.compare.tests.match.ProxyMatchingTest;
@@ -85,7 +86,7 @@ import org.junit.runners.Suite.SuiteClasses;
FeatureMapsPseudoConflictsMergeTest.class, TwoWayBatchMergingTest.class, EqualityHelperTest.class,
FeatureFilterTest.class, ThreeWayBatchMergingTest.class,
MultiLineAttributeConflictDetectionTest.class, ThreeWayTextDiffTest.class,
- MultiLineAttributeMergeTest.class, MonitorCancelTest.class })
+ MultiLineAttributeMergeTest.class, MonitorCancelTest.class, IdentifierEObjectMatcherTest.class })
public class AllTests {
/**
* Standalone launcher for all of compare's tests.

Back to the top