[jbosstools-commits] JBoss Tools SVN: r42760 - in trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test: projects and 9 other directories.
jbosstools-commits at lists.jboss.org
jbosstools-commits at lists.jboss.org
Fri Jul 27 10:14:52 EDT 2012
Author: ljelinko
Date: 2012-07-27 10:14:51 -0400 (Fri, 27 Jul 2012)
New Revision: 42760
Added:
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/jbossas-6.properties
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/CreateAS6Server.java
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/DeployJSPProjectAS6Server.java
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/OperateAS6Server.java
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/UndeployJSPProjectAS6Server.java
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/DeployJSPProjectAS7Server.java
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/UndeployJSPProjectAS7Server.java
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/CreateServerTemplate.java
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/DeleteServer.java
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/OperateServerTemplate.java
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/UndeployJSPProjectTemplate.java
Removed:
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-as7/
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/DeleteAS7Server.java
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/DeployJSPProject.java
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/UndeployJSPProject.java
Modified:
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/AS_AllTestsSuite.launch
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.project
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.wst.common.component
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/EAPCompatibilitySuite.java
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/CreateAS7Server.java
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/HotDeployJSPFile.java
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/OperateAS7Server.java
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/editor/ServerEditor.java
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/web/PageSourceMatcher.java
Log:
Added tests for JBoss AS6
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/AS_AllTestsSuite.launch
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/AS_AllTestsSuite.launch 2012-07-27 12:51:04 UTC (rev 42759)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/AS_AllTestsSuite.launch 2012-07-27 14:14:51 UTC (rev 42760)
@@ -30,7 +30,7 @@
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.jboss.ide.eclipse.as.ui.bot.test"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dswtbot.test.properties.file=/home/ljelinko/work/workspaces/jboss-tools/org.jboss.ide.eclipse.as.ui.bot.test/resources/eap-6.properties -Xmx1024m -XX:MaxPermSize=256m"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dswtbot.test.properties.file=${file_prompt:"Please choose a SWTBot configuration file":${workspace_loc}/org.jboss.ide.eclipse.as.ui.bot.test/resources/} -Xmx1024m -XX:MaxPermSize=256m"/>
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.eclipse.platform.ide"/>
<booleanAttribute key="show_selected_only" value="false"/>
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.project
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-as7/.project 2012-06-14 11:48:13 UTC (rev 41967)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.project 2012-07-27 14:14:51 UTC (rev 42760)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>jsp-as7</name>
+ <name>jsp-project</name>
<comment></comment>
<projects>
</projects>
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.wst.common.component
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-as7/.settings/org.eclipse.wst.common.component 2012-06-14 11:48:13 UTC (rev 41967)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.wst.common.component 2012-07-27 14:14:51 UTC (rev 42760)
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project-modules id="moduleCoreId" project-version="1.5.0">
- <wb-module deploy-name="jsp-as7">
+ <wb-module deploy-name="jsp-project">
<wb-resource deploy-path="/" source-path="/WebContent" tag="defaultRootSource"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
- <property name="context-root" value="jsp-as7"/>
- <property name="java-output-path" value="/jsp-as7/build/classes"/>
+ <property name="context-root" value="jsp-project"/>
+ <property name="java-output-path" value="/jsp-project/build/classes"/>
</wb-module>
</project-modules>
Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/jbossas-6.properties
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/jbossas-6.properties (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/jbossas-6.properties 2012-07-27 14:14:51 UTC (rev 42760)
@@ -0,0 +1 @@
+SERVER=AS,6.1,default,/home/ljelinko/programs/jboss/AS/jboss-6.1.0.Final
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-27 12:51:04 UTC (rev 42759)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/AllTestsSuite.java 2012-07-27 14:14:51 UTC (rev 42760)
@@ -1,11 +1,15 @@
package org.jboss.ide.eclipse.as.ui.bot.test;
+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;
+import org.jboss.ide.eclipse.as.ui.bot.test.as6.UndeployJSPProjectAS6Server;
import org.jboss.ide.eclipse.as.ui.bot.test.as7.CreateAS7Server;
-import org.jboss.ide.eclipse.as.ui.bot.test.as7.DeleteAS7Server;
-import org.jboss.ide.eclipse.as.ui.bot.test.as7.DeployJSPProject;
+import org.jboss.ide.eclipse.as.ui.bot.test.as7.DeployJSPProjectAS7Server;
import org.jboss.ide.eclipse.as.ui.bot.test.as7.HotDeployJSPFile;
import org.jboss.ide.eclipse.as.ui.bot.test.as7.OperateAS7Server;
-import org.jboss.ide.eclipse.as.ui.bot.test.as7.UndeployJSPProject;
+import org.jboss.ide.eclipse.as.ui.bot.test.as7.UndeployJSPProjectAS7Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.template.DeleteServer;
import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
@@ -13,11 +17,15 @@
@RunWith(RequirementAwareSuite.class)
@Suite.SuiteClasses({
CreateAS7Server.class,
+ CreateAS6Server.class,
OperateAS7Server.class,
- DeployJSPProject.class,
+ OperateAS6Server.class,
+ DeployJSPProjectAS7Server.class,
+ DeployJSPProjectAS6Server.class,
HotDeployJSPFile.class,
- UndeployJSPProject.class,
- DeleteAS7Server.class
+ UndeployJSPProjectAS7Server.class,
+ UndeployJSPProjectAS6Server.class,
+ DeleteServer.class
})
public class AllTestsSuite {
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/EAPCompatibilitySuite.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/EAPCompatibilitySuite.java 2012-07-27 12:51:04 UTC (rev 42759)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/EAPCompatibilitySuite.java 2012-07-27 14:14:51 UTC (rev 42760)
@@ -1,11 +1,11 @@
package org.jboss.ide.eclipse.as.ui.bot.test;
import org.jboss.ide.eclipse.as.ui.bot.test.as7.CreateAS7Server;
-import org.jboss.ide.eclipse.as.ui.bot.test.as7.DeleteAS7Server;
-import org.jboss.ide.eclipse.as.ui.bot.test.as7.DeployJSPProject;
+import org.jboss.ide.eclipse.as.ui.bot.test.as7.DeployJSPProjectAS7Server;
import org.jboss.ide.eclipse.as.ui.bot.test.as7.HotDeployJSPFile;
import org.jboss.ide.eclipse.as.ui.bot.test.as7.OperateAS7Server;
-import org.jboss.ide.eclipse.as.ui.bot.test.as7.UndeployJSPProject;
+import org.jboss.ide.eclipse.as.ui.bot.test.as7.UndeployJSPProjectAS7Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.template.DeleteServer;
import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
@@ -14,10 +14,10 @@
@Suite.SuiteClasses({
CreateAS7Server.class,
OperateAS7Server.class,
- DeployJSPProject.class,
+ DeployJSPProjectAS7Server.class,
HotDeployJSPFile.class,
- UndeployJSPProject.class,
- DeleteAS7Server.class
+ UndeployJSPProjectAS7Server.class,
+ DeleteServer.class
})
public class EAPCompatibilitySuite {
Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/CreateAS6Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/CreateAS6Server.java (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/CreateAS6Server.java 2012-07-27 14:14:51 UTC (rev 42760)
@@ -0,0 +1,45 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as6;
+
+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="6.1", state=ServerState.Present))
+public class CreateAS6Server extends CreateServerTemplate {
+
+ @Override
+ protected void assertEditorPorts() {
+ assertThat("8080", is(editor.getWebPort()));
+ assertThat("1099", is(editor.getJNDIPort()));
+ assertThat("1090", is(editor.getJMXPort()));
+ }
+
+ @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/as6/DeployJSPProjectAS6Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/DeployJSPProjectAS6Server.java (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/DeployJSPProjectAS6Server.java 2012-07-27 14:14:51 UTC (rev 42760)
@@ -0,0 +1,21 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as6;
+
+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="6.1", state=ServerState.Running))
+public class DeployJSPProjectAS6Server 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/as6/OperateAS6Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/OperateAS6Server.java (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/OperateAS6Server.java 2012-07-27 14:14:51 UTC (rev 42760)
@@ -0,0 +1,21 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as6;
+
+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="6.1", state=ServerState.NotRunning))
+public class OperateAS6Server 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/as6/UndeployJSPProjectAS6Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/UndeployJSPProjectAS6Server.java (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/UndeployJSPProjectAS6Server.java 2012-07-27 14:14:51 UTC (rev 42760)
@@ -0,0 +1,22 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as6;
+
+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="6.1", state=ServerState.Running), clearProjects=false, clearWorkspace=false)
+public class UndeployJSPProjectAS6Server 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/as7/CreateAS7Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/CreateAS7Server.java 2012-07-27 12:51:04 UTC (rev 42759)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/CreateAS7Server.java 2012-07-27 14:14:51 UTC (rev 42760)
@@ -6,36 +6,31 @@
import java.util.List;
-import org.jboss.ide.eclipse.as.ui.bot.test.editor.ServerEditor;
-import org.jboss.tools.ui.bot.ext.SWTTestExt;
+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;
-import org.jboss.tools.ui.bot.ext.view.ServersView;
-import org.junit.Test;
/**
- * Creates server and checks its ports (in both the server view and server editor)
- *
+ *
+ * @see CreateServerTemplate
* @author Lucia Jelinkova
*
*/
@Require(server=@Server(type=ServerType.EAP, state=ServerState.Present))
-public class CreateAS7Server extends SWTTestExt {
+public class CreateAS7Server extends CreateServerTemplate {
- @Test
- public void createServer(){
- ServerEditor editor = new ServerEditor(configuredState.getServer().name);
- editor.open();
-
+ @Override
+ protected void assertEditorPorts() {
assertThat("8080", is(editor.getWebPort()));
- assertThat("9999", is(editor.getManagementPort()));
-
- ServersView view = new ServersView();
- List<XMLConfiguration> configurations = view.getXMLConfiguration(configuredState.getServer().name, "Ports");
+ 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")));
+ assertThat(configurations, hasItem(new XMLConfiguration("JBoss Web", "8080")));
}
}
Deleted: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/DeleteAS7Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/DeleteAS7Server.java 2012-07-27 12:51:04 UTC (rev 42759)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/DeleteAS7Server.java 2012-07-27 14:14:51 UTC (rev 42760)
@@ -1,23 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.bot.test.as7;
-
-import org.jboss.tools.ui.bot.ext.SWTTestExt;
-import org.jboss.tools.ui.bot.ext.view.ServersView;
-import org.junit.Test;
-
-/**
- * Deletes the server and checks that it is not present on the server's view.
- *
- * @author Lucia Jelinkova
- *
- */
-public class DeleteAS7Server extends SWTTestExt {
-
- private ServersView serversView = new ServersView();
-
- @Test
- public void deleteServer(){
- serversView.deleteServer(configuredState.getServer().name);
-
- assertFalse(serversView.serverExists(configuredState.getServer().name));
- }
-}
Deleted: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/DeployJSPProject.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/DeployJSPProject.java 2012-07-27 12:51:04 UTC (rev 42759)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/DeployJSPProject.java 2012-07-27 14:14:51 UTC (rev 42760)
@@ -1,63 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.bot.test.as7;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.not;
-
-import org.jboss.ide.eclipse.as.ui.bot.test.Activator;
-import org.jboss.ide.eclipse.as.ui.bot.test.web.PageSourceMatcher;
-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.TaskDuration;
-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.matcher.console.ConsoleOutputMatcher;
-import org.jboss.tools.ui.bot.ext.view.ServersView;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * Imports pre-prepared JSP project and adds it into the server. Checks:
- *
- * <ul>
- * <li>the console output</li>
- * <li>server's label</li>
- * <li>project is listed under the server</li>
- * <li>the index.jsp of the project</li>
- * </ul>
- * @author Lucia Jelinkova
- *
- */
- at Require(server=@Server(type=ServerType.EAP, state=ServerState.Running))
-public class DeployJSPProject extends SWTTestExt {
-
- public static final String PROJECT_NAME = "jsp-as7";
-
- @Before
- public void importProject(){
- ImportProjectWizard wizard = new ImportProjectWizard();
- wizard.setCopyProjectsIntoWorkspace(true);
- wizard.setProjectPath(SWTUtilExt.getPathToFileWithinPlugin(Activator.PLUGIN_ID, "projects"));
- wizard.setProjectNames(PROJECT_NAME);
- wizard.execute();
- }
-
- @Test
- public void deployProject(){
- ServersView serversView = new ServersView();
- serversView.addProjectToServer(PROJECT_NAME, configuredState.getServer().name);
-
- // console
- assertThat("Registering web context: /" + PROJECT_NAME, new ConsoleOutputMatcher(TaskDuration.NORMAL));
- assertThat("Exception:", not(new ConsoleOutputMatcher()));
- // view
- 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());
- }
-}
Copied: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/DeployJSPProjectAS7Server.java (from rev 42147, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/DeployJSPProject.java)
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/DeployJSPProjectAS7Server.java (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/DeployJSPProjectAS7Server.java 2012-07-27 14:14:51 UTC (rev 42760)
@@ -0,0 +1,21 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as7;
+
+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.EAP, state=ServerState.Running))
+public class DeployJSPProjectAS7Server extends DeployJSPProjectTemplate {
+
+ @Override
+ protected String getConsoleMessage() {
+ return "Registering web context: /" + PROJECT_NAME;
+ }
+}
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/HotDeployJSPFile.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/HotDeployJSPFile.java 2012-07-27 12:51:04 UTC (rev 42759)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/HotDeployJSPFile.java 2012-07-27 14:14:51 UTC (rev 42760)
@@ -25,12 +25,12 @@
@Test
public void hotDeployment(){
NewFileWizard wizard = new NewFileWizard();
- wizard.setPath(DeployJSPProject.PROJECT_NAME, "WebContent");
+ wizard.setPath(DeployJSPProjectAS7Server.PROJECT_NAME, "WebContent");
wizard.setFileName("hot.jsp");
wizard.setText(JSP_CONTENT);
wizard.execute();
SWTBotFactory.getBot().sleep(5000);
- assertThat("Hot deployment", new PageSourceMatcher("http://localhost:8080/" + DeployJSPProject.PROJECT_NAME + "/hot.jsp"));
+ assertThat("Hot deployment", new PageSourceMatcher("http://localhost:8080/" + DeployJSPProjectAS7Server.PROJECT_NAME + "/hot.jsp"));
}
}
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/OperateAS7Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/OperateAS7Server.java 2012-07-27 12:51:04 UTC (rev 42759)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/OperateAS7Server.java 2012-07-27 14:14:51 UTC (rev 42760)
@@ -1,80 +1,22 @@
package org.jboss.ide.eclipse.as.ui.bot.test.as7;
-import static org.hamcrest.MatcherAssert.assertThat;
-
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.not;
-
-import org.jboss.tools.ui.bot.ext.SWTTestExt;
+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;
-import org.jboss.tools.ui.bot.ext.matcher.console.ConsoleOutputMatcher;
-import org.jboss.tools.ui.bot.ext.view.ServersView;
-import org.junit.Test;
/**
- * Starts, restarts and stops the server and checks:
- * <ul>
- * <li>the console output</li>
- * <li>server's label</li>
- * <li>welcome page is available (if the result state is started)</li>
- * </ul>
+ *
+ * @see OperateServerTemplate
* @author Lucia Jelinkova
*
*/
@Require(server=@Server(type=ServerType.EAP, state=ServerState.NotRunning))
-public class OperateAS7Server extends SWTTestExt {
+public class OperateAS7Server extends OperateServerTemplate {
- private ServersView serversView = new ServersView();
-
- protected String getServerName(){
- return configuredState.getServer().name;
+ @Override
+ public String getWelcomePageText() {
+ return "Welcome to EAP 6";
}
-
- @Test
- public void operateServer(){
- startServer();
- restartServer();
- stopServer();
- }
-
- public void startServer(){
- serversView.startServer(getServerName());
- serversView.openWebPage(configuredState.getServer().name);
-
- assertNoException("Starting server");
- assertServerState("Starting server", "Started");
- assertWebPageContains("Welcome to EAP 6");
- }
-
- public void restartServer(){
- serversView.restartServer(getServerName());
- serversView.openWebPage(configuredState.getServer().name);
-
- assertNoException("Restarting server");
- assertServerState("Restarting server", "Started");
- assertWebPageContains("Welcome to EAP 6");
- }
-
- public void stopServer(){
- serversView.stopServer(getServerName());
- serversView.openWebPage(configuredState.getServer().name);
-
- assertNoException("Stopping server");
- assertServerState("Stopping server", "Stopped");
- }
-
- protected void assertNoException(String message) {
- assertThat(message, "Exception:", not(new ConsoleOutputMatcher()));
- }
-
- protected void assertServerState(String message, String state) {
- assertThat(message, serversView.getServerStatus(getServerName()), is(state));
- }
-
- private void assertWebPageContains(String string) {
- serversView.openWebPage(configuredState.getServer().name);
- }
}
Deleted: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/UndeployJSPProject.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/UndeployJSPProject.java 2012-07-27 12:51:04 UTC (rev 42759)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/UndeployJSPProject.java 2012-07-27 14:14:51 UTC (rev 42760)
@@ -1,43 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.bot.test.as7;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.not;
-
-import org.jboss.tools.ui.bot.ext.SWTTestExt;
-import org.jboss.tools.ui.bot.ext.condition.TaskDuration;
-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.matcher.console.ConsoleOutputMatcher;
-import org.jboss.tools.ui.bot.ext.view.ServersView;
-import org.junit.Test;
-
-/**
- * Removes JSP project from server. Checks:
- *
- * <ul>
- * <li>the console output</li>
- * <li>server's label</li>
- * <li>project is not listed under the server</li>
- * </ul>
- * @author Lucia Jelinkova
- *
- */
- at Require(server=@Server(type=ServerType.EAP, state=ServerState.Running), clearProjects=false, clearWorkspace=false)
-public class UndeployJSPProject extends SWTTestExt {
-
- @Test
- public void undeployProject(){
- ServersView serversView = new ServersView();
- serversView.removeProjectFromServer(DeployJSPProject.PROJECT_NAME, configuredState.getServer().name);
-
- // console
- assertThat("Undeployed \"" + DeployJSPProject.PROJECT_NAME + ".war\"", new ConsoleOutputMatcher(TaskDuration.NORMAL));
- assertThat("Exception:", not(new ConsoleOutputMatcher()));
- // view
- assertFalse("Server contains project", serversView.containsProject(configuredState.getServer().name, DeployJSPProject.PROJECT_NAME));
- assertEquals("Started", serversView.getServerStatus(configuredState.getServer().name));
- assertEquals("Synchronized", serversView.getServerPublishStatus(configuredState.getServer().name));
- }
-}
Copied: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/UndeployJSPProjectAS7Server.java (from rev 42147, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/UndeployJSPProject.java)
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/UndeployJSPProjectAS7Server.java (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/UndeployJSPProjectAS7Server.java 2012-07-27 14:14:51 UTC (rev 42760)
@@ -0,0 +1,22 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as7;
+
+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.EAP, state=ServerState.Running), clearProjects=false, clearWorkspace=false)
+public class UndeployJSPProjectAS7Server extends UndeployJSPProjectTemplate {
+
+ @Override
+ protected String getConsoleMessage() {
+ return "Undeployed \"" + DeployJSPProjectTemplate.PROJECT_NAME + ".war\"";
+ }
+}
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/editor/ServerEditor.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/editor/ServerEditor.java 2012-07-27 12:51:04 UTC (rev 42759)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/editor/ServerEditor.java 2012-07-27 14:14:51 UTC (rev 42760)
@@ -28,6 +28,14 @@
return SWTBotFactory.getBot().textWithLabel("Web").getText();
}
+ public String getJNDIPort(){
+ return SWTBotFactory.getBot().textWithLabel("JNDI").getText();
+ }
+
+ public String getJMXPort(){
+ return SWTBotFactory.getBot().textWithLabel("JMX RMI").getText();
+ }
+
public String getManagementPort(){
return SWTBotFactory.getBot().textWithLabel("Management").getText();
}
Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/CreateServerTemplate.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/CreateServerTemplate.java (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/CreateServerTemplate.java 2012-07-27 14:14:51 UTC (rev 42760)
@@ -0,0 +1,36 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.template;
+
+import java.util.List;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.editor.ServerEditor;
+import org.jboss.tools.ui.bot.ext.SWTTestExt;
+import org.jboss.tools.ui.bot.ext.entity.XMLConfiguration;
+import org.jboss.tools.ui.bot.ext.view.ServersView;
+import org.junit.Test;
+
+/**
+ * Creates server and checks its ports (in both the server view and server editor)
+ *
+ * @author Lucia Jelinkova
+ *
+ */
+public abstract class CreateServerTemplate extends SWTTestExt {
+
+ protected ServerEditor editor;
+
+ protected abstract void assertEditorPorts();
+
+ protected abstract void assertViewPorts(List<XMLConfiguration> configurations);
+
+ @Test
+ public void createServer(){
+ editor = new ServerEditor(configuredState.getServer().name);
+ editor.open();
+
+ assertEditorPorts();
+
+ ServersView view = new ServersView();
+ List<XMLConfiguration> configurations = view.getXMLConfiguration(configuredState.getServer().name, "Ports");
+ assertViewPorts(configurations);
+ }
+}
Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/DeleteServer.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/DeleteServer.java (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/DeleteServer.java 2012-07-27 14:14:51 UTC (rev 42760)
@@ -0,0 +1,23 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.template;
+
+import org.jboss.tools.ui.bot.ext.SWTTestExt;
+import org.jboss.tools.ui.bot.ext.view.ServersView;
+import org.junit.Test;
+
+/**
+ * Deletes the server and checks that it is not present on the server's view.
+ *
+ * @author Lucia Jelinkova
+ *
+ */
+public class DeleteServer extends SWTTestExt {
+
+ private ServersView serversView = new ServersView();
+
+ @Test
+ public void deleteServer(){
+ serversView.deleteServer(configuredState.getServer().name);
+
+ assertFalse(serversView.serverExists(configuredState.getServer().name));
+ }
+}
Added: 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 (rev 0)
+++ 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-27 14:14:51 UTC (rev 42760)
@@ -0,0 +1,60 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.template;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.not;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.Activator;
+import org.jboss.ide.eclipse.as.ui.bot.test.web.PageSourceMatcher;
+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.TaskDuration;
+import org.jboss.tools.ui.bot.ext.matcher.console.ConsoleOutputMatcher;
+import org.jboss.tools.ui.bot.ext.view.ServersView;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * Imports pre-prepared JSP project and adds it into the server. Checks:
+ *
+ * <ul>
+ * <li>the console output</li>
+ * <li>server's label</li>
+ * <li>project is listed under the server</li>
+ * <li>the index.jsp of the project</li>
+ * </ul>
+ * @author Lucia Jelinkova
+ *
+ */
+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();
+ wizard.setCopyProjectsIntoWorkspace(true);
+ wizard.setProjectPath(SWTUtilExt.getPathToFileWithinPlugin(Activator.PLUGIN_ID, "projects"));
+ wizard.setProjectNames(PROJECT_NAME);
+ wizard.execute();
+ }
+
+ @Test
+ public void deployProject(){
+ ServersView serversView = new ServersView();
+ serversView.addProjectToServer(PROJECT_NAME, configuredState.getServer().name);
+
+ // console
+ assertThat(getConsoleMessage(), new ConsoleOutputMatcher(TaskDuration.NORMAL));
+ assertThat("Exception:", not(new ConsoleOutputMatcher()));
+ // view
+ 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());
+ }
+}
Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/OperateServerTemplate.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/OperateServerTemplate.java (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/OperateServerTemplate.java 2012-07-27 14:14:51 UTC (rev 42760)
@@ -0,0 +1,76 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.template;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.not;
+
+import org.jboss.tools.ui.bot.ext.SWTTestExt;
+import org.jboss.tools.ui.bot.ext.matcher.console.ConsoleOutputMatcher;
+import org.jboss.tools.ui.bot.ext.view.ServersView;
+import org.junit.Test;
+
+/**
+ * Starts, restarts and stops the server and checks:
+ * <ul>
+ * <li>the console output</li>
+ * <li>server's label</li>
+ * <li>welcome page is available (if the result state is started)</li>
+ * </ul>
+ * @author Lucia Jelinkova
+ *
+ */
+public abstract class OperateServerTemplate extends SWTTestExt {
+
+ protected ServersView serversView = new ServersView();
+
+ public abstract String getWelcomePageText();
+
+ protected String getServerName(){
+ return configuredState.getServer().name;
+ }
+
+ @Test
+ public void operateServer(){
+ startServer();
+ restartServer();
+ stopServer();
+ }
+
+ public void startServer(){
+ serversView.startServer(getServerName());
+ serversView.openWebPage(configuredState.getServer().name);
+
+ assertNoException("Starting server");
+ assertServerState("Starting server", "Started");
+ assertWebPageContains(getWelcomePageText());
+ }
+
+ public void restartServer(){
+ serversView.restartServer(getServerName());
+ serversView.openWebPage(configuredState.getServer().name);
+
+ assertNoException("Restarting server");
+ assertServerState("Restarting server", "Started");
+ assertWebPageContains(getWelcomePageText());
+ }
+
+ public void stopServer(){
+ serversView.stopServer(getServerName());
+ serversView.openWebPage(configuredState.getServer().name);
+
+ assertNoException("Stopping server");
+ assertServerState("Stopping server", "Stopped");
+ }
+
+ protected void assertNoException(String message) {
+ assertThat(message, "Exception:", not(new ConsoleOutputMatcher()));
+ }
+
+ protected void assertServerState(String message, String state) {
+ assertThat(message, serversView.getServerStatus(getServerName()), is(state));
+ }
+
+ private void assertWebPageContains(String string) {
+ serversView.openWebPage(configuredState.getServer().name);
+ }
+}
Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/UndeployJSPProjectTemplate.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/UndeployJSPProjectTemplate.java (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/UndeployJSPProjectTemplate.java 2012-07-27 14:14:51 UTC (rev 42760)
@@ -0,0 +1,43 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.template;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.not;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.as7.DeployJSPProjectAS7Server;
+import org.jboss.tools.ui.bot.ext.SWTTestExt;
+import org.jboss.tools.ui.bot.ext.condition.TaskDuration;
+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.matcher.console.ConsoleOutputMatcher;
+import org.jboss.tools.ui.bot.ext.view.ServersView;
+import org.junit.Test;
+
+/**
+ * Removes JSP project from server. Checks:
+ *
+ * <ul>
+ * <li>the console output</li>
+ * <li>server's label</li>
+ * <li>project is not listed under the server</li>
+ * </ul>
+ * @author Lucia Jelinkova
+ *
+ */
+public abstract class UndeployJSPProjectTemplate extends SWTTestExt {
+
+ protected abstract String getConsoleMessage();
+ @Test
+ public void undeployProject(){
+ ServersView serversView = new ServersView();
+ serversView.removeProjectFromServer(DeployJSPProjectTemplate.PROJECT_NAME, configuredState.getServer().name);
+
+ // console
+ assertThat(getConsoleMessage(), new ConsoleOutputMatcher(TaskDuration.NORMAL));
+ assertThat("Exception:", not(new ConsoleOutputMatcher()));
+ // view
+ assertFalse("Server contains project", serversView.containsProject(configuredState.getServer().name, DeployJSPProjectAS7Server.PROJECT_NAME));
+ assertEquals("Started", serversView.getServerStatus(configuredState.getServer().name));
+ assertEquals("Synchronized", serversView.getServerPublishStatus(configuredState.getServer().name));
+ }
+}
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/web/PageSourceMatcher.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/web/PageSourceMatcher.java 2012-07-27 12:51:04 UTC (rev 42759)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/web/PageSourceMatcher.java 2012-07-27 14:14:51 UTC (rev 42760)
@@ -28,7 +28,6 @@
}
pageText = browser.getText();
- System.out.println("Page text: " + pageText);
if ("".equals(item)){
return pageText.equals(item);
}
More information about the jbosstools-commits
mailing list