Author: ljelinko Date: 2012-08-10 07:38:52 -0400 (Fri, 10 Aug 2012) New Revision: 42972 Added: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-7.0.properties branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-7.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/as70/ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as70/CreateAS70Server.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/as70/DeployJSPProjectAS70Server.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/as70/OperateAS70Server.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/as70/UndeployJSPProjectAS70Server.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/as71/ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as71/CreateAS71Server.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/as71/DeployJSPProjectAS71Server.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/as71/OperateAS71Server.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/as71/UndeployJSPProjectAS71Server.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 AS7.0 and AS7.1 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-10 11:38:24 UTC (rev 42971) +++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/prepare_workspace/as_prepare_workspace.launch 2012-08-10 11:38:52 UTC (rev 42972) @@ -8,6 +8,8 @@ <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-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-4.2.home=${folder_prompt:JBoss AS 4.2 installation directory}"/> Added: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-7.0.properties =================================================================== --- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-7.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-7.0.properties 2012-08-10 11:38:52 UTC (rev 42972) @@ -0,0 +1 @@ +SERVER=AS,7.0,default,${jbosstools.test.jboss-as-7.0.home} Added: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-7.1.properties =================================================================== --- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-7.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-7.1.properties 2012-08-10 11:38:52 UTC (rev 42972) @@ -0,0 +1 @@ +SERVER=AS,7.1,default,${jbosstools.test.jboss-as-7.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:38:24 UTC (rev 42971) +++ 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:38:52 UTC (rev 42972) @@ -16,6 +16,14 @@ import org.jboss.ide.eclipse.as.ui.bot.test.as6.DeployJSPProjectAS6Server; import org.jboss.ide.eclipse.as.ui.bot.test.as6.OperateAS6Server; import org.jboss.ide.eclipse.as.ui.bot.test.as6.UndeployJSPProjectAS6Server; +import org.jboss.ide.eclipse.as.ui.bot.test.as70.CreateAS70Server; +import org.jboss.ide.eclipse.as.ui.bot.test.as70.DeployJSPProjectAS70Server; +import org.jboss.ide.eclipse.as.ui.bot.test.as70.OperateAS70Server; +import org.jboss.ide.eclipse.as.ui.bot.test.as70.UndeployJSPProjectAS70Server; +import org.jboss.ide.eclipse.as.ui.bot.test.as71.CreateAS71Server; +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.eap5.CreateEAP5Server; import org.jboss.ide.eclipse.as.ui.bot.test.eap5.DeployJSPProjectEAP5Server; import org.jboss.ide.eclipse.as.ui.bot.test.eap5.OperateEAP5Server; @@ -34,18 +42,24 @@ @Suite.SuiteClasses({ CreateEAP6Server.class, CreateEAP5Server.class, + CreateAS71Server.class, + CreateAS70Server.class, CreateAS6Server.class, CreateAS5Server.class, CreateAS4Server.class, CreateAS3Server.class, OperateEAP6Server.class, OperateEAP5Server.class, + OperateAS71Server.class, + OperateAS70Server.class, OperateAS6Server.class, OperateAS5Server.class, OperateAS4Server.class, OperateAS3Server.class, DeployJSPProjectEAP6Server.class, DeployJSPProjectEAP5Server.class, + DeployJSPProjectAS71Server.class, + DeployJSPProjectAS70Server.class, DeployJSPProjectAS6Server.class, DeployJSPProjectAS5Server.class, DeployJSPProjectAS4Server.class, @@ -53,6 +67,8 @@ HotDeployJSPFile.class, UndeployJSPProjectEAP6Server.class, UndeployJSPProjectEAP5Server.class, + UndeployJSPProjectAS71Server.class, + UndeployJSPProjectAS70Server.class, UndeployJSPProjectAS6Server.class, UndeployJSPProjectAS5Server.class, UndeployJSPProjectAS4Server.class, 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/as70/CreateAS70Server.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/as70/CreateAS70Server.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/as70/CreateAS70Server.java 2012-08-10 11:38:52 UTC (rev 42972) @@ -0,0 +1,36 @@ +package org.jboss.ide.eclipse.as.ui.bot.test.as70; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.hasItem; +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="7.0", state=ServerState.Present)) +public class CreateAS70Server extends CreateServerTemplate { + + @Override + protected void assertEditorPorts() { + assertThat("8080", is(editor.getWebPort())); + assertThat("9999", is(editor.getManagementPort())); + } + + @Override + protected void assertViewPorts(List<XMLConfiguration> configurations) { + assertThat(configurations, hasItem(new XMLConfiguration("JBoss Management", "9999"))); + assertThat(configurations, hasItem(new XMLConfiguration("JBoss Web", "8080"))); + } +} 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/as70/DeployJSPProjectAS70Server.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/as70/DeployJSPProjectAS70Server.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/as70/DeployJSPProjectAS70Server.java 2012-08-10 11:38:52 UTC (rev 42972) @@ -0,0 +1,21 @@ +package org.jboss.ide.eclipse.as.ui.bot.test.as70; + +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="7.0", state=ServerState.Running)) +public class DeployJSPProjectAS70Server extends DeployJSPProjectTemplate { + + @Override + protected String getConsoleMessage() { + return "registering web context: /" + 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/as70/OperateAS70Server.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/as70/OperateAS70Server.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/as70/OperateAS70Server.java 2012-08-10 11:38:52 UTC (rev 42972) @@ -0,0 +1,22 @@ +package org.jboss.ide.eclipse.as.ui.bot.test.as70; + +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="7.0", state=ServerState.NotRunning)) +public class OperateAS70Server extends OperateServerTemplate { + + @Override + public String getWelcomePageText() { + return "Welcome to AS 7"; + } +} 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/as70/UndeployJSPProjectAS70Server.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/as70/UndeployJSPProjectAS70Server.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/as70/UndeployJSPProjectAS70Server.java 2012-08-10 11:38:52 UTC (rev 42972) @@ -0,0 +1,22 @@ +package org.jboss.ide.eclipse.as.ui.bot.test.as70; + +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="7.0", state=ServerState.Running), clearProjects=false, clearWorkspace=false) +public class UndeployJSPProjectAS70Server extends UndeployJSPProjectTemplate { + + @Override + protected String getConsoleMessage() { + return "Undeployed \"" + DeployJSPProjectTemplate.PROJECT_NAME + ".war\""; + } +} 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/as71/CreateAS71Server.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/as71/CreateAS71Server.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/as71/CreateAS71Server.java 2012-08-10 11:38:52 UTC (rev 42972) @@ -0,0 +1,36 @@ +package org.jboss.ide.eclipse.as.ui.bot.test.as71; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.hasItem; +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="7.1", state=ServerState.Present)) +public class CreateAS71Server extends CreateServerTemplate { + + @Override + protected void assertEditorPorts() { + assertThat("8080", is(editor.getWebPort())); + assertThat("9999", is(editor.getManagementPort())); + } + + @Override + protected void assertViewPorts(List<XMLConfiguration> configurations) { + assertThat(configurations, hasItem(new XMLConfiguration("JBoss Management", "${jboss.management.native.port:9999}"))); + assertThat(configurations, hasItem(new XMLConfiguration("JBoss Web", "8080"))); + } +} 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/as71/DeployJSPProjectAS71Server.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/as71/DeployJSPProjectAS71Server.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/as71/DeployJSPProjectAS71Server.java 2012-08-10 11:38:52 UTC (rev 42972) @@ -0,0 +1,21 @@ +package org.jboss.ide.eclipse.as.ui.bot.test.as71; + +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="7.1", state=ServerState.Running)) +public class DeployJSPProjectAS71Server extends DeployJSPProjectTemplate { + + @Override + protected String getConsoleMessage() { + return "Registering web context: /" + 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/as71/OperateAS71Server.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/as71/OperateAS71Server.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/as71/OperateAS71Server.java 2012-08-10 11:38:52 UTC (rev 42972) @@ -0,0 +1,22 @@ +package org.jboss.ide.eclipse.as.ui.bot.test.as71; + +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="7.1", state=ServerState.NotRunning)) +public class OperateAS71Server extends OperateServerTemplate { + + @Override + public String getWelcomePageText() { + return "Welcome to AS 7"; + } +} 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/as71/UndeployJSPProjectAS71Server.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/as71/UndeployJSPProjectAS71Server.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/as71/UndeployJSPProjectAS71Server.java 2012-08-10 11:38:52 UTC (rev 42972) @@ -0,0 +1,22 @@ +package org.jboss.ide.eclipse.as.ui.bot.test.as71; + +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="7.1", state=ServerState.Running), clearProjects=false, clearWorkspace=false) +public class UndeployJSPProjectAS71Server extends UndeployJSPProjectTemplate { + + @Override + protected String getConsoleMessage() { + return "Undeployed \"" + DeployJSPProjectTemplate.PROJECT_NAME + ".war\""; + } +}