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
|
/*****************************************************************************
* Copyright (c) 2012 CEA LIST.
*
*
* 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:
* CEA LIST - Initial API and implementation
*
*****************************************************************************/
package org.eclipse.papyrus.uml.diagram.sequence.tests.bug;
import org.eclipse.draw2d.geometry.Dimension;
import org.eclipse.draw2d.geometry.Point;
import org.eclipse.gef.EditPart;
import org.eclipse.gef.Request;
import org.eclipse.gef.RequestConstants;
import org.eclipse.gef.commands.Command;
import org.eclipse.gef.commands.UnexecutableCommand;
import org.eclipse.gef.requests.GroupRequest;
import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
import org.eclipse.gmf.runtime.diagram.ui.requests.EditCommandRequestWrapper;
import org.eclipse.gmf.runtime.emf.type.core.IElementType;
import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
import org.eclipse.papyrus.commands.ICreationCommand;
import org.eclipse.papyrus.commands.wrappers.GEFtoEMFCommandWrapper;
import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragmentCombinedFragmentCompartmentEditPart;
import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragmentEditPart;
import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionOperandEditPart;
import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart;
import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;
import org.eclipse.papyrus.uml.diagram.sequence.tests.canonical.CreateSequenceDiagramCommand;
import org.eclipse.papyrus.uml.diagram.sequence.tests.canonical.TestTopNode;
import org.junit.Test;
/**
* Currently, deleting a combined fragments deletes all its contents. Sometimes,
* the user just wants to delete the combined fragment and keeping its content.
* It would be useful to give the possibility to not delete the combined
* fragment content. This would imply a refactoring of the model.
*
*/
public class TestCombinedFragmentDeletion_364804 extends TestTopNode {
protected ICreationCommand getDiagramCommandCreation() {
return new CreateSequenceDiagramCommand();
}
@Test
public void testCombinedFragmentDeleteAll() {
deleteAll(UMLElementTypes.CombinedFragment_3004);
}
@Test
public void testConsiderIgnoreFragmentDeleteAll() {
deleteAll(UMLElementTypes.ConsiderIgnoreFragment_3007);
}
@Test
public void testCombinedFragmentKeepContents() {
keepContents(UMLElementTypes.CombinedFragment_3004);
}
@Test
public void testConsiderIgnoreFragmentKeepContents() {
keepContents(UMLElementTypes.ConsiderIgnoreFragment_3007);
}
protected void deleteAll(IElementType type) {
createNode(type, getRootEditPart(), new Point(100, 100), new Dimension(200, 200));
waitForComplete();
// create child combined fragment
CombinedFragmentEditPart parentCFP = (CombinedFragmentEditPart)getRootEditPart().getChildren().get(0);
CombinedFragmentCombinedFragmentCompartmentEditPart cfp = (CombinedFragmentCombinedFragmentCompartmentEditPart)parentCFP.getChildren().get(0);
InteractionOperandEditPart op = (InteractionOperandEditPart)cfp.getChildren().get(0);
createNode(type, op, new Point(150, 150), new Dimension(100, 100));
assertTrue(CREATION + TEST_THE_EXECUTION, getRootEditPart().getChildren().size() == 1);
createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(200, 200), new Dimension(60, 240));
waitForComplete();
assertTrue(CREATION + TEST_THE_EXECUTION, getRootEditPart().getChildren().size() == 2);
LifelineEditPart lifelineEP = (LifelineEditPart)getRootEditPart().getChildren().get(1);
waitForComplete();
createNode(UMLElementTypes.ActionExecutionSpecification_3006, lifelineEP, getAbsoluteCenter(lifelineEP).translate(0, 10), null);
waitForComplete();
assertTrue(CREATION + TEST_THE_EXECUTION, lifelineEP.getChildren().size() == 2);
PopupUtil.addMenuListener(0);
{ // destroy semantic
Request deleteViewRequest = new EditCommandRequestWrapper(new DestroyElementRequest(false));
Command command = parentCFP.getCommand(deleteViewRequest);
assertNotNull(DESTROY_DELETION + COMMAND_NULL, command);
assertTrue(DESTROY_DELETION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
assertTrue(DESTROY_DELETION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);
getEMFCommandStack().execute(new GEFtoEMFCommandWrapper(command));
assertTrue(DESTROY_DELETION + TEST_THE_EXECUTION, getRootEditPart().getChildren().size() == 1);
assertTrue(DESTROY_DELETION + TEST_THE_EXECUTION, getRootEditPart().getChildren().get(0) instanceof LifelineEditPart);
assertTrue(DESTROY_DELETION + TEST_THE_EXECUTION, lifelineEP.getChildren().size() == 1); // action execution is deleted
getEMFCommandStack().undo();
assertTrue(DESTROY_DELETION + TEST_THE_UNDO, getRootEditPart().getChildren().size() == 2);
assertTrue(DESTROY_DELETION + TEST_THE_UNDO, lifelineEP.getChildren().size() == 2);
getEMFCommandStack().redo();
assertTrue(DESTROY_DELETION + TEST_THE_REDO, getRootEditPart().getChildren().size() == 1);
assertTrue(DESTROY_DELETION + TEST_THE_REDO, lifelineEP.getChildren().size() == 1);
}
getEMFCommandStack().undo();
{ // delete view
Request deleteViewRequest = new GroupRequest(RequestConstants.REQ_DELETE);
Command command = parentCFP.getCommand(deleteViewRequest);
assertNotNull(VIEW_DELETION + COMMAND_NULL, command);
assertTrue(VIEW_DELETION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
assertTrue(VIEW_DELETION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);
getDiagramCommandStack().execute(command);
assertTrue(VIEW_DELETION + TEST_THE_EXECUTION, getRootEditPart().getChildren().size() == 1);
assertTrue(VIEW_DELETION + TEST_THE_EXECUTION, getRootEditPart().getChildren().get(0) instanceof LifelineEditPart);
getDiagramCommandStack().undo();
assertTrue(VIEW_DELETION + TEST_THE_UNDO, getRootEditPart().getChildren().size() == 2);
getDiagramCommandStack().redo();
assertTrue(VIEW_DELETION + TEST_THE_REDO, getRootEditPart().getChildren().size() == 1);
}
}
protected void keepContents(IElementType type) {
createNode(type, getRootEditPart(), new Point(100, 100), new Dimension(200, 200));
waitForComplete();
// create child combined fragment
CombinedFragmentEditPart parentCFP = (CombinedFragmentEditPart)getRootEditPart().getChildren().get(0);
CombinedFragmentCombinedFragmentCompartmentEditPart cfp = (CombinedFragmentCombinedFragmentCompartmentEditPart)parentCFP.getChildren().get(0);
InteractionOperandEditPart op = (InteractionOperandEditPart)cfp.getChildren().get(0);
createNode(type, op, new Point(150, 150), new Dimension(100, 100));
assertTrue(CREATION + TEST_THE_EXECUTION, getRootEditPart().getChildren().size() == 1);
createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(200, 200), new Dimension(60, 240));
waitForComplete();
assertTrue(CREATION + TEST_THE_EXECUTION, getRootEditPart().getChildren().size() == 2);
LifelineEditPart lifelineEP = (LifelineEditPart)getRootEditPart().getChildren().get(1);
waitForComplete();
createNode(UMLElementTypes.ActionExecutionSpecification_3006, lifelineEP, getAbsoluteCenter(lifelineEP).translate(0, 10), null);
waitForComplete();
assertTrue(CREATION + TEST_THE_EXECUTION, lifelineEP.getChildren().size() == 2);
PopupUtil.addMenuListener(1);
{ // destroy semantic
Request deleteViewRequest = new EditCommandRequestWrapper(new DestroyElementRequest(false));
Command command = parentCFP.getCommand(deleteViewRequest);
assertNotNull(DESTROY_DELETION + COMMAND_NULL, command);
assertTrue(DESTROY_DELETION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
assertTrue(DESTROY_DELETION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);
getEMFCommandStack().execute(new GEFtoEMFCommandWrapper(command));
assertTrue(DESTROY_DELETION + TEST_THE_EXECUTION, getRootEditPart().getChildren().size() == 2);
assertTrue(DESTROY_DELETION + TEST_THE_EXECUTION, getRootEditPart().getChildren().get(1) instanceof CombinedFragmentEditPart);
assertTrue(DESTROY_DELETION + TEST_THE_EXECUTION, lifelineEP.getChildren().size() == 2);
getEMFCommandStack().undo();
assertTrue(DESTROY_DELETION + TEST_THE_UNDO, getRootEditPart().getChildren().size() == 2);
assertTrue(DESTROY_DELETION + TEST_THE_UNDO, lifelineEP.getChildren().size() == 2);
getEMFCommandStack().redo();
assertTrue(DESTROY_DELETION + TEST_THE_REDO, getRootEditPart().getChildren().size() == 2);
assertTrue(DESTROY_DELETION + TEST_THE_REDO, lifelineEP.getChildren().size() == 2);
}
getEMFCommandStack().undo();
{ // delete view
Request deleteViewRequest = new GroupRequest(RequestConstants.REQ_DELETE);
Command command = parentCFP.getCommand(deleteViewRequest);
assertNotNull(VIEW_DELETION + COMMAND_NULL, command);
assertTrue(VIEW_DELETION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
assertTrue(VIEW_DELETION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);
getDiagramCommandStack().execute(command);
assertTrue(VIEW_DELETION + TEST_THE_EXECUTION, getRootEditPart().getChildren().size() == 2);
getDiagramCommandStack().undo();
assertTrue(VIEW_DELETION + TEST_THE_UNDO, getRootEditPart().getChildren().size() == 2);
getDiagramCommandStack().redo();
assertTrue(VIEW_DELETION + TEST_THE_REDO, getRootEditPart().getChildren().size() == 2);
}
}
@Override
protected void tearDown() throws Exception {
page.closeAllEditors(false);
papyrusEditor = null;
waitForComplete();
PopupUtil.removeMenuListener();
}
public void createNode(IElementType type, EditPart parentPart, Point location, Dimension size) {
// CREATION
CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(type, getRootEditPart().getDiagramPreferencesHint());
requestcreation.setLocation(location);
requestcreation.setSize(size);
Command command = parentPart.getCommand(requestcreation);
assertNotNull(CREATION + COMMAND_NULL, command);
assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
assertTrue(CREATION + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);
getDiagramCommandStack().execute(command);
}
}
|
