[456318] Fix test SequenceReturnMessageTest

SequenceReturnMessageTest.test_Zoom() often fails on Mars. So the
Outline view is now closed for this test.

The outline is closed before opening the diagram editor. The editor is
closed before opening again the outline to be sure that it will not be
refreshed.

Bug: 456318
Change-Id: If2cd304518d1c001c757343113c50cd4f45e726f
Signed-off-by: Mickael LANOE <mickael.lanoe@obeo.fr>

1 files changed, 8 insertions, 3 deletions

diff --git a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/sequence/SequenceReturnMessageTest.java b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/sequence/SequenceReturnMessageTest.java
index ee5040905d..110eaebe8d 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/sequence/SequenceReturnMessageTest.java
+++ b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/sequence/SequenceReturnMessageTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2014 THALES GLOBAL SERVICES.
+ * Copyright (c) 2010, 2015 THALES GLOBAL SERVICES and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -30,14 +30,19 @@ import com.google.common.collect.Iterables;
 public class SequenceReturnMessageTest extends AbstractDefaultModelSequenceTests {
 
     @Override
-    protected void setUp() throws Exception {
-        super.setUp();
+    protected void onSetUpAfterOpeningDesignerPerspective() throws Exception {
         bot.viewById("org.eclipse.ui.views.ContentOutline").close();
         SWTBotUtils.waitAllUiEvents();
+        super.onSetUpAfterOpeningDesignerPerspective();
     }
 
     @Override
     protected void tearDown() throws Exception {
+        // Close the editor before opening the outline
+        if (editor != null) {
+            editor.close();
+            SWTBotUtils.waitAllUiEvents();
+        }
         // Reopen outline
         new DesignerViews(bot).openOutlineView();
         SWTBotUtils.waitAllUiEvents();