[jbosstools-commits] JBoss Tools SVN: r42767 - in trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test: as5 and 2 other directories.
jbosstools-commits at lists.jboss.org
jbosstools-commits at lists.jboss.org
Fri Jul 27 12:07:57 EDT 2012
Author: ljelinko
Date: 2012-07-27 12:07:57 -0400 (Fri, 27 Jul 2012)
New Revision: 42767
Added:
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/CreateAS5Server.java
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/DeployJSPProjectAS5Server.java
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/OperateAS5Server.java
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/UndeployJSPProjectAS5Server.java
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/HotDeployJSPFile.java
Removed:
trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/HotDeployJSPFile.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/EAPCompatibilitySuite.java
Log:
Added JBoss AS 5 tests
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 15:58:11 UTC (rev 42766)
+++ 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 16:07:57 UTC (rev 42767)
@@ -1,15 +1,19 @@
package org.jboss.ide.eclipse.as.ui.bot.test;
+import org.jboss.ide.eclipse.as.ui.bot.test.as5.CreateAS5Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as5.DeployJSPProjectAS5Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as5.OperateAS5Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as5.UndeployJSPProjectAS5Server;
import org.jboss.ide.eclipse.as.ui.bot.test.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.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.UndeployJSPProjectAS7Server;
import org.jboss.ide.eclipse.as.ui.bot.test.template.DeleteServer;
+import org.jboss.ide.eclipse.as.ui.bot.test.template.HotDeployJSPFile;
import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
@@ -18,13 +22,17 @@
@Suite.SuiteClasses({
CreateAS7Server.class,
CreateAS6Server.class,
+ CreateAS5Server.class,
OperateAS7Server.class,
OperateAS6Server.class,
+ OperateAS5Server.class,
DeployJSPProjectAS7Server.class,
DeployJSPProjectAS6Server.class,
+ DeployJSPProjectAS5Server.class,
HotDeployJSPFile.class,
UndeployJSPProjectAS7Server.class,
UndeployJSPProjectAS6Server.class,
+ UndeployJSPProjectAS5Server.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 15:58:11 UTC (rev 42766)
+++ 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 16:07:57 UTC (rev 42767)
@@ -2,10 +2,10 @@
import org.jboss.ide.eclipse.as.ui.bot.test.as7.CreateAS7Server;
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.UndeployJSPProjectAS7Server;
import org.jboss.ide.eclipse.as.ui.bot.test.template.DeleteServer;
+import org.jboss.ide.eclipse.as.ui.bot.test.template.HotDeployJSPFile;
import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/CreateAS5Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/CreateAS5Server.java (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/CreateAS5Server.java 2012-07-27 16:07:57 UTC (rev 42767)
@@ -0,0 +1,44 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as5;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+
+import java.util.List;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.template.CreateServerTemplate;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType;
+import org.jboss.tools.ui.bot.ext.entity.XMLConfiguration;
+
+/**
+*
+* @see CreateServerTemplate
+* @author Lucia Jelinkova
+*
+*/
+ at Require(server=@Server(type=ServerType.JbossAS, version="5.1", state=ServerState.Present))
+public class CreateAS5Server extends CreateServerTemplate {
+
+ @Override
+ protected void assertEditorPorts() {
+ assertThat("8080", is(editor.getWebPort()));
+ assertThat("1099", is(editor.getJNDIPort()));
+ }
+
+ @Override
+ protected void assertViewPorts(List<XMLConfiguration> configurations) {
+ for (XMLConfiguration config : configurations){
+ assertValueIsNumber(config);
+ }
+ }
+
+ private void assertValueIsNumber(XMLConfiguration config){
+ try {
+ Integer.parseInt(config.getValue());
+ } catch (NumberFormatException e){
+ fail(config + " does not a numeric value");
+ }
+ }
+}
Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/DeployJSPProjectAS5Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/DeployJSPProjectAS5Server.java (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/DeployJSPProjectAS5Server.java 2012-07-27 16:07:57 UTC (rev 42767)
@@ -0,0 +1,21 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as5;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.template.DeployJSPProjectTemplate;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType;
+
+/**
+ * @see DeployJSPProjectTemplate
+ * @author Lucia Jelinkova
+ *
+ */
+ at Require(server=@Server(type=ServerType.JbossAS, version="5.1", state=ServerState.Running))
+public class DeployJSPProjectAS5Server 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/as5/OperateAS5Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/OperateAS5Server.java (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/OperateAS5Server.java 2012-07-27 16:07:57 UTC (rev 42767)
@@ -0,0 +1,21 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as5;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.template.OperateServerTemplate;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType;
+
+/**
+ * @see OperateServerTemplate
+ * @author Lucia Jelinkova
+ *
+ */
+ at Require(server=@Server(type=ServerType.JbossAS, version="5.1", state=ServerState.NotRunning))
+public class OperateAS5Server extends OperateServerTemplate {
+
+ @Override
+ public String getWelcomePageText() {
+ return "Manage this JBoss AS Instance";
+ }
+}
Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/UndeployJSPProjectAS5Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/UndeployJSPProjectAS5Server.java (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/UndeployJSPProjectAS5Server.java 2012-07-27 16:07:57 UTC (rev 42767)
@@ -0,0 +1,22 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as5;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.template.DeployJSPProjectTemplate;
+import org.jboss.ide.eclipse.as.ui.bot.test.template.UndeployJSPProjectTemplate;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType;
+
+/**
+ * @see UndeployJSPProjectTemplate
+ * @author Lucia Jelinkova
+ *
+ */
+ at Require(server=@Server(type=ServerType.JbossAS, version="5.1", state=ServerState.Running), clearProjects=false, clearWorkspace=false)
+public class UndeployJSPProjectAS5Server extends UndeployJSPProjectTemplate {
+
+ @Override
+ protected String getConsoleMessage() {
+ return "undeploy, ctxPath=/" + DeployJSPProjectTemplate.PROJECT_NAME;
+ }
+}
Deleted: 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 15:58:11 UTC (rev 42766)
+++ 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 16:07:57 UTC (rev 42767)
@@ -1,36 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.bot.test.as7;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-
-import org.jboss.ide.eclipse.as.ui.bot.test.web.PageSourceMatcher;
-import org.jboss.ide.eclipse.as.ui.bot.test.wizard.NewFileWizard;
-import org.jboss.tools.ui.bot.ext.SWTBotFactory;
-import org.jboss.tools.ui.bot.ext.SWTTestExt;
-import org.junit.Test;
-
-/**
- * Adds a new jsp file into the jsp project and checks it is hot deployed:
- * <ul>
- * <li>loads the new page in the web browser </li>
- * </ul>
- * @author Lucia Jelinkova
- *
- */
-public class HotDeployJSPFile extends SWTTestExt {
-
- public static final String JSP_CONTENT =
- "<%@ page language=\"java\" contentType=\"text/html; charset=UTF-8\" pageEncoding=\"UTF-8\"%> \n" +
- "<html> <body> Hot deployment </body> </html>";
-
- @Test
- public void hotDeployment(){
- NewFileWizard wizard = new NewFileWizard();
- 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/" + DeployJSPProjectAS7Server.PROJECT_NAME + "/hot.jsp"));
- }
-}
Copied: trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/HotDeployJSPFile.java (from rev 42760, 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/template/HotDeployJSPFile.java (rev 0)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/HotDeployJSPFile.java 2012-07-27 16:07:57 UTC (rev 42767)
@@ -0,0 +1,37 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.template;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.as7.DeployJSPProjectAS7Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.web.PageSourceMatcher;
+import org.jboss.ide.eclipse.as.ui.bot.test.wizard.NewFileWizard;
+import org.jboss.tools.ui.bot.ext.SWTBotFactory;
+import org.jboss.tools.ui.bot.ext.SWTTestExt;
+import org.junit.Test;
+
+/**
+ * Adds a new jsp file into the jsp project and checks it is hot deployed:
+ * <ul>
+ * <li>loads the new page in the web browser </li>
+ * </ul>
+ * @author Lucia Jelinkova
+ *
+ */
+public class HotDeployJSPFile extends SWTTestExt {
+
+ public static final String JSP_CONTENT =
+ "<%@ page language=\"java\" contentType=\"text/html; charset=UTF-8\" pageEncoding=\"UTF-8\"%> \n" +
+ "<html> <body> Hot deployment </body> </html>";
+
+ @Test
+ public void hotDeployment(){
+ NewFileWizard wizard = new NewFileWizard();
+ 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/" + DeployJSPProjectAS7Server.PROJECT_NAME + "/hot.jsp"));
+ }
+}
More information about the jbosstools-commits
mailing list