diff --git a/jbpm-audit/pom.xml b/jbpm-audit/pom.xml
index 15f1dbd009..cf4324a6b1 100644
--- a/jbpm-audit/pom.xml
+++ b/jbpm-audit/pom.xml
@@ -18,7 +18,9 @@
org.jbpm.process.audit
- jdbc:h2:mem:bamTest;MVCC=TRUE
+
+
+ jdbc:h2:mem:bamTest;MODE=LEGACY;NON_KEYWORDS=VALUE
diff --git a/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/ActivityTest.java b/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/ActivityTest.java
index a3040c5d5d..82d98fbd87 100644
--- a/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/ActivityTest.java
+++ b/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/ActivityTest.java
@@ -55,7 +55,7 @@
import org.jbpm.workflow.instance.node.DynamicUtils;
import org.jbpm.workflow.instance.node.WorkItemNodeInstance;
import org.junit.After;
-import org.junit.BeforeClass;
+import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -115,8 +115,8 @@ public ActivityTest(boolean persistence) throws Exception {
super(persistence);
}
- @BeforeClass
- public static void setup() throws Exception {
+ @Before
+ public void setup() throws Exception {
setUpDataSource();
}
@@ -128,6 +128,7 @@ public void dispose() {
ksession = null;
}
if (ksession2 != null) {
+ abortProcessInstances(ksession2);
ksession2.dispose();
ksession2 = null;
}
@@ -687,7 +688,7 @@ public void testCallActivityMIWrongInputTypeStrictDisabled() throws Exception {
VariableScope.setVariableStrictOption(true);
}
}
-
+
@Test
public void testCallActivityMISequential() throws Exception {
KieBase kbase = createKnowledgeBaseWithoutDumper("BPMN2-CallActivityMISequential.bpmn2",
diff --git a/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/CompensationTest.java b/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/CompensationTest.java
index 511251b53d..9cd15fb511 100644
--- a/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/CompensationTest.java
+++ b/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/CompensationTest.java
@@ -107,6 +107,7 @@ public void prepare() {
@After
public void dispose() {
if (ksession != null) {
+ abortProcessInstances(ksession);
ksession.dispose();
ksession = null;
}
@@ -118,7 +119,7 @@ public void dispose() {
@Test
public void compensationViaIntermediateThrowEventProcess() throws Exception {
- KieSession ksession = createKnowledgeSession("compensation/BPMN2-Compensation-IntermediateThrowEvent.bpmn2");
+ ksession = createKnowledgeSession("compensation/BPMN2-Compensation-IntermediateThrowEvent.bpmn2");
TestWorkItemHandler workItemHandler = new TestWorkItemHandler();
ksession.getWorkItemManager().registerWorkItemHandler("Human Task", workItemHandler);
@@ -135,7 +136,7 @@ public void compensationViaIntermediateThrowEventProcess() throws Exception {
@Test
public void compensationTwiceViaSignal() throws Exception {
- KieSession ksession = createKnowledgeSession("compensation/BPMN2-Compensation-IntermediateThrowEvent.bpmn2");
+ ksession = createKnowledgeSession("compensation/BPMN2-Compensation-IntermediateThrowEvent.bpmn2");
TestWorkItemHandler workItemHandler = new TestWorkItemHandler();
ksession.getWorkItemManager().registerWorkItemHandler("Human Task", workItemHandler);
@@ -155,7 +156,7 @@ public void compensationTwiceViaSignal() throws Exception {
@Test
public void subprocessLevelCompensationViaEventSubProcess() throws Exception {
- KieSession ksession = createKnowledgeSession("compensation/BPMN2-Compensation-EventSubProcess.bpmn2");
+ ksession = createKnowledgeSession("compensation/BPMN2-Compensation-EventSubProcess.bpmn2");
TestWorkItemHandler workItemHandler = new TestWorkItemHandler();
ksession.getWorkItemManager().registerWorkItemHandler("Human Task", workItemHandler);
@@ -171,7 +172,7 @@ public void subprocessLevelCompensationViaEventSubProcess() throws Exception {
@Test
public void processLevelCompensationViaEventSubProcess() throws Exception {
- KieSession ksession = createKnowledgeSession("compensation/BPMN2-Compensation-EventSubProcess2.bpmn2");
+ ksession = createKnowledgeSession("compensation/BPMN2-Compensation-EventSubProcess2.bpmn2");
Map params = new HashMap();
params.put("x", "0");
@@ -182,7 +183,7 @@ public void processLevelCompensationViaEventSubProcess() throws Exception {
@Test
public void compensationOnlyAfterAssociatedActivityHasCompleted() throws Exception {
- KieSession ksession = createKnowledgeSession("compensation/BPMN2-Compensation-UserTaskBeforeAssociatedActivity.bpmn2");
+ ksession = createKnowledgeSession("compensation/BPMN2-Compensation-UserTaskBeforeAssociatedActivity.bpmn2");
ksession.addEventListener(LOGGING_EVENT_LISTENER);
TestWorkItemHandler workItemHandler = new TestWorkItemHandler();
ksession.getWorkItemManager().registerWorkItemHandler("Human Task", workItemHandler);
@@ -204,7 +205,7 @@ public void compensationOnlyAfterAssociatedActivityHasCompleted() throws Excepti
@Test
public void orderedCompensation() throws Exception {
- KieSession ksession = createKnowledgeSession("compensation/BPMN2-Compensation-ParallelOrderedCompensation-IntermediateThrowEvent.bpmn2");
+ ksession = createKnowledgeSession("compensation/BPMN2-Compensation-ParallelOrderedCompensation-IntermediateThrowEvent.bpmn2");
TestWorkItemHandler workItemHandler = new TestWorkItemHandler();
ksession.getWorkItemManager().registerWorkItemHandler("Human Task", workItemHandler);
@@ -242,7 +243,7 @@ public void orderedCompensation() throws Exception {
@Test
public void compensationInSubSubProcesses() throws Exception {
- KieSession ksession = createKnowledgeSession("compensation/BPMN2-Compensation-InSubSubProcess.bpmn2");
+ ksession = createKnowledgeSession("compensation/BPMN2-Compensation-InSubSubProcess.bpmn2");
TestWorkItemHandler workItemHandler = new TestWorkItemHandler();
ksession.getWorkItemManager().registerWorkItemHandler("Human Task", workItemHandler);
@@ -263,7 +264,7 @@ public void compensationInSubSubProcesses() throws Exception {
@Test
public void specificCompensationOfASubProcess() throws Exception {
- KieSession ksession = createKnowledgeSession("compensation/BPMN2-Compensation-ThrowSpecificForSubProcess.bpmn2");
+ ksession = createKnowledgeSession("compensation/BPMN2-Compensation-ThrowSpecificForSubProcess.bpmn2");
TestWorkItemHandler workItemHandler = new TestWorkItemHandler();
ksession.getWorkItemManager().registerWorkItemHandler("Human Task", workItemHandler);
@@ -286,7 +287,7 @@ public void specificCompensationOfASubProcess() throws Exception {
@Test
@Ignore
public void compensationViaCancellation() throws Exception {
- KieSession ksession = createKnowledgeSession("compensation/BPMN2-Compensation-IntermediateThrowEvent.bpmn2");
+ ksession = createKnowledgeSession("compensation/BPMN2-Compensation-IntermediateThrowEvent.bpmn2");
TestWorkItemHandler workItemHandler = new TestWorkItemHandler();
ksession.getWorkItemManager().registerWorkItemHandler("Human Task", workItemHandler);
@@ -304,7 +305,7 @@ public void compensationViaCancellation() throws Exception {
@Test
public void compensationInvokingSubProcess() throws Exception {
- KieSession ksession = createKnowledgeSession("compensation/BPMN2-UserTaskCompensation.bpmn2");
+ ksession = createKnowledgeSession("compensation/BPMN2-UserTaskCompensation.bpmn2");
ksession.getWorkItemManager().registerWorkItemHandler("Human Task", new SystemOutWorkItemHandler());
Map params = new HashMap();
@@ -323,7 +324,7 @@ public void compensationInvokingSubProcess() throws Exception {
*/
@Test
public void compensationWithReusableSubprocess() throws Exception {
- KieSession ksession = createKnowledgeSession("compensation/BPMN2-Booking.bpmn2",
+ ksession = createKnowledgeSession("compensation/BPMN2-Booking.bpmn2",
"compensation/BPMN2-BookResource.bpmn2", "compensation/BPMN2-CancelResource.bpmn2");
ProcessInstance processInstance = ksession.startProcess("Booking");
assertProcessInstanceCompleted(processInstance.getId(), ksession);
diff --git a/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/DataTest.java b/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/DataTest.java
index 1847846e33..73f59a3064 100644
--- a/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/DataTest.java
+++ b/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/DataTest.java
@@ -227,6 +227,7 @@ public static void setup() throws Exception {
@After
public void dispose() {
if (ksession != null) {
+ abortProcessInstances(ksession);
ksession.dispose();
ksession = null;
}
diff --git a/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/EndEventTest.java b/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/EndEventTest.java
index 042c19e1cd..f27f6706ac 100644
--- a/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/EndEventTest.java
+++ b/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/EndEventTest.java
@@ -67,6 +67,7 @@ public static void setup() throws Exception {
@After
public void dispose() {
if (ksession != null) {
+ abortProcessInstances(ksession);
ksession.dispose();
ksession = null;
}
diff --git a/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/ErrorEventTest.java b/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/ErrorEventTest.java
index f8baffed15..89c6ef3609 100644
--- a/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/ErrorEventTest.java
+++ b/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/ErrorEventTest.java
@@ -77,10 +77,11 @@ public ErrorEventTest(boolean persistence) {
public static void setup() throws Exception {
setUpDataSource();
}
-
+
@After
public void dispose() {
if (ksession != null) {
+ abortProcessInstances(ksession);
ksession.dispose();
ksession = null;
}
diff --git a/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/EscalationEventTest.java b/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/EscalationEventTest.java
index 5ddf415598..ee6fba8f22 100644
--- a/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/EscalationEventTest.java
+++ b/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/EscalationEventTest.java
@@ -70,6 +70,7 @@ public static void setup() throws Exception {
@After
public void dispose() {
if (ksession != null) {
+ abortProcessInstances(ksession);
ksession.dispose();
ksession = null;
}
diff --git a/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/FlowTest.java b/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/FlowTest.java
index 34742411d1..8d23baa2de 100644
--- a/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/FlowTest.java
+++ b/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/FlowTest.java
@@ -94,6 +94,7 @@ public static void setup() throws Exception {
@After
public void dispose() {
if (ksession != null) {
+ abortProcessInstances(ksession);
ksession.dispose();
ksession = null;
}
diff --git a/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/JbpmBpmn2TestCase.java b/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/JbpmBpmn2TestCase.java
index 173619ce1c..0c1c10af80 100644
--- a/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/JbpmBpmn2TestCase.java
+++ b/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/JbpmBpmn2TestCase.java
@@ -740,7 +740,6 @@ protected void abortProcessInstances(KieSession ksession) {
logService.findActiveProcessInstances().forEach(pi -> ksession.abortProcessInstance(pi.getId()));
} catch(Exception e) {
-
}
}
}
diff --git a/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/StandaloneBPMNProcessTest.java b/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/StandaloneBPMNProcessTest.java
index 1848515579..223bacd2d7 100644
--- a/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/StandaloneBPMNProcessTest.java
+++ b/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/StandaloneBPMNProcessTest.java
@@ -42,6 +42,7 @@
import org.jbpm.process.instance.impl.demo.DoNothingWorkItemHandler;
import org.jbpm.process.instance.impl.demo.SystemOutWorkItemHandler;
import org.jbpm.test.listener.process.NodeLeftCountDownProcessEventListener;
+import org.junit.After;
import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
@@ -72,6 +73,8 @@ public class StandaloneBPMNProcessTest extends JbpmBpmn2TestCase {
private static final Logger logger = LoggerFactory.getLogger(StandaloneBPMNProcessTest.class);
+ private KieSession ksession;
+
@Parameters
public static Collection