[jbpm-commits] JBoss JBPM SVN: r3578 - in jbpm4/trunk/modules: pvm/src/test/java/org/jbpm/pvm and 6 other directories.

Author: tom.baeyens(a)jboss.com Date: 2008-12-29 06:57:15 -0500 (Mon, 29 Dec 2008) New Revision: 3578 Added: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/tx/ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/executionmode/ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/executionmode/embedded/ Removed: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex10/ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/svc/ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/example03/ Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/tx/BasicTransactionTest.java jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/executionmode/embedded/Loan.hbm.xml jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/executionmode/embedded/hibernate.cfg.xml jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/DbTestCase.java Log: pvm test suite cleanup Copied: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/tx (from rev 3570, jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/tx) Property changes on: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/tx ___________________________________________________________________ Name: svn:mergeinfo + Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/tx/BasicTransactionTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/tx/BasicTransactionTest.java 2008-12-29 09:39:56 UTC (rev 3570) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/tx/BasicTransactionTest.java 2008-12-29 11:57:15 UTC (rev 3578) @@ -19,14 +19,12 @@ * 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.api.tx; +package org.jbpm.pvm.tx; import java.util.List; import javax.transaction.Synchronization; -import junit.framework.Test; - import org.hibernate.Session; import org.jbpm.JbpmException; import org.jbpm.cmd.Command; @@ -34,13 +32,12 @@ import org.jbpm.env.Transaction; import org.jbpm.pvm.internal.model.CommentImpl; import org.jbpm.pvm.internal.type.variable.StringVariable; -import org.jbpm.test.OldDbTestCase; -import org.jbpm.test.EnvironmentFactoryTestSetup; +import org.jbpm.test.DbTestCase; /** * @author Tom Baeyens */ -public class BasicTransactionTest extends OldDbTestCase { +public class BasicTransactionTest extends DbTestCase { public void testCommit() { commandService.execute(new Command<Object>() { Copied: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/executionmode/embedded (from rev 3570, jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/example03) Modified: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/executionmode/embedded/Loan.hbm.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/example03/Loan.hbm.xml 2008-12-29 09:39:56 UTC (rev 3570) +++ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/executionmode/embedded/Loan.hbm.xml 2008-12-29 11:57:15 UTC (rev 3578) @@ -4,7 +4,7 @@ "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping package="org.jbpm.pvm.example03" default-access="field"> +<hibernate-mapping package="org.jbpm.pvm.executionmode.embedded" default-access="field"> <typedef name="execution" class="org.jbpm.pvm.internal.hibernate.ExecutionType" /> Modified: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/executionmode/embedded/hibernate.cfg.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/example03/hibernate.cfg.xml 2008-12-29 09:39:56 UTC (rev 3570) +++ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/executionmode/embedded/hibernate.cfg.xml 2008-12-29 11:57:15 UTC (rev 3578) @@ -17,7 +17,7 @@ <property name="hibernate.format_sql">true"</property> <property name="hibernate.use_sql_comments">true"</property> - <mapping resource="org/jbpm/pvm/example03/Loan.hbm.xml"/> + <mapping resource="org/jbpm/pvm/executionmode/embedded/Loan.hbm.xml"/> </session-factory> </hibernate-configuration> Modified: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/DbTestCase.java =================================================================== --- jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/DbTestCase.java 2008-12-29 11:56:58 UTC (rev 3577) +++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/DbTestCase.java 2008-12-29 11:57:15 UTC (rev 3578) @@ -22,10 +22,8 @@ package org.jbpm.test; import java.util.ArrayList; -import java.util.HashMap; import java.util.HashSet; import java.util.List; -import java.util.Map; import org.jbpm.Configuration; import org.jbpm.Execution; @@ -35,7 +33,7 @@ import org.jbpm.ProcessEngine; import org.jbpm.ProcessService; import org.jbpm.TaskService; -import org.jbpm.client.ClientProcessDefinition; +import org.jbpm.cmd.CommandService; import org.jbpm.task.Task; /** @@ -45,26 +43,22 @@ protected static ProcessEngine processEngine = null; - protected ProcessService processService; - protected ExecutionService executionService; - protected ManagementService managementService; - protected TaskService taskService; - + protected static ProcessService processService; + protected static ExecutionService executionService; + protected static ManagementService managementService; + protected static TaskService taskService; + + protected static CommandService commandService; + protected List<ProcessDefinition> processDefinitions; protected List<String> taskIds; protected void setUp() throws Exception { super.setUp(); - - initializeProcessEngine(); - - processService = processEngine.getProcessService(); - executionService = processEngine.getExecutionService(); - managementService = processEngine.getManagementService(); - taskService = processEngine.getTaskService(); + initialize(); } - protected synchronized void initializeProcessEngine() { + protected synchronized void initialize() { if (processEngine==null) { String jbpmTestCfgType = System.getProperty("jbpm.test.cfg.type"); @@ -76,6 +70,12 @@ } processEngine = configuration.buildProcessEngine(); + + processService = processEngine.getProcessService(); + executionService = processEngine.getExecutionService(); + managementService = processEngine.getManagementService(); + taskService = processEngine.getTaskService(); + commandService = processEngine.get(CommandService.class); } }