Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorVincent Lorenzo2019-02-07 14:31:53 +0000
committerVincent Lorenzo2019-02-08 10:30:32 +0000
commit7074b2202f43c0e2a755dc12104c07e877213f76 (patch)
treebd2b1d3f3bb577699a9ae91afd03553fbce29514 /tests
parentf62bca5a83ee451a2d864d9e7394db07a5d81abb (diff)
downloadorg.eclipse.papyrus-7074b2202f43c0e2a755dc12104c07e877213f76.tar.gz
org.eclipse.papyrus-7074b2202f43c0e2a755dc12104c07e877213f76.tar.xz
org.eclipse.papyrus-7074b2202f43c0e2a755dc12104c07e877213f76.zip
Revert "Bug 447665: [Profiles] Removing profiles definitions causing a profile"
This patch revert the code changes, but keeps the declared new plugin version, by facility, to avoid possible inconsistent versioning of plugins. This reverts commit 5e61a5490724d2ddf52caf45af21744482e8ada8. Change-Id: Iea4cb8d266e877130066f0c98fa730eb25bc625a
Diffstat (limited to 'tests')
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/src/org/eclipse/papyrus/uml/diagram/profile/custom/commands/tests/DefineProfileCommandTest.java12
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/src/org/eclipse/papyrus/uml/diagram/profile/custom/commands/tests/DefineProfileCommandTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/src/org/eclipse/papyrus/uml/diagram/profile/custom/commands/tests/DefineProfileCommandTest.java
index 3313d712dc8..9ad1ac9836b 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/src/org/eclipse/papyrus/uml/diagram/profile/custom/commands/tests/DefineProfileCommandTest.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/src/org/eclipse/papyrus/uml/diagram/profile/custom/commands/tests/DefineProfileCommandTest.java
@@ -1,6 +1,6 @@
/*****************************************************************************
* Copyright (c) 2014 Christian W. Damus and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
@@ -10,7 +10,7 @@
*
* Contributors:
* Christian W. Damus - Initial API and implementation
- *
+ *
*****************************************************************************/
package org.eclipse.papyrus.uml.diagram.profile.custom.commands.tests;
@@ -22,13 +22,13 @@ import static org.hamcrest.MatcherAssert.assertThat;
import org.eclipse.emf.ecore.EAnnotation;
import org.eclipse.emf.ecore.ENamedElement;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
import org.eclipse.papyrus.junit.utils.rules.ModelSetFixture;
import org.eclipse.papyrus.junit.utils.rules.PluginResource;
-import org.eclipse.papyrus.uml.tools.commands.DefineProfileCommand;
+import org.eclipse.papyrus.uml.diagram.profile.custom.commands.DefineProfileCommand;
import org.eclipse.papyrus.uml.tools.profile.definition.PapyrusDefinitionAnnotation;
import org.eclipse.papyrus.uml.tools.profile.definition.Version;
-import org.eclipse.papyrus.uml.tools.util.PapyrusProfileDefinition;
import org.eclipse.uml2.uml.Profile;
import org.junit.Rule;
import org.junit.Test;
@@ -80,8 +80,8 @@ public class DefineProfileCommandTest extends AbstractPapyrusTest {
void executeDefineCommand(Profile profile, String version) {
PapyrusDefinitionAnnotation annotation = new PapyrusDefinitionAnnotation(Version.parseVersion(version), "", "", "", "");
- DefineProfileCommand command = new DefineProfileCommand(modelSet.getEditingDomain(), new PapyrusProfileDefinition(annotation, true), profile);
- modelSet.getEditingDomain().getCommandStack().execute(command);
+ DefineProfileCommand command = new DefineProfileCommand(modelSet.getEditingDomain(), annotation, profile, true);
+ modelSet.getEditingDomain().getCommandStack().execute(GMFtoEMFCommandWrapper.wrap(command));
}
static EAnnotation getUMLAnnotation(ENamedElement namedElement) {

Back to the top