[jbpm-commits] JBoss JBPM SVN: r2226 - in jbpm3/trunk/modules/core/src: main/java/org/jbpm/db and 35 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Sat Sep 13 09:25:39 EDT 2008
Author: thomas.diesler at jboss.com
Date: 2008-09-13 09:25:38 -0400 (Sat, 13 Sep 2008)
New Revision: 2226
Removed:
jbpm3/trunk/modules/core/src/main/java/org/jbpm/JbpmContextTestHelper.java
Modified:
jbpm3/trunk/modules/core/src/main/java/org/jbpm/AbstractJbpmTestCase.java
jbpm3/trunk/modules/core/src/main/java/org/jbpm/JbpmConfiguration.java
jbpm3/trunk/modules/core/src/main/java/org/jbpm/JbpmConfigurationTestHelper.java
jbpm3/trunk/modules/core/src/main/java/org/jbpm/JbpmContext.java
jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/AbstractDbTestCase.java
jbpm3/trunk/modules/core/src/test/java/org/jboss/seam/pageflow/Page.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/DefaultConfigurationTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/JbpmConfigurationTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/JbpmContextTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/JbpmDefaultConfigTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/SerializabilityTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/bytes/ByteArrayTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/calendar/BusinessCalendarTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/calendar/DayPartTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/calendar/DayTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/calendar/HolidayTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/configuration/BeanFactoryTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/configuration/ObjectFactoryTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/configuration/ObjectFactoryUserGuideTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/context/exe/ContextInstanceDbTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/context/exe/JbpmTypesTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/context/exe/TransientVariableTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/context/exe/VariableInstanceDbTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/context/exe/VariableScopingTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/context/exe/VariableTypeTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/context/log/VariableLogTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/context/log/VariableUpdateDbTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/db/TaskMgmtSessionDbTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/file/def/FileDefinitionDbConfigTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/action/ScriptTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/action/ScriptXmlTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/def/ArrivingTransitionsTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/def/DefaultTransitionTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/def/LeavingTransitionsTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/def/NodeDbTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/def/NodeTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/def/ParentTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/def/SuperStateTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/def/SupportedEventsTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/exe/ActionExceptionsTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/exe/ActionExecutionTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/exe/EventPropagationTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/exe/ExceptionHandlingTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/exe/InitialNodeTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/exe/NodeActionTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/exe/RuntimeActionsTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/exe/SuperStateActionExecutionTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/exe/SuperStateTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/exe/TokenNameTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/log/ActionLogTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/log/NodeLogTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/log/ProcessInstanceLogTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/log/ProcessLogsTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/log/SignalLogTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/log/TransitionLogTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/node/CustomSubProcessResolverTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/node/EndStateTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/node/ProcessStateTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/node/TaskNodeTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/instantiation/BeanInstantiatorTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/instantiation/ConfigurationPropertyInstantiatorTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/instantiation/ConstructorInstantiatorTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/instantiation/DefaultInstantiatorTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/instantiation/FieldInstantiatorTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/instantiation/UserCodeInterceptorTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm1072/JBPM1072Test.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm522/JBPM522Test.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/job/executor/JobExecutorDbTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/el/DecisionExpressionTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/el/ExpressionTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/el/FunctionMapperTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/el/TaskExpressionTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/exe/DecisionConditionsTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/exe/DecisionExpressionTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/exe/DecisionHandlerTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/exe/ForkInLoopTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/par/ProcessLoadedActionHandler.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp01SequenceTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp02ParallelSplitTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp03SynchronizationTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp04ExclusiveChoiceTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp05SimpleMergeTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp06MultiChoiceTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp07SynchronizingMergeTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp08MultiMergeTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp09DiscriminatorTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp10NOutOfMJoinTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp11ArbitraryCyclesTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp12ImplicitTerminationTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp13MiWithoutSynchronizationTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp14MiWithAPrioriDesigntimeKnowledgeTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp15MiWithAPrioriRuntimeKnowledgeTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp16MiWithoutAPrioriRuntimeKnowledgeTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp17DeferredChoiceTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp18InterleavedParallelRoutingTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp19MilestoneTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp20CancelActivityTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp21CancelCaseTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/xml/AbstractXmlTestCase.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/xml/NodeXmlTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/xml/ProcessDefinitionXmlTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/xml/SchemaTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/xml/StartStateXmlTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/xml/StateXmlTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/xml/SuperStateXmlTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/xml/TaskControllerXmlTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/xml/TaskNodeXmlTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/xml/TimerValidatingXmlTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/xml/TimerXmlTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/xml/TransitionXmlTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/xml/XmlSchemaTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/logging/exe/CompositeLogTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/logging/exe/LogLogTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/logging/log/ProcessLogDbTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/mail/MailTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/mail/RealServerMailTestCase.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/mail/TaskMailTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/mock/JdbcProxyTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/perf/AbstractPerfTestCase.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/perf/PerfWithoutDbTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/persistence/db/MockSession.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/persistence/db/PersistenceConfigurationDbTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/persistence/db/PersistenceConfigurationTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/persistence/db/PersistenceDbServiceNoTxTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/persistence/db/PersistenceDbServiceTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/persistence/db/PersistenceServiceDbTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/persistence/db/PersistenceServiceFactoryDbTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/seam/SeamPageFlowTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/svc/CloseSequenceTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/svc/ServicesTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/taskmgmt/def/SwimlaneTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/taskmgmt/def/TaskMgmtDefinitionDbTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/taskmgmt/def/TaskMgmtDefinitionTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/taskmgmt/exe/RuntimeTaskCreationTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/taskmgmt/exe/StartTaskTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/taskmgmt/exe/SwimlaneTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/taskmgmt/exe/TaskAssignmentTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/taskmgmt/exe/TaskEventExecutionTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/taskmgmt/exe/TaskExecutionTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/taskmgmt/exe/TaskInstanceEndTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/taskmgmt/exe/TaskVariablesTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/tdd/AuctionTextTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/tdd/AuctionXmlTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/util/ByteUtilTest.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/util/StringUtilTest.java
Log:
Make all tests extend AbstractJbpmTestCase
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/AbstractJbpmTestCase.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/AbstractJbpmTestCase.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/AbstractJbpmTestCase.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -25,9 +25,14 @@
public abstract class AbstractJbpmTestCase extends TestCase
{
- public void setUp() throws Exception
+ protected String getShortName()
{
- JbpmConfigurationTestHelper.reset();
- JbpmContextTestHelper.reset();
+ String shortName = getClass().getName();
+ return shortName.substring(shortName.lastIndexOf('.') + 1) + "." + getName();
}
+
+ protected String getLongName()
+ {
+ return getClass().getName() + "." + getName();
+ }
}
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/JbpmConfiguration.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/JbpmConfiguration.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/JbpmConfiguration.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -246,26 +246,16 @@
*/
public class JbpmConfiguration implements Serializable
{
-
private static final long serialVersionUID = 1L;
- static ObjectFactory defaultObjectFactory = null;
+ static ObjectFactory defaultObjectFactory;
static Map instances = new HashMap();
-
- /**
- * resets static members for test isolation.
- */
- static void reset()
- {
- defaultObjectFactory = null;
- instances = new HashMap();
- }
-
- ObjectFactory objectFactory = null;
static ThreadLocal jbpmConfigurationsStacks = new ThreadLocal();
- ThreadLocal jbpmContextStacks = new ThreadLocal();
- JobExecutor jobExecutor = null;
+ private ObjectFactory objectFactory;
+ private ThreadLocal jbpmContextStacks = new ThreadLocal();
+ private JobExecutor jobExecutor;
+
public JbpmConfiguration(ObjectFactory objectFactory)
{
this.objectFactory = objectFactory;
@@ -278,9 +268,7 @@
public static JbpmConfiguration getInstance(String resource)
{
-
JbpmConfiguration instance = null;
-
synchronized (instances)
{
if (resource == null)
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/JbpmConfigurationTestHelper.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/JbpmConfigurationTestHelper.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/JbpmConfigurationTestHelper.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -21,8 +21,11 @@
*/
package org.jbpm;
-public class JbpmConfigurationTestHelper {
- public static void reset() {
- JbpmConfiguration.reset();
+public class JbpmConfigurationTestHelper
+{
+ public static void reset()
+ {
+ JbpmConfiguration.defaultObjectFactory = null;
+ JbpmConfiguration.instances.clear();
}
}
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/JbpmContext.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/JbpmContext.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/JbpmContext.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -51,8 +51,8 @@
/**
* is used to surround persistent operations to processes.
*
- * <p>Obtain JbpmContext's via {@link org.jbpm.JbpmConfiguration#createJbpmContext()}
- * and put it in a try-finally block like this:
+ * <p>
+ * Obtain JbpmContext's via {@link org.jbpm.JbpmConfiguration#createJbpmContext()} and put it in a try-finally block like this:
* </p>
*
* <pre>
@@ -70,57 +70,48 @@
* }
* </pre>
*
- * <p>A JbpmContext separates jBPM from a sprecific environment.
- * For each service that jBPM uses, there is an interface specified in the jBPM codebase.
- * jBPM also includes implementations that implement these services by using services in a
- * specific environment. e.g. a hibernate session, a JMS asynchronous messaging system, ...
+ * <p>
+ * A JbpmContext separates jBPM from a sprecific environment. For each service that jBPM uses, there is an interface specified in the jBPM codebase. jBPM also includes
+ * implementations that implement these services by using services in a specific environment. e.g. a hibernate session, a JMS asynchronous messaging system, ...
* </p>
*
- * <p>A JbpmContext can demarcate a transaction. When a PersistenceService is fetched from
- * the JbpmContext, the default implementation for the persistence service will create
- * a hibernate session and start a transaction. So that transactions can be configured
- * in the hibernate configuration.
+ * <p>
+ * A JbpmContext can demarcate a transaction. When a PersistenceService is fetched from the JbpmContext, the default implementation for the persistence service will
+ * create a hibernate session and start a transaction. So that transactions can be configured in the hibernate configuration.
* </p>
*
- * <p>A JbpmContext allows the user to overwrite (or make complete) the configuration
- * by injecting objects programmatically. like e.g. a hibernate session factory or
- * a hibernate session or any other resource that can be fetched or created from the
- * configuration.
+ * <p>
+ * A JbpmContext allows the user to overwrite (or make complete) the configuration by injecting objects programmatically. like e.g. a hibernate session factory or a
+ * hibernate session or any other resource that can be fetched or created from the configuration.
* </p>
*
- * <p>Last but not least, JbpmContext provides convenient access to the most common
- * operations such as {@link #getTaskList(String)}, {@link #newProcessInstance(String)}
+ * <p>
+ * Last but not least, JbpmContext provides convenient access to the most common operations such as {@link #getTaskList(String)}, {@link #newProcessInstance(String)}
* {@link #loadTaskInstanceForUpdate(long)} and {@link #save(ProcessInstance)}.
* </p>
*
- * <p>All the <code>...ForUpdate(...)</code> methods will automatically save the loaded
- * objects at <code>jbpmContext.close();</code>
+ * <p>
+ * All the <code>...ForUpdate(...)</code> methods will automatically save the loaded objects at <code>jbpmContext.close();</code>
* </p>
*/
-public class JbpmContext implements Serializable {
-
+public class JbpmContext implements Serializable
+{
private static final long serialVersionUID = 1L;
public static final String DEFAULT_JBPM_CONTEXT_NAME = "default.jbpm.context";
static ThreadLocal currentContextsStack = new ThreadLocal();
- /**
- * resets static members for test isolation.
- */
- static void reset() {
- currentContextsStack = new ThreadLocal();
- }
-
ObjectFactory objectFactory = null;
Services services = null;
List autoSaveProcessInstances = null;
JbpmConfiguration jbpmConfiguration = null;
-
+
/**
* normally, JbpmContext object are created via a {@link JbpmConfiguration}.
*/
- public JbpmContext(Services services, ObjectFactory objectFactory) {
+ public JbpmContext(Services services, ObjectFactory objectFactory)
+ {
log.debug("creating " + toString());
this.services = services;
this.objectFactory = objectFactory;
@@ -129,325 +120,379 @@
/**
* make sure you close your JbpmContext in a finally block.
*/
- public void close() {
+ public void close()
+ {
log.debug("closing jbpmContext " + toString());
- try {
- if (services!=null) {
- try {
+ try
+ {
+ if (services != null)
+ {
+ try
+ {
autoSave();
- } finally {
+ }
+ finally
+ {
services.close();
}
}
- } finally {
- if (jbpmConfiguration!=null) {
+ }
+ finally
+ {
+ if (jbpmConfiguration != null)
+ {
jbpmConfiguration.jbpmContextClosed(this);
}
}
}
/**
- * obtains the current JbpmContext from a thread local.
- * The current JbpmContexts are maintained in a stack so
- * that you can do nested context operations for
- * different jbpm configurations.
+ * obtains the current JbpmContext from a thread local. The current JbpmContexts are maintained in a stack so that you can do nested context operations for different
+ * jbpm configurations.
+ *
* @deprecated method moved to {@link JbpmConfiguration}.
*/
- public static JbpmContext getCurrentJbpmContext() {
+ public static JbpmContext getCurrentJbpmContext()
+ {
JbpmContext currentJbpmContext = null;
JbpmConfiguration currentJbpmConfiguration = JbpmConfiguration.getCurrentJbpmConfiguration();
- if (currentJbpmConfiguration!=null) {
+ if (currentJbpmConfiguration != null)
+ {
currentJbpmContext = currentJbpmConfiguration.getCurrentJbpmContext();
}
return currentJbpmContext;
}
// convenience methods //////////////////////////////////////////////////////
-
+
/**
- * deploys a process definition.
- * For parsing process definitions from archives, see the static parseXxx methods
- * on {@link ProcessDefinition}.
+ * deploys a process definition. For parsing process definitions from archives, see the static parseXxx methods on {@link ProcessDefinition}.
*/
- public void deployProcessDefinition(ProcessDefinition processDefinition) {
+ public void deployProcessDefinition(ProcessDefinition processDefinition)
+ {
getGraphSession().deployProcessDefinition(processDefinition);
}
+
/**
- * fetches the tasklist for the current authenticated actor. With the default
- * configured authentication service, you can set the authenticated user
- * with {@link #setActorId(String)}, then all the subsequent operations will
- * be performed on behalf of that actor.
+ * fetches the tasklist for the current authenticated actor. With the default configured authentication service, you can set the authenticated user with
+ * {@link #setActorId(String)}, then all the subsequent operations will be performed on behalf of that actor.
*/
- public List getTaskList() {
+ public List getTaskList()
+ {
String actorId = getActorId();
return getTaskMgmtSession().findTaskInstances(actorId);
}
+
/**
* fetches the tasklist for the given actor.
*/
- public List getTaskList(String actorId) {
+ public List getTaskList(String actorId)
+ {
return getTaskMgmtSession().findTaskInstances(actorId);
}
+
/**
- * fetches all the task instances for which at least one of the given
- * actorIds is a candidate (pooled actor).
- * Typically, for an actor, his/her personal actorId plus
- * all the actorIds representing the groups that person belongs
- * to form the actorIds. Then the user interface should show
- * only the option to take these tasks to the actor's personal
- * task list (with {@link TaskInstance#setActorId(String)}). Only
- * task instances that are assigned to the actor directly should be
- * offered the possibility for performing the actual task.
+ * fetches all the task instances for which at least one of the given actorIds is a candidate (pooled actor). Typically, for an actor, his/her personal actorId plus
+ * all the actorIds representing the groups that person belongs to form the actorIds. Then the user interface should show only the option to take these tasks to the
+ * actor's personal task list (with {@link TaskInstance#setActorId(String)}). Only task instances that are assigned to the actor directly should be offered the
+ * possibility for performing the actual task.
*/
- public List getGroupTaskList(List actorIds) {
+ public List getGroupTaskList(List actorIds)
+ {
return getTaskMgmtSession().findPooledTaskInstances(actorIds);
}
+
/**
* loads a task instance from the db.
- * @throws JbpmException in case no such task instance exists
+ *
+ * @throws JbpmException in case no such task instance exists
* @see #getTaskInstance(long)
* @see #loadTaskInstanceForUpdate(long)
* @see #getTaskInstanceForUpdate(long)
*/
- public TaskInstance loadTaskInstance(long taskInstanceId) {
+ public TaskInstance loadTaskInstance(long taskInstanceId)
+ {
return getTaskMgmtSession().loadTaskInstance(taskInstanceId);
}
+
/**
* gets a task instance from the db.
- * @return the task instance or null in case no such task instance exists.
+ *
+ * @return the task instance or null in case no such task instance exists.
* @see #loadTaskInstance(long)
* @see #loadTaskInstanceForUpdate(long)
* @see #getTaskInstanceForUpdate(long)
*/
- public TaskInstance getTaskInstance(long taskInstanceId) {
+ public TaskInstance getTaskInstance(long taskInstanceId)
+ {
return getTaskMgmtSession().getTaskInstance(taskInstanceId);
}
+
/**
- * loads a task instance from the db and registers it for auto-save.
- * The loaded task instance will be save automatically at the {@link #close()}.
- * This is a convenience method in case you plan to do update operations on
- * this task instance.
- * @throws JbpmException in case no such task instance exists
+ * loads a task instance from the db and registers it for auto-save. The loaded task instance will be save automatically at the {@link #close()}. This is a
+ * convenience method in case you plan to do update operations on this task instance.
+ *
+ * @throws JbpmException in case no such task instance exists
* @see #loadTaskInstance(long)
* @see #getTaskInstance(long)
* @see #getTaskInstanceForUpdate(long)
*/
- public TaskInstance loadTaskInstanceForUpdate(long taskInstanceId) {
+ public TaskInstance loadTaskInstanceForUpdate(long taskInstanceId)
+ {
TaskInstance taskInstance = getTaskMgmtSession().loadTaskInstance(taskInstanceId);
addAutoSaveTaskInstance(taskInstance);
return taskInstance;
}
+
/**
- * gets a task instance from the db and registers it for auto-save.
- * The loaded task instance will be save automatically at the {@link #close()}.
- * This is a convenience method in case you plan to do update operations on
- * this task instance.
- * @return the task instance or null in case no such task instance exists.
+ * gets a task instance from the db and registers it for auto-save. The loaded task instance will be save automatically at the {@link #close()}. This is a convenience
+ * method in case you plan to do update operations on this task instance.
+ *
+ * @return the task instance or null in case no such task instance exists.
* @see #loadTaskInstance(long)
* @see #getTaskInstance(long)
* @see #loadTaskInstanceForUpdate(long)
*/
- public TaskInstance getTaskInstanceForUpdate(long taskInstanceId) {
+ public TaskInstance getTaskInstanceForUpdate(long taskInstanceId)
+ {
TaskInstance taskInstance = getTaskMgmtSession().getTaskInstance(taskInstanceId);
- if (taskInstance!=null) {
+ if (taskInstance != null)
+ {
addAutoSaveTaskInstance(taskInstance);
}
return taskInstance;
}
+
/**
* loads a token from the db.
+ *
* @throws JbpmException in case no such token exists.
- * @see #getToken(long)
- * @see #loadTokenForUpdate(long)
- * @see #getTokenForUpdate(long)
+ * @see #getToken(long)
+ * @see #loadTokenForUpdate(long)
+ * @see #getTokenForUpdate(long)
*/
- public Token loadToken(long tokenId) {
+ public Token loadToken(long tokenId)
+ {
return getGraphSession().loadToken(tokenId);
}
+
/**
* gets a token from the db.
+ *
* @return the token or null in case no such token exists.
- * @see #loadToken(long)
- * @see #loadTokenForUpdate(long)
- * @see #getTokenForUpdate(long)
+ * @see #loadToken(long)
+ * @see #loadTokenForUpdate(long)
+ * @see #getTokenForUpdate(long)
*/
- public Token getToken(long tokenId) {
+ public Token getToken(long tokenId)
+ {
return getGraphSession().getToken(tokenId);
}
+
/**
- * loads a token from the db and registers it for auto-save.
- * The loaded token will be {@link #save(Token)}d automatically at the {@link #close()}.
- * This is a convenience method in case you plan to do update operations on
- * this token.
+ * loads a token from the db and registers it for auto-save. The loaded token will be {@link #save(Token)}d automatically at the {@link #close()}. This is a
+ * convenience method in case you plan to do update operations on this token.
+ *
* @throws JbpmException in case no such token exists.
- * @see #getToken(long)
- * @see #loadToken(long)
- * @see #getTokenForUpdate(long)
+ * @see #getToken(long)
+ * @see #loadToken(long)
+ * @see #getTokenForUpdate(long)
*/
- public Token loadTokenForUpdate(long tokenId) {
+ public Token loadTokenForUpdate(long tokenId)
+ {
Token token = getGraphSession().loadToken(tokenId);
addAutoSaveToken(token);
return token;
}
+
/**
- * get a token from the db and registers it for auto-save.
- * The loaded token will be {@link #save(Token)}d automatically at the {@link #close()}.
- * This is a convenience method in case you plan to do update operations on
- * this token.
+ * get a token from the db and registers it for auto-save. The loaded token will be {@link #save(Token)}d automatically at the {@link #close()}. This is a convenience
+ * method in case you plan to do update operations on this token.
+ *
* @return the token or null in case no such token exists.
- * @see #getToken(long)
- * @see #loadToken(long)
- * @see #loadTokenForUpdate(long)
+ * @see #getToken(long)
+ * @see #loadToken(long)
+ * @see #loadTokenForUpdate(long)
*/
- public Token getTokenForUpdate(long tokenId) {
+ public Token getTokenForUpdate(long tokenId)
+ {
Token token = getGraphSession().getToken(tokenId);
- if (token!=null) {
+ if (token != null)
+ {
addAutoSaveToken(token);
}
return token;
}
+
/**
- * loads a process instance from the db.
- * Consider using {@link #loadProcessInstanceForUpdate(long)} if you plan to
- * perform an update operation on the process instance.
+ * loads a process instance from the db. Consider using {@link #loadProcessInstanceForUpdate(long)} if you plan to perform an update operation on the process
+ * instance.
+ *
* @throws JbpmException in case no such process instance exists.
- * @see #getProcessInstance(long)
- * @see #loadProcessInstanceForUpdate(long)
- * @see #getProcessInstanceForUpdate(long)
+ * @see #getProcessInstance(long)
+ * @see #loadProcessInstanceForUpdate(long)
+ * @see #getProcessInstanceForUpdate(long)
*/
- public ProcessInstance loadProcessInstance(long processInstanceId) {
+ public ProcessInstance loadProcessInstance(long processInstanceId)
+ {
return getGraphSession().loadProcessInstance(processInstanceId);
}
+
/**
- * gets a process instance from the db.
- * Consider using {@link #loadProcessInstanceForUpdate(long)} if you plan to
- * perform an update operation on the process instance.
+ * gets a process instance from the db. Consider using {@link #loadProcessInstanceForUpdate(long)} if you plan to perform an update operation on the process instance.
+ *
* @return the token or null in case no such token exists.
- * @see #loadProcessInstance(long)
- * @see #loadProcessInstanceForUpdate(long)
- * @see #getProcessInstanceForUpdate(long)
+ * @see #loadProcessInstance(long)
+ * @see #loadProcessInstanceForUpdate(long)
+ * @see #getProcessInstanceForUpdate(long)
*/
- public ProcessInstance getProcessInstance(long processInstanceId) {
+ public ProcessInstance getProcessInstance(long processInstanceId)
+ {
return getGraphSession().getProcessInstance(processInstanceId);
}
+
/**
- * loads a process instances from the db and registers it for auto-save.
- * The loaded process instance will be {@link #save(ProcessInstance)}d automatically
- * at the {@link #close()}. This is a convenience method in case you plan to do update
- * operations on this process instance.
+ * loads a process instances from the db and registers it for auto-save. The loaded process instance will be {@link #save(ProcessInstance)}d automatically at the
+ * {@link #close()}. This is a convenience method in case you plan to do update operations on this process instance.
+ *
* @throws JbpmException in case no such process instance exists.
- * @see #loadProcessInstance(long)
- * @see #getProcessInstance(long)
- * @see #getProcessInstanceForUpdate(long)
+ * @see #loadProcessInstance(long)
+ * @see #getProcessInstance(long)
+ * @see #getProcessInstanceForUpdate(long)
*/
- public ProcessInstance loadProcessInstanceForUpdate(long processInstanceId) {
+ public ProcessInstance loadProcessInstanceForUpdate(long processInstanceId)
+ {
ProcessInstance processInstance = getGraphSession().loadProcessInstance(processInstanceId);
addAutoSaveProcessInstance(processInstance);
return processInstance;
}
+
/**
- * gets a process instances from the db and registers it for auto-save.
- * The loaded process instance will be {@link #save(ProcessInstance)}d automatically
- * at the {@link #close()}. This is a convenience method in case you plan to do update
- * operations on this process instance.
+ * gets a process instances from the db and registers it for auto-save. The loaded process instance will be {@link #save(ProcessInstance)}d automatically at the
+ * {@link #close()}. This is a convenience method in case you plan to do update operations on this process instance.
+ *
* @return the token or null in case no such token exists.
- * @see #loadProcessInstance(long)
- * @see #getProcessInstance(long)
- * @see #loadProcessInstanceForUpdate(long)
+ * @see #loadProcessInstance(long)
+ * @see #getProcessInstance(long)
+ * @see #loadProcessInstanceForUpdate(long)
*/
- public ProcessInstance getProcessInstanceForUpdate(long processInstanceId) {
+ public ProcessInstance getProcessInstanceForUpdate(long processInstanceId)
+ {
ProcessInstance processInstance = getGraphSession().getProcessInstance(processInstanceId);
- if (processInstance!=null) {
+ if (processInstance != null)
+ {
addAutoSaveProcessInstance(processInstance);
}
return processInstance;
}
-
- /** returns the process instance with the given key or null if no such instance exists.
+
+ /**
+ * returns the process instance with the given key or null if no such instance exists.
*/
- public ProcessInstance getProcessInstance(ProcessDefinition processDefinition, String key) {
+ public ProcessInstance getProcessInstance(ProcessDefinition processDefinition, String key)
+ {
return getGraphSession().getProcessInstance(processDefinition, key);
}
- /** returns the process instance with the given key or throws an exception if no
- * such instance exists.
+ /**
+ * returns the process instance with the given key or throws an exception if no such instance exists.
*/
- public ProcessInstance loadProcessInstance(ProcessDefinition processDefinition, String key) {
+ public ProcessInstance loadProcessInstance(ProcessDefinition processDefinition, String key)
+ {
return getGraphSession().loadProcessInstance(processDefinition, key);
}
- /** returns the process instance with the given key or null if no such instance exists.
- * Upon close of this jbpmContext, the fetched process instance will be automatically saved.
+ /**
+ * returns the process instance with the given key or null if no such instance exists. Upon close of this jbpmContext, the fetched process instance will be
+ * automatically saved.
*/
- public ProcessInstance getProcessInstanceForUpdate(ProcessDefinition processDefinition, String key) {
+ public ProcessInstance getProcessInstanceForUpdate(ProcessDefinition processDefinition, String key)
+ {
ProcessInstance processInstance = getGraphSession().getProcessInstance(processDefinition, key);
- if (processInstance!=null) {
+ if (processInstance != null)
+ {
addAutoSaveProcessInstance(processInstance);
}
return processInstance;
}
- /** returns the process instance with the given key or throws an exception if no
- * such instance exists.
- * Upon close of this jbpmContext, the fetched process instance will be automatically saved.
+ /**
+ * returns the process instance with the given key or throws an exception if no such instance exists. Upon close of this jbpmContext, the fetched process instance
+ * will be automatically saved.
*/
- public ProcessInstance loadProcessInstanceForUpdate(ProcessDefinition processDefinition, String key) {
+ public ProcessInstance loadProcessInstanceForUpdate(ProcessDefinition processDefinition, String key)
+ {
ProcessInstance processInstance = getGraphSession().loadProcessInstance(processDefinition, key);
- if (processInstance!=null) {
+ if (processInstance != null)
+ {
addAutoSaveProcessInstance(processInstance);
}
return processInstance;
}
/**
- * creates a new process instance for the latest version of the process definition
- * with the given name.
+ * creates a new process instance for the latest version of the process definition with the given name.
+ *
* @throws JbpmException when no processDefinition with the given name is deployed.
*/
- public ProcessInstance newProcessInstance(String processDefinitionName) {
+ public ProcessInstance newProcessInstance(String processDefinitionName)
+ {
ProcessDefinition processDefinition = getGraphSession().findLatestProcessDefinition(processDefinitionName);
return new ProcessInstance(processDefinition);
}
+
/**
- * creates a new process instance for the latest version of the process definition
- * with the given name and registers it for auto-save.
+ * creates a new process instance for the latest version of the process definition with the given name and registers it for auto-save.
+ *
* @throws JbpmException when no processDefinition with the given name is deployed.
*/
- public ProcessInstance newProcessInstanceForUpdate(String processDefinitionName) {
+ public ProcessInstance newProcessInstanceForUpdate(String processDefinitionName)
+ {
ProcessDefinition processDefinition = getGraphSession().findLatestProcessDefinition(processDefinitionName);
ProcessInstance processInstance = new ProcessInstance(processDefinition);
addAutoSaveProcessInstance(processInstance);
return processInstance;
}
+
/**
* saves the process instance.
*/
- public void save(ProcessInstance processInstance) {
- if (services!=null) {
+ public void save(ProcessInstance processInstance)
+ {
+ if (services != null)
+ {
services.save(processInstance, this);
}
}
+
/**
* saves the complete process instance for this token.
*/
- public void save(Token token) {
+ public void save(Token token)
+ {
save(token.getProcessInstance());
}
+
/**
* saves the complete process instance for this task instance.
*/
- public void save(TaskInstance taskInstance) {
+ public void save(TaskInstance taskInstance)
+ {
save(taskInstance.getTaskMgmtInstance().getProcessInstance());
}
+
/**
- * mark this transaction for rollback only in the persistence service.
- * The {@link #close()} operation will then perform a rollback.
+ * mark this transaction for rollback only in the persistence service. The {@link #close()} operation will then perform a rollback.
*/
- public void setRollbackOnly() {
- TxService txService = (services!=null ? services.getTxService() : null);
- if (txService!=null) {
+ public void setRollbackOnly()
+ {
+ TxService txService = (services != null ? services.getTxService() : null);
+ if (txService != null)
+ {
txService.setRollbackOnly();
- } else {
+ }
+ else
+ {
throw new JbpmException("no transaction service configured");
}
}
@@ -457,82 +502,102 @@
/**
* gives access to the services and service factories.
*/
- public Services getServices() {
+ public Services getServices()
+ {
return services;
}
-
- public ServiceFactory getServiceFactory(String name) {
+
+ public ServiceFactory getServiceFactory(String name)
+ {
return services.getServiceFactory(name);
}
-
+
/**
- * gives access to the object factory containing the configuration
- * for creating the service factories.
+ * gives access to the object factory containing the configuration for creating the service factories.
*/
- public ObjectFactory getObjectFactory() {
+ public ObjectFactory getObjectFactory()
+ {
return objectFactory;
}
// persistence methods //////////////////////////////////////////////////////
/**
- * gets the hibernate session factory from the default configured persistence
- * service.
+ * gets the hibernate session factory from the default configured persistence service.
+ *
* @throws ClassCastException if another persistence service is configured then the default.
*/
- public SessionFactory getSessionFactory() {
- DbPersistenceService persistenceService = (DbPersistenceService) getPersistenceService();
- if (persistenceService==null) return null;
+ public SessionFactory getSessionFactory()
+ {
+ DbPersistenceService persistenceService = (DbPersistenceService)getPersistenceService();
+ if (persistenceService == null)
+ return null;
return persistenceService.getSessionFactory();
}
+
/**
- * sets the hibernate session factory into the default configured persistence
- * service, overwriting the configured session factory (if there is one configured).
+ * sets the hibernate session factory into the default configured persistence service, overwriting the configured session factory (if there is one configured).
+ *
* @throws ClassCastException if another persistence service is configured then the default.
*/
- public void setSessionFactory(SessionFactory sessionFactory) {
- DbPersistenceService persistenceService = (DbPersistenceService) getPersistenceService();
- if (persistenceService==null) return;
+ public void setSessionFactory(SessionFactory sessionFactory)
+ {
+ DbPersistenceService persistenceService = (DbPersistenceService)getPersistenceService();
+ if (persistenceService == null)
+ return;
persistenceService.setSessionFactory(sessionFactory);
}
+
/**
- * gets the hibernate session from the default configured persistence
- * service.
+ * gets the hibernate session from the default configured persistence service.
+ *
* @throws ClassCastException if another persistence service is configured then the default.
*/
- public Session getSession() {
- DbPersistenceService persistenceService = (DbPersistenceService) getPersistenceService();
- if (persistenceService==null) return null;
+ public Session getSession()
+ {
+ DbPersistenceService persistenceService = (DbPersistenceService)getPersistenceService();
+ if (persistenceService == null)
+ return null;
return persistenceService.getSession();
}
+
/**
- * sets the hibernate session into the default configured persistence
- * service, preventing the creation of a session from the configured
- * session factory (if there is one configured).
+ * sets the hibernate session into the default configured persistence service, preventing the creation of a session from the configured session factory (if there is
+ * one configured).
+ *
* @throws ClassCastException if another persistence service is configured then the default.
*/
- public void setSession(Session session) {
- DbPersistenceService persistenceService = (DbPersistenceService) getPersistenceService();
- if (persistenceService==null) return;
+ public void setSession(Session session)
+ {
+ DbPersistenceService persistenceService = (DbPersistenceService)getPersistenceService();
+ if (persistenceService == null)
+ return;
persistenceService.setSession(session);
}
+
/**
* gets the jdbc connection from the default configured persistence service.
+ *
* @throws ClassCastException if another persistence service is configured then the default.
*/
- public Connection getConnection() {
- DbPersistenceService persistenceService = (DbPersistenceService) getPersistenceService();
- if (persistenceService==null) return null;
+ public Connection getConnection()
+ {
+ DbPersistenceService persistenceService = (DbPersistenceService)getPersistenceService();
+ if (persistenceService == null)
+ return null;
return persistenceService.getConnection();
}
+
/**
- * allows users to provide a jdbc connection to be used when the hibernate
- * session is created.
+ * allows users to provide a jdbc connection to be used when the hibernate session is created.
+ *
* @throws ClassCastException if another persistence service is configured then the default.
*/
- public void setConnection(Connection connection) {
- DbPersistenceService persistenceService = (DbPersistenceService) getPersistenceService();
- if (persistenceService==null) return;
+ public void setConnection(Connection connection)
+ {
+ DbPersistenceService persistenceService = (DbPersistenceService)getPersistenceService();
+ if (persistenceService == null)
+ return;
persistenceService.setConnection(connection);
}
@@ -541,37 +606,46 @@
/**
* more variables related database access.
*/
- public ContextSession getContextSession() {
+ public ContextSession getContextSession()
+ {
PersistenceService persistenceService = getPersistenceService();
- return persistenceService!=null ? persistenceService.getContextSession() : null;
+ return persistenceService != null ? persistenceService.getContextSession() : null;
}
+
/**
* more logging related database access.
*/
- public LoggingSession getLoggingSession() {
+ public LoggingSession getLoggingSession()
+ {
PersistenceService persistenceService = getPersistenceService();
- return (persistenceService!=null ? persistenceService.getLoggingSession() : null);
+ return (persistenceService != null ? persistenceService.getLoggingSession() : null);
}
+
/**
* more job related database access.
*/
- public JobSession getJobSession() {
+ public JobSession getJobSession()
+ {
PersistenceService persistenceService = getPersistenceService();
- return (persistenceService!=null ? persistenceService.getJobSession() : null);
+ return (persistenceService != null ? persistenceService.getJobSession() : null);
}
+
/**
* more graph (process) related database access.
*/
- public GraphSession getGraphSession() {
+ public GraphSession getGraphSession()
+ {
PersistenceService persistenceService = getPersistenceService();
- return (persistenceService!=null ? persistenceService.getGraphSession() : null);
+ return (persistenceService != null ? persistenceService.getGraphSession() : null);
}
+
/**
* more task related database access.
*/
- public TaskMgmtSession getTaskMgmtSession() {
+ public TaskMgmtSession getTaskMgmtSession()
+ {
PersistenceService persistenceService = getPersistenceService();
- return (persistenceService!=null ? persistenceService.getTaskMgmtSession() : null);
+ return (persistenceService != null ? persistenceService.getTaskMgmtSession() : null);
}
// authentication methods ///////////////////////////////////////////////////
@@ -579,50 +653,64 @@
/**
* retrieves the current authenticated actor from the authentication service.
*/
- public String getActorId() {
+ public String getActorId()
+ {
return services.getAuthenticationService().getActorId();
}
+
/**
* sets the currently authenticated actorId.
+ *
* @throws ClassCastException if another authentication service is configured then the default.
*/
- public void setActorId(String actorId) {
- DefaultAuthenticationService authenticationService = (DefaultAuthenticationService) services.getAuthenticationService();
+ public void setActorId(String actorId)
+ {
+ DefaultAuthenticationService authenticationService = (DefaultAuthenticationService)services.getAuthenticationService();
authenticationService.setActorId(actorId);
}
// private methods //////////////////////////////////////////////////////////
-
- void addAutoSaveProcessInstance(ProcessInstance processInstance) {
- if (autoSaveProcessInstances==null) autoSaveProcessInstances = new ArrayList();
+
+ void addAutoSaveProcessInstance(ProcessInstance processInstance)
+ {
+ if (autoSaveProcessInstances == null)
+ autoSaveProcessInstances = new ArrayList();
autoSaveProcessInstances.add(processInstance);
}
-
- void addAutoSaveToken(Token token) {
+
+ void addAutoSaveToken(Token token)
+ {
addAutoSaveProcessInstance(token.getProcessInstance());
}
-
- void addAutoSaveTaskInstance(TaskInstance taskInstance) {
+
+ void addAutoSaveTaskInstance(TaskInstance taskInstance)
+ {
addAutoSaveProcessInstance(taskInstance.getTaskMgmtInstance().getProcessInstance());
}
-
- void autoSave() {
- if (autoSaveProcessInstances!=null) {
+
+ void autoSave()
+ {
+ if (autoSaveProcessInstances != null)
+ {
Iterator iter = autoSaveProcessInstances.iterator();
- while (iter.hasNext()) {
- ProcessInstance processInstance = (ProcessInstance) iter.next();
+ while (iter.hasNext())
+ {
+ ProcessInstance processInstance = (ProcessInstance)iter.next();
save(processInstance);
iter.remove();
}
}
}
- PersistenceService getPersistenceService() {
- if (services==null) return null;
+ PersistenceService getPersistenceService()
+ {
+ if (services == null)
+ return null;
return services.getPersistenceService();
}
- public JbpmConfiguration getJbpmConfiguration() {
+ public JbpmConfiguration getJbpmConfiguration()
+ {
return jbpmConfiguration;
}
Deleted: jbpm3/trunk/modules/core/src/main/java/org/jbpm/JbpmContextTestHelper.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/JbpmContextTestHelper.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/JbpmContextTestHelper.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -1,30 +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;
-
-public class JbpmContextTestHelper {
-
- public static void reset() {
- JbpmContext.reset();
- }
-
-}
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/AbstractDbTestCase.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/AbstractDbTestCase.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/AbstractDbTestCase.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -57,7 +57,8 @@
public void setUp() throws Exception
{
- log.debug("### starting " + getClass().getName() + "." + getName() + " ####################################################");
+ log.debug("### starting " + getLongName() + " ####################################################");
+ super.setUp();
createSchema();
createJbpmContext();
initializeMembers();
@@ -68,7 +69,7 @@
resetMembers();
closeJbpmContext();
super.tearDown();
- log.debug("### " + getClass().getName() + "." + getName() + " done ####################################################");
+ log.debug("### " + getLongName() + " done ####################################################");
}
public void beginSessionTransaction()
Modified: jbpm3/trunk/modules/core/src/test/java/org/jboss/seam/pageflow/Page.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jboss/seam/pageflow/Page.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jboss/seam/pageflow/Page.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -1,11 +1,6 @@
package org.jboss.seam.pageflow;
import org.dom4j.Element;
-/*
-import org.jboss.seam.bpm.BusinessProcess;
-import org.jboss.seam.core.Conversation;
-import org.jboss.seam.core.Interpolator;
-*/
import org.jbpm.graph.def.Node;
import org.jbpm.graph.exe.ExecutionContext;
import org.jbpm.jpdl.xml.JpdlXmlReader;
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/DefaultConfigurationTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/DefaultConfigurationTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/DefaultConfigurationTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -1,11 +1,9 @@
package org.jbpm;
-import junit.framework.TestCase;
-
import org.jbpm.graph.def.ProcessDefinition;
import org.jbpm.graph.exe.ProcessInstance;
-public class DefaultConfigurationTest extends TestCase {
+public class DefaultConfigurationTest extends AbstractJbpmTestCase {
public void testDefaultConfiguration() {
ProcessDefinition processDefinition = ProcessDefinition.parseXmlString(
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/JbpmConfigurationTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/JbpmConfigurationTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/JbpmConfigurationTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -23,8 +23,6 @@
import java.util.HashMap;
-import junit.framework.TestCase;
-
import org.jbpm.configuration.ConfigurationException;
import org.jbpm.configuration.ObjectFactory;
import org.jbpm.configuration.ObjectFactoryImpl;
@@ -33,7 +31,7 @@
import org.jbpm.svc.Services;
import org.jbpm.util.XmlException;
-public class JbpmConfigurationTest extends TestCase {
+public class JbpmConfigurationTest extends AbstractJbpmTestCase {
public void setUp() throws Exception
{
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/JbpmContextTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/JbpmContextTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/JbpmContextTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -23,8 +23,6 @@
import java.util.HashMap;
-import junit.framework.TestCase;
-
import org.jbpm.graph.exe.ProcessInstance;
import org.jbpm.logging.LoggingService;
import org.jbpm.logging.log.MessageLog;
@@ -34,7 +32,7 @@
import org.jbpm.svc.Services;
import org.jbpm.svc.save.SaveOperation;
-public class JbpmContextTest extends TestCase {
+public class JbpmContextTest extends AbstractJbpmTestCase {
public void setUp() throws Exception
{
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/JbpmDefaultConfigTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/JbpmDefaultConfigTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/JbpmDefaultConfigTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -1,8 +1,7 @@
package org.jbpm;
-import junit.framework.TestCase;
-public class JbpmDefaultConfigTest extends TestCase {
+public class JbpmDefaultConfigTest extends AbstractJbpmTestCase {
// this test should be ran without jbpm.cfg.xml on the
// classpath.
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/SerializabilityTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/SerializabilityTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/SerializabilityTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -29,12 +29,10 @@
import java.util.Iterator;
import java.util.Set;
-import junit.framework.TestCase;
-
import org.jbpm.file.def.FileDefinitionFileSystemConfigTest;
import org.jbpm.util.ClassLoaderUtil;
-public class SerializabilityTest extends TestCase {
+public class SerializabilityTest extends AbstractJbpmTestCase {
String testRootDir = FileDefinitionFileSystemConfigTest.class.getProtectionDomain().getCodeSource().getLocation().getFile().toString();
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/bytes/ByteArrayTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/bytes/ByteArrayTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/bytes/ByteArrayTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -21,9 +21,9 @@
*/
package org.jbpm.bytes;
-import junit.framework.TestCase;
+import org.jbpm.AbstractJbpmTestCase;
-public class ByteArrayTest extends TestCase {
+public class ByteArrayTest extends AbstractJbpmTestCase {
public void testByteChopping2Blocks() {
ByteArray byteArray = new ByteArray(new byte[2048]);
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/calendar/BusinessCalendarTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/calendar/BusinessCalendarTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/calendar/BusinessCalendarTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -21,11 +21,13 @@
*/
package org.jbpm.calendar;
-import java.util.*;
-import junit.framework.*;
+import java.util.Calendar;
+import java.util.Date;
-public class BusinessCalendarTest extends TestCase {
+import org.jbpm.AbstractJbpmTestCase;
+public class BusinessCalendarTest extends AbstractJbpmTestCase {
+
static BusinessCalendar businessCalendar = new BusinessCalendar();
public void testNonBusinessDurationAddition() throws Exception {
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/calendar/DayPartTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/calendar/DayPartTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/calendar/DayPartTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -21,11 +21,12 @@
*/
package org.jbpm.calendar;
-import java.text.*;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
-import junit.framework.*;
+import org.jbpm.AbstractJbpmTestCase;
-public class DayPartTest extends TestCase {
+public class DayPartTest extends AbstractJbpmTestCase {
public void testDayPartParsing() {
DateFormat dateFormat = new SimpleDateFormat("HH:mm");
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/calendar/DayTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/calendar/DayTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/calendar/DayTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -21,11 +21,12 @@
*/
package org.jbpm.calendar;
-import java.text.*;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
-import junit.framework.*;
+import org.jbpm.AbstractJbpmTestCase;
-public class DayTest extends TestCase {
+public class DayTest extends AbstractJbpmTestCase {
public void testDaySingleDayPartParsing() {
DateFormat dateFormat = new SimpleDateFormat("HH:mm");
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/calendar/HolidayTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/calendar/HolidayTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/calendar/HolidayTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -21,13 +21,14 @@
*/
package org.jbpm.calendar;
-import java.text.*;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
-import junit.framework.*;
+import org.jbpm.AbstractJbpmTestCase;
-public class HolidayTest extends TestCase {
+public class HolidayTest extends AbstractJbpmTestCase {
public void testHolidaySingleDayParsing() throws Exception {
DateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy");
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/configuration/BeanFactoryTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/configuration/BeanFactoryTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/configuration/BeanFactoryTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -23,10 +23,10 @@
import java.util.List;
-import junit.framework.TestCase;
+import org.jbpm.AbstractJbpmTestCase;
-public class BeanFactoryTest extends TestCase {
+public class BeanFactoryTest extends AbstractJbpmTestCase {
protected ObjectFactoryImpl objectFactory = null;
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/configuration/ObjectFactoryTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/configuration/ObjectFactoryTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/configuration/ObjectFactoryTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -25,9 +25,9 @@
import java.util.List;
import java.util.Map;
-import junit.framework.TestCase;
+import org.jbpm.AbstractJbpmTestCase;
-public class ObjectFactoryTest extends TestCase {
+public class ObjectFactoryTest extends AbstractJbpmTestCase {
protected ObjectFactoryImpl objectFactory = null;
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/configuration/ObjectFactoryUserGuideTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/configuration/ObjectFactoryUserGuideTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/configuration/ObjectFactoryUserGuideTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -24,11 +24,10 @@
import java.util.List;
import java.util.Map;
-import junit.framework.TestCase;
-
+import org.jbpm.AbstractJbpmTestCase;
import org.jbpm.taskmgmt.exe.TaskInstance;
-public class ObjectFactoryUserGuideTest extends TestCase {
+public class ObjectFactoryUserGuideTest extends AbstractJbpmTestCase {
protected ObjectFactoryImpl objectFactory = null;
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/context/exe/ContextInstanceDbTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/context/exe/ContextInstanceDbTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/context/exe/ContextInstanceDbTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -21,12 +21,14 @@
*/
package org.jbpm.context.exe;
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
-import org.jbpm.context.def.*;
-import org.jbpm.db.*;
-import org.jbpm.graph.def.*;
-import org.jbpm.graph.exe.*;
+import org.jbpm.context.def.ContextDefinition;
+import org.jbpm.db.AbstractDbTestCase;
+import org.jbpm.graph.def.ProcessDefinition;
+import org.jbpm.graph.exe.ProcessInstance;
+import org.jbpm.graph.exe.Token;
public class ContextInstanceDbTest extends AbstractDbTestCase {
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/context/exe/JbpmTypesTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/context/exe/JbpmTypesTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/context/exe/JbpmTypesTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -21,17 +21,26 @@
*/
package org.jbpm.context.exe;
-import java.util.*;
+import java.util.Date;
-import javax.naming.directory.*;
+import javax.naming.directory.BasicAttribute;
-import junit.framework.*;
+import org.jbpm.AbstractJbpmTestCase;
+import org.jbpm.context.exe.converter.BooleanToStringConverter;
+import org.jbpm.context.exe.converter.ByteToLongConverter;
+import org.jbpm.context.exe.converter.CharacterToStringConverter;
+import org.jbpm.context.exe.converter.FloatToDoubleConverter;
+import org.jbpm.context.exe.converter.IntegerToLongConverter;
+import org.jbpm.context.exe.converter.SerializableToByteArrayConverter;
+import org.jbpm.context.exe.converter.ShortToLongConverter;
+import org.jbpm.context.exe.variableinstance.ByteArrayInstance;
+import org.jbpm.context.exe.variableinstance.DateInstance;
+import org.jbpm.context.exe.variableinstance.DoubleInstance;
+import org.jbpm.context.exe.variableinstance.LongInstance;
+import org.jbpm.context.exe.variableinstance.StringInstance;
-import org.jbpm.context.exe.converter.*;
-import org.jbpm.context.exe.variableinstance.*;
+public class JbpmTypesTest extends AbstractJbpmTestCase {
-public class JbpmTypesTest extends TestCase {
-
public void testString() {
VariableInstance variableInstance = VariableInstance.createVariableInstance("hello");
assertEquals(StringInstance.class, variableInstance.getClass());
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/context/exe/TransientVariableTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/context/exe/TransientVariableTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/context/exe/TransientVariableTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -21,14 +21,13 @@
*/
package org.jbpm.context.exe;
-import org.jbpm.context.def.*;
-import org.jbpm.graph.def.*;
-import org.jbpm.graph.exe.*;
+import org.jbpm.AbstractJbpmTestCase;
+import org.jbpm.context.def.ContextDefinition;
+import org.jbpm.graph.def.ProcessDefinition;
+import org.jbpm.graph.exe.ProcessInstance;
-import junit.framework.*;
+public class TransientVariableTest extends AbstractJbpmTestCase {
-public class TransientVariableTest extends TestCase {
-
ProcessDefinition processDefinition = null;
ContextInstance contextInstance = null;
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/context/exe/VariableInstanceDbTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/context/exe/VariableInstanceDbTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/context/exe/VariableInstanceDbTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -21,16 +21,19 @@
*/
package org.jbpm.context.exe;
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.jbpm.JbpmException;
-import org.jbpm.context.def.*;
-import org.jbpm.db.*;
-import org.jbpm.graph.def.*;
-import org.jbpm.graph.exe.*;
+import org.jbpm.context.def.ContextDefinition;
+import org.jbpm.db.AbstractDbTestCase;
+import org.jbpm.graph.def.ProcessDefinition;
+import org.jbpm.graph.exe.ProcessInstance;
import org.jbpm.util.DateDbTestUtil;
public class VariableInstanceDbTest extends AbstractDbTestCase {
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/context/exe/VariableScopingTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/context/exe/VariableScopingTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/context/exe/VariableScopingTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -21,16 +21,17 @@
*/
package org.jbpm.context.exe;
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
-import junit.framework.*;
+import org.jbpm.AbstractJbpmTestCase;
+import org.jbpm.context.def.ContextDefinition;
+import org.jbpm.graph.def.ProcessDefinition;
+import org.jbpm.graph.exe.ProcessInstance;
+import org.jbpm.graph.exe.Token;
-import org.jbpm.context.def.*;
-import org.jbpm.graph.def.*;
-import org.jbpm.graph.exe.*;
+public class VariableScopingTest extends AbstractJbpmTestCase {
-public class VariableScopingTest extends TestCase {
-
private static ProcessDefinition pd = createProcessDefinition();
private ProcessInstance pi = new ProcessInstance(pd);
private ContextInstance ci = (ContextInstance) pi.getInstance(ContextInstance.class);
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/context/exe/VariableTypeTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/context/exe/VariableTypeTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/context/exe/VariableTypeTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -21,16 +21,15 @@
*/
package org.jbpm.context.exe;
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.Date;
-import org.jbpm.context.def.*;
-import org.jbpm.graph.def.*;
-import org.jbpm.graph.exe.*;
+import org.jbpm.AbstractJbpmTestCase;
+import org.jbpm.context.def.ContextDefinition;
+import org.jbpm.graph.def.ProcessDefinition;
+import org.jbpm.graph.exe.ProcessInstance;
-import junit.framework.*;
-
-public class VariableTypeTest extends TestCase {
+public class VariableTypeTest extends AbstractJbpmTestCase {
private ProcessDefinition processDefinition = null;
private ProcessInstance processInstance = null;
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/context/log/VariableLogTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/context/log/VariableLogTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/context/log/VariableLogTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -25,8 +25,7 @@
import java.util.Date;
import java.util.List;
-import junit.framework.TestCase;
-
+import org.jbpm.AbstractJbpmTestCase;
import org.jbpm.bytes.ByteArray;
import org.jbpm.context.def.ContextDefinition;
import org.jbpm.context.exe.ContextInstance;
@@ -35,7 +34,7 @@
import org.jbpm.graph.exe.ProcessInstance;
import org.jbpm.logging.exe.LoggingInstance;
-public class VariableLogTest extends TestCase {
+public class VariableLogTest extends AbstractJbpmTestCase {
private ProcessDefinition processDefinition = null;
private ProcessInstance processInstance = null;
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/context/log/VariableUpdateDbTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/context/log/VariableUpdateDbTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/context/log/VariableUpdateDbTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -21,8 +21,8 @@
*/
package org.jbpm.context.log;
+import java.util.Arrays;
import java.util.Calendar;
-import java.util.Arrays;
import java.util.Date;
import java.util.List;
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/db/TaskMgmtSessionDbTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/db/TaskMgmtSessionDbTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/db/TaskMgmtSessionDbTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -21,12 +21,18 @@
*/
package org.jbpm.db;
-import java.util.*;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
-import org.jbpm.graph.def.*;
-import org.jbpm.graph.exe.*;
-import org.jbpm.taskmgmt.def.*;
-import org.jbpm.taskmgmt.exe.*;
+import org.jbpm.graph.def.Node;
+import org.jbpm.graph.def.ProcessDefinition;
+import org.jbpm.graph.exe.ProcessInstance;
+import org.jbpm.taskmgmt.def.Task;
+import org.jbpm.taskmgmt.def.TaskMgmtDefinition;
+import org.jbpm.taskmgmt.exe.TaskInstance;
+import org.jbpm.taskmgmt.exe.TaskMgmtInstance;
public class TaskMgmtSessionDbTest extends AbstractDbTestCase {
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/file/def/FileDefinitionDbConfigTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/file/def/FileDefinitionDbConfigTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/file/def/FileDefinitionDbConfigTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -25,11 +25,10 @@
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
-import junit.framework.TestCase;
-
+import org.jbpm.AbstractJbpmTestCase;
import org.jbpm.util.IoUtil;
-public class FileDefinitionDbConfigTest extends TestCase {
+public class FileDefinitionDbConfigTest extends AbstractJbpmTestCase {
private FileDefinition fileDefinition = new FileDefinition();
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/action/ScriptTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/action/ScriptTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/action/ScriptTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -26,8 +26,7 @@
import java.util.Map;
import java.util.Set;
-import junit.framework.TestCase;
-
+import org.jbpm.AbstractJbpmTestCase;
import org.jbpm.context.def.ContextDefinition;
import org.jbpm.context.def.VariableAccess;
import org.jbpm.context.exe.ContextInstance;
@@ -39,7 +38,7 @@
import bsh.ParseException;
-public class ScriptTest extends TestCase {
+public class ScriptTest extends AbstractJbpmTestCase {
public void testActionScript() {
ProcessDefinition processDefinition = ProcessDefinition.parseXmlString(
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/action/ScriptXmlTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/action/ScriptXmlTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/action/ScriptXmlTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -21,13 +21,11 @@
*/
package org.jbpm.graph.action;
-import junit.framework.TestCase;
-
-import org.jbpm.graph.action.Script;
+import org.jbpm.AbstractJbpmTestCase;
import org.jbpm.graph.def.Node;
import org.jbpm.graph.def.ProcessDefinition;
-public class ScriptXmlTest extends TestCase {
+public class ScriptXmlTest extends AbstractJbpmTestCase {
public void testReadScriptExpression() {
ProcessDefinition processDefinition = ProcessDefinition.parseXmlString(
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/def/ArrivingTransitionsTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/def/ArrivingTransitionsTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/def/ArrivingTransitionsTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -26,9 +26,9 @@
import java.util.Iterator;
import java.util.Set;
-import junit.framework.TestCase;
+import org.jbpm.AbstractJbpmTestCase;
-public class ArrivingTransitionsTest extends TestCase {
+public class ArrivingTransitionsTest extends AbstractJbpmTestCase {
private Node n = new Node("n");
private Transition t = new Transition("t");
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/def/DefaultTransitionTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/def/DefaultTransitionTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/def/DefaultTransitionTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -21,9 +21,9 @@
*/
package org.jbpm.graph.def;
-import junit.framework.*;
+import org.jbpm.AbstractJbpmTestCase;
-public class DefaultTransitionTest extends TestCase {
+public class DefaultTransitionTest extends AbstractJbpmTestCase {
private Node n = new Node();
private Node n2 = new Node();
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/def/LeavingTransitionsTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/def/LeavingTransitionsTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/def/LeavingTransitionsTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -24,9 +24,9 @@
import java.util.Iterator;
import java.util.List;
-import junit.framework.TestCase;
+import org.jbpm.AbstractJbpmTestCase;
-public class LeavingTransitionsTest extends TestCase {
+public class LeavingTransitionsTest extends AbstractJbpmTestCase {
private Node node = new Node("n");
private Transition transition = new Transition("t");
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/def/NodeDbTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/def/NodeDbTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/def/NodeDbTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -21,9 +21,12 @@
*/
package org.jbpm.graph.def;
-import java.util.*;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
-import org.jbpm.db.*;
+import org.jbpm.db.AbstractDbTestCase;
public class NodeDbTest extends AbstractDbTestCase {
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/def/NodeTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/def/NodeTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/def/NodeTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -21,9 +21,9 @@
*/
package org.jbpm.graph.def;
-import junit.framework.*;
+import org.jbpm.AbstractJbpmTestCase;
-public class NodeTest extends TestCase {
+public class NodeTest extends AbstractJbpmTestCase {
public void testNameChange() {
Node node = new Node();
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/def/ParentTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/def/ParentTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/def/ParentTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -21,9 +21,9 @@
*/
package org.jbpm.graph.def;
-import junit.framework.TestCase;
+import org.jbpm.AbstractJbpmTestCase;
-public class ParentTest extends TestCase {
+public class ParentTest extends AbstractJbpmTestCase {
ProcessDefinition processDefinition = null;
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/def/SuperStateTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/def/SuperStateTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/def/SuperStateTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -23,9 +23,9 @@
import java.util.List;
-import junit.framework.TestCase;
+import org.jbpm.AbstractJbpmTestCase;
-public class SuperStateTest extends TestCase {
+public class SuperStateTest extends AbstractJbpmTestCase {
public void testChildNodeAdditions() {
SuperState superState = new SuperState();
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/def/SupportedEventsTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/def/SupportedEventsTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/def/SupportedEventsTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -24,8 +24,7 @@
import java.util.HashSet;
import java.util.Set;
-import junit.framework.TestCase;
-
+import org.jbpm.AbstractJbpmTestCase;
import org.jbpm.graph.node.Decision;
import org.jbpm.graph.node.EndState;
import org.jbpm.graph.node.Fork;
@@ -52,7 +51,7 @@
* @author Jim Rigsbee
* @since 3.0
*/
-public class SupportedEventsTest extends TestCase {
+public class SupportedEventsTest extends AbstractJbpmTestCase {
public void testNodeEvents() {
assertSupportedEvents(new Node(), new String[] { "node-enter", "node-leave", "before-signal", "after-signal" });
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/exe/ActionExceptionsTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/exe/ActionExceptionsTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/exe/ActionExceptionsTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -21,12 +21,11 @@
*/
package org.jbpm.graph.exe;
-import junit.framework.TestCase;
-
+import org.jbpm.AbstractJbpmTestCase;
import org.jbpm.graph.def.ActionHandler;
import org.jbpm.graph.def.ProcessDefinition;
-public class ActionExceptionsTest extends TestCase
+public class ActionExceptionsTest extends AbstractJbpmTestCase
{
public static class FailingAction implements ActionHandler
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/exe/ActionExecutionTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/exe/ActionExecutionTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/exe/ActionExecutionTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -25,8 +25,7 @@
import java.util.Iterator;
import java.util.List;
-import junit.framework.TestCase;
-
+import org.jbpm.AbstractJbpmTestCase;
import org.jbpm.JbpmException;
import org.jbpm.graph.def.Action;
import org.jbpm.graph.def.ActionHandler;
@@ -35,7 +34,7 @@
import org.jbpm.graph.def.Node;
import org.jbpm.graph.def.ProcessDefinition;
-public class ActionExecutionTest extends TestCase {
+public class ActionExecutionTest extends AbstractJbpmTestCase {
ProcessDefinition processDefinition = null;
ProcessInstance processInstance = null;
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/exe/EventPropagationTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/exe/EventPropagationTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/exe/EventPropagationTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -24,8 +24,7 @@
import java.util.ArrayList;
import java.util.List;
-import junit.framework.TestCase;
-
+import org.jbpm.AbstractJbpmTestCase;
import org.jbpm.graph.def.Action;
import org.jbpm.graph.def.ActionHandler;
import org.jbpm.graph.def.Event;
@@ -33,7 +32,7 @@
import org.jbpm.graph.def.Node;
import org.jbpm.graph.def.ProcessDefinition;
-public class EventPropagationTest extends TestCase {
+public class EventPropagationTest extends AbstractJbpmTestCase {
ProcessDefinition processDefinition = null;
ProcessInstance processInstance = null;
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/exe/ExceptionHandlingTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/exe/ExceptionHandlingTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/exe/ExceptionHandlingTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -24,13 +24,12 @@
import java.util.ArrayList;
import java.util.List;
-import junit.framework.TestCase;
-
+import org.jbpm.AbstractJbpmTestCase;
import org.jbpm.graph.def.ActionHandler;
import org.jbpm.graph.def.DelegationException;
import org.jbpm.graph.def.ProcessDefinition;
-public class ExceptionHandlingTest extends TestCase
+public class ExceptionHandlingTest extends AbstractJbpmTestCase
{
static List executedActions = null;
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/exe/InitialNodeTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/exe/InitialNodeTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/exe/InitialNodeTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -1,10 +1,9 @@
package org.jbpm.graph.exe;
-import junit.framework.TestCase;
-
+import org.jbpm.AbstractJbpmTestCase;
import org.jbpm.graph.def.ProcessDefinition;
-public class InitialNodeTest extends TestCase {
+public class InitialNodeTest extends AbstractJbpmTestCase {
public void testInitialNode() {
ProcessDefinition processDefinition = ProcessDefinition.parseXmlString(
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/exe/NodeActionTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/exe/NodeActionTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/exe/NodeActionTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -21,13 +21,12 @@
*/
package org.jbpm.graph.exe;
-import junit.framework.TestCase;
-
+import org.jbpm.AbstractJbpmTestCase;
import org.jbpm.graph.def.ActionHandler;
import org.jbpm.graph.def.Node;
import org.jbpm.graph.def.ProcessDefinition;
-public class NodeActionTest extends TestCase {
+public class NodeActionTest extends AbstractJbpmTestCase {
private ProcessDefinition processDefinition = ProcessDefinition.parseXmlString(
"<process-definition>" +
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/exe/RuntimeActionsTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/exe/RuntimeActionsTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/exe/RuntimeActionsTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -21,14 +21,13 @@
*/
package org.jbpm.graph.exe;
-import junit.framework.TestCase;
-
+import org.jbpm.AbstractJbpmTestCase;
import org.jbpm.graph.def.Action;
import org.jbpm.graph.def.ActionHandler;
import org.jbpm.graph.def.Event;
import org.jbpm.graph.def.ProcessDefinition;
-public class RuntimeActionsTest extends TestCase {
+public class RuntimeActionsTest extends AbstractJbpmTestCase {
private ProcessDefinition processDefinition = ProcessDefinition.parseXmlString(
"<process-definition>" +
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/exe/SuperStateActionExecutionTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/exe/SuperStateActionExecutionTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/exe/SuperStateActionExecutionTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -24,8 +24,7 @@
import java.util.ArrayList;
import java.util.List;
-import junit.framework.TestCase;
-
+import org.jbpm.AbstractJbpmTestCase;
import org.jbpm.graph.def.Action;
import org.jbpm.graph.def.ActionHandler;
import org.jbpm.graph.def.Event;
@@ -33,7 +32,7 @@
import org.jbpm.graph.def.Node;
import org.jbpm.graph.def.ProcessDefinition;
-public class SuperStateActionExecutionTest extends TestCase {
+public class SuperStateActionExecutionTest extends AbstractJbpmTestCase {
ProcessDefinition processDefinition = null;
ProcessInstance processInstance = null;
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/exe/SuperStateTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/exe/SuperStateTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/exe/SuperStateTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -21,11 +21,10 @@
*/
package org.jbpm.graph.exe;
-import junit.framework.TestCase;
-
+import org.jbpm.AbstractJbpmTestCase;
import org.jbpm.graph.def.ProcessDefinition;
-public class SuperStateTest extends TestCase {
+public class SuperStateTest extends AbstractJbpmTestCase {
public void testTakeSuperStateTransition() {
ProcessDefinition processDefinition = ProcessDefinition.parseXmlString(
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/exe/TokenNameTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/exe/TokenNameTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/exe/TokenNameTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -21,11 +21,10 @@
*/
package org.jbpm.graph.exe;
-import junit.framework.*;
+import org.jbpm.AbstractJbpmTestCase;
+import org.jbpm.graph.def.ProcessDefinition;
-import org.jbpm.graph.def.*;
-
-public class TokenNameTest extends TestCase {
+public class TokenNameTest extends AbstractJbpmTestCase {
public void testFindRoot() {
ProcessDefinition pd = new ProcessDefinition(
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/log/ActionLogTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/log/ActionLogTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/log/ActionLogTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -23,8 +23,7 @@
import java.util.List;
-import junit.framework.TestCase;
-
+import org.jbpm.AbstractJbpmTestCase;
import org.jbpm.graph.def.ActionHandler;
import org.jbpm.graph.def.ProcessDefinition;
import org.jbpm.graph.exe.ExecutionContext;
@@ -32,7 +31,7 @@
import org.jbpm.graph.exe.Token;
import org.jbpm.logging.exe.LoggingInstance;
-public class ActionLogTest extends TestCase {
+public class ActionLogTest extends AbstractJbpmTestCase {
public static class LoggedAction implements ActionHandler {
private static final long serialVersionUID = 1L;
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/log/NodeLogTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/log/NodeLogTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/log/NodeLogTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -23,13 +23,12 @@
import java.util.List;
-import junit.framework.TestCase;
-
+import org.jbpm.AbstractJbpmTestCase;
import org.jbpm.graph.def.ProcessDefinition;
import org.jbpm.graph.exe.ProcessInstance;
import org.jbpm.logging.exe.LoggingInstance;
-public class NodeLogTest extends TestCase {
+public class NodeLogTest extends AbstractJbpmTestCase {
public void testNodeLogCreation() {
ProcessDefinition processDefinition = ProcessDefinition.parseXmlString(
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/log/ProcessInstanceLogTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/log/ProcessInstanceLogTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/log/ProcessInstanceLogTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -23,13 +23,12 @@
import java.util.List;
-import junit.framework.TestCase;
-
+import org.jbpm.AbstractJbpmTestCase;
import org.jbpm.graph.def.ProcessDefinition;
import org.jbpm.graph.exe.ProcessInstance;
import org.jbpm.logging.exe.LoggingInstance;
-public class ProcessInstanceLogTest extends TestCase {
+public class ProcessInstanceLogTest extends AbstractJbpmTestCase {
public void testProcessInstanceCreateLog() {
ProcessDefinition processDefinition = new ProcessDefinition();
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/log/ProcessLogsTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/log/ProcessLogsTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/log/ProcessLogsTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -23,14 +23,13 @@
import java.util.List;
-import junit.framework.TestCase;
-
+import org.jbpm.AbstractJbpmTestCase;
import org.jbpm.graph.def.ProcessDefinition;
import org.jbpm.graph.exe.ProcessInstance;
import org.jbpm.graph.exe.Token;
import org.jbpm.logging.exe.LoggingInstance;
-public class ProcessLogsTest extends TestCase {
+public class ProcessLogsTest extends AbstractJbpmTestCase {
public void testProcessInstanceStartLog() {
ProcessDefinition processDefinition = ProcessDefinition.parseXmlString(
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/log/SignalLogTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/log/SignalLogTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/log/SignalLogTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -23,14 +23,13 @@
import java.util.List;
-import junit.framework.TestCase;
-
+import org.jbpm.AbstractJbpmTestCase;
import org.jbpm.graph.def.ProcessDefinition;
import org.jbpm.graph.exe.ProcessInstance;
import org.jbpm.graph.exe.Token;
import org.jbpm.logging.exe.LoggingInstance;
-public class SignalLogTest extends TestCase {
+public class SignalLogTest extends AbstractJbpmTestCase {
public void testSignalLog() {
ProcessDefinition processDefinition = ProcessDefinition.parseXmlString(
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/log/TransitionLogTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/log/TransitionLogTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/log/TransitionLogTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -23,14 +23,13 @@
import java.util.List;
-import junit.framework.TestCase;
-
+import org.jbpm.AbstractJbpmTestCase;
import org.jbpm.graph.def.ProcessDefinition;
import org.jbpm.graph.exe.ProcessInstance;
import org.jbpm.graph.exe.Token;
import org.jbpm.logging.exe.LoggingInstance;
-public class TransitionLogTest extends TestCase {
+public class TransitionLogTest extends AbstractJbpmTestCase {
public void testBasicTransitionLogs() {
ProcessDefinition processDefinition = ProcessDefinition.parseXmlString(
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/node/CustomSubProcessResolverTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/node/CustomSubProcessResolverTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/node/CustomSubProcessResolverTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -3,12 +3,11 @@
import java.util.HashMap;
import java.util.Map;
-import junit.framework.TestCase;
-
import org.dom4j.Element;
+import org.jbpm.AbstractJbpmTestCase;
import org.jbpm.graph.def.ProcessDefinition;
-public class CustomSubProcessResolverTest extends TestCase
+public class CustomSubProcessResolverTest extends AbstractJbpmTestCase
{
MapBasedProcessRepository mapBasedProcessRepository = new MapBasedProcessRepository();
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/node/EndStateTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/node/EndStateTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/node/EndStateTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -21,12 +21,11 @@
*/
package org.jbpm.graph.node;
-import junit.framework.TestCase;
-
+import org.jbpm.AbstractJbpmTestCase;
import org.jbpm.graph.def.ProcessDefinition;
import org.jbpm.graph.exe.ProcessInstance;
-public class EndStateTest extends TestCase {
+public class EndStateTest extends AbstractJbpmTestCase {
public void testEndEvent() {
// create the state definition graph
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/node/ProcessStateTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/node/ProcessStateTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/node/ProcessStateTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -21,15 +21,14 @@
*/
package org.jbpm.graph.node;
-import junit.framework.TestCase;
-
+import org.jbpm.AbstractJbpmTestCase;
import org.jbpm.context.def.ContextDefinition;
import org.jbpm.context.exe.ContextInstance;
import org.jbpm.graph.def.ProcessDefinition;
import org.jbpm.graph.exe.ProcessInstance;
import org.jbpm.graph.exe.Token;
-public class ProcessStateTest extends TestCase {
+public class ProcessStateTest extends AbstractJbpmTestCase {
public void testBasicScenario() {
ProcessDefinition superProcessDefinition = ProcessDefinition.parseXmlString(
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/node/TaskNodeTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/node/TaskNodeTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/node/TaskNodeTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -21,12 +21,10 @@
*/
package org.jbpm.graph.node;
-import junit.framework.*;
+import org.jbpm.AbstractJbpmTestCase;
+import org.jbpm.taskmgmt.def.Task;
-import org.jbpm.graph.node.TaskNode;
-import org.jbpm.taskmgmt.def.*;
-
-public class TaskNodeTest extends TestCase {
+public class TaskNodeTest extends AbstractJbpmTestCase {
private TaskNode taskNode = new TaskNode();
private Task laundry = new Task("laundry");
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/instantiation/BeanInstantiatorTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/instantiation/BeanInstantiatorTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/instantiation/BeanInstantiatorTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -21,11 +21,10 @@
*/
package org.jbpm.instantiation;
-import junit.framework.TestCase;
-
import org.dom4j.Element;
+import org.jbpm.AbstractJbpmTestCase;
-public class BeanInstantiatorTest extends TestCase {
+public class BeanInstantiatorTest extends AbstractJbpmTestCase {
public BeanInstantiator beanInstantiator = new BeanInstantiator();
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/instantiation/ConfigurationPropertyInstantiatorTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/instantiation/ConfigurationPropertyInstantiatorTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/instantiation/ConfigurationPropertyInstantiatorTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -21,12 +21,10 @@
*/
package org.jbpm.instantiation;
-import org.jbpm.instantiation.ConfigurationPropertyInstantiator;
+import org.jbpm.AbstractJbpmTestCase;
-import junit.framework.*;
+public class ConfigurationPropertyInstantiatorTest extends AbstractJbpmTestCase {
-public class ConfigurationPropertyInstantiatorTest extends TestCase {
-
public ConfigurationPropertyInstantiator configurationPropertyInstantiator= new ConfigurationPropertyInstantiator();
public static class ConfigurationPropertyClass {
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/instantiation/ConstructorInstantiatorTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/instantiation/ConstructorInstantiatorTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/instantiation/ConstructorInstantiatorTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -21,12 +21,10 @@
*/
package org.jbpm.instantiation;
-import org.jbpm.instantiation.ConstructorInstantiator;
+import org.jbpm.AbstractJbpmTestCase;
-import junit.framework.*;
+public class ConstructorInstantiatorTest extends AbstractJbpmTestCase {
-public class ConstructorInstantiatorTest extends TestCase {
-
public ConstructorInstantiator constructorInstantiator = new ConstructorInstantiator();
public static class StringConstructorClass {
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/instantiation/DefaultInstantiatorTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/instantiation/DefaultInstantiatorTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/instantiation/DefaultInstantiatorTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -21,11 +21,9 @@
*/
package org.jbpm.instantiation;
-import org.jbpm.instantiation.DefaultInstantiator;
+import org.jbpm.AbstractJbpmTestCase;
-import junit.framework.*;
-
-public class DefaultInstantiatorTest extends TestCase {
+public class DefaultInstantiatorTest extends AbstractJbpmTestCase {
public DefaultInstantiator defaultInstantiator = new DefaultInstantiator();
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/instantiation/FieldInstantiatorTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/instantiation/FieldInstantiatorTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/instantiation/FieldInstantiatorTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -35,11 +35,10 @@
import java.util.SortedMap;
import java.util.SortedSet;
-import junit.framework.TestCase;
-
import org.dom4j.Element;
+import org.jbpm.AbstractJbpmTestCase;
-public class FieldInstantiatorTest extends TestCase {
+public class FieldInstantiatorTest extends AbstractJbpmTestCase {
public FieldInstantiator fieldInstantiator = new FieldInstantiator();
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/instantiation/UserCodeInterceptorTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/instantiation/UserCodeInterceptorTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/instantiation/UserCodeInterceptorTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -3,8 +3,7 @@
import java.util.ArrayList;
import java.util.List;
-import junit.framework.TestCase;
-
+import org.jbpm.AbstractJbpmTestCase;
import org.jbpm.context.exe.ContextInstance;
import org.jbpm.graph.def.Action;
import org.jbpm.graph.def.ActionHandler;
@@ -17,7 +16,7 @@
import org.jbpm.taskmgmt.exe.Assignable;
import org.jbpm.taskmgmt.exe.TaskInstance;
-public class UserCodeInterceptorTest extends TestCase {
+public class UserCodeInterceptorTest extends AbstractJbpmTestCase {
static List logs = null;
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm1072/JBPM1072Test.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm1072/JBPM1072Test.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm1072/JBPM1072Test.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -2,6 +2,7 @@
import org.jbpm.EventCallback;
import org.jbpm.JbpmConfiguration;
+import org.jbpm.JbpmConfigurationTestHelper;
import org.jbpm.JbpmContext;
import org.jbpm.db.AbstractDbTestCase;
import org.jbpm.graph.def.ActionHandler;
@@ -53,6 +54,7 @@
@Override
protected JbpmConfiguration getJbpmConfiguration()
{
+ JbpmConfigurationTestHelper.reset();
return JbpmConfiguration.getInstance();
}
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm522/JBPM522Test.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm522/JBPM522Test.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm522/JBPM522Test.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -24,7 +24,6 @@
import java.util.List;
import org.apache.tools.ant.Main;
-
import org.jbpm.db.AbstractDbTestCase;
import org.jbpm.graph.def.ProcessDefinition;
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/job/executor/JobExecutorDbTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/job/executor/JobExecutorDbTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/job/executor/JobExecutorDbTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -6,11 +6,10 @@
import java.util.TimerTask;
import java.util.TreeSet;
-import junit.framework.TestCase;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.hibernate.Session;
+import org.jbpm.AbstractJbpmTestCase;
import org.jbpm.JbpmConfiguration;
import org.jbpm.JbpmContext;
import org.jbpm.graph.def.Action;
@@ -19,7 +18,7 @@
import org.jbpm.graph.exe.ExecutionContext;
import org.jbpm.graph.exe.ProcessInstance;
-public class JobExecutorDbTest extends TestCase
+public class JobExecutorDbTest extends AbstractJbpmTestCase
{
static int nbrOfConcurrentProcessExecutions = 20;
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/el/DecisionExpressionTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/el/DecisionExpressionTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/el/DecisionExpressionTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -1,12 +1,11 @@
package org.jbpm.jpdl.el;
-import junit.framework.TestCase;
-
+import org.jbpm.AbstractJbpmTestCase;
import org.jbpm.JbpmException;
import org.jbpm.graph.def.ProcessDefinition;
import org.jbpm.graph.exe.ProcessInstance;
-public class DecisionExpressionTest extends TestCase
+public class DecisionExpressionTest extends AbstractJbpmTestCase
{
public static class Customer
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/el/ExpressionTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/el/ExpressionTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/el/ExpressionTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -3,8 +3,7 @@
import java.util.HashMap;
import java.util.Map;
-import junit.framework.TestCase;
-
+import org.jbpm.AbstractJbpmTestCase;
import org.jbpm.JbpmException;
import org.jbpm.graph.def.ProcessDefinition;
import org.jbpm.graph.exe.ExecutionContext;
@@ -12,7 +11,7 @@
import org.jbpm.jpdl.el.impl.JbpmExpressionEvaluator;
import org.jbpm.taskmgmt.exe.TaskInstance;
-public class ExpressionTest extends TestCase {
+public class ExpressionTest extends AbstractJbpmTestCase {
public static class MyBean {
public String getAccountNumber() {
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/el/FunctionMapperTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/el/FunctionMapperTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/el/FunctionMapperTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -2,6 +2,7 @@
import java.lang.reflect.Method;
+import org.jbpm.AbstractJbpmTestCase;
import org.jbpm.JbpmConfiguration;
import org.jbpm.JbpmContext;
import org.jbpm.JbpmException;
@@ -9,10 +10,8 @@
import org.jbpm.graph.exe.Token;
import org.jbpm.jpdl.el.impl.JbpmExpressionEvaluator;
-import junit.framework.TestCase;
+public class FunctionMapperTest extends AbstractJbpmTestCase {
-public class FunctionMapperTest extends TestCase {
-
public void testDefault() {
Token token = new Token();
ExecutionContext executionContext = new ExecutionContext(token);
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/el/TaskExpressionTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/el/TaskExpressionTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/el/TaskExpressionTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -4,14 +4,13 @@
import java.util.Iterator;
import java.util.Set;
-import junit.framework.TestCase;
-
+import org.jbpm.AbstractJbpmTestCase;
import org.jbpm.graph.def.ProcessDefinition;
import org.jbpm.graph.exe.ProcessInstance;
import org.jbpm.taskmgmt.exe.PooledActor;
import org.jbpm.taskmgmt.exe.TaskInstance;
-public class TaskExpressionTest extends TestCase {
+public class TaskExpressionTest extends AbstractJbpmTestCase {
public static class Customer {
String salesRepresentative;
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/exe/DecisionConditionsTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/exe/DecisionConditionsTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/exe/DecisionConditionsTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -21,12 +21,11 @@
*/
package org.jbpm.jpdl.exe;
-import junit.framework.TestCase;
-
+import org.jbpm.AbstractJbpmTestCase;
import org.jbpm.graph.def.ProcessDefinition;
import org.jbpm.graph.exe.ProcessInstance;
-public class DecisionConditionsTest extends TestCase {
+public class DecisionConditionsTest extends AbstractJbpmTestCase {
ProcessDefinition processDefinition = ProcessDefinition.parseXmlString(
"<process-definition>" +
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/exe/DecisionExpressionTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/exe/DecisionExpressionTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/exe/DecisionExpressionTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -1,11 +1,10 @@
package org.jbpm.jpdl.exe;
+import org.jbpm.AbstractJbpmTestCase;
import org.jbpm.graph.def.ProcessDefinition;
import org.jbpm.graph.exe.ProcessInstance;
-import junit.framework.TestCase;
-
-public class DecisionExpressionTest extends TestCase {
+public class DecisionExpressionTest extends AbstractJbpmTestCase {
public void testBudgetHignerThenThousand() {
ProcessDefinition processDefinition = ProcessDefinition.parseXmlString(
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/exe/DecisionHandlerTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/exe/DecisionHandlerTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/exe/DecisionHandlerTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -21,14 +21,13 @@
*/
package org.jbpm.jpdl.exe;
-import junit.framework.TestCase;
-
+import org.jbpm.AbstractJbpmTestCase;
import org.jbpm.graph.def.ProcessDefinition;
import org.jbpm.graph.exe.ExecutionContext;
import org.jbpm.graph.exe.ProcessInstance;
import org.jbpm.graph.node.DecisionHandler;
-public class DecisionHandlerTest extends TestCase {
+public class DecisionHandlerTest extends AbstractJbpmTestCase {
public static class LeadEvaluator implements DecisionHandler {
private static final long serialVersionUID = 1L;
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/exe/ForkInLoopTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/exe/ForkInLoopTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/exe/ForkInLoopTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -21,14 +21,13 @@
*/
package org.jbpm.jpdl.exe;
-import junit.framework.TestCase;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.jbpm.AbstractJbpmTestCase;
import org.jbpm.graph.def.ProcessDefinition;
import org.jbpm.graph.exe.ProcessInstance;
-public class ForkInLoopTest extends TestCase {
+public class ForkInLoopTest extends AbstractJbpmTestCase {
public void testCycle() {
ProcessDefinition processDefinition = ProcessDefinition.parseXmlString(
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/par/ProcessLoadedActionHandler.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/par/ProcessLoadedActionHandler.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/par/ProcessLoadedActionHandler.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -21,8 +21,8 @@
*/
package org.jbpm.jpdl.par;
-import org.jbpm.graph.def.*;
-import org.jbpm.graph.exe.*;
+import org.jbpm.graph.def.ActionHandler;
+import org.jbpm.graph.exe.ExecutionContext;
public class ProcessLoadedActionHandler implements ActionHandler {
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp01SequenceTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp01SequenceTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp01SequenceTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -21,8 +21,7 @@
*/
package org.jbpm.jpdl.patterns;
-import junit.framework.TestCase;
-
+import org.jbpm.AbstractJbpmTestCase;
import org.jbpm.graph.def.ProcessDefinition;
import org.jbpm.graph.exe.ProcessInstance;
import org.jbpm.graph.exe.Token;
@@ -30,7 +29,7 @@
/**
* http://is.tm.tue.nl/research/patterns/download/swf/pat_1.swf
*/
-public class Wfp01SequenceTest extends TestCase {
+public class Wfp01SequenceTest extends AbstractJbpmTestCase {
public void testSequence() {
// create a simple definition with 3 states in sequence
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp02ParallelSplitTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp02ParallelSplitTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp02ParallelSplitTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -21,8 +21,7 @@
*/
package org.jbpm.jpdl.patterns;
-import junit.framework.TestCase;
-
+import org.jbpm.AbstractJbpmTestCase;
import org.jbpm.graph.def.ProcessDefinition;
import org.jbpm.graph.exe.ProcessInstance;
import org.jbpm.graph.exe.Token;
@@ -30,7 +29,7 @@
/**
* http://is.tm.tue.nl/research/patterns/download/swf/pat_2.swf
*/
-public class Wfp02ParallelSplitTest extends TestCase {
+public class Wfp02ParallelSplitTest extends AbstractJbpmTestCase {
public void testParallelSplit() {
ProcessDefinition pd = ProcessDefinition.parseXmlString(
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp03SynchronizationTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp03SynchronizationTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp03SynchronizationTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -21,15 +21,15 @@
*/
package org.jbpm.jpdl.patterns;
-import junit.framework.*;
+import org.jbpm.AbstractJbpmTestCase;
+import org.jbpm.graph.def.ProcessDefinition;
+import org.jbpm.graph.exe.ProcessInstance;
+import org.jbpm.graph.exe.Token;
-import org.jbpm.graph.def.*;
-import org.jbpm.graph.exe.*;
-
/**
* http://is.tm.tue.nl/research/patterns/download/swf/pat_3.swf
*/
-public class Wfp03SynchronizationTest extends TestCase {
+public class Wfp03SynchronizationTest extends AbstractJbpmTestCase {
public ProcessDefinition createSynchronizationProcessDefinition() {
ProcessDefinition pd = ProcessDefinition.parseXmlString(
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp04ExclusiveChoiceTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp04ExclusiveChoiceTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp04ExclusiveChoiceTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -21,8 +21,7 @@
*/
package org.jbpm.jpdl.patterns;
-import junit.framework.TestCase;
-
+import org.jbpm.AbstractJbpmTestCase;
import org.jbpm.context.def.ContextDefinition;
import org.jbpm.context.exe.ContextInstance;
import org.jbpm.graph.def.ProcessDefinition;
@@ -49,7 +48,7 @@
* transitions that leave the current state.
* </p>
*/
-public class Wfp04ExclusiveChoiceTest extends TestCase {
+public class Wfp04ExclusiveChoiceTest extends AbstractJbpmTestCase {
static ProcessDefinition exclusiveChoiceProcessDefinition = ProcessDefinition.parseXmlString(
"<process-definition>" +
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp05SimpleMergeTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp05SimpleMergeTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp05SimpleMergeTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -21,11 +21,11 @@
*/
package org.jbpm.jpdl.patterns;
-import junit.framework.*;
+import org.jbpm.AbstractJbpmTestCase;
+import org.jbpm.graph.def.ProcessDefinition;
+import org.jbpm.graph.exe.ProcessInstance;
+import org.jbpm.graph.exe.Token;
-import org.jbpm.graph.def.*;
-import org.jbpm.graph.exe.*;
-
/**
* http://is.tm.tue.nl/research/patterns/download/swf/pat_5.swf
*
@@ -42,7 +42,7 @@
* concurrent paths is demonstrated.
* </p>
*/
-public class Wfp05SimpleMergeTest extends TestCase {
+public class Wfp05SimpleMergeTest extends AbstractJbpmTestCase {
private static ProcessDefinition simpleMergeProcessDefinition = createSimpleMergeProcessDefinition();
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp06MultiChoiceTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp06MultiChoiceTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp06MultiChoiceTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -21,19 +21,20 @@
*/
package org.jbpm.jpdl.patterns;
-import junit.framework.*;
-
-import org.jbpm.context.def.*;
-import org.jbpm.context.exe.*;
+import org.jbpm.AbstractJbpmTestCase;
+import org.jbpm.context.def.ContextDefinition;
+import org.jbpm.context.def.VariableAccess;
+import org.jbpm.context.exe.ContextInstance;
import org.jbpm.graph.action.Script;
-import org.jbpm.graph.def.*;
-import org.jbpm.graph.exe.*;
-import org.jbpm.graph.node.*;
+import org.jbpm.graph.def.ProcessDefinition;
+import org.jbpm.graph.exe.ProcessInstance;
+import org.jbpm.graph.exe.Token;
+import org.jbpm.graph.node.Fork;
/**
* http://is.tm.tue.nl/research/patterns/download/swf/pat_6.swf
*/
-public class Wfp06MultiChoiceTest extends TestCase {
+public class Wfp06MultiChoiceTest extends AbstractJbpmTestCase {
private static ProcessDefinition multiChoiceProcessDefinition = createMultiChoiceProcessDefinition();
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp07SynchronizingMergeTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp07SynchronizingMergeTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp07SynchronizingMergeTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -21,13 +21,12 @@
*/
package org.jbpm.jpdl.patterns;
-import junit.framework.*;
+import org.jbpm.AbstractJbpmTestCase;
+import org.jbpm.graph.def.ProcessDefinition;
+import org.jbpm.graph.exe.Token;
-import org.jbpm.graph.def.*;
-import org.jbpm.graph.exe.*;
+public class Wfp07SynchronizingMergeTest extends AbstractJbpmTestCase {
-public class Wfp07SynchronizingMergeTest extends TestCase {
-
private static ProcessDefinition synchronizingMergeProcessDefinition = createSynchronizingMergeProcessDefinition();
public static ProcessDefinition createSynchronizingMergeProcessDefinition() {
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp08MultiMergeTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp08MultiMergeTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp08MultiMergeTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -21,8 +21,7 @@
*/
package org.jbpm.jpdl.patterns;
-import junit.framework.TestCase;
-
+import org.jbpm.AbstractJbpmTestCase;
import org.jbpm.graph.def.ProcessDefinition;
import org.jbpm.graph.exe.Token;
import org.jbpm.graph.node.Merge;
@@ -30,7 +29,7 @@
/**
* http://is.tm.tue.nl/research/patterns/download/swf/pat_8.swf
*/
-public class Wfp08MultiMergeTest extends TestCase {
+public class Wfp08MultiMergeTest extends AbstractJbpmTestCase {
private static ProcessDefinition multiMergeProcessDefinition = createMultiMergeProcessDefinition();
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp09DiscriminatorTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp09DiscriminatorTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp09DiscriminatorTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -21,8 +21,7 @@
*/
package org.jbpm.jpdl.patterns;
-import junit.framework.TestCase;
-
+import org.jbpm.AbstractJbpmTestCase;
import org.jbpm.graph.def.ProcessDefinition;
import org.jbpm.graph.exe.Token;
import org.jbpm.graph.node.Join;
@@ -30,7 +29,7 @@
/**
* http://is.tm.tue.nl/research/patterns/download/swf/pat_9.swf
*/
-public class Wfp09DiscriminatorTest extends TestCase {
+public class Wfp09DiscriminatorTest extends AbstractJbpmTestCase {
private static ProcessDefinition discriminatorProcessDefinition = createDiscriminatorProcessDefinition();
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp10NOutOfMJoinTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp10NOutOfMJoinTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp10NOutOfMJoinTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -21,12 +21,13 @@
*/
package org.jbpm.jpdl.patterns;
-import junit.framework.*;
-import org.jbpm.graph.def.*;
-import org.jbpm.graph.exe.*;
-import org.jbpm.graph.node.*;
+import org.jbpm.AbstractJbpmTestCase;
+import org.jbpm.graph.def.ProcessDefinition;
+import org.jbpm.graph.exe.ProcessInstance;
+import org.jbpm.graph.exe.Token;
+import org.jbpm.graph.node.Join;
-public class Wfp10NOutOfMJoinTest extends TestCase {
+public class Wfp10NOutOfMJoinTest extends AbstractJbpmTestCase {
private static ProcessDefinition nOutOfMProcessDefinition = createNOutOfMProcessDefinition();
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp11ArbitraryCyclesTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp11ArbitraryCyclesTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp11ArbitraryCyclesTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -21,15 +21,15 @@
*/
package org.jbpm.jpdl.patterns;
-import junit.framework.*;
+import org.jbpm.AbstractJbpmTestCase;
+import org.jbpm.graph.def.ProcessDefinition;
+import org.jbpm.graph.exe.ProcessInstance;
+import org.jbpm.graph.exe.Token;
-import org.jbpm.graph.def.*;
-import org.jbpm.graph.exe.*;
-
/**
* http://is.tm.tue.nl/research/patterns/download/swf/pat_10.swf
*/
-public class Wfp11ArbitraryCyclesTest extends TestCase {
+public class Wfp11ArbitraryCyclesTest extends AbstractJbpmTestCase {
private static ProcessDefinition arbitraryCycleProcessDefinition = createArbitraryCycleProcessDefinition();
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp12ImplicitTerminationTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp12ImplicitTerminationTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp12ImplicitTerminationTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -21,17 +21,17 @@
*/
package org.jbpm.jpdl.patterns;
-import junit.framework.*;
+import org.jbpm.AbstractJbpmTestCase;
+import org.jbpm.graph.def.ProcessDefinition;
+import org.jbpm.graph.exe.ProcessInstance;
+import org.jbpm.graph.exe.Token;
-import org.jbpm.graph.def.*;
-import org.jbpm.graph.exe.*;
-
/**
* http://is.tm.tue.nl/research/patterns/download/swf/pat_11.swf
*
* Must the implicit termination be based on states only or also on tasks ?
*/
-public class Wfp12ImplicitTerminationTest extends TestCase {
+public class Wfp12ImplicitTerminationTest extends AbstractJbpmTestCase {
private static ProcessDefinition implicitTerminationProcessDefinition = createImplicitTerminationDefinition();
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp13MiWithoutSynchronizationTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp13MiWithoutSynchronizationTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp13MiWithoutSynchronizationTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -21,8 +21,7 @@
*/
package org.jbpm.jpdl.patterns;
-import junit.framework.TestCase;
-
+import org.jbpm.AbstractJbpmTestCase;
import org.jbpm.graph.def.ActionHandler;
import org.jbpm.graph.def.ProcessDefinition;
import org.jbpm.graph.exe.ExecutionContext;
@@ -37,7 +36,7 @@
* actually this is a combination of unsynchronized tasks and
* runtime calculation of the tasks.
*/
-public class Wfp13MiWithoutSynchronizationTest extends TestCase {
+public class Wfp13MiWithoutSynchronizationTest extends AbstractJbpmTestCase {
private ProcessDefinition pd = null;
private ProcessInstance pi = null;
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp14MiWithAPrioriDesigntimeKnowledgeTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp14MiWithAPrioriDesigntimeKnowledgeTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp14MiWithAPrioriDesigntimeKnowledgeTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -24,8 +24,7 @@
import java.util.ArrayList;
import java.util.List;
-import junit.framework.TestCase;
-
+import org.jbpm.AbstractJbpmTestCase;
import org.jbpm.graph.def.ProcessDefinition;
import org.jbpm.graph.exe.ProcessInstance;
import org.jbpm.graph.exe.Token;
@@ -35,7 +34,7 @@
/**
* http://is.tm.tue.nl/research/patterns/download/swf/pat_13.swf
*/
-public class Wfp14MiWithAPrioriDesigntimeKnowledgeTest extends TestCase {
+public class Wfp14MiWithAPrioriDesigntimeKnowledgeTest extends AbstractJbpmTestCase {
public void testSituation1() {
ProcessDefinition pd = ProcessDefinition.parseXmlString(
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp15MiWithAPrioriRuntimeKnowledgeTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp15MiWithAPrioriRuntimeKnowledgeTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp15MiWithAPrioriRuntimeKnowledgeTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -21,8 +21,7 @@
*/
package org.jbpm.jpdl.patterns;
-import junit.framework.TestCase;
-
+import org.jbpm.AbstractJbpmTestCase;
import org.jbpm.graph.def.ActionHandler;
import org.jbpm.graph.def.Node;
import org.jbpm.graph.def.ProcessDefinition;
@@ -37,7 +36,7 @@
/**
* http://is.tm.tue.nl/research/patterns/download/swf/pat_14.swf
*/
-public class Wfp15MiWithAPrioriRuntimeKnowledgeTest extends TestCase {
+public class Wfp15MiWithAPrioriRuntimeKnowledgeTest extends AbstractJbpmTestCase {
public static int scenario = -1;
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp16MiWithoutAPrioriRuntimeKnowledgeTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp16MiWithoutAPrioriRuntimeKnowledgeTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp16MiWithoutAPrioriRuntimeKnowledgeTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -21,8 +21,7 @@
*/
package org.jbpm.jpdl.patterns;
-import junit.framework.TestCase;
-
+import org.jbpm.AbstractJbpmTestCase;
import org.jbpm.graph.def.ActionHandler;
import org.jbpm.graph.def.Node;
import org.jbpm.graph.def.ProcessDefinition;
@@ -37,7 +36,7 @@
/**
* http://is.tm.tue.nl/research/patterns/download/swf/pat_15.swf
*/
-public class Wfp16MiWithoutAPrioriRuntimeKnowledgeTest extends TestCase {
+public class Wfp16MiWithoutAPrioriRuntimeKnowledgeTest extends AbstractJbpmTestCase {
public static int scenario = -1;
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp17DeferredChoiceTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp17DeferredChoiceTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp17DeferredChoiceTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -21,15 +21,15 @@
*/
package org.jbpm.jpdl.patterns;
-import junit.framework.*;
+import org.jbpm.AbstractJbpmTestCase;
+import org.jbpm.graph.def.ProcessDefinition;
+import org.jbpm.graph.exe.ProcessInstance;
+import org.jbpm.graph.exe.Token;
-import org.jbpm.graph.def.*;
-import org.jbpm.graph.exe.*;
-
/**
* http://is.tm.tue.nl/research/patterns/download/swf/pat_16.swf
*/
-public class Wfp17DeferredChoiceTest extends TestCase {
+public class Wfp17DeferredChoiceTest extends AbstractJbpmTestCase {
public static ProcessDefinition deferredChoiceProcessDefinition = createDeferredChoiceProcessDefinition();
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp18InterleavedParallelRoutingTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp18InterleavedParallelRoutingTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp18InterleavedParallelRoutingTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -23,8 +23,7 @@
import java.util.Collection;
-import junit.framework.TestCase;
-
+import org.jbpm.AbstractJbpmTestCase;
import org.jbpm.graph.def.ProcessDefinition;
import org.jbpm.graph.exe.ProcessInstance;
import org.jbpm.graph.exe.Token;
@@ -34,7 +33,7 @@
/**
* http://is.tm.tue.nl/research/patterns/download/swf/pat_17.swf
*/
-public class Wfp18InterleavedParallelRoutingTest extends TestCase {
+public class Wfp18InterleavedParallelRoutingTest extends AbstractJbpmTestCase {
private int scenario = -1;
private ProcessDefinition processDefinition = ProcessDefinition.parseXmlString(
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp19MilestoneTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp19MilestoneTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp19MilestoneTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -21,16 +21,19 @@
*/
package org.jbpm.jpdl.patterns;
-import junit.framework.*;
+import org.jbpm.AbstractJbpmTestCase;
+import org.jbpm.context.def.ContextDefinition;
+import org.jbpm.graph.def.Action;
+import org.jbpm.graph.def.Event;
+import org.jbpm.graph.def.Node;
+import org.jbpm.graph.def.ProcessDefinition;
+import org.jbpm.graph.exe.ProcessInstance;
+import org.jbpm.graph.exe.Token;
+import org.jbpm.graph.node.MilestoneEvent;
+import org.jbpm.instantiation.Delegation;
-import org.jbpm.context.def.*;
-import org.jbpm.graph.def.*;
-import org.jbpm.graph.exe.*;
-import org.jbpm.graph.node.*;
-import org.jbpm.instantiation.*;
+public class Wfp19MilestoneTest extends AbstractJbpmTestCase {
-public class Wfp19MilestoneTest extends TestCase {
-
public static ProcessDefinition milestoneProcessDefinition = createMilestoneProcessDefinition();
public static ProcessDefinition createMilestoneProcessDefinition() {
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp20CancelActivityTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp20CancelActivityTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp20CancelActivityTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -21,12 +21,12 @@
*/
package org.jbpm.jpdl.patterns;
-import junit.framework.*;
+import org.jbpm.AbstractJbpmTestCase;
+import org.jbpm.graph.def.ProcessDefinition;
+import org.jbpm.graph.exe.ProcessInstance;
+import org.jbpm.graph.exe.Token;
-import org.jbpm.graph.def.*;
-import org.jbpm.graph.exe.*;
-
-public class Wfp20CancelActivityTest extends TestCase {
+public class Wfp20CancelActivityTest extends AbstractJbpmTestCase {
public static ProcessDefinition cancelProcessDefinition = createCancelProcessDefinition();
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp21CancelCaseTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp21CancelCaseTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/patterns/Wfp21CancelCaseTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -21,13 +21,13 @@
*/
package org.jbpm.jpdl.patterns;
-import junit.framework.*;
+import org.jbpm.AbstractJbpmTestCase;
+import org.jbpm.graph.def.ProcessDefinition;
+import org.jbpm.graph.exe.ProcessInstance;
+import org.jbpm.graph.exe.Token;
-import org.jbpm.graph.def.*;
-import org.jbpm.graph.exe.*;
+public class Wfp21CancelCaseTest extends AbstractJbpmTestCase {
-public class Wfp21CancelCaseTest extends TestCase {
-
public void testCancelActivityScenario2() {
ProcessDefinition pd = Wfp20CancelActivityTest.cancelProcessDefinition;
ProcessInstance pi = new ProcessInstance(pd);
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/xml/AbstractXmlTestCase.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/xml/AbstractXmlTestCase.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/xml/AbstractXmlTestCase.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -21,17 +21,16 @@
*/
package org.jbpm.jpdl.xml;
-import java.io.*;
-
+import java.io.StringWriter;
import java.util.HashMap;
-import junit.framework.*;
+import org.dom4j.DocumentHelper;
+import org.dom4j.Element;
+import org.dom4j.XPath;
+import org.jbpm.AbstractJbpmTestCase;
+import org.jbpm.graph.def.ProcessDefinition;
-import org.dom4j.*;
-
-import org.jbpm.graph.def.*;
-
-public abstract class AbstractXmlTestCase extends TestCase {
+public abstract class AbstractXmlTestCase extends AbstractJbpmTestCase {
// private static final String JPDL_NAMESPACE = "http://jbpm.org/3/jpdl";
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/xml/NodeXmlTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/xml/NodeXmlTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/xml/NodeXmlTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -21,9 +21,11 @@
*/
package org.jbpm.jpdl.xml;
-import org.dom4j.*;
-import org.jbpm.graph.def.*;
+import org.dom4j.Element;
+import org.jbpm.graph.def.Event;
import org.jbpm.graph.def.Node;
+import org.jbpm.graph.def.ProcessDefinition;
+import org.jbpm.graph.def.Transition;
public class NodeXmlTest extends AbstractXmlTestCase {
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/xml/ProcessDefinitionXmlTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/xml/ProcessDefinitionXmlTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/xml/ProcessDefinitionXmlTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -23,8 +23,8 @@
import java.util.List;
-import org.dom4j.*;
-import org.jbpm.graph.def.*;
+import org.dom4j.Element;
+import org.jbpm.graph.def.ProcessDefinition;
import org.jbpm.graph.node.EndState;
import org.jbpm.graph.node.StartState;
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/xml/SchemaTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/xml/SchemaTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/xml/SchemaTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -10,10 +10,9 @@
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
-import junit.framework.TestCase;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.jbpm.AbstractJbpmTestCase;
import org.jbpm.util.XmlUtil;
import org.w3c.dom.Document;
import org.xml.sax.EntityResolver;
@@ -22,7 +21,7 @@
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
-public class SchemaTest extends TestCase
+public class SchemaTest extends AbstractJbpmTestCase
{
private static Log log = LogFactory.getLog(SchemaTest.class);
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/xml/StartStateXmlTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/xml/StartStateXmlTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/xml/StartStateXmlTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -21,8 +21,8 @@
*/
package org.jbpm.jpdl.xml;
-import org.dom4j.*;
-import org.jbpm.graph.def.*;
+import org.dom4j.Element;
+import org.jbpm.graph.def.ProcessDefinition;
import org.jbpm.graph.node.StartState;
public class StartStateXmlTest extends AbstractXmlTestCase {
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/xml/StateXmlTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/xml/StateXmlTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/xml/StateXmlTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -21,9 +21,9 @@
*/
package org.jbpm.jpdl.xml;
-import org.dom4j.*;
-import org.jbpm.graph.def.*;
-import org.jbpm.graph.node.*;
+import org.dom4j.Element;
+import org.jbpm.graph.def.ProcessDefinition;
+import org.jbpm.graph.node.State;
public class StateXmlTest extends AbstractXmlTestCase {
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/xml/SuperStateXmlTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/xml/SuperStateXmlTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/xml/SuperStateXmlTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -23,9 +23,9 @@
import java.io.StringReader;
-import junit.framework.TestCase;
+import org.jbpm.AbstractJbpmTestCase;
-public class SuperStateXmlTest extends TestCase {
+public class SuperStateXmlTest extends AbstractJbpmTestCase {
public void testJpdlXmlReader() {
JpdlXmlReader jpdlXmlReader = new JpdlXmlReader(new StringReader(
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/xml/TaskControllerXmlTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/xml/TaskControllerXmlTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/xml/TaskControllerXmlTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -23,8 +23,7 @@
import java.util.List;
-import junit.framework.TestCase;
-
+import org.jbpm.AbstractJbpmTestCase;
import org.jbpm.context.def.Access;
import org.jbpm.context.def.VariableAccess;
import org.jbpm.graph.def.ProcessDefinition;
@@ -33,7 +32,7 @@
import org.jbpm.taskmgmt.def.Task;
import org.jbpm.taskmgmt.def.TaskController;
-public class TaskControllerXmlTest extends TestCase {
+public class TaskControllerXmlTest extends AbstractJbpmTestCase {
public void testTaskControllerWithVariableAccesses() {
ProcessDefinition processDefinition = ProcessDefinition.parseXmlString(
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/xml/TaskNodeXmlTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/xml/TaskNodeXmlTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/xml/TaskNodeXmlTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -21,8 +21,7 @@
*/
package org.jbpm.jpdl.xml;
-import junit.framework.TestCase;
-
+import org.jbpm.AbstractJbpmTestCase;
import org.jbpm.graph.def.Event;
import org.jbpm.graph.def.ProcessDefinition;
import org.jbpm.graph.node.TaskNode;
@@ -32,7 +31,7 @@
import org.jbpm.taskmgmt.def.Task;
import org.jbpm.taskmgmt.def.TaskMgmtDefinition;
-public class TaskNodeXmlTest extends TestCase {
+public class TaskNodeXmlTest extends AbstractJbpmTestCase {
public void testTaskNodeName() {
ProcessDefinition processDefinition = ProcessDefinition.parseXmlString(
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/xml/TimerValidatingXmlTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/xml/TimerValidatingXmlTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/xml/TimerValidatingXmlTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -21,14 +21,13 @@
*/
package org.jbpm.jpdl.xml;
-import junit.framework.TestCase;
-
+import org.jbpm.AbstractJbpmTestCase;
import org.jbpm.graph.action.Script;
import org.jbpm.graph.def.ProcessDefinition;
import org.jbpm.scheduler.def.CancelTimerAction;
import org.jbpm.scheduler.def.CreateTimerAction;
-public class TimerValidatingXmlTest extends TestCase {
+public class TimerValidatingXmlTest extends AbstractJbpmTestCase {
private static final String schemaNamespace = "xmlns=\"urn:jbpm.org:jpdl-3.2\"";
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/xml/TimerXmlTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/xml/TimerXmlTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/xml/TimerXmlTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -21,14 +21,13 @@
*/
package org.jbpm.jpdl.xml;
-import junit.framework.TestCase;
-
+import org.jbpm.AbstractJbpmTestCase;
import org.jbpm.graph.action.Script;
import org.jbpm.graph.def.ProcessDefinition;
import org.jbpm.scheduler.def.CancelTimerAction;
import org.jbpm.scheduler.def.CreateTimerAction;
-public class TimerXmlTest extends TestCase {
+public class TimerXmlTest extends AbstractJbpmTestCase {
public void testTimerCreateAction() {
ProcessDefinition processDefinition = ProcessDefinition.parseXmlString(
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/xml/TransitionXmlTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/xml/TransitionXmlTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/xml/TransitionXmlTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -21,9 +21,10 @@
*/
package org.jbpm.jpdl.xml;
-import org.dom4j.*;
-import org.jbpm.graph.def.*;
+import org.dom4j.Element;
import org.jbpm.graph.def.Node;
+import org.jbpm.graph.def.ProcessDefinition;
+import org.jbpm.graph.def.Transition;
public class TransitionXmlTest extends AbstractXmlTestCase {
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/xml/XmlSchemaTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/xml/XmlSchemaTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/xml/XmlSchemaTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -23,12 +23,11 @@
import java.util.List;
-import junit.framework.TestCase;
-
+import org.jbpm.AbstractJbpmTestCase;
import org.jbpm.graph.def.ProcessDefinition;
import org.jbpm.jpdl.JpdlException;
-public class XmlSchemaTest extends TestCase {
+public class XmlSchemaTest extends AbstractJbpmTestCase {
/**
* parses the xml file in the subdir 'files' that corresponds
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/logging/exe/CompositeLogTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/logging/exe/CompositeLogTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/logging/exe/CompositeLogTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -21,8 +21,7 @@
*/
package org.jbpm.logging.exe;
-import junit.framework.TestCase;
-
+import org.jbpm.AbstractJbpmTestCase;
import org.jbpm.graph.def.ProcessDefinition;
import org.jbpm.graph.exe.ProcessInstance;
import org.jbpm.graph.exe.Token;
@@ -30,7 +29,7 @@
import org.jbpm.logging.log.MessageLog;
import org.jbpm.logging.log.ProcessLog;
-public class CompositeLogTest extends TestCase {
+public class CompositeLogTest extends AbstractJbpmTestCase {
public void testCompositeLogs() {
ProcessDefinition processDefinition = new ProcessDefinition();
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/logging/exe/LogLogTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/logging/exe/LogLogTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/logging/exe/LogLogTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -21,8 +21,7 @@
*/
package org.jbpm.logging.exe;
-import junit.framework.TestCase;
-
+import org.jbpm.AbstractJbpmTestCase;
import org.jbpm.context.def.ContextDefinition;
import org.jbpm.context.exe.ContextInstance;
import org.jbpm.graph.def.ActionHandler;
@@ -31,7 +30,7 @@
import org.jbpm.graph.exe.ProcessInstance;
import org.jbpm.logging.log.MessageLog;
-public class LogLogTest extends TestCase {
+public class LogLogTest extends AbstractJbpmTestCase {
public static class MessageAction implements ActionHandler {
private static final long serialVersionUID = 1L;
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/logging/log/ProcessLogDbTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/logging/log/ProcessLogDbTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/logging/log/ProcessLogDbTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -21,13 +21,12 @@
*/
package org.jbpm.logging.log;
-import org.jbpm.util.DateDbTestUtil;
-
import java.util.Date;
import java.util.Iterator;
import org.jbpm.db.AbstractDbTestCase;
import org.jbpm.graph.exe.Token;
+import org.jbpm.util.DateDbTestUtil;
public class ProcessLogDbTest extends AbstractDbTestCase {
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/mail/MailTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/mail/MailTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/mail/MailTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -3,21 +3,18 @@
import java.util.Arrays;
import java.util.Iterator;
-import junit.framework.TestCase;
-
+import org.jbpm.AbstractJbpmTestCase;
import org.jbpm.JbpmConfiguration;
import org.jbpm.JbpmContext;
import org.jbpm.graph.def.ProcessDefinition;
import org.jbpm.graph.exe.ProcessInstance;
-import org.jbpm.mail.AddressResolver;
-import org.jbpm.mail.Mail;
import org.jbpm.taskmgmt.def.Swimlane;
import org.jbpm.taskmgmt.exe.SwimlaneInstance;
import com.dumbster.smtp.SimpleSmtpServer;
import com.dumbster.smtp.SmtpMessage;
-public class MailTest extends TestCase {
+public class MailTest extends AbstractJbpmTestCase {
public static class TestAddressResolver implements AddressResolver {
private static final long serialVersionUID = 1L;
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/mail/RealServerMailTestCase.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/mail/RealServerMailTestCase.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/mail/RealServerMailTestCase.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -1,7 +1,6 @@
package org.jbpm.mail;
-import junit.framework.TestCase;
-
+import org.jbpm.AbstractJbpmTestCase;
import org.jbpm.JbpmConfiguration;
import org.jbpm.JbpmContext;
import org.jbpm.graph.def.ProcessDefinition;
@@ -9,7 +8,7 @@
import org.jbpm.svc.Service;
import org.jbpm.svc.ServiceFactory;
-public class RealServerMailTestCase extends TestCase {
+public class RealServerMailTestCase extends AbstractJbpmTestCase {
public static class TestAddressResolver implements AddressResolver, ServiceFactory, Service {
private static final long serialVersionUID = 1L;
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/mail/TaskMailTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/mail/TaskMailTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/mail/TaskMailTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -4,8 +4,7 @@
import java.util.Iterator;
import java.util.List;
-import junit.framework.TestCase;
-
+import org.jbpm.AbstractJbpmTestCase;
import org.jbpm.JbpmConfiguration;
import org.jbpm.JbpmContext;
import org.jbpm.graph.def.ProcessDefinition;
@@ -13,8 +12,8 @@
import org.jbpm.graph.exe.ProcessInstance;
import org.jbpm.graph.exe.Token;
import org.jbpm.instantiation.Delegation;
-import org.jbpm.scheduler.SchedulerService;
import org.jbpm.job.Timer;
+import org.jbpm.scheduler.SchedulerService;
import org.jbpm.svc.Service;
import org.jbpm.svc.ServiceFactory;
import org.jbpm.taskmgmt.def.AssignmentHandler;
@@ -25,7 +24,7 @@
import com.dumbster.smtp.SimpleSmtpServer;
import com.dumbster.smtp.SmtpMessage;
-public class TaskMailTest extends TestCase {
+public class TaskMailTest extends AbstractJbpmTestCase {
static JbpmConfiguration jbpmConfiguration = JbpmConfiguration.parseXmlString(
"<jbpm-configuration>" +
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/mock/JdbcProxyTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/mock/JdbcProxyTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/mock/JdbcProxyTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -22,11 +22,12 @@
package org.jbpm.mock;
import java.sql.Connection;
+
import javax.sql.DataSource;
-import junit.framework.TestCase;
+import org.jbpm.AbstractJbpmTestCase;
-public class JdbcProxyTest extends TestCase {
+public class JdbcProxyTest extends AbstractJbpmTestCase {
public void testProxy() throws Exception {
DataSource dataSource = Jdbc.createRecordedDataSource();
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/perf/AbstractPerfTestCase.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/perf/AbstractPerfTestCase.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/perf/AbstractPerfTestCase.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -21,13 +21,12 @@
*/
package org.jbpm.perf;
-import junit.framework.TestCase;
-
+import org.jbpm.AbstractJbpmTestCase;
import org.jbpm.JbpmConfiguration;
import org.jbpm.JbpmContext;
import org.jbpm.graph.def.ProcessDefinition;
-public abstract class AbstractPerfTestCase extends TestCase {
+public abstract class AbstractPerfTestCase extends AbstractJbpmTestCase {
static JbpmConfiguration jbpmConfiguration = JbpmConfiguration.getInstance();
static {
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/perf/PerfWithoutDbTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/perf/PerfWithoutDbTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/perf/PerfWithoutDbTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -4,8 +4,7 @@
import java.io.PrintWriter;
import java.util.Collection;
-import junit.framework.TestCase;
-
+import org.jbpm.AbstractJbpmTestCase;
import org.jbpm.JbpmConfiguration;
import org.jbpm.JbpmContext;
import org.jbpm.graph.def.ProcessDefinition;
@@ -13,7 +12,7 @@
import org.jbpm.graph.exe.Token;
import org.jbpm.taskmgmt.exe.TaskInstance;
-public class PerfWithoutDbTest extends TestCase
+public class PerfWithoutDbTest extends AbstractJbpmTestCase
{
JbpmConfiguration jbpmConfiguration = JbpmConfiguration.parseXmlString("<jbpm-configuration><jbpm-context /></jbpm-configuration>");
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/persistence/db/MockSession.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/persistence/db/MockSession.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/persistence/db/MockSession.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -18,7 +18,6 @@
import org.hibernate.SQLQuery;
import org.hibernate.Session;
import org.hibernate.SessionFactory;
-import org.hibernate.StaleStateException;
import org.hibernate.Transaction;
import org.hibernate.stat.SessionStatistics;
import org.hibernate.type.Type;
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/persistence/db/PersistenceConfigurationDbTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/persistence/db/PersistenceConfigurationDbTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/persistence/db/PersistenceConfigurationDbTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -21,12 +21,11 @@
*/
package org.jbpm.persistence.db;
-import junit.framework.TestCase;
-
+import org.jbpm.AbstractJbpmTestCase;
import org.jbpm.JbpmConfiguration;
import org.jbpm.JbpmContext;
-public class PersistenceConfigurationDbTest extends TestCase {
+public class PersistenceConfigurationDbTest extends AbstractJbpmTestCase {
public void testDisableHibernateTransactions() {
JbpmConfiguration jbpmConfiguration = JbpmConfiguration.parseXmlString(
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/persistence/db/PersistenceConfigurationTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/persistence/db/PersistenceConfigurationTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/persistence/db/PersistenceConfigurationTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -1,11 +1,10 @@
package org.jbpm.persistence.db;
+import org.jbpm.AbstractJbpmTestCase;
import org.jbpm.JbpmConfiguration;
-import junit.framework.TestCase;
+public class PersistenceConfigurationTest extends AbstractJbpmTestCase {
-public class PersistenceConfigurationTest extends TestCase {
-
public void testDbPersistenceConfigurationDefault() {
JbpmConfiguration jbpmConfiguration = JbpmConfiguration.parseXmlString(
"<jbpm-configuration>" +
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/persistence/db/PersistenceDbServiceNoTxTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/persistence/db/PersistenceDbServiceNoTxTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/persistence/db/PersistenceDbServiceNoTxTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -2,14 +2,13 @@
import java.sql.Connection;
-import junit.framework.TestCase;
-
+import org.jbpm.AbstractJbpmTestCase;
import org.jbpm.JbpmConfiguration;
import org.jbpm.JbpmContext;
import org.jbpm.JbpmException;
import org.jbpm.persistence.JbpmPersistenceException;
-public class PersistenceDbServiceNoTxTest extends TestCase {
+public class PersistenceDbServiceNoTxTest extends AbstractJbpmTestCase {
JbpmConfiguration jbpmConfiguration = null;
JbpmContext jbpmContext = null;
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/persistence/db/PersistenceDbServiceTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/persistence/db/PersistenceDbServiceTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/persistence/db/PersistenceDbServiceTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -2,12 +2,11 @@
import java.sql.Connection;
-import junit.framework.TestCase;
-
+import org.jbpm.AbstractJbpmTestCase;
import org.jbpm.JbpmConfiguration;
import org.jbpm.JbpmContext;
-public class PersistenceDbServiceTest extends TestCase {
+public class PersistenceDbServiceTest extends AbstractJbpmTestCase {
JbpmConfiguration jbpmConfiguration = null;
JbpmContext jbpmContext = null;
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/persistence/db/PersistenceServiceDbTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/persistence/db/PersistenceServiceDbTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/persistence/db/PersistenceServiceDbTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -26,10 +26,9 @@
import javax.sql.DataSource;
-import junit.framework.TestCase;
-
import org.hibernate.Session;
import org.hibernate.SessionFactory;
+import org.jbpm.AbstractJbpmTestCase;
import org.jbpm.JbpmConfiguration;
import org.jbpm.JbpmContext;
import org.jbpm.JbpmException;
@@ -38,7 +37,7 @@
import org.jbpm.mock.Recorded;
import org.jbpm.svc.Services;
-public class PersistenceServiceDbTest extends TestCase {
+public class PersistenceServiceDbTest extends AbstractJbpmTestCase {
public void testDefaults() throws Exception {
JbpmConfiguration jbpmConfiguration = JbpmConfiguration.getInstance();
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/persistence/db/PersistenceServiceFactoryDbTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/persistence/db/PersistenceServiceFactoryDbTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/persistence/db/PersistenceServiceFactoryDbTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -23,15 +23,14 @@
import javax.sql.DataSource;
-import junit.framework.TestCase;
-
import org.hibernate.SessionFactory;
import org.hibernate.cfg.Configuration;
+import org.jbpm.AbstractJbpmTestCase;
import org.jbpm.graph.exe.Token;
import org.jbpm.mock.Jdbc;
import org.jbpm.mock.Jndi;
-public class PersistenceServiceFactoryDbTest extends TestCase {
+public class PersistenceServiceFactoryDbTest extends AbstractJbpmTestCase {
public void setUp() throws Exception
{
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/seam/SeamPageFlowTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/seam/SeamPageFlowTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/seam/SeamPageFlowTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -24,8 +24,7 @@
import java.io.Serializable;
import java.util.Collection;
-import junit.framework.TestCase;
-
+import org.jbpm.AbstractJbpmTestCase;
import org.jbpm.context.exe.ContextInstance;
import org.jbpm.graph.def.ProcessDefinition;
import org.jbpm.graph.exe.ProcessInstance;
@@ -33,7 +32,7 @@
import org.jbpm.graph.node.Page;
import org.jbpm.taskmgmt.exe.TaskInstance;
-public class SeamPageFlowTest extends TestCase {
+public class SeamPageFlowTest extends AbstractJbpmTestCase {
public static class Document implements Serializable {
private static final long serialVersionUID = 1L;
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/svc/CloseSequenceTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/svc/CloseSequenceTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/svc/CloseSequenceTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -24,16 +24,15 @@
import java.util.ArrayList;
import java.util.List;
+import org.jbpm.AbstractJbpmTestCase;
import org.jbpm.JbpmConfiguration;
import org.jbpm.JbpmContext;
-import junit.framework.TestCase;
-
/**
* this test verifies that services are closed in the
* order as they are specified in the jbpmConfiguration (=jbpm.cfg.xml)
*/
-public class CloseSequenceTest extends TestCase {
+public class CloseSequenceTest extends AbstractJbpmTestCase {
static List closedServices = null;
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/svc/ServicesTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/svc/ServicesTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/svc/ServicesTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -26,8 +26,7 @@
import java.util.HashMap;
import java.util.Map;
-import junit.framework.TestCase;
-
+import org.jbpm.AbstractJbpmTestCase;
import org.jbpm.db.ContextSession;
import org.jbpm.db.GraphSession;
import org.jbpm.db.JobSession;
@@ -46,7 +45,7 @@
import org.jbpm.security.AuthorizationService;
import org.jbpm.security.authentication.DefaultAuthenticationService;
-public class ServicesTest extends TestCase {
+public class ServicesTest extends AbstractJbpmTestCase {
public void testUnavailableServiceFactory() {
Map serviceFactories = new HashMap();
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/taskmgmt/def/SwimlaneTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/taskmgmt/def/SwimlaneTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/taskmgmt/def/SwimlaneTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -21,9 +21,9 @@
*/
package org.jbpm.taskmgmt.def;
-import junit.framework.*;
+import org.jbpm.AbstractJbpmTestCase;
-public class SwimlaneTest extends TestCase {
+public class SwimlaneTest extends AbstractJbpmTestCase {
private Swimlane buyer = new Swimlane("buyer");
private Task laundry = new Task("laundry");
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/taskmgmt/def/TaskMgmtDefinitionDbTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/taskmgmt/def/TaskMgmtDefinitionDbTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/taskmgmt/def/TaskMgmtDefinitionDbTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -21,8 +21,8 @@
*/
package org.jbpm.taskmgmt.def;
-import org.jbpm.db.*;
-import org.jbpm.graph.def.*;
+import org.jbpm.db.AbstractDbTestCase;
+import org.jbpm.graph.def.ProcessDefinition;
public class TaskMgmtDefinitionDbTest extends AbstractDbTestCase {
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/taskmgmt/def/TaskMgmtDefinitionTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/taskmgmt/def/TaskMgmtDefinitionTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/taskmgmt/def/TaskMgmtDefinitionTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -21,9 +21,9 @@
*/
package org.jbpm.taskmgmt.def;
-import junit.framework.*;
+import org.jbpm.AbstractJbpmTestCase;
-public class TaskMgmtDefinitionTest extends TestCase {
+public class TaskMgmtDefinitionTest extends AbstractJbpmTestCase {
TaskMgmtDefinition taskMgmtDefinition = new TaskMgmtDefinition();
Swimlane buyer = new Swimlane("buyer");
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/taskmgmt/exe/RuntimeTaskCreationTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/taskmgmt/exe/RuntimeTaskCreationTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/taskmgmt/exe/RuntimeTaskCreationTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -23,8 +23,7 @@
import java.util.Iterator;
-import junit.framework.TestCase;
-
+import org.jbpm.AbstractJbpmTestCase;
import org.jbpm.graph.def.ActionHandler;
import org.jbpm.graph.def.ProcessDefinition;
import org.jbpm.graph.exe.ExecutionContext;
@@ -33,7 +32,7 @@
import org.jbpm.graph.node.TaskNode;
import org.jbpm.taskmgmt.def.Task;
-public class RuntimeTaskCreationTest extends TestCase {
+public class RuntimeTaskCreationTest extends AbstractJbpmTestCase {
public static class CreateTasks implements ActionHandler {
private static final long serialVersionUID = 1L;
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/taskmgmt/exe/StartTaskTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/taskmgmt/exe/StartTaskTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/taskmgmt/exe/StartTaskTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -1,12 +1,11 @@
package org.jbpm.taskmgmt.exe;
+import org.jbpm.AbstractJbpmTestCase;
import org.jbpm.graph.def.ProcessDefinition;
import org.jbpm.graph.exe.ProcessInstance;
-import junit.framework.TestCase;
+public class StartTaskTest extends AbstractJbpmTestCase {
-public class StartTaskTest extends TestCase {
-
public void testStartTaskPresent() {
ProcessDefinition processDefinition = ProcessDefinition.parseXmlString(
"<process-definition>" +
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/taskmgmt/exe/SwimlaneTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/taskmgmt/exe/SwimlaneTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/taskmgmt/exe/SwimlaneTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -27,8 +27,7 @@
import java.util.List;
import java.util.Set;
-import junit.framework.TestCase;
-
+import org.jbpm.AbstractJbpmTestCase;
import org.jbpm.JbpmConfiguration;
import org.jbpm.JbpmContext;
import org.jbpm.graph.def.ProcessDefinition;
@@ -37,7 +36,7 @@
import org.jbpm.graph.exe.Token;
import org.jbpm.taskmgmt.def.AssignmentHandler;
-public class SwimlaneTest extends TestCase {
+public class SwimlaneTest extends AbstractJbpmTestCase {
static JbpmConfiguration jbpmConfiguration = JbpmConfiguration.getInstance("org/jbpm/jbpm.test.cfg.xml");
static int invocationCount = 0;
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/taskmgmt/exe/TaskAssignmentTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/taskmgmt/exe/TaskAssignmentTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/taskmgmt/exe/TaskAssignmentTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -28,8 +28,7 @@
import java.util.List;
import java.util.Set;
-import junit.framework.TestCase;
-
+import org.jbpm.AbstractJbpmTestCase;
import org.jbpm.JbpmConfiguration;
import org.jbpm.JbpmContext;
import org.jbpm.graph.def.ActionHandler;
@@ -38,7 +37,7 @@
import org.jbpm.graph.exe.ProcessInstance;
import org.jbpm.taskmgmt.def.AssignmentHandler;
-public class TaskAssignmentTest extends TestCase {
+public class TaskAssignmentTest extends AbstractJbpmTestCase {
static JbpmConfiguration jbpmConfiguration = JbpmConfiguration.getInstance();
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/taskmgmt/exe/TaskEventExecutionTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/taskmgmt/exe/TaskEventExecutionTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/taskmgmt/exe/TaskEventExecutionTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -21,15 +21,14 @@
*/
package org.jbpm.taskmgmt.exe;
-import junit.framework.TestCase;
-
+import org.jbpm.AbstractJbpmTestCase;
import org.jbpm.graph.def.ActionHandler;
import org.jbpm.graph.def.ProcessDefinition;
import org.jbpm.graph.exe.ExecutionContext;
import org.jbpm.graph.exe.ProcessInstance;
import org.jbpm.graph.exe.Token;
-public class TaskEventExecutionTest extends TestCase {
+public class TaskEventExecutionTest extends AbstractJbpmTestCase {
static int counter = 0;
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/taskmgmt/exe/TaskExecutionTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/taskmgmt/exe/TaskExecutionTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/taskmgmt/exe/TaskExecutionTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -25,15 +25,14 @@
import java.util.Iterator;
import java.util.List;
-import junit.framework.TestCase;
-
+import org.jbpm.AbstractJbpmTestCase;
import org.jbpm.graph.def.ProcessDefinition;
import org.jbpm.graph.def.Transition;
import org.jbpm.graph.exe.ProcessInstance;
import org.jbpm.graph.exe.Token;
import org.jbpm.taskmgmt.def.Task;
-public class TaskExecutionTest extends TestCase {
+public class TaskExecutionTest extends AbstractJbpmTestCase {
public void testSignalLast() {
ProcessDefinition processDefinition = ProcessDefinition.parseXmlString(
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/taskmgmt/exe/TaskInstanceEndTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/taskmgmt/exe/TaskInstanceEndTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/taskmgmt/exe/TaskInstanceEndTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -26,14 +26,13 @@
import java.util.Iterator;
import java.util.List;
-import junit.framework.TestCase;
-
+import org.jbpm.AbstractJbpmTestCase;
import org.jbpm.graph.def.Node;
import org.jbpm.graph.def.ProcessDefinition;
import org.jbpm.graph.exe.ProcessInstance;
import org.jbpm.graph.exe.Token;
-public class TaskInstanceEndTest extends TestCase {
+public class TaskInstanceEndTest extends AbstractJbpmTestCase {
public void testStartTaskInstanceStressed() {
ProcessDefinition processDefinition = ProcessDefinition.parseXmlString(
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/taskmgmt/exe/TaskVariablesTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/taskmgmt/exe/TaskVariablesTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/taskmgmt/exe/TaskVariablesTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -23,14 +23,13 @@
import java.util.HashMap;
+import org.jbpm.AbstractJbpmTestCase;
import org.jbpm.context.exe.ContextInstance;
import org.jbpm.graph.def.ProcessDefinition;
import org.jbpm.graph.exe.ProcessInstance;
-import junit.framework.TestCase;
+public class TaskVariablesTest extends AbstractJbpmTestCase {
-public class TaskVariablesTest extends TestCase {
-
public void testVariables() {
TaskInstance taskInstance = new TaskInstance();
taskInstance.setVariable("key", "value");
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/tdd/AuctionTextTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/tdd/AuctionTextTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/tdd/AuctionTextTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -21,8 +21,7 @@
*/
package org.jbpm.tdd;
-import junit.framework.TestCase;
-
+import org.jbpm.AbstractJbpmTestCase;
import org.jbpm.graph.def.ProcessDefinition;
import org.jbpm.graph.exe.ProcessInstance;
import org.jbpm.graph.exe.Token;
@@ -30,7 +29,7 @@
import org.jbpm.graph.node.StartState;
import org.jbpm.graph.node.State;
-public class AuctionTextTest extends TestCase {
+public class AuctionTextTest extends AbstractJbpmTestCase {
// parse the process definition
static ProcessDefinition auctionProcess = ProcessDefinition.parseXmlString(
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/tdd/AuctionXmlTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/tdd/AuctionXmlTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/tdd/AuctionXmlTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -21,8 +21,7 @@
*/
package org.jbpm.tdd;
-import junit.framework.TestCase;
-
+import org.jbpm.AbstractJbpmTestCase;
import org.jbpm.graph.def.ProcessDefinition;
import org.jbpm.graph.exe.ProcessInstance;
import org.jbpm.graph.exe.Token;
@@ -30,7 +29,7 @@
import org.jbpm.graph.node.StartState;
import org.jbpm.graph.node.State;
-public class AuctionXmlTest extends TestCase {
+public class AuctionXmlTest extends AbstractJbpmTestCase {
// parse the process definition
static ProcessDefinition auctionProcess =
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/util/ByteUtilTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/util/ByteUtilTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/util/ByteUtilTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -2,9 +2,9 @@
import java.util.Arrays;
-import junit.framework.TestCase;
+import org.jbpm.AbstractJbpmTestCase;
-public class ByteUtilTest extends TestCase {
+public class ByteUtilTest extends AbstractJbpmTestCase {
public void testBytesToString() {
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/util/StringUtilTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/util/StringUtilTest.java 2008-09-13 12:17:48 UTC (rev 2225)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/util/StringUtilTest.java 2008-09-13 13:25:38 UTC (rev 2226)
@@ -1,9 +1,9 @@
package org.jbpm.util;
-import junit.framework.TestCase;
+import org.jbpm.AbstractJbpmTestCase;
-public class StringUtilTest extends TestCase {
+public class StringUtilTest extends AbstractJbpmTestCase {
public void testConv() {
// System.out.println(StringUtil.toHexString(new byte[]{(byte) 0x5a,(byte) 0x23,(byte) 0x7c,(byte) 0x0b}));
More information about the jbpm-commits
mailing list