[jbpm-commits] JBoss JBPM SVN: r2693 - in jbpm4/trunk/modules: jpdl and 38 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Fri Oct 31 05:12:33 EDT 2008
Author: tom.baeyens at jboss.com
Date: 2008-10-31 05:12:32 -0400 (Fri, 31 Oct 2008)
New Revision: 2693
Added:
jbpm4/trunk/modules/test/
jbpm4/trunk/modules/test/.classpath
jbpm4/trunk/modules/test/.project
jbpm4/trunk/modules/test/pom.xml
jbpm4/trunk/modules/test/src/
jbpm4/trunk/modules/test/src/main/
jbpm4/trunk/modules/test/src/main/java/
jbpm4/trunk/modules/test/src/main/java/org/
jbpm4/trunk/modules/test/src/main/java/org/jbpm/
jbpm4/trunk/modules/test/src/main/java/org/jbpm/test/
jbpm4/trunk/modules/test/src/main/java/org/jbpm/test/DbTestCase.java
jbpm4/trunk/modules/test/src/main/java/org/jbpm/test/EnvironmentDbTestCase.java
jbpm4/trunk/modules/test/src/main/java/org/jbpm/test/EnvironmentFactoryTestCase.java
Removed:
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/activity/
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/client/
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/env/
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/listener/
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/model/
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/processlog/
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/session/
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/test/base/
jbpm4/trunk/modules/test/src/main/java/org/jbpm/test/DbTestCase.java
jbpm4/trunk/modules/test/src/main/java/org/jbpm/test/EnvironmentDbTestCase.java
jbpm4/trunk/modules/test/src/main/java/org/jbpm/test/EnvironmentFactoryTestCase.java
Modified:
jbpm4/trunk/modules/jpdl/pom.xml
jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/JpdlTestCase.java
jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/ParsingTestCase.java
jbpm4/trunk/modules/manual/pom.xml
jbpm4/trunk/modules/pvm/pom.xml
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/AutomaticDecisionTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/BasicExecutionFlowTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/EventPropagationTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/EventTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/ExceptionHandlerTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/ExecutionStateTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/FunctionalActivityTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/LoopingTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/ScopeStateTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/ScopeVariableDeclarationTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/ScopeVariableTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/SubProcessTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/TransitionAsWaitStateTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/TransitionBasedConcurrencyTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/TransitionEventsTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/VariableTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/basicfeatures/AutomaticDecisionDbTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/basicfeatures/BasicExecutionFlowDbTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/continuation/ContinuationTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/svc/ExecutionServiceTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/svc/ManagementServiceTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/svc/ProcessServiceTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/BasicEnvironmentTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/EnvironmentClassLoaderTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/EnvironmentSearchOrderTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/EnvironmentTypeLookupTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/NestedEnvironmentTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/spring/SpringTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/timer/TimerIntegrationTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/tx/BasicTransactionTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example02/PersistentExecutionModeTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example03/EmbeddedExecutionModeTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example04/DisplayActivityTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example05/ExternalActivityExampleTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example06/BasicProcessExecutionTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example07/EventListenerTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example08/EventPropagationTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/examples/ExamplesTests.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/langext/LanguageExtensionsDbTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/CommentDbTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/ProcessCacheDbTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/ProcessDefinitionDbTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/ProcessExecutionDbTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/SessionFactoryDbTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/WireDbTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/WireTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/type/VariableCustomTypeTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/GroovyExpressionTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/JuelExpressionTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorIsolationDbTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionFailingCommitTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionResourcesCommitTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionResourcesSetRollbackOnlyTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/type/VariableAutoTypeResolutionTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/SubscriptionTestCase.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireObservableTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireTestCase.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/xml/DebugDomBuilderTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/xml/WireParserTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/xml/XmlParsingTest.java
Log:
unification api proposals
Modified: jbpm4/trunk/modules/jpdl/pom.xml
===================================================================
--- jbpm4/trunk/modules/jpdl/pom.xml 2008-10-31 09:11:30 UTC (rev 2692)
+++ jbpm4/trunk/modules/jpdl/pom.xml 2008-10-31 09:12:32 UTC (rev 2693)
@@ -16,7 +16,7 @@
<modelVersion>4.0.0</modelVersion>
- <name>JBoss jBPM4 - jPDL Core</name>
+ <name>jBPM 4 - jPDL</name>
<groupId>org.jbpm.jbpm4</groupId>
<artifactId>jbpm-jpdl</artifactId>
<packaging>jar</packaging>
Modified: jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/JpdlTestCase.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/JpdlTestCase.java 2008-10-31 09:11:30 UTC (rev 2692)
+++ jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/JpdlTestCase.java 2008-10-31 09:12:32 UTC (rev 2693)
@@ -25,7 +25,7 @@
import org.jbpm.pvm.client.ClientProcessDefinition;
import org.jbpm.pvm.internal.log.Log;
import org.jbpm.pvm.internal.xml.Parse;
-import org.jbpm.pvm.test.base.JbpmTestCase;
+import org.jbpm.test.JbpmTestCase;
/**
* @author Tom Baeyens
Modified: jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/ParsingTestCase.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/ParsingTestCase.java 2008-10-31 09:11:30 UTC (rev 2692)
+++ jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/ParsingTestCase.java 2008-10-31 09:12:32 UTC (rev 2693)
@@ -26,7 +26,7 @@
import org.jbpm.jpdl.xml.JpdlParser;
import org.jbpm.pvm.client.ClientProcessDefinition;
import org.jbpm.pvm.internal.xml.Problem;
-import org.jbpm.pvm.test.base.JbpmTestCase;
+import org.jbpm.test.JbpmTestCase;
/**
Modified: jbpm4/trunk/modules/manual/pom.xml
===================================================================
--- jbpm4/trunk/modules/manual/pom.xml 2008-10-31 09:11:30 UTC (rev 2692)
+++ jbpm4/trunk/modules/manual/pom.xml 2008-10-31 09:12:32 UTC (rev 2693)
@@ -16,7 +16,7 @@
<modelVersion>4.0.0</modelVersion>
- <name>JBoss jBPM4 - PVM Manual</name>
+ <name>jBPM 4 - Manual</name>
<groupId>org.jbpm.jbpm4</groupId>
<artifactId>jbpm-manual</artifactId>
<packaging>pom</packaging>
Modified: jbpm4/trunk/modules/pvm/pom.xml
===================================================================
--- jbpm4/trunk/modules/pvm/pom.xml 2008-10-31 09:11:30 UTC (rev 2692)
+++ jbpm4/trunk/modules/pvm/pom.xml 2008-10-31 09:12:32 UTC (rev 2693)
@@ -15,7 +15,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <name>JBoss jBPM4 - PVM Core</name>
+ <name>jBPM 4 - PVM</name>
<groupId>org.jbpm.jbpm4</groupId>
<artifactId>jbpm-pvm</artifactId>
<packaging>jar</packaging>
@@ -41,6 +41,10 @@
<artifactId>jbpm-api</artifactId>
</dependency>
<dependency>
+ <groupId>org.jbpm.jbpm4</groupId>
+ <artifactId>jbpm-test</artifactId>
+ </dependency>
+ <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/AutomaticDecisionTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/AutomaticDecisionTest.java 2008-10-31 09:11:30 UTC (rev 2692)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/AutomaticDecisionTest.java 2008-10-31 09:12:32 UTC (rev 2693)
@@ -23,13 +23,13 @@
import java.util.Map;
-import org.jbpm.pvm.test.base.JbpmTestCase;
import org.jbpm.pvm.activity.Activity;
import org.jbpm.pvm.activity.ActivityExecution;
import org.jbpm.pvm.activity.ExternalActivity;
import org.jbpm.pvm.client.ClientProcessDefinition;
import org.jbpm.pvm.client.ClientProcessInstance;
import org.jbpm.pvm.model.ProcessFactory;
+import org.jbpm.test.JbpmTestCase;
/** shows an automatic decision.
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/BasicExecutionFlowTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/BasicExecutionFlowTest.java 2008-10-31 09:11:30 UTC (rev 2692)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/BasicExecutionFlowTest.java 2008-10-31 09:12:32 UTC (rev 2693)
@@ -34,7 +34,7 @@
import org.jbpm.pvm.example03.AutomaticActivity;
import org.jbpm.pvm.example03.WaitState;
import org.jbpm.pvm.model.ProcessFactory;
-import org.jbpm.pvm.test.base.JbpmTestCase;
+import org.jbpm.test.JbpmTestCase;
/** shows wait states and automatic activities in a simple
* sequence based on transitions.
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/EventPropagationTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/EventPropagationTest.java 2008-10-31 09:11:30 UTC (rev 2692)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/EventPropagationTest.java 2008-10-31 09:12:32 UTC (rev 2693)
@@ -25,7 +25,6 @@
import java.util.List;
import java.util.Map;
-import org.jbpm.pvm.test.base.JbpmTestCase;
import org.jbpm.pvm.activity.Activity;
import org.jbpm.pvm.activity.ActivityExecution;
import org.jbpm.pvm.activity.ExternalActivity;
@@ -37,6 +36,7 @@
import org.jbpm.pvm.model.Node;
import org.jbpm.pvm.model.ObservableElement;
import org.jbpm.pvm.model.ProcessFactory;
+import org.jbpm.test.JbpmTestCase;
/**
* @author Tom Baeyens
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/EventTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/EventTest.java 2008-10-31 09:11:30 UTC (rev 2692)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/EventTest.java 2008-10-31 09:12:32 UTC (rev 2693)
@@ -25,7 +25,6 @@
import java.util.List;
import java.util.Map;
-import org.jbpm.pvm.test.base.JbpmTestCase;
import org.jbpm.pvm.activity.Activity;
import org.jbpm.pvm.activity.ActivityExecution;
import org.jbpm.pvm.activity.ExternalActivity;
@@ -39,6 +38,7 @@
import org.jbpm.pvm.model.Node;
import org.jbpm.pvm.model.ObservableElement;
import org.jbpm.pvm.model.ProcessFactory;
+import org.jbpm.test.JbpmTestCase;
/** shows how actions are listeners to following processDefinition events:
* <ul>
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/ExceptionHandlerTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/ExceptionHandlerTest.java 2008-10-31 09:11:30 UTC (rev 2692)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/ExceptionHandlerTest.java 2008-10-31 09:12:32 UTC (rev 2693)
@@ -23,7 +23,6 @@
import java.util.Map;
-import org.jbpm.pvm.test.base.JbpmTestCase;
import org.jbpm.pvm.activity.ActivityExecution;
import org.jbpm.pvm.activity.ExternalActivity;
import org.jbpm.pvm.client.ClientProcessDefinition;
@@ -32,6 +31,7 @@
import org.jbpm.pvm.listener.EventListenerExecution;
import org.jbpm.pvm.model.Event;
import org.jbpm.pvm.model.ProcessFactory;
+import org.jbpm.test.JbpmTestCase;
/**
* @author Tom Baeyens
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/ExecutionStateTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/ExecutionStateTest.java 2008-10-31 09:11:30 UTC (rev 2692)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/ExecutionStateTest.java 2008-10-31 09:12:32 UTC (rev 2693)
@@ -25,13 +25,13 @@
import org.jbpm.Execution;
import org.jbpm.PvmException;
-import org.jbpm.pvm.test.base.JbpmTestCase;
import org.jbpm.pvm.activity.Activity;
import org.jbpm.pvm.activity.ActivityExecution;
import org.jbpm.pvm.activity.ExternalActivity;
import org.jbpm.pvm.client.ClientProcessDefinition;
import org.jbpm.pvm.client.ClientProcessInstance;
import org.jbpm.pvm.model.ProcessFactory;
+import org.jbpm.test.JbpmTestCase;
/** shows the basics of the state property on the execution.
*
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/FunctionalActivityTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/FunctionalActivityTest.java 2008-10-31 09:11:30 UTC (rev 2692)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/FunctionalActivityTest.java 2008-10-31 09:12:32 UTC (rev 2693)
@@ -25,7 +25,6 @@
import java.util.List;
import java.util.Map;
-import org.jbpm.pvm.test.base.JbpmTestCase;
import org.jbpm.pvm.activity.Activity;
import org.jbpm.pvm.activity.ActivityExecution;
import org.jbpm.pvm.activity.ExternalActivity;
@@ -36,6 +35,7 @@
import org.jbpm.pvm.model.Node;
import org.jbpm.pvm.model.OpenExecution;
import org.jbpm.pvm.model.ProcessFactory;
+import org.jbpm.test.JbpmTestCase;
/** shows how functional nodes (nodes that have a specific function
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/LoopingTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/LoopingTest.java 2008-10-31 09:11:30 UTC (rev 2692)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/LoopingTest.java 2008-10-31 09:12:32 UTC (rev 2693)
@@ -4,13 +4,13 @@
import java.util.List;
import java.util.Map;
-import org.jbpm.pvm.test.base.JbpmTestCase;
import org.jbpm.pvm.activity.Activity;
import org.jbpm.pvm.activity.ActivityExecution;
import org.jbpm.pvm.activity.ExternalActivity;
import org.jbpm.pvm.client.ClientProcessDefinition;
import org.jbpm.pvm.client.ClientExecution;
import org.jbpm.pvm.model.ProcessFactory;
+import org.jbpm.test.JbpmTestCase;
public class LoopingTest extends JbpmTestCase {
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/ScopeStateTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/ScopeStateTest.java 2008-10-31 09:11:30 UTC (rev 2692)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/ScopeStateTest.java 2008-10-31 09:12:32 UTC (rev 2693)
@@ -30,7 +30,7 @@
import org.jbpm.pvm.client.ClientProcessDefinition;
import org.jbpm.pvm.client.ClientProcessInstance;
import org.jbpm.pvm.model.ProcessFactory;
-import org.jbpm.pvm.test.base.JbpmTestCase;
+import org.jbpm.test.JbpmTestCase;
/**
* @author Tom Baeyens
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/ScopeVariableDeclarationTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/ScopeVariableDeclarationTest.java 2008-10-31 09:11:30 UTC (rev 2692)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/ScopeVariableDeclarationTest.java 2008-10-31 09:12:32 UTC (rev 2693)
@@ -24,7 +24,6 @@
import java.util.HashMap;
import java.util.Map;
-import org.jbpm.pvm.test.base.JbpmTestCase;
import org.jbpm.pvm.activity.ActivityExecution;
import org.jbpm.pvm.activity.ExternalActivity;
import org.jbpm.pvm.client.ClientProcessDefinition;
@@ -32,6 +31,7 @@
import org.jbpm.pvm.model.Node;
import org.jbpm.pvm.model.OpenExecution;
import org.jbpm.pvm.model.ProcessFactory;
+import org.jbpm.test.JbpmTestCase;
/**
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/ScopeVariableTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/ScopeVariableTest.java 2008-10-31 09:11:30 UTC (rev 2692)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/ScopeVariableTest.java 2008-10-31 09:12:32 UTC (rev 2693)
@@ -24,13 +24,13 @@
import java.util.Map;
import org.jbpm.PvmException;
-import org.jbpm.pvm.test.base.JbpmTestCase;
import org.jbpm.pvm.activity.ActivityExecution;
import org.jbpm.pvm.activity.ExternalActivity;
import org.jbpm.pvm.client.ClientProcessDefinition;
import org.jbpm.pvm.client.ClientExecution;
import org.jbpm.pvm.model.OpenExecution;
import org.jbpm.pvm.model.ProcessFactory;
+import org.jbpm.test.JbpmTestCase;
/**
*
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/SubProcessTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/SubProcessTest.java 2008-10-31 09:11:30 UTC (rev 2692)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/SubProcessTest.java 2008-10-31 09:12:32 UTC (rev 2693)
@@ -23,13 +23,13 @@
import java.util.Map;
-import org.jbpm.pvm.test.base.JbpmTestCase;
import org.jbpm.pvm.activity.Activity;
import org.jbpm.pvm.activity.ActivityExecution;
import org.jbpm.pvm.activity.ExternalActivity;
import org.jbpm.pvm.client.ClientProcessDefinition;
import org.jbpm.pvm.client.ClientExecution;
import org.jbpm.pvm.model.ProcessFactory;
+import org.jbpm.test.JbpmTestCase;
/**
* @author Tom Baeyens
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/TransitionAsWaitStateTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/TransitionAsWaitStateTest.java 2008-10-31 09:11:30 UTC (rev 2692)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/TransitionAsWaitStateTest.java 2008-10-31 09:12:32 UTC (rev 2693)
@@ -23,7 +23,6 @@
import java.util.Map;
-import org.jbpm.pvm.test.base.JbpmTestCase;
import org.jbpm.pvm.activity.Activity;
import org.jbpm.pvm.activity.ActivityExecution;
import org.jbpm.pvm.activity.ExternalActivity;
@@ -32,6 +31,7 @@
import org.jbpm.pvm.listener.EventListenerExecution;
import org.jbpm.pvm.model.Condition;
import org.jbpm.pvm.model.ProcessFactory;
+import org.jbpm.test.JbpmTestCase;
/** this test shows how to implement a transition that behaves as a
* wait state.
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/TransitionBasedConcurrencyTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/TransitionBasedConcurrencyTest.java 2008-10-31 09:11:30 UTC (rev 2692)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/TransitionBasedConcurrencyTest.java 2008-10-31 09:12:32 UTC (rev 2693)
@@ -6,7 +6,6 @@
import java.util.Map;
import org.jbpm.Execution;
-import org.jbpm.pvm.test.base.JbpmTestCase;
import org.jbpm.pvm.activity.Activity;
import org.jbpm.pvm.activity.ActivityExecution;
import org.jbpm.pvm.activity.ExternalActivity;
@@ -16,6 +15,7 @@
import org.jbpm.pvm.model.OpenExecution;
import org.jbpm.pvm.model.ProcessFactory;
import org.jbpm.pvm.model.Transition;
+import org.jbpm.test.JbpmTestCase;
/**
* concurrent execution where synchronization is done by checking if the
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/TransitionEventsTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/TransitionEventsTest.java 2008-10-31 09:11:30 UTC (rev 2692)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/TransitionEventsTest.java 2008-10-31 09:12:32 UTC (rev 2693)
@@ -25,7 +25,6 @@
import java.util.List;
import java.util.Map;
-import org.jbpm.pvm.test.base.JbpmTestCase;
import org.jbpm.pvm.activity.ActivityExecution;
import org.jbpm.pvm.activity.ExternalActivity;
import org.jbpm.pvm.client.ClientProcessDefinition;
@@ -34,6 +33,7 @@
import org.jbpm.pvm.listener.EventListenerExecution;
import org.jbpm.pvm.model.Event;
import org.jbpm.pvm.model.ProcessFactory;
+import org.jbpm.test.JbpmTestCase;
/**
* @author Tom Baeyens
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/VariableTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/VariableTest.java 2008-10-31 09:11:30 UTC (rev 2692)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/basicfeatures/VariableTest.java 2008-10-31 09:12:32 UTC (rev 2693)
@@ -32,7 +32,7 @@
import org.jbpm.pvm.client.ClientProcessDefinition;
import org.jbpm.pvm.client.ClientProcessInstance;
import org.jbpm.pvm.model.ProcessFactory;
-import org.jbpm.pvm.test.base.JbpmTestCase;
+import org.jbpm.test.JbpmTestCase;
/**
* @author Tom Baeyens
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/basicfeatures/AutomaticDecisionDbTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/basicfeatures/AutomaticDecisionDbTest.java 2008-10-31 09:11:30 UTC (rev 2692)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/basicfeatures/AutomaticDecisionDbTest.java 2008-10-31 09:12:32 UTC (rev 2693)
@@ -23,7 +23,7 @@
import org.jbpm.pvm.activity.ExternalActivity;
import org.jbpm.pvm.client.ClientProcessDefinition;
import org.jbpm.pvm.model.ProcessFactory;
-import org.jbpm.pvm.test.base.DbTestCase;
+import org.jbpm.test.DbTestCase;
/**
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/basicfeatures/BasicExecutionFlowDbTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/basicfeatures/BasicExecutionFlowDbTest.java 2008-10-31 09:11:30 UTC (rev 2692)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/basicfeatures/BasicExecutionFlowDbTest.java 2008-10-31 09:12:32 UTC (rev 2693)
@@ -25,7 +25,7 @@
import org.jbpm.pvm.client.ClientProcessDefinition;
import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor;
import org.jbpm.pvm.model.ProcessFactory;
-import org.jbpm.pvm.test.base.DbTestCase;
+import org.jbpm.test.DbTestCase;
/**
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/continuation/ContinuationTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/continuation/ContinuationTest.java 2008-10-31 09:11:30 UTC (rev 2692)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/continuation/ContinuationTest.java 2008-10-31 09:12:32 UTC (rev 2693)
@@ -43,8 +43,8 @@
import org.jbpm.pvm.model.ProcessFactory;
import org.jbpm.pvm.session.DbSession;
import org.jbpm.pvm.session.PvmDbSession;
-import org.jbpm.pvm.test.base.DbTestCase;
-import org.jbpm.pvm.test.base.EnvironmentFactoryTestSetup;
+import org.jbpm.test.DbTestCase;
+import org.jbpm.test.EnvironmentFactoryTestSetup;
/**
* @author Tom Baeyens
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/svc/ExecutionServiceTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/svc/ExecutionServiceTest.java 2008-10-31 09:11:30 UTC (rev 2692)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/svc/ExecutionServiceTest.java 2008-10-31 09:12:32 UTC (rev 2693)
@@ -35,8 +35,8 @@
import org.jbpm.pvm.DeploymentImpl;
import org.jbpm.pvm.client.ClientProcessDefinition;
import org.jbpm.pvm.model.ProcessFactory;
-import org.jbpm.pvm.test.base.DbTestCase;
-import org.jbpm.pvm.test.base.EnvironmentFactoryTestSetup;
+import org.jbpm.test.DbTestCase;
+import org.jbpm.test.EnvironmentFactoryTestSetup;
/**
* @author Tom Baeyens
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/svc/ManagementServiceTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/svc/ManagementServiceTest.java 2008-10-31 09:11:30 UTC (rev 2692)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/svc/ManagementServiceTest.java 2008-10-31 09:12:32 UTC (rev 2693)
@@ -24,8 +24,8 @@
import junit.framework.Test;
import org.jbpm.ManagementService;
-import org.jbpm.pvm.test.base.DbTestCase;
-import org.jbpm.pvm.test.base.EnvironmentFactoryTestSetup;
+import org.jbpm.test.DbTestCase;
+import org.jbpm.test.EnvironmentFactoryTestSetup;
/**
* @author Tom Baeyens
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/svc/ProcessServiceTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/svc/ProcessServiceTest.java 2008-10-31 09:11:30 UTC (rev 2692)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/svc/ProcessServiceTest.java 2008-10-31 09:12:32 UTC (rev 2693)
@@ -31,8 +31,8 @@
import org.jbpm.PvmException;
import org.jbpm.pvm.DeploymentImpl;
import org.jbpm.pvm.model.ProcessFactory;
-import org.jbpm.pvm.test.base.DbTestCase;
-import org.jbpm.pvm.test.base.EnvironmentFactoryTestSetup;
+import org.jbpm.test.DbTestCase;
+import org.jbpm.test.EnvironmentFactoryTestSetup;
/**
* @author Tom Baeyens
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/BasicEnvironmentTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/BasicEnvironmentTest.java 2008-10-31 09:11:30 UTC (rev 2692)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/BasicEnvironmentTest.java 2008-10-31 09:12:32 UTC (rev 2693)
@@ -21,11 +21,11 @@
*/
package org.jbpm.pvm.api.env;
-import org.jbpm.pvm.test.base.JbpmTestCase;
import org.jbpm.pvm.env.Context;
import org.jbpm.pvm.env.Environment;
import org.jbpm.pvm.env.EnvironmentFactory;
import org.jbpm.pvm.env.PvmEnvironmentFactory;
+import org.jbpm.test.JbpmTestCase;
/**
* @author Tom Baeyens
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/EnvironmentClassLoaderTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/EnvironmentClassLoaderTest.java 2008-10-31 09:11:30 UTC (rev 2692)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/EnvironmentClassLoaderTest.java 2008-10-31 09:12:32 UTC (rev 2693)
@@ -21,10 +21,10 @@
*/
package org.jbpm.pvm.api.env;
-import org.jbpm.pvm.test.base.JbpmTestCase;
import org.jbpm.pvm.env.Environment;
import org.jbpm.pvm.env.EnvironmentFactory;
import org.jbpm.pvm.env.PvmEnvironmentFactory;
+import org.jbpm.test.JbpmTestCase;
/**
* @author Tom Baeyens
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/EnvironmentSearchOrderTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/EnvironmentSearchOrderTest.java 2008-10-31 09:11:30 UTC (rev 2692)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/EnvironmentSearchOrderTest.java 2008-10-31 09:12:32 UTC (rev 2693)
@@ -21,13 +21,13 @@
*/
package org.jbpm.pvm.api.env;
-import org.jbpm.pvm.test.base.JbpmTestCase;
import org.jbpm.pvm.env.Environment;
import org.jbpm.pvm.env.EnvironmentFactory;
import org.jbpm.pvm.env.PvmEnvironmentFactory;
import org.jbpm.pvm.internal.wire.WireContext;
import org.jbpm.pvm.internal.wire.WireDefinition;
import org.jbpm.pvm.internal.wire.xml.WireParser;
+import org.jbpm.test.JbpmTestCase;
/**
* @author Tom Baeyens
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/EnvironmentTypeLookupTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/EnvironmentTypeLookupTest.java 2008-10-31 09:11:30 UTC (rev 2692)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/EnvironmentTypeLookupTest.java 2008-10-31 09:12:32 UTC (rev 2693)
@@ -21,10 +21,10 @@
*/
package org.jbpm.pvm.api.env;
-import org.jbpm.pvm.test.base.JbpmTestCase;
import org.jbpm.pvm.env.Environment;
import org.jbpm.pvm.env.EnvironmentFactory;
import org.jbpm.pvm.env.PvmEnvironmentFactory;
+import org.jbpm.test.JbpmTestCase;
/**
* @author Tom Baeyens
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/NestedEnvironmentTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/NestedEnvironmentTest.java 2008-10-31 09:11:30 UTC (rev 2692)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/NestedEnvironmentTest.java 2008-10-31 09:12:32 UTC (rev 2693)
@@ -21,10 +21,10 @@
*/
package org.jbpm.pvm.api.env;
-import org.jbpm.pvm.test.base.JbpmTestCase;
import org.jbpm.pvm.env.Environment;
import org.jbpm.pvm.env.EnvironmentFactory;
import org.jbpm.pvm.env.PvmEnvironmentFactory;
+import org.jbpm.test.JbpmTestCase;
/**
* @author Tom Baeyens
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/spring/SpringTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/spring/SpringTest.java 2008-10-31 09:11:30 UTC (rev 2692)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/spring/SpringTest.java 2008-10-31 09:12:32 UTC (rev 2693)
@@ -22,11 +22,11 @@
package org.jbpm.pvm.api.spring;
import org.hibernate.Session;
-import org.jbpm.pvm.test.base.JbpmTestCase;
import org.jbpm.pvm.env.Environment;
import org.jbpm.pvm.env.EnvironmentFactory;
import org.jbpm.pvm.internal.cmd.Command;
import org.jbpm.pvm.internal.cmd.CommandService;
+import org.jbpm.test.JbpmTestCase;
import org.springframework.context.support.ClassPathXmlApplicationContext;
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/timer/TimerIntegrationTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/timer/TimerIntegrationTest.java 2008-10-31 09:11:30 UTC (rev 2692)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/timer/TimerIntegrationTest.java 2008-10-31 09:12:32 UTC (rev 2693)
@@ -36,7 +36,7 @@
import org.jbpm.pvm.samples.activities.AutomaticActivity;
import org.jbpm.pvm.session.DbSession;
import org.jbpm.pvm.session.PvmDbSession;
-import org.jbpm.pvm.test.base.EnvironmentDbTestCase;
+import org.jbpm.test.EnvironmentDbTestCase;
/**
* @author Pascal Verdage
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/tx/BasicTransactionTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/tx/BasicTransactionTest.java 2008-10-31 09:11:30 UTC (rev 2692)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/tx/BasicTransactionTest.java 2008-10-31 09:12:32 UTC (rev 2693)
@@ -34,8 +34,8 @@
import org.jbpm.pvm.internal.cmd.Command;
import org.jbpm.pvm.internal.model.CommentImpl;
import org.jbpm.pvm.internal.type.variable.StringVariable;
-import org.jbpm.pvm.test.base.DbTestCase;
-import org.jbpm.pvm.test.base.EnvironmentFactoryTestSetup;
+import org.jbpm.test.DbTestCase;
+import org.jbpm.test.EnvironmentFactoryTestSetup;
/**
* @author Tom Baeyens
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example02/PersistentExecutionModeTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example02/PersistentExecutionModeTest.java 2008-10-31 09:11:30 UTC (rev 2692)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example02/PersistentExecutionModeTest.java 2008-10-31 09:12:32 UTC (rev 2693)
@@ -31,7 +31,7 @@
import org.jbpm.pvm.example01.AutomaticActivity;
import org.jbpm.pvm.example01.WaitState;
import org.jbpm.pvm.model.ProcessFactory;
-import org.jbpm.pvm.test.base.EnvironmentFactoryTestCase;
+import org.jbpm.test.EnvironmentFactoryTestCase;
public class PersistentExecutionModeTest extends EnvironmentFactoryTestCase {
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example03/EmbeddedExecutionModeTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example03/EmbeddedExecutionModeTest.java 2008-10-31 09:11:30 UTC (rev 2692)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example03/EmbeddedExecutionModeTest.java 2008-10-31 09:12:32 UTC (rev 2693)
@@ -25,7 +25,7 @@
import org.hibernate.SessionFactory;
import org.hibernate.Transaction;
import org.hibernate.cfg.Configuration;
-import org.jbpm.pvm.test.base.JbpmTestCase;
+import org.jbpm.test.JbpmTestCase;
/**
* @author Tom Baeyens
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example04/DisplayActivityTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example04/DisplayActivityTest.java 2008-10-31 09:11:30 UTC (rev 2692)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example04/DisplayActivityTest.java 2008-10-31 09:12:32 UTC (rev 2693)
@@ -24,7 +24,7 @@
import org.jbpm.Execution;
import org.jbpm.pvm.client.ClientProcessDefinition;
import org.jbpm.pvm.model.ProcessFactory;
-import org.jbpm.pvm.test.base.JbpmTestCase;
+import org.jbpm.test.JbpmTestCase;
public class DisplayActivityTest extends JbpmTestCase {
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example05/ExternalActivityExampleTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example05/ExternalActivityExampleTest.java 2008-10-31 09:11:30 UTC (rev 2692)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example05/ExternalActivityExampleTest.java 2008-10-31 09:12:32 UTC (rev 2693)
@@ -24,7 +24,7 @@
import org.jbpm.pvm.client.ClientExecution;
import org.jbpm.pvm.client.ClientProcessDefinition;
import org.jbpm.pvm.model.ProcessFactory;
-import org.jbpm.pvm.test.base.JbpmTestCase;
+import org.jbpm.test.JbpmTestCase;
public class ExternalActivityExampleTest extends JbpmTestCase {
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example06/BasicProcessExecutionTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example06/BasicProcessExecutionTest.java 2008-10-31 09:11:30 UTC (rev 2692)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example06/BasicProcessExecutionTest.java 2008-10-31 09:12:32 UTC (rev 2693)
@@ -26,7 +26,7 @@
import org.jbpm.pvm.example04.Display;
import org.jbpm.pvm.example05.WaitState;
import org.jbpm.pvm.model.ProcessFactory;
-import org.jbpm.pvm.test.base.JbpmTestCase;
+import org.jbpm.test.JbpmTestCase;
public class BasicProcessExecutionTest extends JbpmTestCase {
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example07/EventListenerTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example07/EventListenerTest.java 2008-10-31 09:11:30 UTC (rev 2692)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example07/EventListenerTest.java 2008-10-31 09:12:32 UTC (rev 2693)
@@ -31,7 +31,7 @@
import org.jbpm.pvm.example04.TestConsole;
import org.jbpm.pvm.model.Event;
import org.jbpm.pvm.model.ProcessFactory;
-import org.jbpm.pvm.test.base.JbpmTestCase;
+import org.jbpm.test.JbpmTestCase;
public class EventListenerTest extends JbpmTestCase {
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example08/EventPropagationTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example08/EventPropagationTest.java 2008-10-31 09:11:30 UTC (rev 2692)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/example08/EventPropagationTest.java 2008-10-31 09:12:32 UTC (rev 2693)
@@ -30,7 +30,7 @@
import org.jbpm.pvm.example04.TestConsole;
import org.jbpm.pvm.model.Event;
import org.jbpm.pvm.model.ProcessFactory;
-import org.jbpm.pvm.test.base.JbpmTestCase;
+import org.jbpm.test.JbpmTestCase;
public class EventPropagationTest extends JbpmTestCase {
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/examples/ExamplesTests.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/examples/ExamplesTests.java 2008-10-31 09:11:30 UTC (rev 2692)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/examples/ExamplesTests.java 2008-10-31 09:12:32 UTC (rev 2693)
@@ -11,7 +11,7 @@
import org.jbpm.pvm.example06.BasicProcessExecutionTest;
import org.jbpm.pvm.example07.EventListenerTest;
import org.jbpm.pvm.example08.EventPropagationTest;
-import org.jbpm.pvm.test.base.EnvironmentFactoryTestSetup;
+import org.jbpm.test.EnvironmentFactoryTestSetup;
public class ExamplesTests {
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/langext/LanguageExtensionsDbTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/langext/LanguageExtensionsDbTest.java 2008-10-31 09:11:30 UTC (rev 2692)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/langext/LanguageExtensionsDbTest.java 2008-10-31 09:12:32 UTC (rev 2693)
@@ -33,8 +33,8 @@
import org.jbpm.pvm.model.ProcessFactory;
import org.jbpm.pvm.session.DbSession;
import org.jbpm.pvm.session.PvmDbSession;
-import org.jbpm.pvm.test.base.EnvironmentDbTestCase;
-import org.jbpm.pvm.test.base.EnvironmentFactoryTestSetup;
+import org.jbpm.test.EnvironmentDbTestCase;
+import org.jbpm.test.EnvironmentFactoryTestSetup;
/**
* @author Tom Baeyens
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/CommentDbTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/CommentDbTest.java 2008-10-31 09:11:30 UTC (rev 2692)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/CommentDbTest.java 2008-10-31 09:12:32 UTC (rev 2693)
@@ -29,8 +29,8 @@
import org.jbpm.pvm.internal.model.CommentImpl;
import org.jbpm.pvm.model.Comment;
import org.jbpm.pvm.session.DbSession;
-import org.jbpm.pvm.test.base.EnvironmentDbTestCase;
-import org.jbpm.pvm.test.base.EnvironmentFactoryTestSetup;
+import org.jbpm.test.EnvironmentDbTestCase;
+import org.jbpm.test.EnvironmentFactoryTestSetup;
/**
* @author Tom Baeyens
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/ProcessCacheDbTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/ProcessCacheDbTest.java 2008-10-31 09:11:30 UTC (rev 2692)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/ProcessCacheDbTest.java 2008-10-31 09:12:32 UTC (rev 2693)
@@ -27,8 +27,8 @@
import org.jbpm.pvm.model.Transition;
import org.jbpm.pvm.session.DbSession;
import org.jbpm.pvm.session.PvmDbSession;
-import org.jbpm.pvm.test.base.EnvironmentDbTestCase;
-import org.jbpm.pvm.test.base.EnvironmentFactoryTestSetup;
+import org.jbpm.test.EnvironmentDbTestCase;
+import org.jbpm.test.EnvironmentFactoryTestSetup;
/**
* @author Guillaume Porcher
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/ProcessDefinitionDbTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/ProcessDefinitionDbTest.java 2008-10-31 09:11:30 UTC (rev 2692)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/ProcessDefinitionDbTest.java 2008-10-31 09:12:32 UTC (rev 2693)
@@ -28,8 +28,8 @@
import org.jbpm.pvm.model.ProcessFactory;
import org.jbpm.pvm.model.Transition;
import org.jbpm.pvm.session.DbSession;
-import org.jbpm.pvm.test.base.EnvironmentDbTestCase;
-import org.jbpm.pvm.test.base.EnvironmentFactoryTestSetup;
+import org.jbpm.test.EnvironmentDbTestCase;
+import org.jbpm.test.EnvironmentFactoryTestSetup;
/**
* @author Charles Souillard
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/ProcessExecutionDbTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/ProcessExecutionDbTest.java 2008-10-31 09:11:30 UTC (rev 2692)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/ProcessExecutionDbTest.java 2008-10-31 09:12:32 UTC (rev 2693)
@@ -18,8 +18,8 @@
import org.jbpm.pvm.internal.model.ExecutionImpl;
import org.jbpm.pvm.internal.model.ProcessDefinitionImpl;
import org.jbpm.pvm.model.OpenProcessDefinition;
-import org.jbpm.pvm.test.base.EnvironmentDbTestCase;
-import org.jbpm.pvm.test.base.EnvironmentFactoryTestSetup;
+import org.jbpm.test.EnvironmentDbTestCase;
+import org.jbpm.test.EnvironmentFactoryTestSetup;
/**
* @author Guillaume Porcher
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/SessionFactoryDbTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/SessionFactoryDbTest.java 2008-10-31 09:11:30 UTC (rev 2692)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/SessionFactoryDbTest.java 2008-10-31 09:12:32 UTC (rev 2693)
@@ -24,8 +24,8 @@
import junit.framework.Test;
import org.hibernate.SessionFactory;
-import org.jbpm.pvm.test.base.EnvironmentDbTestCase;
-import org.jbpm.pvm.test.base.EnvironmentFactoryTestSetup;
+import org.jbpm.test.EnvironmentDbTestCase;
+import org.jbpm.test.EnvironmentFactoryTestSetup;
/**
* @author Tom Baeyens
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/WireDbTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/WireDbTest.java 2008-10-31 09:11:30 UTC (rev 2692)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/WireDbTest.java 2008-10-31 09:12:32 UTC (rev 2693)
@@ -53,8 +53,8 @@
import org.jbpm.pvm.model.OpenProcessDefinition;
import org.jbpm.pvm.model.ProcessFactory;
import org.jbpm.pvm.session.DbSession;
-import org.jbpm.pvm.test.base.EnvironmentDbTestCase;
-import org.jbpm.pvm.test.base.EnvironmentFactoryTestSetup;
+import org.jbpm.test.EnvironmentDbTestCase;
+import org.jbpm.test.EnvironmentFactoryTestSetup;
/**
* @author Guillaume Porcher
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/WireTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/WireTest.java 2008-10-31 09:11:30 UTC (rev 2692)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/WireTest.java 2008-10-31 09:12:32 UTC (rev 2693)
@@ -28,8 +28,8 @@
import org.jbpm.pvm.internal.wire.descriptor.IntegerDescriptor;
import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor;
import org.jbpm.pvm.session.DbSession;
-import org.jbpm.pvm.test.base.EnvironmentDbTestCase;
-import org.jbpm.pvm.test.base.EnvironmentFactoryTestSetup;
+import org.jbpm.test.EnvironmentDbTestCase;
+import org.jbpm.test.EnvironmentFactoryTestSetup;
/**
* @author Tom Baeyens
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/type/VariableCustomTypeTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/type/VariableCustomTypeTest.java 2008-10-31 09:11:30 UTC (rev 2692)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/type/VariableCustomTypeTest.java 2008-10-31 09:12:32 UTC (rev 2693)
@@ -35,8 +35,8 @@
import org.jbpm.pvm.internal.type.Variable;
import org.jbpm.pvm.internal.type.variable.DateVariable;
import org.jbpm.pvm.model.ProcessFactory;
-import org.jbpm.pvm.test.base.EnvironmentDbTestCase;
-import org.jbpm.pvm.test.base.EnvironmentFactoryTestSetup;
+import org.jbpm.test.EnvironmentDbTestCase;
+import org.jbpm.test.EnvironmentFactoryTestSetup;
/**
* @author Guillaume Porcher
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/GroovyExpressionTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/GroovyExpressionTest.java 2008-10-31 09:11:30 UTC (rev 2692)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/GroovyExpressionTest.java 2008-10-31 09:12:32 UTC (rev 2693)
@@ -28,7 +28,7 @@
import org.jbpm.pvm.internal.script.ScriptManager;
import org.jbpm.pvm.model.ProcessFactory;
import org.jbpm.pvm.samples.activities.WaitState;
-import org.jbpm.pvm.test.base.JbpmTestCase;
+import org.jbpm.test.JbpmTestCase;
/**
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/JuelExpressionTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/JuelExpressionTest.java 2008-10-31 09:11:30 UTC (rev 2692)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/JuelExpressionTest.java 2008-10-31 09:12:32 UTC (rev 2693)
@@ -28,7 +28,7 @@
import org.jbpm.pvm.internal.script.ScriptManager;
import org.jbpm.pvm.model.ProcessFactory;
import org.jbpm.pvm.samples.activities.WaitState;
-import org.jbpm.pvm.test.base.JbpmTestCase;
+import org.jbpm.test.JbpmTestCase;
/**
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorIsolationDbTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorIsolationDbTest.java 2008-10-31 09:11:30 UTC (rev 2692)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorIsolationDbTest.java 2008-10-31 09:12:32 UTC (rev 2693)
@@ -24,7 +24,7 @@
import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor;
import org.jbpm.pvm.session.MessageSession;
import org.jbpm.pvm.session.PvmDbSession;
-import org.jbpm.pvm.test.base.DbTestCase;
+import org.jbpm.test.DbTestCase;
/**
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorTest.java 2008-10-31 09:11:30 UTC (rev 2692)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorTest.java 2008-10-31 09:12:32 UTC (rev 2693)
@@ -50,8 +50,8 @@
import org.jbpm.pvm.model.ProcessFactory;
import org.jbpm.pvm.session.MessageSession;
import org.jbpm.pvm.session.PvmDbSession;
-import org.jbpm.pvm.test.base.DbTestCase;
-import org.jbpm.pvm.test.base.EnvironmentFactoryTestSetup;
+import org.jbpm.test.DbTestCase;
+import org.jbpm.test.EnvironmentFactoryTestSetup;
/**
* @author Tom Baeyens
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionFailingCommitTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionFailingCommitTest.java 2008-10-31 09:11:30 UTC (rev 2692)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionFailingCommitTest.java 2008-10-31 09:12:32 UTC (rev 2693)
@@ -21,8 +21,8 @@
*/
package org.jbpm.pvm.internal.tx;
-import org.jbpm.pvm.test.base.JbpmTestCase;
import org.jbpm.pvm.env.Environment;
+import org.jbpm.test.JbpmTestCase;
/**
* @author Tom Baeyens
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionResourcesCommitTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionResourcesCommitTest.java 2008-10-31 09:11:30 UTC (rev 2692)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionResourcesCommitTest.java 2008-10-31 09:12:32 UTC (rev 2693)
@@ -21,9 +21,9 @@
*/
package org.jbpm.pvm.internal.tx;
-import org.jbpm.pvm.test.base.JbpmTestCase;
import org.jbpm.pvm.env.Environment;
import org.jbpm.pvm.internal.tx.StandardTransaction;
+import org.jbpm.test.JbpmTestCase;
/**
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionResourcesSetRollbackOnlyTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionResourcesSetRollbackOnlyTest.java 2008-10-31 09:11:30 UTC (rev 2692)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionResourcesSetRollbackOnlyTest.java 2008-10-31 09:12:32 UTC (rev 2693)
@@ -21,10 +21,10 @@
*/
package org.jbpm.pvm.internal.tx;
-import org.jbpm.pvm.test.base.JbpmTestCase;
import org.jbpm.pvm.env.Environment;
import org.jbpm.pvm.env.Transaction;
import org.jbpm.pvm.internal.tx.StandardTransaction;
+import org.jbpm.test.JbpmTestCase;
/**
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/type/VariableAutoTypeResolutionTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/type/VariableAutoTypeResolutionTest.java 2008-10-31 09:11:30 UTC (rev 2692)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/type/VariableAutoTypeResolutionTest.java 2008-10-31 09:12:32 UTC (rev 2693)
@@ -40,7 +40,7 @@
import org.jbpm.pvm.internal.type.variable.LongVariable;
import org.jbpm.pvm.internal.type.variable.StringVariable;
import org.jbpm.pvm.model.ProcessFactory;
-import org.jbpm.pvm.test.base.EnvironmentTestCase;
+import org.jbpm.test.EnvironmentTestCase;
/**
* @author Tom Baeyens
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/SubscriptionTestCase.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/SubscriptionTestCase.java 2008-10-31 09:11:30 UTC (rev 2692)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/SubscriptionTestCase.java 2008-10-31 09:12:32 UTC (rev 2693)
@@ -25,7 +25,7 @@
import java.util.List;
import org.jbpm.pvm.internal.util.Listener;
-import org.jbpm.pvm.test.base.JbpmTestCase;
+import org.jbpm.test.JbpmTestCase;
/**
* @author Tom Baeyens
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireObservableTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireObservableTest.java 2008-10-31 09:11:30 UTC (rev 2692)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireObservableTest.java 2008-10-31 09:12:32 UTC (rev 2693)
@@ -23,13 +23,13 @@
import java.util.List;
-import org.jbpm.pvm.test.base.JbpmTestCase;
import org.jbpm.pvm.env.Context;
import org.jbpm.pvm.env.Environment;
import org.jbpm.pvm.env.EnvironmentFactory;
import org.jbpm.pvm.env.PvmEnvironmentFactory;
import org.jbpm.pvm.internal.util.Listener;
import org.jbpm.pvm.internal.wire.WireContext;
+import org.jbpm.test.JbpmTestCase;
/**
* @author Tom Baeyens
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireTestCase.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireTestCase.java 2008-10-31 09:11:30 UTC (rev 2692)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireTestCase.java 2008-10-31 09:12:32 UTC (rev 2693)
@@ -23,11 +23,11 @@
import java.util.List;
-import org.jbpm.pvm.test.base.JbpmTestCase;
import org.jbpm.pvm.internal.wire.WireContext;
import org.jbpm.pvm.internal.wire.WireDefinition;
import org.jbpm.pvm.internal.wire.xml.WireParser;
import org.jbpm.pvm.internal.xml.Problem;
+import org.jbpm.test.JbpmTestCase;
/**
* @author Tom Baeyens
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/xml/DebugDomBuilderTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/xml/DebugDomBuilderTest.java 2008-10-31 09:11:30 UTC (rev 2692)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/xml/DebugDomBuilderTest.java 2008-10-31 09:12:32 UTC (rev 2693)
@@ -24,10 +24,10 @@
import java.io.InputStream;
import java.util.List;
-import org.jbpm.pvm.test.base.JbpmTestCase;
import org.jbpm.pvm.internal.log.Log;
import org.jbpm.pvm.internal.util.DebugDomParser;
import org.jbpm.pvm.internal.util.XmlUtil;
+import org.jbpm.test.JbpmTestCase;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/xml/WireParserTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/xml/WireParserTest.java 2008-10-31 09:11:30 UTC (rev 2692)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/xml/WireParserTest.java 2008-10-31 09:12:32 UTC (rev 2693)
@@ -21,7 +21,7 @@
*/
package org.jbpm.pvm.internal.xml;
-import org.jbpm.pvm.test.base.JbpmTestCase;
+import org.jbpm.test.JbpmTestCase;
/**
* @author Tom Baeyens
Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/xml/XmlParsingTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/xml/XmlParsingTest.java 2008-10-31 09:11:30 UTC (rev 2692)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/xml/XmlParsingTest.java 2008-10-31 09:12:32 UTC (rev 2693)
@@ -4,13 +4,13 @@
import java.util.List;
import org.jbpm.PvmException;
-import org.jbpm.pvm.test.base.JbpmTestCase;
import org.jbpm.pvm.internal.util.TagBinding;
import org.jbpm.pvm.internal.util.XmlUtil;
import org.jbpm.pvm.internal.xml.Bindings;
import org.jbpm.pvm.internal.xml.Parse;
import org.jbpm.pvm.internal.xml.Parser;
import org.jbpm.pvm.internal.xml.Problem;
+import org.jbpm.test.JbpmTestCase;
import org.w3c.dom.Element;
public class XmlParsingTest extends JbpmTestCase {
Added: jbpm4/trunk/modules/test/.classpath
===================================================================
--- jbpm4/trunk/modules/test/.classpath (rev 0)
+++ jbpm4/trunk/modules/test/.classpath 2008-10-31 09:12:32 UTC (rev 2693)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" output="target/classes" path="src/main/java"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Added: jbpm4/trunk/modules/test/.project
===================================================================
--- jbpm4/trunk/modules/test/.project (rev 0)
+++ jbpm4/trunk/modules/test/.project 2008-10-31 09:12:32 UTC (rev 2693)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>test</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ </natures>
+</projectDescription>
Added: jbpm4/trunk/modules/test/pom.xml
===================================================================
--- jbpm4/trunk/modules/test/pom.xml (rev 0)
+++ jbpm4/trunk/modules/test/pom.xml 2008-10-31 09:12:32 UTC (rev 2693)
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<!-- $Id$ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <name>jBPM 4 - Test</name>
+ <groupId>org.jbpm.jbpm4</groupId>
+ <artifactId>jbpm-test</artifactId>
+ <packaging>jar</packaging>
+
+ <!-- Parent -->
+ <parent>
+ <groupId>org.jbpm.jbpm4</groupId>
+ <artifactId>jbpm</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+
+ <!-- Dependencies -->
+ <dependencies>
+ <dependency>
+ <groupId>org.jbpm.jbpm4</groupId>
+ <artifactId>jbpm-api</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate</artifactId>
+ </dependency>
+ </dependencies>
+
+ <!-- Plugins -->
+ <build>
+ <plugins>
+ </plugins>
+ </build>
+
+</project>
\ No newline at end of file
Property changes on: jbpm4/trunk/modules/test/pom.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Copied: jbpm4/trunk/modules/test/src/main/java/org/jbpm/test (from rev 2677, jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/test/base)
Property changes on: jbpm4/trunk/modules/test/src/main/java/org/jbpm/test
___________________________________________________________________
Name: svn:mergeinfo
+
Deleted: jbpm4/trunk/modules/test/src/main/java/org/jbpm/test/DbTestCase.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/test/base/DbTestCase.java 2008-10-30 13:20:37 UTC (rev 2677)
+++ jbpm4/trunk/modules/test/src/main/java/org/jbpm/test/DbTestCase.java 2008-10-31 09:12:32 UTC (rev 2693)
@@ -1,71 +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.pvm.test.base;
-
-import org.jbpm.pvm.ExecutionService;
-import org.jbpm.pvm.ManagementService;
-import org.jbpm.pvm.ProcessService;
-import org.jbpm.pvm.internal.cmd.CommandService;
-
-
-/** for tests that use persistence through a command service.
- *
- * The DB is cleaned inbetween tests. No environment is created.
- *
- * @author Tom Baeyens
- */
-public abstract class DbTestCase extends EnvironmentFactoryTestCase {
-
- protected CommandService commandService;
- protected ProcessService processService;
- protected ExecutionService executionService;
- protected ManagementService managementService;
-
- public DbTestCase() {
- super();
- }
-
- public DbTestCase(String configResource) {
- super(configResource);
- }
-
- public void setUp() throws Exception {
- super.setUp();
-
- if (isEnvironmentFactoryCached()) {
- Db.clean(getEnvironmentFactory());
- }
-
- commandService = getEnvironmentFactory().get(CommandService.class);
- processService = getEnvironmentFactory().get(ProcessService.class);
- executionService = getEnvironmentFactory().get(ExecutionService.class);
- managementService = getEnvironmentFactory().get(ManagementService.class);
- }
-
- public void tearDown() throws Exception {
- commandService = null;
- processService = null;
- executionService = null;
- managementService = null;
- super.tearDown();
- }
-}
Copied: jbpm4/trunk/modules/test/src/main/java/org/jbpm/test/DbTestCase.java (from rev 2682, jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/test/base/DbTestCase.java)
===================================================================
--- jbpm4/trunk/modules/test/src/main/java/org/jbpm/test/DbTestCase.java (rev 0)
+++ jbpm4/trunk/modules/test/src/main/java/org/jbpm/test/DbTestCase.java 2008-10-31 09:12:32 UTC (rev 2693)
@@ -0,0 +1,71 @@
+/*
+ * 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.pvm.test.base;
+
+import org.jbpm.ExecutionService;
+import org.jbpm.ManagementService;
+import org.jbpm.ProcessService;
+import org.jbpm.pvm.internal.cmd.CommandService;
+
+
+/** for tests that use persistence through a command service.
+ *
+ * The DB is cleaned inbetween tests. No environment is created.
+ *
+ * @author Tom Baeyens
+ */
+public abstract class DbTestCase extends EnvironmentFactoryTestCase {
+
+ protected CommandService commandService;
+ protected ProcessService processService;
+ protected ExecutionService executionService;
+ protected ManagementService managementService;
+
+ public DbTestCase() {
+ super();
+ }
+
+ public DbTestCase(String configResource) {
+ super(configResource);
+ }
+
+ public void setUp() throws Exception {
+ super.setUp();
+
+ if (isEnvironmentFactoryCached()) {
+ Db.clean(getEnvironmentFactory());
+ }
+
+ commandService = getEnvironmentFactory().get(CommandService.class);
+ processService = getEnvironmentFactory().get(ProcessService.class);
+ executionService = getEnvironmentFactory().get(ExecutionService.class);
+ managementService = getEnvironmentFactory().get(ManagementService.class);
+ }
+
+ public void tearDown() throws Exception {
+ commandService = null;
+ processService = null;
+ executionService = null;
+ managementService = null;
+ super.tearDown();
+ }
+}
Deleted: jbpm4/trunk/modules/test/src/main/java/org/jbpm/test/EnvironmentDbTestCase.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/test/base/EnvironmentDbTestCase.java 2008-10-30 13:20:37 UTC (rev 2677)
+++ jbpm4/trunk/modules/test/src/main/java/org/jbpm/test/EnvironmentDbTestCase.java 2008-10-31 09:12:32 UTC (rev 2693)
@@ -1,154 +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.pvm.test.base;
-
-import java.lang.reflect.Field;
-
-import org.hibernate.Session;
-import org.hibernate.SessionFactory;
-import org.hibernate.Transaction;
-import org.jbpm.pvm.Execution;
-import org.jbpm.pvm.internal.model.ExecutionImpl;
-import org.jbpm.pvm.internal.model.ProcessDefinitionImpl;
-import org.jbpm.pvm.internal.util.ReflectUtil;
-import org.jbpm.pvm.model.OpenProcessDefinition;
-import org.jbpm.pvm.session.DbSession;
-import org.jbpm.pvm.session.PvmDbSession;
-
-
-/** for tests that use persistence inside environment blocks.
- *
- * An environment is opened in the setUp and closed in the tearDown.
- * DB is cleaned inbetween tests. Extra convenience methods for usage
- * inside an environment block are provided.
- *
- * @author Tom Baeyens
- */
-public class EnvironmentDbTestCase extends EnvironmentTestCase {
-
- Transaction transaction = null;
-
- public EnvironmentDbTestCase() {
- }
-
- public EnvironmentDbTestCase(String configResource) {
- super(configResource);
- }
-
- public void setUp() throws Exception {
- if (isEnvironmentFactoryCached()) {
- Db.clean(getEnvironmentFactory());
- }
- super.setUp();
- beginTransaction();
- }
-
- public void tearDown() throws Exception {
- commitTransaction();
- super.tearDown();
- }
-
- void beginTransaction() {
- Session session = environment.get(Session.class);
- transaction = session.beginTransaction();
- }
-
- void commitTransaction() {
- transaction.commit();
- transaction = null;
- }
-
- void rollbackTransaction() {
- transaction.rollback();
- transaction = null;
- }
-
- public DbSession getDbSession() {
- return environment.get(DbSession.class);
- }
-
- public void rollbackAndBeginNewTransaction() {
- rollbackTransaction();
- closeEnvironment();
- openEnvironment();
- beginTransaction();
- }
-
- public void newTransaction() {
- try {
- commitTransaction();
- closeEnvironment();
- } finally {
- openEnvironment();
- beginTransaction();
- }
- }
-
- public void beginCacheTest() {
- SessionFactory sessionFactory = environment.get(SessionFactory.class);
- if (sessionFactory != null) {
- log.debug("=================================================================");
- log.debug("Beginning of the cache test, no more sql query should be performed before the end of the test");
- log.debug("=================================================================");
-
- sessionFactory.getStatistics().clear();
- sessionFactory.getStatistics().setStatisticsEnabled(true);
- }
- }
-
- public void endCacheTest() {
- SessionFactory sessionFactory = environment.get(SessionFactory.class);
- if (sessionFactory != null) {
- assertEquals(0, sessionFactory.getStatistics().getEntityLoadCount());
- assertEquals(0, sessionFactory.getStatistics().getCollectionLoadCount());
- }
- }
-
- public ProcessDefinitionImpl reload(OpenProcessDefinition processDefinition) {
- environment.get(PvmDbSession.class).save(processDefinition);
- newTransaction();
- return environment.get(PvmDbSession.class).get(ProcessDefinitionImpl.class, processDefinition.getDbid());
- }
-
- public <T> T reload(T object, Class<T> persistentClass) {
- environment.get(DbSession.class).save(object);
- newTransaction();
-
- Long dbid = null;
- try {
- Field dbidField = ReflectUtil.getField(persistentClass, "dbid");
- dbidField.setAccessible(true);
- dbid = (Long) dbidField.get(object);
- } catch (Exception e) {
- e.printStackTrace();
- }
-
- return environment.get(DbSession.class).get(persistentClass, dbid);
- }
-
- public ExecutionImpl reload(Execution execution) {
- environment.get(PvmDbSession.class).save(execution);
- newTransaction();
- return environment.get(PvmDbSession.class).get(ExecutionImpl.class, execution.getDbid());
- }
-
-}
Copied: jbpm4/trunk/modules/test/src/main/java/org/jbpm/test/EnvironmentDbTestCase.java (from rev 2682, jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/test/base/EnvironmentDbTestCase.java)
===================================================================
--- jbpm4/trunk/modules/test/src/main/java/org/jbpm/test/EnvironmentDbTestCase.java (rev 0)
+++ jbpm4/trunk/modules/test/src/main/java/org/jbpm/test/EnvironmentDbTestCase.java 2008-10-31 09:12:32 UTC (rev 2693)
@@ -0,0 +1,154 @@
+/*
+ * 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.pvm.test.base;
+
+import java.lang.reflect.Field;
+
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+import org.hibernate.Transaction;
+import org.jbpm.Execution;
+import org.jbpm.pvm.internal.model.ExecutionImpl;
+import org.jbpm.pvm.internal.model.ProcessDefinitionImpl;
+import org.jbpm.pvm.internal.util.ReflectUtil;
+import org.jbpm.pvm.model.OpenProcessDefinition;
+import org.jbpm.pvm.session.DbSession;
+import org.jbpm.pvm.session.PvmDbSession;
+
+
+/** for tests that use persistence inside environment blocks.
+ *
+ * An environment is opened in the setUp and closed in the tearDown.
+ * DB is cleaned inbetween tests. Extra convenience methods for usage
+ * inside an environment block are provided.
+ *
+ * @author Tom Baeyens
+ */
+public class EnvironmentDbTestCase extends EnvironmentTestCase {
+
+ Transaction transaction = null;
+
+ public EnvironmentDbTestCase() {
+ }
+
+ public EnvironmentDbTestCase(String configResource) {
+ super(configResource);
+ }
+
+ public void setUp() throws Exception {
+ if (isEnvironmentFactoryCached()) {
+ Db.clean(getEnvironmentFactory());
+ }
+ super.setUp();
+ beginTransaction();
+ }
+
+ public void tearDown() throws Exception {
+ commitTransaction();
+ super.tearDown();
+ }
+
+ void beginTransaction() {
+ Session session = environment.get(Session.class);
+ transaction = session.beginTransaction();
+ }
+
+ void commitTransaction() {
+ transaction.commit();
+ transaction = null;
+ }
+
+ void rollbackTransaction() {
+ transaction.rollback();
+ transaction = null;
+ }
+
+ public DbSession getDbSession() {
+ return environment.get(DbSession.class);
+ }
+
+ public void rollbackAndBeginNewTransaction() {
+ rollbackTransaction();
+ closeEnvironment();
+ openEnvironment();
+ beginTransaction();
+ }
+
+ public void newTransaction() {
+ try {
+ commitTransaction();
+ closeEnvironment();
+ } finally {
+ openEnvironment();
+ beginTransaction();
+ }
+ }
+
+ public void beginCacheTest() {
+ SessionFactory sessionFactory = environment.get(SessionFactory.class);
+ if (sessionFactory != null) {
+ log.debug("=================================================================");
+ log.debug("Beginning of the cache test, no more sql query should be performed before the end of the test");
+ log.debug("=================================================================");
+
+ sessionFactory.getStatistics().clear();
+ sessionFactory.getStatistics().setStatisticsEnabled(true);
+ }
+ }
+
+ public void endCacheTest() {
+ SessionFactory sessionFactory = environment.get(SessionFactory.class);
+ if (sessionFactory != null) {
+ assertEquals(0, sessionFactory.getStatistics().getEntityLoadCount());
+ assertEquals(0, sessionFactory.getStatistics().getCollectionLoadCount());
+ }
+ }
+
+ public ProcessDefinitionImpl reload(OpenProcessDefinition processDefinition) {
+ environment.get(PvmDbSession.class).save(processDefinition);
+ newTransaction();
+ return environment.get(PvmDbSession.class).get(ProcessDefinitionImpl.class, processDefinition.getDbid());
+ }
+
+ public <T> T reload(T object, Class<T> persistentClass) {
+ environment.get(DbSession.class).save(object);
+ newTransaction();
+
+ Long dbid = null;
+ try {
+ Field dbidField = ReflectUtil.getField(persistentClass, "dbid");
+ dbidField.setAccessible(true);
+ dbid = (Long) dbidField.get(object);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ return environment.get(DbSession.class).get(persistentClass, dbid);
+ }
+
+ public ExecutionImpl reload(Execution execution) {
+ environment.get(PvmDbSession.class).save(execution);
+ newTransaction();
+ return environment.get(PvmDbSession.class).get(ExecutionImpl.class, execution.getDbid());
+ }
+
+}
Deleted: jbpm4/trunk/modules/test/src/main/java/org/jbpm/test/EnvironmentFactoryTestCase.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/test/base/EnvironmentFactoryTestCase.java 2008-10-30 13:20:37 UTC (rev 2677)
+++ jbpm4/trunk/modules/test/src/main/java/org/jbpm/test/EnvironmentFactoryTestCase.java 2008-10-31 09:12:32 UTC (rev 2693)
@@ -1,82 +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.pvm.test.base;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.jbpm.pvm.PvmException;
-import org.jbpm.pvm.env.EnvironmentFactory;
-import org.jbpm.pvm.env.PvmEnvironmentFactory;
-
-
-/**
- * @author Tom Baeyens
- */
-public abstract class EnvironmentFactoryTestCase extends JbpmTestCase {
-
- String configResource;
-
- static Map<String, EnvironmentFactory> environmentFactories = new HashMap<String, EnvironmentFactory>();
-
- public EnvironmentFactoryTestCase() {
- this("environment.cfg.xml");
- }
-
- public EnvironmentFactoryTestCase(String configResource) {
- this.configResource = configResource;
- }
-
- public EnvironmentFactory getEnvironmentFactory() {
- if (isEnvironmentFactoryCached()) {
- return environmentFactories.get(configResource);
- }
- return createEnvironmentFactory();
- }
-
- boolean isEnvironmentFactoryCached() {
- return environmentFactories.containsKey(configResource);
- }
-
- EnvironmentFactory createEnvironmentFactory() {
- return createEnvironmentFactory(configResource);
- }
-
- static EnvironmentFactory createEnvironmentFactory(String configResource) {
- try {
- log.debug("creating environment factory for ["+configResource+"]");
- EnvironmentFactory newEnvironmentFactory = new PvmEnvironmentFactory(configResource);
- environmentFactories.put(configResource, newEnvironmentFactory);
- return newEnvironmentFactory;
- } catch (Exception e) {
- throw new PvmException("Exception during creation of environment factory for "+configResource, e);
- }
- }
-
- static void closeEnvironmentFactory(String configResource) {
- EnvironmentFactory environmentFactory = environmentFactories.remove(configResource);
- if (environmentFactory!=null) {
- log.debug("closing environment factory for ["+configResource+"]");
- environmentFactory.close();
- }
- }
-}
Copied: jbpm4/trunk/modules/test/src/main/java/org/jbpm/test/EnvironmentFactoryTestCase.java (from rev 2682, jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/test/base/EnvironmentFactoryTestCase.java)
===================================================================
--- jbpm4/trunk/modules/test/src/main/java/org/jbpm/test/EnvironmentFactoryTestCase.java (rev 0)
+++ jbpm4/trunk/modules/test/src/main/java/org/jbpm/test/EnvironmentFactoryTestCase.java 2008-10-31 09:12:32 UTC (rev 2693)
@@ -0,0 +1,82 @@
+/*
+ * 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.pvm.test.base;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.jbpm.PvmException;
+import org.jbpm.pvm.env.EnvironmentFactory;
+import org.jbpm.pvm.env.PvmEnvironmentFactory;
+
+
+/**
+ * @author Tom Baeyens
+ */
+public abstract class EnvironmentFactoryTestCase extends JbpmTestCase {
+
+ String configResource;
+
+ static Map<String, EnvironmentFactory> environmentFactories = new HashMap<String, EnvironmentFactory>();
+
+ public EnvironmentFactoryTestCase() {
+ this("environment.cfg.xml");
+ }
+
+ public EnvironmentFactoryTestCase(String configResource) {
+ this.configResource = configResource;
+ }
+
+ public EnvironmentFactory getEnvironmentFactory() {
+ if (isEnvironmentFactoryCached()) {
+ return environmentFactories.get(configResource);
+ }
+ return createEnvironmentFactory();
+ }
+
+ boolean isEnvironmentFactoryCached() {
+ return environmentFactories.containsKey(configResource);
+ }
+
+ EnvironmentFactory createEnvironmentFactory() {
+ return createEnvironmentFactory(configResource);
+ }
+
+ static EnvironmentFactory createEnvironmentFactory(String configResource) {
+ try {
+ log.debug("creating environment factory for ["+configResource+"]");
+ EnvironmentFactory newEnvironmentFactory = new PvmEnvironmentFactory(configResource);
+ environmentFactories.put(configResource, newEnvironmentFactory);
+ return newEnvironmentFactory;
+ } catch (Exception e) {
+ throw new PvmException("Exception during creation of environment factory for "+configResource, e);
+ }
+ }
+
+ static void closeEnvironmentFactory(String configResource) {
+ EnvironmentFactory environmentFactory = environmentFactories.remove(configResource);
+ if (environmentFactory!=null) {
+ log.debug("closing environment factory for ["+configResource+"]");
+ environmentFactory.close();
+ }
+ }
+}
More information about the jbpm-commits
mailing list