diff options
| author | vlorenzo | 2012-07-19 12:13:43 +0000 |
|---|---|---|
| committer | vlorenzo | 2012-07-19 12:13:43 +0000 |
| commit | a78c7e58fefb962a436c9f4ea7845e7dc1ef0c40 (patch) | |
| tree | 8899f04be35b6c0c6761782f16576884cd942789 | |
| parent | 904994fa1ae1109d23fd78ba27e733301eb34bd0 (diff) | |
| download | org.eclipse.papyrus-a78c7e58fefb962a436c9f4ea7845e7dc1ef0c40.tar.gz org.eclipse.papyrus-a78c7e58fefb962a436c9f4ea7845e7dc1ef0c40.tar.xz org.eclipse.papyrus-a78c7e58fefb962a436c9f4ea7845e7dc1ef0c40.zip | |
385492: [UML Compare] the JUnit tests should test the merge of one diff and the merger associated to this diff
https://bugs.eclipse.org/bugs/show_bug.cgi?id=385492
59 files changed, 883 insertions, 1 deletions
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/AbstractCompareTest.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/AbstractCompareTest.java index 8dfad61af82..37b24a1ac7f 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/AbstractCompareTest.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/AbstractCompareTest.java @@ -18,6 +18,7 @@ import static org.eclipse.papyrus.infra.core.Activator.log; import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
+import java.util.Iterator;
import java.util.List;
import org.eclipse.core.resources.IFile;
@@ -27,6 +28,18 @@ import org.eclipse.emf.common.util.URI; import org.eclipse.emf.compare.diff.metamodel.DiffElement;
import org.eclipse.emf.compare.diff.metamodel.DiffGroup;
import org.eclipse.emf.compare.diff.metamodel.DiffModel;
+import org.eclipse.emf.compare.diff.metamodel.impl.AttributeChangeLeftTargetImpl;
+import org.eclipse.emf.compare.diff.metamodel.impl.AttributeChangeRightTargetImpl;
+import org.eclipse.emf.compare.diff.metamodel.impl.AttributeOrderChangeImpl;
+import org.eclipse.emf.compare.diff.metamodel.impl.DiffGroupImpl;
+import org.eclipse.emf.compare.diff.metamodel.impl.ModelElementChangeLeftTargetImpl;
+import org.eclipse.emf.compare.diff.metamodel.impl.ModelElementChangeRightTargetImpl;
+import org.eclipse.emf.compare.diff.metamodel.impl.MoveModelElementImpl;
+import org.eclipse.emf.compare.diff.metamodel.impl.ReferenceChangeLeftTargetImpl;
+import org.eclipse.emf.compare.diff.metamodel.impl.ReferenceChangeRightTargetImpl;
+import org.eclipse.emf.compare.diff.metamodel.impl.ReferenceOrderChangeImpl;
+import org.eclipse.emf.compare.diff.metamodel.impl.UpdateAttributeImpl;
+import org.eclipse.emf.compare.diff.metamodel.impl.UpdateReferenceImpl;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
@@ -38,6 +51,18 @@ import org.eclipse.papyrus.infra.core.resource.ModelSet; import org.eclipse.papyrus.infra.core.services.ServiceException;
import org.eclipse.papyrus.infra.core.services.ServiceMultiException;
import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
+import org.eclipse.papyrus.infra.emf.compare.diff.internal.merger.AttributeChangeLeftTargetTransactionalMerger;
+import org.eclipse.papyrus.infra.emf.compare.diff.internal.merger.AttributeChangeRightTargetTransactionalMerger;
+import org.eclipse.papyrus.infra.emf.compare.diff.internal.merger.DiffGroupTransactionalMerger;
+import org.eclipse.papyrus.infra.emf.compare.diff.internal.merger.ModelElementChangeLeftTargetTransactionalMerger;
+import org.eclipse.papyrus.infra.emf.compare.diff.internal.merger.ModelElementChangeRightTargetTransactionalMerger;
+import org.eclipse.papyrus.infra.emf.compare.diff.internal.merger.MoveModelElementTransactionalMerger;
+import org.eclipse.papyrus.infra.emf.compare.diff.internal.merger.ReferenceChangeLeftTargetTransactionalMerger;
+import org.eclipse.papyrus.infra.emf.compare.diff.internal.merger.ReferenceChangeRightTargetTransactionalMerger;
+import org.eclipse.papyrus.infra.emf.compare.diff.internal.merger.ReferenceOrderChangeTransactionalMerger;
+import org.eclipse.papyrus.infra.emf.compare.diff.internal.merger.UpdateAttributeTransactionalMerger;
+import org.eclipse.papyrus.infra.emf.compare.diff.internal.merger.UpdateReferenceTransactionalMerger;
+import org.eclipse.papyrus.infra.emf.compare.diff.service.TransactionalMergeFactory;
import org.eclipse.papyrus.infra.emf.compare.diff.service.TransactionalMergeService;
import org.eclipse.papyrus.junit.utils.GenericUtils;
import org.eclipse.papyrus.uml.compare.file.editor.utils.ServicesRegistryUtils;
@@ -68,7 +93,7 @@ public abstract class AbstractCompareTest { protected static Element rightElement;
/** This field is used to store the initial Differences before to do the merge */
- private static List<DiffElement> initialDifferences;
+ protected static List<DiffElement> initialDifferences;
protected static ServicesRegistry servicesRegistry;
@@ -307,4 +332,93 @@ public abstract class AbstractCompareTest { }
return resources;
}
+
+
+
+ /**
+ * This tests verify that the merge of the Diff works fine
+ * the method {@link #testCommandExecution()} test the MergeAll
+ *
+ * @throws IOException
+ * @throws InterruptedException
+ */
+ @Test
+ public void testOneDiffCommandExecution() throws IOException, InterruptedException {
+ testUndo();
+ final DiffModel diff = getDiffModel(leftElement, rightElement);
+ final DiffElement diffElement = getDiffElementToMerge(diff).get(0);
+ Assert.assertFalse(diffElement instanceof DiffGroup);
+ testDiffMerger(diffElement);
+ final Command cmd = TransactionalMergeService.getMergeCommand(domain, diffElement, leftToRight);
+ Assert.assertNotNull(NLS.bind("I can't find the merge command for {0}", diffElement), cmd);
+ Assert.assertTrue(NLS.bind("The builded command to merge {0} is not executable", diffElement), cmd.canExecute());
+ //we execute the command and hope that all it is OK
+ domain.getCommandStack().execute(cmd);
+ saveFiles();
+ testModificationOnDiFile();
+ testModificationOnNotationFile();
+ testModificationOnUMLFile();
+ testResult();
+ testXMIID();
+ testUndo();
+ testRedo();
+ }
+
+
+ protected void testDiffMerger(DiffElement diffElement) {
+ final Class<?> wantedMerger = getWantedMergerFor(diffElement);
+ final Class<?> currentMerger = TransactionalMergeFactory.createMerger(diffElement).getClass();
+ Assert.assertEquals(NLS.bind("We don't get the correct merger for {0}", diffElement), wantedMerger, currentMerger);
+ }
+
+ protected Class<?> getWantedMergerFor(final DiffElement diffElement) {
+ if(diffElement.getClass() == AttributeChangeLeftTargetImpl.class) {
+ return AttributeChangeLeftTargetTransactionalMerger.class;
+ } else if(diffElement.getClass() == AttributeChangeRightTargetImpl.class) {
+ return AttributeChangeRightTargetTransactionalMerger.class;
+ } else if(diffElement.getClass() == AttributeOrderChangeImpl.class) {
+ Assert.fail();//something to do here?
+ } else if(diffElement.getClass() == DiffGroupImpl.class) {
+ return DiffGroupTransactionalMerger.class;
+ } else if(diffElement.getClass() == ModelElementChangeRightTargetImpl.class) {
+ return ModelElementChangeRightTargetTransactionalMerger.class;
+ } else if(diffElement.getClass() == ModelElementChangeLeftTargetImpl.class) {
+ return ModelElementChangeLeftTargetTransactionalMerger.class;
+ } else if(diffElement.getClass() == MoveModelElementImpl.class) {
+ return MoveModelElementTransactionalMerger.class;
+ } else if(diffElement.getClass() == ReferenceChangeLeftTargetImpl.class) {
+ return ReferenceChangeLeftTargetTransactionalMerger.class;
+ } else if(diffElement.getClass() == ReferenceChangeRightTargetImpl.class) {
+ return ReferenceChangeRightTargetTransactionalMerger.class;
+ } else if(diffElement.getClass() == ReferenceOrderChangeImpl.class) {
+ return ReferenceOrderChangeTransactionalMerger.class;
+ } else if(diffElement.getClass() == UpdateReferenceImpl.class) {
+ return UpdateReferenceTransactionalMerger.class;
+ } else if(diffElement.getClass() == UpdateAttributeImpl.class) {
+ return UpdateAttributeTransactionalMerger.class;
+ }
+ return null;
+ }
+
+ /**
+ *
+ * @param diffModel
+ * a diffModel
+ * @return
+ * the list of the single diff to merge -> no DiffGroup are returned
+ */
+ protected List<DiffElement> getDiffElementToMerge(final DiffModel diff) {
+ // Merges all differences from model1 to model2
+ final List<DiffElement> differences = new ArrayList<DiffElement>();
+ Iterator<EObject> iter = diff.eAllContents();
+ while(iter.hasNext()) {
+ EObject current = iter.next();
+ if(current instanceof DiffElement) {
+ if(!(current instanceof DiffGroup)) {
+ differences.add((DiffElement)current);
+ }
+ }
+ }
+ return differences;
+ }
}
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/nested/NestedModelElementChangeLeftTargetTest_1_LeftToRight.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/nested/NestedModelElementChangeLeftTargetTest_1_LeftToRight.java index 6128c0f0251..1e7165becfd 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/nested/NestedModelElementChangeLeftTargetTest_1_LeftToRight.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/nested/NestedModelElementChangeLeftTargetTest_1_LeftToRight.java @@ -124,4 +124,9 @@ public class NestedModelElementChangeLeftTargetTest_1_LeftToRight extends Abstra super.testRedo();
}
+ @Test
+ public void testOneDiffCommandExecution() throws IOException, InterruptedException {
+ super.testOneDiffCommandExecution();
+ }
+
}
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/nested/NestedModelElementChangeLeftTargetTest_1_RightToLeft.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/nested/NestedModelElementChangeLeftTargetTest_1_RightToLeft.java index 7491f9389c5..d1fe59a04eb 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/nested/NestedModelElementChangeLeftTargetTest_1_RightToLeft.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/nested/NestedModelElementChangeLeftTargetTest_1_RightToLeft.java @@ -116,4 +116,8 @@ public class NestedModelElementChangeLeftTargetTest_1_RightToLeft extends Abstra super.testRedo();
}
+ @Test
+ public void testOneDiffCommandExecution() throws IOException, InterruptedException {
+ super.testOneDiffCommandExecution();
+ }
}
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/nested/NestedModelElementChangeRightTargetTest_1_LeftToRight.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/nested/NestedModelElementChangeRightTargetTest_1_LeftToRight.java index c3757f10cdb..64c34821836 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/nested/NestedModelElementChangeRightTargetTest_1_LeftToRight.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/nested/NestedModelElementChangeRightTargetTest_1_LeftToRight.java @@ -116,4 +116,9 @@ public class NestedModelElementChangeRightTargetTest_1_LeftToRight extends Abstr super.testRedo();
}
+ @Test
+ public void testOneDiffCommandExecution() throws IOException, InterruptedException {
+ super.testOneDiffCommandExecution();
+ }
+
}
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/nested/NestedModelElementChangeRightTargetTest_1_RightToLeft.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/nested/NestedModelElementChangeRightTargetTest_1_RightToLeft.java index 936dfe99127..7ae070a3b42 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/nested/NestedModelElementChangeRightTargetTest_1_RightToLeft.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/nested/NestedModelElementChangeRightTargetTest_1_RightToLeft.java @@ -124,4 +124,9 @@ public class NestedModelElementChangeRightTargetTest_1_RightToLeft extends Abstr super.testRedo();
}
+ @Test
+ public void testOneDiffCommandExecution() throws IOException, InterruptedException {
+ super.testOneDiffCommandExecution();
+ }
+
}
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/nested/NestedUpdateAttributeTest_1_LeftToRight.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/nested/NestedUpdateAttributeTest_1_LeftToRight.java index ef7909e7505..b5cdba9070b 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/nested/NestedUpdateAttributeTest_1_LeftToRight.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/nested/NestedUpdateAttributeTest_1_LeftToRight.java @@ -116,4 +116,8 @@ public class NestedUpdateAttributeTest_1_LeftToRight extends AbstractNestedCompa super.testRedo();
}
+ @Test
+ public void testOneDiffCommandExecution() throws IOException, InterruptedException {
+ super.testOneDiffCommandExecution();
+ }
}
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/nested/NestedUpdateAttributeTest_1_RightToLeft.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/nested/NestedUpdateAttributeTest_1_RightToLeft.java index ae3cad3961c..add1f89d722 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/nested/NestedUpdateAttributeTest_1_RightToLeft.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/nested/NestedUpdateAttributeTest_1_RightToLeft.java @@ -116,4 +116,8 @@ public class NestedUpdateAttributeTest_1_RightToLeft extends AbstractNestedCompa super.testRedo();
}
+ @Test
+ public void testOneDiffCommandExecution() throws IOException, InterruptedException {
+ super.testOneDiffCommandExecution();
+ }
}
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/AttributeChangeLeftTargetTest_1_LeftToRight.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/AttributeChangeLeftTargetTest_1_LeftToRight.java index bcd1edbeb1e..3e2566740d1 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/AttributeChangeLeftTargetTest_1_LeftToRight.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/AttributeChangeLeftTargetTest_1_LeftToRight.java @@ -108,4 +108,10 @@ public class AttributeChangeLeftTargetTest_1_LeftToRight extends AbstractStandal super.testRedo();
}
+ @Test
+ public void testOneDiffCommandExecution() throws IOException, InterruptedException {
+ super.testOneDiffCommandExecution();
+ }
+
+
}
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/AttributeChangeLeftTargetTest_1_RightToLeft.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/AttributeChangeLeftTargetTest_1_RightToLeft.java index 5d7aedeb66f..1f7bbf6c08d 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/AttributeChangeLeftTargetTest_1_RightToLeft.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/AttributeChangeLeftTargetTest_1_RightToLeft.java @@ -107,5 +107,9 @@ public class AttributeChangeLeftTargetTest_1_RightToLeft extends AbstractStandal super.testRedo();
}
+ @Test
+ public void testOneDiffCommandExecution() throws IOException, InterruptedException {
+ super.testOneDiffCommandExecution();
+ }
}
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/AttributeChangeRightTargetTest_1_LeftToRight.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/AttributeChangeRightTargetTest_1_LeftToRight.java index d757beb0887..895c3dcadad 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/AttributeChangeRightTargetTest_1_LeftToRight.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/AttributeChangeRightTargetTest_1_LeftToRight.java @@ -108,4 +108,8 @@ public class AttributeChangeRightTargetTest_1_LeftToRight extends AbstractStanda super.testRedo();
}
+ @Test
+ public void testOneDiffCommandExecution() throws IOException, InterruptedException {
+ super.testOneDiffCommandExecution();
+ }
}
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/AttributeChangeRightTargetTest_1_RightToLeft.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/AttributeChangeRightTargetTest_1_RightToLeft.java index dbea350724f..06521d2890a 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/AttributeChangeRightTargetTest_1_RightToLeft.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/AttributeChangeRightTargetTest_1_RightToLeft.java @@ -107,4 +107,9 @@ public class AttributeChangeRightTargetTest_1_RightToLeft extends AbstractStanda public void testRedo() throws IOException, InterruptedException {
super.testRedo();
}
+
+ @Test
+ public void testOneDiffCommandExecution() throws IOException, InterruptedException {
+ super.testOneDiffCommandExecution();
+ }
}
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/AttributeOrderChangeTest_1_LeftToRight.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/AttributeOrderChangeTest_1_LeftToRight.java index 523bb266beb..377da8e6284 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/AttributeOrderChangeTest_1_LeftToRight.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/AttributeOrderChangeTest_1_LeftToRight.java @@ -108,4 +108,9 @@ public class AttributeOrderChangeTest_1_LeftToRight extends AbstractStandaloneCo public void testRedo() throws IOException, InterruptedException {
super.testRedo();
}
+
+ @Test
+ public void testOneDiffCommandExecution() throws IOException, InterruptedException {
+ super.testOneDiffCommandExecution();
+ }
}
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/AttributeOrderChangeTest_1_RightToLeft.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/AttributeOrderChangeTest_1_RightToLeft.java index b56c6613167..beb46cb9197 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/AttributeOrderChangeTest_1_RightToLeft.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/AttributeOrderChangeTest_1_RightToLeft.java @@ -109,4 +109,9 @@ public class AttributeOrderChangeTest_1_RightToLeft extends AbstractStandaloneCo public void testRedo() throws IOException, InterruptedException {
super.testRedo();
}
+
+ @Test
+ public void testOneDiffCommandExecution() throws IOException, InterruptedException {
+ super.testOneDiffCommandExecution();
+ }
}
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/ModelElementChangeLeftTargetTest_1_LeftToRight.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/ModelElementChangeLeftTargetTest_1_LeftToRight.java index 154bd42c6d6..1561b7e5464 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/ModelElementChangeLeftTargetTest_1_LeftToRight.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/ModelElementChangeLeftTargetTest_1_LeftToRight.java @@ -125,4 +125,8 @@ public class ModelElementChangeLeftTargetTest_1_LeftToRight extends AbstractStan super.testRedo();
}
+ @Test
+ public void testOneDiffCommandExecution() throws IOException, InterruptedException {
+ super.testOneDiffCommandExecution();
+ }
}
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/ModelElementChangeLeftTargetTest_1_RightToLeft.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/ModelElementChangeLeftTargetTest_1_RightToLeft.java index 64fee3111f6..1a06f3cdd08 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/ModelElementChangeLeftTargetTest_1_RightToLeft.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/ModelElementChangeLeftTargetTest_1_RightToLeft.java @@ -125,4 +125,9 @@ public class ModelElementChangeLeftTargetTest_1_RightToLeft extends AbstractStan super.testRedo();
}
+ @Test
+ public void testOneDiffCommandExecution() throws IOException, InterruptedException {
+ super.testOneDiffCommandExecution();
+ }
+
}
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/ModelElementChangeRightTargetTest_1_LeftToRight.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/ModelElementChangeRightTargetTest_1_LeftToRight.java index eab900c2a24..7037ea9f18e 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/ModelElementChangeRightTargetTest_1_LeftToRight.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/ModelElementChangeRightTargetTest_1_LeftToRight.java @@ -125,5 +125,9 @@ public class ModelElementChangeRightTargetTest_1_LeftToRight extends AbstractSta super.testRedo();
}
+ @Test
+ public void testOneDiffCommandExecution() throws IOException, InterruptedException {
+ super.testOneDiffCommandExecution();
+ }
}
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/ModelElementChangeRightTargetTest_1_RightToLeft.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/ModelElementChangeRightTargetTest_1_RightToLeft.java index 8ba6cfb0611..3b7f0fcb461 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/ModelElementChangeRightTargetTest_1_RightToLeft.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/ModelElementChangeRightTargetTest_1_RightToLeft.java @@ -122,4 +122,8 @@ public class ModelElementChangeRightTargetTest_1_RightToLeft extends AbstractSta super.testRedo();
}
+ @Test
+ public void testOneDiffCommandExecution() throws IOException, InterruptedException {
+ super.testOneDiffCommandExecution();
+ }
}
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/MoveModelElementTest_1_LeftToRight.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/MoveModelElementTest_1_LeftToRight.java index 32ee97d4bb9..64274fe0885 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/MoveModelElementTest_1_LeftToRight.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/MoveModelElementTest_1_LeftToRight.java @@ -107,4 +107,9 @@ public class MoveModelElementTest_1_LeftToRight extends AbstractStandaloneCompar public void testRedo() throws IOException, InterruptedException {
super.testRedo();
}
+
+ @Test
+ public void testOneDiffCommandExecution() throws IOException, InterruptedException {
+ super.testOneDiffCommandExecution();
+ }
}
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/MoveModelElementTest_1_RightToLeft.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/MoveModelElementTest_1_RightToLeft.java index 0de2434ab5f..c8611fb53a0 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/MoveModelElementTest_1_RightToLeft.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/MoveModelElementTest_1_RightToLeft.java @@ -107,4 +107,9 @@ public class MoveModelElementTest_1_RightToLeft extends AbstractStandaloneCompar public void testRedo() throws IOException, InterruptedException {
super.testRedo();
}
+
+ @Test
+ public void testOneDiffCommandExecution() throws IOException, InterruptedException {
+ super.testOneDiffCommandExecution();
+ }
}
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/MoveModelElementTest_2_LeftToRight.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/MoveModelElementTest_2_LeftToRight.java index fae3b38ec4d..7155e8c3f1c 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/MoveModelElementTest_2_LeftToRight.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/MoveModelElementTest_2_LeftToRight.java @@ -14,14 +14,20 @@ package org.eclipse.papyrus.uml.compare.diff.tests.standalone;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.List;
import org.eclipse.core.runtime.CoreException;
+import org.eclipse.emf.common.command.Command;
import org.eclipse.emf.compare.diff.metamodel.DiffElement;
import org.eclipse.emf.compare.diff.metamodel.DiffGroup;
+import org.eclipse.emf.compare.diff.metamodel.DiffModel;
import org.eclipse.emf.compare.diff.metamodel.MoveModelElement;
+import org.eclipse.osgi.util.NLS;
import org.eclipse.papyrus.infra.core.resource.ModelMultiException;
import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.emf.compare.diff.service.TransactionalMergeService;
+import org.eclipse.papyrus.uml.compare.diff.tests.TestMergerUtils;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Ignore;
@@ -119,4 +125,47 @@ public class MoveModelElementTest_2_LeftToRight extends AbstractStandaloneCompar public void testMergeOrder() {
Assert.fail("not yet implemented");
}
+
+ @Test
+ public void testOneDiffCommandExecution() throws IOException, InterruptedException {
+ testUndo();
+ final DiffModel diff = getDiffModel(leftElement, rightElement);
+ final List<DiffElement> diffsToMerge = getDiffElementToMerge(diff);
+ int nb = diffsToMerge.size();
+ for(final DiffElement diffElement : diffsToMerge) {
+ Assert.assertFalse(diffElement instanceof DiffGroup);
+ testDiffMerger(diffElement);
+ final Command cmd = TransactionalMergeService.getMergeCommand(domain, diffElement, leftToRight);
+ Assert.assertNotNull(NLS.bind("I can't find the merge command for {0}", diffElement), cmd);
+ Assert.assertTrue(NLS.bind("The builded command to merge {0} is not executable", diffElement), cmd.canExecute());
+ //we execute the command and hope that all it is OK
+ domain.getCommandStack().execute(cmd);
+ }
+ saveFiles();
+ testModificationOnDiFile();
+ testModificationOnNotationFile();
+ testModificationOnUMLFile();
+ testResult();
+ testXMIID();
+
+ //we test the Undo
+ for(int i = 0; i < nb; i++) {
+ domain.getCommandStack().undo();
+ }
+ saveFiles();
+ final DiffModel diff2 = getDiffModel(leftElement, rightElement);
+ // Merges all differences from model1 to model2
+ final List<DiffElement> differences = new ArrayList<DiffElement>(diff2.getOwnedElements());
+ TestMergerUtils.compareDiffList(initialDifferences, differences);
+
+
+ //we test the Undo
+ for(int i = 0; i < nb; i++) {
+ domain.getCommandStack().redo();
+ }
+
+ saveFiles();
+ testResult();
+ }
+
}
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/MoveModelElementTest_2_RightToLeft.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/MoveModelElementTest_2_RightToLeft.java index f0dbfb525f1..69e49258791 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/MoveModelElementTest_2_RightToLeft.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/MoveModelElementTest_2_RightToLeft.java @@ -14,14 +14,20 @@ package org.eclipse.papyrus.uml.compare.diff.tests.standalone;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.List;
import org.eclipse.core.runtime.CoreException;
+import org.eclipse.emf.common.command.Command;
import org.eclipse.emf.compare.diff.metamodel.DiffElement;
import org.eclipse.emf.compare.diff.metamodel.DiffGroup;
+import org.eclipse.emf.compare.diff.metamodel.DiffModel;
import org.eclipse.emf.compare.diff.metamodel.MoveModelElement;
+import org.eclipse.osgi.util.NLS;
import org.eclipse.papyrus.infra.core.resource.ModelMultiException;
import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.emf.compare.diff.service.TransactionalMergeService;
+import org.eclipse.papyrus.uml.compare.diff.tests.TestMergerUtils;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Ignore;
@@ -119,4 +125,46 @@ public class MoveModelElementTest_2_RightToLeft extends AbstractStandaloneCompar public void testMergeOrder() {
Assert.fail("not yet implemented");
}
+
+ @Test
+ public void testOneDiffCommandExecution() throws IOException, InterruptedException {
+ testUndo();
+ final DiffModel diff = getDiffModel(leftElement, rightElement);
+ final List<DiffElement> diffsToMerge = getDiffElementToMerge(diff);
+ int nb = diffsToMerge.size();
+ for(final DiffElement diffElement : diffsToMerge) {
+ Assert.assertFalse(diffElement instanceof DiffGroup);
+ testDiffMerger(diffElement);
+ final Command cmd = TransactionalMergeService.getMergeCommand(domain, diffElement, leftToRight);
+ Assert.assertNotNull(NLS.bind("I can't find the merge command for {0}", diffElement), cmd);
+ Assert.assertTrue(NLS.bind("The builded command to merge {0} is not executable", diffElement), cmd.canExecute());
+ //we execute the command and hope that all it is OK
+ domain.getCommandStack().execute(cmd);
+ }
+ saveFiles();
+ testModificationOnDiFile();
+ testModificationOnNotationFile();
+ testModificationOnUMLFile();
+ testResult();
+ testXMIID();
+
+ //we test the Undo
+ for(int i = 0; i < nb; i++) {
+ domain.getCommandStack().undo();
+ }
+ saveFiles();
+ final DiffModel diff2 = getDiffModel(leftElement, rightElement);
+ // Merges all differences from model1 to model2
+ final List<DiffElement> differences = new ArrayList<DiffElement>(diff2.getOwnedElements());
+ TestMergerUtils.compareDiffList(initialDifferences, differences);
+
+
+ //we test the Undo
+ for(int i = 0; i < nb; i++) {
+ domain.getCommandStack().redo();
+ }
+
+ saveFiles();
+ testResult();
+ }
}
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/ReferenceChangeLeftTargetTest_1_LeftToRight.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/ReferenceChangeLeftTargetTest_1_LeftToRight.java index 9f57223956c..151be069a74 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/ReferenceChangeLeftTargetTest_1_LeftToRight.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/ReferenceChangeLeftTargetTest_1_LeftToRight.java @@ -115,4 +115,9 @@ public class ReferenceChangeLeftTargetTest_1_LeftToRight extends AbstractStandal public void testRedo() throws IOException, InterruptedException {
super.testRedo();
}
+
+ @Test
+ public void testOneDiffCommandExecution() throws IOException, InterruptedException {
+ super.testOneDiffCommandExecution();
+ }
}
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/ReferenceChangeLeftTargetTest_1_RightToLeft.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/ReferenceChangeLeftTargetTest_1_RightToLeft.java index 01ddadb263b..15ea10e40a7 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/ReferenceChangeLeftTargetTest_1_RightToLeft.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/ReferenceChangeLeftTargetTest_1_RightToLeft.java @@ -116,5 +116,10 @@ public class ReferenceChangeLeftTargetTest_1_RightToLeft extends AbstractStandal super.testRedo();
}
+ @Test
+ public void testOneDiffCommandExecution() throws IOException, InterruptedException {
+ super.testOneDiffCommandExecution();
+ }
+
}
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/ReferenceChangeRightTargetTest_1_LeftToRight.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/ReferenceChangeRightTargetTest_1_LeftToRight.java index fd6cd0e369c..04023736fe0 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/ReferenceChangeRightTargetTest_1_LeftToRight.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/ReferenceChangeRightTargetTest_1_LeftToRight.java @@ -115,4 +115,9 @@ public class ReferenceChangeRightTargetTest_1_LeftToRight extends AbstractStanda public void testRedo() throws IOException, InterruptedException {
super.testRedo();
}
+
+ @Test
+ public void testOneDiffCommandExecution() throws IOException, InterruptedException {
+ super.testOneDiffCommandExecution();
+ }
}
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/ReferenceChangeRightTargetTest_1_RightToLeft.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/ReferenceChangeRightTargetTest_1_RightToLeft.java index f404020baf3..e53a895f085 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/ReferenceChangeRightTargetTest_1_RightToLeft.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/ReferenceChangeRightTargetTest_1_RightToLeft.java @@ -116,5 +116,9 @@ public class ReferenceChangeRightTargetTest_1_RightToLeft extends AbstractStanda super.testRedo();
}
+ @Test
+ public void testOneDiffCommandExecution() throws IOException, InterruptedException {
+ super.testOneDiffCommandExecution();
+ }
}
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/ReferenceOrderChangeTest_1_LeftToRight.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/ReferenceOrderChangeTest_1_LeftToRight.java index 49eaccfea7c..2c771fa7011 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/ReferenceOrderChangeTest_1_LeftToRight.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/ReferenceOrderChangeTest_1_LeftToRight.java @@ -109,4 +109,8 @@ public class ReferenceOrderChangeTest_1_LeftToRight extends AbstractStandaloneCo super.testRedo();
}
+ @Test
+ public void testOneDiffCommandExecution() throws IOException, InterruptedException {
+ super.testOneDiffCommandExecution();
+ }
}
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/ReferenceOrderChangeTest_1_RightToLeft.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/ReferenceOrderChangeTest_1_RightToLeft.java index f933ff68019..cddb34f1da8 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/ReferenceOrderChangeTest_1_RightToLeft.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/ReferenceOrderChangeTest_1_RightToLeft.java @@ -108,4 +108,9 @@ public class ReferenceOrderChangeTest_1_RightToLeft extends AbstractStandaloneCo public void testRedo() throws IOException, InterruptedException {
super.testRedo();
}
+
+ @Test
+ public void testOneDiffCommandExecution() throws IOException, InterruptedException {
+ super.testOneDiffCommandExecution();
+ }
}
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/UpdateAttributeTest_1_LeftToRight.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/UpdateAttributeTest_1_LeftToRight.java index 348f2cf3e27..6c0ecaf417f 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/UpdateAttributeTest_1_LeftToRight.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/UpdateAttributeTest_1_LeftToRight.java @@ -119,5 +119,9 @@ public class UpdateAttributeTest_1_LeftToRight extends AbstractStandaloneCompare super.testRedo();
}
+ @Test
+ public void testOneDiffCommandExecution() throws IOException, InterruptedException {
+ super.testOneDiffCommandExecution();
+ }
}
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/UpdateAttributeTest_1_RightToLeft.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/UpdateAttributeTest_1_RightToLeft.java index b15a3bd9756..d8c8e0b6167 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/UpdateAttributeTest_1_RightToLeft.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/UpdateAttributeTest_1_RightToLeft.java @@ -117,4 +117,9 @@ public class UpdateAttributeTest_1_RightToLeft extends AbstractStandaloneCompare super.testRedo();
}
+ @Test
+ public void testOneDiffCommandExecution() throws IOException, InterruptedException {
+ super.testOneDiffCommandExecution();
+ }
+
}
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/UpdateReferenceTest_1_LeftToRight.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/UpdateReferenceTest_1_LeftToRight.java index 7042e9421b0..f6056bc2a9f 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/UpdateReferenceTest_1_LeftToRight.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/UpdateReferenceTest_1_LeftToRight.java @@ -107,4 +107,9 @@ public class UpdateReferenceTest_1_LeftToRight extends AbstractStandaloneCompare public void testRedo() throws IOException, InterruptedException {
super.testRedo();
}
+
+ @Test
+ public void testOneDiffCommandExecution() throws IOException, InterruptedException {
+ super.testOneDiffCommandExecution();
+ }
}
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/UpdateReferenceTest_1_RightToLeft.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/UpdateReferenceTest_1_RightToLeft.java index aa465f7a4dd..42ebaf39c4a 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/UpdateReferenceTest_1_RightToLeft.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/UpdateReferenceTest_1_RightToLeft.java @@ -108,4 +108,9 @@ public class UpdateReferenceTest_1_RightToLeft extends AbstractStandaloneCompare public void testRedo() throws IOException, InterruptedException {
super.testRedo();
}
+
+ @Test
+ public void testOneDiffCommandExecution() throws IOException, InterruptedException {
+ super.testOneDiffCommandExecution();
+ }
}
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/UpdateReferenceTest_2_LeftToRight.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/UpdateReferenceTest_2_LeftToRight.java index 59044edf99c..ff2c0982a2e 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/UpdateReferenceTest_2_LeftToRight.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/UpdateReferenceTest_2_LeftToRight.java @@ -108,4 +108,8 @@ public class UpdateReferenceTest_2_LeftToRight extends AbstractStandaloneCompare super.testRedo();
}
+ @Test
+ public void testOneDiffCommandExecution() throws IOException, InterruptedException {
+ super.testOneDiffCommandExecution();
+ }
}
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/UpdateReferenceTest_2_RightToLeft.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/UpdateReferenceTest_2_RightToLeft.java index 8d6ff39eed5..9c5589f4711 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/UpdateReferenceTest_2_RightToLeft.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/standalone/UpdateReferenceTest_2_RightToLeft.java @@ -109,4 +109,8 @@ public class UpdateReferenceTest_2_RightToLeft extends AbstractStandaloneCompare super.testRedo();
}
+ @Test
+ public void testOneDiffCommandExecution() throws IOException, InterruptedException {
+ super.testOneDiffCommandExecution();
+ }
}
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLProfileApplicationAddition_1_LeftToRight.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLProfileApplicationAddition_1_LeftToRight.java index 8f802f09d96..07d1bfe4602 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLProfileApplicationAddition_1_LeftToRight.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLProfileApplicationAddition_1_LeftToRight.java @@ -14,11 +14,13 @@ package org.eclipse.papyrus.uml.compare.diff.tests.uml.profile.standalone;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.List;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.emf.compare.diff.metamodel.AbstractDiffExtension;
import org.eclipse.emf.compare.diff.metamodel.DiffElement;
+import org.eclipse.emf.compare.diff.metamodel.DiffModel;
import org.eclipse.emf.compare.diff.metamodel.ModelElementChangeLeftTarget;
import org.eclipse.emf.compare.uml2diff.UMLProfileApplicationAddition;
import org.eclipse.emf.ecore.EAnnotation;
@@ -26,6 +28,7 @@ import org.eclipse.osgi.util.NLS; import org.eclipse.papyrus.infra.core.resource.ModelMultiException;
import org.eclipse.papyrus.infra.core.services.ServiceException;
import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.uml.compare.diff.internal.merger.UMLProfileApplicationAdditionMerger;
import org.eclipse.uml2.uml.Model;
import org.eclipse.uml2.uml.ProfileApplication;
import org.junit.Assert;
@@ -137,4 +140,30 @@ public class UMLProfileApplicationAddition_1_LeftToRight extends AbstractUMLStan public void testRedo() throws IOException, InterruptedException {
super.testRedo();
}
+
+ @Test
+ public void testOneDiffCommandExecution() throws IOException, InterruptedException {
+ super.testOneDiffCommandExecution();
+ }
+
+ @Override
+ protected List<DiffElement> getDiffElementToMerge(DiffModel diff) {
+ final List<DiffElement> differences = super.getDiffElementToMerge(diff);
+ final List<DiffElement> differencesToRemove = new ArrayList<DiffElement>();
+ for(final DiffElement current : differences) {
+ if(!(current instanceof UMLProfileApplicationAddition)) {
+ differencesToRemove.add(current);
+ }
+ }
+ differences.removeAll(differencesToRemove);
+ return differences;
+ }
+
+ @Override
+ protected java.lang.Class<?> getWantedMergerFor(DiffElement diffElement) {
+ if(diffElement instanceof UMLProfileApplicationAddition) {
+ return UMLProfileApplicationAdditionMerger.class;
+ }
+ return null;
+ }
}
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLProfileApplicationAddition_1_RightToLeft.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLProfileApplicationAddition_1_RightToLeft.java index 7c372ad29b5..a2bb5cd6f74 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLProfileApplicationAddition_1_RightToLeft.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLProfileApplicationAddition_1_RightToLeft.java @@ -14,16 +14,19 @@ package org.eclipse.papyrus.uml.compare.diff.tests.uml.profile.standalone;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.List;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.emf.compare.diff.metamodel.AbstractDiffExtension;
import org.eclipse.emf.compare.diff.metamodel.DiffElement;
+import org.eclipse.emf.compare.diff.metamodel.DiffModel;
import org.eclipse.emf.compare.diff.metamodel.ModelElementChangeLeftTarget;
import org.eclipse.emf.compare.uml2diff.UMLProfileApplicationAddition;
import org.eclipse.osgi.util.NLS;
import org.eclipse.papyrus.infra.core.resource.ModelMultiException;
import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.uml.compare.diff.internal.merger.UMLProfileApplicationAdditionMerger;
import org.eclipse.uml2.uml.Model;
import org.junit.Assert;
import org.junit.BeforeClass;
@@ -119,4 +122,30 @@ public class UMLProfileApplicationAddition_1_RightToLeft extends AbstractUMLStan public void testRedo() throws IOException, InterruptedException {
super.testRedo();
}
+
+ @Test
+ public void testOneDiffCommandExecution() throws IOException, InterruptedException {
+ super.testOneDiffCommandExecution();
+ }
+
+ @Override
+ protected List<DiffElement> getDiffElementToMerge(DiffModel diff) {
+ final List<DiffElement> differences = super.getDiffElementToMerge(diff);
+ final List<DiffElement> differencesToRemove = new ArrayList<DiffElement>();
+ for(final DiffElement current : differences) {
+ if(!(current instanceof UMLProfileApplicationAddition)) {
+ differencesToRemove.add(current);
+ }
+ }
+ differences.removeAll(differencesToRemove);
+ return differences;
+ }
+
+ @Override
+ protected java.lang.Class<?> getWantedMergerFor(DiffElement diffElement) {
+ if(diffElement instanceof UMLProfileApplicationAddition) {
+ return UMLProfileApplicationAdditionMerger.class;
+ }
+ return null;
+ }
}
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLProfileApplicationRemoval_1_LeftToRight.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLProfileApplicationRemoval_1_LeftToRight.java index e389a0f6d36..7aede48a030 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLProfileApplicationRemoval_1_LeftToRight.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLProfileApplicationRemoval_1_LeftToRight.java @@ -14,16 +14,19 @@ package org.eclipse.papyrus.uml.compare.diff.tests.uml.profile.standalone;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.List;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.emf.compare.diff.metamodel.AbstractDiffExtension;
import org.eclipse.emf.compare.diff.metamodel.DiffElement;
+import org.eclipse.emf.compare.diff.metamodel.DiffModel;
import org.eclipse.emf.compare.diff.metamodel.ModelElementChangeRightTarget;
import org.eclipse.emf.compare.uml2diff.UMLProfileApplicationRemoval;
import org.eclipse.osgi.util.NLS;
import org.eclipse.papyrus.infra.core.resource.ModelMultiException;
import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.uml.compare.diff.internal.merger.UMLProfileApplicationRemovalMerger;
import org.eclipse.uml2.uml.Model;
import org.junit.Assert;
import org.junit.BeforeClass;
@@ -119,4 +122,30 @@ public class UMLProfileApplicationRemoval_1_LeftToRight extends AbstractUMLStand public void testRedo() throws IOException, InterruptedException {
super.testRedo();
}
+
+ @Test
+ public void testOneDiffCommandExecution() throws IOException, InterruptedException {
+ super.testOneDiffCommandExecution();
+ }
+
+ @Override
+ protected List<DiffElement> getDiffElementToMerge(DiffModel diff) {
+ final List<DiffElement> differences = super.getDiffElementToMerge(diff);
+ final List<DiffElement> differencesToRemove = new ArrayList<DiffElement>();
+ for(final DiffElement current : differences) {
+ if(!(current instanceof UMLProfileApplicationRemoval)) {
+ differencesToRemove.add(current);
+ }
+ }
+ differences.removeAll(differencesToRemove);
+ return differences;
+ }
+
+ @Override
+ protected java.lang.Class<?> getWantedMergerFor(DiffElement diffElement) {
+ if(diffElement instanceof UMLProfileApplicationRemoval) {
+ return UMLProfileApplicationRemovalMerger.class;
+ }
+ return null;
+ }
}
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLProfileApplicationRemoval_1_RightToLeft.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLProfileApplicationRemoval_1_RightToLeft.java index 70736c5907b..d0d8206af22 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLProfileApplicationRemoval_1_RightToLeft.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLProfileApplicationRemoval_1_RightToLeft.java @@ -14,11 +14,13 @@ package org.eclipse.papyrus.uml.compare.diff.tests.uml.profile.standalone;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.List;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.emf.compare.diff.metamodel.AbstractDiffExtension;
import org.eclipse.emf.compare.diff.metamodel.DiffElement;
+import org.eclipse.emf.compare.diff.metamodel.DiffModel;
import org.eclipse.emf.compare.diff.metamodel.ModelElementChangeRightTarget;
import org.eclipse.emf.compare.uml2diff.UMLProfileApplicationRemoval;
import org.eclipse.emf.ecore.EAnnotation;
@@ -26,6 +28,7 @@ import org.eclipse.osgi.util.NLS; import org.eclipse.papyrus.infra.core.resource.ModelMultiException;
import org.eclipse.papyrus.infra.core.services.ServiceException;
import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.uml.compare.diff.internal.merger.UMLProfileApplicationRemovalMerger;
import org.eclipse.uml2.uml.Model;
import org.eclipse.uml2.uml.ProfileApplication;
import org.junit.Assert;
@@ -137,4 +140,30 @@ public class UMLProfileApplicationRemoval_1_RightToLeft extends AbstractUMLStand public void testRedo() throws IOException, InterruptedException {
super.testRedo();
}
+
+ @Test
+ public void testOneDiffCommandExecution() throws IOException, InterruptedException {
+ super.testOneDiffCommandExecution();
+ }
+
+ @Override
+ protected List<DiffElement> getDiffElementToMerge(DiffModel diff) {
+ final List<DiffElement> differences = super.getDiffElementToMerge(diff);
+ final List<DiffElement> differencesToRemove = new ArrayList<DiffElement>();
+ for(final DiffElement current : differences) {
+ if(!(current instanceof UMLProfileApplicationRemoval)) {
+ differencesToRemove.add(current);
+ }
+ }
+ differences.removeAll(differencesToRemove);
+ return differences;
+ }
+
+ @Override
+ protected java.lang.Class<?> getWantedMergerFor(DiffElement diffElement) {
+ if(diffElement instanceof UMLProfileApplicationRemoval) {
+ return UMLProfileApplicationRemovalMerger.class;
+ }
+ return null;
+ }
}
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeApplicationAddition_1_LeftToRight.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeApplicationAddition_1_LeftToRight.java index 49f0fe24e2e..8b38f1dcfd9 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeApplicationAddition_1_LeftToRight.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeApplicationAddition_1_LeftToRight.java @@ -14,12 +14,14 @@ package org.eclipse.papyrus.uml.compare.diff.tests.uml.profile.standalone; import java.io.IOException; +import java.util.ArrayList; import java.util.List; import org.eclipse.core.runtime.CoreException; import org.eclipse.emf.compare.diff.metamodel.AbstractDiffExtension; import org.eclipse.emf.compare.diff.metamodel.DiffElement; import org.eclipse.emf.compare.diff.metamodel.DiffGroup; +import org.eclipse.emf.compare.diff.metamodel.DiffModel; import org.eclipse.emf.compare.diff.metamodel.ModelElementChangeLeftTarget; import org.eclipse.emf.compare.uml2diff.UMLStereotypeApplicationAddition; import org.eclipse.emf.ecore.EObject; @@ -27,6 +29,7 @@ import org.eclipse.osgi.util.NLS; import org.eclipse.papyrus.infra.core.resource.ModelMultiException; import org.eclipse.papyrus.infra.core.services.ServiceException; import org.eclipse.papyrus.infra.emf.utils.EMFHelper; +import org.eclipse.papyrus.uml.compare.diff.internal.merger.UMLStereotypeApplicationAdditionMerger; import org.eclipse.uml2.uml.Class; import org.eclipse.uml2.uml.Model; import org.eclipse.uml2.uml.Stereotype; @@ -145,4 +148,30 @@ public class UMLStereotypeApplicationAddition_1_LeftToRight extends AbstractUMLS public void testRedo() throws IOException, InterruptedException { super.testRedo(); } + + @Test + public void testOneDiffCommandExecution() throws IOException, InterruptedException { + super.testOneDiffCommandExecution(); + } + + @Override + protected List<DiffElement> getDiffElementToMerge(DiffModel diff) { + final List<DiffElement> differences = super.getDiffElementToMerge(diff); + final List<DiffElement> differencesToRemove = new ArrayList<DiffElement>(); + for(final DiffElement current : differences) { + if(!(current instanceof UMLStereotypeApplicationAddition)) { + differencesToRemove.add(current); + } + } + differences.removeAll(differencesToRemove); + return differences; + } + + @Override + protected java.lang.Class<?> getWantedMergerFor(DiffElement diffElement) { + if(diffElement instanceof UMLStereotypeApplicationAddition) { + return UMLStereotypeApplicationAdditionMerger.class; + } + return null; + } } diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeApplicationAddition_1_RightToLeft.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeApplicationAddition_1_RightToLeft.java index 7b61acc4132..39b7ee99ef3 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeApplicationAddition_1_RightToLeft.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeApplicationAddition_1_RightToLeft.java @@ -14,17 +14,20 @@ package org.eclipse.papyrus.uml.compare.diff.tests.uml.profile.standalone; import java.io.IOException; +import java.util.ArrayList; import java.util.List; import org.eclipse.core.runtime.CoreException; import org.eclipse.emf.compare.diff.metamodel.AbstractDiffExtension; import org.eclipse.emf.compare.diff.metamodel.DiffElement; import org.eclipse.emf.compare.diff.metamodel.DiffGroup; +import org.eclipse.emf.compare.diff.metamodel.DiffModel; import org.eclipse.emf.compare.diff.metamodel.ModelElementChangeLeftTarget; import org.eclipse.emf.compare.uml2diff.UMLStereotypeApplicationAddition; import org.eclipse.osgi.util.NLS; import org.eclipse.papyrus.infra.core.resource.ModelMultiException; import org.eclipse.papyrus.infra.core.services.ServiceException; +import org.eclipse.papyrus.uml.compare.diff.internal.merger.UMLStereotypeApplicationAdditionMerger; import org.eclipse.uml2.uml.Class; import org.eclipse.uml2.uml.Model; import org.eclipse.uml2.uml.Stereotype; @@ -132,4 +135,30 @@ public class UMLStereotypeApplicationAddition_1_RightToLeft extends AbstractUMLS public void testRedo() throws IOException, InterruptedException { super.testRedo(); } + + @Test + public void testOneDiffCommandExecution() throws IOException, InterruptedException { + super.testOneDiffCommandExecution(); + } + + @Override + protected List<DiffElement> getDiffElementToMerge(DiffModel diff) { + final List<DiffElement> differences = super.getDiffElementToMerge(diff); + final List<DiffElement> differencesToRemove = new ArrayList<DiffElement>(); + for(final DiffElement current : differences) { + if(!(current instanceof UMLStereotypeApplicationAddition)) { + differencesToRemove.add(current); + } + } + differences.removeAll(differencesToRemove); + return differences; + } + + @Override + protected java.lang.Class<?> getWantedMergerFor(DiffElement diffElement) { + if(diffElement instanceof UMLStereotypeApplicationAddition) { + return UMLStereotypeApplicationAdditionMerger.class; + } + return null; + } } diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeApplicationRemoval_1_LeftToRight.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeApplicationRemoval_1_LeftToRight.java index 2e34908fdf7..cd6fdecb7d7 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeApplicationRemoval_1_LeftToRight.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeApplicationRemoval_1_LeftToRight.java @@ -14,17 +14,20 @@ package org.eclipse.papyrus.uml.compare.diff.tests.uml.profile.standalone; import java.io.IOException; +import java.util.ArrayList; import java.util.List; import org.eclipse.core.runtime.CoreException; import org.eclipse.emf.compare.diff.metamodel.AbstractDiffExtension; import org.eclipse.emf.compare.diff.metamodel.DiffElement; import org.eclipse.emf.compare.diff.metamodel.DiffGroup; +import org.eclipse.emf.compare.diff.metamodel.DiffModel; import org.eclipse.emf.compare.diff.metamodel.ModelElementChangeRightTarget; import org.eclipse.emf.compare.uml2diff.UMLStereotypeApplicationRemoval; import org.eclipse.osgi.util.NLS; import org.eclipse.papyrus.infra.core.resource.ModelMultiException; import org.eclipse.papyrus.infra.core.services.ServiceException; +import org.eclipse.papyrus.uml.compare.diff.internal.merger.UMLStereotypeApplicationRemovalMerger; import org.eclipse.uml2.uml.Class; import org.eclipse.uml2.uml.Model; import org.eclipse.uml2.uml.Stereotype; @@ -132,4 +135,30 @@ public class UMLStereotypeApplicationRemoval_1_LeftToRight extends AbstractUMLSt public void testRedo() throws IOException, InterruptedException { super.testRedo(); } + + @Test + public void testOneDiffCommandExecution() throws IOException, InterruptedException { + super.testOneDiffCommandExecution(); + } + + @Override + protected List<DiffElement> getDiffElementToMerge(DiffModel diff) { + final List<DiffElement> differences = super.getDiffElementToMerge(diff); + final List<DiffElement> differencesToRemove = new ArrayList<DiffElement>(); + for(final DiffElement current : differences) { + if(!(current instanceof UMLStereotypeApplicationRemoval)) { + differencesToRemove.add(current); + } + } + differences.removeAll(differencesToRemove); + return differences; + } + + @Override + protected java.lang.Class<?> getWantedMergerFor(DiffElement diffElement) { + if(diffElement instanceof UMLStereotypeApplicationRemoval) { + return UMLStereotypeApplicationRemovalMerger.class; + } + return null; + } } diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeApplicationRemoval_1_RightToLeft.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeApplicationRemoval_1_RightToLeft.java index 952fdacc2da..ffaf11e216b 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeApplicationRemoval_1_RightToLeft.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeApplicationRemoval_1_RightToLeft.java @@ -14,12 +14,14 @@ package org.eclipse.papyrus.uml.compare.diff.tests.uml.profile.standalone; import java.io.IOException; +import java.util.ArrayList; import java.util.List; import org.eclipse.core.runtime.CoreException; import org.eclipse.emf.compare.diff.metamodel.AbstractDiffExtension; import org.eclipse.emf.compare.diff.metamodel.DiffElement; import org.eclipse.emf.compare.diff.metamodel.DiffGroup; +import org.eclipse.emf.compare.diff.metamodel.DiffModel; import org.eclipse.emf.compare.diff.metamodel.ModelElementChangeRightTarget; import org.eclipse.emf.compare.uml2diff.UMLStereotypeApplicationRemoval; import org.eclipse.emf.ecore.EObject; @@ -27,6 +29,7 @@ import org.eclipse.osgi.util.NLS; import org.eclipse.papyrus.infra.core.resource.ModelMultiException; import org.eclipse.papyrus.infra.core.services.ServiceException; import org.eclipse.papyrus.infra.emf.utils.EMFHelper; +import org.eclipse.papyrus.uml.compare.diff.internal.merger.UMLStereotypeApplicationRemovalMerger; import org.eclipse.uml2.uml.Class; import org.eclipse.uml2.uml.Model; import org.eclipse.uml2.uml.Stereotype; @@ -146,4 +149,30 @@ public class UMLStereotypeApplicationRemoval_1_RightToLeft extends AbstractUMLSt public void testRedo() throws IOException, InterruptedException { super.testRedo(); } + + @Test + public void testOneDiffCommandExecution() throws IOException, InterruptedException { + super.testOneDiffCommandExecution(); + } + + @Override + protected List<DiffElement> getDiffElementToMerge(DiffModel diff) { + final List<DiffElement> differences = super.getDiffElementToMerge(diff); + final List<DiffElement> differencesToRemove = new ArrayList<DiffElement>(); + for(final DiffElement current : differences) { + if(!(current instanceof UMLStereotypeApplicationRemoval)) { + differencesToRemove.add(current); + } + } + differences.removeAll(differencesToRemove); + return differences; + } + + @Override + protected java.lang.Class<?> getWantedMergerFor(DiffElement diffElement) { + if(diffElement instanceof UMLStereotypeApplicationRemoval) { + return UMLStereotypeApplicationRemovalMerger.class; + } + return null; + } } diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeAttributeChangeLeftTarget_1_LeftToRight.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeAttributeChangeLeftTarget_1_LeftToRight.java index f670b83b88e..19f7c27f80e 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeAttributeChangeLeftTarget_1_LeftToRight.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeAttributeChangeLeftTarget_1_LeftToRight.java @@ -125,4 +125,11 @@ public class UMLStereotypeAttributeChangeLeftTarget_1_LeftToRight extends Abstra public void testTestConformance() { super.testTestConformance(); } + + @Ignore("not yet implemented") + @Override + @Test + public void testOneDiffCommandExecution() throws IOException, InterruptedException { + super.testOneDiffCommandExecution(); + } } diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeAttributeChangeLeftTarget_1_RightToLeft.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeAttributeChangeLeftTarget_1_RightToLeft.java index 6f59fb68ed0..c82ea84f9e0 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeAttributeChangeLeftTarget_1_RightToLeft.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeAttributeChangeLeftTarget_1_RightToLeft.java @@ -113,4 +113,11 @@ public class UMLStereotypeAttributeChangeLeftTarget_1_RightToLeft extends Abstra public void testRedo() throws IOException, InterruptedException { super.testRedo(); } + + @Ignore("not yet implemented") + @Override + @Test + public void testOneDiffCommandExecution() throws IOException, InterruptedException { + super.testOneDiffCommandExecution(); + } } diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeAttributeChangeRightTarget_1_LeftToRight.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeAttributeChangeRightTarget_1_LeftToRight.java index e69b46c3ca7..84341344a6e 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeAttributeChangeRightTarget_1_LeftToRight.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeAttributeChangeRightTarget_1_LeftToRight.java @@ -114,4 +114,11 @@ public class UMLStereotypeAttributeChangeRightTarget_1_LeftToRight extends Abstr super.testRedo(); } + @Ignore("not yet implemented") + @Override + @Test + public void testOneDiffCommandExecution() throws IOException, InterruptedException { + super.testOneDiffCommandExecution(); + } + } diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeAttributeChangeRightTarget_1_RightToLeft.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeAttributeChangeRightTarget_1_RightToLeft.java index 562bafaab4c..eb4eff32c4a 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeAttributeChangeRightTarget_1_RightToLeft.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeAttributeChangeRightTarget_1_RightToLeft.java @@ -113,4 +113,11 @@ public class UMLStereotypeAttributeChangeRightTarget_1_RightToLeft extends Abstr public void testRedo() throws IOException, InterruptedException { super.testRedo(); } + + @Ignore("not yet implemented") + @Override + @Test + public void testOneDiffCommandExecution() throws IOException, InterruptedException { + super.testOneDiffCommandExecution(); + } } diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeReferenceChangeLeftTarget_1_LeftToRight.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeReferenceChangeLeftTarget_1_LeftToRight.java index e671e010067..0cbaec7b9bf 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeReferenceChangeLeftTarget_1_LeftToRight.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeReferenceChangeLeftTarget_1_LeftToRight.java @@ -112,4 +112,11 @@ public class UMLStereotypeReferenceChangeLeftTarget_1_LeftToRight extends Abstra public void testRedo() throws IOException, InterruptedException {
super.testRedo();
}
+
+ @Ignore("not yet implemented")
+ @Override
+ @Test
+ public void testOneDiffCommandExecution() throws IOException, InterruptedException {
+ super.testOneDiffCommandExecution();
+ }
}
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeReferenceChangeLeftTarget_1_RightToLeft.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeReferenceChangeLeftTarget_1_RightToLeft.java index e33576c62e8..ce70180bb0d 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeReferenceChangeLeftTarget_1_RightToLeft.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeReferenceChangeLeftTarget_1_RightToLeft.java @@ -112,4 +112,11 @@ public class UMLStereotypeReferenceChangeLeftTarget_1_RightToLeft extends Abstra public void testRedo() throws IOException, InterruptedException {
super.testRedo();
}
+
+ @Ignore("not yet implemented")
+ @Override
+ @Test
+ public void testOneDiffCommandExecution() throws IOException, InterruptedException {
+ super.testOneDiffCommandExecution();
+ }
}
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeReferenceChangeRightTarget_1_LeftToRight.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeReferenceChangeRightTarget_1_LeftToRight.java index 673830cb303..922909043ef 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeReferenceChangeRightTarget_1_LeftToRight.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeReferenceChangeRightTarget_1_LeftToRight.java @@ -112,4 +112,11 @@ public class UMLStereotypeReferenceChangeRightTarget_1_LeftToRight extends Abstr super.testRedo();
}
+ @Ignore("not yet implemented")
+ @Override
+ @Test
+ public void testOneDiffCommandExecution() throws IOException, InterruptedException {
+ super.testOneDiffCommandExecution();
+ }
+
}
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeReferenceChangeRightTarget_1_RightToLeft.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeReferenceChangeRightTarget_1_RightToLeft.java index 4105132d2f6..d092999f10f 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeReferenceChangeRightTarget_1_RightToLeft.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeReferenceChangeRightTarget_1_RightToLeft.java @@ -112,4 +112,10 @@ public class UMLStereotypeReferenceChangeRightTarget_1_RightToLeft extends Abstr super.testRedo();
}
+ @Ignore("not yet implemented")
+ @Override
+ @Test
+ public void testOneDiffCommandExecution() throws IOException, InterruptedException {
+ super.testOneDiffCommandExecution();
+ }
}
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeReferenceOrderChange_1_LeftToRight.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeReferenceOrderChange_1_LeftToRight.java index 118ccfbaa0f..276db776c24 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeReferenceOrderChange_1_LeftToRight.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeReferenceOrderChange_1_LeftToRight.java @@ -117,4 +117,11 @@ public class UMLStereotypeReferenceOrderChange_1_LeftToRight extends AbstractUML public void testRedo() throws IOException, InterruptedException {
super.testRedo();
}
+
+ @Ignore("not yet implemented")
+ @Override
+ @Test
+ public void testOneDiffCommandExecution() throws IOException, InterruptedException {
+ super.testOneDiffCommandExecution();
+ }
}
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeReferenceOrderChange_1_RightToLeft.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeReferenceOrderChange_1_RightToLeft.java index fe06c76cd7a..42dd029ac78 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeReferenceOrderChange_1_RightToLeft.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeReferenceOrderChange_1_RightToLeft.java @@ -117,4 +117,11 @@ public class UMLStereotypeReferenceOrderChange_1_RightToLeft extends AbstractUML public void testRedo() throws IOException, InterruptedException {
super.testRedo();
}
+
+ @Ignore("not yet implemented")
+ @Override
+ @Test
+ public void testOneDiffCommandExecution() throws IOException, InterruptedException {
+ super.testOneDiffCommandExecution();
+ }
}
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeUpdateAttribute_1_LeftToRight.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeUpdateAttribute_1_LeftToRight.java index 00d4665766f..56559946282 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeUpdateAttribute_1_LeftToRight.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeUpdateAttribute_1_LeftToRight.java @@ -14,16 +14,19 @@ package org.eclipse.papyrus.uml.compare.diff.tests.uml.profile.standalone; import java.io.IOException; +import java.util.ArrayList; import java.util.List; import org.eclipse.core.runtime.CoreException; import org.eclipse.emf.compare.diff.metamodel.DiffElement; import org.eclipse.emf.compare.diff.metamodel.DiffGroup; +import org.eclipse.emf.compare.diff.metamodel.DiffModel; import org.eclipse.emf.compare.diff.metamodel.UpdateAttribute; import org.eclipse.emf.compare.uml2diff.UMLStereotypeUpdateAttribute; import org.eclipse.osgi.util.NLS; import org.eclipse.papyrus.infra.core.resource.ModelMultiException; import org.eclipse.papyrus.infra.core.services.ServiceException; +import org.eclipse.papyrus.infra.emf.compare.diff.internal.merger.DefaultExtensionTransactionalMerger; import org.eclipse.uml2.uml.Class; import org.eclipse.uml2.uml.Model; import org.eclipse.uml2.uml.Stereotype; @@ -141,4 +144,30 @@ public class UMLStereotypeUpdateAttribute_1_LeftToRight extends AbstractUMLStand public void testRedo() throws IOException, InterruptedException { super.testRedo(); } + + @Test + public void testOneDiffCommandExecution() throws IOException, InterruptedException { + super.testOneDiffCommandExecution(); + } + + @Override + protected List<DiffElement> getDiffElementToMerge(DiffModel diff) { + final List<DiffElement> differences = super.getDiffElementToMerge(diff); + final List<DiffElement> differencesToRemove = new ArrayList<DiffElement>(); + for(final DiffElement current : differences) { + if(!(current instanceof UMLStereotypeUpdateAttribute)) { + differencesToRemove.add(current); + } + } + differences.removeAll(differencesToRemove); + return differences; + } + + @Override + protected java.lang.Class<?> getWantedMergerFor(DiffElement diffElement) { + if(diffElement instanceof UMLStereotypeUpdateAttribute) { + return DefaultExtensionTransactionalMerger.class; + } + return null; + } } diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeUpdateAttribute_1_RightToLeft.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeUpdateAttribute_1_RightToLeft.java index 0e633b5d6bc..631aa4e2071 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeUpdateAttribute_1_RightToLeft.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeUpdateAttribute_1_RightToLeft.java @@ -14,16 +14,19 @@ package org.eclipse.papyrus.uml.compare.diff.tests.uml.profile.standalone; import java.io.IOException; +import java.util.ArrayList; import java.util.List; import org.eclipse.core.runtime.CoreException; import org.eclipse.emf.compare.diff.metamodel.DiffElement; import org.eclipse.emf.compare.diff.metamodel.DiffGroup; +import org.eclipse.emf.compare.diff.metamodel.DiffModel; import org.eclipse.emf.compare.diff.metamodel.UpdateAttribute; import org.eclipse.emf.compare.uml2diff.UMLStereotypeUpdateAttribute; import org.eclipse.osgi.util.NLS; import org.eclipse.papyrus.infra.core.resource.ModelMultiException; import org.eclipse.papyrus.infra.core.services.ServiceException; +import org.eclipse.papyrus.infra.emf.compare.diff.internal.merger.DefaultExtensionTransactionalMerger; import org.eclipse.uml2.uml.Class; import org.eclipse.uml2.uml.Model; import org.eclipse.uml2.uml.Stereotype; @@ -124,6 +127,7 @@ public class UMLStereotypeUpdateAttribute_1_RightToLeft extends AbstractUMLStand } + @Override @Test public void testXMIID() { @@ -141,4 +145,31 @@ public class UMLStereotypeUpdateAttribute_1_RightToLeft extends AbstractUMLStand public void testRedo() throws IOException, InterruptedException { super.testRedo(); } + + @Test + public void testOneDiffCommandExecution() throws IOException, InterruptedException { + super.testOneDiffCommandExecution(); + } + + + @Override + protected List<DiffElement> getDiffElementToMerge(DiffModel diff) { + final List<DiffElement> differences = super.getDiffElementToMerge(diff); + final List<DiffElement> differencesToRemove = new ArrayList<DiffElement>(); + for(final DiffElement current : differences) { + if(!(current instanceof UMLStereotypeUpdateAttribute)) { + differencesToRemove.add(current); + } + } + differences.removeAll(differencesToRemove); + return differences; + } + + @Override + protected java.lang.Class<?> getWantedMergerFor(DiffElement diffElement) { + if(diffElement instanceof UMLStereotypeUpdateAttribute) { + return DefaultExtensionTransactionalMerger.class; + } + return null; + } } diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeUpdateReference_1_LeftToRight.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeUpdateReference_1_LeftToRight.java index f08eeb98a66..fef43b6b69d 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeUpdateReference_1_LeftToRight.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeUpdateReference_1_LeftToRight.java @@ -14,17 +14,20 @@ package org.eclipse.papyrus.uml.compare.diff.tests.uml.profile.standalone;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.List;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.emf.compare.diff.metamodel.DiffElement;
import org.eclipse.emf.compare.diff.metamodel.DiffGroup;
+import org.eclipse.emf.compare.diff.metamodel.DiffModel;
import org.eclipse.emf.compare.diff.metamodel.UpdateReference;
import org.eclipse.emf.compare.uml2diff.UMLStereotypeUpdateAttribute;
import org.eclipse.emf.compare.uml2diff.UMLStereotypeUpdateReference;
import org.eclipse.osgi.util.NLS;
import org.eclipse.papyrus.infra.core.resource.ModelMultiException;
import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.emf.compare.diff.internal.merger.DefaultExtensionTransactionalMerger;
import org.eclipse.uml2.uml.InstanceSpecification;
import org.eclipse.uml2.uml.Model;
import org.eclipse.uml2.uml.Stereotype;
@@ -152,4 +155,31 @@ public class UMLStereotypeUpdateReference_1_LeftToRight extends AbstractUMLStand public void testRedo() throws IOException, InterruptedException {
super.testRedo();
}
+
+ @Test
+ public void testOneDiffCommandExecution() throws IOException, InterruptedException {
+ super.testOneDiffCommandExecution();
+ }
+
+
+ @Override
+ protected List<DiffElement> getDiffElementToMerge(DiffModel diff) {
+ final List<DiffElement> differences = super.getDiffElementToMerge(diff);
+ final List<DiffElement> differencesToRemove = new ArrayList<DiffElement>();
+ for(final DiffElement current : differences) {
+ if(!(current instanceof UMLStereotypeUpdateReference)) {
+ differencesToRemove.add(current);
+ }
+ }
+ differences.removeAll(differencesToRemove);
+ return differences;
+ }
+
+ @Override
+ protected Class<?> getWantedMergerFor(DiffElement diffElement) {
+ if(diffElement instanceof UMLStereotypeUpdateReference) {
+ return DefaultExtensionTransactionalMerger.class;
+ }
+ return null;
+ }
}
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeUpdateReference_1_RightToLeft.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeUpdateReference_1_RightToLeft.java index 09482cc854e..ec43bd1fa7d 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeUpdateReference_1_RightToLeft.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/profile/standalone/UMLStereotypeUpdateReference_1_RightToLeft.java @@ -14,17 +14,20 @@ package org.eclipse.papyrus.uml.compare.diff.tests.uml.profile.standalone;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.List;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.emf.compare.diff.metamodel.DiffElement;
import org.eclipse.emf.compare.diff.metamodel.DiffGroup;
+import org.eclipse.emf.compare.diff.metamodel.DiffModel;
import org.eclipse.emf.compare.diff.metamodel.UpdateReference;
import org.eclipse.emf.compare.uml2diff.UMLStereotypeUpdateAttribute;
import org.eclipse.emf.compare.uml2diff.UMLStereotypeUpdateReference;
import org.eclipse.osgi.util.NLS;
import org.eclipse.papyrus.infra.core.resource.ModelMultiException;
import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.emf.compare.diff.internal.merger.DefaultExtensionTransactionalMerger;
import org.eclipse.uml2.uml.InstanceSpecification;
import org.eclipse.uml2.uml.Model;
import org.eclipse.uml2.uml.Stereotype;
@@ -152,4 +155,30 @@ public class UMLStereotypeUpdateReference_1_RightToLeft extends AbstractUMLStand public void testRedo() throws IOException, InterruptedException {
super.testRedo();
}
+
+ @Test
+ public void testOneDiffCommandExecution() throws IOException, InterruptedException {
+ super.testOneDiffCommandExecution();
+ }
+
+ @Override
+ protected List<DiffElement> getDiffElementToMerge(DiffModel diff) {
+ final List<DiffElement> differences = super.getDiffElementToMerge(diff);
+ final List<DiffElement> differencesToRemove = new ArrayList<DiffElement>();
+ for(final DiffElement current : differences) {
+ if(!(current instanceof UMLStereotypeUpdateReference)) {
+ differencesToRemove.add(current);
+ }
+ }
+ differences.removeAll(differencesToRemove);
+ return differences;
+ }
+
+ @Override
+ protected Class<?> getWantedMergerFor(DiffElement diffElement) {
+ if(diffElement instanceof UMLStereotypeUpdateReference) {
+ return DefaultExtensionTransactionalMerger.class;
+ }
+ return null;
+ }
}
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/standalone/GeneralizationSourceChangedTest_1_LeftToRight.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/standalone/GeneralizationSourceChangedTest_1_LeftToRight.java index e2b7d2b3c1a..c2d62280249 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/standalone/GeneralizationSourceChangedTest_1_LeftToRight.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/standalone/GeneralizationSourceChangedTest_1_LeftToRight.java @@ -14,16 +14,19 @@ package org.eclipse.papyrus.uml.compare.diff.tests.uml.standalone;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.List;
import org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.GeneralizationSourceChangedExtension;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.emf.compare.diff.metamodel.AbstractDiffExtension;
import org.eclipse.emf.compare.diff.metamodel.DiffElement;
+import org.eclipse.emf.compare.diff.metamodel.DiffModel;
import org.eclipse.emf.compare.diff.metamodel.MoveModelElement;
import org.eclipse.osgi.util.NLS;
import org.eclipse.papyrus.infra.core.resource.ModelMultiException;
import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.uml.compare.diff.internal.merger.GeneralizationSourceMerger;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -114,4 +117,31 @@ public class GeneralizationSourceChangedTest_1_LeftToRight extends AbstractUMLSt public void testRedo() throws IOException, InterruptedException {
super.testRedo();
}
+
+ @Test
+ public void testOneDiffCommandExecution() throws IOException, InterruptedException {
+ super.testOneDiffCommandExecution();
+ }
+
+ @Override
+ protected List<DiffElement> getDiffElementToMerge(DiffModel diff) {
+ final List<DiffElement> differences = super.getDiffElementToMerge(diff);
+ final List<DiffElement> differencesToRemove = new ArrayList<DiffElement>();
+ for(final DiffElement current : differences) {
+ if(!(current instanceof GeneralizationSourceChangedExtension)) {
+ differencesToRemove.add(current);
+ }
+ }
+ differences.removeAll(differencesToRemove);
+ return differences;
+ }
+
+ @Override
+ protected java.lang.Class<?> getWantedMergerFor(DiffElement diffElement) {
+ if(diffElement instanceof GeneralizationSourceChangedExtension) {
+ return GeneralizationSourceMerger.class;
+ }
+ return null;
+ }
+
}
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/standalone/GeneralizationSourceChangedTest_1_RightToLeft.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/standalone/GeneralizationSourceChangedTest_1_RightToLeft.java index 12c228d58b7..6c78a8a404c 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/standalone/GeneralizationSourceChangedTest_1_RightToLeft.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/standalone/GeneralizationSourceChangedTest_1_RightToLeft.java @@ -14,16 +14,19 @@ package org.eclipse.papyrus.uml.compare.diff.tests.uml.standalone;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.List;
import org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.GeneralizationSourceChangedExtension;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.emf.compare.diff.metamodel.AbstractDiffExtension;
import org.eclipse.emf.compare.diff.metamodel.DiffElement;
+import org.eclipse.emf.compare.diff.metamodel.DiffModel;
import org.eclipse.emf.compare.diff.metamodel.MoveModelElement;
import org.eclipse.osgi.util.NLS;
import org.eclipse.papyrus.infra.core.resource.ModelMultiException;
import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.uml.compare.diff.internal.merger.GeneralizationSourceMerger;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -114,4 +117,30 @@ public class GeneralizationSourceChangedTest_1_RightToLeft extends AbstractUMLSt public void testRedo() throws IOException, InterruptedException {
super.testRedo();
}
+
+ @Test
+ public void testOneDiffCommandExecution() throws IOException, InterruptedException {
+ super.testOneDiffCommandExecution();
+ }
+
+ @Override
+ protected List<DiffElement> getDiffElementToMerge(DiffModel diff) {
+ final List<DiffElement> differences = super.getDiffElementToMerge(diff);
+ final List<DiffElement> differencesToRemove = new ArrayList<DiffElement>();
+ for(final DiffElement current : differences) {
+ if(!(current instanceof GeneralizationSourceChangedExtension)) {
+ differencesToRemove.add(current);
+ }
+ }
+ differences.removeAll(differencesToRemove);
+ return differences;
+ }
+
+ @Override
+ protected java.lang.Class<?> getWantedMergerFor(DiffElement diffElement) {
+ if(diffElement instanceof GeneralizationSourceChangedExtension) {
+ return GeneralizationSourceMerger.class;
+ }
+ return null;
+ }
}
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/standalone/GeneralizationTargetChangedTest_1_LeftToRight.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/standalone/GeneralizationTargetChangedTest_1_LeftToRight.java index c0b7e4c629e..0b42a69af19 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/standalone/GeneralizationTargetChangedTest_1_LeftToRight.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/standalone/GeneralizationTargetChangedTest_1_LeftToRight.java @@ -14,16 +14,19 @@ package org.eclipse.papyrus.uml.compare.diff.tests.uml.standalone;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.List;
import org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.GeneralizationTargetChangedExtension;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.emf.compare.diff.metamodel.AbstractDiffExtension;
import org.eclipse.emf.compare.diff.metamodel.DiffElement;
+import org.eclipse.emf.compare.diff.metamodel.DiffModel;
import org.eclipse.emf.compare.diff.metamodel.UpdateReference;
import org.eclipse.osgi.util.NLS;
import org.eclipse.papyrus.infra.core.resource.ModelMultiException;
import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.uml.compare.diff.internal.merger.GeneralizationTargetMerger;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -114,4 +117,30 @@ public class GeneralizationTargetChangedTest_1_LeftToRight extends AbstractUMLSt public void testRedo() throws IOException, InterruptedException {
super.testRedo();
}
+
+ @Test
+ public void testOneDiffCommandExecution() throws IOException, InterruptedException {
+ super.testOneDiffCommandExecution();
+ }
+
+ @Override
+ protected List<DiffElement> getDiffElementToMerge(DiffModel diff) {
+ final List<DiffElement> differences = super.getDiffElementToMerge(diff);
+ final List<DiffElement> differencesToRemove = new ArrayList<DiffElement>();
+ for(final DiffElement current : differences) {
+ if(!(current instanceof GeneralizationTargetChangedExtension)) {
+ differencesToRemove.add(current);
+ }
+ }
+ differences.removeAll(differencesToRemove);
+ return differences;
+ }
+
+ @Override
+ protected java.lang.Class<?> getWantedMergerFor(DiffElement diffElement) {
+ if(diffElement instanceof GeneralizationTargetChangedExtension) {
+ return GeneralizationTargetMerger.class;
+ }
+ return null;
+ }
}
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/standalone/GeneralizationTargetChangedTest_1_RightToLeft.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/standalone/GeneralizationTargetChangedTest_1_RightToLeft.java index 355c9c63191..e978610233f 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/standalone/GeneralizationTargetChangedTest_1_RightToLeft.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff.tests/src/org/eclipse/papyrus/uml/compare/diff/tests/uml/standalone/GeneralizationTargetChangedTest_1_RightToLeft.java @@ -14,16 +14,19 @@ package org.eclipse.papyrus.uml.compare.diff.tests.uml.standalone;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.List;
import org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.GeneralizationTargetChangedExtension;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.emf.compare.diff.metamodel.AbstractDiffExtension;
import org.eclipse.emf.compare.diff.metamodel.DiffElement;
+import org.eclipse.emf.compare.diff.metamodel.DiffModel;
import org.eclipse.emf.compare.diff.metamodel.UpdateReference;
import org.eclipse.osgi.util.NLS;
import org.eclipse.papyrus.infra.core.resource.ModelMultiException;
import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.uml.compare.diff.internal.merger.GeneralizationTargetMerger;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -114,4 +117,26 @@ public class GeneralizationTargetChangedTest_1_RightToLeft extends AbstractUMLSt public void testRedo() throws IOException, InterruptedException {
super.testRedo();
}
+
+ @Override
+ protected List<DiffElement> getDiffElementToMerge(DiffModel diff) {
+ final List<DiffElement> differences = super.getDiffElementToMerge(diff);
+ final List<DiffElement> differencesToRemove = new ArrayList<DiffElement>();
+ for(final DiffElement current : differences) {
+ if(!(current instanceof GeneralizationTargetChangedExtension)) {
+ differencesToRemove.add(current);
+ }
+ }
+ differences.removeAll(differencesToRemove);
+ return differences;
+ }
+
+ @Override
+ protected java.lang.Class<?> getWantedMergerFor(DiffElement diffElement) {
+ if(diffElement instanceof GeneralizationTargetChangedExtension) {
+ return GeneralizationTargetMerger.class;
+ }
+ return null;
+ }
+
}
|