Author: ljelinko Date: 2012-08-13 03:30:03 -0400 (Mon, 13 Aug 2012) New Revision: 42995 Added: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/product/eap-4.properties branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-4.0.properties branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-5.0.properties branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as40/ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as40/CreateAS40Server.java branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as40/DeployJSPProjectAS40Server.java branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as40/OperateAS40Server.java branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as40/UndeployJSPProjectAS40Server.java branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as50/ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as50/CreateAS50Server.java branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as50/DeployJSPProjectAS50Server.java branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as50/OperateAS50Server.java branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as50/UndeployJSPProjectAS50Server.java branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap4/ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap4/CreateEAP4Server.java branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap4/DeployJSPProjectEAP4Server.java branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap4/OperateEAP4Server.java branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap4/UndeployJSPProjectEAP4Server.java Modified: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/prepare_workspace/as_prepare_workspace.launch branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/AllTestsSuite.java Log: Added tests for EAP 4 and AS 5.0 and AS 4.0 Modified: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/prepare_workspace/as_prepare_workspace.launch =================================================================== --- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/prepare_workspace/as_prepare_workspace.launch 2012-08-13 07:29:10 UTC (rev 42994) +++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/prepare_workspace/as_prepare_workspace.launch 2012-08-13 07:30:03 UTC (rev 42995) @@ -8,11 +8,14 @@ <listAttribute key="M2_PROPERTIES"> <listEntry value="jbosstools.test.jboss-eap-6.home=${folder_prompt:EAP 6 installation directory}"/> <listEntry value="jbosstools.test.jboss-eap-5.home=${folder_prompt:EAP 5 installation directory}"/> +<listEntry value="jbosstools.test.jboss-eap-4.home=${folder_prompt:EAP 4 installation directory}"/> <listEntry value="jbosstools.test.jboss-as-7.1.home=${folder_prompt:JBoss AS 7.1 installation directory}"/> <listEntry value="jbosstools.test.jboss-as-7.0.home=${folder_prompt:JBoss AS 7.0 installation directory}"/> <listEntry value="jbosstools.test.jboss-as-6.x.home=${folder_prompt:JBoss AS 6.x installation directory}"/> <listEntry value="jbosstools.test.jboss-as-5.1.home=${folder_prompt:JBoss AS 5.1 installation directory}"/> +<listEntry value="jbosstools.test.jboss-as-5.0.home=${folder_prompt:JBoss AS 5.0 installation directory}"/> <listEntry value="jbosstools.test.jboss-as-4.2.home=${folder_prompt:JBoss AS 4.2 installation directory}"/> +<listEntry value="jbosstools.test.jboss-as-4.0.home=${folder_prompt:JBoss AS 4.0 installation directory}"/> <listEntry value="jbosstools.test.jboss-as-3.2.home=${folder_prompt:JBoss AS 3.2 installation directory}"/> </listAttribute> <stringAttribute key="M2_RUNTIME" value="EMBEDDED"/> Added: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/product/eap-4.properties =================================================================== --- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/product/eap-4.properties (rev 0) +++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/product/eap-4.properties 2012-08-13 07:30:03 UTC (rev 42995) @@ -0,0 +1 @@ +SERVER=EAP,4.3,default,${jbosstools.test.jboss-eap-4.home} Added: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-4.0.properties =================================================================== --- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-4.0.properties (rev 0) +++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-4.0.properties 2012-08-13 07:30:03 UTC (rev 42995) @@ -0,0 +1 @@ +SERVER=AS,4.0,default,${jbosstools.test.jboss-as-4.0.home} Added: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-5.0.properties =================================================================== --- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-5.0.properties (rev 0) +++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-5.0.properties 2012-08-13 07:30:03 UTC (rev 42995) @@ -0,0 +1 @@ +SERVER=AS,5.0,default,${jbosstools.test.jboss-as-5.0.home} Modified: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/AllTestsSuite.java =================================================================== --- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/AllTestsSuite.java 2012-08-13 07:29:10 UTC (rev 42994) +++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/AllTestsSuite.java 2012-08-13 07:30:03 UTC (rev 42995) @@ -4,10 +4,18 @@ import org.jboss.ide.eclipse.as.ui.bot.test.as3.DeployJSPProjectAS3Server; import org.jboss.ide.eclipse.as.ui.bot.test.as3.OperateAS3Server; import org.jboss.ide.eclipse.as.ui.bot.test.as3.UndeployJSPProjectAS3Server; +import org.jboss.ide.eclipse.as.ui.bot.test.as40.CreateAS40Server; +import org.jboss.ide.eclipse.as.ui.bot.test.as40.DeployJSPProjectAS40Server; +import org.jboss.ide.eclipse.as.ui.bot.test.as40.OperateAS40Server; +import org.jboss.ide.eclipse.as.ui.bot.test.as40.UndeployJSPProjectAS40Server; import org.jboss.ide.eclipse.as.ui.bot.test.as42.CreateAS42Server; import org.jboss.ide.eclipse.as.ui.bot.test.as42.DeployJSPProjectAS42Server; import org.jboss.ide.eclipse.as.ui.bot.test.as42.OperateAS42Server; import org.jboss.ide.eclipse.as.ui.bot.test.as42.UndeployJSPProjectAS42Server; +import org.jboss.ide.eclipse.as.ui.bot.test.as50.CreateAS50Server; +import org.jboss.ide.eclipse.as.ui.bot.test.as50.DeployJSPProjectAS50Server; +import org.jboss.ide.eclipse.as.ui.bot.test.as50.OperateAS50Server; +import org.jboss.ide.eclipse.as.ui.bot.test.as50.UndeployJSPProjectAS50Server; import org.jboss.ide.eclipse.as.ui.bot.test.as51.CreateAS51Server; import org.jboss.ide.eclipse.as.ui.bot.test.as51.DeployJSPProjectAS51Server; import org.jboss.ide.eclipse.as.ui.bot.test.as51.OperateAS51Server; @@ -24,6 +32,10 @@ import org.jboss.ide.eclipse.as.ui.bot.test.as71.DeployJSPProjectAS71Server; import org.jboss.ide.eclipse.as.ui.bot.test.as71.OperateAS71Server; import org.jboss.ide.eclipse.as.ui.bot.test.as71.UndeployJSPProjectAS71Server; +import org.jboss.ide.eclipse.as.ui.bot.test.eap4.CreateEAP4Server; +import org.jboss.ide.eclipse.as.ui.bot.test.eap4.DeployJSPProjectEAP4Server; +import org.jboss.ide.eclipse.as.ui.bot.test.eap4.OperateEAP4Server; +import org.jboss.ide.eclipse.as.ui.bot.test.eap4.UndeployJSPProjectEAP4Server; import org.jboss.ide.eclipse.as.ui.bot.test.eap5.CreateEAP5Server; import org.jboss.ide.eclipse.as.ui.bot.test.eap5.DeployJSPProjectEAP5Server; import org.jboss.ide.eclipse.as.ui.bot.test.eap5.OperateEAP5Server; @@ -42,37 +54,49 @@ @Suite.SuiteClasses({ CreateEAP6Server.class, CreateEAP5Server.class, + CreateEAP4Server.class, CreateAS71Server.class, CreateAS70Server.class, CreateAS6Server.class, CreateAS51Server.class, + CreateAS50Server.class, CreateAS42Server.class, + CreateAS40Server.class, CreateAS3Server.class, OperateEAP6Server.class, OperateEAP5Server.class, + OperateEAP4Server.class, OperateAS71Server.class, OperateAS70Server.class, OperateAS6Server.class, OperateAS51Server.class, + OperateAS50Server.class, OperateAS42Server.class, OperateAS3Server.class, + OperateAS40Server.class, DeployJSPProjectEAP6Server.class, DeployJSPProjectEAP5Server.class, + DeployJSPProjectEAP4Server.class, DeployJSPProjectAS71Server.class, DeployJSPProjectAS70Server.class, DeployJSPProjectAS6Server.class, DeployJSPProjectAS51Server.class, + DeployJSPProjectAS50Server.class, DeployJSPProjectAS42Server.class, DeployJSPProjectAS3Server.class, + DeployJSPProjectAS40Server.class, HotDeployJSPFile.class, UndeployJSPProjectEAP6Server.class, UndeployJSPProjectEAP5Server.class, + UndeployJSPProjectEAP4Server.class, UndeployJSPProjectAS71Server.class, UndeployJSPProjectAS70Server.class, UndeployJSPProjectAS6Server.class, UndeployJSPProjectAS51Server.class, + UndeployJSPProjectAS50Server.class, UndeployJSPProjectAS42Server.class, UndeployJSPProjectAS3Server.class, + UndeployJSPProjectAS40Server.class, DeleteServer.class }) public class AllTestsSuite { Added: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as40/CreateAS40Server.java =================================================================== --- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as40/CreateAS40Server.java (rev 0) +++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as40/CreateAS40Server.java 2012-08-13 07:30:03 UTC (rev 42995) @@ -0,0 +1,44 @@ +package org.jboss.ide.eclipse.as.ui.bot.test.as40; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; + +import java.util.List; + +import org.jboss.ide.eclipse.as.ui.bot.test.template.CreateServerTemplate; +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.jboss.tools.ui.bot.ext.entity.XMLConfiguration; + +/** +* +* @see CreateServerTemplate +* @author Lucia Jelinkova +* +*/ +@Require(server=(a)Server(type=ServerType.JbossAS, version="4.0", state=ServerState.Present)) +public class CreateAS40Server extends CreateServerTemplate { + + @Override + protected void assertEditorPorts() { + assertThat("8080", is(editor.getWebPort())); + assertThat("1099", is(editor.getJNDIPort())); + } + + @Override + protected void assertViewPorts(List<XMLConfiguration> configurations) { + for (XMLConfiguration config : configurations){ + assertValueIsNumber(config); + } + } + + private void assertValueIsNumber(XMLConfiguration config){ + try { + Integer.parseInt(config.getValue()); + } catch (NumberFormatException e){ + fail(config + " does not a numeric value"); + } + } +} Added: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as40/DeployJSPProjectAS40Server.java =================================================================== --- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as40/DeployJSPProjectAS40Server.java (rev 0) +++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as40/DeployJSPProjectAS40Server.java 2012-08-13 07:30:03 UTC (rev 42995) @@ -0,0 +1,21 @@ +package org.jboss.ide.eclipse.as.ui.bot.test.as40; + +import org.jboss.ide.eclipse.as.ui.bot.test.template.DeployJSPProjectTemplate; +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; + +/** + * @see DeployJSPProjectTemplate + * @author Lucia Jelinkova + * + */ +@Require(server=(a)Server(type=ServerType.JbossAS, version="4.0", state=ServerState.Running)) +public class DeployJSPProjectAS40Server extends DeployJSPProjectTemplate { + + @Override + protected String getConsoleMessage() { + return "deploy, ctxPath=/" + PROJECT_NAME; + } +} Added: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as40/OperateAS40Server.java =================================================================== --- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as40/OperateAS40Server.java (rev 0) +++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as40/OperateAS40Server.java 2012-08-13 07:30:03 UTC (rev 42995) @@ -0,0 +1,21 @@ +package org.jboss.ide.eclipse.as.ui.bot.test.as40; + +import org.jboss.ide.eclipse.as.ui.bot.test.template.OperateServerTemplate; +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; + +/** + * @see OperateServerTemplate + * @author Lucia Jelinkova + * + */ +@Require(server=(a)Server(type=ServerType.JbossAS, version="4.0", state=ServerState.NotRunning)) +public class OperateAS40Server extends OperateServerTemplate { + + @Override + public String getWelcomePageText() { + return "JBoss Management"; + } +} Added: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as40/UndeployJSPProjectAS40Server.java =================================================================== --- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as40/UndeployJSPProjectAS40Server.java (rev 0) +++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as40/UndeployJSPProjectAS40Server.java 2012-08-13 07:30:03 UTC (rev 42995) @@ -0,0 +1,22 @@ +package org.jboss.ide.eclipse.as.ui.bot.test.as40; + +import org.jboss.ide.eclipse.as.ui.bot.test.template.DeployJSPProjectTemplate; +import org.jboss.ide.eclipse.as.ui.bot.test.template.UndeployJSPProjectTemplate; +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; + +/** + * @see UndeployJSPProjectTemplate + * @author Lucia Jelinkova + * + */ +@Require(server=(a)Server(type=ServerType.JbossAS, version="4.0", state=ServerState.Running), clearProjects=false, clearWorkspace=false) +public class UndeployJSPProjectAS40Server extends UndeployJSPProjectTemplate { + + @Override + protected String getConsoleMessage() { + return "undeploy, ctxPath=/" + DeployJSPProjectTemplate.PROJECT_NAME; + } +} Added: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as50/CreateAS50Server.java =================================================================== --- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as50/CreateAS50Server.java (rev 0) +++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as50/CreateAS50Server.java 2012-08-13 07:30:03 UTC (rev 42995) @@ -0,0 +1,44 @@ +package org.jboss.ide.eclipse.as.ui.bot.test.as50; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; + +import java.util.List; + +import org.jboss.ide.eclipse.as.ui.bot.test.template.CreateServerTemplate; +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.jboss.tools.ui.bot.ext.entity.XMLConfiguration; + +/** +* +* @see CreateServerTemplate +* @author Lucia Jelinkova +* +*/ +@Require(server=(a)Server(type=ServerType.JbossAS, version="5.0", state=ServerState.Present)) +public class CreateAS50Server extends CreateServerTemplate { + + @Override + protected void assertEditorPorts() { + assertThat("8080", is(editor.getWebPort())); + assertThat("1099", is(editor.getJNDIPort())); + } + + @Override + protected void assertViewPorts(List<XMLConfiguration> configurations) { + for (XMLConfiguration config : configurations){ + assertValueIsNumber(config); + } + } + + private void assertValueIsNumber(XMLConfiguration config){ + try { + Integer.parseInt(config.getValue()); + } catch (NumberFormatException e){ + fail(config + " does not a numeric value"); + } + } +} Added: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as50/DeployJSPProjectAS50Server.java =================================================================== --- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as50/DeployJSPProjectAS50Server.java (rev 0) +++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as50/DeployJSPProjectAS50Server.java 2012-08-13 07:30:03 UTC (rev 42995) @@ -0,0 +1,21 @@ +package org.jboss.ide.eclipse.as.ui.bot.test.as50; + +import org.jboss.ide.eclipse.as.ui.bot.test.template.DeployJSPProjectTemplate; +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; + +/** + * @see DeployJSPProjectTemplate + * @author Lucia Jelinkova + * + */ +@Require(server=(a)Server(type=ServerType.JbossAS, version="5.0", state=ServerState.Running)) +public class DeployJSPProjectAS50Server extends DeployJSPProjectTemplate { + + @Override + protected String getConsoleMessage() { + return "deploy, ctxPath=/" + PROJECT_NAME; + } +} Added: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as50/OperateAS50Server.java =================================================================== --- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as50/OperateAS50Server.java (rev 0) +++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as50/OperateAS50Server.java 2012-08-13 07:30:03 UTC (rev 42995) @@ -0,0 +1,21 @@ +package org.jboss.ide.eclipse.as.ui.bot.test.as50; + +import org.jboss.ide.eclipse.as.ui.bot.test.template.OperateServerTemplate; +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; + +/** + * @see OperateServerTemplate + * @author Lucia Jelinkova + * + */ +@Require(server=(a)Server(type=ServerType.JbossAS, version="5.0", state=ServerState.NotRunning)) +public class OperateAS50Server extends OperateServerTemplate { + + @Override + public String getWelcomePageText() { + return "JBoss Management"; + } +} Added: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as50/UndeployJSPProjectAS50Server.java =================================================================== --- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as50/UndeployJSPProjectAS50Server.java (rev 0) +++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as50/UndeployJSPProjectAS50Server.java 2012-08-13 07:30:03 UTC (rev 42995) @@ -0,0 +1,22 @@ +package org.jboss.ide.eclipse.as.ui.bot.test.as50; + +import org.jboss.ide.eclipse.as.ui.bot.test.template.DeployJSPProjectTemplate; +import org.jboss.ide.eclipse.as.ui.bot.test.template.UndeployJSPProjectTemplate; +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; + +/** + * @see UndeployJSPProjectTemplate + * @author Lucia Jelinkova + * + */ +@Require(server=(a)Server(type=ServerType.JbossAS, version="5.0", state=ServerState.Running), clearProjects=false, clearWorkspace=false) +public class UndeployJSPProjectAS50Server extends UndeployJSPProjectTemplate { + + @Override + protected String getConsoleMessage() { + return "undeploy, ctxPath=/" + DeployJSPProjectTemplate.PROJECT_NAME; + } +} Added: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap4/CreateEAP4Server.java =================================================================== --- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap4/CreateEAP4Server.java (rev 0) +++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap4/CreateEAP4Server.java 2012-08-13 07:30:03 UTC (rev 42995) @@ -0,0 +1,44 @@ +package org.jboss.ide.eclipse.as.ui.bot.test.eap4; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; + +import java.util.List; + +import org.jboss.ide.eclipse.as.ui.bot.test.template.CreateServerTemplate; +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.jboss.tools.ui.bot.ext.entity.XMLConfiguration; + +/** +* +* @see CreateServerTemplate +* @author Lucia Jelinkova +* +*/ +@Require(server=(a)Server(type=ServerType.EAP, version="4.3", state=ServerState.Present)) +public class CreateEAP4Server extends CreateServerTemplate { + + @Override + protected void assertEditorPorts() { + assertThat("8080", is(editor.getWebPort())); + assertThat("1099", is(editor.getJNDIPort())); + } + + @Override + protected void assertViewPorts(List<XMLConfiguration> configurations) { + for (XMLConfiguration config : configurations){ + assertValueIsNumber(config); + } + } + + private void assertValueIsNumber(XMLConfiguration config){ + try { + Integer.parseInt(config.getValue()); + } catch (NumberFormatException e){ + fail(config + " does not a numeric value"); + } + } +} Added: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap4/DeployJSPProjectEAP4Server.java =================================================================== --- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap4/DeployJSPProjectEAP4Server.java (rev 0) +++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap4/DeployJSPProjectEAP4Server.java 2012-08-13 07:30:03 UTC (rev 42995) @@ -0,0 +1,21 @@ +package org.jboss.ide.eclipse.as.ui.bot.test.eap4; + +import org.jboss.ide.eclipse.as.ui.bot.test.template.DeployJSPProjectTemplate; +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; + +/** + * @see DeployJSPProjectTemplate + * @author Lucia Jelinkova + * + */ +@Require(server=(a)Server(type=ServerType.EAP, version="4.3", state=ServerState.Running)) +public class DeployJSPProjectEAP4Server extends DeployJSPProjectTemplate { + + @Override + protected String getConsoleMessage() { + return "deploy, ctxPath=/" + PROJECT_NAME; + } +} Added: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap4/OperateEAP4Server.java =================================================================== --- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap4/OperateEAP4Server.java (rev 0) +++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap4/OperateEAP4Server.java 2012-08-13 07:30:03 UTC (rev 42995) @@ -0,0 +1,21 @@ +package org.jboss.ide.eclipse.as.ui.bot.test.eap4; + +import org.jboss.ide.eclipse.as.ui.bot.test.template.OperateServerTemplate; +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; + +/** + * @see OperateServerTemplate + * @author Lucia Jelinkova + * + */ +@Require(server=(a)Server(type=ServerType.EAP, version="4.3", state=ServerState.NotRunning)) +public class OperateEAP4Server extends OperateServerTemplate { + + @Override + public String getWelcomePageText() { + return "JBoss Management"; + } +} Added: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap4/UndeployJSPProjectEAP4Server.java =================================================================== --- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap4/UndeployJSPProjectEAP4Server.java (rev 0) +++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/eap4/UndeployJSPProjectEAP4Server.java 2012-08-13 07:30:03 UTC (rev 42995) @@ -0,0 +1,22 @@ +package org.jboss.ide.eclipse.as.ui.bot.test.eap4; + +import org.jboss.ide.eclipse.as.ui.bot.test.template.DeployJSPProjectTemplate; +import org.jboss.ide.eclipse.as.ui.bot.test.template.UndeployJSPProjectTemplate; +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; + +/** + * @see UndeployJSPProjectTemplate + * @author Lucia Jelinkova + * + */ +@Require(server=(a)Server(type=ServerType.EAP, version="4.3", state=ServerState.Running), clearProjects=false, clearWorkspace=false) +public class UndeployJSPProjectEAP4Server extends UndeployJSPProjectTemplate { + + @Override + protected String getConsoleMessage() { + return "undeploy, ctxPath=/" + DeployJSPProjectTemplate.PROJECT_NAME; + } +}