[jbpm-commits] JBoss JBPM SVN: r3872 - in jbpm4/trunk/modules: examples/src/test/java/org/jbpm/examples/end/multiple and 43 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Fri Feb 13 10:32:37 EST 2009
Author: tom.baeyens at jboss.com
Date: 2009-02-13 10:32:36 -0500 (Fri, 13 Feb 2009)
New Revision: 3872
Added:
jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/BaseJbpmTestCase.java
jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java
Removed:
jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/DbTestCase.java
jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java
Modified:
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/concurrency/graphbased/ConcurrencyGraphBasedTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/multiple/EndMultipleTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/processinstance/EndProcessInstanceTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/state/EndStateTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/esb/EsbTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/exclusive/conditions/ExclusiveConditionsTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/exclusive/expression/ExclusiveExpressionTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/exclusive/handler/ExclusiveHandlerTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/hql/HqlTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/java/JavaInstantiateTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/expression/ScriptExpressionTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/text/ScriptTextTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/sql/SqlTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/state/choice/StateChoiceTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/state/sequence/StateSequenceTest.java
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/TaskTest.java
jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/JpdlTestCase.java
jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/JpdlParseTestCase.java
jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/test/xml/JpdlXmlTest.java
jbpm4/trunk/modules/log/src/main/java/org/jbpm/log/Jdk14LogFactory.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/activities/TestConsoleTestCase.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/builder/BuilderTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/BasicEnvironmentTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentClassLoaderTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentSearchOrderTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentTypeLookupTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/NestedEnvironmentTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/eventlistener/EventPropagationTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/executionmode/embedded/EmbeddedExecutionModeTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/GroovyExpressionTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/JuelExpressionTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/identity/IdentityTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/AsyncContinuationsTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionFailingCommitTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionResourcesCommitTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionResourcesSetRollbackOnlyTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/SubscriptionTestCase.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireObservableTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireTestCase.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/spring/SpringTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/test/EnvironmentFactoryTestCase.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/tx/BasicTransactionTest.java
jbpm4/trunk/modules/task/src/test/java/org/jbpm/task/internal/model/TaskTest.java
jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/MessageFinder.java
jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/activities/ExclusiveTest.java
jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/activities/StateTest.java
jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/cfg/ConfigurationTest.java
jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/execution/FindExecutionTest.java
jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/execution/SignalExecutionTest.java
jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/execution/StartExecutionTest.java
jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/history/AvgDurationTest.java
jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/history/ChoiceDistributionTest.java
jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/history/ProcessInstanceHistoryTest.java
jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/process/ProcessAttachmentsTest.java
jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/process/ProcessDefinitionQueryTest.java
jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/process/ProcessServiceTest.java
jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/task/TaskCreateUpdateDeleteTest.java
jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/task/TaskListTest.java
jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/task/TaskQueryTest.java
jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/variables/BasicVariablesTest.java
jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/variables/VariableBasicTypesTest.java
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/LoadTestCase.java
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailingMessageTest.java
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/JobExecutorTestCase.java
jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/AutomaticDecisionTest.java
jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/BasicExecutionFlowTest.java
jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/EventPropagationTest.java
jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/EventTest.java
jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExceptionHandlerTest.java
jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExecutionStateTest.java
jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/FunctionalActivityTest.java
jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/LoopingTest.java
jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeStateTest.java
jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeVariableDeclarationTest.java
jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeVariableTest.java
jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/SubProcessTest.java
jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionBasedConcurrencyTest.java
jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionEventsTest.java
jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/VariableTest.java
Log:
renamed test base classes so that JbpmTestCase becomes the class for our users to use
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/concurrency/graphbased/ConcurrencyGraphBasedTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/concurrency/graphbased/ConcurrencyGraphBasedTest.java 2009-02-13 14:40:26 UTC (rev 3871)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/concurrency/graphbased/ConcurrencyGraphBasedTest.java 2009-02-13 15:32:36 UTC (rev 3872)
@@ -25,13 +25,13 @@
import java.util.Set;
import org.jbpm.Execution;
-import org.jbpm.test.DbTestCase;
+import org.jbpm.test.JbpmTestCase;
/**
* @author Tom Baeyens
*/
-public class ConcurrencyGraphBasedTest extends DbTestCase {
+public class ConcurrencyGraphBasedTest extends JbpmTestCase {
public void testConcurrencyGraphBased() {
deployJpdlResource("org/jbpm/examples/concurrency/graphbased/process.jpdl.xml");
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/multiple/EndMultipleTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/multiple/EndMultipleTest.java 2009-02-13 14:40:26 UTC (rev 3871)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/multiple/EndMultipleTest.java 2009-02-13 15:32:36 UTC (rev 3872)
@@ -22,13 +22,13 @@
package org.jbpm.examples.end.multiple;
import org.jbpm.Execution;
-import org.jbpm.test.DbTestCase;
+import org.jbpm.test.JbpmTestCase;
/**
* @author Tom Baeyens
*/
-public class EndMultipleTest extends DbTestCase {
+public class EndMultipleTest extends JbpmTestCase {
public void testEndMultipleOk() {
deployJpdlResource("org/jbpm/examples/end/multiple/process.jpdl.xml");
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/processinstance/EndProcessInstanceTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/processinstance/EndProcessInstanceTest.java 2009-02-13 14:40:26 UTC (rev 3871)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/processinstance/EndProcessInstanceTest.java 2009-02-13 15:32:36 UTC (rev 3872)
@@ -22,13 +22,13 @@
package org.jbpm.examples.end.processinstance;
import org.jbpm.Execution;
-import org.jbpm.test.DbTestCase;
+import org.jbpm.test.JbpmTestCase;
/**
* @author Tom Baeyens
*/
-public class EndProcessInstanceTest extends DbTestCase {
+public class EndProcessInstanceTest extends JbpmTestCase {
public void testEndProcessInstance() {
deployJpdlResource("org/jbpm/examples/end/processinstance/process.jpdl.xml");
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/state/EndStateTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/state/EndStateTest.java 2009-02-13 14:40:26 UTC (rev 3871)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/state/EndStateTest.java 2009-02-13 15:32:36 UTC (rev 3872)
@@ -22,13 +22,13 @@
package org.jbpm.examples.end.state;
import org.jbpm.Execution;
-import org.jbpm.test.DbTestCase;
+import org.jbpm.test.JbpmTestCase;
/**
* @author Tom Baeyens
*/
-public class EndStateTest extends DbTestCase {
+public class EndStateTest extends JbpmTestCase {
public void testEndStateCompleted() {
deployJpdlResource("org/jbpm/examples/end/state/process.jpdl.xml");
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/esb/EsbTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/esb/EsbTest.java 2009-02-13 14:40:26 UTC (rev 3871)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/esb/EsbTest.java 2009-02-13 15:32:36 UTC (rev 3872)
@@ -31,13 +31,13 @@
import org.jboss.soa.esb.message.Body;
import org.jboss.soa.esb.message.Message;
import org.jbpm.Execution;
-import org.jbpm.test.DbTestCase;
+import org.jbpm.test.JbpmTestCase;
/**
* @author Tom Baeyens
*/
-public class EsbTest extends DbTestCase {
+public class EsbTest extends JbpmTestCase {
public JbpmMockCourier courier;
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/exclusive/conditions/ExclusiveConditionsTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/exclusive/conditions/ExclusiveConditionsTest.java 2009-02-13 14:40:26 UTC (rev 3871)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/exclusive/conditions/ExclusiveConditionsTest.java 2009-02-13 15:32:36 UTC (rev 3872)
@@ -25,13 +25,13 @@
import java.util.Map;
import org.jbpm.Execution;
-import org.jbpm.test.DbTestCase;
+import org.jbpm.test.JbpmTestCase;
/**
* @author Tom Baeyens
*/
-public class ExclusiveConditionsTest extends DbTestCase {
+public class ExclusiveConditionsTest extends JbpmTestCase {
public void testExclusiveConditionsGood() {
deployJpdlResource("org/jbpm/examples/exclusive/conditions/process.jpdl.xml");
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/exclusive/expression/ExclusiveExpressionTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/exclusive/expression/ExclusiveExpressionTest.java 2009-02-13 14:40:26 UTC (rev 3871)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/exclusive/expression/ExclusiveExpressionTest.java 2009-02-13 15:32:36 UTC (rev 3872)
@@ -25,13 +25,13 @@
import java.util.Map;
import org.jbpm.Execution;
-import org.jbpm.test.DbTestCase;
+import org.jbpm.test.JbpmTestCase;
/**
* @author Tom Baeyens
*/
-public class ExclusiveExpressionTest extends DbTestCase {
+public class ExclusiveExpressionTest extends JbpmTestCase {
public void testExclusiveExpressionGood() {
deployJpdlResource("org/jbpm/examples/exclusive/expression/process.jpdl.xml");
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/exclusive/handler/ExclusiveHandlerTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/exclusive/handler/ExclusiveHandlerTest.java 2009-02-13 14:40:26 UTC (rev 3871)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/exclusive/handler/ExclusiveHandlerTest.java 2009-02-13 15:32:36 UTC (rev 3872)
@@ -25,13 +25,13 @@
import java.util.Map;
import org.jbpm.Execution;
-import org.jbpm.test.DbTestCase;
+import org.jbpm.test.JbpmTestCase;
/**
* @author Tom Baeyens
*/
-public class ExclusiveHandlerTest extends DbTestCase {
+public class ExclusiveHandlerTest extends JbpmTestCase {
public void testExclusiveHandlerGreat() {
deployJpdlResource("org/jbpm/examples/exclusive/handler/process.jpdl.xml");
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/hql/HqlTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/hql/HqlTest.java 2009-02-13 14:40:26 UTC (rev 3871)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/hql/HqlTest.java 2009-02-13 15:32:36 UTC (rev 3872)
@@ -28,13 +28,13 @@
import java.util.Set;
import org.jbpm.Execution;
-import org.jbpm.test.DbTestCase;
+import org.jbpm.test.JbpmTestCase;
/**
* @author Tom Baeyens
*/
-public class HqlTest extends DbTestCase {
+public class HqlTest extends JbpmTestCase {
public void testHql() {
deployJpdlResource("org/jbpm/examples/hql/process.jpdl.xml");
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/java/JavaInstantiateTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/java/JavaInstantiateTest.java 2009-02-13 14:40:26 UTC (rev 3871)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/java/JavaInstantiateTest.java 2009-02-13 15:32:36 UTC (rev 3872)
@@ -22,13 +22,13 @@
package org.jbpm.examples.java;
import org.jbpm.Execution;
-import org.jbpm.test.DbTestCase;
+import org.jbpm.test.JbpmTestCase;
/**
* @author Tom Baeyens
*/
-public class JavaInstantiateTest extends DbTestCase {
+public class JavaInstantiateTest extends JbpmTestCase {
public void testJavaInstantiate() {
deployJpdlResource("org/jbpm/examples/java/process.jpdl.xml");
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/expression/ScriptExpressionTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/expression/ScriptExpressionTest.java 2009-02-13 14:40:26 UTC (rev 3871)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/expression/ScriptExpressionTest.java 2009-02-13 15:32:36 UTC (rev 3872)
@@ -26,13 +26,13 @@
import org.jbpm.Execution;
import org.jbpm.examples.script.text.Person;
-import org.jbpm.test.DbTestCase;
+import org.jbpm.test.JbpmTestCase;
/**
* @author Tom Baeyens
*/
-public class ScriptExpressionTest extends DbTestCase {
+public class ScriptExpressionTest extends JbpmTestCase {
public void testScriptText() {
deployJpdlResource("org/jbpm/examples/script/expression/process.jpdl.xml");
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/text/ScriptTextTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/text/ScriptTextTest.java 2009-02-13 14:40:26 UTC (rev 3871)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/text/ScriptTextTest.java 2009-02-13 15:32:36 UTC (rev 3872)
@@ -25,13 +25,13 @@
import java.util.Map;
import org.jbpm.Execution;
-import org.jbpm.test.DbTestCase;
+import org.jbpm.test.JbpmTestCase;
/**
* @author Tom Baeyens
*/
-public class ScriptTextTest extends DbTestCase {
+public class ScriptTextTest extends JbpmTestCase {
public void testScriptText() {
deployJpdlResource("org/jbpm/examples/script/text/process.jpdl.xml");
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/sql/SqlTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/sql/SqlTest.java 2009-02-13 14:40:26 UTC (rev 3871)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/sql/SqlTest.java 2009-02-13 15:32:36 UTC (rev 3872)
@@ -25,13 +25,13 @@
import java.util.List;
import org.jbpm.Execution;
-import org.jbpm.test.DbTestCase;
+import org.jbpm.test.JbpmTestCase;
/**
* @author Tom Baeyens
*/
-public class SqlTest extends DbTestCase {
+public class SqlTest extends JbpmTestCase {
public void testSql() {
deployJpdlResource("org/jbpm/examples/sql/process.jpdl.xml");
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/state/choice/StateChoiceTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/state/choice/StateChoiceTest.java 2009-02-13 14:40:26 UTC (rev 3871)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/state/choice/StateChoiceTest.java 2009-02-13 15:32:36 UTC (rev 3872)
@@ -22,13 +22,13 @@
package org.jbpm.examples.state.choice;
import org.jbpm.Execution;
-import org.jbpm.test.DbTestCase;
+import org.jbpm.test.JbpmTestCase;
/**
* @author Tom Baeyens
*/
-public class StateChoiceTest extends DbTestCase {
+public class StateChoiceTest extends JbpmTestCase {
public void testStateChoiceAccept() {
deployJpdlResource("org/jbpm/examples/state/choice/process.jpdl.xml");
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/state/sequence/StateSequenceTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/state/sequence/StateSequenceTest.java 2009-02-13 14:40:26 UTC (rev 3871)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/state/sequence/StateSequenceTest.java 2009-02-13 15:32:36 UTC (rev 3872)
@@ -22,13 +22,13 @@
package org.jbpm.examples.state.sequence;
import org.jbpm.Execution;
-import org.jbpm.test.DbTestCase;
+import org.jbpm.test.JbpmTestCase;
/**
* @author Tom Baeyens
*/
-public class StateSequenceTest extends DbTestCase {
+public class StateSequenceTest extends JbpmTestCase {
public void testWaitStatesSequence() {
deployJpdlResource("org/jbpm/examples/state/sequence/process.jpdl.xml");
Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/TaskTest.java
===================================================================
--- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/TaskTest.java 2009-02-13 14:40:26 UTC (rev 3871)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/TaskTest.java 2009-02-13 15:32:36 UTC (rev 3872)
@@ -25,13 +25,13 @@
import org.jbpm.Execution;
import org.jbpm.task.Task;
-import org.jbpm.test.DbTestCase;
+import org.jbpm.test.JbpmTestCase;
/**
* @author Tom Baeyens
*/
-public class TaskTest extends DbTestCase {
+public class TaskTest extends JbpmTestCase {
public void testTask() {
deployJpdlResource("org/jbpm/examples/task/process.jpdl.xml");
Modified: jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/JpdlTestCase.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/JpdlTestCase.java 2009-02-13 14:40:26 UTC (rev 3871)
+++ jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/JpdlTestCase.java 2009-02-13 15:32:36 UTC (rev 3872)
@@ -25,12 +25,12 @@
import org.jbpm.jpdl.xml.JpdlParser;
import org.jbpm.log.Log;
import org.jbpm.pvm.internal.xml.Parse;
-import org.jbpm.test.JbpmTestCase;
+import org.jbpm.test.BaseJbpmTestCase;
/**
* @author Tom Baeyens
*/
-public abstract class JpdlTestCase extends JbpmTestCase
+public abstract class JpdlTestCase extends BaseJbpmTestCase
{
static protected Log log = Log.getLog(JpdlTestCase.class.getName());
Modified: jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/JpdlParseTestCase.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/JpdlParseTestCase.java 2009-02-13 14:40:26 UTC (rev 3871)
+++ jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/JpdlParseTestCase.java 2009-02-13 15:32:36 UTC (rev 3872)
@@ -26,13 +26,13 @@
import org.jbpm.Problem;
import org.jbpm.client.ClientProcessDefinition;
import org.jbpm.jpdl.xml.JpdlParser;
-import org.jbpm.test.JbpmTestCase;
+import org.jbpm.test.BaseJbpmTestCase;
/**
* @author Tom Baeyens
*/
-public abstract class JpdlParseTestCase extends JbpmTestCase {
+public abstract class JpdlParseTestCase extends BaseJbpmTestCase {
static JpdlParser jpdlParser = new JpdlParser();
Modified: jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/test/xml/JpdlXmlTest.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/test/xml/JpdlXmlTest.java 2009-02-13 14:40:26 UTC (rev 3871)
+++ jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/test/xml/JpdlXmlTest.java 2009-02-13 15:32:36 UTC (rev 3872)
@@ -25,12 +25,12 @@
import org.jbpm.Problem;
import org.jbpm.jpdl.xml.JpdlParser;
-import org.jbpm.test.JbpmTestCase;
+import org.jbpm.test.BaseJbpmTestCase;
/**
* @author Tom Baeyens
*/
-public class JpdlXmlTest extends JbpmTestCase {
+public class JpdlXmlTest extends BaseJbpmTestCase {
public void testValidXml() {
List<Problem> problems = new JpdlParser()
Modified: jbpm4/trunk/modules/log/src/main/java/org/jbpm/log/Jdk14LogFactory.java
===================================================================
--- jbpm4/trunk/modules/log/src/main/java/org/jbpm/log/Jdk14LogFactory.java 2009-02-13 14:40:26 UTC (rev 3871)
+++ jbpm4/trunk/modules/log/src/main/java/org/jbpm/log/Jdk14LogFactory.java 2009-02-13 15:32:36 UTC (rev 3872)
@@ -54,17 +54,16 @@
try {
if (inputStream != null) {
LogManager.getLogManager().readConfiguration(inputStream);
+
+ String redirectCommons = LogManager.getLogManager().getProperty("redirect.commons.logging");
+ if ( (redirectCommons!=null)
+ && (! redirectCommons.equalsIgnoreCase("disabled"))
+ && (! redirectCommons.equalsIgnoreCase("off"))
+ && (! redirectCommons.equalsIgnoreCase("false"))
+ ) {
+ redirectCommonsToJdk14();
+ }
}
-
- String redirectCommons = LogManager.getLogManager().getProperty("redirect.commons.logging");
- if ( (redirectCommons!=null)
- && (! redirectCommons.equalsIgnoreCase("disabled"))
- && (! redirectCommons.equalsIgnoreCase("off"))
- && (! redirectCommons.equalsIgnoreCase("false"))
- ) {
- redirectCommonsToJdk14();
- }
-
} catch (Exception e) {
e.printStackTrace();
throw new RuntimeException("couldn't initialize logging properly", e);
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/activities/TestConsoleTestCase.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/activities/TestConsoleTestCase.java 2009-02-13 14:40:26 UTC (rev 3871)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/activities/TestConsoleTestCase.java 2009-02-13 15:32:36 UTC (rev 3872)
@@ -21,13 +21,13 @@
*/
package org.jbpm.pvm.activities;
-import org.jbpm.test.JbpmTestCase;
+import org.jbpm.test.BaseJbpmTestCase;
/**
* @author Tom Baeyens
*/
-public class TestConsoleTestCase extends JbpmTestCase {
+public class TestConsoleTestCase extends BaseJbpmTestCase {
protected TestConsole testConsole;
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/builder/BuilderTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/builder/BuilderTest.java 2009-02-13 14:40:26 UTC (rev 3871)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/builder/BuilderTest.java 2009-02-13 15:32:36 UTC (rev 3872)
@@ -28,13 +28,13 @@
import org.jbpm.model.Transition;
import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
import org.jbpm.pvm.internal.model.ActivityImpl;
-import org.jbpm.test.JbpmTestCase;
+import org.jbpm.test.BaseJbpmTestCase;
/**
* @author Tom Baeyens
*/
-public class BuilderTest extends JbpmTestCase {
+public class BuilderTest extends BaseJbpmTestCase {
public void testBuilderProcessDefinitionProperties() {
ClientProcessDefinition processDefinition = ProcessDefinitionBuilder
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/BasicEnvironmentTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/BasicEnvironmentTest.java 2009-02-13 14:40:26 UTC (rev 3871)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/BasicEnvironmentTest.java 2009-02-13 15:32:36 UTC (rev 3872)
@@ -25,13 +25,13 @@
import org.jbpm.env.Environment;
import org.jbpm.env.EnvironmentFactory;
import org.jbpm.pvm.internal.cfg.JbpmConfiguration;
-import org.jbpm.test.JbpmTestCase;
+import org.jbpm.test.BaseJbpmTestCase;
/**
* @author Tom Baeyens
* @author Guillaume Porcher
*/
-public class BasicEnvironmentTest extends JbpmTestCase {
+public class BasicEnvironmentTest extends BaseJbpmTestCase {
public void testBasicEnvironmentOperation() {
EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString(
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentClassLoaderTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentClassLoaderTest.java 2009-02-13 14:40:26 UTC (rev 3871)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentClassLoaderTest.java 2009-02-13 15:32:36 UTC (rev 3872)
@@ -24,12 +24,12 @@
import org.jbpm.env.Environment;
import org.jbpm.env.EnvironmentFactory;
import org.jbpm.pvm.internal.cfg.JbpmConfiguration;
-import org.jbpm.test.JbpmTestCase;
+import org.jbpm.test.BaseJbpmTestCase;
/**
* @author Tom Baeyens
*/
-public class EnvironmentClassLoaderTest extends JbpmTestCase {
+public class EnvironmentClassLoaderTest extends BaseJbpmTestCase {
public static class TestClassLoader extends ClassLoader {
}
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentSearchOrderTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentSearchOrderTest.java 2009-02-13 14:40:26 UTC (rev 3871)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentSearchOrderTest.java 2009-02-13 15:32:36 UTC (rev 3872)
@@ -27,12 +27,12 @@
import org.jbpm.pvm.internal.wire.WireContext;
import org.jbpm.pvm.internal.wire.WireDefinition;
import org.jbpm.pvm.internal.wire.xml.WireParser;
-import org.jbpm.test.JbpmTestCase;
+import org.jbpm.test.BaseJbpmTestCase;
/**
* @author Tom Baeyens
*/
-public class EnvironmentSearchOrderTest extends JbpmTestCase
+public class EnvironmentSearchOrderTest extends BaseJbpmTestCase
{
public void testEnvironmentDefaultSearchOrder() {
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentTypeLookupTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentTypeLookupTest.java 2009-02-13 14:40:26 UTC (rev 3871)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/EnvironmentTypeLookupTest.java 2009-02-13 15:32:36 UTC (rev 3872)
@@ -24,12 +24,12 @@
import org.jbpm.env.Environment;
import org.jbpm.env.EnvironmentFactory;
import org.jbpm.pvm.internal.cfg.JbpmConfiguration;
-import org.jbpm.test.JbpmTestCase;
+import org.jbpm.test.BaseJbpmTestCase;
/**
* @author Tom Baeyens
*/
-public class EnvironmentTypeLookupTest extends JbpmTestCase {
+public class EnvironmentTypeLookupTest extends BaseJbpmTestCase {
public static class A {
}
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/NestedEnvironmentTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/NestedEnvironmentTest.java 2009-02-13 14:40:26 UTC (rev 3871)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/env/NestedEnvironmentTest.java 2009-02-13 15:32:36 UTC (rev 3872)
@@ -24,12 +24,12 @@
import org.jbpm.env.Environment;
import org.jbpm.env.EnvironmentFactory;
import org.jbpm.pvm.internal.cfg.JbpmConfiguration;
-import org.jbpm.test.JbpmTestCase;
+import org.jbpm.test.BaseJbpmTestCase;
/**
* @author Tom Baeyens
*/
-public class NestedEnvironmentTest extends JbpmTestCase {
+public class NestedEnvironmentTest extends BaseJbpmTestCase {
public void testNestedEnvironments() {
EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString(
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/eventlistener/EventPropagationTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/eventlistener/EventPropagationTest.java 2009-02-13 14:40:26 UTC (rev 3871)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/eventlistener/EventPropagationTest.java 2009-02-13 15:32:36 UTC (rev 3872)
@@ -31,10 +31,10 @@
import org.jbpm.pvm.activities.TestConsole;
import org.jbpm.pvm.activities.WaitState;
import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
-import org.jbpm.test.JbpmTestCase;
+import org.jbpm.test.BaseJbpmTestCase;
-public class EventPropagationTest extends JbpmTestCase {
+public class EventPropagationTest extends BaseJbpmTestCase {
TestConsole testConsole;
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/executionmode/embedded/EmbeddedExecutionModeTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/executionmode/embedded/EmbeddedExecutionModeTest.java 2009-02-13 14:40:26 UTC (rev 3871)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/executionmode/embedded/EmbeddedExecutionModeTest.java 2009-02-13 15:32:36 UTC (rev 3872)
@@ -25,12 +25,12 @@
import org.hibernate.SessionFactory;
import org.hibernate.Transaction;
import org.hibernate.cfg.Configuration;
-import org.jbpm.test.JbpmTestCase;
+import org.jbpm.test.BaseJbpmTestCase;
/**
* @author Tom Baeyens
*/
-public class EmbeddedExecutionModeTest extends JbpmTestCase {
+public class EmbeddedExecutionModeTest extends BaseJbpmTestCase {
SessionFactory sessionFactory;
Session session;
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/GroovyExpressionTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/GroovyExpressionTest.java 2009-02-13 14:40:26 UTC (rev 3871)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/GroovyExpressionTest.java 2009-02-13 15:32:36 UTC (rev 3872)
@@ -28,13 +28,13 @@
import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
import org.jbpm.pvm.internal.cfg.JbpmConfiguration;
import org.jbpm.pvm.internal.script.ScriptManager;
-import org.jbpm.test.JbpmTestCase;
+import org.jbpm.test.BaseJbpmTestCase;
/**
* @author Tom Baeyens
*/
-public class GroovyExpressionTest extends JbpmTestCase {
+public class GroovyExpressionTest extends BaseJbpmTestCase {
public void testGroovyExpression() {
System.out.println("FIXME: JBPM-1768 Fix groovy support");
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/JuelExpressionTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/JuelExpressionTest.java 2009-02-13 14:40:26 UTC (rev 3871)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/JuelExpressionTest.java 2009-02-13 15:32:36 UTC (rev 3872)
@@ -28,13 +28,13 @@
import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
import org.jbpm.pvm.internal.cfg.JbpmConfiguration;
import org.jbpm.pvm.internal.script.ScriptManager;
-import org.jbpm.test.JbpmTestCase;
+import org.jbpm.test.BaseJbpmTestCase;
/**
* @author Tom Baeyens
*/
-public class JuelExpressionTest extends JbpmTestCase {
+public class JuelExpressionTest extends BaseJbpmTestCase {
public void testJuelExpression() {
EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString(
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/identity/IdentityTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/identity/IdentityTest.java 2009-02-13 14:40:26 UTC (rev 3871)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/identity/IdentityTest.java 2009-02-13 15:32:36 UTC (rev 3872)
@@ -27,13 +27,13 @@
import org.jbpm.IdentityService;
import org.jbpm.identity.Group;
import org.jbpm.identity.User;
-import org.jbpm.test.DbTestCase;
+import org.jbpm.test.JbpmTestCase;
/**
* @author Tom Baeyens
*/
-public class IdentityTest extends DbTestCase {
+public class IdentityTest extends JbpmTestCase {
public void testSingleUser() throws Exception {
IdentityService identityService = processEngine.get(IdentityService.class);
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/AsyncContinuationsTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/AsyncContinuationsTest.java 2009-02-13 14:40:26 UTC (rev 3871)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/AsyncContinuationsTest.java 2009-02-13 15:32:36 UTC (rev 3872)
@@ -28,13 +28,13 @@
import org.jbpm.model.OpenProcessDefinition;
import org.jbpm.pvm.activities.AutomaticActivity;
import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
-import org.jbpm.test.DbTestCase;
+import org.jbpm.test.JbpmTestCase;
/**
* @author Tom Baeyens
*/
-public class AsyncContinuationsTest extends DbTestCase {
+public class AsyncContinuationsTest extends JbpmTestCase {
public void testContinuations() {
deployProcess();
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionFailingCommitTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionFailingCommitTest.java 2009-02-13 14:40:26 UTC (rev 3871)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionFailingCommitTest.java 2009-02-13 15:32:36 UTC (rev 3872)
@@ -24,12 +24,12 @@
import org.jbpm.Configuration;
import org.jbpm.env.Environment;
import org.jbpm.env.EnvironmentFactory;
-import org.jbpm.test.JbpmTestCase;
+import org.jbpm.test.BaseJbpmTestCase;
/**
* @author Tom Baeyens
*/
-public class TransactionFailingCommitTest extends JbpmTestCase {
+public class TransactionFailingCommitTest extends BaseJbpmTestCase {
public static class CommitException extends RuntimeException {
private static final long serialVersionUID = 1L;
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionResourcesCommitTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionResourcesCommitTest.java 2009-02-13 14:40:26 UTC (rev 3871)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionResourcesCommitTest.java 2009-02-13 15:32:36 UTC (rev 3872)
@@ -25,13 +25,13 @@
import org.jbpm.env.Environment;
import org.jbpm.env.EnvironmentFactory;
import org.jbpm.pvm.internal.tx.StandardTransaction;
-import org.jbpm.test.JbpmTestCase;
+import org.jbpm.test.BaseJbpmTestCase;
/**
* @author Tom Baeyens
*/
-public class TransactionResourcesCommitTest extends JbpmTestCase {
+public class TransactionResourcesCommitTest extends BaseJbpmTestCase {
public static Environment openEnvironment(String xmlString) {
EnvironmentFactory environmentFactory = (EnvironmentFactory)
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionResourcesSetRollbackOnlyTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionResourcesSetRollbackOnlyTest.java 2009-02-13 14:40:26 UTC (rev 3871)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionResourcesSetRollbackOnlyTest.java 2009-02-13 15:32:36 UTC (rev 3872)
@@ -26,13 +26,13 @@
import org.jbpm.env.EnvironmentFactory;
import org.jbpm.env.Transaction;
import org.jbpm.pvm.internal.tx.StandardTransaction;
-import org.jbpm.test.JbpmTestCase;
+import org.jbpm.test.BaseJbpmTestCase;
/**
* @author Tom Baeyens
*/
-public class TransactionResourcesSetRollbackOnlyTest extends JbpmTestCase {
+public class TransactionResourcesSetRollbackOnlyTest extends BaseJbpmTestCase {
public static Environment openEnvironment(String xmlString) {
EnvironmentFactory environmentFactory = (EnvironmentFactory)
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/SubscriptionTestCase.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/SubscriptionTestCase.java 2009-02-13 14:40:26 UTC (rev 3871)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/SubscriptionTestCase.java 2009-02-13 15:32:36 UTC (rev 3872)
@@ -25,12 +25,12 @@
import java.util.List;
import org.jbpm.pvm.internal.util.Listener;
-import org.jbpm.test.JbpmTestCase;
+import org.jbpm.test.BaseJbpmTestCase;
/**
* @author Tom Baeyens
*/
-public abstract class SubscriptionTestCase extends JbpmTestCase {
+public abstract class SubscriptionTestCase extends BaseJbpmTestCase {
public static class Event {
Object source;
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireObservableTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireObservableTest.java 2009-02-13 14:40:26 UTC (rev 3871)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireObservableTest.java 2009-02-13 15:32:36 UTC (rev 3872)
@@ -29,12 +29,12 @@
import org.jbpm.pvm.internal.cfg.JbpmConfiguration;
import org.jbpm.pvm.internal.util.Listener;
import org.jbpm.pvm.internal.wire.WireContext;
-import org.jbpm.test.JbpmTestCase;
+import org.jbpm.test.BaseJbpmTestCase;
/**
* @author Tom Baeyens
*/
-public class WireObservableTest extends JbpmTestCase
+public class WireObservableTest extends BaseJbpmTestCase
{
public static class Recorder implements Listener {
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireTestCase.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireTestCase.java 2009-02-13 14:40:26 UTC (rev 3871)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireTestCase.java 2009-02-13 15:32:36 UTC (rev 3872)
@@ -25,12 +25,12 @@
import org.jbpm.Problem;
import org.jbpm.pvm.internal.wire.xml.WireParser;
-import org.jbpm.test.JbpmTestCase;
+import org.jbpm.test.BaseJbpmTestCase;
/**
* @author Tom Baeyens
*/
-public abstract class WireTestCase extends JbpmTestCase {
+public abstract class WireTestCase extends BaseJbpmTestCase {
public static WireContext createWireContext(String wireDefinitionXml) {
WireDefinition wireDefinition = (WireDefinition) WireParser.getInstance()
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/spring/SpringTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/spring/SpringTest.java 2009-02-13 14:40:26 UTC (rev 3871)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/spring/SpringTest.java 2009-02-13 15:32:36 UTC (rev 3872)
@@ -26,14 +26,14 @@
import org.jbpm.cmd.CommandService;
import org.jbpm.env.Environment;
import org.jbpm.env.EnvironmentFactory;
-import org.jbpm.test.JbpmTestCase;
+import org.jbpm.test.BaseJbpmTestCase;
import org.springframework.context.support.ClassPathXmlApplicationContext;
/**
* @author Tom Baeyens
*/
-public class SpringTest extends JbpmTestCase {
+public class SpringTest extends BaseJbpmTestCase {
public void testSpringTransactions() {
ClassPathXmlApplicationContext applicationContext = new ClassPathXmlApplicationContext("org/jbpm/pvm/spring/spring.beans.xml");
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/test/EnvironmentFactoryTestCase.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/test/EnvironmentFactoryTestCase.java 2009-02-13 14:40:26 UTC (rev 3871)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/test/EnvironmentFactoryTestCase.java 2009-02-13 15:32:36 UTC (rev 3872)
@@ -27,13 +27,13 @@
import org.jbpm.Configuration;
import org.jbpm.JbpmException;
import org.jbpm.env.EnvironmentFactory;
-import org.jbpm.test.JbpmTestCase;
+import org.jbpm.test.BaseJbpmTestCase;
/**
* @author Tom Baeyens
*/
-public abstract class EnvironmentFactoryTestCase extends JbpmTestCase {
+public abstract class EnvironmentFactoryTestCase extends BaseJbpmTestCase {
String configResource;
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/tx/BasicTransactionTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/tx/BasicTransactionTest.java 2009-02-13 14:40:26 UTC (rev 3871)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/tx/BasicTransactionTest.java 2009-02-13 15:32:36 UTC (rev 3872)
@@ -32,12 +32,12 @@
import org.jbpm.env.Transaction;
import org.jbpm.pvm.internal.model.CommentImpl;
import org.jbpm.pvm.internal.type.variable.StringVariable;
-import org.jbpm.test.DbTestCase;
+import org.jbpm.test.JbpmTestCase;
/**
* @author Tom Baeyens
*/
-public class BasicTransactionTest extends DbTestCase {
+public class BasicTransactionTest extends JbpmTestCase {
public void testCommit() {
commandService.execute(new Command<Object>() {
Modified: jbpm4/trunk/modules/task/src/test/java/org/jbpm/task/internal/model/TaskTest.java
===================================================================
--- jbpm4/trunk/modules/task/src/test/java/org/jbpm/task/internal/model/TaskTest.java 2009-02-13 14:40:26 UTC (rev 3871)
+++ jbpm4/trunk/modules/task/src/test/java/org/jbpm/task/internal/model/TaskTest.java 2009-02-13 15:32:36 UTC (rev 3872)
@@ -32,12 +32,12 @@
import org.jbpm.task.internal.model.RoleImpl;
import org.jbpm.task.internal.model.SwimlaneImpl;
import org.jbpm.task.internal.model.TaskImpl;
-import org.jbpm.test.JbpmTestCase;
+import org.jbpm.test.BaseJbpmTestCase;
/**
* @author Tom Baeyens
*/
-public class TaskTest extends JbpmTestCase {
+public class TaskTest extends BaseJbpmTestCase {
public void testTask() {
Date now = new Date();
Copied: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/BaseJbpmTestCase.java (from rev 3826, jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java)
===================================================================
--- jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/BaseJbpmTestCase.java (rev 0)
+++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/BaseJbpmTestCase.java 2009-02-13 15:32:36 UTC (rev 3872)
@@ -0,0 +1,92 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jbpm.test;
+
+import junit.framework.AssertionFailedError;
+import junit.framework.TestCase;
+
+import org.jbpm.env.Environment;
+import org.jbpm.log.Jdk14LogFactory;
+import org.jbpm.log.Log;
+import org.jbpm.log.LogFormatter;
+
+/** base class for jbpm test cases.
+ *
+ * When this class is loaded (defined), then a search for a logging.properties
+ * file will be done.
+ *
+ * If a logging.properties file is present in the root of the classpath,
+ * it will be used to initialize the java.util.logging logging framework.
+ *
+ * If this logging.properties contains property 'redirect.commons.logging'
+ * then all commons logging will be redirected to java.util.logging during
+ * this logging initialization.
+ *
+ * Apart from logging initialization, this class will add some logging
+ * to setUp and tearDown.
+ *
+ * If the JbpmLogFormatter is used, it will display multiple threads with
+ * indentation.
+ *
+ * @author Tom Baeyens
+ */
+public abstract class BaseJbpmTestCase extends TestCase {
+
+ static {
+ Jdk14LogFactory.initializeJdk14Logging();
+ }
+
+ static protected Log log = Log.getLog(BaseJbpmTestCase.class.getName());
+
+ protected void setUp() throws Exception {
+ assertNull(Environment.getCurrent());
+ LogFormatter.resetIndentation();
+ log.info("=== starting "+getName()+" =============================");
+ }
+
+ protected void tearDown() throws Exception {
+ log.info("=== ending "+getName()+" =============================\n");
+ assertNull(Environment.getCurrent());
+ }
+
+ public void assertTextPresent(String expected, String value) {
+ if ( (value==null)
+ || (value.indexOf(expected)==-1)
+ ) {
+ fail("expected presence of '"+expected+"' but was '"+value+"'");
+ }
+ }
+
+ protected void runTest() throws Throwable {
+ try {
+ super.runTest();
+ } catch (AssertionFailedError e) {
+ log.error("");
+ log.error("ASSERTION FAILURE: "+e.getMessage(), e);
+ log.error("");
+ throw e;
+ } catch (Throwable t) {
+ t.printStackTrace();
+ throw t;
+ }
+ }
+}
Deleted: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/DbTestCase.java
===================================================================
--- jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/DbTestCase.java 2009-02-13 14:40:26 UTC (rev 3871)
+++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/DbTestCase.java 2009-02-13 15:32:36 UTC (rev 3872)
@@ -1,241 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jbpm.test;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-
-import org.jbpm.Configuration;
-import org.jbpm.Execution;
-import org.jbpm.ExecutionService;
-import org.jbpm.HistoryService;
-import org.jbpm.ManagementService;
-import org.jbpm.ProcessDefinition;
-import org.jbpm.ProcessEngine;
-import org.jbpm.ProcessService;
-import org.jbpm.TaskService;
-import org.jbpm.cmd.CommandService;
-import org.jbpm.job.Job;
-import org.jbpm.task.Task;
-
-/**
- * @author Tom Baeyens
- */
-public abstract class DbTestCase extends JbpmTestCase {
-
- protected static ProcessEngine processEngine = null;
-
- protected static ProcessService processService;
- protected static ExecutionService executionService;
- protected static ManagementService managementService;
- protected static TaskService taskService;
- protected static HistoryService historyService;
-
- protected static CommandService commandService;
-
- /** registered process definitions will be deleted automatically in the tearDown.
- * This is a convenience function as each test is expected to clean up the DB. */
- protected List<ProcessDefinition> registeredProcessDefinitions;
- /** registered tasks will be deleted automatically in the tearDown.
- * This is a convenience function as each test is expected to clean up the DB. */
- protected List<String> registeredTaskIds;
-
- protected void setUp() throws Exception {
- super.setUp();
- initialize();
- }
-
- protected synchronized void initialize() {
- if (processEngine==null) {
-
- String jbpmTestCfgType = System.getProperty("jbpm.test.cfg.type");
- Configuration configuration = new Configuration(jbpmTestCfgType);
-
- String jbpmTestCfgResource = System.getProperty("jbpm.test.cfg.resource");
- if (jbpmTestCfgResource!=null) {
- configuration.setResource(jbpmTestCfgResource);
- }
-
- processEngine = configuration.buildProcessEngine();
-
- processService = processEngine.getProcessService();
- executionService = processEngine.getExecutionService();
- historyService = processEngine.getHistoryService();
- managementService = processEngine.getManagementService();
- taskService = processEngine.getTaskService();
- commandService = processEngine.get(CommandService.class);
- }
- }
-
- protected void tearDown() throws Exception {
- if (registeredProcessDefinitions!=null) {
- for (ProcessDefinition processDefinition : registeredProcessDefinitions) {
- processService.deleteProcessDefinitionCascade(processDefinition.getId());
- }
- }
-
- if (registeredTaskIds != null) {
- for (String taskId : registeredTaskIds) {
- taskService.deleteTask(taskId);
- }
- }
-
- Db.verifyClean(processEngine);
-
- super.tearDown();
- }
-
- public ProcessDefinition deployJpdlXmlString(String jpdlXmlString) {
- List<ProcessDefinition> deployedProcessDefinitions =
- processService.createDeployment()
- .addString("xmlstring.jpdl.xml", jpdlXmlString)
- .deploy()
- .getProcessDefinitions();
-
- return registerDeployedProcessDefinitions(deployedProcessDefinitions);
- }
-
- public ProcessDefinition deployJpdlResource(String resource) {
- List<ProcessDefinition> deployedProcessDefinitions =
- processService.createDeployment()
- .addResource(resource)
- .deploy()
- .getProcessDefinitions();
-
- return registerDeployedProcessDefinitions(deployedProcessDefinitions);
- }
-
- protected ProcessDefinition addDeployedProcessDefinition(ProcessDefinition deployedProcessDefinition) {
- if (registeredProcessDefinitions==null) {
- registeredProcessDefinitions = new ArrayList<ProcessDefinition>();
- }
-
- registeredProcessDefinitions.add(deployedProcessDefinition);
-
- return deployedProcessDefinition;
- }
-
- protected ProcessDefinition registerDeployedProcessDefinitions(List<ProcessDefinition> deployedProcessDefinitions) {
- if (registeredProcessDefinitions==null) {
- registeredProcessDefinitions = new ArrayList<ProcessDefinition>();
- }
-
- registeredProcessDefinitions.addAll(deployedProcessDefinitions);
-
- if (deployedProcessDefinitions.size()>=1) {
- return deployedProcessDefinitions.get(0);
- }
-
- return null;
- }
-
- public void saveAndRegisterTask(Task task) {
- taskService.saveTask(task);
-
- if (registeredTaskIds == null) {
- registeredTaskIds = new ArrayList<String>();
- }
- registeredTaskIds.add(task.getId());
- }
-
- public HashSet<String> getActivityNames(String processInstanceId) {
- HashSet<String> activityNames = new HashSet<String>();
-
- List<Execution> executions = executionService.findExecutions(processInstanceId);
- for (Execution execution: executions) {
- String activityName = execution.getActivityName();
- if (activityName!=null) {
- activityNames.add(activityName);
- }
- }
-
- return activityNames;
- }
-
- public Execution findExecution(String processInstanceId, String activityName) {
- List<Execution> executions = executionService.findExecutions(processInstanceId);
- for (Execution execution: executions) {
- if (activityName.equals(execution.getActivityName())) {
- return execution;
- }
- }
-
- return null;
- }
-
- public static Task getTask(List<Task> taskList, String taskName) {
- for (Task task : taskList) {
- if (taskName.equals(task.getName())) {
- return task;
- }
- }
- return null;
- }
-
- public static void assertContainsTask(List<Task> taskList, String taskName) {
- if (getTask(taskList, taskName)==null) {
- fail("tasklist doesn't contain task '"+taskName+"': "+taskList);
- }
- }
-
- public static Task getTask(List<Task> taskList, String taskName, String assignee) {
- for (Task task : taskList) {
- if (taskName.equals(task.getName())) {
- if (assignee==null) {
- if (task.getAssignee()==null) {
- return task;
- }
- } else {
- if (assignee.equals(task.getAssignee())) {
- return task;
- }
- }
- }
- }
- return null;
- }
-
- public void executeAsyncMessage(Execution execution) {
- List<Job> jobs = managementService
- .createJobQuery()
- .messages()
- .processInstanceId(execution.getId())
- .execute();
-
- if (jobs.isEmpty()) {
- fail("no async message");
- }
-
- if (jobs.size()>1) {
- fail("more then one async message");
- }
-
- managementService.executeJob(jobs.get(0).getDbid());
- }
-
- public static void assertContainsTask(List<Task> taskList, String taskName, String assignee) {
- if (getTask(taskList, taskName, assignee)==null) {
- fail("tasklist doesn't contain task '"+taskName+"' for assignee '"+assignee+"': "+taskList);
- }
- }
-}
Deleted: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java
===================================================================
--- jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java 2009-02-13 14:40:26 UTC (rev 3871)
+++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java 2009-02-13 15:32:36 UTC (rev 3872)
@@ -1,72 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jbpm.test;
-
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
-
-import org.jbpm.env.Environment;
-import org.jbpm.log.Jdk14LogFactory;
-import org.jbpm.log.Log;
-import org.jbpm.log.LogFormatter;
-
-public abstract class JbpmTestCase extends TestCase {
-
- static {
- Jdk14LogFactory.initializeJdk14Logging();
- }
-
- static protected Log log = Log.getLog(JbpmTestCase.class.getName());
-
- protected void setUp() throws Exception {
- assertNull(Environment.getCurrent());
- LogFormatter.resetIndentation();
- log.info("=== starting "+getName()+" =============================");
- }
-
- protected void tearDown() throws Exception {
- log.info("=== ending "+getName()+" =============================\n");
- assertNull(Environment.getCurrent());
- }
-
- public void assertTextPresent(String expected, String value) {
- if ( (value==null)
- || (value.indexOf(expected)==-1)
- ) {
- fail("expected presence of '"+expected+"' but was '"+value+"'");
- }
- }
-
- protected void runTest() throws Throwable {
- try {
- super.runTest();
- } catch (AssertionFailedError e) {
- log.error("");
- log.error("ASSERTION FAILURE: "+e.getMessage(), e);
- log.error("");
- throw e;
- } catch (Throwable t) {
- t.printStackTrace();
- throw t;
- }
- }
-}
Copied: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java (from rev 3871, jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/DbTestCase.java)
===================================================================
--- jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java (rev 0)
+++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java 2009-02-13 15:32:36 UTC (rev 3872)
@@ -0,0 +1,263 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jbpm.test;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+
+import org.jbpm.Configuration;
+import org.jbpm.Execution;
+import org.jbpm.ExecutionService;
+import org.jbpm.HistoryService;
+import org.jbpm.ManagementService;
+import org.jbpm.ProcessDefinition;
+import org.jbpm.ProcessEngine;
+import org.jbpm.ProcessService;
+import org.jbpm.TaskService;
+import org.jbpm.cmd.CommandService;
+import org.jbpm.job.Job;
+import org.jbpm.task.Task;
+
+/** base class for persistent jBPM tests.
+ *
+ * This class exposes a lot of extra convenience methods for testing
+ * process executions.
+ *
+ * The ProcessEngine services will be initialized and available as
+ * member fields.
+ *
+ * This test assumes that each test will clean the DB itself and that
+ * no data is in the DB tables when the test finishes.
+ *
+ * During tearDown, a check will be done if all the DB tables are
+ * empty. If not, that is logged with a F I X M E and the DB tables
+ * are cleaned.
+ *
+ * Convenience methods {@link #deployJpdlXmlString(String)} and
+ * {@link #deployJpdlResource(String)} will automatically keep track
+ * of the deployed process and delete it (and all the related executions)
+ * before the check is done.
+ *
+ * Similarly, the {@link #saveAndRegisterTask(Task)} will delete
+ * the task before the check is done in the tearDown.
+ *
+ * @author Tom Baeyens
+ */
+public abstract class JbpmTestCase extends BaseJbpmTestCase {
+
+ protected static ProcessEngine processEngine = null;
+
+ protected static ProcessService processService;
+ protected static ExecutionService executionService;
+ protected static ManagementService managementService;
+ protected static TaskService taskService;
+ protected static HistoryService historyService;
+
+ protected static CommandService commandService;
+
+ /** registered process definitions will be deleted automatically in the tearDown.
+ * This is a convenience function as each test is expected to clean up the DB. */
+ protected List<ProcessDefinition> registeredProcessDefinitions;
+ /** registered tasks will be deleted automatically in the tearDown.
+ * This is a convenience function as each test is expected to clean up the DB. */
+ protected List<String> registeredTaskIds;
+
+ protected void setUp() throws Exception {
+ super.setUp();
+ initialize();
+ }
+
+ protected synchronized void initialize() {
+ if (processEngine==null) {
+
+ String jbpmTestCfgType = System.getProperty("jbpm.test.cfg.type");
+ Configuration configuration = new Configuration(jbpmTestCfgType);
+
+ String jbpmTestCfgResource = System.getProperty("jbpm.test.cfg.resource");
+ if (jbpmTestCfgResource!=null) {
+ configuration.setResource(jbpmTestCfgResource);
+ }
+
+ processEngine = configuration.buildProcessEngine();
+
+ processService = processEngine.getProcessService();
+ executionService = processEngine.getExecutionService();
+ historyService = processEngine.getHistoryService();
+ managementService = processEngine.getManagementService();
+ taskService = processEngine.getTaskService();
+ commandService = processEngine.get(CommandService.class);
+ }
+ }
+
+ protected void tearDown() throws Exception {
+ if (registeredProcessDefinitions!=null) {
+ for (ProcessDefinition processDefinition : registeredProcessDefinitions) {
+ processService.deleteProcessDefinitionCascade(processDefinition.getId());
+ }
+ }
+
+ if (registeredTaskIds != null) {
+ for (String taskId : registeredTaskIds) {
+ taskService.deleteTask(taskId);
+ }
+ }
+
+ Db.verifyClean(processEngine);
+
+ super.tearDown();
+ }
+
+ public ProcessDefinition deployJpdlXmlString(String jpdlXmlString) {
+ List<ProcessDefinition> deployedProcessDefinitions =
+ processService.createDeployment()
+ .addString("xmlstring.jpdl.xml", jpdlXmlString)
+ .deploy()
+ .getProcessDefinitions();
+
+ return registerDeployedProcessDefinitions(deployedProcessDefinitions);
+ }
+
+ public ProcessDefinition deployJpdlResource(String resource) {
+ List<ProcessDefinition> deployedProcessDefinitions =
+ processService.createDeployment()
+ .addResource(resource)
+ .deploy()
+ .getProcessDefinitions();
+
+ return registerDeployedProcessDefinitions(deployedProcessDefinitions);
+ }
+
+ protected ProcessDefinition addDeployedProcessDefinition(ProcessDefinition deployedProcessDefinition) {
+ if (registeredProcessDefinitions==null) {
+ registeredProcessDefinitions = new ArrayList<ProcessDefinition>();
+ }
+
+ registeredProcessDefinitions.add(deployedProcessDefinition);
+
+ return deployedProcessDefinition;
+ }
+
+ protected ProcessDefinition registerDeployedProcessDefinitions(List<ProcessDefinition> deployedProcessDefinitions) {
+ if (registeredProcessDefinitions==null) {
+ registeredProcessDefinitions = new ArrayList<ProcessDefinition>();
+ }
+
+ registeredProcessDefinitions.addAll(deployedProcessDefinitions);
+
+ if (deployedProcessDefinitions.size()>=1) {
+ return deployedProcessDefinitions.get(0);
+ }
+
+ return null;
+ }
+
+ public void saveAndRegisterTask(Task task) {
+ taskService.saveTask(task);
+
+ if (registeredTaskIds == null) {
+ registeredTaskIds = new ArrayList<String>();
+ }
+ registeredTaskIds.add(task.getId());
+ }
+
+ public HashSet<String> getActivityNames(String processInstanceId) {
+ HashSet<String> activityNames = new HashSet<String>();
+
+ List<Execution> executions = executionService.findExecutions(processInstanceId);
+ for (Execution execution: executions) {
+ String activityName = execution.getActivityName();
+ if (activityName!=null) {
+ activityNames.add(activityName);
+ }
+ }
+
+ return activityNames;
+ }
+
+ public Execution findExecution(String processInstanceId, String activityName) {
+ List<Execution> executions = executionService.findExecutions(processInstanceId);
+ for (Execution execution: executions) {
+ if (activityName.equals(execution.getActivityName())) {
+ return execution;
+ }
+ }
+
+ return null;
+ }
+
+ public static Task getTask(List<Task> taskList, String taskName) {
+ for (Task task : taskList) {
+ if (taskName.equals(task.getName())) {
+ return task;
+ }
+ }
+ return null;
+ }
+
+ public static void assertContainsTask(List<Task> taskList, String taskName) {
+ if (getTask(taskList, taskName)==null) {
+ fail("tasklist doesn't contain task '"+taskName+"': "+taskList);
+ }
+ }
+
+ public static Task getTask(List<Task> taskList, String taskName, String assignee) {
+ for (Task task : taskList) {
+ if (taskName.equals(task.getName())) {
+ if (assignee==null) {
+ if (task.getAssignee()==null) {
+ return task;
+ }
+ } else {
+ if (assignee.equals(task.getAssignee())) {
+ return task;
+ }
+ }
+ }
+ }
+ return null;
+ }
+
+ public void executeAsyncMessage(Execution execution) {
+ List<Job> jobs = managementService
+ .createJobQuery()
+ .messages()
+ .processInstanceId(execution.getId())
+ .execute();
+
+ if (jobs.isEmpty()) {
+ fail("no async message");
+ }
+
+ if (jobs.size()>1) {
+ fail("more then one async message");
+ }
+
+ managementService.executeJob(jobs.get(0).getDbid());
+ }
+
+ public static void assertContainsTask(List<Task> taskList, String taskName, String assignee) {
+ if (getTask(taskList, taskName, assignee)==null) {
+ fail("tasklist doesn't contain task '"+taskName+"' for assignee '"+assignee+"': "+taskList);
+ }
+ }
+}
Modified: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/MessageFinder.java
===================================================================
--- jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/MessageFinder.java 2009-02-13 14:40:26 UTC (rev 3871)
+++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/MessageFinder.java 2009-02-13 15:32:36 UTC (rev 3872)
@@ -27,12 +27,10 @@
*/
public class MessageFinder {
- protected DbTestCase dbTestCase;
+ protected JbpmTestCase jbpmTestCase;
- public MessageFinder(DbTestCase dbTestCase) {
- this.dbTestCase = dbTestCase;
+ public MessageFinder(JbpmTestCase jbpmTestCase) {
+ this.jbpmTestCase = jbpmTestCase;
}
-
-
}
Modified: jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/activities/ExclusiveTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/activities/ExclusiveTest.java 2009-02-13 14:40:26 UTC (rev 3871)
+++ jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/activities/ExclusiveTest.java 2009-02-13 15:32:36 UTC (rev 3872)
@@ -25,13 +25,13 @@
import java.util.Map;
import org.jbpm.Execution;
-import org.jbpm.test.DbTestCase;
+import org.jbpm.test.JbpmTestCase;
/**
* @author Tom Baeyens
*/
-public class ExclusiveTest extends DbTestCase {
+public class ExclusiveTest extends JbpmTestCase {
public void testExclusiveExpression() {
deployJpdlXmlString(
Modified: jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/activities/StateTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/activities/StateTest.java 2009-02-13 14:40:26 UTC (rev 3871)
+++ jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/activities/StateTest.java 2009-02-13 15:32:36 UTC (rev 3872)
@@ -23,12 +23,12 @@
import org.jbpm.Execution;
import org.jbpm.JbpmException;
-import org.jbpm.test.DbTestCase;
+import org.jbpm.test.JbpmTestCase;
/**
* @author Tom Baeyens
*/
-public class StateTest extends DbTestCase {
+public class StateTest extends JbpmTestCase {
public void testWaitStatesSequence() {
deployJpdlXmlString(
Modified: jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/cfg/ConfigurationTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/cfg/ConfigurationTest.java 2009-02-13 14:40:26 UTC (rev 3871)
+++ jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/cfg/ConfigurationTest.java 2009-02-13 15:32:36 UTC (rev 3872)
@@ -23,12 +23,12 @@
import org.jbpm.Configuration;
import org.jbpm.ProcessEngine;
-import org.jbpm.test.JbpmTestCase;
+import org.jbpm.test.BaseJbpmTestCase;
/**
* @author Tom Baeyens
*/
-public class ConfigurationTest extends JbpmTestCase {
+public class ConfigurationTest extends BaseJbpmTestCase {
public void testDefaultConfiguration() {
ProcessEngine processEngine = new Configuration()
Modified: jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/execution/FindExecutionTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/execution/FindExecutionTest.java 2009-02-13 14:40:26 UTC (rev 3871)
+++ jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/execution/FindExecutionTest.java 2009-02-13 15:32:36 UTC (rev 3872)
@@ -22,12 +22,12 @@
package org.jbpm.test.execution;
import org.jbpm.Execution;
-import org.jbpm.test.DbTestCase;
+import org.jbpm.test.JbpmTestCase;
/**
* @author Tom Baeyens
*/
-public class FindExecutionTest extends DbTestCase {
+public class FindExecutionTest extends JbpmTestCase {
public void testFindExecutionById() {
deployJpdlXmlString(
Modified: jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/execution/SignalExecutionTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/execution/SignalExecutionTest.java 2009-02-13 14:40:26 UTC (rev 3871)
+++ jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/execution/SignalExecutionTest.java 2009-02-13 15:32:36 UTC (rev 3872)
@@ -27,13 +27,13 @@
import java.util.Set;
import org.jbpm.Execution;
-import org.jbpm.test.DbTestCase;
+import org.jbpm.test.JbpmTestCase;
/**
* @author Tom Baeyens
*/
-public class SignalExecutionTest extends DbTestCase {
+public class SignalExecutionTest extends JbpmTestCase {
public void testSignalExecutionByKey() {
deployJpdlXmlString(
Modified: jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/execution/StartExecutionTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/execution/StartExecutionTest.java 2009-02-13 14:40:26 UTC (rev 3871)
+++ jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/execution/StartExecutionTest.java 2009-02-13 15:32:36 UTC (rev 3872)
@@ -28,13 +28,13 @@
import org.jbpm.Execution;
import org.jbpm.ProcessDefinition;
-import org.jbpm.test.DbTestCase;
+import org.jbpm.test.JbpmTestCase;
/**
* @author Tom Baeyens
*/
-public class StartExecutionTest extends DbTestCase {
+public class StartExecutionTest extends JbpmTestCase {
public void testStartNewExecutionByKey() {
deployJpdlXmlString(
Modified: jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/history/AvgDurationTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/history/AvgDurationTest.java 2009-02-13 14:40:26 UTC (rev 3871)
+++ jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/history/AvgDurationTest.java 2009-02-13 15:32:36 UTC (rev 3872)
@@ -27,13 +27,13 @@
import org.jbpm.Execution;
import org.jbpm.history.HistoryProcessInstance;
import org.jbpm.history.HistoryProcessInstanceQuery;
-import org.jbpm.test.DbTestCase;
+import org.jbpm.test.JbpmTestCase;
/**
* @author Tom Baeyens
*/
-public class AvgDurationTest extends DbTestCase {
+public class AvgDurationTest extends JbpmTestCase {
public void testAvgDuration() throws Exception {
deployJpdlXmlString(
@@ -59,7 +59,8 @@
executeProcess();
Map<String, Long> avgDurations = historyService.avgDurationPerActivity("ICL:1");
-
+
+
Long avgDurationOne = avgDurations.get("one");
assertNotNull(avgDurationOne);
assertTrue(avgDurationOne>50);
Modified: jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/history/ChoiceDistributionTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/history/ChoiceDistributionTest.java 2009-02-13 14:40:26 UTC (rev 3871)
+++ jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/history/ChoiceDistributionTest.java 2009-02-13 15:32:36 UTC (rev 3872)
@@ -25,13 +25,13 @@
import java.util.Map;
import org.jbpm.Execution;
-import org.jbpm.test.DbTestCase;
+import org.jbpm.test.JbpmTestCase;
/**
* @author Tom Baeyens
*/
-public class ChoiceDistributionTest extends DbTestCase {
+public class ChoiceDistributionTest extends JbpmTestCase {
public void testExclusiveExpression() {
deployJpdlXmlString(
Modified: jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/history/ProcessInstanceHistoryTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/history/ProcessInstanceHistoryTest.java 2009-02-13 14:40:26 UTC (rev 3871)
+++ jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/history/ProcessInstanceHistoryTest.java 2009-02-13 15:32:36 UTC (rev 3872)
@@ -25,13 +25,13 @@
import org.jbpm.history.HistoryProcessInstance;
import org.jbpm.history.HistoryProcessInstanceQuery;
-import org.jbpm.test.DbTestCase;
+import org.jbpm.test.JbpmTestCase;
/**
* @author Tom Baeyens
*/
-public class ProcessInstanceHistoryTest extends DbTestCase {
+public class ProcessInstanceHistoryTest extends JbpmTestCase {
public void testProcessInstanceHistory() {
deployJpdlXmlString(
Modified: jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/process/ProcessAttachmentsTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/process/ProcessAttachmentsTest.java 2009-02-13 14:40:26 UTC (rev 3871)
+++ jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/process/ProcessAttachmentsTest.java 2009-02-13 15:32:36 UTC (rev 3872)
@@ -26,13 +26,13 @@
import java.util.List;
import org.jbpm.ProcessDefinition;
-import org.jbpm.test.DbTestCase;
+import org.jbpm.test.JbpmTestCase;
/**
* @author Tom Baeyens
*/
-public class ProcessAttachmentsTest extends DbTestCase {
+public class ProcessAttachmentsTest extends JbpmTestCase {
public void testProcessWithNameOnly() {
byte[] lotOfBytes = generateString("a lot of bytes ", 5000).getBytes();
Modified: jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/process/ProcessDefinitionQueryTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/process/ProcessDefinitionQueryTest.java 2009-02-13 14:40:26 UTC (rev 3871)
+++ jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/process/ProcessDefinitionQueryTest.java 2009-02-13 15:32:36 UTC (rev 3872)
@@ -25,13 +25,13 @@
import org.jbpm.ProcessDefinition;
import org.jbpm.ProcessDefinitionQuery;
-import org.jbpm.test.DbTestCase;
+import org.jbpm.test.JbpmTestCase;
/**
* @author Tom Baeyens
*/
-public class ProcessDefinitionQueryTest extends DbTestCase {
+public class ProcessDefinitionQueryTest extends JbpmTestCase {
public void testQueryProcessDefinitionsEmpty() {
List<ProcessDefinition> processDefinitions = processService
Modified: jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/process/ProcessServiceTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/process/ProcessServiceTest.java 2009-02-13 14:40:26 UTC (rev 3871)
+++ jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/process/ProcessServiceTest.java 2009-02-13 15:32:36 UTC (rev 3872)
@@ -27,13 +27,13 @@
import org.jbpm.Execution;
import org.jbpm.JbpmException;
import org.jbpm.ProcessDefinition;
-import org.jbpm.test.DbTestCase;
+import org.jbpm.test.JbpmTestCase;
/**
* @author Tom Baeyens
*/
-public class ProcessServiceTest extends DbTestCase {
+public class ProcessServiceTest extends JbpmTestCase {
public void testProcessWithNameOnly() {
ProcessDefinition processDefinition = deployJpdlXmlString(
Modified: jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/task/TaskCreateUpdateDeleteTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/task/TaskCreateUpdateDeleteTest.java 2009-02-13 14:40:26 UTC (rev 3871)
+++ jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/task/TaskCreateUpdateDeleteTest.java 2009-02-13 15:32:36 UTC (rev 3872)
@@ -24,12 +24,12 @@
import java.util.Date;
import org.jbpm.task.Task;
-import org.jbpm.test.DbTestCase;
+import org.jbpm.test.JbpmTestCase;
/**
* @author Alejandro Guizar
*/
-public class TaskCreateUpdateDeleteTest extends DbTestCase {
+public class TaskCreateUpdateDeleteTest extends JbpmTestCase {
public void testNewTask() {
// creation of a new non-persisted task
Modified: jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/task/TaskListTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/task/TaskListTest.java 2009-02-13 14:40:26 UTC (rev 3871)
+++ jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/task/TaskListTest.java 2009-02-13 15:32:36 UTC (rev 3872)
@@ -24,13 +24,13 @@
import java.util.List;
import org.jbpm.task.Task;
-import org.jbpm.test.DbTestCase;
+import org.jbpm.test.JbpmTestCase;
/**
* @author Tom Baeyens
*/
-public class TaskListTest extends DbTestCase {
+public class TaskListTest extends JbpmTestCase {
public void testPersonalTaskList() {
Task task = taskService.newTask();
Modified: jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/task/TaskQueryTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/task/TaskQueryTest.java 2009-02-13 14:40:26 UTC (rev 3871)
+++ jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/task/TaskQueryTest.java 2009-02-13 15:32:36 UTC (rev 3872)
@@ -25,13 +25,13 @@
import org.jbpm.TaskQuery;
import org.jbpm.task.Task;
-import org.jbpm.test.DbTestCase;
+import org.jbpm.test.JbpmTestCase;
/**
* @author Tom Baeyens
*/
-public class TaskQueryTest extends DbTestCase {
+public class TaskQueryTest extends JbpmTestCase {
public void testSimplestTaskQuery() {
Task task = taskService.newTask();
Modified: jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/variables/BasicVariablesTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/variables/BasicVariablesTest.java 2009-02-13 14:40:26 UTC (rev 3871)
+++ jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/variables/BasicVariablesTest.java 2009-02-13 15:32:36 UTC (rev 3872)
@@ -26,13 +26,13 @@
import java.util.Map;
import java.util.Set;
-import org.jbpm.test.DbTestCase;
+import org.jbpm.test.JbpmTestCase;
/**
* @author Tom Baeyens
*/
-public class BasicVariablesTest extends DbTestCase {
+public class BasicVariablesTest extends JbpmTestCase {
public void testStartProcessInstanceWithoutVariables() {
deployJpdlXmlString(
Modified: jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/variables/VariableBasicTypesTest.java
===================================================================
--- jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/variables/VariableBasicTypesTest.java 2009-02-13 14:40:26 UTC (rev 3871)
+++ jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/variables/VariableBasicTypesTest.java 2009-02-13 15:32:36 UTC (rev 3872)
@@ -24,13 +24,13 @@
import java.io.Serializable;
import java.util.Date;
-import org.jbpm.test.DbTestCase;
+import org.jbpm.test.JbpmTestCase;
/**
* @author Tom Baeyens
*/
-public class VariableBasicTypesTest extends DbTestCase {
+public class VariableBasicTypesTest extends JbpmTestCase {
public void checkVariableValue(Object variableValue) {
deployJpdlXmlString(
Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/LoadTestCase.java
===================================================================
--- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/LoadTestCase.java 2009-02-13 14:40:26 UTC (rev 3871)
+++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/LoadTestCase.java 2009-02-13 15:32:36 UTC (rev 3872)
@@ -33,13 +33,13 @@
import org.jbpm.pvm.internal.job.JobImpl;
import org.jbpm.pvm.internal.jobexecutor.JobExecutor;
import org.jbpm.pvm.internal.util.ReflectUtil;
-import org.jbpm.test.DbTestCase;
+import org.jbpm.test.JbpmTestCase;
/**
* @author Tom Baeyens
*/
-public class LoadTestCase extends DbTestCase {
+public class LoadTestCase extends JbpmTestCase {
protected static final long SECOND = 1000;
protected static final long MINUTE = 60 * SECOND;
Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailingMessageTest.java
===================================================================
--- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailingMessageTest.java 2009-02-13 14:40:26 UTC (rev 3871)
+++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailingMessageTest.java 2009-02-13 15:32:36 UTC (rev 3872)
@@ -32,7 +32,7 @@
import org.jbpm.pvm.internal.model.CommentImpl;
import org.jbpm.session.MessageSession;
import org.jbpm.session.PvmDbSession;
-import org.jbpm.test.DbTestCase;
+import org.jbpm.test.JbpmTestCase;
/**
Modified: jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/JobExecutorTestCase.java
===================================================================
--- jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/JobExecutorTestCase.java 2009-02-13 14:40:26 UTC (rev 3871)
+++ jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/JobExecutorTestCase.java 2009-02-13 15:32:36 UTC (rev 3872)
@@ -32,13 +32,13 @@
import org.jbpm.env.Environment;
import org.jbpm.pvm.internal.job.JobImpl;
import org.jbpm.pvm.internal.jobexecutor.JobExecutor;
-import org.jbpm.test.DbTestCase;
+import org.jbpm.test.JbpmTestCase;
/**
* @author Tom Baeyens
*/
-public class JobExecutorTestCase extends DbTestCase {
+public class JobExecutorTestCase extends JbpmTestCase {
long timeoutMillis = 20 * 1000; // 20 seconds
long checkInterval = 400;
Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/AutomaticDecisionTest.java
===================================================================
--- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/AutomaticDecisionTest.java 2009-02-13 14:40:26 UTC (rev 3871)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/AutomaticDecisionTest.java 2009-02-13 15:32:36 UTC (rev 3872)
@@ -29,14 +29,14 @@
import org.jbpm.client.ClientProcessDefinition;
import org.jbpm.client.ClientProcessInstance;
import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
-import org.jbpm.test.JbpmTestCase;
+import org.jbpm.test.BaseJbpmTestCase;
/** shows an automatic decision.
*
* @author Tom Baeyens
*/
-public class AutomaticDecisionTest extends JbpmTestCase {
+public class AutomaticDecisionTest extends BaseJbpmTestCase {
public static class AutomaticCreditRating implements ActivityBehaviour {
private static final long serialVersionUID = 1L;
Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/BasicExecutionFlowTest.java
===================================================================
--- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/BasicExecutionFlowTest.java 2009-02-13 14:40:26 UTC (rev 3871)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/BasicExecutionFlowTest.java 2009-02-13 15:32:36 UTC (rev 3872)
@@ -32,14 +32,14 @@
import org.jbpm.client.ClientProcessDefinition;
import org.jbpm.client.ClientProcessInstance;
import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
-import org.jbpm.test.JbpmTestCase;
+import org.jbpm.test.BaseJbpmTestCase;
/** shows wait states and automatic activities in a simple
* sequence based on transitions.
*
* @author Tom Baeyens
*/
-public class BasicExecutionFlowTest extends JbpmTestCase {
+public class BasicExecutionFlowTest extends BaseJbpmTestCase {
// automatic activity will log an event in a given list
Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/EventPropagationTest.java
===================================================================
--- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/EventPropagationTest.java 2009-02-13 14:40:26 UTC (rev 3871)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/EventPropagationTest.java 2009-02-13 15:32:36 UTC (rev 3872)
@@ -35,12 +35,12 @@
import org.jbpm.model.Event;
import org.jbpm.model.ObservableElement;
import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
-import org.jbpm.test.JbpmTestCase;
+import org.jbpm.test.BaseJbpmTestCase;
/**
* @author Tom Baeyens
*/
-public class EventPropagationTest extends JbpmTestCase {
+public class EventPropagationTest extends BaseJbpmTestCase {
public class Recorder implements EventListener {
private static final long serialVersionUID = 1L;
Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/EventTest.java
===================================================================
--- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/EventTest.java 2009-02-13 14:40:26 UTC (rev 3871)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/EventTest.java 2009-02-13 15:32:36 UTC (rev 3872)
@@ -38,7 +38,7 @@
import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
import org.jbpm.pvm.internal.model.ExecutionImpl;
import org.jbpm.pvm.internal.model.ProcessDefinitionImpl;
-import org.jbpm.test.JbpmTestCase;
+import org.jbpm.test.BaseJbpmTestCase;
/** shows how actions are listeners to following processDefinition events:
* <ul>
@@ -50,7 +50,7 @@
*
* @author Tom Baeyens
*/
-public class EventTest extends JbpmTestCase {
+public class EventTest extends BaseJbpmTestCase {
// activity leave action ////////////////////////////////////////////////////////
Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExceptionHandlerTest.java
===================================================================
--- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExceptionHandlerTest.java 2009-02-13 14:40:26 UTC (rev 3871)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExceptionHandlerTest.java 2009-02-13 15:32:36 UTC (rev 3872)
@@ -31,12 +31,12 @@
import org.jbpm.listener.EventListenerExecution;
import org.jbpm.model.Event;
import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
-import org.jbpm.test.JbpmTestCase;
+import org.jbpm.test.BaseJbpmTestCase;
/**
* @author Tom Baeyens
*/
-public class ExceptionHandlerTest extends JbpmTestCase
+public class ExceptionHandlerTest extends BaseJbpmTestCase
{
public static class WaitState implements ExternalActivityBehaviour {
Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExecutionStateTest.java
===================================================================
--- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExecutionStateTest.java 2009-02-13 14:40:26 UTC (rev 3871)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ExecutionStateTest.java 2009-02-13 15:32:36 UTC (rev 3872)
@@ -31,7 +31,7 @@
import org.jbpm.client.ClientProcessDefinition;
import org.jbpm.client.ClientProcessInstance;
import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
-import org.jbpm.test.JbpmTestCase;
+import org.jbpm.test.BaseJbpmTestCase;
/** shows the basics of the state property on the execution.
*
@@ -55,7 +55,7 @@
*
* @author Tom Baeyens
*/
-public class ExecutionStateTest extends JbpmTestCase {
+public class ExecutionStateTest extends BaseJbpmTestCase {
public static class AutomaticActivity implements ActivityBehaviour {
private static final long serialVersionUID = 1L;
Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/FunctionalActivityTest.java
===================================================================
--- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/FunctionalActivityTest.java 2009-02-13 14:40:26 UTC (rev 3871)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/FunctionalActivityTest.java 2009-02-13 15:32:36 UTC (rev 3872)
@@ -35,7 +35,7 @@
import org.jbpm.model.Activity;
import org.jbpm.model.OpenExecution;
import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
-import org.jbpm.test.JbpmTestCase;
+import org.jbpm.test.BaseJbpmTestCase;
/** shows how functional activities (activities that have a specific function
@@ -50,7 +50,7 @@
*
* @author Tom Baeyens
*/
-public class FunctionalActivityTest extends JbpmTestCase {
+public class FunctionalActivityTest extends BaseJbpmTestCase {
public static class FunctionalActivity implements ActivityBehaviour, EventListener {
private static final long serialVersionUID = 1L;
Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/LoopingTest.java
===================================================================
--- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/LoopingTest.java 2009-02-13 14:40:26 UTC (rev 3871)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/LoopingTest.java 2009-02-13 15:32:36 UTC (rev 3872)
@@ -10,9 +10,9 @@
import org.jbpm.client.ClientExecution;
import org.jbpm.client.ClientProcessDefinition;
import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
-import org.jbpm.test.JbpmTestCase;
+import org.jbpm.test.BaseJbpmTestCase;
-public class LoopingTest extends JbpmTestCase {
+public class LoopingTest extends BaseJbpmTestCase {
public static class For implements ExternalActivityBehaviour {
private static final long serialVersionUID = 1L;
Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeStateTest.java
===================================================================
--- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeStateTest.java 2009-02-13 14:40:26 UTC (rev 3871)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeStateTest.java 2009-02-13 15:32:36 UTC (rev 3872)
@@ -30,12 +30,12 @@
import org.jbpm.client.ClientProcessDefinition;
import org.jbpm.client.ClientProcessInstance;
import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
-import org.jbpm.test.JbpmTestCase;
+import org.jbpm.test.BaseJbpmTestCase;
/**
* @author Tom Baeyens
*/
-public class ScopeStateTest extends JbpmTestCase
+public class ScopeStateTest extends BaseJbpmTestCase
{
public static class AutomaticActivity implements ActivityBehaviour {
Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeVariableDeclarationTest.java
===================================================================
--- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeVariableDeclarationTest.java 2009-02-13 14:40:26 UTC (rev 3871)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeVariableDeclarationTest.java 2009-02-13 15:32:36 UTC (rev 3872)
@@ -32,13 +32,13 @@
import org.jbpm.model.OpenExecution;
import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
import org.jbpm.pvm.internal.wire.descriptor.StringDescriptor;
-import org.jbpm.test.JbpmTestCase;
+import org.jbpm.test.BaseJbpmTestCase;
/**
* @author Tom Baeyens
*/
-public class ScopeVariableDeclarationTest extends JbpmTestCase {
+public class ScopeVariableDeclarationTest extends BaseJbpmTestCase {
public static class WaitState implements ExternalActivityBehaviour {
private static final long serialVersionUID = 1L;
Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeVariableTest.java
===================================================================
--- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeVariableTest.java 2009-02-13 14:40:26 UTC (rev 3871)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeVariableTest.java 2009-02-13 15:32:36 UTC (rev 3872)
@@ -30,7 +30,7 @@
import org.jbpm.client.ClientProcessDefinition;
import org.jbpm.model.OpenExecution;
import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
-import org.jbpm.test.JbpmTestCase;
+import org.jbpm.test.BaseJbpmTestCase;
/**
*
@@ -42,7 +42,7 @@
*
* @author Tom Baeyens
*/
-public class ScopeVariableTest extends JbpmTestCase
+public class ScopeVariableTest extends BaseJbpmTestCase
{
public static class WaitState implements ExternalActivityBehaviour {
Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/SubProcessTest.java
===================================================================
--- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/SubProcessTest.java 2009-02-13 14:40:26 UTC (rev 3871)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/SubProcessTest.java 2009-02-13 15:32:36 UTC (rev 3872)
@@ -29,12 +29,12 @@
import org.jbpm.client.ClientExecution;
import org.jbpm.client.ClientProcessDefinition;
import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
-import org.jbpm.test.JbpmTestCase;
+import org.jbpm.test.BaseJbpmTestCase;
/**
* @author Tom Baeyens
*/
-public class SubProcessTest extends JbpmTestCase
+public class SubProcessTest extends BaseJbpmTestCase
{
public static class SubProcess implements ExternalActivityBehaviour {
Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionBasedConcurrencyTest.java
===================================================================
--- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionBasedConcurrencyTest.java 2009-02-13 14:40:26 UTC (rev 3871)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionBasedConcurrencyTest.java 2009-02-13 15:32:36 UTC (rev 3872)
@@ -15,7 +15,7 @@
import org.jbpm.model.OpenExecution;
import org.jbpm.model.Transition;
import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
-import org.jbpm.test.JbpmTestCase;
+import org.jbpm.test.BaseJbpmTestCase;
/**
* concurrent execution where synchronization is done by checking if the
@@ -23,7 +23,7 @@
*
* @author Tom Baeyens
*/
-public class TransitionBasedConcurrencyTest extends JbpmTestCase {
+public class TransitionBasedConcurrencyTest extends BaseJbpmTestCase {
public static class Fork implements ActivityBehaviour {
private static final long serialVersionUID = 1L;
Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionEventsTest.java
===================================================================
--- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionEventsTest.java 2009-02-13 14:40:26 UTC (rev 3871)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionEventsTest.java 2009-02-13 15:32:36 UTC (rev 3872)
@@ -30,12 +30,12 @@
import org.jbpm.listener.EventListenerExecution;
import org.jbpm.model.Event;
import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
-import org.jbpm.test.JbpmTestCase;
+import org.jbpm.test.BaseJbpmTestCase;
/**
* @author Tom Baeyens
*/
-public class TransitionEventsTest extends JbpmTestCase {
+public class TransitionEventsTest extends BaseJbpmTestCase {
public class Recorder implements EventListener {
private static final long serialVersionUID = 1L;
Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/VariableTest.java
===================================================================
--- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/VariableTest.java 2009-02-13 14:40:26 UTC (rev 3871)
+++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/VariableTest.java 2009-02-13 15:32:36 UTC (rev 3872)
@@ -32,12 +32,12 @@
import org.jbpm.client.ClientProcessDefinition;
import org.jbpm.client.ClientProcessInstance;
import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
-import org.jbpm.test.JbpmTestCase;
+import org.jbpm.test.BaseJbpmTestCase;
/**
* @author Tom Baeyens
*/
-public class VariableTest extends JbpmTestCase {
+public class VariableTest extends BaseJbpmTestCase {
public static class WaitState implements ExternalActivityBehaviour {
private static final long serialVersionUID = 1L;
More information about the jbpm-commits
mailing list