From a58b04bc9d67fcf27995ef0b64183539781d93c5 Mon Sep 17 00:00:00 2001
From: Hugo Marchadour <hugo.marchadour@obeo.fr>
Date: Mon, 9 Dec 2013 17:08:39 +0100
Subject: [PATCH] [tests] Try to fix UI test suite

Calls closeWelcome() and set the modeling perpective at the begining
---
 .../dsl/uml2/design/tests/contexts/UMLDesignerBot.java      | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/org.obeonetwork.dsl.uml2.design.tests/src/org/obeonetwork/dsl/uml2/design/tests/contexts/UMLDesignerBot.java b/tests/org.obeonetwork.dsl.uml2.design.tests/src/org/obeonetwork/dsl/uml2/design/tests/contexts/UMLDesignerBot.java
index 584c78310..c1dc7519e 100644
--- a/tests/org.obeonetwork.dsl.uml2.design.tests/src/org/obeonetwork/dsl/uml2/design/tests/contexts/UMLDesignerBot.java
+++ b/tests/org.obeonetwork.dsl.uml2.design.tests/src/org/obeonetwork/dsl/uml2/design/tests/contexts/UMLDesignerBot.java
@@ -82,7 +82,9 @@ public UMLDesignerBot closeWelcome() {
 	}
 
 	public SWTBotDesignerEditor importAndOpenTravelAgency() {
+		closeWelcome();
 		bot.resetWorkbench();
+		openModelingPerspective();
 		String nameInWizard = "Travel Agency UML";
 
 		bot.menu("File").menu("New").menu("Example...").click();
@@ -91,7 +93,6 @@ public SWTBotDesignerEditor importAndOpenTravelAgency() {
 		bot.shell("New Example").bot().tree().expandNode("UML").getNode(nameInWizard).select();
 		bot.button("Next >").click();
 		bot.button("Finish").click();
-		closeWelcome();
 		bot.viewByTitle("Model Explorer").bot().tree().expandNode("TravelAgency").expandNode("agency.uml");
 
 		waitForProgressInformationComplete();
@@ -127,7 +128,9 @@ public SWTBotDesignerEditor openEntitiesClassDiagram() {
 	}
 
 	public void importAndOpenTestAllMappings() {
+		closeWelcome();
 		bot.resetWorkbench();
+		openModelingPerspective();
 		String nameInWizard = "Test All Mappings";
 
 		bot.menu("File").menu("New").menu("Example...").click();
@@ -136,7 +139,6 @@ public void importAndOpenTestAllMappings() {
 		bot.shell("New Example").bot().tree().expandNode("UML").getNode(nameInWizard).select();
 		bot.button("Next >").click();
 		bot.button("Finish").click();
-		closeWelcome();
 		bot.viewByTitle("Model Explorer").bot().tree().expandNode("TestAllMappings").expandNode("model.uml");
 
 		waitForProgressInformationComplete();