Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlgoubet2013-06-24 11:16:48 -0400
committerLaurent Goubet2013-07-12 02:35:14 -0400
commit2b6957c24d3554cf936d2c49410962293ec7d446 (patch)
tree4630f0fa882a2e24e51be5ced8f9bb9120ccff76 /plugins/org.eclipse.emf.compare.uml2.tests
parent2a49b81c24888b6e1158d946ec25d520a53c35a6 (diff)
downloadorg.eclipse.emf.compare-2b6957c24d3554cf936d2c49410962293ec7d446.tar.gz
org.eclipse.emf.compare-2b6957c24d3554cf936d2c49410962293ec7d446.tar.xz
org.eclipse.emf.compare-2b6957c24d3554cf936d2c49410962293ec7d446.zip
[410737] preserve ordering even for equivalent differences.
We need to check both equivalent and implied (or implied "by") differences. This allows us to "catch" issues with EMF automatically merging elements in their target lists while disregarding order. Bug:410737 Change-Id: I32b7c703d8069973ab8d6d90c0eb6a14ccee35a3
Diffstat (limited to 'plugins/org.eclipse.emf.compare.uml2.tests')
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/association/AddAssociation2Test.java9
1 files changed, 0 insertions, 9 deletions
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/association/AddAssociation2Test.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/association/AddAssociation2Test.java
index 4dc748179..b773db30f 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/association/AddAssociation2Test.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/association/AddAssociation2Test.java
@@ -28,7 +28,6 @@ import org.eclipse.emf.compare.uml2.internal.AssociationChange;
import org.eclipse.emf.compare.uml2.tests.AbstractTest;
import org.eclipse.emf.compare.uml2.tests.association.data.AssociationInputData;
import org.eclipse.emf.ecore.resource.Resource;
-import org.junit.Ignore;
import org.junit.Test;
@SuppressWarnings("nls")
@@ -54,8 +53,6 @@ public class AddAssociation2Test extends AbstractTest {
}
@Test
- @Ignore
- // FIXME: See Bug 410737
public void testMergeLtRA30UseCase() throws IOException {
final Resource left = input.getA3Left();
final Resource right = input.getA3Right();
@@ -73,8 +70,6 @@ public class AddAssociation2Test extends AbstractTest {
}
@Test
- @Ignore
- // FIXME: See Bug 410737
public void testMergeRtLA31UseCase() throws IOException {
final Resource left = input.getA3Left();
final Resource right = input.getA3Right();
@@ -108,8 +103,6 @@ public class AddAssociation2Test extends AbstractTest {
}
@Test
- @Ignore
- // FIXME: See Bug 410737
public void testMergeLtRA30UseCase3way() throws IOException {
final Resource left = input.getA3Left();
final Resource right = input.getA3Right();
@@ -134,8 +127,6 @@ public class AddAssociation2Test extends AbstractTest {
}
@Test
- @Ignore
- // FIXME: See Bug 410737
public void testMergeLtRA31UseCase3way() throws IOException {
final Resource left = input.getA3Left();
final Resource right = input.getA3Right();

Back to the top