Author: ljelinko Date: 2011-11-29 08:04:35 -0500 (Tue, 29 Nov 2011) New Revision: 36726 Added: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/CreateSeamPortlet.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/RunSeamPortletOnServer.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreateJSFSeamPortletTemplate.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/SeamPortletTestSuite.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/CreateJSFPortlet.java Log: created new seam tests 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-29 13:04:11 UTC (rev 36725) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/AllTestsSuite.java 2011-11-29 13:04:35 UTC (rev 36726) @@ -6,7 +6,9 @@ import org.jboss.tools.portlet.ui.bot.test.jsf.CreateJSFPortlet; import org.jboss.tools.portlet.ui.bot.test.jsf.CreateJSFPortletProject; import org.jboss.tools.portlet.ui.bot.test.jsf.RunJSFPortletOnServer; +import org.jboss.tools.portlet.ui.bot.test.seam.CreateSeamPortlet; import org.jboss.tools.portlet.ui.bot.test.seam.CreateSeamPortletProject; +import org.jboss.tools.portlet.ui.bot.test.seam.RunSeamPortletOnServer; import org.junit.runner.RunWith; import org.junit.runners.Suite; @@ -18,7 +20,9 @@ CreateJSFPortletProject.class, CreateJSFPortlet.class, RunJSFPortletOnServer.class, - CreateSeamPortletProject.class + CreateSeamPortletProject.class, + CreateSeamPortlet.class, + RunSeamPortletOnServer.class }) public class AllTestsSuite { Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/SeamPortletTestSuite.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/SeamPortletTestSuite.java 2011-11-29 13:04:11 UTC (rev 36725) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/SeamPortletTestSuite.java 2011-11-29 13:04:35 UTC (rev 36726) @@ -1,12 +1,16 @@ package org.jboss.tools.portlet.ui.bot.test; +import org.jboss.tools.portlet.ui.bot.test.seam.CreateSeamPortlet; import org.jboss.tools.portlet.ui.bot.test.seam.CreateSeamPortletProject; +import org.jboss.tools.portlet.ui.bot.test.seam.RunSeamPortletOnServer; import org.junit.runner.RunWith; import org.junit.runners.Suite; @RunWith(RequirementAwareUsageWindowClosingSuite.class) @Suite.SuiteClasses({ CreateSeamPortletProject.class, + CreateSeamPortlet.class, + RunSeamPortletOnServer.class }) public class SeamPortletTestSuite { Modified: 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 2011-11-29 13:04:11 UTC (rev 36725) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/CreateJSFPortlet.java 2011-11-29 13:04:35 UTC (rev 36726) @@ -2,58 +2,18 @@ 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.test.template.CreateJSFSeamPortletTemplate; -import org.jboss.tools.portlet.ui.bot.entity.XMLNode; -import org.jboss.tools.portlet.ui.bot.task.wizard.WizardPageDefaultsFillingTask; -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 { +public class CreateJSFPortlet extends CreateJSFSeamPortletTemplate { - private static final String FACES_CLASS_NAME = "javax.portlet.faces.GenericFacesPortlet"; - @Override protected String getProjectName() { return PROJECT_NAME; } - - @Override - protected AbstractPortletCreationTask getCreatePortletTask() { - JSFPortletCreationTask task = new JSFPortletCreationTask(); - task.addWizardPage(new WizardPageDefaultsFillingTask()); - task.addWizardPage(new WizardPageDefaultsFillingTask()); - return task; - } - - @Override - protected List<String> getExpectedFiles() { - return Arrays.asList( - JSF_FOLDER + "edit.jsp", - JSF_FOLDER + "view.jsp", - JSF_FOLDER + "help.jsp" - ); - } - - @Override - protected List<String> getNonExpectedFiles() { - return Arrays.asList( - DEFAULT_OBJECTS_XML, - PORTLET_INSTANCES_XML, - JBOSS_APP_XML, - JBOSS_PORTLET_XML); - } - - @Override - protected List<XMLNode> getExpectedXMLNodes() { - return Arrays.asList(new XMLNode("portlet-app/portlet/portlet-class", FACES_CLASS_NAME)); - } } Added: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/CreateSeamPortlet.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/CreateSeamPortlet.java (rev 0) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/CreateSeamPortlet.java 2011-11-29 13:04:35 UTC (rev 36726) @@ -0,0 +1,19 @@ +package org.jboss.tools.portlet.ui.bot.test.seam; + +import static org.jboss.tools.portlet.ui.bot.test.seam.CreateSeamPortletProject.PROJECT_NAME; + +import org.jboss.tools.portlet.ui.bot.test.template.CreateJSFSeamPortletTemplate; + +/** + * Creates a new seam portlet and checks if the right files are generated. + * + * @author Lucia Jelinkova + * + */ +public class CreateSeamPortlet extends CreateJSFSeamPortletTemplate { + + @Override + protected String getProjectName() { + return PROJECT_NAME; + } +} Added: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/RunSeamPortletOnServer.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/RunSeamPortletOnServer.java (rev 0) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/RunSeamPortletOnServer.java 2011-11-29 13:04:35 UTC (rev 36726) @@ -0,0 +1,20 @@ +package org.jboss.tools.portlet.ui.bot.test.seam; + +import static org.jboss.tools.portlet.ui.bot.test.seam.CreateSeamPortletProject.PROJECT_NAME; + +import org.jboss.tools.portlet.ui.bot.test.template.RunPortletOnServerTemplate; + +/** + * Performs Run on Server on the jsf portlet project and checks if there is no exception in the + * console. + * + * @author Lucia Jelinkova + * + */ +public class RunSeamPortletOnServer extends RunPortletOnServerTemplate { + + @Override + protected String getProjectName() { + return PROJECT_NAME; + } +} Added: 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 (rev 0) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreateJSFSeamPortletTemplate.java 2011-11-29 13:04:35 UTC (rev 36726) @@ -0,0 +1,51 @@ +package org.jboss.tools.portlet.ui.bot.test.template; + +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.WizardPageDefaultsFillingTask; +import org.jboss.tools.portlet.ui.bot.task.wizard.web.jboss.AbstractPortletCreationTask; +import org.jboss.tools.portlet.ui.bot.task.wizard.web.jboss.JSFPortletCreationTask; + +/** + * Creates a new jsf portlet and checks if the right files are generated. + * + * @author Lucia Jelinkova + * + */ +public abstract class CreateJSFSeamPortletTemplate extends CreatePortletTemplate { + + private static final String FACES_CLASS_NAME = "javax.portlet.faces.GenericFacesPortlet"; + + @Override + protected AbstractPortletCreationTask getCreatePortletTask() { + JSFPortletCreationTask task = new JSFPortletCreationTask(); + task.addWizardPage(new WizardPageDefaultsFillingTask()); + task.addWizardPage(new WizardPageDefaultsFillingTask()); + return task; + } + + @Override + protected List<String> getExpectedFiles() { + return Arrays.asList( + JSF_FOLDER + "edit.jsp", + JSF_FOLDER + "view.jsp", + JSF_FOLDER + "help.jsp" + ); + } + + @Override + protected List<String> getNonExpectedFiles() { + return Arrays.asList( + DEFAULT_OBJECTS_XML, + PORTLET_INSTANCES_XML, + JBOSS_APP_XML, + JBOSS_PORTLET_XML); + } + + @Override + protected List<XMLNode> getExpectedXMLNodes() { + return Arrays.asList(new XMLNode("portlet-app/portlet/portlet-class", FACES_CLASS_NAME)); + } +}