diff options
| author | Pierre-Charles David | 2015-06-25 13:18:06 +0000 |
|---|---|---|
| committer | Pierre-Charles David | 2015-06-25 13:18:06 +0000 |
| commit | ac57e5b5136afd8a870f1bf883b1aac6acdea8d8 (patch) | |
| tree | c9c426cbc0896f5c7d02a38e27b2b9f13db1777d | |
| parent | e140c633ebbd2b760fd471a54b3026eb9d2c2966 (diff) | |
| download | org.eclipse.sirius-ac57e5b5136afd8a870f1bf883b1aac6acdea8d8.tar.gz org.eclipse.sirius-ac57e5b5136afd8a870f1bf883b1aac6acdea8d8.tar.xz org.eclipse.sirius-ac57e5b5136afd8a870f1bf883b1aac6acdea8d8.zip | |
[456318] Make SWTBot test more reliable on Mars
One test in ArrangeAllLinkedBorderedNodesLayoutStabilityAppTemoinTest
tends to fail a lot under Mars because of a regression introduced in GEF
by #309912. Until we can consume a GEF version with the fix, work around
the issue by closing the outline view, which it not required in this
test.
Bug: 456318
Change-Id: I4a51b3536a8ea9493a8b059b31c9eb50e0a00d72
Signed-off-by: Pierre-Charles David <pierre-charles.david@obeo.fr>
| -rw-r--r-- | plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/ArrangeAllLinkedBorderedNodesLayoutStabilityAppTemoinTest.java | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/ArrangeAllLinkedBorderedNodesLayoutStabilityAppTemoinTest.java b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/ArrangeAllLinkedBorderedNodesLayoutStabilityAppTemoinTest.java index 3517ee9e4a..509512fb72 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/ArrangeAllLinkedBorderedNodesLayoutStabilityAppTemoinTest.java +++ b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/ArrangeAllLinkedBorderedNodesLayoutStabilityAppTemoinTest.java @@ -32,6 +32,8 @@ import org.eclipse.sirius.tests.swtbot.support.api.business.UIDiagramRepresentat import org.eclipse.sirius.tests.swtbot.support.api.business.UILocalSession; import org.eclipse.sirius.tests.swtbot.support.api.business.UIResource; import org.eclipse.sirius.tests.swtbot.support.api.editor.SWTBotSiriusDiagramEditor; +import org.eclipse.sirius.tests.swtbot.support.api.view.DesignerViews; +import org.eclipse.sirius.tests.swtbot.support.utils.SWTBotUtils; import org.eclipse.swtbot.eclipse.gef.finder.widgets.SWTBotGefEditPart; /** @@ -91,6 +93,15 @@ public class ArrangeAllLinkedBorderedNodesLayoutStabilityAppTemoinTest extends A sessionAirdResource = new UIResource(designerProject, FILE_DIR, SESSION_FILE); localSession = designerPerspective.openSessionFromFile(sessionAirdResource); editor = openDiagram(localSession.getOpenedSession(), REPRESENTATION_NAME_ENTITIES2, REPRESENTATION_INSTANCE_NAME_ENTITIES2, DDiagram.class); + bot.viewById("org.eclipse.ui.views.ContentOutline").close(); + SWTBotUtils.waitAllUiEvents(); + } + + @Override + protected void tearDown() throws Exception { + // Reopen outline + new DesignerViews(bot).openOutlineView(); + super.tearDown(); } /** |