[jbosstools-commits] JBoss Tools SVN: r39610 - in trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test: src/org/jboss/tools/portlet/ui/bot/matcher/browser and 7 other directories.
jbosstools-commits at lists.jboss.org
jbosstools-commits at lists.jboss.org
Mon Mar 19 08:26:46 EDT 2012
Author: ljelinko
Date: 2012-03-19 08:26:45 -0400 (Mon, 19 Mar 2012)
New Revision: 39610
Added:
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/launchers/PortletServerTestSuite.launch
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/browser/BrowserUrlMatcher.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/facet/Facets.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/server/
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/server/PortletServerTestSuite.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/server/RunAsLoadsPortalURLRuntime4x.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/server/RunAsLoadsPortalURLRuntime5x.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/RunAsLoadsPortalURLTemplate.java
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/jsf/CreateJSFPortletProject.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/template/CreatePortletProjectTemplate.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/RunPortletOnServerTemplate.java
Log:
Created tests for the URL loaded in browser after Run as...
Added: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/launchers/PortletServerTestSuite.launch
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/launchers/PortletServerTestSuite.launch (rev 0)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/launchers/PortletServerTestSuite.launch 2012-03-19 12:26:45 UTC (rev 39610)
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.swtbot.eclipse.ui.launcher.JunitLaunchConfig">
+<booleanAttribute key="append.args" value="true"/>
+<booleanAttribute key="askclear" value="false"/>
+<booleanAttribute key="automaticAdd" value="true"/>
+<booleanAttribute key="automaticValidate" value="false"/>
+<stringAttribute key="bootstrap" value=""/>
+<stringAttribute key="checked" value="[NONE]"/>
+<booleanAttribute key="clearConfig" value="true"/>
+<booleanAttribute key="clearws" value="true"/>
+<booleanAttribute key="clearwslog" value="false"/>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
+<booleanAttribute key="default" value="true"/>
+<booleanAttribute key="includeOptional" value="true"/>
+<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/server/PortletServerTestSuite.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<mapAttribute key="org.eclipse.debug.core.environmentVariables">
+<mapEntry key="DISPLAY" value=":${string_prompt:display number:0}"/>
+</mapAttribute>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jboss.tools.portlet.ui.bot.test.server.PortletServerTestSuite"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.jboss.tools.portlet.ui.bot.test"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dswtbot.test.properties.file=${file_prompt:"Please choose a SWTBot configuration file":${workspace_loc}/org.jboss.tools.portlet.ui.bot.test/resources/generated_config_files} -Xmx1024m -XX:MaxPermSize=256m"/>
+<stringAttribute key="pde.version" value="3.3"/>
+<stringAttribute key="product" value="org.eclipse.platform.ide"/>
+<booleanAttribute key="show_selected_only" value="false"/>
+<booleanAttribute key="tracing" value="false"/>
+<booleanAttribute key="useCustomFeatures" value="false"/>
+<booleanAttribute key="useDefaultConfig" value="true"/>
+<booleanAttribute key="useDefaultConfigArea" value="false"/>
+<booleanAttribute key="useProduct" value="true"/>
+</launchConfiguration>
Added: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/browser/BrowserUrlMatcher.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/browser/BrowserUrlMatcher.java (rev 0)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/browser/BrowserUrlMatcher.java 2012-03-19 12:26:45 UTC (rev 39610)
@@ -0,0 +1,28 @@
+package org.jboss.tools.portlet.ui.bot.matcher.browser;
+
+import org.hamcrest.Description;
+import org.jboss.tools.portlet.ui.bot.matcher.AbstractSWTMatcher;
+import org.jboss.tools.ui.bot.ext.SWTBotFactory;
+
+/**
+ * Checks the URL of the page laoded in the browser.
+ *
+ * @author Lucia Jelinkova
+ *
+ */
+public class BrowserUrlMatcher extends AbstractSWTMatcher<String> {
+
+ private String realURL;
+
+ @Override
+ public boolean matchesSafely(String expectedURL) {
+ realURL = SWTBotFactory.getBot().browser().getUrl();
+ return expectedURL.equals(realURL);
+ }
+
+ @Override
+ public void describeTo(Description description) {
+ description.appendText("is loaded in browser but it was: ");
+ description.appendValue(realURL);
+ }
+}
Added: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/facet/Facets.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/facet/Facets.java (rev 0)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/facet/Facets.java 2012-03-19 12:26:45 UTC (rev 39610)
@@ -0,0 +1,19 @@
+package org.jboss.tools.portlet.ui.bot.task.facet;
+
+import org.jboss.tools.portlet.ui.bot.entity.FacetDefinition;
+
+public class Facets {
+
+ public static final FacetDefinition JAVA_FACET = new FacetDefinition("Java", null, "1.6");
+
+ public static final FacetDefinition JSF_FACET = new FacetDefinition("JavaServer Faces");
+
+ private static final String JBOSS_FACET_CATEGORY = "JBoss Portlets";
+
+ public static final FacetDefinition CORE_PORTLET_FACET = new FacetDefinition("JBoss Core Portlet", JBOSS_FACET_CATEGORY);
+
+ public static final FacetDefinition JSF_PORTLET_FACET = new FacetDefinition("JBoss JSF Portlet", JBOSS_FACET_CATEGORY);
+
+ public static final FacetDefinition SEAM_PORTLET_FACET = new FacetDefinition("JBoss Seam Portlet", JBOSS_FACET_CATEGORY);
+
+}
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 2012-03-19 11:16:28 UTC (rev 39609)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/CreateJavaPortletProject.java 2012-03-19 12:26:45 UTC (rev 39610)
@@ -5,6 +5,7 @@
import java.util.List;
import org.jboss.tools.portlet.ui.bot.entity.FacetDefinition;
+import org.jboss.tools.portlet.ui.bot.task.facet.Facets;
import org.jboss.tools.portlet.ui.bot.task.wizard.WizardPageDefaultsFillingTask;
import org.jboss.tools.portlet.ui.bot.task.wizard.WizardPageFillingTask;
import org.jboss.tools.portlet.ui.bot.task.wizard.web.jboss.JBossPortletCapabilitiesWizardPageFillingTask;
@@ -28,8 +29,8 @@
@Override
public List<FacetDefinition> getRequiredFacets() {
List<FacetDefinition> facets = new ArrayList<FacetDefinition>();
- facets.add(JAVA_FACET);
- facets.add(CORE_PORTLET_FACET);
+ facets.add(Facets.JAVA_FACET);
+ facets.add(Facets.CORE_PORTLET_FACET);
return facets;
}
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 2012-03-19 11:16:28 UTC (rev 39609)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/CreateJSFPortletProject.java 2012-03-19 12:26:45 UTC (rev 39610)
@@ -5,6 +5,7 @@
import java.util.List;
import org.jboss.tools.portlet.ui.bot.entity.FacetDefinition;
+import org.jboss.tools.portlet.ui.bot.task.facet.Facets;
import org.jboss.tools.portlet.ui.bot.task.wizard.WizardPageDefaultsFillingTask;
import org.jboss.tools.portlet.ui.bot.task.wizard.WizardPageFillingTask;
import org.jboss.tools.portlet.ui.bot.task.wizard.web.jboss.JBossJSFPortletCapabilitiesWizardPageFillingTask;
@@ -31,10 +32,10 @@
@Override
public List<FacetDefinition> getRequiredFacets() {
List<FacetDefinition> facets = new ArrayList<FacetDefinition>();
- facets.add(JAVA_FACET);
- facets.add(JSF_FACET);
- facets.add(CORE_PORTLET_FACET);
- facets.add(JSF_PORTLET_FACET);
+ facets.add(Facets.JAVA_FACET);
+ facets.add(Facets.JSF_FACET);
+ facets.add(Facets.CORE_PORTLET_FACET);
+ facets.add(Facets.JSF_PORTLET_FACET);
return facets;
}
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 2012-03-19 11:16:28 UTC (rev 39609)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/seam/CreateSeamPortletProject.java 2012-03-19 12:26:45 UTC (rev 39610)
@@ -6,6 +6,7 @@
import java.util.List;
import org.jboss.tools.portlet.ui.bot.entity.FacetDefinition;
+import org.jboss.tools.portlet.ui.bot.task.facet.Facets;
import org.jboss.tools.portlet.ui.bot.task.wizard.WizardPageDefaultsFillingTask;
import org.jboss.tools.portlet.ui.bot.task.wizard.WizardPageFillingTask;
import org.jboss.tools.portlet.ui.bot.task.wizard.web.jboss.JBossJSFPortletCapabilitiesWizardPageFillingTask;
@@ -41,12 +42,12 @@
@Override
public List<FacetDefinition> getRequiredFacets() {
List<FacetDefinition> facets = new ArrayList<FacetDefinition>();
- facets.add(JAVA_FACET);
- facets.add(JSF_FACET);
+ facets.add(Facets.JAVA_FACET);
+ facets.add(Facets.JSF_FACET);
facets.add(new FacetDefinition("Seam", null, configuredState.getSeam().version));
- facets.add(CORE_PORTLET_FACET);
- facets.add(JSF_PORTLET_FACET);
- facets.add(SEAM_PORTLET_FACET);
+ facets.add(Facets.CORE_PORTLET_FACET);
+ facets.add(Facets.JSF_PORTLET_FACET);
+ facets.add(Facets.SEAM_PORTLET_FACET);
return facets;
}
Added: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/server/PortletServerTestSuite.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/server/PortletServerTestSuite.java (rev 0)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/server/PortletServerTestSuite.java 2012-03-19 12:26:45 UTC (rev 39610)
@@ -0,0 +1,14 @@
+package org.jboss.tools.portlet.ui.bot.test.server;
+
+import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+ at RunWith(RequirementAwareSuite.class)
+ at Suite.SuiteClasses({
+ RunAsLoadsPortalURLRuntime4x.class,
+ RunAsLoadsPortalURLRuntime5x.class
+ })
+public class PortletServerTestSuite {
+
+}
Added: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/server/RunAsLoadsPortalURLRuntime4x.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/server/RunAsLoadsPortalURLRuntime4x.java (rev 0)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/server/RunAsLoadsPortalURLRuntime4x.java 2012-03-19 12:26:45 UTC (rev 39610)
@@ -0,0 +1,15 @@
+package org.jboss.tools.portlet.ui.bot.test.server;
+
+import org.jboss.tools.portlet.ui.bot.test.template.RunAsLoadsPortalURLTemplate;
+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;
+
+ at Require(server=@Server(version="4.3", state=ServerState.Running))
+public class RunAsLoadsPortalURLRuntime4x extends RunAsLoadsPortalURLTemplate {
+
+ @Override
+ public String getExpectedURL() {
+ return "http://localhost:8080/portal";
+ }
+}
Added: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/server/RunAsLoadsPortalURLRuntime5x.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/server/RunAsLoadsPortalURLRuntime5x.java (rev 0)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/server/RunAsLoadsPortalURLRuntime5x.java 2012-03-19 12:26:45 UTC (rev 39610)
@@ -0,0 +1,15 @@
+package org.jboss.tools.portlet.ui.bot.test.server;
+
+import org.jboss.tools.portlet.ui.bot.test.template.RunAsLoadsPortalURLTemplate;
+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;
+
+ at Require(server=@Server(version="5.0", operator=">", state=ServerState.Running))
+public class RunAsLoadsPortalURLRuntime5x extends RunAsLoadsPortalURLTemplate {
+
+ @Override
+ public String getExpectedURL() {
+ return "http://localhost:8080/portal/classic/";
+ }
+}
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-03-19 11:16:28 UTC (rev 39609)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreatePortletProjectTemplate.java 2012-03-19 12:26:45 UTC (rev 39610)
@@ -34,18 +34,6 @@
@Require(server=@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");
-
- protected static final String JBOSS_FACET_CATEGORY = "JBoss Portlets";
-
- protected static final FacetDefinition CORE_PORTLET_FACET = new FacetDefinition("JBoss Core Portlet", JBOSS_FACET_CATEGORY);
-
- protected static final FacetDefinition JSF_PORTLET_FACET = new FacetDefinition("JBoss JSF Portlet", JBOSS_FACET_CATEGORY);
-
- public static final FacetDefinition SEAM_PORTLET_FACET = new FacetDefinition("JBoss Seam Portlet", JBOSS_FACET_CATEGORY);
-
protected static final String WEB_INF = "WebContent/WEB-INF/";
protected static final String FACES_CONFIG_XML = WEB_INF + "faces-config.xml";
Added: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/RunAsLoadsPortalURLTemplate.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/RunAsLoadsPortalURLTemplate.java (rev 0)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/RunAsLoadsPortalURLTemplate.java 2012-03-19 12:26:45 UTC (rev 39610)
@@ -0,0 +1,66 @@
+package org.jboss.tools.portlet.ui.bot.test.template;
+
+import org.jboss.tools.portlet.ui.bot.matcher.browser.BrowserUrlMatcher;
+import org.jboss.tools.portlet.ui.bot.task.SWTTask;
+import org.jboss.tools.portlet.ui.bot.task.facet.Facets;
+import org.jboss.tools.portlet.ui.bot.task.facet.FacetsSelectionTask;
+import org.jboss.tools.portlet.ui.bot.task.server.RunninngProjectOnServerTask;
+import org.jboss.tools.portlet.ui.bot.task.wizard.WizardPageDefaultsFillingTask;
+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.task.wizard.web.jboss.JBossPortletCapabilitiesWizardPageFillingTask;
+import org.jboss.tools.portlet.ui.bot.test.testcase.SWTTaskBasedTestCase;
+import org.jboss.tools.ui.bot.ext.SWTTestExt;
+import org.junit.Test;
+
+/**
+ * Creates a java portlet and checks the loaded URL in browser after Run as...
+ *
+ * This test is ran only once - no need to run it specially for java, jsf and seam portlet.
+ *
+ * @author Lucia Jelinkova
+ *
+ */
+public abstract class RunAsLoadsPortalURLTemplate extends SWTTaskBasedTestCase {
+
+ private static final String PROJECT_NAME = "runAsURLTestProject";
+
+ public abstract String getExpectedURL();
+
+ @Test
+ public void runAsLoadsPortalURL(){
+ doPerform(createJavaPortletTask());
+ doPerform(runOnServerTask());
+
+ doAssertThatInWorkspace(getExpectedURL(), new BrowserUrlMatcher());
+ }
+
+ private SWTTask createJavaPortletTask() {
+ DynamicWebProjectCreationTask wizardTask = new DynamicWebProjectCreationTask();
+ wizardTask.addWizardPage(dynamicWebProjectTask());
+ wizardTask.addWizardPage(new WizardPageDefaultsFillingTask());
+ wizardTask.addWizardPage(new WizardPageDefaultsFillingTask());
+ wizardTask.addWizardPage(new JBossPortletCapabilitiesWizardPageFillingTask(JBossPortletCapabilitiesWizardPageFillingTask.Type.RUNTIME_PROVIDER));
+ return wizardTask;
+ }
+
+ private DynamicWebProjectWizardPageFillingTask dynamicWebProjectTask(){
+ DynamicWebProjectWizardPageFillingTask task = new DynamicWebProjectWizardPageFillingTask();
+ task.setProjectName(PROJECT_NAME);
+ task.setWebModuleVersion("2.5");
+ task.setServerName(SWTTestExt.configuredState.getServer().name);
+ task.setSelectFacetsTask(getFacets());
+ return task;
+ }
+
+ private FacetsSelectionTask getFacets() {
+ FacetsSelectionTask task = new FacetsSelectionTask();
+ task.addFacet(Facets.JAVA_FACET);
+ task.addFacet(Facets.CORE_PORTLET_FACET);
+ return task;
+ }
+
+ private SWTTask runOnServerTask() {
+ return new RunninngProjectOnServerTask(PROJECT_NAME);
+ }
+}
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/RunPortletOnServerTemplate.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/RunPortletOnServerTemplate.java 2012-03-19 11:16:28 UTC (rev 39609)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/RunPortletOnServerTemplate.java 2012-03-19 12:26:45 UTC (rev 39610)
@@ -6,10 +6,6 @@
import org.jboss.tools.portlet.ui.bot.task.console.ConsoleClearingTask;
import org.jboss.tools.portlet.ui.bot.task.server.RunninngProjectOnServerTask;
import org.jboss.tools.portlet.ui.bot.test.testcase.SWTTaskBasedTestCase;
-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;
-import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType;
import org.junit.Test;
/**
@@ -19,7 +15,6 @@
* @author Lucia Jelinkova
*
*/
- at Require(clearWorkspace=false, clearProjects=false, server=@Server(state=ServerState.Running, type=ServerType.EPP))
public abstract class RunPortletOnServerTemplate extends SWTTaskBasedTestCase {
protected abstract String getProjectName();
More information about the jbosstools-commits
mailing list