[jbosstools-commits] JBoss Tools SVN: r43038 - trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext.

[jbosstools-commits at lists.jboss.org]

Author: rhopp
Date: 2012-08-15 05:12:49 -0400 (Wed, 15 Aug 2012)
New Revision: 43038

Modified:
   trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTJBTExt.java
Log:
Make main shell active after closing perspective (was failing on windows slaves)

Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTJBTExt.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTJBTExt.java	2012-08-15 08:20:19 UTC (rev 43037)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTJBTExt.java	2012-08-15 09:12:49 UTC (rev 43038)
@@ -559,14 +559,13 @@
     
     // Get rid of welcome screen. Simple close did not work when run in maven
     try {
+    	SWTBotShell shell = bot.activeShell();
     	bot.menu("Window").menu("Close Perspective").click();
+    	shell.setFocus();
     	SWTBotFactory.getOpen().perspective(ActionItem.Perspective.JAVA.LABEL);
     } catch (WidgetNotFoundException e){
     	// ok, Welcome screen not present
     	log.info("Welcome window not present");
-    } catch (TimeoutException e){ //hack by rhopp to make tests work on windows
-    	//probably no perspective open. Try to open Java perspective anyway 
-    	SWTBotFactory.getOpen().perspective(ActionItem.Perspective.JAVA.LABEL);
     }
   }
 	/**