Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilip Langer2014-07-29 14:15:46 -0400
committerPhilip Langer2014-07-31 05:12:50 -0400
commit9bd8b7f6aa55394955b168e8db3546a13193619a (patch)
treeca6d32f64fd65359a16b7e38961231cef6b61348 /plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/suite
parent0c0f9384703b36909f807c211d439e9d14b72462 (diff)
downloadorg.eclipse.emf.compare-9bd8b7f6aa55394955b168e8db3546a13193619a.tar.gz
org.eclipse.emf.compare-9bd8b7f6aa55394955b168e8db3546a13193619a.tar.xz
org.eclipse.emf.compare-9bd8b7f6aa55394955b168e8db3546a13193619a.zip
[440679] Avoids NPE when performing a move
We now make sure that the correct feature (i.e., the target feature of the target container) is used when obtaining the target value list (current list of values in the target container's feature) for finding the insertion index. Signed-off-by: Philip Langer <planger@eclipsesource.com> Bug: 440679 Change-Id: I02798dc702c3a17c49ae63d80cf6a099858b7d89
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 ca965c0ea..c3f00530f 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
@@ -40,6 +40,7 @@ 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.merge.TwoWayBatchMergingTest;
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;
@@ -68,7 +69,7 @@ import org.junit.runners.Suite.SuiteClasses;
AllEditTests.class, CommandStackTestSuite.class, MatchEngineFactoryRegistryTest.class,
ConflictMergeTest.class, PseudoConflictMergeTest.class, ProximityIndexTest.class, AllRCPTests.class,
FeatureMaps2wayMergeTest.class, FeatureMaps3wayMergeTest.class, FeatureMapsConflictsMergeTest.class,
- FeatureMapsPseudoConflictsMergeTest.class })
+ FeatureMapsPseudoConflictsMergeTest.class, TwoWayBatchMergingTest.class })
public class AllTests {
/**
* Standalone launcher for all of compare's tests.

Back to the top