Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Redor2017-09-01 10:26:24 +0000
committerLaurent Redor2017-09-01 10:32:34 +0000
commit2011e7ae9c986a1055671e8da66eba2e8b4b5035 (patch)
tree5646f1df4bd56e427d490557dd86b2b7da682548
parent7fc71d3d5236d530f4d71528b10806aa0e502795 (diff)
downloadorg.eclipse.sirius-2011e7ae9c986a1055671e8da66eba2e8b4b5035.tar.gz
org.eclipse.sirius-2011e7ae9c986a1055671e8da66eba2e8b4b5035.tar.xz
org.eclipse.sirius-2011e7ae9c986a1055671e8da66eba2e8b4b5035.zip
Revert "[521356] Add tests to reveal the problem"
This reverts commit d8c7667824651c5776c402236724e68f1150a931as the bug 521356 is finally invalid. Bug: 521356 Change-Id: I66dce18e5611e3d9cf81526d37bfaf96b42b9e17 Signed-off-by: Laurent Redor <laurent.redor@obeo.fr>
-rw-r--r--plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/sequence/ExecutionTests.java23
1 files changed, 2 insertions, 21 deletions
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/sequence/ExecutionTests.java b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/sequence/ExecutionTests.java
index 11df990db3..c1b1f19f92 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/sequence/ExecutionTests.java
+++ b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/sequence/ExecutionTests.java
@@ -824,7 +824,7 @@ public class ExecutionTests extends AbstractDefaultModelSequenceTests {
arrangeAll();
editor.maximize();
// Create first execution on lifeLine A
- SWTBotGefEditPart firstExecutionA = createExecutionWithResult(new Point(getLifelineScreenX(LIFELINE_A), 150)).get();
+ createExecutionWithResult(new Point(getLifelineScreenX(LIFELINE_A), 150)).get();
Rectangle firstExecutionBoundsA = assertExecutionHasValidScreenBounds(LIFELINE_A, 0, new Rectangle(0, 150, 0, 30), false);
// Create second execution on lifeLine A
SWTBotGefEditPart secondExecutionA = createExecutionWithResult(new Point(getLifelineScreenX(LIFELINE_A), 250)).get();
@@ -909,14 +909,6 @@ public class ExecutionTests extends AbstractDefaultModelSequenceTests {
secondExecutionBoundsAResize = new Rectangle(secondExecutionBoundsA.x, secondExecutionBoundsA.y, secondExecutionBoundsA.width, secondExecutionBoundsA.height);
assertExecutionHasValidScreenBounds(LIFELINE_A, 2, thirdExecutionBoundsAResize, true);
assertExecutionHasValidScreenBounds(LIFELINE_A, 1, secondExecutionBoundsAResize, true);
-
- // Resize first execution on the life line bound limit. This action is
- // forbidden.
- editor.select(firstExecutionA);
- bot.waitUntil(new CheckSelectedCondition(editor, firstExecutionA.part()));
- editor.drag(firstExecutionBoundsA.getTop(), firstExecutionBoundsA.getTop().x, getBounds(LIFELINE_A, true).getBottom().y + LayoutConstants.TIME_START_MIN_OFFSET - 1);
- bot.sleep(500);
- assertExecutionHasValidScreenBounds(LIFELINE_A, 0, firstExecutionBoundsA, true);
}
/**
@@ -1224,20 +1216,9 @@ public class ExecutionTests extends AbstractDefaultModelSequenceTests {
assertEquals("the execution position is wrong", combinedFragmentBoundsA.getCenter().y, executionBoundsB.getTop().y);
// Resize execution in combined fragment, just before the lower bound of
- // the lifeline, just when grand parent Combined Fragment becomes
- // unauthorized (it's forbidden)
- int limitAuthorized = getBounds(LIFELINE_A, true).getBottom().y + LayoutConstants.TIME_START_MIN_OFFSET + LayoutConstants.COMBINED_FRAGMENT_TITLE_HEIGHT
- + LayoutConstants.EXECUTION_CHILDREN_MARGIN;
- int previousExecutionTop = executionBoundsB.getTop().y;
- editor.drag(executionBoundsB.getTop(), combinedFragmentBoundsA.getCenter().x, limitAuthorized - 1);
- bot.sleep(500);
-
- executionBoundsB = editor.getBounds(executionB);
- assertEquals("the execution must not be moved", previousExecutionTop, executionBoundsB.getTop().y);
-
- // Resize execution in combined fragment, just before the lower bound of
// the lifeline, just when grand parent Combined Fragment starts to be
// authorized
+ int limitAuthorized = combinedFragmentBoundsA.getTop().y + LayoutConstants.COMBINED_FRAGMENT_TITLE_HEIGHT + LayoutConstants.EXECUTION_CHILDREN_MARGIN;
ICondition done = new OperationDoneCondition();
editor.drag(executionBoundsB.getTop(), combinedFragmentBoundsA.getCenter().x, limitAuthorized);
bot.waitUntil(done);

Back to the top