Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAxel Richard2013-09-10 11:35:17 -0400
committerGerrit Code Review @ Eclipse.org2013-09-24 01:50:24 -0400
commit540ecf5aba691c65fb74a0a69015bb34e6b56d32 (patch)
tree688d69bf657d9e4652f6a3d9fea954298e182bb9 /plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/suite
parent2eacc1ba60603854275f6881d1775f099befef5e (diff)
downloadorg.eclipse.emf.compare-540ecf5aba691c65fb74a0a69015bb34e6b56d32.tar.gz
org.eclipse.emf.compare-540ecf5aba691c65fb74a0a69015bb34e6b56d32.tar.xz
org.eclipse.emf.compare-540ecf5aba691c65fb74a0a69015bb34e6b56d32.zip
[416400] - Fix IOWrappedException by adding a ConflictMerger
The merge of conflicts was not managed yet. Add a new Merger for conflict with a ranking of 15 (higher than ReferenceMerger and AttributeMerger). Bug: 416400 Change-Id: Id38da2f67db570f276518e8cba81636bcc777669
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.java5
1 files changed, 3 insertions, 2 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 77a7b1ba2..00d917ced 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
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2012 Obeo.
+ * Copyright (c) 2012, 2013 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -29,6 +29,7 @@ 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.MatchEngineFactoryRegistryTest;
+import org.eclipse.emf.compare.tests.merge.ConflictMergeTest;
import org.eclipse.emf.compare.tests.merge.ExtensionMergeTest;
import org.eclipse.emf.compare.tests.merge.IndividualMergeOutOfScopeValuesTest;
import org.eclipse.emf.compare.tests.merge.IndividualMergeTest;
@@ -57,7 +58,7 @@ import org.junit.runners.Suite.SuiteClasses;
PostProcessorTest.class, IndividualMergeTest.class, ExtensionMergeTest.class,
IndividualMergeOutOfScopeValuesTest.class, ProximityComparisonTest.class,
DynamicInstanceComparisonTest.class, URIDistanceTest.class, FragmentationTest.class,
- AllEditTests.class, CommandStackTestSuite.class, MatchEngineFactoryRegistryTest.class })
+ AllEditTests.class, CommandStackTestSuite.class, MatchEngineFactoryRegistryTest.class, ConflictMergeTest.class })
public class AllTests {
/**
* Standalone launcher for all of compare's tests.

Back to the top