Bug 467484 : [Test]: regression

https://hudson.eclipse.org/papyrus/view/Mars/job/Papyrus-Master-Tests/1010/testReport/org.eclipse.papyrus.uml.diagram.sequence.tests.bug.pro20130916/Fixbug_LifelineManagement_417365/testResizeLifelineAfterStereotypeApplied/

- integration of correction detected by Celine J.
- integration of Camille remarks
- reactivation of all test in Fixbug_LifelineManagement_417365
- find a hack to split test
- find a hack for anchor management

Change-Id: I7835d4f96f5c09ed996a3bb526447c0a97ddc73c
Signed-off-by: Francois Le Fevre - CEA <francois.le-fevre@cea.fr>

3 files changed, 102 insertions, 78 deletions

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/PreserveAnchorsPositionCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/PreserveAnchorsPositionCommand.java
index 046fbf6249d..9d95b6d580e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/PreserveAnchorsPositionCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/commands/PreserveAnchorsPositionCommand.java
@@ -258,6 +258,9 @@ public class PreserveAnchorsPositionCommand extends AbstractTransactionalCommand
 		Rectangle figureBounds = getFigureBounds();
 
 		PrecisionPoint pp = BaseSlidableAnchor.parseTerminalString(anchor.getId());
+		if(pp==null){
+			pp= new PrecisionPoint();
+		}
 
 		if (getPreserveAxis() == PRESERVE_Y || getPreserveAxis() == PRESERVE_XY) {
 			int anchorYPos = (int) Math.round(figureBounds.height * pp.preciseY());
@@ -350,6 +353,9 @@ public class PreserveAnchorsPositionCommand extends AbstractTransactionalCommand
 		}
 
 		PrecisionPoint pp = BaseSlidableAnchor.parseTerminalString(anchor.getId());
+		if(pp==null){
+			pp= new PrecisionPoint();
+		}
 
 		int margin = 6;
 
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/AbstractNodeTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/AbstractNodeTest.java
index cda75958f7d..9242529eb03 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/AbstractNodeTest.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/m7/AbstractNodeTest.java
@@ -259,6 +259,13 @@ public abstract class AbstractNodeTest extends TestTopNode {
 		EditPart targetEditPart = currentViewer.findObjectAtExcluding(endLocation, Collections.emptySet(), getTargetingConditional(request));;

 		return createLink(elementType, currentViewer, startLocation, sourceEditPart, endLocation, targetEditPart);

 	}

+	

+	protected EditPart createLink(IElementType elementType, EditPartViewer currentViewer, EditPart sourceEditPart, EditPart targetEditPart) {

+		Point startLocation = null;

+		Point endLocation = null;

+		

+		return createLink(elementType, currentViewer, startLocation, sourceEditPart, endLocation, targetEditPart);

+	}

 

 	protected EditPart createLink(IElementType elementType, EditPartViewer currentViewer, Point startLocation, EditPart sourceEditPart, Point endLocation, EditPart targetEditPart) {

 		assertNotNull("IElementType is null: ", elementType);

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/Fixbug_LifelineManagement_417365.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/Fixbug_LifelineManagement_417365.java
index e8f7a74fe20..798103149c5 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/Fixbug_LifelineManagement_417365.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/pro20130916/Fixbug_LifelineManagement_417365.java
@@ -20,6 +20,7 @@ import static org.junit.Assert.assertTrue;
 

 import org.eclipse.draw2d.Connection;

 import org.eclipse.draw2d.FigureCanvas;

+import org.eclipse.draw2d.PositionConstants;

 import org.eclipse.draw2d.RectangleFigure;

 import org.eclipse.draw2d.geometry.Dimension;

 import org.eclipse.draw2d.geometry.Point;

@@ -111,74 +112,74 @@ public class Fixbug_LifelineManagement_417365 extends BaseStereotypesTest {
 	 * Create Test Diagram.

 	 */

 	protected void prepareDiagram() {

-		// Create Lifelines

-		lifeline1 = (LifelineEditPart) createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), new Dimension(100, 800));

-		lifeline2 = (LifelineEditPart) createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(300, 100), new Dimension(100, 800));

-		lifeline3 = (LifelineEditPart) createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(500, 100), null);

+		//Create Lifelines

+		lifeline1 = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(100, 100), new Dimension(100, 800));

+		lifeline2 = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(300, 100), new Dimension(100, 800));

+		lifeline3 = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(500, 100), null);

 

 		int y = 120;

-		// Create message from Interaction to Lifeline1.

-		InteractionEditPart interaction = (InteractionEditPart) getRootEditPart().getParent();

+		//Create message from Interaction to Lifeline1.

+		InteractionEditPart interaction = (InteractionEditPart)getRootEditPart().getParent();

 		Rectangle interactionBounds = SequenceUtil.getAbsoluteBounds(interaction);

 		Rectangle lifeline1Bounds = SequenceUtil.getAbsoluteBounds(lifeline1);

 		Point pt = lifeline1Bounds.getCenter();

-		message1 = (AbstractMessageEditPart) createLink(UMLElementTypes.Message_4004, lifeline1.getViewer(), new Point(0, y - 1), interaction, new Point(pt.x, y), lifeline1);

+		message1 = (AbstractMessageEditPart)createLink(UMLElementTypes.Message_4004, lifeline1.getViewer(), new Point(0, y - 1), interaction, new Point(pt.x, y), lifeline1);

 

-		// Create ExecutionSpecification on lifeline1 and Lifeline2

+		//Create ExecutionSpecification on lifeline1 and Lifeline2

 		y += 20;

-		AbstractExecutionSpecificationEditPart execution1 = (AbstractExecutionSpecificationEditPart) createNode(UMLElementTypes.ActionExecutionSpecification_3006, lifeline1, new Point(pt.x, y), null);

-		AbstractExecutionSpecificationEditPart execution2 = (AbstractExecutionSpecificationEditPart) createNode(UMLElementTypes.ActionExecutionSpecification_3006, lifeline2, SequenceUtil.getAbsoluteBounds(lifeline2).getCenter().setY(y), null);

+		AbstractExecutionSpecificationEditPart execution1 = (AbstractExecutionSpecificationEditPart)createNode(UMLElementTypes.ActionExecutionSpecification_3006, lifeline1, new Point(pt.x, y), null);

+		AbstractExecutionSpecificationEditPart execution2 = (AbstractExecutionSpecificationEditPart)createNode(UMLElementTypes.ActionExecutionSpecification_3006, lifeline2, SequenceUtil.getAbsoluteBounds(lifeline2).getCenter().setY(y), null);

 

-		// Create Message between execution1 and execution2.

-		message2 = (AbstractMessageEditPart) createLink(UMLElementTypes.Message_4003, lifeline1.getViewer(), SequenceUtil.getAbsoluteBounds(execution1).getTop(), execution1, SequenceUtil.getAbsoluteBounds(execution2).getTop(), execution2);

-		message3 = (AbstractMessageEditPart) createLink(UMLElementTypes.Message_4004, lifeline1.getViewer(), SequenceUtil.getAbsoluteBounds(execution2).getBottom(), execution2, SequenceUtil.getAbsoluteBounds(execution1).getBottom(), execution1);

+		//Create Message between execution1 and execution2.

+		message2 = (AbstractMessageEditPart)createLink(UMLElementTypes.Message_4003, lifeline1.getViewer(), SequenceUtil.getAbsoluteBounds(execution1).getTop(), execution1, SequenceUtil.getAbsoluteBounds(execution2).getTop(), execution2);

+		message3 = (AbstractMessageEditPart)createLink(UMLElementTypes.Message_4004, lifeline1.getViewer(), SequenceUtil.getAbsoluteBounds(execution2).getBottom(), execution2, SequenceUtil.getAbsoluteBounds(execution1).getBottom(), execution1);

 

-		// Create Message from execution2 to Lifeline3

+		//Create Message from execution2 to Lifeline3

 		y = SequenceUtil.getAbsoluteBounds(execution2).getCenter().y;

-		message4 = (AbstractMessageEditPart) createLink(UMLElementTypes.Message_4004, lifeline1.getViewer(), SequenceUtil.getAbsoluteBounds(execution2).getCenter(), execution2, SequenceUtil.getAbsoluteBounds(lifeline3).getCenter().translate(0, 1), lifeline3);

+		message4 = (AbstractMessageEditPart)createLink(UMLElementTypes.Message_4004, lifeline1.getViewer(), SequenceUtil.getAbsoluteBounds(execution2).getCenter(), execution2, SequenceUtil.getAbsoluteBounds(lifeline3).getCenter().setY(y + 1), lifeline3);

 

-		lifeline4 = (LifelineEditPart) createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(650, 100), new Dimension(70, 100));

-		// Create Message Create from lifeline3 to lifeline4

+		lifeline4 = (LifelineEditPart)createNode(UMLElementTypes.Lifeline_3001, getRootEditPart(), new Point(650, 100), new Dimension(70, 100));

+		//Create Message Create from lifeline3 to lifeline4

 		y += 20;

-		message5 = (AbstractMessageEditPart) createLink(UMLElementTypes.Message_4006, lifeline1.getViewer(), SequenceUtil.getAbsoluteBounds(lifeline3).getCenter().setY(y), lifeline3, SequenceUtil.getAbsoluteBounds(lifeline4).getTop(), lifeline4);

+		message5 = (AbstractMessageEditPart)createLink(UMLElementTypes.Message_4006, lifeline1.getViewer(), SequenceUtil.getAbsoluteBounds(lifeline3).getCenter().setY(y), lifeline3, SequenceUtil.getAbsoluteBounds(lifeline4).getTop(), lifeline4);

 

-		// Create message from interaction to lifeline4

+		//Create message  from interaction to lifeline4

 		y += 40;

-		message6 = (AbstractMessageEditPart) createLink(UMLElementTypes.Message_4004, lifeline1.getViewer(), interactionBounds.getRight().setY(y).translate(0, -1), interaction, SequenceUtil.getAbsoluteBounds(lifeline4).getCenter().setY(y), lifeline4);

-

-		// Create message found and message lost

+		//message6 = (AbstractMessageEditPart)createLink(UMLElementTypes.Message_4004, lifeline1.getViewer(), interactionBounds.getRight().setY(y).translate(0, -1), interaction, SequenceUtil.getAbsoluteBounds(lifeline4).getCenter().setY(y), lifeline4);

+		message6 = (AbstractMessageEditPart)createLink(UMLElementTypes.Message_4004, lifeline1.getViewer(), new Point(interactionBounds.right(), y - 1), interaction, SequenceUtil.getAbsoluteBounds(lifeline4).getCenter().setY(y), lifeline4);

+		

+		 

+		//Create message found and message lost

 		y += 20;

-		message7 = (AbstractMessageEditPart) createLink(UMLElementTypes.Message_4009, lifeline1.getViewer(), SequenceUtil.getAbsoluteBounds(lifeline3).getCenter().setY(y).getTranslated(-80, 0), interaction, SequenceUtil.getAbsoluteBounds(lifeline3)

-				.getCenter().setY(y), lifeline3);

+		message7 = (AbstractMessageEditPart)createLink(UMLElementTypes.Message_4009, lifeline1.getViewer(), SequenceUtil.getAbsoluteBounds(lifeline3).getCenter().setY(y).getTranslated(-80, 0), interaction, SequenceUtil.getAbsoluteBounds(lifeline3).getCenter().setY(y), lifeline3);

 		y += 20;

-		message8 = (AbstractMessageEditPart) createLink(UMLElementTypes.Message_4008, lifeline1.getViewer(), SequenceUtil.getAbsoluteBounds(lifeline3).getCenter().setY(y), lifeline3,

-				SequenceUtil.getAbsoluteBounds(lifeline3).getCenter().setY(y).getTranslated(250, 1), interaction);

+		message8 = (AbstractMessageEditPart)createLink(UMLElementTypes.Message_4008, lifeline1.getViewer(), SequenceUtil.getAbsoluteBounds(lifeline3).getCenter().setY(y), lifeline3, SequenceUtil.getAbsoluteBounds(lifeline3).getCenter().setY(y).getTranslated(250, 1), interaction);

 

-		// Create CombinedFragment

-		CombinedFragmentEditPart combinedFragment = (CombinedFragmentEditPart) createNode(UMLElementTypes.CombinedFragment_3004, getRootEditPart(), new Point(50, 300), new Dimension(500, 200));

-		CombinedFragmentCombinedFragmentCompartmentEditPart compartment = (CombinedFragmentCombinedFragmentCompartmentEditPart) combinedFragment.getChildBySemanticHint(CombinedFragmentCombinedFragmentCompartmentEditPart.VISUAL_ID + "");

-		InteractionOperandEditPart firstOperand = (InteractionOperandEditPart) compartment.getPrimaryChildEditPart();

-		InteractionOperandEditPart secondOperand = (InteractionOperandEditPart) createNode(UMLElementTypes.InteractionOperand_3005, compartment, SequenceUtil.getAbsoluteBounds(combinedFragment).getCenter(), null);

+		//Create CombinedFragment

+		CombinedFragmentEditPart combinedFragment = (CombinedFragmentEditPart)createNode(UMLElementTypes.CombinedFragment_3004, getRootEditPart(), new Point(50, 300), new Dimension(500, 200));

+		CombinedFragmentCombinedFragmentCompartmentEditPart compartment = (CombinedFragmentCombinedFragmentCompartmentEditPart)combinedFragment.getChildBySemanticHint(CombinedFragmentCombinedFragmentCompartmentEditPart.VISUAL_ID + "");

+		InteractionOperandEditPart firstOperand = (InteractionOperandEditPart)compartment.getPrimaryChildEditPart();

+		InteractionOperandEditPart secondOperand = (InteractionOperandEditPart)createNode(UMLElementTypes.InteractionOperand_3005, compartment, SequenceUtil.getAbsoluteBounds(combinedFragment).getCenter(), null);

 

-		// create message in firstOperand

+		//create message in firstOperand

 		y = SequenceUtil.getAbsoluteBounds(firstOperand).getCenter().y;

-		AbstractExecutionSpecificationEditPart execution3 = (AbstractExecutionSpecificationEditPart) createNode(UMLElementTypes.ActionExecutionSpecification_3006, lifeline1, new Point(pt.x, y), null);

-		AbstractExecutionSpecificationEditPart execution4 = (AbstractExecutionSpecificationEditPart) createNode(UMLElementTypes.ActionExecutionSpecification_3006, lifeline2, SequenceUtil.getAbsoluteBounds(lifeline2).getCenter().setY(y), null);

-		// Create Message between execution1 and execution2.

-		message9 = (AbstractMessageEditPart) createLink(UMLElementTypes.Message_4003, lifeline1.getViewer(), SequenceUtil.getAbsoluteBounds(execution3).getTop(), execution3, SequenceUtil.getAbsoluteBounds(execution4).getTop(), execution4);

-		message10 = (AbstractMessageEditPart) createLink(UMLElementTypes.Message_4004, lifeline1.getViewer(), SequenceUtil.getAbsoluteBounds(execution4).getBottom(), execution4, SequenceUtil.getAbsoluteBounds(execution3).getBottom(), execution3);

+		AbstractExecutionSpecificationEditPart execution3 = (AbstractExecutionSpecificationEditPart)createNode(UMLElementTypes.ActionExecutionSpecification_3006, lifeline1, new Point(pt.x, y), null);

+		AbstractExecutionSpecificationEditPart execution4 = (AbstractExecutionSpecificationEditPart)createNode(UMLElementTypes.ActionExecutionSpecification_3006, lifeline2, SequenceUtil.getAbsoluteBounds(lifeline2).getCenter().setY(y), null);

+		//Create Message between execution1 and execution2.

+		message9 = (AbstractMessageEditPart)createLink(UMLElementTypes.Message_4003, lifeline1.getViewer(), SequenceUtil.getAbsoluteBounds(execution3).getTop(), execution3, SequenceUtil.getAbsoluteBounds(execution4).getTop(), execution4);

+		message10 = (AbstractMessageEditPart)createLink(UMLElementTypes.Message_4004, lifeline1.getViewer(), SequenceUtil.getAbsoluteBounds(execution4).getBottom(), execution4, SequenceUtil.getAbsoluteBounds(execution3).getBottom(), execution3);

 

-		// create message in secondOperand

+		//create message in secondOperand

 		y = SequenceUtil.getAbsoluteBounds(secondOperand).getCenter().y;

-		message11 = (AbstractMessageEditPart) createLink(UMLElementTypes.Message_4004, lifeline1.getViewer(), SequenceUtil.getAbsoluteBounds(lifeline1).getCenter().setY(y), lifeline1, SequenceUtil.getAbsoluteBounds(lifeline2).getCenter().setY(y + 1),

-				lifeline2);

+		message11 = (AbstractMessageEditPart)createLink(UMLElementTypes.Message_4004, lifeline1.getViewer(), SequenceUtil.getAbsoluteBounds(lifeline1).getCenter().setY(y), lifeline1, SequenceUtil.getAbsoluteBounds(lifeline2).getCenter().setY(y + 1), lifeline2);

+		//message11 = (AbstractMessageEditPart)createLink(UMLElementTypes.Message_4004, lifeline1.getViewer(), new Point(SequenceUtil.getAbsoluteBounds(lifeline1).right(), y), lifeline1, SequenceUtil.getAbsoluteBounds(lifeline2).getCenter().setY(y + 1), lifeline2);

 

-		// Create message between Interaction and CombinedFragment

+		//Create message between Interaction and CombinedFragment

 		y = SequenceUtil.getAbsoluteBounds(combinedFragment).getLeft().y;

-		message12 = (AbstractMessageEditPart) createLink(UMLElementTypes.Message_4004, lifeline1.getViewer(), new Point(0, y - 1), interaction, SequenceUtil.getAbsoluteBounds(combinedFragment).getLeft(), combinedFragment);

+		message12 = (AbstractMessageEditPart)createLink(UMLElementTypes.Message_4004, lifeline1.getViewer(), new Point(0, y - 1), interaction, SequenceUtil.getAbsoluteBounds(combinedFragment).getLeft(), combinedFragment);

 

 		y = SequenceUtil.getAbsoluteBounds(combinedFragment).getRight().y;

-		message13 = (AbstractMessageEditPart) createLink(UMLElementTypes.Message_4004, lifeline1.getViewer(), new Point(interactionBounds.right(), y - 1), interaction, SequenceUtil.getAbsoluteBounds(combinedFragment).getRight(), combinedFragment);

+		message13 = (AbstractMessageEditPart)createLink(UMLElementTypes.Message_4004, lifeline1.getViewer(), new Point(interactionBounds.right(), y - 1), interaction, SequenceUtil.getAbsoluteBounds(combinedFragment).getRight(), combinedFragment);

 

 		waitForComplete();

 		validateMessageHorizontally();

@@ -205,17 +206,17 @@ public class Fixbug_LifelineManagement_417365 extends BaseStereotypesTest {
 

 	private void validateMessageHorizontally(AbstractMessageEditPart message) {

 		assertNotNull("message", message);

-		// waitForComplete();

-		// message.refresh();

-		// waitForComplete();

+		waitForComplete();

+		message.refresh();

+		waitForComplete();

 		Connection conn = message.getConnectionFigure();

 		PointList points = conn.getPoints();

 		int start = points.getFirstPoint().y;

 		int end = points.getLastPoint().y;

 		EObject obj = message.resolveSemanticElement();

 		String name = "";

-		if (obj instanceof Message) {

-			name = ((Message) obj).getName();

+		if(obj instanceof Message) {

+			name = ((Message)obj).getName();

 		}

 		assertEquals("message horizontal position<" + name + ">", end, start);

 	}

@@ -242,53 +243,52 @@ public class Fixbug_LifelineManagement_417365 extends BaseStereotypesTest {
 		return figureLifelineNameContainerFigure.getBounds().bottom();

 	}

 

-	@InvalidTest("Platform-specific failure")

 	@Test

 	public void testFontChanged() {

 		try {

-			// Increase height of font for lifeline1

-			for (int i = 1; i < FONT_HEIGHTS.length; i++) {

+			//Increase height of font for lifeline1

+			for(int i = 1; i < FONT_HEIGHTS.length; i++) {

 				int height = FONT_HEIGHTS[i];

 				testChangeFontHeight(lifeline1, height);

 			}

-			// Decrease height of font for lifeline1

-			for (int i = FONT_HEIGHTS.length - 2; i >= 0; i--) {

+			//Decrease height of font for lifeline1

+			for(int i = FONT_HEIGHTS.length - 2; i >= 0; i--) {

 				int height = FONT_HEIGHTS[i];

 				testChangeFontHeight(lifeline1, height);

 			}

 

 			panViewerTo(lifeline2);

-			// Increase height of font for lifeline2

-			for (int i = 1; i < FONT_HEIGHTS.length; i++) {

+			//Increase height of font for lifeline2

+			for(int i = 1; i < FONT_HEIGHTS.length; i++) {

 				int height = FONT_HEIGHTS[i];

 				testChangeFontHeight(lifeline2, height);

 			}

-			// Decrease height of font for lifeline2

-			for (int i = FONT_HEIGHTS.length - 2; i >= 0; i--) {

+			//Decrease height of font for lifeline2

+			for(int i = FONT_HEIGHTS.length - 2; i >= 0; i--) {

 				int height = FONT_HEIGHTS[i];

 				testChangeFontHeight(lifeline2, height);

 			}

 

 			panViewerTo(lifeline3);

-			// Increase height of font for lifeline3

-			for (int i = 1; i < FONT_HEIGHTS.length; i++) {

+			//Increase height of font for lifeline3

+			for(int i = 1; i < FONT_HEIGHTS.length; i++) {

 				int height = FONT_HEIGHTS[i];

 				testChangeFontHeight(lifeline3, height);

 			}

-			// Decrease height of font for lifeline3

-			for (int i = FONT_HEIGHTS.length - 2; i >= 0; i--) {

+			//Decrease height of font for lifeline3

+			for(int i = FONT_HEIGHTS.length - 2; i >= 0; i--) {

 				int height = FONT_HEIGHTS[i];

 				testChangeFontHeight(lifeline3, height);

 			}

 

 			panViewerTo(lifeline4);

-			// Increase height of font for lifeline4

-			for (int i = 1; i < FONT_HEIGHTS.length; i++) {

+			//Increase height of font for lifeline4

+			for(int i = 1; i < FONT_HEIGHTS.length; i++) {

 				int height = FONT_HEIGHTS[i];

 				testChangeFontHeight(lifeline4, height);

 			}

-			// Decrease height of font for lifeline4

-			for (int i = FONT_HEIGHTS.length - 2; i >= 0; i--) {

+			//Decrease height of font for lifeline4

+			for(int i = FONT_HEIGHTS.length - 2; i >= 0; i--) {

 				int height = FONT_HEIGHTS[i];

 				testChangeFontHeight(lifeline4, height);

 			}

@@ -309,25 +309,28 @@ public class Fixbug_LifelineManagement_417365 extends BaseStereotypesTest {
 		validateAll();

 	}

 

-	@InvalidTest("Platform-specific failure")

 	@Test

-	public void testStereotypeChanged() {

-		// Applied stereotype on lifeline1

+	public void testStereotypeChanged1() {

+		//Applied stereotype on lifeline1

 		doTestDisplayStereotypeInCompartment(lifeline1, lifeline1);

 		waitForComplete();

 		validateAll();

-

-		// Applied stereotype on lifeline2

-		doTestDisplayStereotypeInCompartment(lifeline2, lifeline2);

+		

+		//Applied stereotype on lifeline3

+		doTestDisplayStereotypeInCompartment(lifeline3, lifeline3);

 		waitForComplete();

 		validateAll();

+	}

+	

+	@Test

+	public void testStereotypeChanged2() {

 

-		// Applied stereotype on lifeline3

-		doTestDisplayStereotypeInCompartment(lifeline3, lifeline3);

+		//Applied stereotype on lifeline2

+		doTestDisplayStereotypeInCompartment(lifeline2, lifeline2);

 		waitForComplete();

 		validateAll();

-

-		// Applied stereotype on lifeline4

+		

+		//Applied stereotype on lifeline4

 		doTestDisplayStereotypeInCompartment(lifeline4, lifeline4);

 		waitForComplete();

 		validateAll();

@@ -335,12 +338,20 @@ public class Fixbug_LifelineManagement_417365 extends BaseStereotypesTest {
 

 	@Test

 	public void testResizeLifelineAfterStereotypeApplied() {

-		// Applied stereotype on lifeline1

+		//Applied stereotype on lifeline1

 		doTestDisplayStereotypeInCompartment(lifeline4, lifeline4);

+		//resize down/up from bottom

+		resize(lifeline4, SequenceUtil.getAbsoluteBounds(lifeline4).getLocation(), PositionConstants.SOUTH, new Dimension(0, 30));

+		resize(lifeline4, SequenceUtil.getAbsoluteBounds(lifeline4).getLocation(), PositionConstants.NORTH, new Dimension(0, 30));

+

+		//resize west

+		resize(lifeline4, SequenceUtil.getAbsoluteBounds(lifeline4).getLocation(), PositionConstants.WEST, new Dimension(30, 0));

+		//resize east

+		resize(lifeline4, SequenceUtil.getAbsoluteBounds(lifeline4).getLocation(), PositionConstants.EAST, new Dimension(30, 0));

 	}

 

 	private void panViewerTo(IGraphicalEditPart editPart) {

-		FigureCanvas canvas = (FigureCanvas) editPart.getViewer().getControl();

+		FigureCanvas canvas = (FigureCanvas)editPart.getViewer().getControl();

 		int width = canvas.getViewport().getBounds().width;

 		int centre = getAbsoluteCenter(editPart).x;

 		canvas.scrollToX(centre - (width / 2));

@@ -348,7 +359,7 @@ public class Fixbug_LifelineManagement_417365 extends BaseStereotypesTest {
 	}

 

 	private void resetViewer(IGraphicalEditPart editPart) {

-		FigureCanvas canvas = (FigureCanvas) editPart.getViewer().getControl();

+		FigureCanvas canvas = (FigureCanvas)editPart.getViewer().getControl();

 		canvas.scrollTo(0, 0);

 	}

 }