Author: jjankovi Date: 2012-02-14 11:08:20 -0500 (Tue, 14 Feb 2012) New Revision: 38706 Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/CDIWizardBase.java Log: Modifying to use waitUntil method instead of sleep Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/CDIWizardBase.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/CDIWizardBase.java 2012-02-14 15:39:41 UTC (rev 38705) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/CDIWizardBase.java 2012-02-14 16:08:20 UTC (rev 38706) @@ -21,7 +21,9 @@ import org.eclipse.swtbot.swt.finder.widgets.SWTBotRadio; import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell; import org.jboss.tools.cdi.bot.test.annotations.CDIWizardType; -import org.jboss.tools.ui.bot.ext.Timing; +import org.jboss.tools.cdi.bot.test.condition.NonEmptyTableCondition; +import org.jboss.tools.ui.bot.ext.condition.TaskDuration; +import org.jboss.tools.ui.bot.ext.types.IDELabel; public class CDIWizardBase extends Wizard { @@ -227,10 +229,11 @@ case STEREOTYPE: case INTERCEPTOR: setFocus(); - bot().button("Add", 0).click(); + bot().button(IDELabel.Button.ADD_WITHOUT_DOTS, 0).click(); SWTBotShell sh = bot().activeShell(); sh.bot().text().setText(ib); - sh.bot().button("OK").click(); + sh.bot().waitUntil(new NonEmptyTableCondition(sh.bot().table()), TaskDuration.NORMAL.getTimeout()); + sh.bot().button(IDELabel.Button.OK).click(); setFocus(); break; default: @@ -312,12 +315,12 @@ case DECORATOR: case BEAN: setFocus(); - bot().button("Add...", 0).click(); + bot().button(IDELabel.Button.ADD, 0).click(); SWTBotShell sh = bot().activeShell(); sh.bot().text().setText(intf); - sh.bot().sleep(Timing.time3S()); + sh.bot().waitUntil(new NonEmptyTableCondition(sh.bot().table()), TaskDuration.NORMAL.getTimeout()); sh.bot().table().getTableItem(0).select(); - sh.bot().button("OK").click(); + sh.bot().button(IDELabel.Button.OK).click(); setFocus(); break; default: @@ -340,7 +343,7 @@ } SWTBotShell sh = bot().activeShell(); sh.bot().text().setText(qualifier); - sh.bot().sleep(Timing.time2S()); + sh.bot().waitUntil(new NonEmptyTableCondition(sh.bot().table()), TaskDuration.SHORT.getTimeout()); sh.bot().table().getTableItem(0).select(); sh.bot().button("OK").click(); setFocus();