fix tests

apache · Jun 17, 2024 · 41e9845 · 41e9845
1 parent 4234e8f
commit 41e9845
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 28 deletions.
diff --git a/...-flow-builder/src/main/java/org/jbpm/test/util/NodeLeftCountDownProcessEventListener.java b/...-flow-builder/src/main/java/org/jbpm/test/util/NodeLeftCountDownProcessEventListener.java
@@ -20,21 +20,17 @@
 
 import org.kie.api.event.process.ProcessNodeLeftEvent;
 
-public class NodeLeftCountDownProcessEventListener extends NodeCountDownProcessEventListener {
+public class NodeLeftCountDownProcessEventListener extends DefaultCountDownProcessEventListener {
 
-    private boolean reactOnBeforeNodeLeft = false;
+    private String nodeName;
 
     public NodeLeftCountDownProcessEventListener() {
 
     }
 
     public NodeLeftCountDownProcessEventListener(String nodeName, int threads) {
-        super(nodeName, threads);
-    }
-
-    public NodeLeftCountDownProcessEventListener(String nodeName, int threads, boolean reactOnBeforeNodeLeft) {
-        super(nodeName, threads);
-        this.reactOnBeforeNodeLeft = reactOnBeforeNodeLeft;
+        super(threads);
+        this.nodeName = nodeName;
     }
 
     @Override
@@ -43,11 +39,4 @@ public void afterNodeLeft(ProcessNodeLeftEvent event) {
             countDown();
         }
     }
-
-    @Override
-    public void beforeNodeLeft(ProcessNodeLeftEvent event) {
-        if (reactOnBeforeNodeLeft && nodeName.equals(event.getNodeInstance().getNodeName())) {
-            countDown();
-        }
-    }
 }
diff --git a/...il/NodeCountDownProcessEventListener.java → ...il/NodeTriggeredProcessEventListener.java b/...il/NodeCountDownProcessEventListener.java → ...il/NodeTriggeredProcessEventListener.java
@@ -18,32 +18,26 @@
  */
 package org.jbpm.test.util;
 
-import java.util.concurrent.CountDownLatch;
-
 import org.kie.api.event.process.ProcessNodeTriggeredEvent;
 
-public class NodeCountDownProcessEventListener extends DefaultCountDownProcessEventListener {
+public class NodeTriggeredProcessEventListener extends DefaultCountDownProcessEventListener {
 
     protected String nodeName;
 
-    public NodeCountDownProcessEventListener() {
+    public NodeTriggeredProcessEventListener() {
 
     }
 
     @Override
-    public void beforeNodeTriggered(ProcessNodeTriggeredEvent event) {
+    public void afterNodeTriggered(ProcessNodeTriggeredEvent event) {
         if (nodeName.equals(event.getNodeInstance().getNodeName())) {
             countDown();
         }
     }
 
-    public NodeCountDownProcessEventListener(String nodeName, int threads) {
+    public NodeTriggeredProcessEventListener(String nodeName, int threads) {
         super(threads);
         this.nodeName = nodeName;
     }
 
-    public void reset(String nodeName, int threads) {
-        this.nodeName = nodeName;
-        this.latch = new CountDownLatch(threads);
-    }
 }
diff --git a/jbpm/jbpm-tests/src/test/java/org/jbpm/bpmn2/IntermediateEventTest.java b/jbpm/jbpm-tests/src/test/java/org/jbpm/bpmn2/IntermediateEventTest.java
@@ -48,7 +48,6 @@
 import org.jbpm.process.instance.event.listeners.RuleAwareProcessEventListener;
 import org.jbpm.process.instance.impl.demo.DoNothingWorkItemHandler;
 import org.jbpm.process.instance.impl.demo.SystemOutWorkItemHandler;
-import org.jbpm.test.util.NodeCountDownProcessEventListener;
 import org.jbpm.test.util.NodeLeftCountDownProcessEventListener;
 import org.jbpm.test.util.ProcessCompletedCountDownProcessEventListener;
 import org.jbpm.test.utils.ProcessTestHelper;
@@ -113,7 +112,7 @@ public void beforeNodeTriggered(ProcessNodeTriggeredEvent event) {
     @Test
     public void testBoundaryTimerCycleISO() {
         Application app = ProcessTestHelper.newApplication();
-        NodeCountDownProcessEventListener listener = new NodeCountDownProcessEventListener("Send Update", 3);
+        NodeLeftCountDownProcessEventListener listener = new NodeLeftCountDownProcessEventListener("Send Update", 3);
         ProcessTestHelper.registerProcessEventListener(app, listener);
         org.kie.kogito.process.Process<BoundaryTimerCycleISOModel> definition = BoundaryTimerCycleISOProcess.newProcess(app);
         org.kie.kogito.process.ProcessInstance<BoundaryTimerCycleISOModel> instance = definition.createInstance(definition.createModel());
@@ -126,7 +125,7 @@ public void testBoundaryTimerCycleISO() {
     @Test
     public void testBoundaryTimerCycleISOVariable() {
         Application app = ProcessTestHelper.newApplication();
-        NodeCountDownProcessEventListener listener = new NodeCountDownProcessEventListener("Send Update", 3);
+        NodeLeftCountDownProcessEventListener listener = new NodeLeftCountDownProcessEventListener("Send Update", 3);
         ProcessTestHelper.registerProcessEventListener(app, listener);
         org.kie.kogito.process.Process<BoundaryTimerCycleISOVariableModel> definition = BoundaryTimerCycleISOVariableProcess.newProcess(app);
         BoundaryTimerCycleISOVariableModel model = definition.createModel();