[jbosstools-commits] JBoss Tools SVN: r42216 - in trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test: launcher and 3 other directories.
jbosstools-commits at lists.jboss.org
jbosstools-commits at lists.jboss.org
Tue Jun 26 09:06:09 EDT 2012
Author: apodhrad
Date: 2012-06-26 09:06:09 -0400 (Tue, 26 Jun 2012)
New Revision: 42216
Added:
trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/launcher/
trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/launcher/BpelAllTests.launch
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/AssociateRuntimeTest.java
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/FaultModelingTest.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
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/examples/HelloWorldExampleTest.java
trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/examples/HelloWorldOdeExampleTest.java
trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/suite/BPELAllTest.java
Log:
Bpel bot tests: some small corrections, especially referred to server definition in test classes
Added: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/launcher/BpelAllTests.launch
===================================================================
--- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/launcher/BpelAllTests.launch (rev 0)
+++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/launcher/BpelAllTests.launch 2012-06-26 13:06:09 UTC (rev 42216)
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.swtbot.eclipse.ui.launcher.JunitLaunchConfig">
+<booleanAttribute key="append.args" value="true"/>
+<booleanAttribute key="askclear" value="false"/>
+<booleanAttribute key="automaticAdd" value="true"/>
+<booleanAttribute key="automaticValidate" value="false"/>
+<stringAttribute key="bootstrap" value=""/>
+<stringAttribute key="checked" value="[NONE]"/>
+<booleanAttribute key="clearConfig" value="true"/>
+<booleanAttribute key="clearws" value="true"/>
+<booleanAttribute key="clearwslog" value="false"/>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
+<booleanAttribute key="default" value="true"/>
+<booleanAttribute key="includeOptional" value="true"/>
+<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/suite/BPELAllTest.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<mapAttribute key="org.eclipse.debug.core.environmentVariables">
+<mapEntry key="DISPLAY" value=":2"/>
+</mapAttribute>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jboss.tools.bpel.ui.bot.test.suite.BPELAllTest"/>
+<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.tools.bpel.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=org.jboss.tools.bpel.ui.bot.test.properties -Xms256m -Xmx512m -XX:PermSize=256m -XX:MaxPermSize=384m"/>
+<stringAttribute key="pde.version" value="3.3"/>
+<stringAttribute key="product" value="com.jboss.jbds.product.product"/>
+<booleanAttribute key="show_selected_only" value="false"/>
+<booleanAttribute key="tracing" value="false"/>
+<booleanAttribute key="useCustomFeatures" value="false"/>
+<booleanAttribute key="useDefaultConfig" value="true"/>
+<booleanAttribute key="useDefaultConfigArea" value="false"/>
+<booleanAttribute key="useProduct" value="true"/>
+</launchConfiguration>
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 2012-06-26 12:32:25 UTC (rev 42215)
+++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/AssignActivityTest.java 2012-06-26 13:06:09 UTC (rev 42216)
@@ -1,36 +1,28 @@
package org.jboss.tools.bpel.ui.bot.test;
import org.eclipse.core.resources.IProject;
-
import org.eclipse.swtbot.eclipse.gef.finder.SWTGefBot;
import org.eclipse.swtbot.eclipse.gef.finder.widgets.SWTBotGefEditor;
-
import org.eclipse.swtbot.swt.finder.SWTBot;
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.jboss.tools.bpel.ui.bot.ext.widgets.BotBpelEditor;
import org.jboss.tools.bpel.ui.bot.test.util.ResourceHelper;
-import org.jboss.tools.bpel.util.SendSoapMessage;
-
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.helper.ContextMenuHelper;
import org.jboss.tools.ui.bot.ext.types.IDELabel;
-import org.jboss.tools.ui.bot.ext.types.ViewType;
import org.jboss.tools.ui.bot.ext.view.PackageExplorer;
import org.jboss.tools.ui.bot.ext.view.ServersView;
-
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
- at Require(clearProjects = true, server = @Server(type = ServerType.JbossAS, state = ServerState.Running, version = "5.1"), perspective="BPEL")
+ at Require(clearProjects = true, server = @Server(type = ServerType.ALL, state = ServerState.Running), 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/AssociateRuntimeTest.java
===================================================================
--- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/AssociateRuntimeTest.java 2012-06-26 12:32:25 UTC (rev 42215)
+++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/AssociateRuntimeTest.java 2012-06-26 13:06:09 UTC (rev 42216)
@@ -16,7 +16,7 @@
import org.junit.Test;
- at Require(server = @Server(type = ServerType.JbossAS, state = ServerState.Present, version = "5.1"), perspective="BPEL")
+ at Require(server = @Server(type = ServerType.ALL, state = ServerState.Present), perspective="BPEL")
public class AssociateRuntimeTest extends BPELTest {
@Test
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-26 12:32:25 UTC (rev 42215)
+++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/BPELTest.java 2012-06-26 13:06:09 UTC (rev 42216)
@@ -19,6 +19,7 @@
import org.jboss.tools.ui.bot.ext.types.IDELabel;
import org.jboss.tools.ui.bot.ext.view.PackageExplorer;
import org.jboss.tools.ui.bot.ext.view.ProjectExplorer;
+import org.junit.Assert;
import org.osgi.framework.Version;
public class BPELTest extends SWTTestExt {
@@ -275,7 +276,10 @@
}
public static boolean isProjectDeployed(String projectName) {
+ bot.sleep(TIME_5S);
+
assertFalse(console.getConsoleText().contains("DEPLOYMENTS IN ERROR:"));
+ assertFalse(console.getConsoleText().contains("deploy failed"));
// This is due to JBIDE-11928
return true;
Modified: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/FaultModelingTest.java
===================================================================
--- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/FaultModelingTest.java 2012-06-26 12:32:25 UTC (rev 42215)
+++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/FaultModelingTest.java 2012-06-26 13:06:09 UTC (rev 42216)
@@ -24,7 +24,7 @@
*
* @author mbaluch
*/
- at Require(clearProjects = true, server = @Server(type = ServerType.JbossAS, state = ServerState.Disabled), perspective = "BPEL")
+ at Require(clearProjects = true, server = @Server(type = ServerType.ALL, state = ServerState.Disabled), perspective = "BPEL")
public class FaultModelingTest 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 2012-06-26 12:32:25 UTC (rev 42215)
+++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/OdeDeployTest.java 2012-06-26 13:06:09 UTC (rev 42216)
@@ -20,7 +20,7 @@
* @author psrna, apodhrad
*
*/
- at Require(server = @Server(type = ServerType.JbossAS, state = ServerState.Running, version = "5.1"), perspective="BPEL")
+ at Require(server = @Server(type = ServerType.ALL, state = ServerState.Running), 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 2012-06-26 12:32:25 UTC (rev 42215)
+++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/SimpleModelingTest.java 2012-06-26 13:06:09 UTC (rev 42216)
@@ -20,7 +20,7 @@
import org.junit.Before;
import org.junit.Test;
- at Require(clearProjects = true, server = @Server(type = ServerType.JbossAS, state = ServerState.Present, version = "5.1"))
+ at Require(clearProjects = true, server = @Server(type = ServerType.ALL, state = ServerState.Present))
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 2012-06-26 12:32:25 UTC (rev 42215)
+++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/ToolingCompatibilityTest.java 2012-06-26 13:06:09 UTC (rev 42216)
@@ -36,7 +36,7 @@
* @author psrna
*
*/
- at Require(server = @Server(type = ServerType.JbossAS, state = ServerState.Running, version = "5.1"), perspective="BPEL")
+ at Require(server = @Server(type = ServerType.ALL, state = ServerState.Running), perspective="BPEL")
public class ToolingCompatibilityTest extends BPELTest{
final static String BUNDLE = "org.jboss.tools.bpel.ui.bot.test";
@@ -63,22 +63,9 @@
@Test
- public void deployProjectTest(){
-
- String serverName = ToolingCompatibilityTest.configuredState.getServer().name;
+ public void deployProjectTest() {
// Publish the process
projExplorer.runOnServer("eclipse_tooling_proj");
-
- Assert.assertFalse(console.getConsoleText().contains("DEPLOYMENTS IN ERROR:"));
- Assert.assertFalse(console.getConsoleText().contains("deploy failed"));
-
- 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_5S);
assertTrue(isProjectDeployed("eclipse_tooling_proj"));
}
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-26 12:32:25 UTC (rev 42215)
+++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/WizardTest.java 2012-06-26 13:06:09 UTC (rev 42216)
@@ -13,7 +13,7 @@
import org.junit.Assert;
import org.junit.Test;
- at Require(clearProjects = true, server = @Server(type = ServerType.JbossAS, state = ServerState.Present), perspective="BPEL")
+ at Require(server = @Server(type = ServerType.ALL, state = ServerState.Present), perspective="BPEL")
public class WizardTest extends BPELTest {
Modified: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/examples/HelloWorldExampleTest.java
===================================================================
--- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/examples/HelloWorldExampleTest.java 2012-06-26 12:32:25 UTC (rev 42215)
+++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/examples/HelloWorldExampleTest.java 2012-06-26 13:06:09 UTC (rev 42216)
@@ -5,14 +5,13 @@
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.junit.Test;
/**
*
* @author apodhrad
*
*/
- at Require(server = @Server(type = ServerType.JbossAS, state = ServerState.Running, version = "5.1"), perspective = "BPEL")
+ at Require(server = @Server(type = ServerType.ALL, state = ServerState.Running), perspective = "BPEL")
public class HelloWorldExampleTest extends BPELExampleTest {
private static final String PROJECT_NAME = "HelloWorld";
Modified: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/examples/HelloWorldOdeExampleTest.java
===================================================================
--- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/examples/HelloWorldOdeExampleTest.java 2012-06-26 12:32:25 UTC (rev 42215)
+++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/examples/HelloWorldOdeExampleTest.java 2012-06-26 13:06:09 UTC (rev 42216)
@@ -10,7 +10,7 @@
* @author apodhrad
*
*/
- at Require(server = @Server(type = ServerType.JbossAS, state = ServerState.Running, version = "5.1"), perspective = "BPEL")
+ at Require(server = @Server(type = ServerType.ALL, state = ServerState.Running), perspective = "BPEL")
public class HelloWorldOdeExampleTest extends BPELExampleTest {
private static final String PROJECT_NAME = "Hello_World_Header_Ode";
Modified: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/suite/BPELAllTest.java
===================================================================
--- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/suite/BPELAllTest.java 2012-06-26 12:32:25 UTC (rev 42215)
+++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/suite/BPELAllTest.java 2012-06-26 13:06:09 UTC (rev 42216)
@@ -19,7 +19,8 @@
import org.junit.runner.RunWith;
import org.junit.runners.Suite.SuiteClasses;
- at SuiteClasses({OdeDeployTest.class,
+ at SuiteClasses({
+ OdeDeployTest.class,
WizardTest.class,
ActivityModelingTest.class,
AssignActivityTest.class,
@@ -28,7 +29,8 @@
ToolingCompatibilityTest.class,
AssociateRuntimeTest.class,
HelloWorldExampleTest.class,
- HelloWorldOdeExampleTest.class})
+ HelloWorldOdeExampleTest.class
+ })
@RunWith(RequirementAwareSuite.class)
public class BPELAllTest extends TestSuite {
More information about the jbosstools-commits
mailing list