1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
|
/*****************************************************************************
* Copyright (c) 2013, 2015 CEA LIST, 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 v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
* Remi Schnekenburger (CEA LIST) - Initial API and implementation
* Christian W. Damus (CEA) - bug 434993
* Christian W. Damus - bug 468071
*
*****************************************************************************/
package org.eclipse.papyrus.uml.service.types.tests.creation;
import static org.hamcrest.CoreMatchers.notNullValue;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import java.io.IOException;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.Platform;
import org.eclipse.emf.common.command.Command;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.transaction.TransactionalEditingDomain;
import org.eclipse.gmf.runtime.common.core.command.ICommand;
import org.eclipse.gmf.runtime.emf.type.core.requests.MoveRequest;
import org.eclipse.papyrus.infra.core.resource.ModelSet;
import org.eclipse.papyrus.infra.core.resource.ModelUtils;
import org.eclipse.papyrus.infra.core.resource.NotFoundException;
import org.eclipse.papyrus.infra.core.services.ServiceException;
import org.eclipse.papyrus.infra.elementtypesconfigurations.registries.ElementTypeSetConfigurationRegistry;
import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;
import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
import org.eclipse.papyrus.junit.utils.PapyrusProjectUtils;
import org.eclipse.papyrus.junit.utils.rules.HouseKeeper;
import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
import org.eclipse.papyrus.uml.tools.model.UmlModel;
import org.eclipse.papyrus.uml.tools.model.UmlUtils;
import org.eclipse.swt.widgets.Display;
import org.eclipse.uml2.uml.Class;
import org.eclipse.uml2.uml.Model;
import org.eclipse.uml2.uml.Operation;
import org.eclipse.uml2.uml.RedefinableTemplateSignature;
import org.eclipse.uml2.uml.TemplateSignature;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Test;
/**
* Test moving of UML elements (Move / Undo / redo)
*/
public class MoveElementTest extends AbstractPapyrusTest {
@ClassRule
public static final HouseKeeper.Static houseKeeper = new HouseKeeper.Static();
private static IProject createProject;
private static IFile copyPapyrusModel;
private static IMultiDiagramEditor openPapyrusEditor;
private static ModelSet modelset;
private static UmlModel umlIModel;
private static Model rootModel;
private static TransactionalEditingDomain transactionalEditingDomain;
private static Class testClass;
private static Class testClassWithOperation;
private static Operation testOperation;
private static Operation testOperation2;
/**
* Init test class
*/
@BeforeClass
public static void initMoveElementTest() throws Exception {
// create Project
createProject = houseKeeper.createProject("UMLServiceTypesTest");
// import test model
try {
copyPapyrusModel = PapyrusProjectUtils.copyPapyrusModel(createProject, Platform.getBundle("org.eclipse.papyrus.uml.service.types"), "/resource/", "TestModel");
} catch (CoreException e) {
fail(e.getMessage());
} catch (IOException e) {
fail(e.getMessage());
}
// open project
openPapyrusEditor = houseKeeper.openPapyrusEditor(copyPapyrusModel);
transactionalEditingDomain = openPapyrusEditor.getAdapter(TransactionalEditingDomain.class);
assertTrue("Impossible to init editing domain", transactionalEditingDomain instanceof TransactionalEditingDomain);
// retrieve UML model from this editor
try {
modelset = ModelUtils.getModelSetChecked(openPapyrusEditor.getServicesRegistry());
umlIModel = UmlUtils.getUmlModel(modelset);
rootModel = (Model) umlIModel.lookupRoot();
} catch (ServiceException e) {
fail(e.getMessage());
} catch (NotFoundException e) {
fail(e.getMessage());
} catch (ClassCastException e) {
fail(e.getMessage());
}
try {
initExistingElements();
} catch (Exception e) {
fail(e.getMessage());
}
// force load of the element type registry. Will need to load in in UI thread because of some advice in communication diag: see org.eclipse.gmf.tooling.runtime.providers.DiagramElementTypeImages
Display.getDefault().syncExec(new Runnable() {
@Override
public void run() {
ElementTypeSetConfigurationRegistry registry = ElementTypeSetConfigurationRegistry.getInstance();
Assert.assertNotNull("registry should not be null after init", registry);
Assert.assertNotNull("element type should not be null", UMLElementTypes.CLASS);
}
});
}
/**
* Init fields corresponding to element in the test model
*/
private static void initExistingElements() throws Exception {
testClass = (Class) rootModel.getOwnedMember("TestClass");
testClassWithOperation = (Class) rootModel.getOwnedMember("TestClassWithOperation");
testOperation = testClassWithOperation.getOwnedOperation("foo", null, null);
testOperation2 = testClassWithOperation.getOwnedOperation("bar", null, null);
}
@Test
public void testCannotMoveRedefinableTemplateSignatureToOperation_bug468071() throws Exception {
Assert.assertTrue("Editor should not be dirty before test", !openPapyrusEditor.isDirty());
RedefinableTemplateSignature signature = (RedefinableTemplateSignature) testClassWithOperation.getOwnedTemplateSignature();
getMoveCommand(signature, testOperation, false);
}
@Test
public void testMoveTemplateSignatureToOperation_bug468071() throws Exception {
Assert.assertTrue("Editor should not be dirty before test", !openPapyrusEditor.isDirty());
TemplateSignature signature = testOperation2.getOwnedTemplateSignature();
Command command = getMoveCommand(signature, testOperation, true);
transactionalEditingDomain.getCommandStack().execute(command);
assertThat("Template signature not moved", testOperation.getOwnedTemplateSignature(), notNullValue());
transactionalEditingDomain.getCommandStack().undo();
assertThat("Template signature still moved after undo", testOperation.getOwnedTemplateSignature(), nullValue());
transactionalEditingDomain.getCommandStack().redo();
assertThat("Template signature not restored by redo", testOperation.getOwnedTemplateSignature(), notNullValue());
transactionalEditingDomain.getCommandStack().undo();
assertThat("Template signature still moved after second undo", testOperation.getOwnedTemplateSignature(), nullValue());
// assert editor is not dirty
Assert.assertTrue("Editor should not be dirty after undo", !openPapyrusEditor.isDirty());
}
@Test
public void testMoveRedefinableTemplateSignatureToClass_bug468071() throws Exception {
Assert.assertTrue("Editor should not be dirty before test", !openPapyrusEditor.isDirty());
RedefinableTemplateSignature signature = (RedefinableTemplateSignature) testClassWithOperation.getOwnedTemplateSignature();
Command command = getMoveCommand(signature, testClass, true);
transactionalEditingDomain.getCommandStack().execute(command);
assertThat("Template signature not moved", testClass.getOwnedTemplateSignature(), notNullValue());
transactionalEditingDomain.getCommandStack().undo();
assertThat("Template signature still moved after undo", testClass.getOwnedTemplateSignature(), nullValue());
transactionalEditingDomain.getCommandStack().redo();
assertThat("Template signature not restored by redo", testClass.getOwnedTemplateSignature(), notNullValue());
transactionalEditingDomain.getCommandStack().undo();
assertThat("Template signature still moved after second undo", testClass.getOwnedTemplateSignature(), nullValue());
// assert editor is not dirty
Assert.assertTrue("Editor should not be dirty after undo", !openPapyrusEditor.isDirty());
}
/**
* Creates a command to move the {@code element} to a new owner and asserts its executability.
*
* @param element
* the element to move
* @param newOwner
* the new owner of the moved element
* @param canMove
* <code>true</code> if element can be moved to the specified owner
*/
protected Command getMoveCommand(EObject element, EObject newOwner, boolean canMove) throws Exception {
IElementEditService elementEditService = ElementEditServiceUtils.getCommandProvider(element);
ICommand command = elementEditService.getEditCommand(new MoveRequest(newOwner, element));
if (!canMove) {
// command should not be executable: either it should be null or it should be not executable
if (command != null && command.canExecute()) {
fail("Move command is executable but it was expected not to be");
}
} else {
// command should be executable in this case
assertNotNull("Command should not be null", command);
assertTrue("Command should be executable", command.canExecute());
// command is executable, and it was expected to => run the creation
Command emfCommand = new org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper(command);
return emfCommand;
}
return null;
}
}
|
