[jbosstools-commits] JBoss Tools SVN: r35538 - in trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test: src/org/jboss/tools/bpel/ui/bot/test and 1 other directory.
jbosstools-commits at lists.jboss.org
jbosstools-commits at lists.jboss.org
Tue Oct 11 10:55:23 EDT 2011
Author: psrna
Date: 2011-10-11 10:55:23 -0400 (Tue, 11 Oct 2011)
New Revision: 35538
Modified:
trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/org.jboss.tools.bpel.ui.bot.test.properties
trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/AssignActivityTest.java
trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/OdeDeployTest.java
trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/SimpleModelingTest.java
trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/ToolingCompatibilityTest.java
Log:
Enhancements and refactoring of BPEL bot tests
Modified: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/org.jboss.tools.bpel.ui.bot.test.properties
===================================================================
--- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/org.jboss.tools.bpel.ui.bot.test.properties 2011-10-11 14:54:15 UTC (rev 35537)
+++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/org.jboss.tools.bpel.ui.bot.test.properties 2011-10-11 14:55:23 UTC (rev 35538)
@@ -5,7 +5,7 @@
#EAP|JBOSS_AS|EPP|SOA,<server version>,<jre version to run with>|default,<server home>
# note : when server is type of SOA, version is version of SOA (not the bundled EAP)
#SERVER=JBOSS_AS,5.0,1.6,/home/psrna/data/jboss/jboss/jboss-as
-SERVER=SOA,5.1,1.6,/home/psrna/data/jboss/soa-5.2/jboss-as
+SERVER=SOA,5.2,1.6,/home/psrna/data/jboss/soa-5.2/jboss-as
#<seam version>,<seam runtime home>
#SEAM=2.2,/home/psrna/data/jboss/soa-5.1.0.ER6-eds/seam
#<esb versoin>,<esb runtime home>
Modified: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/AssignActivityTest.java
===================================================================
--- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/AssignActivityTest.java 2011-10-11 14:54:15 UTC (rev 35537)
+++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/AssignActivityTest.java 2011-10-11 14:55:23 UTC (rev 35538)
@@ -31,7 +31,7 @@
import org.junit.Before;
import org.junit.Test;
- at Require(clearProjects = true, server = @Server(type = ServerType.SOA, state = ServerState.Running), perspective="BPEL")
+ at Require(clearProjects = true, server = @Server(type = ServerType.SOA, state = ServerState.Running, version = "5.2"), perspective="BPEL")
public class AssignActivityTest extends BPELTest {
static String BUNDLE = "org.jboss.tools.bpel.ui.bot.test";
Modified: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/OdeDeployTest.java
===================================================================
--- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/OdeDeployTest.java 2011-10-11 14:54:15 UTC (rev 35537)
+++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/OdeDeployTest.java 2011-10-11 14:55:23 UTC (rev 35538)
@@ -26,7 +26,7 @@
* @author psrna
*
*/
- at Require(server = @Server(type = ServerType.SOA, state = ServerState.Running), perspective="BPEL")
+ at Require(server = @Server(type = ServerType.SOA, state = ServerState.Running, version = "5.2"), perspective="BPEL")
public class OdeDeployTest extends BPELTest {
final static String BUNDLE = "org.jboss.tools.bpel.ui.bot.test";
Modified: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/SimpleModelingTest.java
===================================================================
--- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/SimpleModelingTest.java 2011-10-11 14:54:15 UTC (rev 35537)
+++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/SimpleModelingTest.java 2011-10-11 14:55:23 UTC (rev 35538)
@@ -21,7 +21,7 @@
import org.junit.Before;
import org.junit.Test;
- at Require(clearProjects = true, server = @Server(type = ServerType.SOA, state = ServerState.Present))
+ at Require(clearProjects = true, server = @Server(type = ServerType.SOA, state = ServerState.Present, version = "5.2"))
public class SimpleModelingTest extends BPELTest {
static String BUNDLE = "org.jboss.tools.bpel.ui.bot.test";
Modified: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/ToolingCompatibilityTest.java
===================================================================
--- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/ToolingCompatibilityTest.java 2011-10-11 14:54:15 UTC (rev 35537)
+++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/ToolingCompatibilityTest.java 2011-10-11 14:55:23 UTC (rev 35538)
@@ -1,31 +1,18 @@
package org.jboss.tools.bpel.ui.bot.test;
import static org.eclipse.swtbot.swt.finder.matchers.WidgetMatcherFactory.widgetOfType;
-import static org.eclipse.swtbot.swt.finder.waits.Conditions.waitForWidget;
-
-import java.awt.event.ComponentEvent;
-import java.util.ArrayList;
import java.util.List;
-import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swtbot.eclipse.gef.finder.SWTGefBot;
-import org.eclipse.swtbot.eclipse.gef.finder.widgets.SWTBotGefEditPart;
import org.eclipse.swtbot.eclipse.gef.finder.widgets.SWTBotGefEditor;
import org.eclipse.swtbot.swt.finder.SWTBot;
-import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
-import org.eclipse.swtbot.swt.finder.finders.UIThreadRunnable;
-import org.eclipse.swtbot.swt.finder.results.Result;
-import org.eclipse.swtbot.swt.finder.utils.MessageFormat;
-import org.eclipse.swtbot.swt.finder.utils.SWTUtils;
-import org.eclipse.swtbot.swt.finder.widgets.AbstractSWTBotControl;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotMenu;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
import org.eclipse.ui.internal.views.properties.tabbed.view.TabbedPropertyList.ListElement;
import org.hamcrest.Matcher;
-import org.hamcrest.SelfDescribing;
import org.jboss.tools.bpel.ui.bot.ext.widgets.BotBpelEditor;
import org.jboss.tools.bpel.ui.bot.test.suite.BPELTest;
import org.jboss.tools.bpel.ui.bot.test.util.CompositeControl;
@@ -38,12 +25,17 @@
import org.jboss.tools.ui.bot.ext.helper.ContextMenuHelper;
import org.jboss.tools.ui.bot.ext.types.IDELabel;
import org.jboss.tools.ui.bot.ext.view.PropertiesView;
+import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
-
- at Require(server = @Server(type = ServerType.SOA, state = ServerState.Running), perspective="BPEL")
+/**
+ * Tests that verify JBoss BPEL tooling and Eclipse BPEL tooling compatibility.
+ * @author psrna
+ *
+ */
+ at Require(server = @Server(type = ServerType.SOA, state = ServerState.Running, version = "5.2"), perspective="BPEL")
public class ToolingCompatibilityTest extends BPELTest{
final static String BUNDLE = "org.jboss.tools.bpel.ui.bot.test";
@@ -67,10 +59,10 @@
ResourceHelper.importProject(BUNDLE, "/projects/eclipse_tooling_proj", "eclipse_tooling_proj");
bot.viewByTitle("Project Explorer").setFocus();
}
+
-
@Test
- public void deployEclipseProjectTest(){
+ public void deployProjectTest(){
String serverName = ToolingCompatibilityTest.configuredState.getServer().name;
// Publish the process
@@ -86,7 +78,7 @@
SWTBotTreeItem server = tree.getTreeItem(serverName + " [Started, Synchronized]").select();
server.expand();
bot.sleep(TIME_5S);
- assertTrue(server.getNode("eclipse_tooling_proj [Started, Synchronized]").isVisible());
+ assertTrue(server.getNode("eclipse_tooling_proj [Synchronized]").isVisible());
}
@Test
@@ -104,11 +96,10 @@
Assert.assertTrue(response.contains("</HelloWorldResponse>"));
Assert.assertTrue(response.contains("</SOAP-ENV:Body>"));
Assert.assertTrue(response.contains("</SOAP-ENV:Envelope>"));
-
}
- @SuppressWarnings({ "static-access", "restriction" })
+ @SuppressWarnings({ "restriction" })
@Test
public void simpleEditingTest() throws Exception {
@@ -141,14 +132,11 @@
pView.bot().styledText().setText("concat('Hello ', $input.payload/tns:input)");
log.info("Save");
bpel.save();
- bot.sleep(TIME_5S);
+ bot.sleep(TIME_20S);
+
+ log.info("Server: Clean...");
+ cleanServer();
- log.info("Remove from server");
- removeFromServer("eclipse_tooling_proj");
- bot.sleep(TIME_5S);
- log.info("Run on server");
- projExplorer.runOnServer("eclipse_tooling_proj");
-
String serverName = OdeDeployTest.configuredState.getServer().name;
Assert.assertFalse(console.getConsoleText().contains("DEPLOYMENTS IN ERROR:"));
@@ -160,9 +148,8 @@
SWTBotTree tree = bot.viewByTitle("Servers").bot().tree();
SWTBotTreeItem server = tree.getTreeItem(serverName + " [Started, Synchronized]").select();
server.expand();
- bot.sleep(TIME_5S);
- assertTrue(server.getNode("eclipse_tooling_proj [Started, Synchronized]").isVisible());
-
+ bot.sleep(TIME_20S);
+ assertTrue(server.getNode("eclipse_tooling_proj [Synchronized]").isVisible());
}
@Test
@@ -180,18 +167,36 @@
Assert.assertTrue(response.contains("</HelloWorldResponse>"));
Assert.assertTrue(response.contains("</SOAP-ENV:Body>"));
Assert.assertTrue(response.contains("</SOAP-ENV:Envelope>"));
+ }
+
+ @Test
+ public void cleanupTest(){
+ removeFromServer("eclipse_tooling_proj");
+ String serverName = OdeDeployTest.configuredState.getServer().name;
+
+ bot.viewByTitle("Servers").show();
+ bot.viewByTitle("Servers").setFocus();
+
+ SWTBotTree tree = bot.viewByTitle("Servers").bot().tree();
+ SWTBotTreeItem server = tree.getTreeItem(serverName + " [Started, Synchronized]").select();
+ server.expand();
+ bot.sleep(TIME_20S);
+
+ List<String> projects = server.getNodes();
+
+ for(String s : projects){
+ assertFalse(s.contains("eclipse_tooling_proj"));
+ }
}
-
- public void removeFromServer(String projectName){
+ public static void removeFromServer(String projectName){
String serverName = ToolingCompatibilityTest.configuredState.getServer().name;
bot.viewByTitle("Servers").show();
bot.viewByTitle("Servers").setFocus();
SWTBotTree tree = bot.viewByTitle("Servers").bot().tree();
- bot.sleep(TIME_5S);
SWTBotTreeItem server = tree.getTreeItem(serverName + " [Started, Synchronized]").select();
ContextMenuHelper.prepareTreeItemForContextMenu(tree, server);
@@ -206,7 +211,24 @@
viewBot.tree(1).select(projectName);
viewBot.button("< Remove").click();
viewBot.button("Finish").click();
+ }
+ public static void cleanServer(){
+ String serverName = ToolingCompatibilityTest.configuredState.getServer().name;
+
+ bot.viewByTitle("Servers").show();
+ bot.viewByTitle("Servers").setFocus();
+
+ SWTBotTree tree = bot.viewByTitle("Servers").bot().tree();
+ SWTBotTreeItem server = tree.getTreeItem(serverName + " [Started, Republish]").select();
+
+ ContextMenuHelper.prepareTreeItemForContextMenu(tree, server);
+ new SWTBotMenu(ContextMenuHelper.getContextMenu(tree, "Clean...", false)).click();
+
+ SWTBotShell shell = OdeDeployTest.bot.shell("Server");
+ shell.activate();
+
+ shell.bot().button(IDELabel.Button.OK).click();
}
-
+
}
More information about the jbosstools-commits
mailing list