diff options
| author | vlorenzo | 2012-06-25 08:59:55 +0000 |
|---|---|---|
| committer | vlorenzo | 2012-06-25 08:59:55 +0000 |
| commit | 87b039902d209f4d5627d9df8139457f8f8fa68a (patch) | |
| tree | 691fa1b9f8b31e10f7d3ad11dd7209785a24fd6f /tests/junit/extraplugins | |
| parent | 2d5f43c8c145c08a134f6f198b867a5f4cbdbf42 (diff) | |
| download | org.eclipse.papyrus-87b039902d209f4d5627d9df8139457f8f8fa68a.tar.gz org.eclipse.papyrus-87b039902d209f4d5627d9df8139457f8f8fa68a.tar.xz org.eclipse.papyrus-87b039902d209f4d5627d9df8139457f8f8fa68a.zip | |
330183: [Usability] Papyrus shall enable comparing/merging models.
https://bugs.eclipse.org/bugs/show_bug.cgi?id=330183
Use the Papyrus Service registry in the tests suite.
Diffstat (limited to 'tests/junit/extraplugins')
35 files changed, 154 insertions, 57 deletions
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/AbstractCompareTest.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/AbstractCompareTest.java index 41013f4275e..b440f53bf29 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/AbstractCompareTest.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/AbstractCompareTest.java @@ -1,25 +1,39 @@ package org.eclipse.papyrus.uml.compare.merger.tests;
+import static org.eclipse.papyrus.infra.core.Activator.log;
+
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
import org.eclipse.emf.common.command.Command;
+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.ecore.EObject;
import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
import org.eclipse.emf.transaction.TransactionalEditingDomain;
import org.eclipse.emf.transaction.util.TransactionUtil;
import org.eclipse.osgi.util.NLS;
+import org.eclipse.papyrus.infra.core.resource.ModelMultiException;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.resource.TransactionalEditingDomainManager;
+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.junit.utils.GenericUtils;
+import org.eclipse.papyrus.junit.utils.ProjectUtils;
+import org.eclipse.papyrus.uml.compare.file.editor.utils.ServicesRegistryUtils;
import org.eclipse.papyrus.uml.compare.merger.services.TransactionalMergeService;
+import org.eclipse.uml2.common.util.UML2Util;
import org.eclipse.uml2.uml.Element;
+import org.eclipse.uml2.uml.UMLPackage;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.Test;
@@ -31,7 +45,7 @@ public abstract class AbstractCompareTest { protected static TransactionalEditingDomain domain;
- protected static ResourceSet set;
+ protected static ModelSet set;
/** indicates the direction of the merge */
protected static boolean leftToRight;
@@ -46,7 +60,27 @@ public abstract class AbstractCompareTest { /** This field is used to store the initial Differences before to do the merge */
private static List<DiffElement> initialDifferences;
-
+ protected static ServicesRegistry servicesRegistry;
+
+ protected static List<EObject> roots;
+
+ public static void loadModels(final List<IFile> comparedFiles) throws ServiceException, ModelMultiException{
+ roots = new ArrayList<EObject>();
+ servicesRegistry = ServicesRegistryUtils.createAndInitServiceRegistryForUMLCompareFile();
+ set = servicesRegistry.getService(ModelSet.class);
+ domain =set.getTransactionalEditingDomain();
+ for(final IFile current : comparedFiles) {
+ set.loadModels(current);
+ final String filePath = current.getFullPath().toString();
+ URI uri = URI.createPlatformResourceURI(filePath, false);
+ EObject root = UML2Util.load(set, uri, UMLPackage.Literals.PACKAGE);
+ set.getResource(uri, false).setTrackingModification(true);
+ Assert.assertNotNull("The root of the model is null",root);
+ roots.add(root);
+ }
+ }
+
+
/**
* This test tests the contents of the differences found.
*
@@ -225,6 +259,13 @@ public abstract class AbstractCompareTest { current.unload();
}
resources.clear();
+ if(servicesRegistry != null) {
+ try {
+ servicesRegistry.disposeRegistry();
+ } catch (ServiceMultiException e) {
+ log.error(e);
+ }
+ }
//we close all the editors
GenericUtils.closeAllEditors();
}
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/nested/AbstractNestedCompareTest.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/nested/AbstractNestedCompareTest.java index c8f6e8689a2..40b8b048973 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/nested/AbstractNestedCompareTest.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/nested/AbstractNestedCompareTest.java @@ -10,9 +10,8 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.emf.compare.diff.metamodel.DiffModel;
import org.eclipse.emf.compare.match.metamodel.MatchModel;
import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.papyrus.infra.core.resource.TransactionalEditingDomainManager;
-import org.eclipse.papyrus.infra.emf.compare.common.internal.utils.PapyrusFileLoader;
+import org.eclipse.papyrus.infra.core.resource.ModelMultiException;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
import org.eclipse.papyrus.junit.utils.GenericUtils;
import org.eclipse.papyrus.junit.utils.PapyrusProjectUtils;
import org.eclipse.papyrus.junit.utils.ProjectUtils;
@@ -21,7 +20,6 @@ import org.eclipse.papyrus.uml.compare.merger.services.nested.NestedMergeUtils; import org.eclipse.papyrus.uml.compare.merger.services.nested.UMLDiffService;
import org.eclipse.papyrus.uml.compare.merger.tests.AbstractCompareTest;
import org.eclipse.papyrus.uml.compare.merger.tests.Activator;
-import org.eclipse.uml2.uml.Model;
import org.eclipse.uml2.uml.Package;
;
@@ -43,19 +41,17 @@ public abstract class AbstractNestedCompareTest extends AbstractCompareTest { private static final String MODEL = "model";
- public static final void init(final String modelPath, boolean leftToRight) throws CoreException, IOException {
+
+ public static final void init(final String modelPath, boolean leftToRight) throws CoreException, IOException, ServiceException, ModelMultiException {
GenericUtils.closeIntroPart();
GenericUtils.cleanWorkspace();
+ AbstractCompareTest.leftToRight = leftToRight;
project = ProjectUtils.createProject("MyProject"); //$NON-NLS-1$
PapyrusProjectUtils.copyPapyrusModel(project, Activator.getDefault().getBundle(), FOLDER_PATH + modelPath, MODEL);
final List<IFile> comparedFiles = new ArrayList<IFile>();
-
comparedFiles.add(project.getFile(MODEL + "." + "uml"));
- set = new ResourceSetImpl();
- domain = TransactionalEditingDomainManager.createDefaultTransactionalEditingDomain(set);
- EObject[] roots = PapyrusFileLoader.loadPapyrusFiles(set, comparedFiles, true);
- root = (Model)roots[0];
- AbstractNestedCompareTest.leftToRight = leftToRight;
+ AbstractCompareTest.loadModels(comparedFiles);
+ root = (Package)roots.get(0);
}
/**
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/nested/NestedModelElementChangeLeftTargetTest_1_LeftToRight.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/nested/NestedModelElementChangeLeftTargetTest_1_LeftToRight.java index 26bd3f62293..bbc6f02d29d 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/nested/NestedModelElementChangeLeftTargetTest_1_LeftToRight.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/nested/NestedModelElementChangeLeftTargetTest_1_LeftToRight.java @@ -7,6 +7,8 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.emf.compare.diff.metamodel.DiffElement;
import org.eclipse.emf.compare.diff.metamodel.ModelElementChangeLeftTarget;
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.merger.tests.AbstractCompareTest;
import org.eclipse.uml2.uml.Class;
import org.eclipse.uml2.uml.Package;
@@ -21,7 +23,7 @@ public class NestedModelElementChangeLeftTargetTest_1_LeftToRight extends Abstra private static final String MODEL_PATH = "modelElementChangeLeftTarget_1/";
@BeforeClass
- public static void init() throws CoreException, IOException {
+ public static void init() throws CoreException, IOException, ModelMultiException, ServiceException {
AbstractNestedCompareTest.init(MODEL_PATH, true);
AbstractCompareTest.leftElement = (Class)AbstractNestedCompareTest.root.getOwnedMember("Class1");
AbstractCompareTest.rightElement = (Class)((Package)root.getPackagedElement("Package1")).getOwnedMember("Class1");
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/nested/NestedModelElementChangeLeftTargetTest_1_RightToLeft.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/nested/NestedModelElementChangeLeftTargetTest_1_RightToLeft.java index e5778bc32a8..33bafc3db36 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/nested/NestedModelElementChangeLeftTargetTest_1_RightToLeft.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/nested/NestedModelElementChangeLeftTargetTest_1_RightToLeft.java @@ -7,6 +7,8 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.emf.compare.diff.metamodel.DiffElement;
import org.eclipse.emf.compare.diff.metamodel.ModelElementChangeLeftTarget;
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.merger.tests.AbstractCompareTest;
import org.eclipse.uml2.uml.Class;
@@ -22,7 +24,7 @@ public class NestedModelElementChangeLeftTargetTest_1_RightToLeft extends Abstra private static final String MODEL_PATH = "modelElementChangeLeftTarget_1/";
@BeforeClass
- public static void init() throws CoreException, IOException {
+ public static void init() throws CoreException, IOException, ModelMultiException, ServiceException {
AbstractNestedCompareTest.init(MODEL_PATH, false);
AbstractCompareTest.leftElement = (Class)AbstractNestedCompareTest.root.getOwnedMember("Class1");
AbstractCompareTest.rightElement = (Class)((Package)root.getPackagedElement("Package1")).getOwnedMember("Class1");
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/nested/NestedModelElementChangeRightTargetTest_1_LeftToRight.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/nested/NestedModelElementChangeRightTargetTest_1_LeftToRight.java index 0da4a1d61a2..ecc8d330581 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/nested/NestedModelElementChangeRightTargetTest_1_LeftToRight.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/nested/NestedModelElementChangeRightTargetTest_1_LeftToRight.java @@ -7,6 +7,8 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.emf.compare.diff.metamodel.DiffElement;
import org.eclipse.emf.compare.diff.metamodel.ModelElementChangeRightTarget;
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.merger.tests.AbstractCompareTest;
import org.eclipse.uml2.uml.Class;
import org.eclipse.uml2.uml.Package;
@@ -21,7 +23,7 @@ public class NestedModelElementChangeRightTargetTest_1_LeftToRight extends Abstr private static final String MODEL_PATH = "modelElementChangeRightTarget_1/";
@BeforeClass
- public static void init() throws CoreException, IOException {
+ public static void init() throws CoreException, IOException, ModelMultiException, ServiceException {
AbstractNestedCompareTest.init(MODEL_PATH, true);
AbstractCompareTest.leftElement = (Class)AbstractNestedCompareTest.root.getOwnedMember("Class1");
AbstractCompareTest.rightElement = (Class)((Package)root.getPackagedElement("Package1")).getOwnedMember("Class1");
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/nested/NestedModelElementChangeRightTargetTest_1_RightToLeft.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/nested/NestedModelElementChangeRightTargetTest_1_RightToLeft.java index 03ded7a41e9..7717cbce130 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/nested/NestedModelElementChangeRightTargetTest_1_RightToLeft.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/nested/NestedModelElementChangeRightTargetTest_1_RightToLeft.java @@ -7,6 +7,8 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.emf.compare.diff.metamodel.DiffElement;
import org.eclipse.emf.compare.diff.metamodel.ModelElementChangeRightTarget;
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.merger.tests.AbstractCompareTest;
import org.eclipse.uml2.uml.Class;
@@ -22,7 +24,7 @@ public class NestedModelElementChangeRightTargetTest_1_RightToLeft extends Abstr private static final String MODEL_PATH = "modelElementChangeRightTarget_1/";
@BeforeClass
- public static void init() throws CoreException, IOException {
+ public static void init() throws CoreException, IOException, ModelMultiException, ServiceException {
AbstractNestedCompareTest.init(MODEL_PATH, false);
AbstractCompareTest.leftElement = (Class)AbstractNestedCompareTest.root.getOwnedMember("Class1");
AbstractCompareTest.rightElement = (Class)((Package)root.getPackagedElement("Package1")).getOwnedMember("Class1");
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/nested/NestedUpdateAttributeTest_1_LeftToRight.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/nested/NestedUpdateAttributeTest_1_LeftToRight.java index 8000f02b0fe..a6b1a6837f0 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/nested/NestedUpdateAttributeTest_1_LeftToRight.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/nested/NestedUpdateAttributeTest_1_LeftToRight.java @@ -7,6 +7,8 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.emf.compare.diff.metamodel.DiffElement;
import org.eclipse.emf.compare.diff.metamodel.UpdateAttribute;
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.merger.tests.AbstractCompareTest;
import org.eclipse.uml2.uml.Class;
import org.eclipse.uml2.uml.NamedElement;
@@ -20,7 +22,7 @@ public class NestedUpdateAttributeTest_1_LeftToRight extends AbstractNestedCompa private static final String MODEL_PATH = "updateAttribute_1/";
@BeforeClass
- public static void init() throws CoreException, IOException {
+ public static void init() throws CoreException, IOException, ModelMultiException, ServiceException {
AbstractNestedCompareTest.init(MODEL_PATH, true);
AbstractCompareTest.leftElement = (Class)root.getOwnedMember("Class1");
AbstractCompareTest.rightElement = (Class)root.getOwnedMember("Class2");
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/nested/NestedUpdateAttributeTest_1_RightToLeft.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/nested/NestedUpdateAttributeTest_1_RightToLeft.java index 820efcb4bb8..0981f3e34d3 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/nested/NestedUpdateAttributeTest_1_RightToLeft.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/nested/NestedUpdateAttributeTest_1_RightToLeft.java @@ -7,6 +7,8 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.emf.compare.diff.metamodel.DiffElement;
import org.eclipse.emf.compare.diff.metamodel.UpdateAttribute;
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.merger.tests.AbstractCompareTest;
import org.eclipse.uml2.uml.Class;
import org.eclipse.uml2.uml.NamedElement;
@@ -20,7 +22,7 @@ public class NestedUpdateAttributeTest_1_RightToLeft extends AbstractNestedCompa private static final String MODEL_PATH = "updateAttribute_1/";
@BeforeClass
- public static void init() throws CoreException, IOException {
+ public static void init() throws CoreException, IOException, ModelMultiException, ServiceException {
AbstractNestedCompareTest.init(MODEL_PATH, false);
AbstractCompareTest.leftElement = (Class)root.getOwnedMember("Class1");
AbstractCompareTest.rightElement = (Class)root.getOwnedMember("Class2");
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/AbstractStandaloneCompareTest.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/AbstractStandaloneCompareTest.java index 88d89ffaf8e..56852b03a3c 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/AbstractStandaloneCompareTest.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/AbstractStandaloneCompareTest.java @@ -14,11 +14,10 @@ import org.eclipse.emf.compare.match.metamodel.MatchModel; import org.eclipse.emf.compare.match.service.MatchService;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
import org.eclipse.osgi.util.NLS;
-import org.eclipse.papyrus.infra.core.resource.TransactionalEditingDomainManager;
-import org.eclipse.papyrus.infra.emf.compare.common.internal.utils.PapyrusFileLoader;
+import org.eclipse.papyrus.infra.core.resource.ModelMultiException;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
import org.eclipse.papyrus.junit.utils.GenericUtils;
import org.eclipse.papyrus.junit.utils.PapyrusProjectUtils;
import org.eclipse.papyrus.junit.utils.ProjectUtils;
@@ -70,7 +69,7 @@ public abstract class AbstractStandaloneCompareTest extends AbstractCompareTest return diff;
}
- public static final void init(final String modelPath, boolean leftToRight) throws CoreException, IOException {
+ public static final void init(final String modelPath, boolean leftToRight) throws CoreException, IOException, ModelMultiException, ServiceException{
GenericUtils.closeIntroPart();
GenericUtils.cleanWorkspace();
@@ -81,13 +80,10 @@ public abstract class AbstractStandaloneCompareTest extends AbstractCompareTest comparedFiles.add(project.getFile(LEFT + "." + "uml"));
comparedFiles.add(project.getFile(RIGHT + "." + "uml"));
-
- //TODO associate the EditingDomain!
- set = new ResourceSetImpl();
- domain = TransactionalEditingDomainManager.createDefaultTransactionalEditingDomain(set);
- EObject[] roots = PapyrusFileLoader.loadPapyrusFiles(set, comparedFiles, true);
- leftElement = (Model)roots[0];
- rightElement = (Model)roots[1];
+ AbstractCompareTest.loadModels(comparedFiles);
+
+ leftElement = (Model)roots.get(0);
+ rightElement = (Model)roots.get(1);
AbstractCompareTest.leftToRight = leftToRight;
}
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/AttributeChangeLeftTargetTest_1_LeftToRight.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/AttributeChangeLeftTargetTest_1_LeftToRight.java index 430513ab80f..abf3e80fe65 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/AttributeChangeLeftTargetTest_1_LeftToRight.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/AttributeChangeLeftTargetTest_1_LeftToRight.java @@ -7,6 +7,8 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.emf.compare.diff.metamodel.AttributeChangeLeftTarget;
import org.eclipse.emf.compare.diff.metamodel.DiffElement;
import org.eclipse.osgi.util.NLS;
+import org.eclipse.papyrus.infra.core.resource.ModelMultiException;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -17,7 +19,7 @@ public class AttributeChangeLeftTargetTest_1_LeftToRight extends AbstractStandal private static final String MODEL_PATH = "attributeChangeLeftTarget_1/";
@BeforeClass
- public static void init() throws CoreException, IOException {
+ public static void init() throws CoreException, IOException,ModelMultiException, ServiceException {
AbstractStandaloneCompareTest.init(MODEL_PATH, true);
}
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/AttributeChangeLeftTargetTest_1_RightToLeft.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/AttributeChangeLeftTargetTest_1_RightToLeft.java index c8d5642b8d0..f408d96cf55 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/AttributeChangeLeftTargetTest_1_RightToLeft.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/AttributeChangeLeftTargetTest_1_RightToLeft.java @@ -7,6 +7,8 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.emf.compare.diff.metamodel.AttributeChangeLeftTarget;
import org.eclipse.emf.compare.diff.metamodel.DiffElement;
import org.eclipse.osgi.util.NLS;
+import org.eclipse.papyrus.infra.core.resource.ModelMultiException;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -17,7 +19,7 @@ public class AttributeChangeLeftTargetTest_1_RightToLeft extends AbstractStandal private static final String MODEL_PATH = "attributeChangeLeftTarget_1/";
@BeforeClass
- public static void init() throws CoreException, IOException {
+ public static void init() throws CoreException, IOException , ModelMultiException, ServiceException{
AbstractStandaloneCompareTest.init(MODEL_PATH, false);
}
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/AttributeChangeRightTargetTest_1_LeftToRight.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/AttributeChangeRightTargetTest_1_LeftToRight.java index d10f08f45c4..01a8605831b 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/AttributeChangeRightTargetTest_1_LeftToRight.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/AttributeChangeRightTargetTest_1_LeftToRight.java @@ -7,6 +7,8 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.emf.compare.diff.metamodel.AttributeChangeRightTarget;
import org.eclipse.emf.compare.diff.metamodel.DiffElement;
import org.eclipse.osgi.util.NLS;
+import org.eclipse.papyrus.infra.core.resource.ModelMultiException;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -17,7 +19,7 @@ public class AttributeChangeRightTargetTest_1_LeftToRight extends AbstractStanda private static final String MODEL_PATH = "attributeChangeRightTarget_1/";
@BeforeClass
- public static void init() throws CoreException, IOException {
+ public static void init() throws CoreException, IOException , ModelMultiException, ServiceException{
AbstractStandaloneCompareTest.init(MODEL_PATH, true);
}
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/AttributeChangeRightTargetTest_1_RightToLeft.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/AttributeChangeRightTargetTest_1_RightToLeft.java index 9fb33737448..e7900677bb5 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/AttributeChangeRightTargetTest_1_RightToLeft.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/AttributeChangeRightTargetTest_1_RightToLeft.java @@ -7,6 +7,8 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.emf.compare.diff.metamodel.AttributeChangeRightTarget;
import org.eclipse.emf.compare.diff.metamodel.DiffElement;
import org.eclipse.osgi.util.NLS;
+import org.eclipse.papyrus.infra.core.resource.ModelMultiException;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -17,7 +19,7 @@ public class AttributeChangeRightTargetTest_1_RightToLeft extends AbstractStanda private static final String MODEL_PATH = "attributeChangeRightTarget_1/";
@BeforeClass
- public static void init() throws CoreException, IOException {
+ public static void init() throws CoreException, IOException , ModelMultiException, ServiceException{
AbstractStandaloneCompareTest.init(MODEL_PATH, false);
}
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/AttributeOrderChangeTest_1_LeftToRight.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/AttributeOrderChangeTest_1_LeftToRight.java index 568baf9ce69..6f5aea860b2 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/AttributeOrderChangeTest_1_LeftToRight.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/AttributeOrderChangeTest_1_LeftToRight.java @@ -7,6 +7,8 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.emf.compare.diff.metamodel.AttributeOrderChange;
import org.eclipse.emf.compare.diff.metamodel.DiffElement;
import org.eclipse.osgi.util.NLS;
+import org.eclipse.papyrus.infra.core.resource.ModelMultiException;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -17,7 +19,7 @@ public class AttributeOrderChangeTest_1_LeftToRight extends AbstractStandaloneCo private static final String MODEL_PATH = "attributeOrderChange_1/";
@BeforeClass
- public static void init() throws CoreException, IOException {
+ public static void init() throws CoreException, IOException , ModelMultiException, ServiceException{
AbstractStandaloneCompareTest.init(MODEL_PATH, true);
}
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/AttributeOrderChangeTest_1_RightToLeft.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/AttributeOrderChangeTest_1_RightToLeft.java index ad2b6a496d1..16bdfd2d201 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/AttributeOrderChangeTest_1_RightToLeft.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/AttributeOrderChangeTest_1_RightToLeft.java @@ -7,6 +7,8 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.emf.compare.diff.metamodel.AttributeOrderChange;
import org.eclipse.emf.compare.diff.metamodel.DiffElement;
import org.eclipse.osgi.util.NLS;
+import org.eclipse.papyrus.infra.core.resource.ModelMultiException;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -17,7 +19,7 @@ public class AttributeOrderChangeTest_1_RightToLeft extends AbstractStandaloneCo private static final String MODEL_PATH = "attributeOrderChange_1/";
@BeforeClass
- public static void init() throws CoreException, IOException {
+ public static void init() throws CoreException, IOException , ModelMultiException, ServiceException{
AbstractStandaloneCompareTest.init(MODEL_PATH, false);
}
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/ModelElementChangeLeftTargetTest_1_LeftToRight.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/ModelElementChangeLeftTargetTest_1_LeftToRight.java index 23d6a9add6b..e03f0c97a23 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/ModelElementChangeLeftTargetTest_1_LeftToRight.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/ModelElementChangeLeftTargetTest_1_LeftToRight.java @@ -7,6 +7,8 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.emf.compare.diff.metamodel.DiffElement;
import org.eclipse.emf.compare.diff.metamodel.ModelElementChangeLeftTarget;
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.uml2.uml.Class;
import org.eclipse.uml2.uml.Package;
@@ -24,7 +26,7 @@ public class ModelElementChangeLeftTargetTest_1_LeftToRight extends AbstractStan final String PROPERTY_NAME = "Property1";
@BeforeClass
- public static void init() throws CoreException, IOException {
+ public static void init() throws CoreException, IOException , ModelMultiException, ServiceException {
AbstractStandaloneCompareTest.init(MODEL_PATH, true);
}
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/ModelElementChangeLeftTargetTest_1_RightToLeft.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/ModelElementChangeLeftTargetTest_1_RightToLeft.java index dce37119a11..3e5dbdf6555 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/ModelElementChangeLeftTargetTest_1_RightToLeft.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/ModelElementChangeLeftTargetTest_1_RightToLeft.java @@ -7,6 +7,8 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.emf.compare.diff.metamodel.DiffElement;
import org.eclipse.emf.compare.diff.metamodel.ModelElementChangeLeftTarget;
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.uml2.uml.Class;
import org.eclipse.uml2.uml.Package;
@@ -25,7 +27,7 @@ public class ModelElementChangeLeftTargetTest_1_RightToLeft extends AbstractStan final String PROPERTY_NAME = "Property1";
@BeforeClass
- public static void init() throws CoreException, IOException {
+ public static void init() throws CoreException, IOException , ModelMultiException, ServiceException {
AbstractStandaloneCompareTest.init(MODEL_PATH, false);
}
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/ModelElementChangeRightTargetTest_1_LeftToRight.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/ModelElementChangeRightTargetTest_1_LeftToRight.java index 59392523fa5..eb2dae99405 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/ModelElementChangeRightTargetTest_1_LeftToRight.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/ModelElementChangeRightTargetTest_1_LeftToRight.java @@ -7,6 +7,8 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.emf.compare.diff.metamodel.DiffElement;
import org.eclipse.emf.compare.diff.metamodel.ModelElementChangeRightTarget;
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.uml2.uml.Class;
import org.eclipse.uml2.uml.Package;
@@ -25,7 +27,7 @@ public class ModelElementChangeRightTargetTest_1_LeftToRight extends AbstractSta final String PROPERTY_NAME = "Property1";
@BeforeClass
- public static void init() throws CoreException, IOException {
+ public static void init() throws CoreException, IOException , ModelMultiException, ServiceException{
AbstractStandaloneCompareTest.init(MODEL_PATH, true);
}
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/ModelElementChangeRightTargetTest_1_RightToLeft.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/ModelElementChangeRightTargetTest_1_RightToLeft.java index e65987fa56d..383b32b4a02 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/ModelElementChangeRightTargetTest_1_RightToLeft.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/ModelElementChangeRightTargetTest_1_RightToLeft.java @@ -7,6 +7,8 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.emf.compare.diff.metamodel.DiffElement;
import org.eclipse.emf.compare.diff.metamodel.ModelElementChangeRightTarget;
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.uml2.uml.Class;
import org.eclipse.uml2.uml.Package;
@@ -25,7 +27,7 @@ public class ModelElementChangeRightTargetTest_1_RightToLeft extends AbstractSta final String PROPERTY_NAME = "Property1";
@BeforeClass
- public static void init() throws CoreException, IOException {
+ public static void init() throws CoreException, IOException , ModelMultiException, ServiceException {
AbstractStandaloneCompareTest.init(MODEL_PATH, false);
}
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/MoveModelElementTest_1_LeftToRight.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/MoveModelElementTest_1_LeftToRight.java index e9452002b71..15ece512d8b 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/MoveModelElementTest_1_LeftToRight.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/MoveModelElementTest_1_LeftToRight.java @@ -7,6 +7,8 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.emf.compare.diff.metamodel.DiffElement;
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.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -17,7 +19,7 @@ public class MoveModelElementTest_1_LeftToRight extends AbstractStandaloneCompar private static final String MODEL_PATH = "moveModelElement_1/";
@BeforeClass
- public static void init() throws CoreException, IOException {
+ public static void init() throws CoreException, IOException , ModelMultiException, ServiceException{
AbstractStandaloneCompareTest.init(MODEL_PATH, true);
}
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/MoveModelElementTest_1_RightToLeft.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/MoveModelElementTest_1_RightToLeft.java index 673a80100ea..730ba64ec6a 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/MoveModelElementTest_1_RightToLeft.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/MoveModelElementTest_1_RightToLeft.java @@ -7,6 +7,8 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.emf.compare.diff.metamodel.DiffElement;
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.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -17,7 +19,7 @@ public class MoveModelElementTest_1_RightToLeft extends AbstractStandaloneCompar private static final String MODEL_PATH = "moveModelElement_1/";
@BeforeClass
- public static void init() throws CoreException, IOException {
+ public static void init() throws CoreException, IOException , ModelMultiException, ServiceException{
AbstractStandaloneCompareTest.init(MODEL_PATH, false);
}
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/MoveModelElementTest_2_LeftToRight.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/MoveModelElementTest_2_LeftToRight.java index 0f0cdf848b7..ea31ce919a1 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/MoveModelElementTest_2_LeftToRight.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/MoveModelElementTest_2_LeftToRight.java @@ -7,6 +7,8 @@ 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.MoveModelElement;
+import org.eclipse.papyrus.infra.core.resource.ModelMultiException;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -17,7 +19,7 @@ public class MoveModelElementTest_2_LeftToRight extends AbstractStandaloneCompar private static final String MODEL_PATH = "moveModelElement_2/";
@BeforeClass
- public static void init() throws CoreException, IOException {
+ public static void init() throws CoreException, IOException , ModelMultiException, ServiceException{
AbstractStandaloneCompareTest.init(MODEL_PATH, true);
}
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/MoveModelElementTest_2_RightToLeft.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/MoveModelElementTest_2_RightToLeft.java index a33e753447b..74459a18915 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/MoveModelElementTest_2_RightToLeft.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/MoveModelElementTest_2_RightToLeft.java @@ -7,6 +7,8 @@ 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.MoveModelElement;
+import org.eclipse.papyrus.infra.core.resource.ModelMultiException;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -17,7 +19,7 @@ public class MoveModelElementTest_2_RightToLeft extends AbstractStandaloneCompar private static final String MODEL_PATH = "moveModelElement_2/";
@BeforeClass
- public static void init() throws CoreException, IOException {
+ public static void init() throws CoreException, IOException , ModelMultiException, ServiceException{
AbstractStandaloneCompareTest.init(MODEL_PATH, false);
}
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/ReferenceChangeLeftTargetTest_1_LeftToRight.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/ReferenceChangeLeftTargetTest_1_LeftToRight.java index 5cc3c303293..ae53bf8736d 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/ReferenceChangeLeftTargetTest_1_LeftToRight.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/ReferenceChangeLeftTargetTest_1_LeftToRight.java @@ -8,6 +8,8 @@ import org.eclipse.emf.compare.diff.metamodel.DiffElement; import org.eclipse.emf.compare.diff.metamodel.DiffGroup;
import org.eclipse.emf.compare.diff.metamodel.ReferenceChangeLeftTarget;
import org.eclipse.osgi.util.NLS;
+import org.eclipse.papyrus.infra.core.resource.ModelMultiException;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -18,7 +20,7 @@ public class ReferenceChangeLeftTargetTest_1_LeftToRight extends AbstractStandal private static final String MODEL_PATH = "referenceChangeLeftTarget_1/";
@BeforeClass
- public static void init() throws CoreException, IOException {
+ public static void init() throws CoreException, IOException , ModelMultiException, ServiceException{
AbstractStandaloneCompareTest.init(MODEL_PATH, true);
}
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/ReferenceChangeLeftTargetTest_1_RightToLeft.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/ReferenceChangeLeftTargetTest_1_RightToLeft.java index 97002d68045..05c43aab093 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/ReferenceChangeLeftTargetTest_1_RightToLeft.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/ReferenceChangeLeftTargetTest_1_RightToLeft.java @@ -8,6 +8,8 @@ import org.eclipse.emf.compare.diff.metamodel.DiffElement; import org.eclipse.emf.compare.diff.metamodel.DiffGroup;
import org.eclipse.emf.compare.diff.metamodel.ReferenceChangeLeftTarget;
import org.eclipse.osgi.util.NLS;
+import org.eclipse.papyrus.infra.core.resource.ModelMultiException;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -18,7 +20,7 @@ public class ReferenceChangeLeftTargetTest_1_RightToLeft extends AbstractStandal private static final String MODEL_PATH = "referenceChangeLeftTarget_1/";
@BeforeClass
- public static void init() throws CoreException, IOException {
+ public static void init() throws CoreException, IOException , ModelMultiException, ServiceException{
AbstractStandaloneCompareTest.init(MODEL_PATH, false);
}
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/ReferenceChangeRightTargetTest_1_LeftToRight.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/ReferenceChangeRightTargetTest_1_LeftToRight.java index 76237b497de..8710da86c44 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/ReferenceChangeRightTargetTest_1_LeftToRight.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/ReferenceChangeRightTargetTest_1_LeftToRight.java @@ -8,6 +8,8 @@ import org.eclipse.emf.compare.diff.metamodel.DiffElement; import org.eclipse.emf.compare.diff.metamodel.DiffGroup;
import org.eclipse.emf.compare.diff.metamodel.ReferenceChangeRightTarget;
import org.eclipse.osgi.util.NLS;
+import org.eclipse.papyrus.infra.core.resource.ModelMultiException;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -18,7 +20,7 @@ public class ReferenceChangeRightTargetTest_1_LeftToRight extends AbstractStanda private static final String MODEL_PATH = "referenceChangeRightTarget_1/";
@BeforeClass
- public static void init() throws CoreException, IOException {
+ public static void init() throws CoreException, IOException , ModelMultiException, ServiceException{
AbstractStandaloneCompareTest.init(MODEL_PATH, true);
}
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/ReferenceChangeRightTargetTest_1_RightToLeft.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/ReferenceChangeRightTargetTest_1_RightToLeft.java index aff82ab5439..0893a435f21 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/ReferenceChangeRightTargetTest_1_RightToLeft.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/ReferenceChangeRightTargetTest_1_RightToLeft.java @@ -8,6 +8,8 @@ import org.eclipse.emf.compare.diff.metamodel.DiffElement; import org.eclipse.emf.compare.diff.metamodel.DiffGroup;
import org.eclipse.emf.compare.diff.metamodel.ReferenceChangeRightTarget;
import org.eclipse.osgi.util.NLS;
+import org.eclipse.papyrus.infra.core.resource.ModelMultiException;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -18,7 +20,7 @@ public class ReferenceChangeRightTargetTest_1_RightToLeft extends AbstractStanda private static final String MODEL_PATH = "referenceChangeRightTarget_1/";
@BeforeClass
- public static void init() throws CoreException, IOException {
+ public static void init() throws CoreException, IOException , ModelMultiException, ServiceException{
AbstractStandaloneCompareTest.init(MODEL_PATH, false);
}
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/ReferenceOrderChangeTest_1_LeftToRight.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/ReferenceOrderChangeTest_1_LeftToRight.java index 181619fea32..5122b37ec43 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/ReferenceOrderChangeTest_1_LeftToRight.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/ReferenceOrderChangeTest_1_LeftToRight.java @@ -7,6 +7,8 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.emf.compare.diff.metamodel.DiffElement;
import org.eclipse.emf.compare.diff.metamodel.ReferenceOrderChange;
import org.eclipse.osgi.util.NLS;
+import org.eclipse.papyrus.infra.core.resource.ModelMultiException;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -17,7 +19,7 @@ public class ReferenceOrderChangeTest_1_LeftToRight extends AbstractStandaloneCo private static final String MODEL_PATH = "referenceOrderChange_1/";
@BeforeClass
- public static void init() throws CoreException, IOException {
+ public static void init() throws CoreException, IOException , ModelMultiException, ServiceException{
AbstractStandaloneCompareTest.init(MODEL_PATH, true);
}
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/ReferenceOrderChangeTest_1_RightToLeft.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/ReferenceOrderChangeTest_1_RightToLeft.java index 4158bed5641..7791b076df3 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/ReferenceOrderChangeTest_1_RightToLeft.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/ReferenceOrderChangeTest_1_RightToLeft.java @@ -7,6 +7,8 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.emf.compare.diff.metamodel.DiffElement;
import org.eclipse.emf.compare.diff.metamodel.ReferenceOrderChange;
import org.eclipse.osgi.util.NLS;
+import org.eclipse.papyrus.infra.core.resource.ModelMultiException;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -17,7 +19,7 @@ public class ReferenceOrderChangeTest_1_RightToLeft extends AbstractStandaloneCo private static final String MODEL_PATH = "referenceOrderChange_1/";
@BeforeClass
- public static void init() throws CoreException, IOException {
+ public static void init() throws CoreException, IOException , ModelMultiException, ServiceException {
AbstractStandaloneCompareTest.init(MODEL_PATH, false);
}
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/UpdateAttributeTest_1_LeftToRight.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/UpdateAttributeTest_1_LeftToRight.java index 35c89f89dec..fc58e28e5b3 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/UpdateAttributeTest_1_LeftToRight.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/UpdateAttributeTest_1_LeftToRight.java @@ -7,6 +7,8 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.emf.compare.diff.metamodel.DiffElement;
import org.eclipse.emf.compare.diff.metamodel.UpdateAttribute;
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.uml2.uml.NamedElement;
import org.eclipse.uml2.uml.Package;
import org.junit.Assert;
@@ -19,7 +21,7 @@ public class UpdateAttributeTest_1_LeftToRight extends AbstractStandaloneCompare private static final String MODEL_PATH = "updateAttribute_1/";
@BeforeClass
- public static void init() throws CoreException, IOException {
+ public static void init() throws CoreException, IOException , ModelMultiException, ServiceException{
AbstractStandaloneCompareTest.init(MODEL_PATH, true);
}
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/UpdateAttributeTest_1_RightToLeft.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/UpdateAttributeTest_1_RightToLeft.java index 66fadc8237b..0d5dcb1d92c 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/UpdateAttributeTest_1_RightToLeft.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/UpdateAttributeTest_1_RightToLeft.java @@ -7,6 +7,8 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.emf.compare.diff.metamodel.DiffElement;
import org.eclipse.emf.compare.diff.metamodel.UpdateAttribute;
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.uml2.uml.NamedElement;
import org.eclipse.uml2.uml.Package;
import org.junit.Assert;
@@ -19,7 +21,7 @@ public class UpdateAttributeTest_1_RightToLeft extends AbstractStandaloneCompare private static final String MODEL_PATH = "updateAttribute_1/";
@BeforeClass
- public static void init() throws CoreException, IOException {
+ public static void init() throws CoreException, IOException , ModelMultiException, ServiceException{
AbstractStandaloneCompareTest.init(MODEL_PATH, false);
}
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/UpdateReferenceTest_1_LeftToRight.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/UpdateReferenceTest_1_LeftToRight.java index 299a581ca41..8088e4b5135 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/UpdateReferenceTest_1_LeftToRight.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/UpdateReferenceTest_1_LeftToRight.java @@ -7,6 +7,8 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.emf.compare.diff.metamodel.DiffElement;
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.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -17,7 +19,7 @@ public class UpdateReferenceTest_1_LeftToRight extends AbstractStandaloneCompare private static final String MODEL_PATH = "updateReference_1/";
@BeforeClass
- public static void init() throws CoreException, IOException {
+ public static void init() throws CoreException, IOException , ModelMultiException, ServiceException{
AbstractStandaloneCompareTest.init(MODEL_PATH, true);
}
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/UpdateReferenceTest_1_RightToLeft.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/UpdateReferenceTest_1_RightToLeft.java index ecd0d1da3d4..a894e9fa3ac 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/UpdateReferenceTest_1_RightToLeft.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/UpdateReferenceTest_1_RightToLeft.java @@ -7,6 +7,8 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.emf.compare.diff.metamodel.DiffElement;
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.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -17,7 +19,7 @@ public class UpdateReferenceTest_1_RightToLeft extends AbstractStandaloneCompare private static final String MODEL_PATH = "updateReference_1/";
@BeforeClass
- public static void init() throws CoreException, IOException {
+ public static void init() throws CoreException, IOException , ModelMultiException, ServiceException{
AbstractStandaloneCompareTest.init(MODEL_PATH, false);
}
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/UpdateReferenceTest_2_LeftToRight.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/UpdateReferenceTest_2_LeftToRight.java index 70549c79f88..9036cfa5efa 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/UpdateReferenceTest_2_LeftToRight.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/UpdateReferenceTest_2_LeftToRight.java @@ -7,6 +7,8 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.emf.compare.diff.metamodel.DiffElement;
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.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -17,7 +19,7 @@ public class UpdateReferenceTest_2_LeftToRight extends AbstractStandaloneCompare private static final String MODEL_PATH = "updateReference_2/";
@BeforeClass
- public static void init() throws CoreException, IOException {
+ public static void init() throws CoreException, IOException , ModelMultiException, ServiceException {
AbstractStandaloneCompareTest.init(MODEL_PATH, true);
}
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/UpdateReferenceTest_2_RightToLeft.java b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/UpdateReferenceTest_2_RightToLeft.java index 34ccf38bc4c..1a1e89fdce8 100644 --- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/UpdateReferenceTest_2_RightToLeft.java +++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger.tests/src/org/eclipse/papyrus/uml/compare/merger/tests/standalone/UpdateReferenceTest_2_RightToLeft.java @@ -7,6 +7,8 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.emf.compare.diff.metamodel.DiffElement;
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.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -17,7 +19,7 @@ public class UpdateReferenceTest_2_RightToLeft extends AbstractStandaloneCompare private static final String MODEL_PATH = "updateReference_2/";
@BeforeClass
- public static void init() throws CoreException, IOException {
+ public static void init() throws CoreException, IOException , ModelMultiException, ServiceException{
AbstractStandaloneCompareTest.init(MODEL_PATH, false);
}
|