[jbpm-commits] JBoss JBPM SVN: r3438 - in jbpm3/trunk/modules/core: src/main/java/org/jbpm/db and 1 other directory.

[do-not-reply at jboss.org]

Author: thomas.diesler at jboss.com
Date: 2008-12-19 04:06:06 -0500 (Fri, 19 Dec 2008)
New Revision: 3438

Modified:
   jbpm3/trunk/modules/core/pom.xml
   jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/AbstractDbTestCase.java
Log:
[JBPM-1811] JmsMessageTest fails intermitently on HSQLDB

Modified: jbpm3/trunk/modules/core/pom.xml
===================================================================
--- jbpm3/trunk/modules/core/pom.xml	2008-12-19 08:45:04 UTC (rev 3437)
+++ jbpm3/trunk/modules/core/pom.xml	2008-12-19 09:06:06 UTC (rev 3438)
@@ -223,8 +223,6 @@
             <artifactId>maven-surefire-plugin</artifactId>
             <configuration>
               <excludes>
-                <!-- Won't Fix [JBPM-1811] JmsMessageTest fails intermitently on HSQLDB  -->
-                <exclude>org/jbpm/msg/jms/JmsMessageTest.java</exclude>
                 <!-- [JBPM-983] concurrent process execution fails -->
                 <exclude>org/jbpm/jbpm983/JBPM983Test.java</exclude>
                 <!-- [JBPM-1072] Concurrent JobExecutors can process the same job in parallel -->
@@ -260,8 +258,6 @@
                 <exclude>org/jbpm/jbpm983/JBPM983Test.java</exclude>
                 <!-- Won't Fix [JBPM-1072] Concurrent JobExecutors can process the same job in parallel -->
                 <exclude>org/jbpm/jbpm1072/JBPM1072Test.java</exclude>
-                <!-- Won't Fix [JBPM-1811] JmsMessageTest fails intermitently on HSQLDB  -->
-                <exclude>org/jbpm/msg/jms/JmsMessageTest.java</exclude>
                 <!-- [JBPM-1810] Fix clean, drop, create schema with JbpmSchema  -->
                 <exclude>org/jbpm/db/JbpmSchemaDbTest.java</exclude>
               </excludes>

Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/AbstractDbTestCase.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/AbstractDbTestCase.java	2008-12-19 08:45:04 UTC (rev 3437)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/AbstractDbTestCase.java	2008-12-19 09:06:06 UTC (rev 3438)
@@ -21,6 +21,8 @@
  */
 package org.jbpm.db;
 
+// $Id$
+
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Timer;
@@ -30,6 +32,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.hibernate.Session;
 import org.hibernate.cfg.Configuration;
+import org.hibernate.cfg.Environment;
 import org.hibernate.tool.hbm2ddl.SchemaExport;
 import org.jbpm.AbstractJbpmTestCase;
 import org.jbpm.JbpmConfiguration;
@@ -40,6 +43,7 @@
 import org.jbpm.job.executor.JobExecutor;
 import org.jbpm.logging.log.ProcessLog;
 import org.jbpm.persistence.db.DbPersistenceServiceFactory;
+import org.jbpm.svc.Services;
 import org.jbpm.taskmgmt.exe.TaskInstance;
 
 public abstract class AbstractDbTestCase extends AbstractJbpmTestCase
@@ -105,13 +109,19 @@
     }
   }
 
-  public void beginSessionTransaction()
+  protected String getHibernateDialect()
   {
+    DbPersistenceServiceFactory factory = (DbPersistenceServiceFactory)jbpmContext.getServiceFactory(Services.SERVICENAME_PERSISTENCE);
+    return factory.getConfiguration().getProperty(Environment.DIALECT);
+  }
+
+  protected void beginSessionTransaction()
+  {
     createJbpmContext();
     initializeMembers();
   }
 
-  public void commitAndCloseSession()
+  protected void commitAndCloseSession()
   {
     closeJbpmContext();
     resetMembers();
@@ -123,28 +133,28 @@
     beginSessionTransaction();
   }
 
-  public ProcessInstance saveAndReload(ProcessInstance pi)
+  protected ProcessInstance saveAndReload(ProcessInstance pi)
   {
     jbpmContext.save(pi);
     newTransaction();
     return graphSession.loadProcessInstance(pi.getId());
   }
 
-  public TaskInstance saveAndReload(TaskInstance taskInstance)
+  protected TaskInstance saveAndReload(TaskInstance taskInstance)
   {
     jbpmContext.save(taskInstance);
     newTransaction();
     return (TaskInstance)session.load(TaskInstance.class, new Long(taskInstance.getId()));
   }
 
-  public ProcessDefinition saveAndReload(ProcessDefinition pd)
+  protected ProcessDefinition saveAndReload(ProcessDefinition pd)
   {
     graphSession.saveProcessDefinition(pd);
     newTransaction();
     return graphSession.loadProcessDefinition(pd.getId());
   }
 
-  public ProcessLog saveAndReload(ProcessLog processLog)
+  protected ProcessLog saveAndReload(ProcessLog processLog)
   {
     loggingSession.saveProcessLog(processLog);
     newTransaction();