Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMathieu Cartaud2015-12-16 10:27:41 -0500
committerMathieu Cartaud2016-01-08 11:09:15 -0500
commit341c5b1091ce188e7703750e8b61f8196cb90838 (patch)
tree0dfa59207cb4da0bdd986e517b298a950d84c405 /plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/suite
parent230f8d1c3c6cc911aaea8f5fcee062193a6b9a79 (diff)
downloadorg.eclipse.emf.compare-341c5b1091ce188e7703750e8b61f8196cb90838.tar.gz
org.eclipse.emf.compare-341c5b1091ce188e7703750e8b61f8196cb90838.tar.xz
org.eclipse.emf.compare-341c5b1091ce188e7703750e8b61f8196cb90838.zip
[484579] Fix merge consequences algorithm
When computing the consequences of a merge, one must be careful when pseudo-conflict cause diffs from the other side to be merged, since then the leftToRight parameter must be negated to get the relevant consequences for these "opposite side" diffs. Bug: 484579 Change-Id: I34eb80d028068d2b80a59d42fcb3fb9ea9ed0053 Also-by: Laurent Delaigue <laurent.delaigue@obeo.fr> Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>
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/AtLeastLunaVersionTests.java63
1 files changed, 63 insertions, 0 deletions
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/suite/AtLeastLunaVersionTests.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/suite/AtLeastLunaVersionTests.java
new file mode 100644
index 000000000..599e0864b
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/suite/AtLeastLunaVersionTests.java
@@ -0,0 +1,63 @@
+/*******************************************************************************
+ * Copyright (c) 2012, 2015 Obeo and others.
+ * 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
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Obeo - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.emf.compare.tests.suite;
+
+import junit.framework.JUnit4TestAdapter;
+import junit.framework.Test;
+import junit.textui.TestRunner;
+
+import org.eclipse.emf.compare.ComparePackage;
+import org.eclipse.emf.compare.tests.merge.ConflictImplicationsTest_Bug484579;
+import org.eclipse.emf.compare.tests.nodes.NodesPackage;
+import org.eclipse.emf.compare.tests.nodes.util.NodesResourceFactoryImpl;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.junit.BeforeClass;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
+
+/**
+ * This test suite allows us to launch the test which are only compatible with Eclipse Luna and newer
+ * versions.
+ *
+ * @author <a href="mailto:mathieu.cartaud@obeo.fr">Mathieu Cartaud</a>
+ */
+@RunWith(Suite.class)
+@SuiteClasses({ConflictImplicationsTest_Bug484579.class })
+public class AtLeastLunaVersionTests {
+ /**
+ * Standalone launcher for all of compare's tests.
+ *
+ * @generated
+ */
+ public static void main(String[] args) {
+ TestRunner.run(suite());
+ }
+
+ /**
+ * This will return a suite populated with all tests available through this class.
+ *
+ * @generated
+ */
+ public static Test suite() {
+ return new JUnit4TestAdapter(CompareTestSuite.class);
+ }
+
+ @BeforeClass
+ public static void fillEMFRegistries() {
+ EPackage.Registry.INSTANCE.put(ComparePackage.eNS_URI, ComparePackage.eINSTANCE);
+ EPackage.Registry.INSTANCE.put(NodesPackage.eNS_URI, NodesPackage.eINSTANCE);
+
+ Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("nodes", //$NON-NLS-1$
+ new NodesResourceFactoryImpl());
+ }
+}

Back to the top