Author: ljelinko Date: 2012-02-06 05:50:32 -0500 (Mon, 06 Feb 2012) New Revision: 38442 Added: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/condition/NonSystemJobRunsCondition.java trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/condition/ShellIsActiveCondition.java trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/condition/TaskDuration.java trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/wizards/SWTBotImportWizard.java trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/wizards/SWTBotNewObjectWizard.java Removed: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wait/TaskDuration.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wait/condition/NonSystemJobRunsCondition.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wait/condition/ShellIsActiveCondition.java Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/dialog/property/ProjectPropertyDialogCloseTask.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/importing/ImportingTask.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wait/WaitUntilTask.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wait/WaitWhileTask.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/WizardFillingTask.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/WizardOpeningTask.java trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/wizards/SWTBotWizard.java Log: Moved some of the wizard functionality from portlet to swtbotext Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/dialog/property/ProjectPropertyDialogCloseTask.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/dialog/property/ProjectPropertyDialogCloseTask.java 2012-02-06 08:42:18 UTC (rev 38441) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/dialog/property/ProjectPropertyDialogCloseTask.java 2012-02-06 10:50:32 UTC (rev 38442) @@ -2,10 +2,10 @@ 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.TaskDuration; import org.jboss.tools.portlet.ui.bot.task.wait.WaitWhileTask; -import org.jboss.tools.portlet.ui.bot.task.wait.condition.NonSystemJobRunsCondition; -import org.jboss.tools.portlet.ui.bot.task.wait.condition.ShellIsActiveCondition; +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 { Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/importing/ImportingTask.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/importing/ImportingTask.java 2012-02-06 08:42:18 UTC (rev 38441) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/importing/ImportingTask.java 2012-02-06 10:50:32 UTC (rev 38442) @@ -1,12 +1,7 @@ package org.jboss.tools.portlet.ui.bot.task.importing; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; - import org.jboss.tools.portlet.ui.bot.task.AbstractSWTTask; -import org.jboss.tools.ui.bot.ext.SWTBotFactory; -import org.jboss.tools.ui.bot.ext.gen.IImport; +import org.jboss.tools.ui.bot.ext.wizards.SWTBotImportWizard; /** * Imports the specified object under the specified category. @@ -33,22 +28,14 @@ @Override public void perform() { - IImport importPath = new IImport() { - - @Override - public String getName() { - return name; - } - - @Override - public List<String> getGroupPath() { - if (category == null){ - return Collections.emptyList(); - } - - return Arrays.asList(category.split("/")); - } - }; - SWTBotFactory.getOpen().newImport(importPath); + new SWTBotImportWizard().open(name, getGroupPath()); } + + private String[] getGroupPath() { + if (category == null){ + return new String[0]; + } + + return category.split("/"); + } } Deleted: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wait/TaskDuration.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wait/TaskDuration.java 2012-02-06 08:42:18 UTC (rev 38441) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wait/TaskDuration.java 2012-02-06 10:50:32 UTC (rev 38442) @@ -1,15 +0,0 @@ -package org.jboss.tools.portlet.ui.bot.task.wait; - -public enum TaskDuration { - SHORT(1 * 1000), NORMAL(10 * 1000), LONG(1 * 60 * 1000), VERY_LONG(10 * 60 * 1000); - - private long timeout; - - private TaskDuration(long timeout) { - this.timeout = timeout; - } - - public long getTimeout() { - return timeout; - } -} \ No newline at end of file Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wait/WaitUntilTask.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wait/WaitUntilTask.java 2012-02-06 08:42:18 UTC (rev 38441) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wait/WaitUntilTask.java 2012-02-06 10:50:32 UTC (rev 38442) @@ -2,6 +2,7 @@ import org.eclipse.swtbot.swt.finder.waits.ICondition; import org.jboss.tools.portlet.ui.bot.task.AbstractSWTTask; +import org.jboss.tools.ui.bot.ext.condition.TaskDuration; /** * Waits for the specified condition with the specified timeout. Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wait/WaitWhileTask.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wait/WaitWhileTask.java 2012-02-06 08:42:18 UTC (rev 38441) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wait/WaitWhileTask.java 2012-02-06 10:50:32 UTC (rev 38442) @@ -2,6 +2,7 @@ import org.eclipse.swtbot.swt.finder.waits.ICondition; import org.jboss.tools.portlet.ui.bot.task.AbstractSWTTask; +import org.jboss.tools.ui.bot.ext.condition.TaskDuration; /** * Waits while the specified condition is valid with the specified timeout. Deleted: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wait/condition/NonSystemJobRunsCondition.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wait/condition/NonSystemJobRunsCondition.java 2012-02-06 08:42:18 UTC (rev 38441) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wait/condition/NonSystemJobRunsCondition.java 2012-02-06 10:50:32 UTC (rev 38442) @@ -1,46 +0,0 @@ -package org.jboss.tools.portlet.ui.bot.task.wait.condition; - -import java.util.ArrayList; -import java.util.List; - -import org.eclipse.core.runtime.jobs.Job; -import org.eclipse.swtbot.swt.finder.SWTBot; -import org.eclipse.swtbot.swt.finder.waits.ICondition; - -/** - * Returns true, if there is a non system job running, false - * otherwise. - * - * @author Lucia Jelinkova - * - */ -public class NonSystemJobRunsCondition implements ICondition { - - @Override - public boolean test() throws Exception { - return getJobs().size() != 0; - } - - @Override - public void init(SWTBot bot) { - } - - @Override - public String getFailureMessage() { - StringBuilder msg = new StringBuilder("Expected no running jobs, found the following jobs: \n"); - for (Job job : getJobs()){ - msg.append(job.getName() + "\n"); - } - return msg.toString(); - } - - private List<Job> getJobs(){ - List<Job> jobs = new ArrayList<Job>(); - for (Job job : Job.getJobManager().find(null)){ - if (!job.isSystem() && Job.SLEEPING != job.getState()){ - jobs.add(job); - } - } - return jobs; - } -} Deleted: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wait/condition/ShellIsActiveCondition.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wait/condition/ShellIsActiveCondition.java 2012-02-06 08:42:18 UTC (rev 38441) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wait/condition/ShellIsActiveCondition.java 2012-02-06 10:50:32 UTC (rev 38442) @@ -1,35 +0,0 @@ -package org.jboss.tools.portlet.ui.bot.task.wait.condition; - -import org.eclipse.swtbot.swt.finder.SWTBot; -import org.eclipse.swtbot.swt.finder.waits.ICondition; -import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell; - -/** - * Returns true while the specified shell is active. - * - * @author Lucia Jelinkova - * - */ -public class ShellIsActiveCondition implements ICondition { - - private SWTBotShell shell; - - public ShellIsActiveCondition(SWTBotShell shell) { - super(); - this.shell = shell; - } - - @Override - public void init(SWTBot bot) { - } - - @Override - public boolean test() throws Exception { - return shell.isActive(); - } - - @Override - public String getFailureMessage() { - return "Expected the shell to become non active: " + shell; - } -} Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/WizardFillingTask.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/WizardFillingTask.java 2012-02-06 08:42:18 UTC (rev 38441) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/WizardFillingTask.java 2012-02-06 10:50:32 UTC (rev 38442) @@ -5,10 +5,7 @@ import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell; import org.jboss.tools.portlet.ui.bot.task.CompositeSWTTask; -import org.jboss.tools.portlet.ui.bot.task.wait.TaskDuration; -import org.jboss.tools.portlet.ui.bot.task.wait.WaitWhileTask; -import org.jboss.tools.portlet.ui.bot.task.wait.condition.NonSystemJobRunsCondition; -import org.jboss.tools.portlet.ui.bot.task.wait.condition.ShellIsActiveCondition; +import org.jboss.tools.ui.bot.ext.wizards.SWTBotNewObjectWizard; /** * @@ -29,14 +26,10 @@ @Override public void perform() { - SWTBotShell activeShell = getActiveShell(); - super.setTasks(wizardPages); super.perform(); - getBot().button("Finish").click(); - performInnerTask(new WaitWhileTask(new ShellIsActiveCondition(activeShell), TaskDuration.LONG)); - performInnerTask(new WaitWhileTask(new NonSystemJobRunsCondition(), TaskDuration.LONG)); + new SWTBotNewObjectWizard().finishWithWait(); } public void addWizardPage(WizardPageFillingTask task){ Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/WizardOpeningTask.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/WizardOpeningTask.java 2012-02-06 08:42:18 UTC (rev 38441) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/WizardOpeningTask.java 2012-02-06 10:50:32 UTC (rev 38442) @@ -1,12 +1,7 @@ package org.jboss.tools.portlet.ui.bot.task.wizard; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; - import org.jboss.tools.portlet.ui.bot.task.AbstractSWTTask; -import org.jboss.tools.ui.bot.ext.SWTBotFactory; -import org.jboss.tools.ui.bot.ext.gen.INewObject; +import org.jboss.tools.ui.bot.ext.wizards.SWTBotNewObjectWizard; /** * Opens a specified wizard. @@ -37,22 +32,14 @@ @Override public void perform() { - INewObject wizardPath = new INewObject() { - - @Override - public String getName() { - return name; - } - - @Override - public List<String> getGroupPath() { - if (category == null){ - return Collections.emptyList(); - } - - return Arrays.asList(category.split("/")); - } - }; - SWTBotFactory.getOpen().newObject(wizardPath); + new SWTBotNewObjectWizard().open(name, getGroupPath()); } + + private String[] getGroupPath() { + if (category == null){ + return new String[0]; + } + + return category.split("/"); + } } Copied: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/condition/NonSystemJobRunsCondition.java (from rev 38107, trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wait/condition/NonSystemJobRunsCondition.java) =================================================================== --- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/condition/NonSystemJobRunsCondition.java (rev 0) +++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/condition/NonSystemJobRunsCondition.java 2012-02-06 10:50:32 UTC (rev 38442) @@ -0,0 +1,46 @@ +package org.jboss.tools.ui.bot.ext.condition; + +import java.util.ArrayList; +import java.util.List; + +import org.eclipse.core.runtime.jobs.Job; +import org.eclipse.swtbot.swt.finder.SWTBot; +import org.eclipse.swtbot.swt.finder.waits.ICondition; + +/** + * Returns true, if there is a non system job running, false + * otherwise. + * + * @author Lucia Jelinkova + * + */ +public class NonSystemJobRunsCondition implements ICondition { + + @Override + public boolean test() throws Exception { + return getJobs().size() != 0; + } + + @Override + public void init(SWTBot bot) { + } + + @Override + public String getFailureMessage() { + StringBuilder msg = new StringBuilder("Expected no running jobs, found the following jobs: \n"); + for (Job job : getJobs()){ + msg.append(job.getName() + "\n"); + } + return msg.toString(); + } + + private List<Job> getJobs(){ + List<Job> jobs = new ArrayList<Job>(); + for (Job job : Job.getJobManager().find(null)){ + if (!job.isSystem() && Job.SLEEPING != job.getState()){ + jobs.add(job); + } + } + return jobs; + } +} Copied: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/condition/ShellIsActiveCondition.java (from rev 38107, trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wait/condition/ShellIsActiveCondition.java) =================================================================== --- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/condition/ShellIsActiveCondition.java (rev 0) +++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/condition/ShellIsActiveCondition.java 2012-02-06 10:50:32 UTC (rev 38442) @@ -0,0 +1,35 @@ +package org.jboss.tools.ui.bot.ext.condition; + +import org.eclipse.swtbot.swt.finder.SWTBot; +import org.eclipse.swtbot.swt.finder.waits.ICondition; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell; + +/** + * Returns true while the specified shell is active. + * + * @author Lucia Jelinkova + * + */ +public class ShellIsActiveCondition implements ICondition { + + private SWTBotShell shell; + + public ShellIsActiveCondition(SWTBotShell shell) { + super(); + this.shell = shell; + } + + @Override + public void init(SWTBot bot) { + } + + @Override + public boolean test() throws Exception { + return shell.isActive(); + } + + @Override + public String getFailureMessage() { + return "Expected the shell to become non active: " + shell; + } +} Copied: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/condition/TaskDuration.java (from rev 38107, trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wait/TaskDuration.java) =================================================================== --- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/condition/TaskDuration.java (rev 0) +++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/condition/TaskDuration.java 2012-02-06 10:50:32 UTC (rev 38442) @@ -0,0 +1,15 @@ +package org.jboss.tools.ui.bot.ext.condition; + +public enum TaskDuration { + SHORT(1 * 1000), NORMAL(10 * 1000), LONG(1 * 60 * 1000), VERY_LONG(10 * 60 * 1000); + + private long timeout; + + private TaskDuration(long timeout) { + this.timeout = timeout; + } + + public long getTimeout() { + return timeout; + } +} \ No newline at end of file Added: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/wizards/SWTBotImportWizard.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/wizards/SWTBotImportWizard.java (rev 0) +++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/wizards/SWTBotImportWizard.java 2012-02-06 10:50:32 UTC (rev 38442) @@ -0,0 +1,40 @@ +package org.jboss.tools.ui.bot.ext.wizards; + +import java.util.Arrays; +import java.util.List; + +import org.jboss.tools.ui.bot.ext.SWTBotFactory; +import org.jboss.tools.ui.bot.ext.gen.IImport; + + +/** + * Provides actions for opening and navigating import wizard. + * + * @author Lucia Jelinkova + * + */ +public class SWTBotImportWizard extends SWTBotWizard { + + public void open(IImport importObject){ + SWTBotFactory.getOpen().newImport(importObject); + } + + public void open(String name, String... path){ + SWTBotFactory.getOpen().newImport(createImportObject(name, path)); + } + + private IImport createImportObject(final String name, final String... path){ + return new IImport() { + + @Override + public String getName() { + return name; + } + + @Override + public List<String> getGroupPath() { + return Arrays.asList(path); + } + }; + } +} Added: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/wizards/SWTBotNewObjectWizard.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/wizards/SWTBotNewObjectWizard.java (rev 0) +++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/wizards/SWTBotNewObjectWizard.java 2012-02-06 10:50:32 UTC (rev 38442) @@ -0,0 +1,39 @@ +package org.jboss.tools.ui.bot.ext.wizards; + +import java.util.Arrays; +import java.util.List; + +import org.jboss.tools.ui.bot.ext.SWTBotFactory; +import org.jboss.tools.ui.bot.ext.gen.INewObject; + +/** + * Provides actions for opening and navigating new object wizard. + * + * @author Lucia Jelinkova + * + */ +public class SWTBotNewObjectWizard extends SWTBotWizard { + + public void open(INewObject newObject){ + SWTBotFactory.getOpen().newObject(newObject); + } + + public void open(String name, String... path){ + SWTBotFactory.getOpen().newObject(createNewObject(name, path)); + } + + private INewObject createNewObject(final String name, final String... path){ + return new INewObject() { + + @Override + public String getName() { + return name; + } + + @Override + public List<String> getGroupPath() { + return Arrays.asList(path); + } + }; + } +} Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/wizards/SWTBotWizard.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/wizards/SWTBotWizard.java 2012-02-06 08:42:18 UTC (rev 38441) +++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/wizards/SWTBotWizard.java 2012-02-06 10:50:32 UTC (rev 38442) @@ -14,6 +14,9 @@ import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell; import org.eclipse.swtbot.swt.finder.widgets.SWTBotText; import org.jboss.tools.ui.bot.ext.SWTTestExt; +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; import org.jboss.tools.ui.bot.ext.types.IDELabel; public class SWTBotWizard extends SWTBotShell { @@ -49,7 +52,14 @@ public void finish() { clickButton(IDELabel.Button.FINISH); } - + + public void finishWithWait() { + SWTBotShell activeShell = getActiveShell(); + finish(); + bot().waitWhile(new ShellIsActiveCondition(activeShell), TaskDuration.LONG.getTimeout()); + bot().waitWhile(new NonSystemJobRunsCondition(), TaskDuration.LONG.getTimeout()); + } + protected void clickButton(String text) { bot().button(text).click(); bot().sleep(500); @@ -60,4 +70,14 @@ t.setFocus(); t.setText(text); } + + private SWTBotShell getActiveShell(){ + for (SWTBotShell shell : bot().shells()){ + if (shell.isActive()){ + return shell; + } + } + + throw new IllegalStateException("No active shell found"); + } }