Author: jjankovi Date: 2012-02-08 11:01:52 -0500 (Wed, 08 Feb 2012) New Revision: 38514 Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/CDIProjectHelper.java Log: Modifying CDIProjectHelper to not use sleep method Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/CDIProjectHelper.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/CDIProjectHelper.java 2012-02-08 16:01:14 UTC (rev 38513) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/CDIProjectHelper.java 2012-02-08 16:01:52 UTC (rev 38514) @@ -19,8 +19,10 @@ import org.jboss.tools.cdi.bot.test.CDIConstants; import org.jboss.tools.cdi.bot.test.uiutils.actions.NewFileWizardAction; import org.jboss.tools.cdi.bot.test.uiutils.wizards.DynamicWebProjectWizard; -import org.jboss.tools.ui.bot.ext.Timing; +import org.jboss.tools.ui.bot.ext.condition.ProgressInformationShellIsActiveCondition; +import org.jboss.tools.ui.bot.ext.condition.TaskDuration; import org.jboss.tools.ui.bot.ext.helper.ContextMenuHelper; +import org.jboss.tools.ui.bot.ext.types.IDELabel; public class CDIProjectHelper extends CDIBase{ @@ -32,10 +34,7 @@ new NewFileWizardAction().run() .selectTemplate(CDIConstants.CDI_GROUP, CDIConstants.CDI_WEB_PROJECT).next(); - new DynamicWebProjectWizard().setProjectName(projectName).finish(); - bot.sleep(Timing.time5S()); - util.waitForNonIgnoredJobs(); - bot.sleep(Timing.time5S()); + new DynamicWebProjectWizard().setProjectName(projectName).finishWithWait(); } /** @@ -55,8 +54,7 @@ public void createDynamicWebProjectWithCDIPreset(String projectName) { new NewFileWizardAction().run() .selectTemplate(CDIConstants.WEB_GROUP, CDIConstants.DYNAMIC_WEB_PROJECT).next(); - new DynamicWebProjectWizard().setProjectName(projectName).setCDIPreset().finish(); - util.waitForNonIgnoredJobs(); + new DynamicWebProjectWizard().setProjectName(projectName).setCDIPreset().finishWithWait(); } /** @@ -66,9 +64,7 @@ public void createDynamicWebProjectWithCDIFacets(String projectName) { new NewFileWizardAction().run() .selectTemplate(CDIConstants.WEB_GROUP, CDIConstants.DYNAMIC_WEB_PROJECT).next(); - new DynamicWebProjectWizard().setProjectName(projectName).setCDIFacet().finish(); - bot.sleep(Timing.time5S()); - util.waitForNonIgnoredJobs(); + new DynamicWebProjectWizard().setProjectName(projectName).setCDIFacet().finishWithWait(); } /** @@ -94,8 +90,7 @@ private void createDynamicWebProject(String projectName) { new NewFileWizardAction().run() .selectTemplate(CDIConstants.WEB_GROUP, CDIConstants.DYNAMIC_WEB_PROJECT).next(); - new DynamicWebProjectWizard().setProjectName(projectName).finish(); - util.waitForNonIgnoredJobs(); + new DynamicWebProjectWizard().setProjectName(projectName).finishWithWait(); } /** @@ -109,9 +104,8 @@ item.expand(); NodeContextUtil.nodeContextMenu(tree, item, CDIConstants.CONFIGURE, CDIConstants.ADD_CDI_SUPPORT).click(); - bot.activeShell().bot().button("OK").click(); - bot.sleep(Timing.time2S()); - util.waitForNonIgnoredJobs(); + bot.activeShell().bot().button(IDELabel.Button.OK).click(); + bot.waitWhile(new ProgressInformationShellIsActiveCondition(), TaskDuration.LONG.getTimeout()); } /** @@ -128,7 +122,7 @@ bot.tree().expandNode(CDIConstants.CDI_PROPERTIES_SETTINGS).select(); boolean isCDISupported = bot.checkBox().isChecked(); - bot.button("Cancel").click(); + bot.button(IDELabel.Button.CANCEL).click(); return isCDISupported; }