diff options
| author | Axel Richard | 2014-05-21 09:26:26 +0000 |
|---|---|---|
| committer | Axel Richard | 2014-05-23 09:52:22 +0000 |
| commit | 01962bfa99975d1ea70c2e08d629a63caca7da50 (patch) | |
| tree | f0d439edc6a69e9e3186566c655f7c8fc97cc3cc /plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/suite | |
| parent | 919590ee3a62b7f8e07efc5609c70ca505ea6846 (diff) | |
| download | org.eclipse.emf.compare-01962bfa99975d1ea70c2e08d629a63caca7da50.tar.gz org.eclipse.emf.compare-01962bfa99975d1ea70c2e08d629a63caca7da50.tar.xz org.eclipse.emf.compare-01962bfa99975d1ea70c2e08d629a63caca7da50.zip | |
[435053] Add Pseudo conflicts tests.
In case of a pseudo conflict, no merge action is performed, even in
ACCEPT/REJECT mode.
Add tests for pseudo conflicts.
Bug: 435053
Change-Id: I450c6676633502bb001829c889336023ee0d1cc1
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.java | 3 |
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 292f599f4..6f7953bae 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 @@ -35,6 +35,7 @@ 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; +import org.eclipse.emf.compare.tests.merge.PseudoConflictMergeTest; import org.eclipse.emf.compare.tests.nodes.NodesPackage; import org.eclipse.emf.compare.tests.nodes.util.NodesResourceFactoryImpl; import org.eclipse.emf.compare.tests.postprocess.PostProcessorTest; @@ -61,7 +62,7 @@ import org.junit.runners.Suite.SuiteClasses; IndividualMergeOutOfScopeValuesTest.class, ProximityComparisonTest.class, DynamicInstanceComparisonTest.class, URIDistanceTest.class, FragmentationTest.class, AllEditTests.class, CommandStackTestSuite.class, MatchEngineFactoryRegistryTest.class, - ConflictMergeTest.class, ProximityIndexTest.class, AllRCPTests.class }) + ConflictMergeTest.class, PseudoConflictMergeTest.class, ProximityIndexTest.class, AllRCPTests.class }) public class AllTests { /** * Standalone launcher for all of compare's tests. |