Author: jlukas(a)redhat.com Date: 2011-07-19 11:39:12 -0400 (Tue, 19 Jul 2011) New Revision: 33045 Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/uiutils/wizards/WebServiceClientWizard.java trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/uiutils/wizards/WebServiceWizard.java trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/uiutils/wizards/WsWizardBase.java Log: another guard tests against lost focus Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/uiutils/wizards/WebServiceClientWizard.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/uiutils/wizards/WebServiceClientWizard.java 2011-07-19 15:29:06 UTC (rev 33044) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/uiutils/wizards/WebServiceClientWizard.java 2011-07-19 15:39:12 UTC (rev 33045) @@ -28,7 +28,7 @@ } public WebServiceClientWizard setClientProject(String name) { - setTargetProject("Client project:", name); + setTargetProject("Client project:", name, "Specify Client Project Settings"); return this; } Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/uiutils/wizards/WebServiceWizard.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/uiutils/wizards/WebServiceWizard.java 2011-07-19 15:29:06 UTC (rev 33044) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/uiutils/wizards/WebServiceWizard.java 2011-07-19 15:39:12 UTC (rev 33045) @@ -94,5 +94,9 @@ public boolean isClientEnabled() { return isScaleEnabled(1); - } + } + + private void setTargetProject(String label, String name) { + setTargetProject(label, name, "Specify Service Project Settings"); + } } Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/uiutils/wizards/WsWizardBase.java =================================================================== --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/uiutils/wizards/WsWizardBase.java 2011-07-19 15:29:06 UTC (rev 33044) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/uiutils/wizards/WsWizardBase.java 2011-07-19 15:39:12 UTC (rev 33045) @@ -86,11 +86,13 @@ return this; } - protected WsWizardBase setTargetProject(String label, String name) { + protected WsWizardBase setTargetProject(String label, String name, String shellTitle) { setFocus(); sleep(100); findLink(label).get(0).click(); - SWTBotShell sh = bot().activeShell(); + sleep(100); + SWTBotShell sh = bot().shell(shellTitle); + sh.setFocus(); SWTBotCombo c = sh.bot().comboBoxWithLabel(label); String[] items = c.items(); boolean found = false;