[jbosstools-commits] JBoss Tools SVN: r42801 - in trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test: src/org/jboss/ide/eclipse/as/ui/bot/test and 2 other directories.
jbosstools-commits at lists.jboss.org
jbosstools-commits at lists.jboss.org
Tue Jul 31 05:23:35 EDT 2012
Author: ljelinko
Date: 2012-07-31 05:23:35 -0400 (Tue, 31 Jul 2012)
New Revision: 42801
Added:
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-4.properties
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/CreateAS4Server.java
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/DeployJSPProjectAS4Server.java
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/OperateAS4Server.java
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/UndeployJSPProjectAS4Server.java
Modified:
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/AllTestsSuite.java
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/DeployJSPProjectTemplate.java
Log:
Added tests for AS 4.2
Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-4.properties
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-4.properties (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-4.properties 2012-07-31 09:23:35 UTC (rev 42801)
@@ -0,0 +1 @@
+SERVER=AS,4.2,default,${jboss-as-4.2}
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/AllTestsSuite.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/AllTestsSuite.java 2012-07-31 08:24:11 UTC (rev 42800)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/AllTestsSuite.java 2012-07-31 09:23:35 UTC (rev 42801)
@@ -1,5 +1,9 @@
package org.jboss.ide.eclipse.as.ui.bot.test;
+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;
@@ -23,16 +27,20 @@
CreateAS7Server.class,
CreateAS6Server.class,
CreateAS5Server.class,
+ CreateAS4Server.class,
OperateAS7Server.class,
OperateAS6Server.class,
OperateAS5Server.class,
+ OperateAS4Server.class,
DeployJSPProjectAS7Server.class,
DeployJSPProjectAS6Server.class,
DeployJSPProjectAS5Server.class,
+ DeployJSPProjectAS4Server.class,
HotDeployJSPFile.class,
UndeployJSPProjectAS7Server.class,
UndeployJSPProjectAS6Server.class,
UndeployJSPProjectAS5Server.class,
+ UndeployJSPProjectAS4Server.class,
DeleteServer.class
})
public class AllTestsSuite {
Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/CreateAS4Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/CreateAS4Server.java (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/CreateAS4Server.java 2012-07-31 09:23:35 UTC (rev 42801)
@@ -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
+*
+*/
+ at Require(server=@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");
+ }
+ }
+}
Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/DeployJSPProjectAS4Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/DeployJSPProjectAS4Server.java (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/DeployJSPProjectAS4Server.java 2012-07-31 09:23:35 UTC (rev 42801)
@@ -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
+ *
+ */
+ at Require(server=@Server(type=ServerType.JbossAS, version="4.2", state=ServerState.Running))
+public class DeployJSPProjectAS4Server extends DeployJSPProjectTemplate {
+
+ @Override
+ protected String getConsoleMessage() {
+ return "deploy, ctxPath=/" + PROJECT_NAME;
+ }
+}
Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/OperateAS4Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/OperateAS4Server.java (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/OperateAS4Server.java 2012-07-31 09:23:35 UTC (rev 42801)
@@ -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
+ *
+ */
+ at Require(server=@Server(type=ServerType.JbossAS, version="4.2", state=ServerState.NotRunning))
+public class OperateAS4Server extends OperateServerTemplate {
+
+ @Override
+ public String getWelcomePageText() {
+ return "Manage this JBoss AS Instance";
+ }
+}
Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/UndeployJSPProjectAS4Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/UndeployJSPProjectAS4Server.java (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/UndeployJSPProjectAS4Server.java 2012-07-31 09:23:35 UTC (rev 42801)
@@ -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
+ *
+ */
+ at Require(server=@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;
+ }
+}
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/DeployJSPProjectTemplate.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/DeployJSPProjectTemplate.java 2012-07-31 08:24:11 UTC (rev 42800)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/DeployJSPProjectTemplate.java 2012-07-31 09:23:35 UTC (rev 42801)
@@ -8,6 +8,7 @@
import org.jboss.ide.eclipse.as.ui.bot.test.wizard.ImportProjectWizard;
import org.jboss.tools.ui.bot.ext.SWTTestExt;
import org.jboss.tools.ui.bot.ext.SWTUtilExt;
+import org.jboss.tools.ui.bot.ext.condition.NonSystemJobRunsCondition;
import org.jboss.tools.ui.bot.ext.condition.TaskDuration;
import org.jboss.tools.ui.bot.ext.matcher.console.ConsoleOutputMatcher;
import org.jboss.tools.ui.bot.ext.view.ServersView;
@@ -29,9 +30,9 @@
public abstract class DeployJSPProjectTemplate extends SWTTestExt {
public static final String PROJECT_NAME = "jsp-project";
-
+
protected abstract String getConsoleMessage();
-
+
@Before
public void importProject(){
ImportProjectWizard wizard = new ImportProjectWizard();
@@ -40,12 +41,15 @@
wizard.setProjectNames(PROJECT_NAME);
wizard.execute();
}
-
+
@Test
public void deployProject(){
ServersView serversView = new ServersView();
serversView.addProjectToServer(PROJECT_NAME, configuredState.getServer().name);
-
+
+ // web
+ serversView.openWebPage(configuredState.getServer().name, PROJECT_NAME);
+ assertThat("Hello tests!", new PageSourceMatcher());
// console
assertThat(getConsoleMessage(), new ConsoleOutputMatcher(TaskDuration.NORMAL));
assertThat("Exception:", not(new ConsoleOutputMatcher()));
@@ -53,8 +57,5 @@
assertTrue("Server contains project", serversView.containsProject(configuredState.getServer().name, PROJECT_NAME));
assertEquals("Started", serversView.getServerStatus(configuredState.getServer().name));
assertEquals("Synchronized", serversView.getServerPublishStatus(configuredState.getServer().name));
- // web
- serversView.openWebPage(configuredState.getServer().name, PROJECT_NAME);
- assertThat("Hello tests!", new PageSourceMatcher());
}
}
More information about the jbosstools-commits
mailing list