Skip to content

Commit 6d42069

Browse files
elguardianelguardian
committed
revisited boundary timer tests
1 parent 4228c23 commit 6d42069

File tree

5 files changed

+25
-17
lines changed

5 files changed

+25
-17
lines changed

‎jbpm/jbpm-flow-builder/src/main/java/org/jbpm/test/util/NodeCountDownProcessEventListener.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020

2121
import java.util.concurrent.CountDownLatch;
2222

23+
import org.kie.api.event.process.ProcessNodeTriggeredEvent;
24+
2325
public class NodeCountDownProcessEventListener extends DefaultCountDownProcessEventListener {
2426

2527
protected String nodeName;
@@ -28,6 +30,13 @@ public NodeCountDownProcessEventListener() {
2830

2931
}
3032

33+
@Override
34+
public void beforeNodeTriggered(ProcessNodeTriggeredEvent event) {
35+
if (nodeName.equals(event.getNodeInstance().getNodeName())) {
36+
countDown();
37+
}
38+
}
39+
3140
public NodeCountDownProcessEventListener(String nodeName, int threads) {
3241
super(threads);
3342
this.nodeName = nodeName;

‎jbpm/jbpm-flow/src/main/java/org/jbpm/workflow/instance/node/HumanTaskNodeInstance.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,14 +215,12 @@ private boolean checkAndReassign(Map<String, Reassignment> timers,
215215
@Override
216216
protected void addWorkItemListener() {
217217
super.addWorkItemListener();
218-
getProcessInstance().addEventListener(TIMER_TRIGGERED_EVENT, this, false);
219218
getProcessInstance().addEventListener(WORK_ITEM_TRANSITION, this, false);
220219
}
221220

222221
@Override
223222
protected void removeWorkItemListener() {
224223
super.removeWorkItemListener();
225-
getProcessInstance().removeEventListener(TIMER_TRIGGERED_EVENT, this, false);
226224
getProcessInstance().removeEventListener(WORK_ITEM_TRANSITION, this, false);
227225
}
228226

‎jbpm/jbpm-tests/src/test/bpmn/org/jbpm/bpmn2/event/BPMN2-BoundaryTimerCycleCron.bpmn2 renamed to ‎jbpm/jbpm-tests/src/test/bpmn/org/jbpm/bpmn2/event/BPMN2-BoundaryTimerCycleISO.bpmn2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.omg.org/bpmn20" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:bpsim="http://www.bpsim.org/schemas/1.0" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:drools="http://www.jboss.org/drools" id="_erIygJZ7EeSDh8PHobjSSA" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd http://www.jboss.org/drools drools.xsd http://www.bpsim.org/schemas/1.0 bpsim.xsd" expressionLanguage="http://www.mvel.org/2.0" targetNamespace="http://www.omg.org/bpmn20" typeLanguage="http://www.java.com/javaTypes">
2222
<bpmn2:itemDefinition id="_cronStrItem" structureRef="String"/>
2323
<bpmn2:itemDefinition id="_completeItem" structureRef="String"/>
24-
<bpmn2:process id="BoundaryTimerCycleCron" drools:packageName="org.jbpm.bpmn2.event" drools:version="1.0" name="Test_Cron" isExecutable="true">
24+
<bpmn2:process id="BoundaryTimerCycleISO" drools:packageName="org.jbpm.bpmn2.event" drools:version="1.0" name="Test_Cron" isExecutable="true">
2525
<bpmn2:property id="cronStr" itemSubjectRef="_cronStrItem"/>
2626
<bpmn2:property id="complete" itemSubjectRef="_completeItem"/>
2727
<bpmn2:startEvent id="processStartEvent" drools:bgcolor="#9acd32" drools:selectable="true" name="">

‎jbpm/jbpm-tests/src/test/bpmn/org/jbpm/bpmn2/event/BPMN2-BoundaryTimerCycleCronVariable.bpmn2 renamed to ‎jbpm/jbpm-tests/src/test/bpmn/org/jbpm/bpmn2/event/BPMN2-BoundaryTimerCycleISOVariable.bpmn2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.omg.org/bpmn20" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:bpsim="http://www.bpsim.org/schemas/1.0" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:drools="http://www.jboss.org/drools" id="_erIygJZ7EeSDh8PHobjSSA" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd http://www.jboss.org/drools drools.xsd http://www.bpsim.org/schemas/1.0 bpsim.xsd" expressionLanguage="http://www.mvel.org/2.0" targetNamespace="http://www.omg.org/bpmn20" typeLanguage="http://www.java.com/javaTypes">
2222
<bpmn2:itemDefinition id="_cronStrItem" structureRef="String"/>
2323
<bpmn2:itemDefinition id="_completeItem" structureRef="String"/>
24-
<bpmn2:process id="BoundaryTimerCycleCronVariable" drools:packageName="org.jbpm.bpmn2.event" drools:version="1.0" name="Test_Cron" isExecutable="true">
24+
<bpmn2:process id="BoundaryTimerCycleISOVariable" drools:packageName="org.jbpm.bpmn2.event" drools:version="1.0" name="Test_Cron" isExecutable="true">
2525
<bpmn2:property id="cronStr" itemSubjectRef="_cronStrItem"/>
2626
<bpmn2:property id="complete" itemSubjectRef="_completeItem"/>
2727
<bpmn2:startEvent id="processStartEvent" drools:bgcolor="#9acd32" drools:selectable="true" name="">

‎jbpm/jbpm-tests/src/test/java/org/jbpm/bpmn2/IntermediateEventTest.java

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,11 @@
3333
import org.jbpm.bpmn2.activity.BoundarySignalEventOnTaskWithTransformationProcess;
3434
import org.jbpm.bpmn2.event.BoundarySignalWithNameEventOnTaskModel;
3535
import org.jbpm.bpmn2.event.BoundarySignalWithNameEventOnTaskProcess;
36-
import org.jbpm.bpmn2.event.BoundaryTimerCycleCronModel;
37-
import org.jbpm.bpmn2.event.BoundaryTimerCycleCronProcess;
3836
import org.jbpm.bpmn2.event.BoundaryTimerCycleCronVariableModel;
39-
import org.jbpm.bpmn2.event.BoundaryTimerCycleCronVariableProcess;
37+
import org.jbpm.bpmn2.event.BoundaryTimerCycleISOModel;
38+
import org.jbpm.bpmn2.event.BoundaryTimerCycleISOProcess;
39+
import org.jbpm.bpmn2.event.BoundaryTimerCycleISOVariableModel;
40+
import org.jbpm.bpmn2.event.BoundaryTimerCycleISOVariableProcess;
4041
import org.jbpm.bpmn2.handler.ReceiveTaskHandler;
4142
import org.jbpm.bpmn2.handler.SendTaskHandler;
4243
import org.jbpm.bpmn2.intermediate.IntermediateThrowEventSignalModel;
@@ -51,7 +52,6 @@
5152
import org.jbpm.test.util.NodeCountDownProcessEventListener;
5253
import org.jbpm.test.util.NodeLeftCountDownProcessEventListener;
5354
import org.jbpm.test.util.ProcessCompletedCountDownProcessEventListener;
54-
import org.jbpm.test.utils.EventTrackerProcessListener;
5555
import org.jbpm.test.utils.ProcessTestHelper;
5656
import org.junit.jupiter.api.Disabled;
5757
import org.junit.jupiter.api.Test;
@@ -112,29 +112,30 @@ public void beforeNodeTriggered(ProcessNodeTriggeredEvent event) {
112112
*/
113113

114114
@Test
115-
public void testBoundaryTimerCycleCron() {
115+
public void testBoundaryTimerCycleISO() {
116116
Application app = ProcessTestHelper.newApplication();
117117
NodeCountDownProcessEventListener listener = new NodeCountDownProcessEventListener("Send Update", 3);
118118
ProcessTestHelper.registerProcessEventListener(app, listener);
119-
org.kie.kogito.process.Process<BoundaryTimerCycleCronModel> definition = BoundaryTimerCycleCronProcess.newProcess(app);
120-
org.kie.kogito.process.ProcessInstance<BoundaryTimerCycleCronModel> instance = definition.createInstance(definition.createModel());
119+
org.kie.kogito.process.Process<BoundaryTimerCycleISOModel> definition = BoundaryTimerCycleISOProcess.newProcess(app);
120+
org.kie.kogito.process.ProcessInstance<BoundaryTimerCycleISOModel> instance = definition.createInstance(definition.createModel());
121121
instance.start();
122122
listener.waitTillCompleted();
123123
ProcessTestHelper.completeWorkItem(instance, "john", Collections.emptyMap());
124124
assertThat(instance.status()).isEqualTo(org.kie.kogito.process.ProcessInstance.STATE_COMPLETED);
125125
}
126126

127127
@Test
128-
public void testBoundaryTimerCycleCronVariable() {
128+
public void testBoundaryTimerCycleISOVariable() {
129129
Application app = ProcessTestHelper.newApplication();
130-
ProcessCompletedCountDownProcessEventListener listener = new ProcessCompletedCountDownProcessEventListener();
130+
NodeCountDownProcessEventListener listener = new NodeCountDownProcessEventListener("Send Update", 3);
131131
ProcessTestHelper.registerProcessEventListener(app, listener);
132-
org.kie.kogito.process.Process<BoundaryTimerCycleCronVariableModel> definition = BoundaryTimerCycleCronVariableProcess.newProcess(app);
133-
BoundaryTimerCycleCronVariableModel model = definition.createModel();
134-
model.setCronStr("PT1S");
135-
org.kie.kogito.process.ProcessInstance<BoundaryTimerCycleCronVariableModel> instance = definition.createInstance(model);
132+
org.kie.kogito.process.Process<BoundaryTimerCycleISOVariableModel> definition = BoundaryTimerCycleISOVariableProcess.newProcess(app);
133+
BoundaryTimerCycleISOVariableModel model = definition.createModel();
134+
model.setCronStr("R3/PT1S");
135+
org.kie.kogito.process.ProcessInstance<BoundaryTimerCycleISOVariableModel> instance = definition.createInstance(model);
136136
instance.start();
137137
listener.waitTillCompleted();
138+
ProcessTestHelper.completeWorkItem(instance, "john", Collections.emptyMap());
138139
assertThat(instance.status()).isEqualTo(org.kie.kogito.process.ProcessInstance.STATE_COMPLETED);
139140
}
140141

0 commit comments

Comments
 (0)