Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Dirix2015-02-27 08:16:32 -0500
committerAxel RICHARD2015-03-09 04:12:25 -0400
commit92029f6241a7a1a0e7e6584690ec43a746938fd6 (patch)
treec03a17ac156f8c65aa4044f242b79450faeb4cd0 /plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/suite
parentbf9717a69a20da626b1d8955c8c371973396b531 (diff)
downloadorg.eclipse.emf.compare-92029f6241a7a1a0e7e6584690ec43a746938fd6.tar.gz
org.eclipse.emf.compare-92029f6241a7a1a0e7e6584690ec43a746938fd6.tar.xz
org.eclipse.emf.compare-92029f6241a7a1a0e7e6584690ec43a746938fd6.zip
[457652] Give xmi:ids higher priority than attribute ids
The IdentifierEObjectMatcher will now give xmi:ids priority over attribute ids to prevent models with duplicate xmi:ids. Includes testcases. Bug: 457652 Signed-off-by: Stefan Dirix <sdirix@eclipsesource.com> Change-Id: Ia3ba4222837ecc7f6a17bccc3973ecaee334fad0
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.java9
1 files changed, 5 insertions, 4 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 37308ddd6..5e062a038 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
@@ -8,7 +8,7 @@
* Contributors:
* Obeo - initial API and implementation
* Philip Langer - Adds additional test classes
- * Stefan Dirix - Add additional test class
+ * Stefan Dirix - Adds additional test classes
*******************************************************************************/
package org.eclipse.emf.compare.tests.suite;
@@ -37,6 +37,7 @@ import org.eclipse.emf.compare.tests.fullcomparison.ProximityComparisonTest;
import org.eclipse.emf.compare.tests.match.MatchEngineFactoryRegistryTest;
import org.eclipse.emf.compare.tests.match.ProximityIndexTest;
import org.eclipse.emf.compare.tests.match.ProxyMatchingTest;
+import org.eclipse.emf.compare.tests.match.XMIMatchingTest;
import org.eclipse.emf.compare.tests.merge.ConflictMergeTest;
import org.eclipse.emf.compare.tests.merge.ExtensionMergeTest;
import org.eclipse.emf.compare.tests.merge.FeatureMaps2wayMergeTest;
@@ -78,9 +79,9 @@ import org.junit.runners.Suite.SuiteClasses;
ExtensionMergeTest.class, IndividualMergeOutOfScopeValuesTest.class, ProximityComparisonTest.class,
DynamicInstanceComparisonTest.class, URIDistanceTest.class, FragmentationTest.class,
AllEditTests.class, CommandStackTestSuite.class, MatchEngineFactoryRegistryTest.class,
- ProxyMatchingTest.class, ConflictMergeTest.class, PseudoConflictMergeTest.class,
- ProximityIndexTest.class, AllRCPTests.class, FeatureMaps2wayMergeTest.class,
- FeatureMaps3wayMergeTest.class, FeatureMapsConflictsMergeTest.class,
+ XMIMatchingTest.class, ProxyMatchingTest.class, ConflictMergeTest.class,
+ PseudoConflictMergeTest.class, ProximityIndexTest.class, AllRCPTests.class,
+ FeatureMaps2wayMergeTest.class, FeatureMaps3wayMergeTest.class, FeatureMapsConflictsMergeTest.class,
FeatureMapsPseudoConflictsMergeTest.class, TwoWayBatchMergingTest.class, EqualityHelperTest.class,
FeatureFilterTest.class, ThreeWayBatchMergingTest.class,
MultiLineAttributeConflictDetectionTest.class, ThreeWayTextDiffTest.class,

Back to the top