Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAxel Richard2015-03-16 09:55:51 -0400
committerPhilip Langer2015-03-17 05:41:12 -0400
commita4164f67c1644846b4e863ed6607f0cb4ccd0390 (patch)
tree791fac89884e7d78c8f1dc9fd36b9021a98abe46 /plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare
parentc3bfdc0ec922dd129c3a6766287f64439fb32a7e (diff)
downloadorg.eclipse.emf.compare-a4164f67c1644846b4e863ed6607f0cb4ccd0390.tar.gz
org.eclipse.emf.compare-a4164f67c1644846b4e863ed6607f0cb4ccd0390.tar.xz
org.eclipse.emf.compare-a4164f67c1644846b4e863ed6607f0cb4ccd0390.zip
[462203] Child match appear as top-level match.
Reorganize matches in IdentifierEObjectMatcher class to avoid root matches that are actually child matches. Bug: 462203 Change-Id: I0045b96cbf7805c3e7e19f6e2fa4ed3bb6085c85 Signed-off-by: Axel Richard <axel.richard@obeo.fr>
Diffstat (limited to 'plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare')
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/match/IdentifierEObjectMatcherTest.java112
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/suite/AllTests.java3
2 files changed, 114 insertions, 1 deletions
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/match/IdentifierEObjectMatcherTest.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/match/IdentifierEObjectMatcherTest.java
new file mode 100644
index 000000000..46a736811
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/match/IdentifierEObjectMatcherTest.java
@@ -0,0 +1,112 @@
+/*******************************************************************************
+ * Copyright (c) 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.match;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import com.google.common.collect.Iterators;
+import com.google.common.collect.Lists;
+
+import java.io.IOException;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.compare.Match;
+import org.eclipse.emf.compare.match.eobject.IdentifierEObjectMatcher;
+import org.eclipse.emf.compare.tests.nodes.Node;
+import org.eclipse.emf.compare.tests.nodes.NodesFactory;
+import org.eclipse.emf.ecore.EObject;
+import org.junit.Test;
+
+/**
+ * Test class for {@link IdentifierEObjectMatcher}.
+ *
+ * @author <a href="mailto:axel.richard@obeo.fr">Axel Richard</a>
+ */
+@SuppressWarnings("nls")
+public class IdentifierEObjectMatcherTest {
+
+ /**
+ * Test the matchPerId function, especially the containment between matches.
+ *
+ * @throws IOException
+ */
+ @Test
+ public void testMatchPerIdFunction() throws IOException {
+
+ Node root = NodesFactory.eINSTANCE.createNode();
+ root.setName("root");
+ Node nodeLevel1 = NodesFactory.eINSTANCE.createNode();
+ nodeLevel1.setName("nodeLevel1");
+ Node nodeLevel2 = NodesFactory.eINSTANCE.createNode();
+ nodeLevel2.setName("nodeLevel2");
+ Node nodeLevel3 = NodesFactory.eINSTANCE.createNode();
+ nodeLevel3.setName("nodeLevel3");
+ root.getContainmentRef1().add(nodeLevel1);
+ nodeLevel1.getContainmentRef1().add(nodeLevel2);
+ nodeLevel2.getContainmentRef1().add(nodeLevel3);
+
+ // Give the eObjects to matchPerId function in opposite containment order, to force the matchPerId
+ // method to reorganize matches.
+ Collection<Node> nodes = Lists.newArrayList(nodeLevel3, nodeLevel2, nodeLevel1, root);
+
+ MockIdentifierEObjectMatcher matcher = new MockIdentifierEObjectMatcher();
+
+ Iterator<? extends EObject> leftEObjects = nodes.iterator();
+ Iterator<? extends EObject> rightEObjects = nodes.iterator();
+ Iterator<? extends EObject> originEObjects = Iterators.emptyIterator();
+ List<EObject> leftEObjectsNoID = Lists.newArrayList();
+ List<EObject> rightEObjectsNoID = Lists.newArrayList();
+ List<EObject> originEObjectsNoID = Lists.newArrayList();
+
+ Set<Match> matches = matcher.matchPerId(leftEObjects, rightEObjects, originEObjects,
+ leftEObjectsNoID, rightEObjectsNoID, originEObjectsNoID);
+
+ assertEquals(1, matches.size());
+ Match rootMatch = matches.iterator().next();
+ assertEquals(root, rootMatch.getLeft());
+ EList<Match> rootSubMatches = rootMatch.getSubmatches();
+ assertEquals(1, rootSubMatches.size());
+ Match nodeLevel1Match = rootSubMatches.iterator().next();
+ assertEquals(nodeLevel1, nodeLevel1Match.getLeft());
+ EList<Match> nodeLevel1SubMatches = nodeLevel1Match.getSubmatches();
+ assertEquals(1, nodeLevel1SubMatches.size());
+ Match nodeLevel2Match = nodeLevel1SubMatches.iterator().next();
+ assertEquals(nodeLevel2, nodeLevel2Match.getLeft());
+ EList<Match> nodeLevel2SubMatches = nodeLevel2Match.getSubmatches();
+ assertEquals(1, nodeLevel2SubMatches.size());
+ Match nodeLevel3Match = nodeLevel2SubMatches.iterator().next();
+ assertEquals(nodeLevel3, nodeLevel3Match.getLeft());
+ EList<Match> nodeLevel3SubMatches = nodeLevel3Match.getSubmatches();
+ assertTrue(nodeLevel3SubMatches.isEmpty());
+
+ }
+
+ /**
+ * Mock {@link IdentifierEObjectMatcher} to test matchPerId method.
+ *
+ * @author <a href="mailto:axel.richard@obeo.fr">Axel Richard</a>
+ */
+ private class MockIdentifierEObjectMatcher extends IdentifierEObjectMatcher {
+ @Override
+ public Set<Match> matchPerId(Iterator<? extends EObject> leftEObjects,
+ Iterator<? extends EObject> rightEObjects, Iterator<? extends EObject> originEObjects,
+ List<EObject> leftEObjectsNoID, List<EObject> rightEObjectsNoID,
+ List<EObject> originEObjectsNoID) {
+ return super.matchPerId(leftEObjects, rightEObjects, originEObjects, leftEObjectsNoID,
+ rightEObjectsNoID, originEObjectsNoID);
+ }
+ }
+}
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 5e062a038..20767fe68 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
@@ -34,6 +34,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.match.IdentifierEObjectMatcherTest;
import org.eclipse.emf.compare.tests.match.MatchEngineFactoryRegistryTest;
import org.eclipse.emf.compare.tests.match.ProximityIndexTest;
import org.eclipse.emf.compare.tests.match.ProxyMatchingTest;
@@ -85,7 +86,7 @@ import org.junit.runners.Suite.SuiteClasses;
FeatureMapsPseudoConflictsMergeTest.class, TwoWayBatchMergingTest.class, EqualityHelperTest.class,
FeatureFilterTest.class, ThreeWayBatchMergingTest.class,
MultiLineAttributeConflictDetectionTest.class, ThreeWayTextDiffTest.class,
- MultiLineAttributeMergeTest.class, MonitorCancelTest.class })
+ MultiLineAttributeMergeTest.class, MonitorCancelTest.class, IdentifierEObjectMatcherTest.class })
public class AllTests {
/**
* Standalone launcher for all of compare's tests.

Back to the top