JBPM-6510 - Refactor tests to use only one CountDownProcessEventListe…

…ner (#1039)
kiegroup · Oct 24, 2017 · 0622c52 · 0622c52
1 parent dcac15d
commit 0622c52
Show file tree

Hide file tree

Showing 50 changed files with 358 additions and 972 deletions.
diff --git a/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/ActivityTest.java b/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/ActivityTest.java
@@ -38,7 +38,7 @@
 import org.jbpm.process.instance.event.listeners.TriggerRulesEventListener;
 import org.jbpm.process.instance.impl.demo.DoNothingWorkItemHandler;
 import org.jbpm.process.instance.impl.demo.SystemOutWorkItemHandler;
-import org.jbpm.test.util.CountDownProcessEventListener;
+import org.jbpm.test.listener.NodeLeftCountDownProcessEventListener;
 import org.jbpm.workflow.instance.WorkflowRuntimeException;
 import org.jbpm.workflow.instance.node.DynamicNodeInstance;
 import org.jbpm.workflow.instance.node.DynamicUtils;
@@ -546,7 +546,7 @@ public Void execute(Context context) {
     @Test(timeout=10000)
     @RequirePersistence
     public void testProcesWithHumanTaskWithTimer() throws Exception {
-        CountDownProcessEventListener countDownListener = new CountDownProcessEventListener("Timer", 1);
+        NodeLeftCountDownProcessEventListener countDownListener = new NodeLeftCountDownProcessEventListener("Timer", 1);
         KieBase kbase = createKnowledgeBase("BPMN2-SubProcessWithTimer.bpmn2");
         StatefulKnowledgeSession ksession = createKnowledgeSession(kbase);
         ksession.addEventListener(countDownListener);
@@ -756,7 +756,7 @@ public void testCallActivityWithHistoryLog() throws Exception {
     @Test(timeout=10000)
     @RequirePersistence
     public void testCallActivityWithTimer() throws Exception {
-        CountDownProcessEventListener countDownListener = new CountDownProcessEventListener("Timer", 1);
+        NodeLeftCountDownProcessEventListener countDownListener = new NodeLeftCountDownProcessEventListener("Timer", 1);
         KieBase kbase = createKnowledgeBase("BPMN2-ParentProcess.bpmn2",
                 "BPMN2-SubProcessWithTimer.bpmn2");
         ksession = createKnowledgeSession(kbase);
@@ -1364,7 +1364,7 @@ public void testBusinessRuleTaskWithContionalEvent() throws Exception {
     @RequirePersistence
     @Test(timeout=10000)
     public void testNullVariableInScriptTaskProcess() throws Exception {
-        CountDownProcessEventListener countDownListener = new CountDownProcessEventListener("Timer", 1, true);
+        NodeLeftCountDownProcessEventListener countDownListener = new NodeLeftCountDownProcessEventListener("Timer", 1, true);
         KieBase kbase = createKnowledgeBase("BPMN2-NullVariableInScriptTaskProcess.bpmn2");
         ksession = createKnowledgeSession(kbase);
         ksession.addEventListener(countDownListener);
@@ -1396,7 +1396,7 @@ public void testScriptTaskWithVariableByName() throws Exception {
 
     @Test
     public void testCallActivityWithBoundaryEvent() throws Exception {
-        CountDownProcessEventListener countDownListener = new CountDownProcessEventListener("Boundary event", 1);
+        NodeLeftCountDownProcessEventListener countDownListener = new NodeLeftCountDownProcessEventListener("Boundary event", 1);
         KieBase kbase = createKnowledgeBase(
                 "BPMN2-CallActivityWithBoundaryEvent.bpmn2",
                 "BPMN2-CallActivitySubProcessWithBoundaryEvent.bpmn2");

diff --git a/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/FlowTest.java b/jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/FlowTest.java
@@ -22,7 +22,7 @@
 import org.jbpm.process.core.context.variable.VariableScope;
 import org.jbpm.process.instance.context.variable.VariableScopeInstance;
 import org.jbpm.process.instance.impl.demo.SystemOutWorkItemHandler;
-import org.jbpm.test.util.CountDownProcessEventListener;
+import org.jbpm.test.listener.NodeLeftCountDownProcessEventListener;
 import org.jbpm.workflow.instance.impl.NodeInstanceImpl;
 import org.jbpm.workflow.instance.impl.WorkflowProcessInstanceImpl;
 import org.jbpm.workflow.instance.node.CompositeContextNodeInstance;
@@ -458,7 +458,7 @@ public void testInclusiveSplitAndJoinWithEnd() throws Exception {
 
     @Test(timeout=10000)
     public void testInclusiveSplitAndJoinWithTimer() throws Exception {
-        CountDownProcessEventListener countDownListener = new CountDownProcessEventListener("timer", 2);
+        NodeLeftCountDownProcessEventListener countDownListener = new NodeLeftCountDownProcessEventListener("timer", 2);
         KieBase kbase = createKnowledgeBase("BPMN2-InclusiveSplitAndJoinWithTimer.bpmn2");
         ksession = createKnowledgeSession(kbase);
         ksession.addEventListener(countDownListener);
@@ -1358,7 +1358,7 @@ public void testMultiInstanceLoopCharacteristicsTask() throws Exception {
 
     @Test
     public void testMultipleInOutgoingSequenceFlows() throws Exception {
-        CountDownProcessEventListener countDownListener = new CountDownProcessEventListener("timer", 1);
+        NodeLeftCountDownProcessEventListener countDownListener = new NodeLeftCountDownProcessEventListener("timer", 1);
         System.setProperty("jbpm.enable.multi.con", "true");
         KieBase kbase = createKnowledgeBase("BPMN2-MultipleInOutgoingSequenceFlows.bpmn2");
         ksession = createKnowledgeSession(kbase);
@@ -1517,7 +1517,7 @@ public void beforeProcessStarted(ProcessStartedEvent event) {
 
     @Test
     public void testTimerAndGateway() throws Exception {
-        CountDownProcessEventListener countDownListener = new CountDownProcessEventListener("timer", 1);
+        NodeLeftCountDownProcessEventListener countDownListener = new NodeLeftCountDownProcessEventListener("timer", 1);
         KieBase kbase = createKnowledgeBase("timer/BPMN2-ParallelSplitWithTimerProcess.bpmn2");
         ksession = createKnowledgeSession(kbase);
         ksession.addEventListener(countDownListener);