Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlgoubet2019-05-23 08:31:31 -0400
committerlgoubet2019-05-23 08:32:23 -0400
commit7f0ed79430efeb4e0755a5ebdf0f91b013d2b170 (patch)
tree8766ced81161fccaca0096ac74020e3998a12051 /plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf
parent80b7768dfda6de49e919ce8d864caf4ac36d44f7 (diff)
downloadorg.eclipse.emf.compare-7f0ed79430efeb4e0755a5ebdf0f91b013d2b170.tar.gz
org.eclipse.emf.compare-7f0ed79430efeb4e0755a5ebdf0f91b013d2b170.tar.xz
org.eclipse.emf.compare-7f0ed79430efeb4e0755a5ebdf0f91b013d2b170.zip
Merging single-valued containment changes can lead to dangling elements3.3.7M5
Diffstat (limited to 'plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf')
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/DanglingReferenceAfterMergeTest.java164
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/data/IndividualDiffInputData.java12
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/data/danglingpostmerge/left.nodes9
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/data/danglingpostmerge/origin.nodes9
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/data/danglingpostmerge/right.nodes9
5 files changed, 203 insertions, 0 deletions
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/DanglingReferenceAfterMergeTest.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/DanglingReferenceAfterMergeTest.java
new file mode 100644
index 000000000..7e4bc1b8a
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/DanglingReferenceAfterMergeTest.java
@@ -0,0 +1,164 @@
+/*******************************************************************************
+ * Copyright (c) 2019 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
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Obeo - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.emf.compare.tests.merge;
+
+import static com.google.common.base.Predicates.and;
+import static org.eclipse.emf.compare.utils.EMFComparePredicates.changedReference;
+import static org.eclipse.emf.compare.utils.EMFComparePredicates.fromSide;
+import static org.eclipse.emf.compare.utils.EMFComparePredicates.ofKind;
+import static org.eclipse.emf.compare.utils.EMFComparePredicates.onEObject;
+import static org.eclipse.emf.compare.utils.EMFComparePredicates.referenceValueMatch;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import com.google.common.base.Predicate;
+import com.google.common.collect.Iterators;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+
+import org.eclipse.emf.common.util.BasicMonitor;
+import org.eclipse.emf.common.util.TreeIterator;
+import org.eclipse.emf.compare.Comparison;
+import org.eclipse.emf.compare.Diff;
+import org.eclipse.emf.compare.DifferenceKind;
+import org.eclipse.emf.compare.DifferenceSource;
+import org.eclipse.emf.compare.DifferenceState;
+import org.eclipse.emf.compare.EMFCompare;
+import org.eclipse.emf.compare.merge.BatchMerger;
+import org.eclipse.emf.compare.merge.IMerger;
+import org.eclipse.emf.compare.scope.DefaultComparisonScope;
+import org.eclipse.emf.compare.scope.IComparisonScope;
+import org.eclipse.emf.compare.tests.merge.data.IndividualDiffInputData;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.junit.Test;
+
+/**
+ * This class double-checks that there are no dangling references after a batch merge.
+ * <p>
+ * A particular case that has been isolated presenting such an occurrence is when the user changes the element
+ * contained in a single-valued containment reference while this value is referenced through non-containment
+ * features.
+ * </p>
+ *
+ * @author lgoubet
+ */
+@SuppressWarnings("nls")
+public class DanglingReferenceAfterMergeTest {
+ private IndividualDiffInputData input = new IndividualDiffInputData();
+
+ private final BatchMerger batchMerger = new BatchMerger(IMerger.RegistryImpl.createStandaloneInstance());
+
+ @Test
+ public void testDanglingReferencePostMergeLtR() throws IOException {
+ Resource ancestor = input.getDanglingPostMergeAncestor();
+ Resource left = input.getDanglingPostMergeLeft();
+ Resource right = input.getDanglingPostMergeRight();
+
+ IComparisonScope scope = new DefaultComparisonScope(left, right, ancestor);
+ Comparison comparison = EMFCompare.builder().build().compare(scope);
+
+ List<Diff> differences = comparison.getDifferences();
+ assertEquals(3, differences.size());
+
+ Diff changedReference = Iterators.find(differences.iterator(),
+ and(fromSide(DifferenceSource.RIGHT),
+ changedReference("root.container.ClassA", "singleValuedReference",
+ "root.referencedContainer.ClassB", "root.referencedContainer.ClassC")));
+ Diff addedClassC = Iterators.find(differences.iterator(),
+ and(fromSide(DifferenceSource.RIGHT), addedToSingleValuedReference("root.referencedContainer",
+ "singleValueContainment", "root.referencedContainer.ClassC")));
+ Diff removedClassB = Iterators.find(differences.iterator(),
+ and(fromSide(DifferenceSource.RIGHT),
+ removedFromSingleValuedReference("root.referencedContainer", "singleValueContainment",
+ "root.referencedContainer.ClassB")));
+
+ batchMerger.copyAllLeftToRight(Arrays.asList(addedClassC), new BasicMonitor());
+ assertNoDangling(right);
+ assertNotNull(getNodeNamed(right, "ClassB"));
+ assertEquals(DifferenceState.DISCARDED, changedReference.getState());
+ assertEquals(DifferenceState.DISCARDED, addedClassC.getState());
+ assertEquals(DifferenceState.DISCARDED, removedClassB.getState());
+ }
+
+ @Test
+ public void testDanglingReferencePostMergeRtL() throws IOException {
+ Resource ancestor = input.getDanglingPostMergeAncestor();
+ Resource left = input.getDanglingPostMergeLeft();
+ Resource right = input.getDanglingPostMergeRight();
+
+ IComparisonScope scope = new DefaultComparisonScope(left, right, ancestor);
+ Comparison comparison = EMFCompare.builder().build().compare(scope);
+
+ List<Diff> differences = comparison.getDifferences();
+ assertEquals(3, differences.size());
+
+ Diff changedReference = Iterators.find(differences.iterator(),
+ and(fromSide(DifferenceSource.RIGHT),
+ changedReference("root.container.ClassA", "singleValuedReference",
+ "root.referencedContainer.ClassB", "root.referencedContainer.ClassC")));
+ Diff addedClassC = Iterators.find(differences.iterator(),
+ and(fromSide(DifferenceSource.RIGHT), addedToSingleValuedReference("root.referencedContainer",
+ "singleValueContainment", "root.referencedContainer.ClassC")));
+ Diff removedClassB = Iterators.find(differences.iterator(),
+ and(fromSide(DifferenceSource.RIGHT),
+ removedFromSingleValuedReference("root.referencedContainer", "singleValueContainment",
+ "root.referencedContainer.ClassB")));
+
+ batchMerger.copyAllRightToLeft(Arrays.asList(addedClassC), new BasicMonitor());
+ assertNoDangling(left);
+ assertNotNull(getNodeNamed(left, "ClassC"));
+ assertEquals(DifferenceState.MERGED, changedReference.getState());
+ assertEquals(DifferenceState.MERGED, addedClassC.getState());
+ assertEquals(DifferenceState.MERGED, removedClassB.getState());
+ }
+
+ private void assertNoDangling(Resource res) {
+ TreeIterator<EObject> iterator = res.getAllContents();
+ while (iterator.hasNext()) {
+ EObject next = iterator.next();
+ for (EObject o : next.eCrossReferences()) {
+ assertNotNull(o.eResource());
+ }
+ }
+ }
+
+ @SuppressWarnings("unchecked")
+ private Predicate<? super Diff> addedToSingleValuedReference(String qualifiedName, String referenceName,
+ String addedQualifiedName) {
+ return and(ofKind(DifferenceKind.ADD), onEObject(qualifiedName),
+ referenceValueMatch(referenceName, addedQualifiedName, false));
+ }
+
+ @SuppressWarnings("unchecked")
+ private Predicate<? super Diff> removedFromSingleValuedReference(String qualifiedName,
+ String referenceName, String addedQualifiedName) {
+ return and(ofKind(DifferenceKind.DELETE), onEObject(qualifiedName),
+ referenceValueMatch(referenceName, addedQualifiedName, false));
+ }
+
+ private EObject getNodeNamed(Resource res, String name) {
+ final Iterator<EObject> iterator = EcoreUtil.getAllProperContents(res, false);
+ while (iterator.hasNext()) {
+ final EObject next = iterator.next();
+ final EStructuralFeature nameFeature = next.eClass().getEStructuralFeature("name");
+ if (nameFeature != null && name.equals(next.eGet(nameFeature))) {
+ return next;
+ }
+ }
+ return null;
+ }
+}
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/data/IndividualDiffInputData.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/data/IndividualDiffInputData.java
index 805f5d1b6..92c69b74d 100644
--- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/data/IndividualDiffInputData.java
+++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/data/IndividualDiffInputData.java
@@ -820,4 +820,16 @@ public class IndividualDiffInputData extends AbstractInputData {
public Resource getMoveConflictAndPseudoConflictImplicationsRight() throws IOException {
return loadFromClassLoader("dependencies/bug_484579/right.uml");
}
+
+ public Resource getDanglingPostMergeAncestor() throws IOException {
+ return loadFromClassLoader("danglingpostmerge/origin.nodes");
+ }
+
+ public Resource getDanglingPostMergeLeft() throws IOException {
+ return loadFromClassLoader("danglingpostmerge/left.nodes");
+ }
+
+ public Resource getDanglingPostMergeRight() throws IOException {
+ return loadFromClassLoader("danglingpostmerge/right.nodes");
+ }
}
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/data/danglingpostmerge/left.nodes b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/data/danglingpostmerge/left.nodes
new file mode 100644
index 000000000..337f3daa9
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/data/danglingpostmerge/left.nodes
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<nodes:Node xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:nodes="http://www.eclipse.org/emf/compare/tests/nodes" xmi:id="_R8rFcHylEemhG-_oVU730g" name="root">
+ <containmentRef1 xmi:id="_emUtkHylEemhG-_oVU730g" name="container">
+ <containmentRef1 xsi:type="nodes:NodeSingleValueReference" xmi:id="_f6BKEHylEemhG-_oVU730g" name="ClassA" singleValuedReference="_agybkHylEemhG-_oVU730g"/>
+ </containmentRef1>
+ <containmentRef1 xsi:type="nodes:NodeSingleValueContainment" xmi:id="_TurOkHylEemhG-_oVU730g" name="referencedContainer">
+ <singleValueContainment xmi:id="_agybkHylEemhG-_oVU730g" name="ClassB"/>
+ </containmentRef1>
+</nodes:Node>
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/data/danglingpostmerge/origin.nodes b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/data/danglingpostmerge/origin.nodes
new file mode 100644
index 000000000..337f3daa9
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/data/danglingpostmerge/origin.nodes
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<nodes:Node xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:nodes="http://www.eclipse.org/emf/compare/tests/nodes" xmi:id="_R8rFcHylEemhG-_oVU730g" name="root">
+ <containmentRef1 xmi:id="_emUtkHylEemhG-_oVU730g" name="container">
+ <containmentRef1 xsi:type="nodes:NodeSingleValueReference" xmi:id="_f6BKEHylEemhG-_oVU730g" name="ClassA" singleValuedReference="_agybkHylEemhG-_oVU730g"/>
+ </containmentRef1>
+ <containmentRef1 xsi:type="nodes:NodeSingleValueContainment" xmi:id="_TurOkHylEemhG-_oVU730g" name="referencedContainer">
+ <singleValueContainment xmi:id="_agybkHylEemhG-_oVU730g" name="ClassB"/>
+ </containmentRef1>
+</nodes:Node>
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/data/danglingpostmerge/right.nodes b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/data/danglingpostmerge/right.nodes
new file mode 100644
index 000000000..12a13b8ea
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/merge/data/danglingpostmerge/right.nodes
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<nodes:Node xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:nodes="http://www.eclipse.org/emf/compare/tests/nodes" xmi:id="_R8rFcHylEemhG-_oVU730g" name="root">
+ <containmentRef1 xmi:id="_emUtkHylEemhG-_oVU730g" name="container">
+ <containmentRef1 xsi:type="nodes:NodeSingleValueReference" xmi:id="_f6BKEHylEemhG-_oVU730g" name="ClassA" singleValuedReference="_kEXqoHylEemhG-_oVU730g"/>
+ </containmentRef1>
+ <containmentRef1 xsi:type="nodes:NodeSingleValueContainment" xmi:id="_TurOkHylEemhG-_oVU730g" name="referencedContainer">
+ <singleValueContainment xmi:id="_kEXqoHylEemhG-_oVU730g" name="ClassC"/>
+ </containmentRef1>
+</nodes:Node>

Back to the top