[jbosstools-commits] JBoss Tools SVN: r42974 - in branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test: src/org/jboss/ide/eclipse/as/ui/bot/test and 2 other directories.

Author: ljelinko Date: 2012-08-10 07:52:52 -0400 (Fri, 10 Aug 2012) New Revision: 42974 Added: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-4.2.properties branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-5.1.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/as4/CreateAS42Server.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/as4/DeployJSPProjectAS42Server.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/as4/OperateAS42Server.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/as4/UndeployJSPProjectAS42Server.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/as5/CreateAS51Server.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/as5/DeployJSPProjectAS51Server.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/as5/OperateAS51Server.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/as5/UndeployJSPProjectAS51Server.java Removed: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-4.properties branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-5.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/as4/CreateAS4Server.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/as4/DeployJSPProjectAS4Server.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/as4/OperateAS4Server.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/as4/UndeployJSPProjectAS4Server.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/as5/CreateAS5Server.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/as5/DeployJSPProjectAS5Server.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/as5/OperateAS5Server.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/as5/UndeployJSPProjectAS5Server.java 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 Log: Renamed AS 4 files to AS 4.2 and AS 5 files to AS 5.1 Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-4.2.properties (from rev 42973, branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-4.properties) =================================================================== --- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-4.2.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.2.properties 2012-08-10 11:52:52 UTC (rev 42974) @@ -0,0 +1 @@ +SERVER=AS,4.2,default,${jbosstools.test.jboss-as-4.2.home} Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-4.properties =================================================================== --- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-4.properties 2012-08-10 11:42:02 UTC (rev 42973) +++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-4.properties 2012-08-10 11:52:52 UTC (rev 42974) @@ -1 +0,0 @@ -SERVER=AS,4.2,default,${jbosstools.test.jboss-as-4.2.home} Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-5.1.properties (from rev 42973, branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-5.properties) =================================================================== --- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-5.1.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.1.properties 2012-08-10 11:52:52 UTC (rev 42974) @@ -0,0 +1 @@ +SERVER=AS,5.1,default,${jbosstools.test.jboss-as-5.1.home} Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-5.properties =================================================================== --- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-5.properties 2012-08-10 11:42:02 UTC (rev 42973) +++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-5.properties 2012-08-10 11:52:52 UTC (rev 42974) @@ -1 +0,0 @@ -SERVER=AS,5.1,default,${jbosstools.test.jboss-as-5.1.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-10 11:42:02 UTC (rev 42973) +++ 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-10 11:52:52 UTC (rev 42974) @@ -4,14 +4,14 @@ 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.as4.CreateAS4Server; -import org.jboss.ide.eclipse.as.ui.bot.test.as4.DeployJSPProjectAS4Server; -import org.jboss.ide.eclipse.as.ui.bot.test.as4.OperateAS4Server; -import org.jboss.ide.eclipse.as.ui.bot.test.as4.UndeployJSPProjectAS4Server; -import org.jboss.ide.eclipse.as.ui.bot.test.as5.CreateAS5Server; -import org.jboss.ide.eclipse.as.ui.bot.test.as5.DeployJSPProjectAS5Server; -import org.jboss.ide.eclipse.as.ui.bot.test.as5.OperateAS5Server; -import org.jboss.ide.eclipse.as.ui.bot.test.as5.UndeployJSPProjectAS5Server; +import org.jboss.ide.eclipse.as.ui.bot.test.as4.CreateAS42Server; +import org.jboss.ide.eclipse.as.ui.bot.test.as4.DeployJSPProjectAS42Server; +import org.jboss.ide.eclipse.as.ui.bot.test.as4.OperateAS42Server; +import org.jboss.ide.eclipse.as.ui.bot.test.as4.UndeployJSPProjectAS42Server; +import org.jboss.ide.eclipse.as.ui.bot.test.as5.CreateAS51Server; +import org.jboss.ide.eclipse.as.ui.bot.test.as5.DeployJSPProjectAS51Server; +import org.jboss.ide.eclipse.as.ui.bot.test.as5.OperateAS51Server; +import org.jboss.ide.eclipse.as.ui.bot.test.as5.UndeployJSPProjectAS51Server; import org.jboss.ide.eclipse.as.ui.bot.test.as6.CreateAS6Server; import org.jboss.ide.eclipse.as.ui.bot.test.as6.DeployJSPProjectAS6Server; import org.jboss.ide.eclipse.as.ui.bot.test.as6.OperateAS6Server; @@ -45,24 +45,24 @@ CreateAS71Server.class, CreateAS70Server.class, CreateAS6Server.class, - CreateAS5Server.class, - CreateAS4Server.class, + CreateAS51Server.class, + CreateAS42Server.class, CreateAS3Server.class, OperateEAP6Server.class, OperateEAP5Server.class, OperateAS71Server.class, OperateAS70Server.class, OperateAS6Server.class, - OperateAS5Server.class, - OperateAS4Server.class, + OperateAS51Server.class, + OperateAS42Server.class, OperateAS3Server.class, DeployJSPProjectEAP6Server.class, DeployJSPProjectEAP5Server.class, DeployJSPProjectAS71Server.class, DeployJSPProjectAS70Server.class, DeployJSPProjectAS6Server.class, - DeployJSPProjectAS5Server.class, - DeployJSPProjectAS4Server.class, + DeployJSPProjectAS51Server.class, + DeployJSPProjectAS42Server.class, DeployJSPProjectAS3Server.class, HotDeployJSPFile.class, UndeployJSPProjectEAP6Server.class, @@ -70,8 +70,8 @@ UndeployJSPProjectAS71Server.class, UndeployJSPProjectAS70Server.class, UndeployJSPProjectAS6Server.class, - UndeployJSPProjectAS5Server.class, - UndeployJSPProjectAS4Server.class, + UndeployJSPProjectAS51Server.class, + UndeployJSPProjectAS42Server.class, UndeployJSPProjectAS3Server.class, DeleteServer.class }) Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/CreateAS42Server.java (from rev 42973, branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/CreateAS4Server.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/as4/CreateAS42Server.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/as4/CreateAS42Server.java 2012-08-10 11:52:52 UTC (rev 42974) @@ -0,0 +1,44 @@ +package org.jboss.ide.eclipse.as.ui.bot.test.as4; + +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.2", state=ServerState.Present)) +public class CreateAS42Server 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"); + } + } +} Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/CreateAS4Server.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/as4/CreateAS4Server.java 2012-08-10 11:42:02 UTC (rev 42973) +++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/CreateAS4Server.java 2012-08-10 11:52:52 UTC (rev 42974) @@ -1,44 +0,0 @@ -package org.jboss.ide.eclipse.as.ui.bot.test.as4; - -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.2", state=ServerState.Present)) -public class CreateAS4Server 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"); - } - } -} Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/DeployJSPProjectAS42Server.java (from rev 42973, branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/DeployJSPProjectAS4Server.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/as4/DeployJSPProjectAS42Server.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/as4/DeployJSPProjectAS42Server.java 2012-08-10 11:52:52 UTC (rev 42974) @@ -0,0 +1,21 @@ +package org.jboss.ide.eclipse.as.ui.bot.test.as4; + +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.2", state=ServerState.Running)) +public class DeployJSPProjectAS42Server extends DeployJSPProjectTemplate { + + @Override + protected String getConsoleMessage() { + return "deploy, ctxPath=/" + PROJECT_NAME; + } +} Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/DeployJSPProjectAS4Server.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/as4/DeployJSPProjectAS4Server.java 2012-08-10 11:42:02 UTC (rev 42973) +++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/DeployJSPProjectAS4Server.java 2012-08-10 11:52:52 UTC (rev 42974) @@ -1,21 +0,0 @@ -package org.jboss.ide.eclipse.as.ui.bot.test.as4; - -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.2", state=ServerState.Running)) -public class DeployJSPProjectAS4Server extends DeployJSPProjectTemplate { - - @Override - protected String getConsoleMessage() { - return "deploy, ctxPath=/" + PROJECT_NAME; - } -} Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/OperateAS42Server.java (from rev 42973, branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/OperateAS4Server.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/as4/OperateAS42Server.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/as4/OperateAS42Server.java 2012-08-10 11:52:52 UTC (rev 42974) @@ -0,0 +1,21 @@ +package org.jboss.ide.eclipse.as.ui.bot.test.as4; + +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.2", state=ServerState.NotRunning)) +public class OperateAS42Server extends OperateServerTemplate { + + @Override + public String getWelcomePageText() { + return "JBoss Management"; + } +} Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/OperateAS4Server.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/as4/OperateAS4Server.java 2012-08-10 11:42:02 UTC (rev 42973) +++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/OperateAS4Server.java 2012-08-10 11:52:52 UTC (rev 42974) @@ -1,21 +0,0 @@ -package org.jboss.ide.eclipse.as.ui.bot.test.as4; - -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.2", state=ServerState.NotRunning)) -public class OperateAS4Server extends OperateServerTemplate { - - @Override - public String getWelcomePageText() { - return "JBoss Management"; - } -} Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/UndeployJSPProjectAS42Server.java (from rev 42973, branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/UndeployJSPProjectAS4Server.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/as4/UndeployJSPProjectAS42Server.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/as4/UndeployJSPProjectAS42Server.java 2012-08-10 11:52:52 UTC (rev 42974) @@ -0,0 +1,22 @@ +package org.jboss.ide.eclipse.as.ui.bot.test.as4; + +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.2", state=ServerState.Running), clearProjects=false, clearWorkspace=false) +public class UndeployJSPProjectAS42Server extends UndeployJSPProjectTemplate { + + @Override + protected String getConsoleMessage() { + return "undeploy, ctxPath=/" + DeployJSPProjectTemplate.PROJECT_NAME; + } +} Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/UndeployJSPProjectAS4Server.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/as4/UndeployJSPProjectAS4Server.java 2012-08-10 11:42:02 UTC (rev 42973) +++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/UndeployJSPProjectAS4Server.java 2012-08-10 11:52:52 UTC (rev 42974) @@ -1,22 +0,0 @@ -package org.jboss.ide.eclipse.as.ui.bot.test.as4; - -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.2", state=ServerState.Running), clearProjects=false, clearWorkspace=false) -public class UndeployJSPProjectAS4Server extends UndeployJSPProjectTemplate { - - @Override - protected String getConsoleMessage() { - return "undeploy, ctxPath=/" + DeployJSPProjectTemplate.PROJECT_NAME; - } -} Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/CreateAS51Server.java (from rev 42973, branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/CreateAS5Server.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/as5/CreateAS51Server.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/as5/CreateAS51Server.java 2012-08-10 11:52:52 UTC (rev 42974) @@ -0,0 +1,44 @@ +package org.jboss.ide.eclipse.as.ui.bot.test.as5; + +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.1", state=ServerState.Present)) +public class CreateAS51Server 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"); + } + } +} Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/CreateAS5Server.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/as5/CreateAS5Server.java 2012-08-10 11:42:02 UTC (rev 42973) +++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/CreateAS5Server.java 2012-08-10 11:52:52 UTC (rev 42974) @@ -1,44 +0,0 @@ -package org.jboss.ide.eclipse.as.ui.bot.test.as5; - -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.1", state=ServerState.Present)) -public class CreateAS5Server 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"); - } - } -} Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/DeployJSPProjectAS51Server.java (from rev 42973, branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/DeployJSPProjectAS5Server.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/as5/DeployJSPProjectAS51Server.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/as5/DeployJSPProjectAS51Server.java 2012-08-10 11:52:52 UTC (rev 42974) @@ -0,0 +1,21 @@ +package org.jboss.ide.eclipse.as.ui.bot.test.as5; + +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.1", state=ServerState.Running)) +public class DeployJSPProjectAS51Server extends DeployJSPProjectTemplate { + + @Override + protected String getConsoleMessage() { + return "deploy, ctxPath=/" + PROJECT_NAME; + } +} Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/DeployJSPProjectAS5Server.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/as5/DeployJSPProjectAS5Server.java 2012-08-10 11:42:02 UTC (rev 42973) +++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/DeployJSPProjectAS5Server.java 2012-08-10 11:52:52 UTC (rev 42974) @@ -1,21 +0,0 @@ -package org.jboss.ide.eclipse.as.ui.bot.test.as5; - -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.1", state=ServerState.Running)) -public class DeployJSPProjectAS5Server extends DeployJSPProjectTemplate { - - @Override - protected String getConsoleMessage() { - return "deploy, ctxPath=/" + PROJECT_NAME; - } -} Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/OperateAS51Server.java (from rev 42973, branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/OperateAS5Server.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/as5/OperateAS51Server.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/as5/OperateAS51Server.java 2012-08-10 11:52:52 UTC (rev 42974) @@ -0,0 +1,21 @@ +package org.jboss.ide.eclipse.as.ui.bot.test.as5; + +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.1", state=ServerState.NotRunning)) +public class OperateAS51Server extends OperateServerTemplate { + + @Override + public String getWelcomePageText() { + return "Manage this JBoss AS Instance"; + } +} Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/OperateAS5Server.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/as5/OperateAS5Server.java 2012-08-10 11:42:02 UTC (rev 42973) +++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/OperateAS5Server.java 2012-08-10 11:52:52 UTC (rev 42974) @@ -1,21 +0,0 @@ -package org.jboss.ide.eclipse.as.ui.bot.test.as5; - -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.1", state=ServerState.NotRunning)) -public class OperateAS5Server extends OperateServerTemplate { - - @Override - public String getWelcomePageText() { - return "Manage this JBoss AS Instance"; - } -} Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/UndeployJSPProjectAS51Server.java (from rev 42973, branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/UndeployJSPProjectAS5Server.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/as5/UndeployJSPProjectAS51Server.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/as5/UndeployJSPProjectAS51Server.java 2012-08-10 11:52:52 UTC (rev 42974) @@ -0,0 +1,22 @@ +package org.jboss.ide.eclipse.as.ui.bot.test.as5; + +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.1", state=ServerState.Running), clearProjects=false, clearWorkspace=false) +public class UndeployJSPProjectAS51Server extends UndeployJSPProjectTemplate { + + @Override + protected String getConsoleMessage() { + return "undeploy, ctxPath=/" + DeployJSPProjectTemplate.PROJECT_NAME; + } +} Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/UndeployJSPProjectAS5Server.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/as5/UndeployJSPProjectAS5Server.java 2012-08-10 11:42:02 UTC (rev 42973) +++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/UndeployJSPProjectAS5Server.java 2012-08-10 11:52:52 UTC (rev 42974) @@ -1,22 +0,0 @@ -package org.jboss.ide.eclipse.as.ui.bot.test.as5; - -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.1", state=ServerState.Running), clearProjects=false, clearWorkspace=false) -public class UndeployJSPProjectAS5Server extends UndeployJSPProjectTemplate { - - @Override - protected String getConsoleMessage() { - return "undeploy, ctxPath=/" + DeployJSPProjectTemplate.PROJECT_NAME; - } -}