Author: ljelinko Date: 2011-11-24 06:20:11 -0500 (Thu, 24 Nov 2011) New Revision: 36608 Added: 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/task/wizard/web/jboss/JavaPortletWizardPageFillingTask.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/CreateJSFPortlet.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreatePortletTemplate.java Removed: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/web/jboss/PortletCreationTask.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/web/jboss/PortletWizardPageFillingTask.java Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/AllTestsSuite.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/JSFPortletTestSuite.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/core/CreateJavaPortletProject.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/CreateJSFPortletProject.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreatePortletProjectTemplate.java Log: created CreateJSFPortlet (and refactored CreatedJavaPortlet) Added: 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 (rev 0) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/web/jboss/AbstractPortletCreationTask.java 2011-11-24 11:20:11 UTC (rev 36608) @@ -0,0 +1,28 @@ +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; + +/** + * + * Common ancestor for tasks creating portlets. + * + * @author Lucia Jelinkova + * + */ +public abstract class AbstractPortletCreationTask extends WizardFillingTask { + + private static final String PORTLET_WIZARD_PATH = "JBoss Tools Web/Portlet"; + + private String portletWizardName; + + public AbstractPortletCreationTask(String portletWizardName) { + this.portletWizardName = portletWizardName; + } + + @Override + public void perform() { + performInnerTask(new WizardOpeningTask(portletWizardName, PORTLET_WIZARD_PATH)); + super.perform(); + } +} Added: 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 (rev 0) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/web/jboss/JSFPortletCreationTask.java 2011-11-24 11:20:11 UTC (rev 36608) @@ -0,0 +1,15 @@ +package org.jboss.tools.portlet.ui.bot.task.wizard.web.jboss; + + +/** + * Creates a new java portlet using a JBoss wizard. + * + * @author Lucia Jelinkova + * + */ +public class JSFPortletCreationTask extends AbstractPortletCreationTask { + + public JSFPortletCreationTask() { + super("JBoss JSF/Seam Portlet"); + } +} Copied: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/web/jboss/JavaPortletCreationTask.java (from rev 36592, trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/web/jboss/PortletCreationTask.java) =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/web/jboss/JavaPortletCreationTask.java (rev 0) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/web/jboss/JavaPortletCreationTask.java 2011-11-24 11:20:11 UTC (rev 36608) @@ -0,0 +1,39 @@ +package org.jboss.tools.portlet.ui.bot.task.wizard.web.jboss; + + +/** + * Creates a new java portlet using a JBoss wizard. + * + * @author Lucia Jelinkova + * + */ +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); + } +} Copied: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/web/jboss/JavaPortletWizardPageFillingTask.java (from rev 36592, trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/web/jboss/PortletWizardPageFillingTask.java) =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/web/jboss/JavaPortletWizardPageFillingTask.java (rev 0) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/web/jboss/JavaPortletWizardPageFillingTask.java 2011-11-24 11:20:11 UTC (rev 36608) @@ -0,0 +1,60 @@ +package org.jboss.tools.portlet.ui.bot.task.wizard.web.jboss; + +import org.jboss.tools.portlet.ui.bot.task.AbstractSWTTask; +import org.jboss.tools.portlet.ui.bot.task.wizard.WizardPageFillingTask; + +public class JavaPortletWizardPageFillingTask extends AbstractSWTTask implements WizardPageFillingTask { + + private String project; + + private String sourceFolder; + + private String packageName; + + private String className; + + private String superclass; + + @Override + public void perform() { + if (project != null){ + getBot().comboBoxWithLabel("Project:").setSelection(project); + } + + if (sourceFolder != null){ + getBot().textWithLabel("Source folder:").setText(sourceFolder); + } + + if (packageName != null){ + getBot().textWithLabel("Java package:").setText(packageName); + } + + if (className != null){ + getBot().textWithLabel("Class name:").setText(className); + } + + if (superclass != null){ + getBot().textWithLabel("Superclass:").setText(superclass); + } + } + + public void setProject(String project) { + this.project = project; + } + + public void setSourceFolder(String sourceFolder) { + this.sourceFolder = sourceFolder; + } + + public void setPackageName(String packageName) { + this.packageName = packageName; + } + + public void setClassName(String className) { + this.className = className; + } + + public void setSuperclass(String superclass) { + this.superclass = superclass; + } +} Deleted: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/web/jboss/PortletCreationTask.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/web/jboss/PortletCreationTask.java 2011-11-24 11:19:07 UTC (rev 36607) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/web/jboss/PortletCreationTask.java 2011-11-24 11:20:11 UTC (rev 36608) @@ -1,47 +0,0 @@ -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; - -/** - * Creates a new portlet using a JBoss wizard. - * - * @author Lucia Jelinkova - * - */ -public class PortletCreationTask extends WizardFillingTask { - - private PortletWizardPageFillingTask firstPage; - - public PortletCreationTask() { - super(); - firstPage = new PortletWizardPageFillingTask(); - addWizardPage(firstPage); - } - - @Override - public void perform() { - performInnerTask(new WizardOpeningTask("Java Portlet", "JBoss Tools Web/Portlet")); - super.perform(); - } - - 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); - } -} Deleted: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/web/jboss/PortletWizardPageFillingTask.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/web/jboss/PortletWizardPageFillingTask.java 2011-11-24 11:19:07 UTC (rev 36607) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/web/jboss/PortletWizardPageFillingTask.java 2011-11-24 11:20:11 UTC (rev 36608) @@ -1,60 +0,0 @@ -package org.jboss.tools.portlet.ui.bot.task.wizard.web.jboss; - -import org.jboss.tools.portlet.ui.bot.task.AbstractSWTTask; -import org.jboss.tools.portlet.ui.bot.task.wizard.WizardPageFillingTask; - -public class PortletWizardPageFillingTask extends AbstractSWTTask implements WizardPageFillingTask { - - private String project; - - private String sourceFolder; - - private String packageName; - - private String className; - - private String superclass; - - @Override - public void perform() { - if (project != null){ - getBot().comboBoxWithLabel("Project:").setSelection(project); - } - - if (sourceFolder != null){ - getBot().textWithLabel("Source folder:").setText(sourceFolder); - } - - if (packageName != null){ - getBot().textWithLabel("Java package:").setText(packageName); - } - - if (className != null){ - getBot().textWithLabel("Class name:").setText(className); - } - - if (superclass != null){ - getBot().textWithLabel("Superclass:").setText(superclass); - } - } - - public void setProject(String project) { - this.project = project; - } - - public void setSourceFolder(String sourceFolder) { - this.sourceFolder = sourceFolder; - } - - public void setPackageName(String packageName) { - this.packageName = packageName; - } - - public void setClassName(String className) { - this.className = className; - } - - public void setSuperclass(String superclass) { - this.superclass = superclass; - } -} Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/AllTestsSuite.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/AllTestsSuite.java 2011-11-24 11:19:07 UTC (rev 36607) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/AllTestsSuite.java 2011-11-24 11:20:11 UTC (rev 36608) @@ -3,6 +3,7 @@ import org.jboss.tools.portlet.ui.bot.test.core.CreateJavaPortlet; import org.jboss.tools.portlet.ui.bot.test.core.CreateJavaPortletProject; import org.jboss.tools.portlet.ui.bot.test.core.RunJavaPortletOnServer; +import org.jboss.tools.portlet.ui.bot.test.jsf.CreateJSFPortlet; import org.jboss.tools.portlet.ui.bot.test.jsf.CreateJSFPortletProject; import org.junit.runner.RunWith; import org.junit.runners.Suite; @@ -12,7 +13,8 @@ CreateJavaPortletProject.class, CreateJavaPortlet.class, RunJavaPortletOnServer.class, - CreateJSFPortletProject.class + CreateJSFPortletProject.class, + CreateJSFPortlet.class }) public class AllTestsSuite { Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/JSFPortletTestSuite.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/JSFPortletTestSuite.java 2011-11-24 11:19:07 UTC (rev 36607) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/JSFPortletTestSuite.java 2011-11-24 11:20:11 UTC (rev 36608) @@ -1,5 +1,6 @@ package org.jboss.tools.portlet.ui.bot.test; +import org.jboss.tools.portlet.ui.bot.test.jsf.CreateJSFPortlet; import org.jboss.tools.portlet.ui.bot.test.jsf.CreateJSFPortletProject; import org.junit.runner.RunWith; import org.junit.runners.Suite; @@ -7,6 +8,7 @@ @RunWith(RequirementAwareUsageWindowClosingSuite.class) @Suite.SuiteClasses({ CreateJSFPortletProject.class, + CreateJSFPortlet.class }) public class JSFPortletTestSuite { 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 2011-11-24 11:19:07 UTC (rev 36607) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/CreateJavaPortlet.java 2011-11-24 11:20:11 UTC (rev 36608) @@ -1,26 +1,24 @@ package org.jboss.tools.portlet.ui.bot.test.core; -import static org.jboss.tools.portlet.ui.bot.entity.EntityFactory.file; -import static org.jboss.tools.portlet.ui.bot.matcher.factory.DefaultMatchersFactory.isNumberOfErrors; -import static org.jboss.tools.portlet.ui.bot.matcher.factory.WorkspaceMatchersFactory.containsNodes; -import static org.jboss.tools.portlet.ui.bot.matcher.factory.WorkspaceMatchersFactory.exists; import static org.jboss.tools.portlet.ui.bot.test.core.CreateJavaPortletProject.PROJECT_NAME; +import java.util.Arrays; +import java.util.List; + import org.jboss.tools.portlet.ui.bot.entity.XMLNode; -import org.jboss.tools.portlet.ui.bot.task.SWTTask; -import org.jboss.tools.portlet.ui.bot.task.wizard.web.jboss.PortletCreationTask; -import org.jboss.tools.portlet.ui.bot.test.testcase.SWTTaskBasedTestCase; -import org.junit.Test; +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.test.template.CreatePortletTemplate; /** - * Creates a new java portlet. + * Creates a new java portlet and checks if the right files are generated. * * @author Lucia Jelinkova * */ -public class CreateJavaPortlet extends SWTTaskBasedTestCase { +public class CreateJavaPortlet extends CreatePortletTemplate { - private static final String CLASS_NAME = "UITestingPortlet"; + private static final String CLASS_NAME = "UITestingJavaPortlet"; private static final String PACKAGE_NAME = "org.jboss.tools.tests.ui.portlet"; @@ -30,22 +28,29 @@ private static final String FULL_CLASS_NAME = PACKAGE_NAME + "." + CLASS_NAME; - @Test - public void testCreate(){ - doPerform(getCreatePortletTask()); - - doAssertThat(0, isNumberOfErrors()); - doAssertThat(file(PROJECT_NAME, CLASS_FILE), exists()); - doAssertThat(file(PROJECT_NAME, "WebContent/WEB-INF/default-object.xml"), exists()); - doAssertThat(file(PROJECT_NAME, "WebContent/WEB-INF/portlet-instances.xml"), exists()); - doAssertThat(file(PROJECT_NAME, "WebContent/WEB-INF/portlet.xml"), containsNodes(new XMLNode("portlet-app/portlet/portlet-class", FULL_CLASS_NAME))); + @Override + protected String getProjectName() { + return PROJECT_NAME; } - - private SWTTask getCreatePortletTask() { - PortletCreationTask task = new PortletCreationTask(); + + protected AbstractPortletCreationTask getCreatePortletTask() { + JavaPortletCreationTask task = new JavaPortletCreationTask(); task.setProject(PROJECT_NAME); task.setPackageName(PACKAGE_NAME); task.setClassName(CLASS_NAME); return task; } + + @Override + protected List<String> getExpectedFiles() { + return Arrays.asList( + "WebContent/WEB-INF/default-object.xml", + "WebContent/WEB-INF/portlet-instances.xml", + CLASS_FILE); + } + + @Override + protected List<XMLNode> getExpectedXMLNodes() { + return Arrays.asList(new XMLNode("portlet-app/portlet/portlet-class", FULL_CLASS_NAME)); + } } Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/CreateJavaPortletProject.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/CreateJavaPortletProject.java 2011-11-24 11:19:07 UTC (rev 36607) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/CreateJavaPortletProject.java 2011-11-24 11:20:11 UTC (rev 36608) @@ -1,6 +1,7 @@ package org.jboss.tools.portlet.ui.bot.test.core; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import org.jboss.tools.portlet.ui.bot.entity.FacetDefinition; @@ -40,4 +41,9 @@ tasks.add(new JBossPortletCapabilitiesWizardPageFillingTask(JBossPortletCapabilitiesWizardPageFillingTask.Type.RUNTIME_PROVIDER)); return tasks; } + + @Override + public List<String> getExpectedFiles() { + return Arrays.asList(WEB_XML, PORTLET_XML, PORTLET_LIBRARIES); + } } Added: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/CreateJSFPortlet.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/CreateJSFPortlet.java (rev 0) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/CreateJSFPortlet.java 2011-11-24 11:20:11 UTC (rev 36608) @@ -0,0 +1,47 @@ +package org.jboss.tools.portlet.ui.bot.test.jsf; + +import static org.jboss.tools.portlet.ui.bot.test.jsf.CreateJSFPortletProject.PROJECT_NAME; + +import java.util.Arrays; +import java.util.List; + +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.JSFPortletCreationTask; +import org.jboss.tools.portlet.ui.bot.test.template.CreatePortletTemplate; + +/** + * Creates a new jsf portlet and checks if the right files are generated. + * + * @author Lucia Jelinkova + * + */ +public class CreateJSFPortlet extends CreatePortletTemplate { + + private static final String FACES_CLASS_NAME = "javax.portlet.faces.GenericFacesPortlet"; + + private static final String JSF_FOLDER = "WebContent/jsf/"; + + @Override + protected String getProjectName() { + return PROJECT_NAME; + } + + @Override + protected AbstractPortletCreationTask getCreatePortletTask() { + return new JSFPortletCreationTask(); + } + + @Override + protected List<String> getExpectedFiles() { + return Arrays.asList( + JSF_FOLDER + "edit.jsp", + JSF_FOLDER + "view.jsp", + JSF_FOLDER + "help.jsp"); + } + + @Override + protected List<XMLNode> getExpectedXMLNodes() { + return Arrays.asList(new XMLNode("portlet-app/portlet/portlet-class", FACES_CLASS_NAME)); + } +} Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/CreateJSFPortletProject.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/CreateJSFPortletProject.java 2011-11-24 11:19:07 UTC (rev 36607) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/CreateJSFPortletProject.java 2011-11-24 11:20:11 UTC (rev 36608) @@ -1,6 +1,7 @@ package org.jboss.tools.portlet.ui.bot.test.jsf; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import org.jboss.tools.portlet.ui.bot.entity.FacetDefinition; @@ -25,6 +26,10 @@ protected static final FacetDefinition JSF_FACET = new FacetDefinition("JavaServer Faces"); + protected static final String FACES_CONFIG_XML = "WebContent/WEB-INF/faces-config.xml"; + + protected static final String WEB_APP_LIBRARIES = "Web App Libraries"; + @Override public String getProjectName() { return PROJECT_NAME; @@ -50,4 +55,9 @@ tasks.add(new JBossJSFPortletCapabilitiesWizardPageFillingTask(JBossJSFPortletCapabilitiesWizardPageFillingTask.Type.RUNTIME_PROVIDER)); return tasks; } + + @Override + public List<String> getExpectedFiles() { + return Arrays.asList(WEB_XML, PORTLET_XML, PORTLET_LIBRARIES, FACES_CONFIG_XML, WEB_APP_LIBRARIES); + } } 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 2011-11-24 11:19:07 UTC (rev 36607) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreatePortletProjectTemplate.java 2011-11-24 11:20:11 UTC (rev 36608) @@ -1,14 +1,15 @@ package org.jboss.tools.portlet.ui.bot.test.template; -import static org.jboss.tools.portlet.ui.bot.entity.EntityFactory.file; import static org.jboss.tools.portlet.ui.bot.matcher.factory.DefaultMatchersFactory.isNumberOfErrors; -import static org.jboss.tools.portlet.ui.bot.matcher.factory.WorkspaceMatchersFactory.exists; +import static org.jboss.tools.portlet.ui.bot.matcher.factory.WorkspaceMatchersFactory.exist; import static org.jboss.tools.portlet.ui.bot.matcher.factory.WorkspaceMatchersFactory.hasFacets; import static org.jboss.tools.portlet.ui.bot.matcher.factory.WorkspaceMatchersFactory.isExistingProject; +import java.util.ArrayList; import java.util.List; 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.WizardPageFillingTask; @@ -37,21 +38,28 @@ protected static final FacetDefinition JAVA_FACET = new FacetDefinition("Java", null, "1.6"); + protected static final String WEB_XML = "WebContent/WEB-INF/web.xml"; + + protected static final String PORTLET_XML = "WebContent/WEB-INF/portlet.xml"; + + protected static final String PORTLET_LIBRARIES = "JBoss Portlet Libraries"; + public abstract String getProjectName(); public abstract List<FacetDefinition> getRequiredFacets(); public abstract List<WizardPageFillingTask> getAdditionalWizardPages(); + public abstract List<String> getExpectedFiles(); + @Test public void testcreate(){ doPerform(getCreateDynamicWebProjectTask()); doAssertThat(0, isNumberOfErrors()); doAssertThat(getProjectName(), isExistingProject()); - doAssertThat(file(getProjectName(), "WebContent/WEB-INF/portlet.xml"), exists()); - doAssertThat(file(getProjectName(), "JBoss Portlet Libraries"), exists()); doAssertThat(getProjectName(), hasFacets(getRequiredFacets())); + doAssertThat(getExpectedWorkspaceFiles(), exist()); } protected AbstractSWTTask getCreateDynamicWebProjectTask() { @@ -69,4 +77,14 @@ task.addAllFacets(getRequiredFacets()); return task; } + + private List<WorkspaceFile> getExpectedWorkspaceFiles(){ + List<WorkspaceFile> expectedWorkspaceFiles = new ArrayList<WorkspaceFile>(); + + for (String file : getExpectedFiles()){ + expectedWorkspaceFiles.add(new WorkspaceFile(getProjectName(), file)); + } + + return expectedWorkspaceFiles; + } } Added: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreatePortletTemplate.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreatePortletTemplate.java (rev 0) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreatePortletTemplate.java 2011-11-24 11:20:11 UTC (rev 36608) @@ -0,0 +1,53 @@ +package org.jboss.tools.portlet.ui.bot.test.template; + +import static org.jboss.tools.portlet.ui.bot.entity.EntityFactory.file; +import static org.jboss.tools.portlet.ui.bot.matcher.factory.DefaultMatchersFactory.isNumberOfErrors; +import static org.jboss.tools.portlet.ui.bot.matcher.factory.WorkspaceMatchersFactory.containsNodes; +import static org.jboss.tools.portlet.ui.bot.matcher.factory.WorkspaceMatchersFactory.exist; + +import java.util.ArrayList; +import java.util.List; + +import org.jboss.tools.portlet.ui.bot.entity.WorkspaceFile; +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.test.testcase.SWTTaskBasedTestCase; +import org.junit.Test; + +/** + * template test that creates a portlet (specified by subclasses) and asserts + * if the right files have been generated. + * + * @author Lucia Jelinkova + * + */ +public abstract class CreatePortletTemplate extends SWTTaskBasedTestCase { + + protected abstract String getProjectName(); + + protected abstract AbstractPortletCreationTask getCreatePortletTask(); + + protected abstract List<String> getExpectedFiles(); + + protected abstract List<XMLNode> getExpectedXMLNodes(); + + @Test + public void testCreate(){ + doPerform(getCreatePortletTask()); + + doAssertThat(0, isNumberOfErrors()); + doAssertThat(getExpectedWorkspaceFiles(), exist()); + doAssertThat(file(getProjectName(), "WebContent/WEB-INF/portlet.xml"), + containsNodes(getExpectedXMLNodes())); + } + + private List<WorkspaceFile> getExpectedWorkspaceFiles(){ + List<WorkspaceFile> expectedWorkspaceFiles = new ArrayList<WorkspaceFile>(); + + for (String file : getExpectedFiles()){ + expectedWorkspaceFiles.add(new WorkspaceFile(getProjectName(), file)); + } + + return expectedWorkspaceFiles; + } +}