Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorcletavernie2013-03-22 12:28:43 -0400
committercletavernie2013-03-22 12:28:43 -0400
commit061e8c7e6b8851382a3d1e46ee72708a2930fafe (patch)
tree916ccdaa09ce2fdab04bab380e8f209695df66fe /tests
parent8a1640518ce6899c3d6cde69356c8dab1a7f16ef (diff)
downloadorg.eclipse.papyrus-061e8c7e6b8851382a3d1e46ee72708a2930fafe.tar.gz
org.eclipse.papyrus-061e8c7e6b8851382a3d1e46ee72708a2930fafe.tar.xz
org.eclipse.papyrus-061e8c7e6b8851382a3d1e46ee72708a2930fafe.zip
404141: [Sequence Diagram] Migrate the sequence diagram from 0.9.2 (Juno) to 0.10 (Kepler)
https://bugs.eclipse.org/bugs/show_bug.cgi?id=404141 Apply Papyrus formatter Remove unused imports Various style-related cleanup
Diffstat (limited to 'tests')
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/BugTests2.java4
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/PopupUtil.java15
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentDeletion_364804.java1
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentGates_364816.java1
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentKind_364710.java1
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentName_382951.java15
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentOperand_364701.java1
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCreationUndo_384618.java1
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestDestructionNode_384201.java4
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestDurationConstraints_384596.java10
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestExecutionSpecificationDimension_384572.java4
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestGuardEdition_364808.java7
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestInteractionConstraint_382966.java7
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestLifelineAlignment_364688.java1
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestLifelineAutoResize_383723.java22
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestLifelineLabelCustomize_383722.java18
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMessageCreate_379661.java9
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMessageEndConstraint_364817.java10
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMessageLostFound_384202.java1
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMovingCombinedFragment_364711.java1
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestNestedCombinedFragment_364795.java1
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestNestedExecution_384616.java8
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestObservationLink_364826.java9
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestParentBarAutoresize_385603.java67
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestSynchronousMessageCreation_364827.java10
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/canonical/TestChildNode.java2
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/canonical/TestSequenceDiagramTopNode.java34
27 files changed, 164 insertions, 100 deletions
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/BugTests2.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/BugTests2.java
index ded5dde482f..4fa03ef4713 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/BugTests2.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/BugTests2.java
@@ -5,7 +5,7 @@ import org.junit.runners.Suite;
import org.junit.runners.Suite.SuiteClasses;
@RunWith(Suite.class)
-@SuiteClasses({TestCombinedFragmentName_382951.class, TestCreationUndo_384618.class, TestDestructionNode_384201.class, TestDurationConstraints_384596.class, TestExecutionSpecificationDimension_384572.class, TestInteractionConstraint_382966.class, /*TestLifelineAutoResize_383723.class, TestLifelineLabelCustomize_383722.class,*/ TestMessageCreate_379661.class, TestMessageLostFound_384202.class, TestNestedExecution_384616.class, TestParentBarAutoresize_385603.class})
+/* TestLifelineAutoResize_383723.class, TestLifelineLabelCustomize_383722.class */
+@SuiteClasses({ TestCombinedFragmentName_382951.class, TestCreationUndo_384618.class, TestDestructionNode_384201.class, TestDurationConstraints_384596.class, TestExecutionSpecificationDimension_384572.class, TestInteractionConstraint_382966.class, TestMessageCreate_379661.class, TestMessageLostFound_384202.class, TestNestedExecution_384616.class, TestParentBarAutoresize_385603.class })
public class BugTests2 {
-
}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/PopupUtil.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/PopupUtil.java
index 26836246673..628c9886b50 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/PopupUtil.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/PopupUtil.java
@@ -64,8 +64,9 @@ public class PopupUtil {
public static void click(final Menu bar, int index) {
MenuItem[] items = bar.getItems();
- if(items != null && index < items.length)
+ if(items != null && index < items.length) {
notifyEvent(items[index], SWT.Selection);
+ }
bar.setVisible(false);
bar.notifyListeners(SWT.Hide, new Event());
@@ -114,8 +115,9 @@ public class PopupUtil {
* the event to check.
*/
public void handleEvent(Event event) {
- if(!(event.widget instanceof Menu))
+ if(!(event.widget instanceof Menu)) {
return;
+ }
Menu menu = (Menu)event.widget;
if(hasStyle(menu, SWT.POP_UP)) {
if(event.type == SWT.Show) {
@@ -123,8 +125,9 @@ public class PopupUtil {
click(menu, clickMenuIndex);
menuPopup = true;
}
- if(event.type == SWT.Hide)
+ if(event.type == SWT.Hide) {
currentContextMenu = null;
+ }
}
}
}
@@ -139,10 +142,12 @@ public class PopupUtil {
* @return <code>true</code> if the widget has the specified style bit set. Otherwise <code>false</code>.
*/
public static boolean hasStyle(final Widget w, final int style) {
- if((w == null) || w.isDisposed())
+ if((w == null) || w.isDisposed()) {
return false;
- if(style == SWT.NONE)
+ }
+ if(style == SWT.NONE) {
return true;
+ }
final List<Boolean> list = new ArrayList<Boolean>();
w.getDisplay().syncExec(new Runnable() {
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentDeletion_364804.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentDeletion_364804.java
index 0d8d37cdc2c..a342a79a7a4 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentDeletion_364804.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentDeletion_364804.java
@@ -46,6 +46,7 @@ import org.junit.Test;
*/
public class TestCombinedFragmentDeletion_364804 extends TestTopNode {
+ @Override
protected ICreationCommand getDiagramCommandCreation() {
return new CreateSequenceDiagramCommand();
}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentGates_364816.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentGates_364816.java
index 8b4376a5d75..7e7dcdc8170 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentGates_364816.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentGates_364816.java
@@ -49,6 +49,7 @@ import org.junit.Test;
*/
public class TestCombinedFragmentGates_364816 extends TestLink {
+ @Override
protected ICreationCommand getDiagramCommandCreation() {
return new CreateSequenceDiagramCommand();
}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentKind_364710.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentKind_364710.java
index 2b2b637d0a2..b02e78f4bb4 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentKind_364710.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentKind_364710.java
@@ -53,6 +53,7 @@ public class TestCombinedFragmentKind_364710 extends TestTopNode {
private static final String CHANGE_OPERATOR_KIND = "Change Operator Kind: ";
+ @Override
protected ICreationCommand getDiagramCommandCreation() {
return new CreateSequenceDiagramCommand();
}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentName_382951.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentName_382951.java
index 345e7faa39e..3f9de033a4a 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentName_382951.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentName_382951.java
@@ -35,18 +35,21 @@ import org.eclipse.uml2.uml.ConsiderIgnoreFragment;
import org.junit.Test;
/**
- * Combined fragment name shall be displayed at the right upper corner of the fragment.
+ * Combined fragment name shall be displayed at the right upper corner of the fragment.
*
* https://bugs.eclipse.org/bugs/show_bug.cgi?id=382951
- *
+ *
*/
public class TestCombinedFragmentName_382951 extends TestTopNode {
private static final String PREF_STORE = "org.eclipse.papyrus.infra.gmfdiag.preferences";
+
private static final String COMBINED_FRAGMENT_KEY = "ELEMENT_PapyrusUMLSequenceDiagram_CombinedFragment_CombinedFragmentCompartment.compartment_name.visibility";
+
private static final String CONSIDER_FRAGMENT_KEY = "ELEMENT_PapyrusUMLSequenceDiagram_ConsiderIgnoreFragment_CombinedFragmentCompartment.compartment_name.visibility";
+ @Override
protected ICreationCommand getDiagramCommandCreation() {
return new CreateSequenceDiagramCommand();
}
@@ -55,18 +58,18 @@ public class TestCombinedFragmentName_382951 extends TestTopNode {
public void testCombinedFragment() {
IEclipsePreferences store = InstanceScope.INSTANCE.getNode(PREF_STORE);
store.putBoolean(COMBINED_FRAGMENT_KEY, true);
-
+
createNode(UMLElementTypes.CombinedFragment_3004, getRootEditPart(), new Point(10, 80), new Dimension(100, 100));
CombinedFragmentEditPart cep = (CombinedFragmentEditPart)getRootEditPart().getChildren().get(0);
CombinedFragment cf = (CombinedFragment)cep.resolveSemanticElement();
WrappingLabel label = cep.getTitleLabel();
assertTrue(TEST_THE_EXECUTION, label.isVisible());
assertTrue(TEST_THE_EXECUTION, label.getText().equals(cf.getName()));
-
+
store.putBoolean(COMBINED_FRAGMENT_KEY, false);
assertFalse(TEST_THE_EXECUTION, label.isVisible());
}
-
+
@Test
public void testConsiderIgnoreFragment() {
IEclipsePreferences store = InstanceScope.INSTANCE.getNode(PREF_STORE);
@@ -77,7 +80,7 @@ public class TestCombinedFragmentName_382951 extends TestTopNode {
ConsiderIgnoreFragment cf = (ConsiderIgnoreFragment)cep.resolveSemanticElement();
WrappingLabel label = cep.getTitleLabel();
assertFalse(TEST_THE_EXECUTION, label.isVisible());
-
+
store.putBoolean(CONSIDER_FRAGMENT_KEY, true);
assertTrue(TEST_THE_EXECUTION, label.isVisible());
assertTrue(TEST_THE_EXECUTION, label.getText().equals(cf.getName()));
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentOperand_364701.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentOperand_364701.java
index 50a49862d0e..9843c4e156b 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentOperand_364701.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentOperand_364701.java
@@ -51,6 +51,7 @@ public class TestCombinedFragmentOperand_364701 extends TestTopNode {
private static final String OPERAND_RESIZE = "Operand Resize: ";
+ @Override
protected ICreationCommand getDiagramCommandCreation() {
return new CreateSequenceDiagramCommand();
}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCreationUndo_384618.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCreationUndo_384618.java
index e563d3e87b9..e1fbb6932cc 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCreationUndo_384618.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCreationUndo_384618.java
@@ -39,6 +39,7 @@ import org.junit.Test;
*/
public class TestCreationUndo_384618 extends TestLink {
+ @Override
protected ICreationCommand getDiagramCommandCreation() {
return new CreateSequenceDiagramCommand();
}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestDestructionNode_384201.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestDestructionNode_384201.java
index ee36d00d5b1..3d49d08bedb 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestDestructionNode_384201.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestDestructionNode_384201.java
@@ -46,6 +46,7 @@ public class TestDestructionNode_384201 extends TestTopNode {
private static final String RESIZE = "Resize: ";
+ @Override
protected ICreationCommand getDiagramCommandCreation() {
return new CreateSequenceDiagramCommand();
}
@@ -93,8 +94,9 @@ public class TestDestructionNode_384201 extends TestTopNode {
req.setEditParts(op);
req.setResizeDirection(resizeDir);
req.setSizeDelta(deltaSize);
- if(resizeDir == PositionConstants.NORTH || resizeDir == PositionConstants.WEST)
+ if(resizeDir == PositionConstants.NORTH || resizeDir == PositionConstants.WEST) {
req.setMoveDelta(new Point(-deltaSize.width(), -deltaSize.height()));
+ }
Command c = op.getCommand(req);
verifyResizeCommnad(op, deltaSize, c);
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestDurationConstraints_384596.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestDurationConstraints_384596.java
index 51eeb449754..c7b9ef78a4a 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestDurationConstraints_384596.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestDurationConstraints_384596.java
@@ -70,6 +70,7 @@ public class TestDurationConstraints_384596 extends TestTopNode {
private static final String EDIT = "Edit: ";
+ @Override
protected ICreationCommand getDiagramCommandCreation() {
return new CreateSequenceDiagramCommand();
}
@@ -139,8 +140,9 @@ public class TestDurationConstraints_384596 extends TestTopNode {
}
public void input(Widget widget, char... character) {
- if(widget.isDisposed())
+ if(widget.isDisposed()) {
return;
+ }
for(char c : character) {
Event e = createKeyEvent(widget, 0, c);
@@ -171,8 +173,9 @@ public class TestDurationConstraints_384596 extends TestTopNode {
private Text findEditor(Composite composite, WrappingLabel label) {
for(Control c : composite.getChildren()) {
if(c instanceof Text) {
- if(label.getText().equals(((Text)c).getText()))
+ if(label.getText().equals(((Text)c).getText())) {
return (Text)c;
+ }
}
}
return null;
@@ -193,8 +196,9 @@ public class TestDurationConstraints_384596 extends TestTopNode {
CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(type, getRootEditPart().getDiagramPreferencesHint());
requestcreation.setLocation(location);
requestcreation.setSize(size);
- if(extendedData != null)
+ if(extendedData != null) {
requestcreation.getExtendedData().putAll(extendedData);
+ }
Command command = parentPart.getCommand(requestcreation);
assertNotNull(CREATION + COMMAND_NULL, command);
assertTrue(CREATION + TEST_IF_THE_COMMAND_IS_CREATED, command != UnexecutableCommand.INSTANCE);
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestExecutionSpecificationDimension_384572.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestExecutionSpecificationDimension_384572.java
index 3a465168098..f72cfe4e4f2 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestExecutionSpecificationDimension_384572.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestExecutionSpecificationDimension_384572.java
@@ -43,6 +43,7 @@ public class TestExecutionSpecificationDimension_384572 extends TestTopNode {
private static final String RESIZE = "Resize: ";
+ @Override
protected ICreationCommand getDiagramCommandCreation() {
return new CreateSequenceDiagramCommand();
}
@@ -103,8 +104,9 @@ public class TestExecutionSpecificationDimension_384572 extends TestTopNode {
req.setEditParts(op);
req.setResizeDirection(resizeDir);
req.setSizeDelta(deltaSize);
- if(resizeDir == PositionConstants.NORTH || resizeDir == PositionConstants.WEST)
+ if(resizeDir == PositionConstants.NORTH || resizeDir == PositionConstants.WEST) {
req.setMoveDelta(new Point(-deltaSize.width(), -deltaSize.height()));
+ }
Command c = op.getCommand(req);
manageResizeCommnad(op, deltaSize, c);
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestGuardEdition_364808.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestGuardEdition_364808.java
index 3388ab62fb0..38f5f128277 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestGuardEdition_364808.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestGuardEdition_364808.java
@@ -64,6 +64,7 @@ public class TestGuardEdition_364808 extends TestTopNode {
private static final String EDIT = "Edit: ";
+ @Override
protected ICreationCommand getDiagramCommandCreation() {
return new CreateSequenceDiagramCommand();
}
@@ -141,8 +142,9 @@ public class TestGuardEdition_364808 extends TestTopNode {
private Text findEditor(Composite composite, WrappingLabel label) {
for(Control c : composite.getChildren()) {
if(c instanceof Text) {
- if(label.getText().equals(((Text)c).getText()))
+ if(label.getText().equals(((Text)c).getText())) {
return (Text)c;
+ }
}
}
return null;
@@ -161,8 +163,9 @@ public class TestGuardEdition_364808 extends TestTopNode {
}
public void input(Widget widget, char... character) {
- if(widget.isDisposed())
+ if(widget.isDisposed()) {
return;
+ }
for(char c : character) {
Event e = createKeyEvent(widget, 0, c);
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestInteractionConstraint_382966.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestInteractionConstraint_382966.java
index 60196cef7f0..09ff2044801 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestInteractionConstraint_382966.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestInteractionConstraint_382966.java
@@ -59,6 +59,7 @@ public class TestInteractionConstraint_382966 extends TestTopNode {
private static final String CHANGE_OPERATOR_KIND = "Change Operator Kind: ";
+ @Override
protected ICreationCommand getDiagramCommandCreation() {
return new CreateSequenceDiagramCommand();
}
@@ -74,6 +75,7 @@ public class TestInteractionConstraint_382966 extends TestTopNode {
executeCommandWithoutHistory(getRootEditPart().getEditingDomain(), new DummyCommand() {
+ @Override
public void execute() {
guard.setMaxint(null); // unset maxint
guard.setSpecification(null);
@@ -84,7 +86,7 @@ public class TestInteractionConstraint_382966 extends TestTopNode {
WrappingLabel label = op.getPrimaryShape().getInteractionConstraintLabel();
assertTrue(TEST_THE_EXECUTION, label.getText().equals(""));
}
-
+
@Test
public void testEditMinint() {
InteractionOperandEditPart op = setupOperand();
@@ -96,6 +98,7 @@ public class TestInteractionConstraint_382966 extends TestTopNode {
executeCommandWithoutHistory(getRootEditPart().getEditingDomain(), new DummyCommand() {
+ @Override
public void execute() {
guard.setMinint(null); // unset maxint
guard.setSpecification(null);
@@ -137,9 +140,11 @@ public class TestInteractionConstraint_382966 extends TestTopNode {
public void redo() {
}
+ @Override
public void undo() {
}
+ @Override
protected boolean prepare() {
return true;
}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestLifelineAlignment_364688.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestLifelineAlignment_364688.java
index 09b162046e6..632bf6cd67e 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestLifelineAlignment_364688.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestLifelineAlignment_364688.java
@@ -44,6 +44,7 @@ public class TestLifelineAlignment_364688 extends TestLink {
private static final String ALIGNMENT = "Alignment: ";
+ @Override
protected ICreationCommand getDiagramCommandCreation() {
return new CreateSequenceDiagramCommand();
}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestLifelineAutoResize_383723.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestLifelineAutoResize_383723.java
index 0709eb3eeda..0f2fa6b24fc 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestLifelineAutoResize_383723.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestLifelineAutoResize_383723.java
@@ -78,6 +78,7 @@ public class TestLifelineAutoResize_383723 extends TestTopNode {
private static final String UML_REPLACEMENT_TEMPLATE = "><nestedClassifier xmi:type=\"uml:Class\" xmi:id=\"_zAqbcIP8EeGnt9CMb_JfYQ\" name=\"Person\">" + "<ownedAttribute xmi:id=\"__-RhYIP8EeGnt9CMb_JfYQ\" name=\"company\" isStatic=\"true\" type=\"_6imi4IP8EeGnt9CMb_JfYQ\"/>" + "</nestedClassifier>" + "<nestedClassifier xmi:type=\"uml:Class\" xmi:id=\"_6imi4IP8EeGnt9CMb_JfYQ\" name=\"Company\">" + "<ownedAttribute xmi:type=\"uml:Port\" xmi:id=\"_1oQd4IP-EeGnt9CMb_JfYQ\" name=\"port1\">" + "<type xmi:type=\"uml:PrimitiveType\" href=\"pathmap://UML_METAMODELS/Ecore.metamodel.uml#EShort\"/>" + "</ownedAttribute>" + "<ownedAttribute xmi:id=\"_CVUmYIP_EeGnt9CMb_JfYQ\" name=\"Property1\">" + "<type xmi:type=\"uml:PrimitiveType\" href=\"pathmap://UML_METAMODELS/Ecore.metamodel.uml#EDouble\"/>" + "</ownedAttribute>" + "</nestedClassifier>" + "</packagedElement>" + "<packageImport xmi:id=\"_q19q4YP8EeGnt9CMb_JfYQ\">" + "<importedPackage xmi:type=\"uml:Model\" href=\"pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0\"/>" + "</packageImport>";
+ @Override
protected ICreationCommand getDiagramCommandCreation() {
return new CreateSequenceDiagramCommand();
}
@@ -145,6 +146,7 @@ public class TestLifelineAutoResize_383723 extends TestTopNode {
// change name
executeCommandWithoutHistory(getRootEditPart().getEditingDomain(), new DummyCommand() {
+ @Override
public void execute() {
feature.setName("abc");
}
@@ -156,6 +158,7 @@ public class TestLifelineAutoResize_383723 extends TestTopNode {
// change type
executeCommandWithoutHistory(getRootEditPart().getEditingDomain(), new DummyCommand() {
+ @Override
public void execute() {
feature.getType().setName("xy");
}
@@ -193,14 +196,17 @@ public class TestLifelineAutoResize_383723 extends TestTopNode {
public void redo() {
}
+ @Override
public void undo() {
}
+ @Override
protected boolean prepare() {
return true;
}
};
+ @Override
protected void projectCreation() {
IWorkspace workspace = ResourcesPlugin.getWorkspace();
root = workspace.getRoot();
@@ -209,10 +215,12 @@ public class TestLifelineAutoResize_383723 extends TestTopNode {
this.diResourceSet = new DiResourceSet();
try {
//at this point, no resources have been created
- if(!project.exists())
+ if(!project.exists()) {
project.create(null);
- if(!project.isOpen())
+ }
+ if(!project.isOpen()) {
project.open(null);
+ }
if(file.exists()) {
file.delete(true, new NullProgressMonitor());
@@ -221,9 +229,9 @@ public class TestLifelineAutoResize_383723 extends TestTopNode {
if(!file.exists()) {
file.create(new ByteArrayInputStream(new byte[0]), true, new NullProgressMonitor());
diResourceSet.createsModels(file);
- new CreateUMLModelCommand().createModel((DiResourceSet)this.diResourceSet);
+ new CreateUMLModelCommand().createModel(this.diResourceSet);
ICreationCommand command = getDiagramCommandCreation();
- command.createDiagram((DiResourceSet)diResourceSet, null, "DiagramToTest");
+ command.createDiagram(diResourceSet, null, "DiagramToTest");
diResourceSet.save(new NullProgressMonitor());
}
@@ -257,8 +265,9 @@ public class TestLifelineAutoResize_383723 extends TestTopNode {
assertTrue(CHANGE_REPRESENTS + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, emfCommand.canExecute() == true);
getEMFCommandStack().execute(emfCommand);
waitForComplete();
- if(value != null)
+ if(value != null) {
assertTrue(CHANGE_REPRESENTS + TEST_THE_EXECUTION, lifeline.getRepresents().equals(value));
+ }
}
private void resize(IGraphicalEditPart op, Point p, int resizeDir, Dimension deltaSize) {
@@ -267,8 +276,9 @@ public class TestLifelineAutoResize_383723 extends TestTopNode {
req.setEditParts(op);
req.setResizeDirection(resizeDir);
req.setSizeDelta(deltaSize);
- if(resizeDir == PositionConstants.NORTH || resizeDir == PositionConstants.WEST)
+ if(resizeDir == PositionConstants.NORTH || resizeDir == PositionConstants.WEST) {
req.setMoveDelta(new Point(-deltaSize.width(), -deltaSize.height()));
+ }
Command c = op.getCommand(req);
manageResizeCommnad(op, deltaSize, c);
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestLifelineLabelCustomize_383722.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestLifelineLabelCustomize_383722.java
index 1a6148c07d4..2e6e40dad4a 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestLifelineLabelCustomize_383722.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestLifelineLabelCustomize_383722.java
@@ -89,6 +89,7 @@ public class TestLifelineLabelCustomize_383722 extends TestTopNode {
private static final String UML_REPLACEMENT_TEMPLATE = "><nestedClassifier xmi:type=\"uml:Class\" xmi:id=\"_zAqbcIP8EeGnt9CMb_JfYQ\" name=\"Person\">" + "<ownedAttribute xmi:id=\"__-RhYIP8EeGnt9CMb_JfYQ\" name=\"company\" isStatic=\"true\" type=\"_6imi4IP8EeGnt9CMb_JfYQ\"/>" + "</nestedClassifier>" + "<nestedClassifier xmi:type=\"uml:Class\" xmi:id=\"_6imi4IP8EeGnt9CMb_JfYQ\" name=\"Company\">" + "<ownedAttribute xmi:type=\"uml:Port\" xmi:id=\"_1oQd4IP-EeGnt9CMb_JfYQ\" name=\"port1\">" + "<type xmi:type=\"uml:PrimitiveType\" href=\"pathmap://UML_METAMODELS/Ecore.metamodel.uml#EShort\"/>" + "</ownedAttribute>" + "<ownedAttribute xmi:id=\"_CVUmYIP_EeGnt9CMb_JfYQ\" name=\"Property1\">" + "<type xmi:type=\"uml:PrimitiveType\" href=\"pathmap://UML_METAMODELS/Ecore.metamodel.uml#EDouble\"/>" + "</ownedAttribute>" + "</nestedClassifier>" + "</packagedElement>" + "<packageImport xmi:id=\"_q19q4YP8EeGnt9CMb_JfYQ\">" + "<importedPackage xmi:type=\"uml:Model\" href=\"pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0\"/>" + "</packageImport>";
+ @Override
protected ICreationCommand getDiagramCommandCreation() {
return new CreateSequenceDiagramCommand();
}
@@ -178,6 +179,7 @@ public class TestLifelineLabelCustomize_383722 extends TestTopNode {
protected void setLabelAppearence(final LifelineEditPart lifeline1, final int value) {
DummyCommand c = new DummyCommand() {
+ @Override
public void execute() {
View view = lifeline1.getNotationView();
EAnnotation oldAnnotation = view.getEAnnotation(CUSTOM_APPEARENCE_ANNOTATION); //VisualInformationPapyrusConstants
@@ -192,6 +194,7 @@ public class TestLifelineLabelCustomize_383722 extends TestTopNode {
getEMFCommandStack().execute(c);
}
+ @Override
protected void projectCreation() {
IWorkspace workspace = ResourcesPlugin.getWorkspace();
root = workspace.getRoot();
@@ -200,10 +203,12 @@ public class TestLifelineLabelCustomize_383722 extends TestTopNode {
this.diResourceSet = new DiResourceSet();
try {
//at this point, no resources have been created
- if(!project.exists())
+ if(!project.exists()) {
project.create(null);
- if(!project.isOpen())
+ }
+ if(!project.isOpen()) {
project.open(null);
+ }
if(file.exists()) {
file.delete(true, new NullProgressMonitor());
@@ -212,9 +217,9 @@ public class TestLifelineLabelCustomize_383722 extends TestTopNode {
if(!file.exists()) {
file.create(new ByteArrayInputStream(new byte[0]), true, new NullProgressMonitor());
diResourceSet.createsModels(file);
- new CreateUMLModelCommand().createModel((DiResourceSet)this.diResourceSet);
+ new CreateUMLModelCommand().createModel(this.diResourceSet);
ICreationCommand command = getDiagramCommandCreation();
- command.createDiagram((DiResourceSet)diResourceSet, null, "DiagramToTest");
+ command.createDiagram(diResourceSet, null, "DiagramToTest");
diResourceSet.save(new NullProgressMonitor());
}
@@ -261,8 +266,9 @@ public class TestLifelineLabelCustomize_383722 extends TestTopNode {
assertTrue(CHANGE_REPRESENTS + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, emfCommand.canExecute() == true);
getEMFCommandStack().execute(emfCommand);
waitForComplete();
- if(value != null)
+ if(value != null) {
assertTrue(CHANGE_REPRESENTS + TEST_THE_EXECUTION, lifeline.getRepresents().equals(value));
+ }
}
static class DummyCommand extends org.eclipse.emf.common.command.AbstractCommand {
@@ -273,9 +279,11 @@ public class TestLifelineLabelCustomize_383722 extends TestTopNode {
public void redo() {
}
+ @Override
public void undo() {
}
+ @Override
protected boolean prepare() {
return true;
}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMessageCreate_379661.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMessageCreate_379661.java
index f1b67a4e91f..5a1205407bf 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMessageCreate_379661.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMessageCreate_379661.java
@@ -48,6 +48,7 @@ public class TestMessageCreate_379661 extends TestLink {
private static final String MOVE = "Move: ";
+ @Override
protected ICreationCommand getDiagramCommandCreation() {
return new CreateSequenceDiagramCommand();
}
@@ -129,10 +130,12 @@ public class TestMessageCreate_379661 extends TestLink {
protected void moveLifeline(LifelineEditPart lifelineEP, Point moveDelta) {
ChangeBoundsRequest req = new ChangeBoundsRequest(RequestConstants.REQ_MOVE);
- if(moveDelta.x != 0)
+ if(moveDelta.x != 0) {
req.setResizeDirection(moveDelta.x > 0 ? PositionConstants.EAST : PositionConstants.WEST);
- if(moveDelta.y != 0)
+ }
+ if(moveDelta.y != 0) {
req.setResizeDirection(moveDelta.y > 0 ? PositionConstants.SOUTH : PositionConstants.NORTH);
+ }
req.setLocation(getAbsoluteCenter(lifelineEP));
req.setEditParts(lifelineEP);
req.setMoveDelta(moveDelta);
@@ -202,4 +205,4 @@ public class TestMessageCreate_379661 extends TestLink {
getDiagramCommandStack().execute(command);
}
-} \ No newline at end of file
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMessageEndConstraint_364817.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMessageEndConstraint_364817.java
index 0778d383d3d..f323ec986ff 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMessageEndConstraint_364817.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMessageEndConstraint_364817.java
@@ -58,10 +58,12 @@ public class TestMessageEndConstraint_364817 extends TestLink {
AbstractMessageEditPart linkEditPart = (AbstractMessageEditPart)source.getSourceConnections().get(0);
MessageEndEditPart linkEndPoint = null;
- for(Object child : linkEditPart.getChildren())
- if(child instanceof MessageEndEditPart)
- linkEndPoint = (MessageEndEditPart) child;
-
+ for(Object child : linkEditPart.getChildren()) {
+ if(child instanceof MessageEndEditPart) {
+ linkEndPoint = (MessageEndEditPart)child;
+ }
+ }
+
ConstraintEditPart constraintEditPart = (ConstraintEditPart)getRootEditPart().getChildren().get(2);
createLink(UMLElementTypes.ConstraintConstrainedElement_4011, constraintEditPart, linkEndPoint, getAbsoluteCenter(constraintEditPart), getAbsoluteCenter(linkEndPoint));
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMessageLostFound_384202.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMessageLostFound_384202.java
index 94ffff0bba8..549f9207996 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMessageLostFound_384202.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMessageLostFound_384202.java
@@ -53,6 +53,7 @@ import org.junit.Test;
*/
public class TestMessageLostFound_384202 extends TestLink {
+ @Override
protected ICreationCommand getDiagramCommandCreation() {
return new CreateSequenceDiagramCommand();
}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMovingCombinedFragment_364711.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMovingCombinedFragment_364711.java
index ebd18da07eb..717bf11c306 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMovingCombinedFragment_364711.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMovingCombinedFragment_364711.java
@@ -44,6 +44,7 @@ public class TestMovingCombinedFragment_364711 extends TestTopNode {
private static final String MOVE = "Move: ";
+ @Override
protected ICreationCommand getDiagramCommandCreation() {
return new CreateSequenceDiagramCommand();
}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestNestedCombinedFragment_364795.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestNestedCombinedFragment_364795.java
index 70ad503e4c3..16404522741 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestNestedCombinedFragment_364795.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestNestedCombinedFragment_364795.java
@@ -43,6 +43,7 @@ import org.junit.Test;
*/
public class TestNestedCombinedFragment_364795 extends TestTopNode {
+ @Override
protected ICreationCommand getDiagramCommandCreation() {
return new CreateSequenceDiagramCommand();
}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestNestedExecution_384616.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestNestedExecution_384616.java
index 6b6c1be6366..9882bdb06b8 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestNestedExecution_384616.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestNestedExecution_384616.java
@@ -50,6 +50,7 @@ public class TestNestedExecution_384616 extends TestTopNode {
private static final String MOVE = "Move: ";
+ @Override
protected ICreationCommand getDiagramCommandCreation() {
return new CreateSequenceDiagramCommand();
}
@@ -74,9 +75,9 @@ public class TestNestedExecution_384616 extends TestTopNode {
waitForComplete();
/*
- * Tips: 1. The real location of the first node would be (123, 200). 2. Make sure the bottom of nested Execution is less than the parent one.
+ * Tips: 1. The real location of the first node would be (123, 200). 2. Make sure the bottom of nested Execution is less than the parent one.
*/
-
+
createNode(elementType, lifeline1, new Point(131, 220), new Dimension(20, 40));
waitForComplete();
@@ -130,8 +131,9 @@ public class TestNestedExecution_384616 extends TestTopNode {
req.setEditParts(op);
req.setResizeDirection(resizeDir);
req.setSizeDelta(deltaSize);
- if(resizeDir == PositionConstants.NORTH || resizeDir == PositionConstants.WEST)
+ if(resizeDir == PositionConstants.NORTH || resizeDir == PositionConstants.WEST) {
req.setMoveDelta(new Point(-deltaSize.width(), -deltaSize.height()));
+ }
Command c = op.getCommand(req);
manageResizeCommnad(op, deltaSize, c);
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestObservationLink_364826.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestObservationLink_364826.java
index ec9c26cb8de..124ca2ef6f3 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestObservationLink_364826.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestObservationLink_364826.java
@@ -201,8 +201,8 @@ public class TestObservationLink_364826 extends TestLink {
}
waitForComplete();
- manageObservationLink(observation1, connPart, getAbsoluteEdgeExtremity((ConnectionNodeEditPart)connPart, true).translate(0, -5));
- manageObservationLink(observation2, connPart, getAbsoluteEdgeExtremity((ConnectionNodeEditPart)connPart, false).translate(0, -5));
+ manageObservationLink(observation1, connPart, getAbsoluteEdgeExtremity(connPart, true).translate(0, -5));
+ manageObservationLink(observation2, connPart, getAbsoluteEdgeExtremity(connPart, false).translate(0, -5));
}
@@ -240,8 +240,8 @@ public class TestObservationLink_364826 extends TestLink {
observation1 = (GraphicalEditPart)observation1.getChildren().get(0);
observation2 = (GraphicalEditPart)observation2.getChildren().get(0);
- manageObservationLink(observation1, lifeline1, getAbsoluteEdgeExtremity((ConnectionNodeEditPart)connPart, true).translate(0, -5));
- manageObservationLink(observation2, lifeline2, getAbsoluteEdgeExtremity((ConnectionNodeEditPart)connPart, false).translate(0, -5));
+ manageObservationLink(observation1, lifeline1, getAbsoluteEdgeExtremity(connPart, true).translate(0, -5));
+ manageObservationLink(observation2, lifeline2, getAbsoluteEdgeExtremity(connPart, false).translate(0, -5));
}
@@ -374,6 +374,7 @@ public class TestObservationLink_364826 extends TestLink {
return connectionRequest;
}
+ @Override
protected Point getAbsoluteCenter(IGraphicalEditPart part) {
IFigure f = part.getFigure();
Rectangle b = f.getBounds().getCopy();
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestParentBarAutoresize_385603.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestParentBarAutoresize_385603.java
index 24e37fd0a22..64dec76ac43 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestParentBarAutoresize_385603.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestParentBarAutoresize_385603.java
@@ -35,16 +35,18 @@ import org.eclipse.papyrus.uml.diagram.sequence.tests.canonical.TestTopNode;
import org.junit.Test;
/**
- * When childs are outside the current size, the parent bar should autoresize. The parent should always wrap the children.
+ * When childs are outside the current size, the parent bar should autoresize. The parent should always wrap the children.
* Its size should be extended when we create, move, resize and reparent a child
* https://bugs.eclipse.org/bugs/show_bug.cgi?id=385603
- *
+ *
*/
public class TestParentBarAutoresize_385603 extends TestTopNode {
+
private static final String RESIZE = "Resize: ";
-
+
private static final String MOVE = "Move: ";
-
+
+ @Override
protected ICreationCommand getDiagramCommandCreation() {
return new CreateSequenceDiagramCommand();
}
@@ -53,22 +55,22 @@ public class TestParentBarAutoresize_385603 extends TestTopNode {
public void testActionExecutionSpecificationUp() {
moveUp(UMLElementTypes.ActionExecutionSpecification_3006);
}
-
+
@Test
public void testActionExecutionSpecificationDown() {
moveDown(UMLElementTypes.ActionExecutionSpecification_3006);
}
-
+
@Test
public void testBehaviorExecutionSpecificationDown() {
moveDown(UMLElementTypes.BehaviorExecutionSpecification_3003);
}
-
+
@Test
public void testBehaviorExecutionSpecificationUp() {
moveUp(UMLElementTypes.BehaviorExecutionSpecification_3003);
}
-
+
private void moveUp(IElementType elementType) {
createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), new Dimension(62, 300));
final LifelineEditPart lifeline1 = (LifelineEditPart)getRootEditPart().getChildren().get(0);
@@ -79,17 +81,17 @@ public class TestParentBarAutoresize_385603 extends TestTopNode {
waitForComplete();
IGraphicalEditPart parent = (IGraphicalEditPart)lifeline1.getChildren().get(1);
Rectangle before = getAbsoluteBounds(parent);
-
+
// create child
/* With location (131, 270), the new Execution will not the child of parent. */
createNode(elementType, lifeline1, new Point(131, 310), new Dimension(20, 40));
waitForComplete();
IGraphicalEditPart child = (IGraphicalEditPart)lifeline1.getChildren().get(2);
-
+
//The parent will not be expand when creation.
assertTrue(RESIZE + TEST_THE_EXECUTION, getAbsoluteBounds(parent).getTop().y == before.getTop().y);
assertTrue(RESIZE + TEST_THE_EXECUTION, getAbsoluteBounds(parent).height == before.height);
-
+
// move up
before = getAbsoluteBounds(parent);
Point moveDelta = new Point(0, -20);
@@ -101,13 +103,13 @@ public class TestParentBarAutoresize_385603 extends TestTopNode {
* assertTrue(MOVE + TEST_THE_EXECUTION, getAbsoluteBounds(parent).getTop().y - before.getTop().y == moveDelta.y);
*/
assertTrue(MOVE + TEST_THE_EXECUTION, getAbsoluteBounds(parent).getTop().y <= getAbsoluteBounds(child).getTop().y);
-
+
// resize
before = getAbsoluteBounds(parent);
Dimension deltaSize = new Dimension(0, 20);
resize(child, getAbsoluteBounds(child).getTop(), PositionConstants.NORTH, deltaSize);
assertTrue(MOVE + TEST_THE_EXECUTION, getAbsoluteBounds(parent).getTop().y == getAbsoluteBounds(child).getTop().y);
- assertTrue(MOVE + TEST_THE_EXECUTION, getAbsoluteBounds(parent).height - before.height == deltaSize.height);
+ assertTrue(MOVE + TEST_THE_EXECUTION, getAbsoluteBounds(parent).height - before.height == deltaSize.height);
}
private void moveDown(IElementType elementType) {
@@ -120,7 +122,7 @@ public class TestParentBarAutoresize_385603 extends TestTopNode {
waitForComplete();
IGraphicalEditPart parent = (IGraphicalEditPart)lifeline1.getChildren().get(1);
Rectangle before = getAbsoluteBounds(parent);
-
+
// create child
createNode(elementType, lifeline1, before.getRight().getTranslated(-1, 0), new Dimension(20, 50));
waitForComplete();
@@ -133,53 +135,54 @@ public class TestParentBarAutoresize_385603 extends TestTopNode {
* assertTrue(RESIZE + TEST_THE_EXECUTION, getAbsoluteBounds(parent).getBottom().y == getAbsoluteBounds(child).getBottom().y);
*/
assertTrue(RESIZE + TEST_THE_EXECUTION, getAbsoluteBounds(parent).getBottom().y == before.getBottom().y);
-
+
// move
before = getAbsoluteBounds(parent);
Point moveDelta = new Point(0, 20);
move(child, moveDelta);
- assertTrue(MOVE + TEST_THE_EXECUTION, before.getLocation().equals(getAbsoluteBounds(parent).getLocation() ));
-
+ assertTrue(MOVE + TEST_THE_EXECUTION, before.getLocation().equals(getAbsoluteBounds(parent).getLocation()));
+
/*
* The height of parent will not be changed when move down child.
* assertTrue(MOVE + TEST_THE_EXECUTION, before.height + moveDelta.y == getAbsoluteBounds(parent).height);
* assertTrue(MOVE + TEST_THE_EXECUTION, getAbsoluteBounds(parent).getBottom().y == getAbsoluteBounds(child).getBottom().y);
*/
- assertTrue(MOVE + TEST_THE_EXECUTION, before.height == getAbsoluteBounds(parent).height);
-
+ assertTrue(MOVE + TEST_THE_EXECUTION, before.height == getAbsoluteBounds(parent).height);
+
// resize
before = getAbsoluteBounds(parent);
Dimension deltaSize = new Dimension(0, 30);
resize(child, getAbsoluteBounds(child).getBottom(), PositionConstants.SOUTH, deltaSize);
-
+
/*
* parent would not be changed.
*
* assertTrue(RESIZE + TEST_THE_EXECUTION, getAbsoluteBounds(parent).getBottom().y == getAbsoluteBounds(child).getBottom().y);
* assertTrue(RESIZE + TEST_THE_EXECUTION, getAbsoluteBounds(parent).height == before.height + deltaSize.height);
*/
- assertTrue(RESIZE + TEST_THE_EXECUTION, getAbsoluteBounds(parent).getTop().equals( before.getTop() ));
-
+ assertTrue(RESIZE + TEST_THE_EXECUTION, getAbsoluteBounds(parent).getTop().equals(before.getTop()));
+
// move parent will move child bar
before = getAbsoluteBounds(child);
move(parent, moveDelta);
- assertTrue(MOVE + TEST_THE_EXECUTION, getAbsoluteBounds(child).x - before.x == moveDelta.x );
- assertTrue(MOVE + TEST_THE_EXECUTION, getAbsoluteBounds(child).y - before.y == moveDelta.y );
-
+ assertTrue(MOVE + TEST_THE_EXECUTION, getAbsoluteBounds(child).x - before.x == moveDelta.x);
+ assertTrue(MOVE + TEST_THE_EXECUTION, getAbsoluteBounds(child).y - before.y == moveDelta.y);
+
// resize parent will not resize child
before = getAbsoluteBounds(child);
resize(parent, getAbsoluteBounds(parent).getBottom(), PositionConstants.SOUTH, deltaSize);
- assertTrue(RESIZE + TEST_THE_EXECUTION, getAbsoluteBounds(child).equals( before ));
+ assertTrue(RESIZE + TEST_THE_EXECUTION, getAbsoluteBounds(child).equals(before));
}
-
+
private void resize(IGraphicalEditPart op, Point p, int resizeDir, Dimension deltaSize) {
ChangeBoundsRequest req = new ChangeBoundsRequest(RequestConstants.REQ_RESIZE);
req.setLocation(p);
req.setEditParts(op);
req.setResizeDirection(resizeDir);
req.setSizeDelta(deltaSize);
- if(resizeDir == PositionConstants.NORTH || resizeDir == PositionConstants.WEST)
+ if(resizeDir == PositionConstants.NORTH || resizeDir == PositionConstants.WEST) {
req.setMoveDelta(new Point(-deltaSize.width(), -deltaSize.height()));
+ }
Command c = op.getCommand(req);
assertNotNull(RESIZE + COMMAND_NULL, c);
@@ -187,12 +190,12 @@ public class TestParentBarAutoresize_385603 extends TestTopNode {
Rectangle before = getAbsoluteBounds(op);
getEMFCommandStack().execute(new GEFtoEMFCommandWrapper(c));
waitForComplete();
-
+
Rectangle after = getAbsoluteBounds(op);
assertTrue(RESIZE + TEST_THE_EXECUTION, after.width() - before.width() == deltaSize.width());
assertTrue(RESIZE + TEST_THE_EXECUTION, after.height() - before.height() == deltaSize.height());
}
-
+
protected void move(IGraphicalEditPart part, Point moveDelta) {
ChangeBoundsRequest req = new ChangeBoundsRequest(RequestConstants.REQ_MOVE);
req.setResizeDirection(moveDelta.y > 0 ? PositionConstants.SOUTH : PositionConstants.NORTH);
@@ -204,9 +207,9 @@ public class TestParentBarAutoresize_385603 extends TestTopNode {
assertNotNull(MOVE + COMMAND_NULL, command);
assertTrue(MOVE + TEST_IF_THE_COMMAND_CAN_BE_EXECUTED, command.canExecute() == true);
getEMFCommandStack().execute(new GEFtoEMFCommandWrapper(command));
- waitForComplete();
+ waitForComplete();
}
-
+
public void createNode(IElementType type, EditPart parentPart, Point location, Dimension size) {
//CREATION
CreateViewRequest requestcreation = CreateViewRequestFactory.getCreateShapeRequest(type, getRootEditPart().getDiagramPreferencesHint());
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestSynchronousMessageCreation_364827.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestSynchronousMessageCreation_364827.java
index 54607629999..b3efb157651 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestSynchronousMessageCreation_364827.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestSynchronousMessageCreation_364827.java
@@ -53,10 +53,10 @@ public class TestSynchronousMessageCreation_364827 extends TestLink {
public void selectActionExecution(IElementType sourceType, IElementType targetType, IElementType linkType, IElementType subNodeType) {
installEnvironment(sourceType, targetType, subNodeType);
target = createSubNode(target, subNodeType, getAbsoluteCenter(target));
-
+
assertTrue(CREATION + TEST_THE_EXECUTION, target instanceof ActionExecutionSpecificationEditPart);
-// assertTrue(CREATION + INITIALIZATION_TEST, target.getChildren().size() == 1);
+ // assertTrue(CREATION + INITIALIZATION_TEST, target.getChildren().size() == 1);
waitForComplete();
PopupUtil.addMenuListener(0);
createLink(linkType, source, target, getAbsoluteCenter(source), getAbsoluteCenter(target).translate(0, 60));
@@ -66,7 +66,7 @@ public class TestSynchronousMessageCreation_364827 extends TestLink {
AbstractMessageEditPart p = (AbstractMessageEditPart)source.getSourceConnections().get(0);
assertTrue(CREATION + TEST_THE_EXECUTION, ((View)p.getModel()).getType().equals(((IHintedType)linkType).getSemanticHint()));
-// assertTrue(CREATION + TEST_THE_EXECUTION, target.getChildren().size() == 2); // LifelineNameEditPart
+ // assertTrue(CREATION + TEST_THE_EXECUTION, target.getChildren().size() == 2); // LifelineNameEditPart
assertTrue(CREATION + TEST_THE_EXECUTION, target instanceof ActionExecutionSpecificationEditPart);
getDiagramCommandStack().undo();
@@ -83,7 +83,7 @@ public class TestSynchronousMessageCreation_364827 extends TestLink {
target = createSubNode(target, subNodeType, getAbsoluteCenter(target));
assertTrue(CREATION + TEST_THE_EXECUTION, target instanceof BehaviorExecutionSpecificationEditPart);
-// assertTrue(CREATION + INITIALIZATION_TEST, target.getChildren().size() == 1);
+ // assertTrue(CREATION + INITIALIZATION_TEST, target.getChildren().size() == 1);
waitForComplete();
PopupUtil.addMenuListener(1);
createLink(linkType, source, target, getAbsoluteCenter(source), getAbsoluteCenter(target).translate(0, 60));
@@ -93,7 +93,7 @@ public class TestSynchronousMessageCreation_364827 extends TestLink {
AbstractMessageEditPart p = (AbstractMessageEditPart)source.getSourceConnections().get(0);
assertTrue(CREATION + TEST_THE_EXECUTION, ((View)p.getModel()).getType().equals(((IHintedType)linkType).getSemanticHint()));
-// assertTrue(CREATION + TEST_THE_EXECUTION, target.getChildren().size() == 2);
+ // assertTrue(CREATION + TEST_THE_EXECUTION, target.getChildren().size() == 2);
getDiagramCommandStack().undo();
assertTrue(CREATION + TEST_THE_UNDO, source.getSourceConnections().size() == 0);
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/canonical/TestChildNode.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/canonical/TestChildNode.java
index c170c0c1e9e..62557f0c4db 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/canonical/TestChildNode.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/canonical/TestChildNode.java
@@ -50,10 +50,12 @@ public abstract class TestChildNode extends AbstractPapyrusTestCase {
return rootPart;
}
+ @Override
protected View getRootView() {
return getRootEditPart().getNotationView();
}
+ @Override
protected Element getRootSemanticModel() {
return (Element)getRootView().getElement();
}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/canonical/TestSequenceDiagramTopNode.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/canonical/TestSequenceDiagramTopNode.java
index 245258a6732..3ad071cb0f1 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/canonical/TestSequenceDiagramTopNode.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/canonical/TestSequenceDiagramTopNode.java
@@ -53,23 +53,23 @@ public class TestSequenceDiagramTopNode extends TestTopNode {
testToManageTopNode(UMLElementTypes.InteractionUse_3002, provider);
}
-// @Test
-// public void testToManageConsiderIgnoreFragment() { // popup menu when delete
-// PopupUtil.addMenuListener(0);
-// testToManageTopNode(UMLElementTypes.ConsiderIgnoreFragment_3007, provider);
-//
-// waitForComplete();
-// PopupUtil.removeMenuListener();
-// }
-//
-// @Test
-// public void testToManageCombinedFragment() { // popup menu when delete
-// PopupUtil.addMenuListener(0);
-// testToManageTopNode(UMLElementTypes.CombinedFragment_3004, provider);
-//
-// waitForComplete();
-// PopupUtil.removeMenuListener();
-// }
+ // @Test
+ // public void testToManageConsiderIgnoreFragment() { // popup menu when delete
+ // PopupUtil.addMenuListener(0);
+ // testToManageTopNode(UMLElementTypes.ConsiderIgnoreFragment_3007, provider);
+ //
+ // waitForComplete();
+ // PopupUtil.removeMenuListener();
+ // }
+ //
+ // @Test
+ // public void testToManageCombinedFragment() { // popup menu when delete
+ // PopupUtil.addMenuListener(0);
+ // testToManageTopNode(UMLElementTypes.CombinedFragment_3004, provider);
+ //
+ // waitForComplete();
+ // PopupUtil.removeMenuListener();
+ // }
@Test
public void testToManageTimeObservation() {

Back to the top