Author: ljelinko Date: 2011-12-09 10:11:13 -0500 (Fri, 09 Dec 2011) New Revision: 37168 Added: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/CreateJSFPortletRuntime4x.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/CreateJSFPortletRuntime5x.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/CreateSeamPortletRuntime4x.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/CreateSeamPortletRuntime5x.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreateJSFSeamPortletRuntime4xTemplate.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreateJSFSeamPortletRuntime5xTemplate.java Removed: 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/seam/CreateSeamPortlet.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/jsf/CreateJSFPortletProject.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/JSFPortletTestSuite.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/CreateSeamPortletProject.java trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/SeamPortletTestSuite.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: changed tests to support 5.x and 4.x runtime 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-12-09 15:09:56 UTC (rev 37167) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/AllTestsSuite.java 2011-12-09 15:11:13 UTC (rev 37168) @@ -6,11 +6,13 @@ import org.jboss.tools.portlet.ui.bot.test.example.JSFPortletExample; import org.jboss.tools.portlet.ui.bot.test.example.JavaPortletExample; import org.jboss.tools.portlet.ui.bot.test.example.SeamPortletExample; -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.CreateJSFPortletRuntime4x; +import org.jboss.tools.portlet.ui.bot.test.jsf.CreateJSFPortletRuntime5x; 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.CreateSeamPortletRuntime4x; +import org.jboss.tools.portlet.ui.bot.test.seam.CreateSeamPortletRuntime5x; import org.jboss.tools.portlet.ui.bot.test.seam.RunSeamPortletOnServer; import org.junit.runner.RunWith; import org.junit.runners.Suite; @@ -21,10 +23,12 @@ CreateJavaPortlet.class, RunJavaPortletOnServer.class, CreateJSFPortletProject.class, - CreateJSFPortlet.class, + CreateJSFPortletRuntime4x.class, + CreateJSFPortletRuntime5x.class, RunJSFPortletOnServer.class, - CreateSeamPortletProject.class, - CreateSeamPortlet.class, + CreateSeamPortletProject.class, + CreateSeamPortletRuntime4x.class, + CreateSeamPortletRuntime5x.class, RunSeamPortletOnServer.class, JavaPortletExample.class, JSFPortletExample.class, Deleted: 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-12-09 15:09:56 UTC (rev 37167) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/CreateJSFPortlet.java 2011-12-09 15:11:13 UTC (rev 37168) @@ -1,19 +0,0 @@ -package org.jboss.tools.portlet.ui.bot.test.jsf; - -import static org.jboss.tools.portlet.ui.bot.test.jsf.CreateJSFPortletProject.PROJECT_NAME; - -import org.jboss.tools.portlet.ui.bot.test.template.CreateJSFSeamPortletTemplate; - -/** - * Creates a new jsf portlet and checks if the right files are generated. - * - * @author Lucia Jelinkova - * - */ -public class CreateJSFPortlet extends CreateJSFSeamPortletTemplate { - - @Override - protected String getProjectName() { - return PROJECT_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-12-09 15:09:56 UTC (rev 37167) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/CreateJSFPortletProject.java 2011-12-09 15:11:13 UTC (rev 37168) @@ -44,7 +44,7 @@ tasks.add(new WizardPageDefaultsFillingTask()); tasks.add(new JBossPortletCapabilitiesWizardPageFillingTask(JBossPortletCapabilitiesWizardPageFillingTask.Type.RUNTIME_PROVIDER)); tasks.add(new WizardPageDefaultsFillingTask()); - tasks.add(new JBossJSFPortletCapabilitiesWizardPageFillingTask(JBossJSFPortletCapabilitiesWizardPageFillingTask.Type.RUNTIME_PROVIDER)); + tasks.add(new JBossJSFPortletCapabilitiesWizardPageFillingTask(JBossJSFPortletCapabilitiesWizardPageFillingTask.Type.RUNTIME_PROVIDER, "/home/ljelinko/programs/jboss/EPP/jboss-epp-5.1/portletbridge")); return tasks; } Added: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/CreateJSFPortletRuntime4x.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/CreateJSFPortletRuntime4x.java (rev 0) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/CreateJSFPortletRuntime4x.java 2011-12-09 15:11:13 UTC (rev 37168) @@ -0,0 +1,19 @@ +package org.jboss.tools.portlet.ui.bot.test.jsf; + +import static org.jboss.tools.portlet.ui.bot.test.jsf.CreateJSFPortletProject.PROJECT_NAME; + +import org.jboss.tools.portlet.ui.bot.test.template.CreateJSFSeamPortletRuntime4xTemplate; + +/** + * Creates a new jsf portlet for 4.x runtime and checks if the right files are generated. + * + * @author Lucia Jelinkova + * + */ +public class CreateJSFPortletRuntime4x extends CreateJSFSeamPortletRuntime4xTemplate { + + @Override + protected String getProjectName() { + return PROJECT_NAME; + } +} Copied: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/CreateJSFPortletRuntime5x.java (from rev 37065, 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/CreateJSFPortletRuntime5x.java (rev 0) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/CreateJSFPortletRuntime5x.java 2011-12-09 15:11:13 UTC (rev 37168) @@ -0,0 +1,19 @@ +package org.jboss.tools.portlet.ui.bot.test.jsf; + +import static org.jboss.tools.portlet.ui.bot.test.jsf.CreateJSFPortletProject.PROJECT_NAME; + +import org.jboss.tools.portlet.ui.bot.test.template.CreateJSFSeamPortletRuntime5xTemplate; + +/** + * Creates a new jsf portlet for 5.x runtime and checks if the right files are generated. + * + * @author Lucia Jelinkova + * + */ +public class CreateJSFPortletRuntime5x extends CreateJSFSeamPortletRuntime5xTemplate { + + @Override + protected String getProjectName() { + return PROJECT_NAME; + } +} Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/JSFPortletTestSuite.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/JSFPortletTestSuite.java 2011-12-09 15:09:56 UTC (rev 37167) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/JSFPortletTestSuite.java 2011-12-09 15:11:13 UTC (rev 37168) @@ -7,7 +7,8 @@ @RunWith(RequirementAwareUsageWindowClosingSuite.class) @Suite.SuiteClasses({ CreateJSFPortletProject.class, - CreateJSFPortlet.class, + CreateJSFPortletRuntime4x.class, + CreateJSFPortletRuntime5x.class, RunJSFPortletOnServer.class }) public class JSFPortletTestSuite { Deleted: 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 2011-12-09 15:09:56 UTC (rev 37167) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/CreateSeamPortlet.java 2011-12-09 15:11:13 UTC (rev 37168) @@ -1,19 +0,0 @@ -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; - } -} Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/CreateSeamPortletProject.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/CreateSeamPortletProject.java 2011-12-09 15:09:56 UTC (rev 37167) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/CreateSeamPortletProject.java 2011-12-09 15:11:13 UTC (rev 37168) @@ -19,6 +19,7 @@ import org.jboss.tools.ui.bot.ext.config.Annotations.Server; import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState; import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType; +import org.jboss.tools.ui.bot.ext.config.TestConfigurator; /** @@ -31,6 +32,8 @@ public class CreateSeamPortletProject extends CreatePortletProjectTemplate{ public static final String PROJECT_NAME = "seam-portlet"; + + private static final String PORTLET_BRIDGE_AS_RELATIVE_PATH = "/server/default/deploy/jboss-portal.sar/portal-identity.sar/portal-identity.war/WEB-INF/lib"; @Override public String getProjectName() { @@ -54,10 +57,13 @@ List<WizardPageFillingTask> tasks = new ArrayList<WizardPageFillingTask>(); tasks.add(new WizardPageDefaultsFillingTask()); tasks.add(new WizardPageDefaultsFillingTask()); - tasks.add(new JBossPortletCapabilitiesWizardPageFillingTask(JBossPortletCapabilitiesWizardPageFillingTask.Type.RUNTIME_PROVIDER)); + tasks.add(new JBossPortletCapabilitiesWizardPageFillingTask( + JBossPortletCapabilitiesWizardPageFillingTask.Type.RUNTIME_PROVIDER)); tasks.add(new WizardPageDefaultsFillingTask()); tasks.add(getSeamFacetPageFillingTask()); - tasks.add(new JBossJSFPortletCapabilitiesWizardPageFillingTask(JBossJSFPortletCapabilitiesWizardPageFillingTask.Type.RUNTIME_PROVIDER, "/home/ljelinko/programs/jboss/EPP/jboss-epp-5.1/portletbridge")); + tasks.add(new JBossJSFPortletCapabilitiesWizardPageFillingTask( + JBossJSFPortletCapabilitiesWizardPageFillingTask.Type.RUNTIME_PROVIDER, + TestConfigurator.currentConfig.getServer().runtimeHome + PORTLET_BRIDGE_AS_RELATIVE_PATH)); return tasks; } Added: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/CreateSeamPortletRuntime4x.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/CreateSeamPortletRuntime4x.java (rev 0) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/CreateSeamPortletRuntime4x.java 2011-12-09 15:11:13 UTC (rev 37168) @@ -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.CreateJSFSeamPortletRuntime4xTemplate; + +/** + * Creates a new seam portlet for 4.x runtime and checks if the right files are generated. + * + * @author Lucia Jelinkova + * + */ +public class CreateSeamPortletRuntime4x extends CreateJSFSeamPortletRuntime4xTemplate { + + @Override + protected String getProjectName() { + return PROJECT_NAME; + } +} Copied: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/CreateSeamPortletRuntime5x.java (from rev 37065, 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/CreateSeamPortletRuntime5x.java (rev 0) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/CreateSeamPortletRuntime5x.java 2011-12-09 15:11:13 UTC (rev 37168) @@ -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.CreateJSFSeamPortletRuntime5xTemplate; + +/** + * Creates a new seam portlet for 5.x runtime and checks if the right files are generated. + * + * @author Lucia Jelinkova + * + */ +public class CreateSeamPortletRuntime5x extends CreateJSFSeamPortletRuntime5xTemplate { + + @Override + protected String getProjectName() { + return PROJECT_NAME; + } +} Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/SeamPortletTestSuite.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/SeamPortletTestSuite.java 2011-12-09 15:09:56 UTC (rev 37167) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/SeamPortletTestSuite.java 2011-12-09 15:11:13 UTC (rev 37168) @@ -7,7 +7,8 @@ @RunWith(RequirementAwareUsageWindowClosingSuite.class) @Suite.SuiteClasses({ CreateSeamPortletProject.class, - CreateSeamPortlet.class, + CreateSeamPortletRuntime4x.class, + CreateSeamPortletRuntime5x.class, RunSeamPortletOnServer.class }) public class SeamPortletTestSuite { Added: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreateJSFSeamPortletRuntime4xTemplate.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreateJSFSeamPortletRuntime4xTemplate.java (rev 0) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreateJSFSeamPortletRuntime4xTemplate.java 2011-12-09 15:11:13 UTC (rev 37168) @@ -0,0 +1,37 @@ +package org.jboss.tools.portlet.ui.bot.test.template; + +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + +import org.jboss.tools.ui.bot.ext.config.Annotations.Require; +import org.jboss.tools.ui.bot.ext.config.Annotations.Server; +import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState; + +/** + * Creates a new jsf portlet with 4.x runtime and checks if the right files are generated. + * + * @author Lucia Jelinkova + * + */ +@Require(clearWorkspace=false, clearProjects=false, server=(a)Server(version=&quot;4.3&quot;, state=ServerState.Present)) +public abstract class CreateJSFSeamPortletRuntime4xTemplate extends CreateJSFSeamPortletTemplate { + + @Override + protected List<String> getExpectedFiles() { + return Arrays.asList( + JSF_FOLDER + "edit.jsp", + JSF_FOLDER + "view.jsp", + JSF_FOLDER + "help.jsp", + DEFAULT_OBJECTS_XML, + PORTLET_INSTANCES_XML, + JBOSS_APP_XML, + JBOSS_PORTLET_XML + ); + } + + @Override + protected List<String> getNonExpectedFiles() { + return Collections.emptyList(); + } +} Added: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreateJSFSeamPortletRuntime5xTemplate.java =================================================================== --- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreateJSFSeamPortletRuntime5xTemplate.java (rev 0) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreateJSFSeamPortletRuntime5xTemplate.java 2011-12-09 15:11:13 UTC (rev 37168) @@ -0,0 +1,30 @@ +package org.jboss.tools.portlet.ui.bot.test.template; + +import java.util.Arrays; +import java.util.List; + +import org.jboss.tools.ui.bot.ext.config.Annotations.Require; +import org.jboss.tools.ui.bot.ext.config.Annotations.Server; +import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState; + +@Require(clearWorkspace=false, clearProjects=false, server=(a)Server(version=&quot;5.0&quot;, operator=">", state=ServerState.Present)) +public abstract class CreateJSFSeamPortletRuntime5xTemplate extends CreateJSFSeamPortletTemplate { + + @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); + } +} 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 2011-12-09 15:09:56 UTC (rev 37167) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreateJSFSeamPortletTemplate.java 2011-12-09 15:11:13 UTC (rev 37168) @@ -27,24 +27,6 @@ } @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)); } 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-12-09 15:09:56 UTC (rev 37167) +++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreatePortletProjectTemplate.java 2011-12-09 15:11:13 UTC (rev 37168) @@ -30,15 +30,13 @@ * @author Lucia Jelinkova * */ -@Require(server=@Server(required=true, state=ServerState.Present, type=ServerType.EPP)) +@Require(server=(a)Server(state=ServerState.Present, type=ServerType.EPP)) public abstract class CreatePortletProjectTemplate extends SWTTaskBasedTestCase { protected static final FacetDefinition JAVA_FACET = new FacetDefinition("Java", null, "1.6"); protected static final FacetDefinition JSF_FACET = new FacetDefinition("JavaServer Faces"); - public static final FacetDefinition SEAM_2_FACET = new FacetDefinition("Seam 2"); - protected static final String JBOSS_FACET_CATEGORY = "JBoss Portlets"; protected static final FacetDefinition CORE_PORTLET_FACET = new FacetDefinition("JBoss Core Portlet", JBOSS_FACET_CATEGORY);