improve test stability

closes #368

.gitignore

@@ -19,7 +19,6 @@ bin/
 # Test info
 /settings*.xml
 /lib-jdbc/
-bitronix-default-config.properties
 *.db
 *.tlog
 

jbpm-audit/src/test/resources/bitronix-default-config.properties

@@ -0,0 +1 @@
+bitronix.tm.journal=null

jbpm-bpmn2/pom.xml

@@ -18,7 +18,7 @@
   <description>jBPM BPMN2</description>
 
   <properties>    
-    <maven.jdbc.url>jdbc:h2:tcp://localhost/target/jbpm-bpmn-db</maven.jdbc.url>
+    <maven.jdbc.url>jdbc:h2:tcp://localhost/target/jbpm-bpmn-db;MVCC=TRUE</maven.jdbc.url>
   </properties>
 
   <dependencies>

jbpm-bpmn2/src/test/java/org/jbpm/test/util/AbstractBaseTest.java

@@ -20,16 +20,9 @@
 import org.junit.Assert;
 import org.junit.BeforeClass;
 
-import bitronix.tm.TransactionManagerServices;
-
 public abstract class AbstractBaseTest extends Assert {
 
-    static {
-        if (!TransactionManagerServices.isTransactionManagerRunning()) {
-            TransactionManagerServices.getConfiguration().setJournal("null");
-        }
-    }
-
+
     @BeforeClass
     public static void configure() { 
         LoggingPrintStream.interceptSysOutSysErr();

jbpm-bpmn2/src/test/java/org/jbpm/test/util/CountDownProcessEventListener.java

@@ -3,6 +3,9 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
+import org.drools.persistence.TransactionManager;
+import org.drools.persistence.TransactionManagerFactory;
+import org.drools.persistence.TransactionSynchronization;
 import org.kie.api.event.process.DefaultProcessEventListener;
 import org.kie.api.event.process.ProcessNodeLeftEvent;
 import org.slf4j.Logger;
@@ -24,7 +27,7 @@ public CountDownProcessEventListener(String nodeName, int threads) {
     @Override
     public void afterNodeLeft(ProcessNodeLeftEvent event) {
         if (nodeName.equals(event.getNodeInstance().getNodeName())) {
-            latch.countDown();
+            countDown();
         }
     }
 
@@ -43,4 +46,29 @@ public void waitTillCompleted(long timeOut) {
             logger.debug("Interrputed thread while waiting for all triggers for node {}", nodeName);
         }
     }
+
+    protected void countDown() {
+        try {
+            TransactionManager tm = TransactionManagerFactory.get().newTransactionManager();
+            if (tm != null && tm.getStatus() != TransactionManager.STATUS_NO_TRANSACTION
+                    && tm.getStatus() != TransactionManager.STATUS_ROLLEDBACK
+                    && tm.getStatus() != TransactionManager.STATUS_COMMITTED) {
+                tm.registerTransactionSynchronization(new TransactionSynchronization() {
+
+                    @Override
+                    public void beforeCompletion() {        
+                    }
+
+                    @Override
+                    public void afterCompletion(int status) {
+                        latch.countDown();
+                    }
+                });
+            } else {            
+                latch.countDown();
+            }
+        } catch (Exception e) {
+            latch.countDown();
+        }
+    }
 }

jbpm-bpmn2/src/test/resources/bitronix-default-config.properties

@@ -0,0 +1 @@
+bitronix.tm.journal=null

jbpm-human-task/jbpm-human-task-audit/src/test/resources/bitronix-default-config.properties

@@ -0,0 +1 @@
+bitronix.tm.journal=null

jbpm-human-task/jbpm-human-task-core/src/test/java/org/jbpm/services/task/HumanTaskServicesBaseTest.java

@@ -60,12 +60,6 @@ public abstract class HumanTaskServicesBaseTest {
 
     private static final Logger logger = LoggerFactory.getLogger(HumanTaskServicesBaseTest.class);
 
-    static {
-        if (!TransactionManagerServices.isTransactionManagerRunning()) {
-            TransactionManagerServices.getConfiguration().setJournal("null");
-        }
-    }
-
     protected InternalTaskService taskService;
 
     @BeforeClass

jbpm-human-task/jbpm-human-task-core/src/test/java/org/jbpm/services/task/jaxb/JsonTaskSerializationTest.java

@@ -16,10 +16,6 @@
 package org.jbpm.services.task.jaxb;
 
 import org.codehaus.jackson.map.ObjectMapper;
-import org.jbpm.services.task.impl.model.ContentImpl;
-import org.jbpm.services.task.impl.model.xml.JaxbContent;
-import org.junit.Test;
-import org.kie.api.task.model.Content;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -31,6 +27,9 @@ public class JsonTaskSerializationTest extends AbstractTaskSerializationTest {
 
     private ObjectMapper mapper = new ObjectMapper();
 
+    public JsonTaskSerializationTest() {
+    }
+
     public TestType getType() {
         return TestType.JSON;
     }

jbpm-human-task/jbpm-human-task-core/src/test/resources/bitronix-default-config.properties

@@ -0,0 +1 @@
+bitronix.tm.journal=null

jbpm-human-task/jbpm-human-task-jpa/src/test/resources/bitronix-default-config.properties

@@ -0,0 +1 @@
+bitronix.tm.journal=null

jbpm-human-task/jbpm-human-task-performance/src/test/resources/bitronix-default-config.properties

@@ -0,0 +1 @@
+bitronix.tm.journal=null

jbpm-human-task/jbpm-human-task-workitems/src/test/resources/bitronix-default-config.properties

@@ -0,0 +1 @@
+bitronix.tm.journal=null

jbpm-persistence-jpa/src/test/resources/bitronix-default-config.properties

@@ -0,0 +1 @@
+bitronix.tm.journal=null

jbpm-query-jpa/src/test/resources/bitronix-default-config.properties

@@ -0,0 +1 @@
+bitronix.tm.journal=null

jbpm-runtime-manager/.gitignore

@@ -20,7 +20,6 @@ bin/
 # Test info
 /settings*.xml
 /lib-jdbc/
-bitronix-default-config.properties
 *.db
 
 # modules that don't exist in this branch

jbpm-runtime-manager/src/test/java/org/jbpm/runtime/manager/concurrent/ConcurrentOperationsTest.java

@@ -18,6 +18,7 @@
 import bitronix.tm.resource.jdbc.PoolingDataSource;
 
 import org.jbpm.runtime.manager.impl.DefaultRegisterableItemsFactory;
+import org.jbpm.runtime.manager.impl.RuntimeEngineImpl;
 import org.jbpm.runtime.manager.util.TestUtil;
 import org.jbpm.services.task.identity.JBossUserGroupCallbackImpl;
 import org.jbpm.test.util.AbstractBaseTest;
@@ -90,7 +91,7 @@ public void testExecuteProcessWithAsyncHandler() throws Exception {
 					@Override
 					public Map<String, WorkItemHandler> getWorkItemHandlers(RuntimeEngine runtime) {
 						Map<String, WorkItemHandler> handlers = super.getWorkItemHandlers(runtime);
-						handlers.put("Log", new AsyncWorkItemHandler(runtime.getKieSession()));
+						handlers.put("Log", new AsyncWorkItemHandler(((RuntimeEngineImpl)runtime).getManager()));
 						return handlers;
 					}
 
@@ -150,7 +151,7 @@ public void testExecuteHumanTaskWithAsyncHandler() throws Exception {
 					@Override
 					public Map<String, WorkItemHandler> getWorkItemHandlers(RuntimeEngine runtime) {
 						Map<String, WorkItemHandler> handlers = super.getWorkItemHandlers(runtime);
-						handlers.put("Log", new AsyncWorkItemHandler(runtime.getKieSession()));
+						handlers.put("Log", new AsyncWorkItemHandler(((RuntimeEngineImpl)runtime).getManager()));
 						return handlers;
 					}
 
@@ -211,10 +212,10 @@ public List<ProcessEventListener> getProcessEventListeners(RuntimeEngine runtime
 
     private class AsyncWorkItemHandler implements WorkItemHandler {
 
-    	private KieSession ksession;
+    	private RuntimeManager runtimeManager;
 
-    	AsyncWorkItemHandler(KieSession ksession) {
-    		this.ksession = ksession;
+    	AsyncWorkItemHandler(RuntimeManager runtimeManager) {
+    		this.runtimeManager = runtimeManager;
     	}
 
 		@Override
@@ -224,15 +225,20 @@ public void executeWorkItem(final WorkItem workItem, WorkItemManager manager) {
 
 				@Override
 				public void run() {
-					logger.debug("staring a thread....");
-					ksession.insert("doing it async");
+
 					try {
-						Thread.sleep(1000);
-					} catch (InterruptedException e) {
-
+					    Thread.sleep(1000);
+
+    					RuntimeEngine engine = runtimeManager.getRuntimeEngine(EmptyContext.get());// only for singleton
+                        logger.debug("staring a thread....");
+                        engine.getKieSession().insert("doing it async");
+    					logger.debug("Completing the work item");
+
+    					engine.getKieSession().getWorkItemManager().completeWorkItem(workItem.getId(), null);
+    					runtimeManager.disposeRuntimeEngine(engine);
+					} catch (Exception e) {
+					    logger.error("Error when executing async operation", e);
 					}
-					logger.debug("Completing the work item");
-					ksession.getWorkItemManager().completeWorkItem(workItem.getId(), null);
 				}
 
 			}.start();

jbpm-runtime-manager/src/test/java/org/jbpm/test/util/CountDownProcessEventListener.java

@@ -3,6 +3,9 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
+import org.drools.persistence.TransactionManager;
+import org.drools.persistence.TransactionManagerFactory;
+import org.drools.persistence.TransactionSynchronization;
 import org.kie.api.event.process.DefaultProcessEventListener;
 import org.kie.api.event.process.ProcessNodeLeftEvent;
 import org.slf4j.Logger;
@@ -24,7 +27,7 @@ public CountDownProcessEventListener(String nodeName, int threads) {
     @Override
     public void afterNodeLeft(ProcessNodeLeftEvent event) {
         if (nodeName.equals(event.getNodeInstance().getNodeName())) {
-            latch.countDown();
+            countDown();
         }
     }
 
@@ -52,4 +55,29 @@ public void reset(String nodeName, int threads) {
         this.nodeName = nodeName;
         this.latch = new CountDownLatch(threads);
     }
+
+    protected void countDown() {
+        try {
+            TransactionManager tm = TransactionManagerFactory.get().newTransactionManager();
+            if (tm != null && tm.getStatus() != TransactionManager.STATUS_NO_TRANSACTION
+                    && tm.getStatus() != TransactionManager.STATUS_ROLLEDBACK
+                    && tm.getStatus() != TransactionManager.STATUS_COMMITTED) {
+                tm.registerTransactionSynchronization(new TransactionSynchronization() {
+
+                    @Override
+                    public void beforeCompletion() {        
+                    }
+
+                    @Override
+                    public void afterCompletion(int status) {
+                        latch.countDown();
+                    }
+                });
+            } else {            
+                latch.countDown();
+            }
+        } catch (Exception e) {
+            latch.countDown();
+        }
+    }
 }

jbpm-runtime-manager/src/test/resources/bitronix-default-config.properties

@@ -0,0 +1 @@
+bitronix.tm.journal=null

jbpm-services/jbpm-executor-cdi/.gitignore

@@ -19,7 +19,6 @@ bin/
 # Test info
 /settings*.xml
 /lib-jdbc/
-bitronix-default-config.properties
 *.db
 *.tlog
 

jbpm-services/jbpm-executor-cdi/src/test/resources/bitronix-default-config.properties

@@ -0,0 +1 @@
+bitronix.tm.journal=null

jbpm-services/jbpm-executor/src/test/java/org/jbpm/executor/BasicExecutorBaseTest.java

@@ -49,18 +49,10 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import bitronix.tm.TransactionManagerServices;
-
 public abstract class BasicExecutorBaseTest {
 
     private static final Logger logger = LoggerFactory.getLogger(BasicExecutorBaseTest.class);
 
-    static {
-        if (!TransactionManagerServices.isTransactionManagerRunning()) {
-            TransactionManagerServices.getConfiguration().setJournal("null");
-        }
-    }
-
     protected ExecutorService executorService;
     public static final Map<String, Object> cachedEntities = new HashMap<String, Object>();
 

jbpm-services/jbpm-executor/src/test/java/org/jbpm/executor/ReconfiguredExecutorTest.java

@@ -37,7 +37,6 @@
 import org.kie.api.executor.RequestInfo;
 import org.kie.api.runtime.query.QueryContext;
 
-import bitronix.tm.TransactionManagerServices;
 import bitronix.tm.resource.jdbc.PoolingDataSource;
 
 
@@ -46,12 +45,6 @@ public class ReconfiguredExecutorTest {
 	protected ExecutorService executorService;
     public static final Map<String, Object> cachedEntities = new HashMap<String, Object>();
 
-    static {
-        if (!TransactionManagerServices.isTransactionManagerRunning()) {
-            TransactionManagerServices.getConfiguration().setJournal("null");
-        }
-    }
-
 	private PoolingDataSource pds;
 	private EntityManagerFactory emf = null;
 

jbpm-services/jbpm-executor/src/test/java/org/jbpm/executor/impl/jms/JmsAvaiableJobExecutorTest.java

@@ -51,20 +51,13 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import bitronix.tm.TransactionManagerServices;
 import bitronix.tm.resource.jdbc.PoolingDataSource;
 import bitronix.tm.resource.jms.PoolingConnectionFactory;
 
 public class JmsAvaiableJobExecutorTest  {
 
     private static final Logger logger = LoggerFactory.getLogger(JmsAvaiableJobExecutorTest.class);
-
-    static {
-        if (!TransactionManagerServices.isTransactionManagerRunning()) {
-            TransactionManagerServices.getConfiguration().setJournal("null");
-        }
-    }
-
+
     private ConnectionFactory factory;
     private Queue queue;
 

jbpm-services/jbpm-executor/src/test/java/org/jbpm/executor/impl/jpa/ExecutorQueryBuilderCoverageTest.java

@@ -18,19 +18,13 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import bitronix.tm.TransactionManagerServices;
 import bitronix.tm.resource.jdbc.PoolingDataSource;
 
 public class ExecutorQueryBuilderCoverageTest {
 
     private static final Logger logger = LoggerFactory.getLogger(ExecutorQueryBuilderCoverageTest.class);
 
-    static {
-        if (!TransactionManagerServices.isTransactionManagerRunning()) {
-            TransactionManagerServices.getConfiguration().setJournal("null");
-        }
-    }
-
+
     private static PoolingDataSource pds;
     private static EntityManagerFactory emf;
 

jbpm-services/jbpm-executor/src/test/java/org/jbpm/test/util/AbstractExecutorBaseTest.java

@@ -22,15 +22,9 @@
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 
-import bitronix.tm.TransactionManagerServices;
-
 public abstract class AbstractExecutorBaseTest {
 
-    static {
-        if (!TransactionManagerServices.isTransactionManagerRunning()) {
-            TransactionManagerServices.getConfiguration().setJournal("null");
-        }
-    }
+
     @After
     public void cleanup() {
     	EntityManagerFactoryManager.get().clear();