Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMathieu Cartaud2016-01-28 04:11:24 -0500
committerMathieu Cartaud2016-02-03 03:10:27 -0500
commitac24a1d067febd4284dbefa7353e33fed7f73343 (patch)
tree4a9ca222ed6911e2a86e51d6f2d091aaefc9fd74 /plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests
parenta6b0693d96f4cd424c8b531f04421393ed1947b4 (diff)
downloadorg.eclipse.emf.compare-ac24a1d067febd4284dbefa7353e33fed7f73343.tar.gz
org.eclipse.emf.compare-ac24a1d067febd4284dbefa7353e33fed7f73343.tar.xz
org.eclipse.emf.compare-ac24a1d067febd4284dbefa7353e33fed7f73343.zip
[487011] Fix wrong conflict detection
When comparing two identical models and a different ancestor, some changes lead to real conflicts instead of pseudo-conflicts. Bug: 487011 Change-Id: Ibab0a456eab7833497de24a19c5cd85ff500b207 Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>
Diffstat (limited to 'plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests')
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/conflict/PseudoConflictDetectionTest.java101
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/conflict/data/ConflictInputData.java53
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/conflict/data/pseudoConflictDetection/case1/ancestor/model.uml4
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/conflict/data/pseudoConflictDetection/case1/ancestor/package1.uml7
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/conflict/data/pseudoConflictDetection/case1/model.uml2
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/conflict/data/pseudoConflictDetection/case2/ancestor/model.uml8
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/conflict/data/pseudoConflictDetection/case2/model.uml10
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/conflict/data/pseudoConflictDetection/case3/ancestor/model.uml10
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/conflict/data/pseudoConflictDetection/case3/model.uml11
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/conflict/data/pseudoConflictDetection/case4/ancestor/model.uml11
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/conflict/data/pseudoConflictDetection/case4/model.uml13
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/suite/AtLeastLunaVersionTests.java3
12 files changed, 231 insertions, 2 deletions
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/conflict/PseudoConflictDetectionTest.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/conflict/PseudoConflictDetectionTest.java
new file mode 100644
index 000000000..94c7f3bdd
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/conflict/PseudoConflictDetectionTest.java
@@ -0,0 +1,101 @@
+/*******************************************************************************
+ * Copyright (c) 2016 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.conflict;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+import static org.junit.Assert.assertEquals;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.compare.Comparison;
+import org.eclipse.emf.compare.Conflict;
+import org.eclipse.emf.compare.ConflictKind;
+import org.eclipse.emf.compare.EMFCompare;
+import org.eclipse.emf.compare.scope.DefaultComparisonScope;
+import org.eclipse.emf.compare.scope.IComparisonScope;
+import org.eclipse.emf.compare.tests.conflict.data.ConflictInputData;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+/**
+ * This class test the detection of pseudo conflicts.
+ *
+ * @author <a href="mailto:mathieu.cartaud@obeo.fr">Mathieu Cartaud</a>
+ */
+@RunWith(Parameterized.class)
+public class PseudoConflictDetectionTest {
+
+ private final Notifier origin;
+
+ private final Notifier left;
+
+ private final Notifier right;
+
+ private final int numberOfConflicts;
+
+ @Parameters
+ public static Collection<Object[]> params() throws IOException {
+ ConflictInputData inputData = new ConflictInputData();
+ /**
+ * Ancestor model is fragmented into 2 files, and the controlled file is deleted on both sides.
+ */
+ Object[] test1 = new Object[] {inputData.getPseudoConflictCase1Ancestor(),
+ inputData.getPseudoConflictCase1RightAndLeftModel(),
+ inputData.getPseudoConflictCase1RightAndLeftModel(), new Integer(4) };
+ /**
+ * Right and left models add the same univaluated containment EReference.
+ */
+ Object[] test2 = new Object[] {inputData.getPseudoConflictCase2Ancestor(),
+ inputData.getPseudoConflictCase2RightAndLeftModel(),
+ inputData.getPseudoConflictCase2RightAndLeftModel(), new Integer(1) };
+ /**
+ * Right and left models add an element in an univaluated containment EReference and this element
+ * referenced another element by a non-containment reference.
+ */
+ Object[] test3 = new Object[] {inputData.getPseudoConflictCase3Ancestor(),
+ inputData.getPseudoConflictCase3RightAndLeftModel(),
+ inputData.getPseudoConflictCase3RightAndLeftModel(), new Integer(2) };
+ /**
+ * Test the same behavior that test3 but with a more complex model.
+ */
+ Object[] test4 = new Object[] {inputData.getPseudoConflictCase4Ancestor(),
+ inputData.getPseudoConflictCase4RightAndLeftModel(),
+ inputData.getPseudoConflictCase4RightAndLeftModel(), new Integer(2) };
+ return Arrays.asList(test1, test2, test3, test4);
+ }
+
+ public PseudoConflictDetectionTest(final Notifier origin, final Notifier left, final Notifier right,
+ final Integer numberOfConflicts) {
+ this.origin = checkNotNull(origin);
+ this.left = checkNotNull(left);
+ this.right = checkNotNull(right);
+ this.numberOfConflicts = (checkNotNull(numberOfConflicts)).intValue();
+ }
+
+ @Test
+ public void verifyPseudoConflictDetection() throws IOException {
+ final IComparisonScope scope = new DefaultComparisonScope(left, right, origin);
+ final Comparison comparison = EMFCompare.builder().build().compare(scope);
+
+ EList<Conflict> conflicts = comparison.getConflicts();
+ assertEquals(numberOfConflicts, conflicts.size());
+
+ for (Conflict conflict : conflicts) {
+ assertEquals(ConflictKind.PSEUDO, conflict.getKind());
+ }
+ }
+}
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/conflict/data/ConflictInputData.java b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/conflict/data/ConflictInputData.java
index 2fb05d6f4..46dad8498 100644
--- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/conflict/data/ConflictInputData.java
+++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/conflict/data/ConflictInputData.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2012, 2015 Obeo and others.
+ * Copyright (c) 2012, 2016 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
@@ -15,6 +15,11 @@ import java.io.IOException;
import org.eclipse.emf.compare.tests.framework.AbstractInputData;
import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.uml2.uml.UMLPackage;
+import org.eclipse.uml2.uml.resource.UMLResource;
/**
* This will provide the input model for all of our "conflict detection" tests.
@@ -670,4 +675,50 @@ public class ConflictInputData extends AbstractInputData {
public Resource getComplexRight() throws IOException {
return loadFromClassLoader("complex/conflict_complex_right.nodes");
}
+
+ public ResourceSet getPseudoConflictCase1Ancestor() throws IOException {
+ ResourceSet resourceSet = createResourceSet();
+ loadFromClassLoader("pseudoConflictDetection/case1/ancestor/model.uml", resourceSet);
+ EcoreUtil.resolveAll(resourceSet);
+ return resourceSet;
+ }
+
+ public ResourceSet getPseudoConflictCase1RightAndLeftModel() throws IOException {
+ ResourceSet resourceSet = createResourceSet();
+ loadFromClassLoader("pseudoConflictDetection/case1/model.uml", resourceSet);
+ EcoreUtil.resolveAll(resourceSet);
+ return resourceSet;
+ }
+
+ public Resource getPseudoConflictCase2Ancestor() throws IOException {
+ return loadFromClassLoader("pseudoConflictDetection/case2/ancestor/model.uml");
+ }
+
+ public Resource getPseudoConflictCase2RightAndLeftModel() throws IOException {
+ return loadFromClassLoader("pseudoConflictDetection/case2/model.uml");
+ }
+
+ public Resource getPseudoConflictCase3Ancestor() throws IOException {
+ return loadFromClassLoader("pseudoConflictDetection/case3/ancestor/model.uml");
+ }
+
+ public Resource getPseudoConflictCase3RightAndLeftModel() throws IOException {
+ return loadFromClassLoader("pseudoConflictDetection/case3/model.uml");
+ }
+
+ public Resource getPseudoConflictCase4Ancestor() throws IOException {
+ return loadFromClassLoader("pseudoConflictDetection/case4/ancestor/model.uml");
+ }
+
+ public Resource getPseudoConflictCase4RightAndLeftModel() throws IOException {
+ return loadFromClassLoader("pseudoConflictDetection/case4/model.uml");
+ }
+
+ protected ResourceSet createResourceSet() {
+ ResourceSet resourceSet = new ResourceSetImpl();
+ resourceSet.getPackageRegistry().put(UMLPackage.eNS_URI, UMLPackage.eINSTANCE);
+ resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put(UMLResource.FILE_EXTENSION,
+ UMLResource.Factory.INSTANCE);
+ return resourceSet;
+ }
}
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/conflict/data/pseudoConflictDetection/case1/ancestor/model.uml b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/conflict/data/pseudoConflictDetection/case1/ancestor/model.uml
new file mode 100644
index 000000000..f0c362648
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/conflict/data/pseudoConflictDetection/case1/ancestor/model.uml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_jqC_YMQtEeWHJZXr_M-_cQ">
+ <packagedElement xmi:type="uml:Package" href="package1.uml#_pD71MMQtEeWHJZXr_M-_cQ"/>
+</uml:Model>
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/conflict/data/pseudoConflictDetection/case1/ancestor/package1.uml b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/conflict/data/pseudoConflictDetection/case1/ancestor/package1.uml
new file mode 100644
index 000000000..6d948e321
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/conflict/data/pseudoConflictDetection/case1/ancestor/package1.uml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Package xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_pD71MMQtEeWHJZXr_M-_cQ" name="package1">
+ <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_sfPXEMQwEeWHJZXr_M-_cQ" name="type1">
+ <ownedAttribute xmi:id="_hHlQYMQyEeWJMeruo-MCUA" name="property1"/>
+ </packagedElement>
+ <packagedElement xmi:type="uml:Class" xmi:id="_LPSNwMQ6EeWTlrsVZBx1Sw" name="class1"/>
+</uml:Package>
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/conflict/data/pseudoConflictDetection/case1/model.uml b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/conflict/data/pseudoConflictDetection/case1/model.uml
new file mode 100644
index 000000000..47901b0a2
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/conflict/data/pseudoConflictDetection/case1/model.uml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_jqC_YMQtEeWHJZXr_M-_cQ"/>
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/conflict/data/pseudoConflictDetection/case2/ancestor/model.uml b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/conflict/data/pseudoConflictDetection/case2/ancestor/model.uml
new file mode 100644
index 000000000..df63eeaeb
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/conflict/data/pseudoConflictDetection/case2/ancestor/model.uml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_jqC_YMQtEeWHJZXr_M-_cQ">
+ <packagedElement xmi:type="uml:Package" xmi:id="_pD71MMQtEeWHJZXr_M-_cQ" name="package1">
+ <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_sfPXEMQwEeWHJZXr_M-_cQ" name="type1">
+ <ownedAttribute xmi:id="_hHlQYMQyEeWJMeruo-MCUA" name="property1"/>
+ </packagedElement>
+ </packagedElement>
+</uml:Model>
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/conflict/data/pseudoConflictDetection/case2/model.uml b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/conflict/data/pseudoConflictDetection/case2/model.uml
new file mode 100644
index 000000000..5bff695a0
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/conflict/data/pseudoConflictDetection/case2/model.uml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_jqC_YMQtEeWHJZXr_M-_cQ">
+ <packagedElement xmi:type="uml:Package" xmi:id="_pD71MMQtEeWHJZXr_M-_cQ" name="package1">
+ <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_sfPXEMQwEeWHJZXr_M-_cQ" name="type1">
+ <ownedAttribute xmi:id="_hHlQYMQyEeWJMeruo-MCUA" name="property1">
+ <lowerValue xmi:type="uml:DurationInterval" xmi:id="_68k4cMQyEeWJMeruo-MCUA"/>
+ </ownedAttribute>
+ </packagedElement>
+ </packagedElement>
+</uml:Model>
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/conflict/data/pseudoConflictDetection/case3/ancestor/model.uml b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/conflict/data/pseudoConflictDetection/case3/ancestor/model.uml
new file mode 100644
index 000000000..566531c55
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/conflict/data/pseudoConflictDetection/case3/ancestor/model.uml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_jqC_YMQtEeWHJZXr_M-_cQ">
+ <packagedElement xmi:type="uml:Package" xmi:id="_pD71MMQtEeWHJZXr_M-_cQ" name="package1">
+ <packagedElement xmi:type="uml:StateMachine" xmi:id="_v4QBoMQtEeWHJZXr_M-_cQ" name="state1">
+ <ownedOperation xmi:id="_Ur_kUMQwEeWHJZXr_M-_cQ" name="operation0">
+ <ownedParameter xmi:id="_c8ez0MQwEeWHJZXr_M-_cQ" name="parameter0"/>
+ </ownedOperation>
+ </packagedElement>
+ </packagedElement>
+</uml:Model>
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/conflict/data/pseudoConflictDetection/case3/model.uml b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/conflict/data/pseudoConflictDetection/case3/model.uml
new file mode 100644
index 000000000..e52bdf31b
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/conflict/data/pseudoConflictDetection/case3/model.uml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_jqC_YMQtEeWHJZXr_M-_cQ">
+ <packagedElement xmi:type="uml:Package" xmi:id="_pD71MMQtEeWHJZXr_M-_cQ" name="package1">
+ <packagedElement xmi:type="uml:StateMachine" xmi:id="_v4QBoMQtEeWHJZXr_M-_cQ" name="state1">
+ <ownedOperation xmi:id="_Ur_kUMQwEeWHJZXr_M-_cQ" name="operation0" bodyCondition="_A0O6QMQxEeWHJZXr_M-_cQ">
+ <ownedRule xmi:type="uml:DurationConstraint" xmi:id="_A0O6QMQxEeWHJZXr_M-_cQ"/>
+ <ownedParameter xmi:id="_c8ez0MQwEeWHJZXr_M-_cQ" name="parameter0"/>
+ </ownedOperation>
+ </packagedElement>
+ </packagedElement>
+</uml:Model>
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/conflict/data/pseudoConflictDetection/case4/ancestor/model.uml b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/conflict/data/pseudoConflictDetection/case4/ancestor/model.uml
new file mode 100644
index 000000000..969ba554b
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/conflict/data/pseudoConflictDetection/case4/ancestor/model.uml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_jqC_YMQtEeWHJZXr_M-_cQ">
+ <packagedElement xmi:type="uml:Package" xmi:id="_pD71MMQtEeWHJZXr_M-_cQ" name="package1">
+ <packagedElement xmi:type="uml:StateMachine" xmi:id="_H_vh4MQ1EeWyCriXb06WOA" name="stateM0">
+ <ownedOperation xmi:id="_KIwc0MQ1EeWyCriXb06WOA" name="operation1"/>
+ <region xmi:id="_VGD34MQ1EeWyCriXb06WOA" name="region0">
+ <subvertex xmi:type="uml:State" xmi:id="_XrpaEMQ1EeWyCriXb06WOA" name="state0"/>
+ </region>
+ </packagedElement>
+ </packagedElement>
+</uml:Model>
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/conflict/data/pseudoConflictDetection/case4/model.uml b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/conflict/data/pseudoConflictDetection/case4/model.uml
new file mode 100644
index 000000000..4c0fd4b16
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/conflict/data/pseudoConflictDetection/case4/model.uml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_jqC_YMQtEeWHJZXr_M-_cQ">
+ <packagedElement xmi:type="uml:Package" xmi:id="_pD71MMQtEeWHJZXr_M-_cQ" name="package1">
+ <packagedElement xmi:type="uml:StateMachine" xmi:id="_H_vh4MQ1EeWyCriXb06WOA" name="stateM0">
+ <ownedOperation xmi:id="_KIwc0MQ1EeWyCriXb06WOA" name="operation1" method="_dDF_4MQ1EeWyCriXb06WOA"/>
+ <region xmi:id="_VGD34MQ1EeWyCriXb06WOA" name="region0">
+ <subvertex xmi:type="uml:State" xmi:id="_XrpaEMQ1EeWyCriXb06WOA" name="state0">
+ <doActivity xmi:type="uml:ProtocolStateMachine" xmi:id="_dDF_4MQ1EeWyCriXb06WOA" specification="_KIwc0MQ1EeWyCriXb06WOA"/>
+ </subvertex>
+ </region>
+ </packagedElement>
+ </packagedElement>
+</uml:Model>
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
index 599e0864b..f427722d4 100644
--- 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
@@ -15,6 +15,7 @@ import junit.framework.Test;
import junit.textui.TestRunner;
import org.eclipse.emf.compare.ComparePackage;
+import org.eclipse.emf.compare.tests.conflict.PseudoConflictDetectionTest;
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;
@@ -32,7 +33,7 @@ import org.junit.runners.Suite.SuiteClasses;
* @author <a href="mailto:mathieu.cartaud@obeo.fr">Mathieu Cartaud</a>
*/
@RunWith(Suite.class)
-@SuiteClasses({ConflictImplicationsTest_Bug484579.class })
+@SuiteClasses({ConflictImplicationsTest_Bug484579.class, PseudoConflictDetectionTest.class })
public class AtLeastLunaVersionTests {
/**
* Standalone launcher for all of compare's tests.

Back to the top