Author: ljelinko Date: 2012-08-17 08:12:55 -0400 (Fri, 17 Aug 2012) New Revision: 43093 Modified: branches/jbosstools-3.3.x/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/dialog/property/ProjectPropertyDialogCloseTask.java Log: Trying new condition Modified: branches/jbosstools-3.3.x/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/dialog/property/ProjectPropertyDialogCloseTask.java =================================================================== --- branches/jbosstools-3.3.x/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/dialog/property/ProjectPropertyDialogCloseTask.java 2012-08-17 11:44:22 UTC (rev 43092) +++ branches/jbosstools-3.3.x/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/dialog/property/ProjectPropertyDialogCloseTask.java 2012-08-17 12:12:55 UTC (rev 43093) @@ -1,10 +1,11 @@ package org.jboss.tools.portlet.ui.bot.task.dialog.property; +import static org.eclipse.swtbot.swt.finder.waits.Conditions.shellCloses; + import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell; import org.jboss.tools.portlet.ui.bot.task.AbstractSWTTask; import org.jboss.tools.portlet.ui.bot.task.wait.WaitWhileTask; import org.jboss.tools.ui.bot.ext.condition.NonSystemJobRunsCondition; -import org.jboss.tools.ui.bot.ext.condition.ShellIsActiveCondition; import org.jboss.tools.ui.bot.ext.condition.TaskDuration; public class ProjectPropertyDialogCloseTask extends AbstractSWTTask { @@ -13,7 +14,7 @@ public void perform() { SWTBotShell activeShell = getBot().activeShell(); getBot().button("OK").click(); + getBot().waitUntil(shellCloses(activeShell), TaskDuration.NORMAL.getTimeout()); performInnerTask(new WaitWhileTask(new NonSystemJobRunsCondition(), TaskDuration.LONG)); - performInnerTask(new WaitWhileTask(new ShellIsActiveCondition(activeShell), TaskDuration.NORMAL)); } }