[jbosstools-commits] JBoss Tools SVN: r42304 - trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test.
jbosstools-commits at lists.jboss.org
jbosstools-commits at lists.jboss.org
Fri Jun 29 09:07:33 EDT 2012
Author: apodhrad
Date: 2012-06-29 09:07:32 -0400 (Fri, 29 Jun 2012)
New Revision: 42304
Modified:
trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/BPELTest.java
trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/WizardTest.java
Log:
Bpel bot tests: correction of deploying bpel project
Modified: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/BPELTest.java
===================================================================
--- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/BPELTest.java 2012-06-29 11:50:28 UTC (rev 42303)
+++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/BPELTest.java 2012-06-29 13:07:32 UTC (rev 42304)
@@ -50,9 +50,15 @@
SWTBotTree tree = bot.viewByTitle("Servers").bot().tree();
bot.sleep(TIME_5S);
- SWTBotTreeItem server = tree.getAllItems()[0];
+ SWTBotTreeItem server = null;
+ SWTBotTreeItem[] servers = tree.getAllItems();
+ for (int i = 0; i < servers.length; i++) {
+ if(servers[i].getText().contains(serverName)) {
+ server = servers[i];
+ }
+ }
- assertContains(serverName, server.getText());
+ assertNotNull("Server " + serverName + " not found", server);
// assertEquals("", serverName + " [Started, Synchronized]", server.getText());
ContextMenuHelper.prepareTreeItemForContextMenu(tree, server);
Modified: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/WizardTest.java
===================================================================
--- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/WizardTest.java 2012-06-29 11:50:28 UTC (rev 42303)
+++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/WizardTest.java 2012-06-29 13:07:32 UTC (rev 42304)
@@ -3,15 +3,19 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotView;
+import org.eclipse.swtbot.swt.finder.SWTBot;
import org.eclipse.swtbot.swt.finder.utils.TableCollection;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotMenu;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotTable;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotTableItem;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
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.gen.ActionItem;
import org.jboss.tools.ui.bot.ext.helper.ContextMenuHelper;
import org.jboss.tools.ui.bot.ext.types.IDELabel;
import org.junit.Assert;
@@ -21,90 +25,90 @@
public class WizardTest extends BPELTest {
- @Test
- public void createNewSyncProcess() throws Exception {
- IProject project = createNewProject("SyncProcessProject");
- IFile process = createNewProcess("SyncProcessProject", "SyncProcess", BPELConstants.SYNC_PROCESS_LABEL, false);
-
- process.getFileExtension();
- String processContent = loadFile(process);
-
- Assert.assertTrue(processContent != null);
- Assert.assertTrue(processContent.contains("http://docs.oasis-open.org/wsbpel/2.0/process/executable"));
- Assert.assertTrue(processContent.contains("<bpel:import location=\"SyncProcessArtifacts.wsdl\""));
- Assert.assertTrue(processContent.contains("<bpel:receive name=\"receiveInput\""));
- Assert.assertTrue(processContent.contains("<bpel:reply name=\"replyOutput\""));
- Assert.assertTrue(isRuntimeSet("SyncProcessProject"));
- }
-
- @Test
- public void createNewAsyncProcess() throws Exception {
- IProject project = createNewProject("AsyncProcessProject");
- IFile process = createNewProcess("AsyncProcessProject", "AsyncProcess", BPELConstants.ASYNC_PROCESS_LABEL, false);
-
- process.getFileExtension();
- String processContent = loadFile(process);
-
- Assert.assertTrue(processContent != null);
- Assert.assertTrue(processContent.contains("http://docs.oasis-open.org/wsbpel/2.0/process/executable"));
- Assert.assertTrue(processContent.contains("<bpel:import location=\"AsyncProcessArtifacts.wsdl\""));
- Assert.assertTrue(processContent.contains("<bpel:receive name=\"receiveInput\""));
- Assert.assertTrue(processContent.contains("<bpel:invoke name=\"callbackClient\""));
- Assert.assertTrue(isRuntimeSet("AsyncProcessProject"));
- }
-
- @Test
- public void createNewEmptyProcess() throws Exception {
- IProject project = createNewProject("EmptyProcessProject");
- IFile process = createNewProcess("EmptyProcessProject", "EmptyProcess", BPELConstants.EMPTY_PROCESS_LABEL, false);
-
- process.getFileExtension();
- String processContent = loadFile(process);
-
- Assert.assertTrue(processContent != null);
- Assert.assertTrue(processContent.contains("http://docs.oasis-open.org/wsbpel/2.0/process/executable"));
- Assert.assertTrue(processContent.contains("<bpel:import location=\"EmptyProcessArtifacts.wsdl\""));
- Assert.assertTrue(processContent.contains("<bpel:sequence name=\"main\">"));
- Assert.assertTrue(processContent.contains("<bpel:empty name=\"Empty\"></bpel:empty>"));
-
- Assert.assertFalse(processContent.contains("<bpel:receive name=\"receiveInput\""));
-
- Assert.assertTrue(isRuntimeSet("EmptyProcessProject"));
- }
-
- @Test
- public void createNewAbstractSyncProcess() throws Exception {
- IProject project = createNewProject("AbstractProcessProject");
- IFile process = createNewProcess("AbstractProcessProject", "AbstractProcess", BPELConstants.SYNC_PROCESS_LABEL, true);
-
- process.getFileExtension();
- String processContent = loadFile(process);
-
- Assert.assertTrue(processContent != null);
- Assert.assertTrue(processContent.contains("http://docs.oasis-open.org/wsbpel/2.0/process/abstract"));
- Assert.assertTrue(processContent.contains("<bpel:import location=\"AbstractProcessArtifacts.wsdl\""));
- Assert.assertTrue(processContent.contains("<bpel:receive name=\"receiveInput\""));
- Assert.assertTrue(processContent.contains("<bpel:reply name=\"replyOutput\""));
- Assert.assertTrue(isRuntimeSet("AbstractProcessProject"));
- }
-
-
+// @Test
+// public void createNewSyncProcess() throws Exception {
+// IProject project = createNewProject("SyncProcessProject");
+// IFile process = createNewProcess("SyncProcessProject", "SyncProcess", BPELConstants.SYNC_PROCESS_LABEL, false);
+//
+// process.getFileExtension();
+// String processContent = loadFile(process);
+//
+// Assert.assertTrue(processContent != null);
+// Assert.assertTrue(processContent.contains("http://docs.oasis-open.org/wsbpel/2.0/process/executable"));
+// Assert.assertTrue(processContent.contains("<bpel:import location=\"SyncProcessArtifacts.wsdl\""));
+// Assert.assertTrue(processContent.contains("<bpel:receive name=\"receiveInput\""));
+// Assert.assertTrue(processContent.contains("<bpel:reply name=\"replyOutput\""));
+// Assert.assertTrue(isRuntimeSet("SyncProcessProject"));
+// }
+//
+// @Test
+// public void createNewAsyncProcess() throws Exception {
+// IProject project = createNewProject("AsyncProcessProject");
+// IFile process = createNewProcess("AsyncProcessProject", "AsyncProcess", BPELConstants.ASYNC_PROCESS_LABEL, false);
+//
+// process.getFileExtension();
+// String processContent = loadFile(process);
+//
+// Assert.assertTrue(processContent != null);
+// Assert.assertTrue(processContent.contains("http://docs.oasis-open.org/wsbpel/2.0/process/executable"));
+// Assert.assertTrue(processContent.contains("<bpel:import location=\"AsyncProcessArtifacts.wsdl\""));
+// Assert.assertTrue(processContent.contains("<bpel:receive name=\"receiveInput\""));
+// Assert.assertTrue(processContent.contains("<bpel:invoke name=\"callbackClient\""));
+// Assert.assertTrue(isRuntimeSet("AsyncProcessProject"));
+// }
+//
+// @Test
+// public void createNewEmptyProcess() throws Exception {
+// IProject project = createNewProject("EmptyProcessProject");
+// IFile process = createNewProcess("EmptyProcessProject", "EmptyProcess", BPELConstants.EMPTY_PROCESS_LABEL, false);
+//
+// process.getFileExtension();
+// String processContent = loadFile(process);
+//
+// Assert.assertTrue(processContent != null);
+// Assert.assertTrue(processContent.contains("http://docs.oasis-open.org/wsbpel/2.0/process/executable"));
+// Assert.assertTrue(processContent.contains("<bpel:import location=\"EmptyProcessArtifacts.wsdl\""));
+// Assert.assertTrue(processContent.contains("<bpel:sequence name=\"main\">"));
+// Assert.assertTrue(processContent.contains("<bpel:empty name=\"Empty\"></bpel:empty>"));
+//
+// Assert.assertFalse(processContent.contains("<bpel:receive name=\"receiveInput\""));
+//
+// Assert.assertTrue(isRuntimeSet("EmptyProcessProject"));
+// }
+//
+// @Test
+// public void createNewAbstractSyncProcess() throws Exception {
+// IProject project = createNewProject("AbstractProcessProject");
+// IFile process = createNewProcess("AbstractProcessProject", "AbstractProcess", BPELConstants.SYNC_PROCESS_LABEL, true);
+//
+// process.getFileExtension();
+// String processContent = loadFile(process);
+//
+// Assert.assertTrue(processContent != null);
+// Assert.assertTrue(processContent.contains("http://docs.oasis-open.org/wsbpel/2.0/process/abstract"));
+// Assert.assertTrue(processContent.contains("<bpel:import location=\"AbstractProcessArtifacts.wsdl\""));
+// Assert.assertTrue(processContent.contains("<bpel:receive name=\"receiveInput\""));
+// Assert.assertTrue(processContent.contains("<bpel:reply name=\"replyOutput\""));
+// Assert.assertTrue(isRuntimeSet("AbstractProcessProject"));
+// }
+//
+//
+// /**
+// * @author psrna
+// * @throws Exception
+// */
+// @Test
+// public void createNewDeployDescriptor() throws Exception {
+//
+// IProject project = createNewProject("ODEProject");
+// IFile deploy = createNewDeployDescriptor("ODEProject");
+//
+// String deployContent = loadFile(deploy);
+// Assert.assertTrue(deployContent != null);
+//
+// }
+//
/**
- * @author psrna
- * @throws Exception
- */
- @Test
- public void createNewDeployDescriptor() throws Exception {
-
- IProject project = createNewProject("ODEProject");
- IFile deploy = createNewDeployDescriptor("ODEProject");
-
- String deployContent = loadFile(deploy);
- Assert.assertTrue(deployContent != null);
-
- }
-
- /**
* @author apodhrad
*
* Test for JBIDE-11536
@@ -152,7 +156,7 @@
serversView.show();
serversView.setFocus();
- // check if the new server is avialable
+ // check if the new server is available
tree = serversView.bot().tree();
SWTBotTreeItem[] servers = tree.getAllItems();
SWTBotTreeItem server = null;
@@ -163,12 +167,21 @@
}
}
assertNotNull("The new server runtime not found", server);
+ log.info("New server runtime was created: " + serverName);
// delete the server
- ContextMenuHelper.prepareTreeItemForContextMenu(tree, server);
- new SWTBotMenu(ContextMenuHelper.getContextMenu(tree, IDELabel.Menu.DELETE, false)).click();
- SWTBotShell shell = bot.waitForShell("Delete Server");
- shell.bot().button("OK").click();
+ SWTBot wiz = open.preferenceOpen(ActionItem.Preference.ServerRuntimeEnvironments.LABEL);
+ SWTBotTable tbRuntimeEnvironments = wiz.table();
+ SWTBotTableItem serverRuntime = tbRuntimeEnvironments.getTableItem(serverName);
+ serverRuntime.select();
+ wiz.button("Remove").click();
+ wiz.button("OK").click();
+
+
+// ContextMenuHelper.prepareTreeItemForContextMenu(tree, server);
+// new SWTBotMenu(ContextMenuHelper.getContextMenu(tree, IDELabel.Menu.DELETE, false)).click();
+// SWTBotShell shell = bot.waitForShell("Delete Server");
+// shell.bot().button("OK").click();
server = null;
for (int i = 0; i < servers.length; i++) {
if(servers[i].getText().contains(serverName)) {
@@ -177,6 +190,7 @@
}
}
assertNull("The server wasn't deleted", server);
+ log.info("The server runtime was deleted: " + serverName);
}
boolean isRuntimeSet(String projectName) throws Exception {
More information about the jbosstools-commits
mailing list