Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCedric Notot2013-01-24 11:39:37 -0500
committerCedric Notot2013-01-24 11:55:27 -0500
commitd536c92b88b21b16d5402e2625351d3e48603ff6 (patch)
tree114911ef15d245e164ee3c1e7a3b81fdf2958bd8 /plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/suite
parent0e16023621b6343b1234d0743bd3a3756e5e4224 (diff)
downloadorg.eclipse.emf.compare-d536c92b88b21b16d5402e2625351d3e48603ff6.tar.gz
org.eclipse.emf.compare-d536c92b88b21b16d5402e2625351d3e48603ff6.tar.xz
org.eclipse.emf.compare-d536c92b88b21b16d5402e2625351d3e48603ff6.zip
[398863] Provide a merge extension mechanism
Tests
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 971515a06..d6b107d68 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
@@ -26,6 +26,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.merge.ExtensionMergeTest;
import org.eclipse.emf.compare.tests.merge.IndividualMergeOutOfScopeValuesTest;
import org.eclipse.emf.compare.tests.merge.IndividualMergeTest;
import org.eclipse.emf.compare.tests.merge.MultipleMergeTest;
@@ -50,7 +51,7 @@ import org.junit.runners.Suite.SuiteClasses;
@SuiteClasses({CompareTestSuite.class, DefaultComparisonScopeTest.class, IdentifierComparisonTest.class,
ExtLibraryTest.class, ConflictDetectionTest.class, ReqComputingTest.class, EquiComputingTest.class,
DiffUtilTest.class, MultipleMergeTest.class, PostProcessorTest.class, IndividualMergeTest.class,
- IndividualMergeOutOfScopeValuesTest.class, ProximityComparisonTest.class,
+ ExtensionMergeTest.class, IndividualMergeOutOfScopeValuesTest.class, ProximityComparisonTest.class,
DynamicInstanceComparisonTest.class, URIDistanceTest.class, FragmentationTest.class,
AllEditTests.class, CommandStackTestSuite.class, })
public class AllTests {

Back to the top