Author: ljelinko Date: 2012-08-09 10:20:40 -0400 (Thu, 09 Aug 2012) New Revision: 42954 Added: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-3.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/as3/ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as3/CreateAS3Server.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/as3/DeployJSPProjectAS3Server.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/as3/OperateAS3Server.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/as3/UndeployJSPProjectAS3Server.java Removed: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as3/CreateAS3Server.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/as3/DeployJSPProjectAS3Server.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/as3/OperateAS3Server.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/as3/UndeployJSPProjectAS3Server.java Modified: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.wst.common.project.facet.core.xml 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 AS3 Modified: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.wst.common.project.facet.core.xml =================================================================== --- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.wst.common.project.facet.core.xml 2012-08-09 14:19:57 UTC (rev 42953) +++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.wst.common.project.facet.core.xml 2012-08-09 14:20:40 UTC (rev 42954) @@ -5,5 +5,5 @@ <fixed facet="wst.jsdt.web"/> <installed facet="java" version="1.6"/> <installed facet="wst.jsdt.web" version="1.0"/> - <installed facet="jst.web" version="2.5"/> + <installed facet="jst.web" version="2.4"/> </faceted-project> Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-3.properties (from rev 42949, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-3.properties) =================================================================== --- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-3.properties (rev 0) +++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-3.properties 2012-08-09 14:20:40 UTC (rev 42954) @@ -0,0 +1,2 @@ +SERVER=AS,3.2,1.5,${jboss-as-3.2} + 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-09 14:19:57 UTC (rev 42953) +++ 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-09 14:20:40 UTC (rev 42954) @@ -1,5 +1,9 @@ package org.jboss.ide.eclipse.as.ui.bot.test; +import org.jboss.ide.eclipse.as.ui.bot.test.as3.CreateAS3Server; +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; @@ -28,19 +32,23 @@ CreateAS6Server.class, CreateAS5Server.class, CreateAS4Server.class, + CreateAS3Server.class, OperateEAP6Server.class, OperateAS6Server.class, OperateAS5Server.class, OperateAS4Server.class, + OperateAS3Server.class, DeployJSPProjectEAP6Server.class, DeployJSPProjectAS6Server.class, DeployJSPProjectAS5Server.class, DeployJSPProjectAS4Server.class, + DeployJSPProjectAS3Server.class, HotDeployJSPFile.class, UndeployJSPProjectEAP6Server.class, UndeployJSPProjectAS6Server.class, UndeployJSPProjectAS5Server.class, UndeployJSPProjectAS4Server.class, + UndeployJSPProjectAS3Server.class, DeleteServer.class }) public class AllTestsSuite { 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/as3/CreateAS3Server.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as3/CreateAS3Server.java 2012-08-09 12:56:38 UTC (rev 42949) +++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as3/CreateAS3Server.java 2012-08-09 14:20:40 UTC (rev 42954) @@ -1,44 +0,0 @@ -package org.jboss.ide.eclipse.as.ui.bot.test.as3; - -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="3.2", state=ServerState.Present)) -public class CreateAS3Server 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/as3/CreateAS3Server.java (from rev 42949, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as3/CreateAS3Server.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/as3/CreateAS3Server.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/as3/CreateAS3Server.java 2012-08-09 14:20:40 UTC (rev 42954) @@ -0,0 +1,44 @@ +package org.jboss.ide.eclipse.as.ui.bot.test.as3; + +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="3.2", state=ServerState.Present)) +public class CreateAS3Server 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/as3/DeployJSPProjectAS3Server.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as3/DeployJSPProjectAS3Server.java 2012-08-09 12:56:38 UTC (rev 42949) +++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as3/DeployJSPProjectAS3Server.java 2012-08-09 14:20:40 UTC (rev 42954) @@ -1,21 +0,0 @@ -package org.jboss.ide.eclipse.as.ui.bot.test.as3; - -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="3.2", state=ServerState.Running)) -public class DeployJSPProjectAS3Server 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/as3/DeployJSPProjectAS3Server.java (from rev 42949, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as3/DeployJSPProjectAS3Server.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/as3/DeployJSPProjectAS3Server.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/as3/DeployJSPProjectAS3Server.java 2012-08-09 14:20:40 UTC (rev 42954) @@ -0,0 +1,21 @@ +package org.jboss.ide.eclipse.as.ui.bot.test.as3; + +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="3.2", state=ServerState.Running)) +public class DeployJSPProjectAS3Server 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/as3/OperateAS3Server.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as3/OperateAS3Server.java 2012-08-09 12:56:38 UTC (rev 42949) +++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as3/OperateAS3Server.java 2012-08-09 14:20:40 UTC (rev 42954) @@ -1,21 +0,0 @@ -package org.jboss.ide.eclipse.as.ui.bot.test.as3; - -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="3.2", state=ServerState.NotRunning)) -public class OperateAS3Server 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/as3/OperateAS3Server.java (from rev 42949, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as3/OperateAS3Server.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/as3/OperateAS3Server.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/as3/OperateAS3Server.java 2012-08-09 14:20:40 UTC (rev 42954) @@ -0,0 +1,21 @@ +package org.jboss.ide.eclipse.as.ui.bot.test.as3; + +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="3.2", state=ServerState.NotRunning)) +public class OperateAS3Server 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/as3/UndeployJSPProjectAS3Server.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as3/UndeployJSPProjectAS3Server.java 2012-08-09 12:56:38 UTC (rev 42949) +++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as3/UndeployJSPProjectAS3Server.java 2012-08-09 14:20:40 UTC (rev 42954) @@ -1,22 +0,0 @@ -package org.jboss.ide.eclipse.as.ui.bot.test.as3; - -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="3.2", state=ServerState.Running), clearProjects=false, clearWorkspace=false) -public class UndeployJSPProjectAS3Server 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/as3/UndeployJSPProjectAS3Server.java (from rev 42949, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as3/UndeployJSPProjectAS3Server.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/as3/UndeployJSPProjectAS3Server.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/as3/UndeployJSPProjectAS3Server.java 2012-08-09 14:20:40 UTC (rev 42954) @@ -0,0 +1,22 @@ +package org.jboss.ide.eclipse.as.ui.bot.test.as3; + +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="3.2", state=ServerState.Running), clearProjects=false, clearWorkspace=false) +public class UndeployJSPProjectAS3Server extends UndeployJSPProjectTemplate { + + @Override + protected String getConsoleMessage() { + return "undeploy, ctxPath=/" + DeployJSPProjectTemplate.PROJECT_NAME; + } +}