[jbosstools-commits] JBoss Tools SVN: r37604 - in trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot: task/wizard/web and 3 other directories.

Author: ljelinko Date: 2012-01-02 05:31:33 -0500 (Mon, 02 Jan 2012) New Revision: 37604 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/web/DynamicWebProjectCreationTask.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/web/jboss/AbstractPortletCreationTask.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/web/jboss/JSFPortletCreationTask.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/web/jboss/JavaPortletCreationTask.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/CreateJavaPortlet.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreateJSFSeamPortletTemplate.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreatePortletProjectTemplate.java Log: refactoring of wizards 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-01-02 09:12:55 UTC (rev 37603) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/WizardFillingTask.java 2012-01-02 10:31:33 UTC (rev 37604) @@ -12,7 +12,7 @@ /** * - * Provides the functionality of navigating between wizard pages. The data + * Provides the functionality of opening wizard and navigating between its pages. The data * should fill every wizard page itself. * * @author ljelinko @@ -22,13 +22,25 @@ private List<WizardPageFillingTask> wizardPages; - public WizardFillingTask() { + private String wizardName; + + private String wizardPath; + + public WizardFillingTask(String name) { + this(name, null); + } + + public WizardFillingTask(String name, String path) { super(); + this.wizardName = name; + this.wizardPath = path; wizardPages = new ArrayList<WizardPageFillingTask>(); } @Override public void perform() { + performInnerTask(new WizardOpeningTask(wizardName, wizardPath)); + SWTBotShell activeShell = getActiveShell(); super.setTasks(wizardPages); Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/web/DynamicWebProjectCreationTask.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/web/DynamicWebProjectCreationTask.java 2012-01-02 09:12:55 UTC (rev 37603) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/web/DynamicWebProjectCreationTask.java 2012-01-02 10:31:33 UTC (rev 37604) @@ -1,46 +1,23 @@ package org.jboss.tools.portlet.ui.bot.task.wizard.web; import org.jboss.tools.portlet.ui.bot.task.dialog.AssociatedPerspectiveDialogClosingTask; -import org.jboss.tools.portlet.ui.bot.task.facet.FacetsSelectionTask; import org.jboss.tools.portlet.ui.bot.task.wizard.WizardFillingTask; -import org.jboss.tools.portlet.ui.bot.task.wizard.WizardOpeningTask; /** - * Creates a new dynamic web project using the wizard. + * Create a new dynamic web project using the wizard. * * @author ljelinko * */ public class DynamicWebProjectCreationTask extends WizardFillingTask { - private DynamicWebProjectWizardPageFillingTask firstPage; - public DynamicWebProjectCreationTask() { - super(); - firstPage = new DynamicWebProjectWizardPageFillingTask(); - addWizardPage(firstPage); + super("Dynamic Web Project", "Web"); } @Override public void perform() { - performInnerTask(new WizardOpeningTask("Dynamic Web Project", "Web")); super.perform(); performInnerTask(new AssociatedPerspectiveDialogClosingTask(false)); } - - public void setProjectName(String projectName) { - firstPage.setProjectName(projectName); - } - - public void setWebModuleVersion(String webModuleVersion) { - firstPage.setWebModuleVersion(webModuleVersion); - } - - public void setServerName(String serverName) { - firstPage.setServerName(serverName); - } - - public void setSelectFacetsTask(FacetsSelectionTask selectFacetsTask) { - firstPage.setSelectFacetsTask(selectFacetsTask); - } -} +} \ 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/wizard/web/jboss/AbstractPortletCreationTask.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/web/jboss/AbstractPortletCreationTask.java 2012-01-02 09:12:55 UTC (rev 37603) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/web/jboss/AbstractPortletCreationTask.java 2012-01-02 10:31:33 UTC (rev 37604) @@ -1,7 +1,6 @@ package org.jboss.tools.portlet.ui.bot.task.wizard.web.jboss; import org.jboss.tools.portlet.ui.bot.task.wizard.WizardFillingTask; -import org.jboss.tools.portlet.ui.bot.task.wizard.WizardOpeningTask; /** * @@ -14,15 +13,7 @@ private static final String PORTLET_WIZARD_PATH = "JBoss Tools Web/Portlet"; - private String portletWizardName; - public AbstractPortletCreationTask(String portletWizardName) { - this.portletWizardName = portletWizardName; + super(portletWizardName, PORTLET_WIZARD_PATH); } - - @Override - public void perform() { - performInnerTask(new WizardOpeningTask(portletWizardName, PORTLET_WIZARD_PATH)); - super.perform(); - } } Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/web/jboss/JSFPortletCreationTask.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/web/jboss/JSFPortletCreationTask.java 2012-01-02 09:12:55 UTC (rev 37603) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/web/jboss/JSFPortletCreationTask.java 2012-01-02 10:31:33 UTC (rev 37604) @@ -1,6 +1,5 @@ package org.jboss.tools.portlet.ui.bot.task.wizard.web.jboss; -import org.jboss.tools.portlet.ui.bot.task.wizard.WizardPageDefaultsFillingTask; /** @@ -13,7 +12,5 @@ public JSFPortletCreationTask() { super("JBoss JSF/Seam Portlet"); - // leave defaults on the first page - addWizardPage(new WizardPageDefaultsFillingTask()); } } Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/web/jboss/JavaPortletCreationTask.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/web/jboss/JavaPortletCreationTask.java 2012-01-02 09:12:55 UTC (rev 37603) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/web/jboss/JavaPortletCreationTask.java 2012-01-02 10:31:33 UTC (rev 37604) @@ -9,31 +9,7 @@ */ public class JavaPortletCreationTask extends AbstractPortletCreationTask { - private JavaPortletWizardPageFillingTask firstPage; - public JavaPortletCreationTask() { super("Java Portlet"); - firstPage = new JavaPortletWizardPageFillingTask(); - addWizardPage(firstPage); } - - public void setProject(String project) { - firstPage.setProject(project); - } - - public void setSourceFolder(String sourceFolder) { - firstPage.setSourceFolder(sourceFolder); - } - - public void setPackageName(String packageName) { - firstPage.setPackageName(packageName); - } - - public void setClassName(String className) { - firstPage.setClassName(className); - } - - public void setSuperclass(String superclass) { - firstPage.setSuperclass(superclass); - } } Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/CreateJavaPortlet.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/CreateJavaPortlet.java 2012-01-02 09:12:55 UTC (rev 37603) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/CreateJavaPortlet.java 2012-01-02 10:31:33 UTC (rev 37604) @@ -8,6 +8,7 @@ import org.jboss.tools.portlet.ui.bot.entity.XMLNode; import org.jboss.tools.portlet.ui.bot.task.wizard.web.jboss.AbstractPortletCreationTask; import org.jboss.tools.portlet.ui.bot.task.wizard.web.jboss.JavaPortletCreationTask; +import org.jboss.tools.portlet.ui.bot.task.wizard.web.jboss.JavaPortletWizardPageFillingTask; import org.jboss.tools.portlet.ui.bot.test.template.CreatePortletTemplate; /** @@ -34,11 +35,14 @@ } protected AbstractPortletCreationTask getCreatePortletTask() { - JavaPortletCreationTask task = new JavaPortletCreationTask(); + JavaPortletWizardPageFillingTask task = new JavaPortletWizardPageFillingTask(); task.setProject(PROJECT_NAME); task.setPackageName(PACKAGE_NAME); task.setClassName(CLASS_NAME); - return task; + + JavaPortletCreationTask wizardTask = new JavaPortletCreationTask(); + wizardTask.addWizardPage(task); + return wizardTask; } @Override Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreateJSFSeamPortletTemplate.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreateJSFSeamPortletTemplate.java 2012-01-02 09:12:55 UTC (rev 37603) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreateJSFSeamPortletTemplate.java 2012-01-02 10:31:33 UTC (rev 37604) @@ -23,6 +23,7 @@ JSFPortletCreationTask task = new JSFPortletCreationTask(); task.addWizardPage(new WizardPageDefaultsFillingTask()); task.addWizardPage(new WizardPageDefaultsFillingTask()); + task.addWizardPage(new WizardPageDefaultsFillingTask()); return task; } Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreatePortletProjectTemplate.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreatePortletProjectTemplate.java 2012-01-02 09:12:55 UTC (rev 37603) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreatePortletProjectTemplate.java 2012-01-02 10:31:33 UTC (rev 37604) @@ -11,10 +11,11 @@ import org.jboss.tools.portlet.ui.bot.entity.FacetDefinition; import org.jboss.tools.portlet.ui.bot.entity.WorkspaceFile; -import org.jboss.tools.portlet.ui.bot.task.AbstractSWTTask; import org.jboss.tools.portlet.ui.bot.task.facet.FacetsSelectionTask; +import org.jboss.tools.portlet.ui.bot.task.wizard.WizardFillingTask; import org.jboss.tools.portlet.ui.bot.task.wizard.WizardPageFillingTask; import org.jboss.tools.portlet.ui.bot.task.wizard.web.DynamicWebProjectCreationTask; +import org.jboss.tools.portlet.ui.bot.task.wizard.web.DynamicWebProjectWizardPageFillingTask; import org.jboss.tools.portlet.ui.bot.test.testcase.SWTTaskBasedTestCase; import org.jboss.tools.ui.bot.ext.SWTTestExt; import org.jboss.tools.ui.bot.ext.config.Annotations.Require; @@ -86,14 +87,17 @@ } } - protected AbstractSWTTask getCreateDynamicWebProjectTask() { - DynamicWebProjectCreationTask task = new DynamicWebProjectCreationTask(); + protected WizardFillingTask getCreateDynamicWebProjectTask() { + DynamicWebProjectWizardPageFillingTask task = new DynamicWebProjectWizardPageFillingTask(); task.setProjectName(getProjectName()); task.setWebModuleVersion("2.5"); task.setServerName(SWTTestExt.configuredState.getServer().name); task.setSelectFacetsTask(getSelectFacetsTask()); - task.addAllWizardPages(getAdditionalWizardPages()); - return task; + + DynamicWebProjectCreationTask wizardTask = new DynamicWebProjectCreationTask(); + wizardTask.addWizardPage(task); + wizardTask.addAllWizardPages(getAdditionalWizardPages()); + return wizardTask; } protected FacetsSelectionTask getSelectFacetsTask() {