From f13306ce45958ad46c179ef1e063a9a5f8a43011 Mon Sep 17 00:00:00 2001
From: Dave Ward <left@alfresco.com>
Date: Wed, 24 Jun 2009 10:21:26 +0000
Subject: [PATCH] Fix failing JBPMDeleteProcessTest after removal of derby
 dependencies - Run on real repository rather than fake derby one - Also
 tidied up classpath.unit.test in build.xml

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14881 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../workflow/jbpm/JBPMDeleteProcessTest.java  |  45 +----
 .../jbpmresources/hibernate.cfg.xml           | 171 ------------------
 2 files changed, 9 insertions(+), 207 deletions(-)
 delete mode 100644 source/test-resources/jbpmresources/hibernate.cfg.xml

diff --git a/source/java/org/alfresco/repo/workflow/jbpm/JBPMDeleteProcessTest.java b/source/java/org/alfresco/repo/workflow/jbpm/JBPMDeleteProcessTest.java
index 90900e594b..60b0f73dce 100644
--- a/source/java/org/alfresco/repo/workflow/jbpm/JBPMDeleteProcessTest.java
+++ b/source/java/org/alfresco/repo/workflow/jbpm/JBPMDeleteProcessTest.java
@@ -27,8 +27,7 @@ package org.alfresco.repo.workflow.jbpm;
 
 import java.util.List;
 
-import junit.framework.TestCase;
-
+import org.alfresco.util.BaseSpringTest;
 import org.jbpm.JbpmConfiguration;
 import org.jbpm.JbpmContext;
 import org.jbpm.db.GraphSession;
@@ -47,43 +46,17 @@ import org.jbpm.taskmgmt.exe.TaskInstance;
  * @author davidc
  */
 
-public class JBPMDeleteProcessTest extends TestCase {
+public class JBPMDeleteProcessTest extends BaseSpringTest {
 
-    static JbpmConfiguration jbpmConfiguration = null; 
-    static long processId = -1L;
-    static String currentTokenPath = null;
+    JbpmConfiguration jbpmConfiguration; 
+    long processId = -1L;
+    String currentTokenPath;
 
-    static {
-      jbpmConfiguration = JbpmConfiguration.parseXmlString(
-        "<jbpm-configuration>" +
-        "  <jbpm-context>" +
-        "    <service name='persistence' factory='org.jbpm.persistence.db.DbPersistenceServiceFactory' />" + 
-        "    <service name='tx' factory='org.jbpm.tx.TxServiceFactory' />" +
-        "  </jbpm-context>" +
-        "  <string name='resource.hibernate.cfg.xml' " +
-        "          value='jbpmresources/hibernate.cfg.xml' />" +
-        "  <string name='resource.business.calendar' " +
-        "          value='org/jbpm/calendar/jbpm.business.calendar.properties' />" +
-        "  <string name='resource.default.modules' " +
-        "          value='org/jbpm/graph/def/jbpm.default.modules.properties' />" +
-        "  <string name='resource.converter' " +
-        "          value='org/jbpm/db/hibernate/jbpm.converter.properties' />" +
-        "  <string name='resource.action.types' " +
-        "          value='org/jbpm/graph/action/action.types.xml' />" +
-        "  <string name='resource.node.types' " +
-        "          value='org/jbpm/graph/node/node.types.xml' />" +
-        "  <string name='resource.varmapping' " +
-        "          value='org/jbpm/context/exe/jbpm.varmapping.xml' />" +
-        "</jbpm-configuration>"
-      );
-    }
     
-    public void setUp() {
-      jbpmConfiguration.createSchema();
-    }
-    
-    public void tearDown() {
-      jbpmConfiguration.dropSchema();
+    @Override
+    protected void onSetUpInTransaction() throws Exception
+    {
+        jbpmConfiguration = (JbpmConfiguration) getApplicationContext().getBean("jbpm_configuration");
     }
 
     public void testDelete() {
diff --git a/source/test-resources/jbpmresources/hibernate.cfg.xml b/source/test-resources/jbpmresources/hibernate.cfg.xml
deleted file mode 100644
index 396343c1ef..0000000000
--- a/source/test-resources/jbpmresources/hibernate.cfg.xml
+++ /dev/null
@@ -1,171 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-
-<!DOCTYPE hibernate-configuration PUBLIC
-          "-//Hibernate/Hibernate Configuration DTD 3.0//EN"
-          "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
-
-<hibernate-configuration>
-  <session-factory>
-
-    <!-- jdbc connection properties -->
-    <property name="hibernate.cache.provider_class">org.alfresco.repo.cache.InternalEhCacheManagerFactoryBean</property>
-    <property name="hibernate.cache.use_second_level_cache">true</property>
-    <property name="hibernate.dialect">org.hibernate.dialect.DerbyDialect</property>
-    <property name="hibernate.connection.driver_class">org.apache.derby.jdbc.EmbeddedDriver</property>
-    <property name="hibernate.connection.url">jdbc:derby:./JBPM;create=true</property>
-    <property name="hibernate.connection.username">sa</property>
-    <property name="hibernate.connection.password"></property>
-        
-    <!-- other hibernate properties 
-    <property name="hibernate.show_sql">true</property>
-    <property name="hibernate.format_sql">true</property>
-    <property name="hibernate.use_sql_comments">true</property>
-    -->
-
-    <!-- ############################################ -->
-    <!-- # mapping files with external dependencies # -->
-    <!-- ############################################ -->
-
-    <!-- following mapping file has a dependendy on   -->
-    <!-- 'bsh-{version}.jar'.                         -->
-    <!-- uncomment this if you don't have bsh on your -->
-    <!-- classpath.  you won't be able to use the     -->
-    <!-- script element in process definition files   -->
-    <mapping resource="org/jbpm/graph/action/Script.hbm.xml"/>
-
-    <!-- following mapping files have a dependendy on  -->
-    <!-- 'jbpm-identity.jar', mapping files            -->
-    <!-- of the pluggable jbpm identity component.     -->
-    <!-- Uncomment the following 3 lines if you        -->
-    <!-- want to use the jBPM identity mgmgt           -->
-    <!-- component.                                    -->
-    <!-- identity mappings (begin) -->
-    <mapping resource="hibernate.identity.hbm.xml"/>
-    
-    <!-- identity mappings (end) -->
-    
-    <!-- following mapping files have a dependendy on  -->
-    <!-- the JCR API                                   -->
-    <!-- jcr mappings (begin) ===
-    <mapping resource="org/jbpm/context/exe/variableinstance/JcrNodeInstance.hbm.xml"/>
-    ==== jcr mappings (end) -->
-
-
-    <!-- ###################### -->
-    <!-- # jbpm mapping files # -->
-    <!-- ###################### -->
-
-    <!-- hql queries and type defs -->
-    <mapping resource="org/jbpm/db/hibernate.queries.hbm.xml" />
-    
-    <!-- graph.def mapping files -->
-    <mapping resource="org/jbpm/graph/def/ProcessDefinition.hbm.xml"/>
-    <mapping resource="org/jbpm/graph/def/Node.hbm.xml"/>
-    <mapping resource="org/jbpm/graph/def/Transition.hbm.xml"/>
-    <mapping resource="org/jbpm/graph/def/Event.hbm.xml"/>
-    <mapping resource="org/jbpm/graph/def/Action.hbm.xml"/>
-    <mapping resource="org/jbpm/graph/def/SuperState.hbm.xml"/>
-    <mapping resource="org/jbpm/graph/def/ExceptionHandler.hbm.xml"/>
-    <mapping resource="org/jbpm/instantiation/Delegation.hbm.xml"/>
-
-    <!-- graph.node mapping files -->
-    <mapping resource="org/jbpm/graph/node/StartState.hbm.xml"/>
-    <mapping resource="org/jbpm/graph/node/EndState.hbm.xml"/>
-    <mapping resource="org/jbpm/graph/node/ProcessState.hbm.xml"/>
-    <mapping resource="org/jbpm/graph/node/Decision.hbm.xml"/>
-    <mapping resource="org/jbpm/graph/node/Fork.hbm.xml"/>
-    <mapping resource="org/jbpm/graph/node/Join.hbm.xml"/>
-    <mapping resource="org/jbpm/graph/node/State.hbm.xml"/>
-    <mapping resource="org/jbpm/graph/node/TaskNode.hbm.xml"/>
-
-    <!-- context.def mapping files -->
-    <mapping resource="org/jbpm/context/def/ContextDefinition.hbm.xml"/>
-    <mapping resource="org/jbpm/context/def/VariableAccess.hbm.xml"/>
-
-    <!-- taskmgmt.def mapping files -->
-    <mapping resource="org/jbpm/taskmgmt/def/TaskMgmtDefinition.hbm.xml"/>
-    <mapping resource="org/jbpm/taskmgmt/def/Swimlane.hbm.xml"/>
-    <mapping resource="org/jbpm/taskmgmt/def/Task.hbm.xml"/>
-    <mapping resource="org/jbpm/taskmgmt/def/TaskController.hbm.xml"/>
-
-    <!-- module.def mapping files -->
-    <mapping resource="org/jbpm/module/def/ModuleDefinition.hbm.xml"/>
-
-    <!-- bytes mapping files -->
-    <mapping resource="org/jbpm/bytes/ByteArray.hbm.xml"/>
-
-    <!-- file.def mapping files -->
-    <mapping resource="org/jbpm/file/def/FileDefinition.hbm.xml"/>
-
-    <!-- scheduler.def mapping files -->
-    <mapping resource="org/jbpm/scheduler/def/CreateTimerAction.hbm.xml"/>
-    <mapping resource="org/jbpm/scheduler/def/CancelTimerAction.hbm.xml"/>
-
-    <!-- graph.exe mapping files -->
-    <mapping resource="org/jbpm/graph/exe/Comment.hbm.xml"/>
-    <mapping resource="org/jbpm/graph/exe/ProcessInstance.hbm.xml"/>
-    <mapping resource="org/jbpm/graph/exe/Token.hbm.xml"/>
-    <mapping resource="org/jbpm/graph/exe/RuntimeAction.hbm.xml"/>
-
-    <!-- module.exe mapping files -->
-    <mapping resource="org/jbpm/module/exe/ModuleInstance.hbm.xml"/>
-        
-    <!-- context.exe mapping files -->
-    <mapping resource="org/jbpm/context/exe/ContextInstance.hbm.xml"/>
-    <mapping resource="org/jbpm/context/exe/TokenVariableMap.hbm.xml"/>
-    <mapping resource="org/jbpm/context/exe/VariableInstance.hbm.xml"/>
-    <mapping resource="org/jbpm/context/exe/variableinstance/ByteArrayInstance.hbm.xml"/>
-    <mapping resource="org/jbpm/context/exe/variableinstance/DateInstance.hbm.xml"/>
-    <mapping resource="org/jbpm/context/exe/variableinstance/DoubleInstance.hbm.xml"/>
-    <mapping resource="org/jbpm/context/exe/variableinstance/HibernateLongInstance.hbm.xml"/>
-    <mapping resource="org/jbpm/context/exe/variableinstance/HibernateStringInstance.hbm.xml"/>
-    <mapping resource="org/jbpm/context/exe/variableinstance/LongInstance.hbm.xml"/>
-    <mapping resource="org/jbpm/context/exe/variableinstance/NullInstance.hbm.xml"/>
-    <mapping resource="org/jbpm/context/exe/variableinstance/StringInstance.hbm.xml"/>
-
-    <!-- job mapping files -->
-    <mapping resource="org/jbpm/job/Job.hbm.xml"/>
-    <mapping resource="org/jbpm/job/Timer.hbm.xml"/>
-    <mapping resource="org/jbpm/job/ExecuteNodeJob.hbm.xml"/>
-    <mapping resource="org/jbpm/job/ExecuteActionJob.hbm.xml"/>
-
-    <!-- taskmgmt.exe mapping files -->
-    <mapping resource="org/jbpm/taskmgmt/exe/TaskMgmtInstance.hbm.xml"/>
-    <mapping resource="org/jbpm/taskmgmt/exe/TaskInstance.hbm.xml"/>
-    <mapping resource="org/jbpm/taskmgmt/exe/PooledActor.hbm.xml"/>
-    <mapping resource="org/jbpm/taskmgmt/exe/SwimlaneInstance.hbm.xml"/>
-
-    <!-- logging mapping files -->
-    <mapping resource="org/jbpm/logging/log/ProcessLog.hbm.xml"/>
-    <mapping resource="org/jbpm/logging/log/MessageLog.hbm.xml"/>
-    <mapping resource="org/jbpm/logging/log/CompositeLog.hbm.xml"/>
-    <mapping resource="org/jbpm/graph/log/ActionLog.hbm.xml"/>
-    <mapping resource="org/jbpm/graph/log/NodeLog.hbm.xml"/>
-    <mapping resource="org/jbpm/graph/log/ProcessInstanceCreateLog.hbm.xml"/>
-    <mapping resource="org/jbpm/graph/log/ProcessInstanceEndLog.hbm.xml"/>
-    <mapping resource="org/jbpm/graph/log/ProcessStateLog.hbm.xml"/>
-    <mapping resource="org/jbpm/graph/log/SignalLog.hbm.xml"/>
-    <mapping resource="org/jbpm/graph/log/TokenCreateLog.hbm.xml"/>
-    <mapping resource="org/jbpm/graph/log/TokenEndLog.hbm.xml"/>
-    <mapping resource="org/jbpm/graph/log/TransitionLog.hbm.xml"/>
-    <mapping resource="org/jbpm/context/log/VariableLog.hbm.xml"/>
-    <mapping resource="org/jbpm/context/log/VariableCreateLog.hbm.xml"/>
-    <mapping resource="org/jbpm/context/log/VariableDeleteLog.hbm.xml"/>
-    <mapping resource="org/jbpm/context/log/VariableUpdateLog.hbm.xml"/>
-    <mapping resource="org/jbpm/context/log/variableinstance/ByteArrayUpdateLog.hbm.xml"/>
-    <mapping resource="org/jbpm/context/log/variableinstance/DateUpdateLog.hbm.xml"/>
-    <mapping resource="org/jbpm/context/log/variableinstance/DoubleUpdateLog.hbm.xml"/>
-    <mapping resource="org/jbpm/context/log/variableinstance/HibernateLongUpdateLog.hbm.xml"/>
-    <mapping resource="org/jbpm/context/log/variableinstance/HibernateStringUpdateLog.hbm.xml"/>
-    <mapping resource="org/jbpm/context/log/variableinstance/LongUpdateLog.hbm.xml"/>
-    <mapping resource="org/jbpm/context/log/variableinstance/StringUpdateLog.hbm.xml"/>
-    <mapping resource="org/jbpm/taskmgmt/log/TaskLog.hbm.xml"/>
-    <mapping resource="org/jbpm/taskmgmt/log/TaskCreateLog.hbm.xml"/>
-    <mapping resource="org/jbpm/taskmgmt/log/TaskAssignLog.hbm.xml"/>
-    <mapping resource="org/jbpm/taskmgmt/log/TaskEndLog.hbm.xml"/>
-    <mapping resource="org/jbpm/taskmgmt/log/SwimlaneLog.hbm.xml"/>
-    <mapping resource="org/jbpm/taskmgmt/log/SwimlaneCreateLog.hbm.xml"/>
-    <mapping resource="org/jbpm/taskmgmt/log/SwimlaneAssignLog.hbm.xml"/>
-    
-  </session-factory>
-</hibernate-configuration>