36
36
import org .jbpm .bpmn2 .activity .ScriptTaskWithIOProcess ;
37
37
import org .jbpm .bpmn2 .activity .UserTaskWithSimulationMetaDataModel ;
38
38
import org .jbpm .bpmn2 .activity .UserTaskWithSimulationMetaDataProcess ;
39
+ import org .jbpm .bpmn2 .adhoc .SubProcessInAdHocProcessModel ;
40
+ import org .jbpm .bpmn2 .adhoc .SubProcessInAdHocProcessProcess ;
39
41
import org .jbpm .bpmn2 .flow .CompositeWithDIGraphicalModel ;
40
42
import org .jbpm .bpmn2 .flow .CompositeWithDIGraphicalProcess ;
41
43
import org .jbpm .bpmn2 .flow .MinimalImplicitModel ;
50
52
import org .jbpm .bpmn2 .flow .ProcessWithVariableNameProcess ;
51
53
import org .jbpm .bpmn2 .flow .UserTaskModel ;
52
54
import org .jbpm .bpmn2 .flow .UserTaskProcess ;
55
+ import org .jbpm .bpmn2 .flow .XORSameTargetModel ;
56
+ import org .jbpm .bpmn2 .flow .XORSameTargetProcess ;
53
57
import org .jbpm .bpmn2 .handler .ReceiveTaskHandler ;
54
58
import org .jbpm .bpmn2 .handler .SendTaskHandler ;
55
59
import org .jbpm .bpmn2 .handler .ServiceTaskHandler ;
58
62
import org .jbpm .bpmn2 .objects .HelloService ;
59
63
import org .jbpm .bpmn2 .objects .Person ;
60
64
import org .jbpm .bpmn2 .objects .TestWorkItemHandler ;
65
+ import org .jbpm .bpmn2 .subprocess .AssignmentProcessModel ;
66
+ import org .jbpm .bpmn2 .subprocess .AssignmentProcessProcess ;
67
+ import org .jbpm .bpmn2 .subprocess .AssignmentSubProcessModel ;
68
+ import org .jbpm .bpmn2 .subprocess .AssignmentSubProcessProcess ;
61
69
import org .jbpm .bpmn2 .subprocess .CallActivityModel ;
62
70
import org .jbpm .bpmn2 .subprocess .CallActivityProcess ;
63
71
import org .jbpm .bpmn2 .subprocess .CallActivitySubProcessProcess ;
72
+ import org .jbpm .bpmn2 .subprocess .CallActivityWithIOexpressionModel ;
73
+ import org .jbpm .bpmn2 .subprocess .CallActivityWithIOexpressionProcess ;
64
74
import org .jbpm .bpmn2 .subprocess .InputMappingUsingValueModel ;
65
75
import org .jbpm .bpmn2 .subprocess .InputMappingUsingValueProcess ;
76
+ import org .jbpm .bpmn2 .subprocess .MainGroupAssignmentModel ;
77
+ import org .jbpm .bpmn2 .subprocess .MainGroupAssignmentProcess ;
66
78
import org .jbpm .bpmn2 .subprocess .SingleTaskWithVarDefModel ;
67
79
import org .jbpm .bpmn2 .subprocess .SingleTaskWithVarDefProcess ;
68
80
import org .jbpm .bpmn2 .subprocess .SubProcessWithEntryExitScriptsModel ;
71
83
import org .jbpm .bpmn2 .subprocess .SubProcessWithTerminateEndEventProcess ;
72
84
import org .jbpm .bpmn2 .subprocess .SubProcessWithTerminateEndEventProcessScopeModel ;
73
85
import org .jbpm .bpmn2 .subprocess .SubProcessWithTerminateEndEventProcessScopeProcess ;
86
+ import org .jbpm .bpmn2 .subprocess .SubprocessGroupAssignmentModel ;
87
+ import org .jbpm .bpmn2 .subprocess .SubprocessGroupAssignmentProcess ;
74
88
import org .jbpm .bpmn2 .task .ReceiveTaskModel ;
75
89
import org .jbpm .bpmn2 .task .ReceiveTaskProcess ;
76
90
import org .jbpm .bpmn2 .task .SendTaskModel ;
@@ -1393,36 +1407,37 @@ public void testMultipleBusinessRuleTaskWithDataInputsWithPersistence()
1393
1407
}
1394
1408
1395
1409
@ Test
1396
- public void testSubProcessInAdHocProcess () throws Exception {
1410
+ public void testSubProcessInAdHocProcess () {
1397
1411
// JBPM-5374
1398
- kruntime = createKogitoProcessRuntime (
1399
- "org/jbpm/bpmn2/adhoc/BPMN2-SubProcessInAdHocProcess.bpmn2" );
1400
-
1412
+ Application app = ProcessTestHelper .newApplication ();
1401
1413
TestWorkItemHandler workItemHandler = new TestWorkItemHandler ();
1402
- kruntime .getKogitoWorkItemManager ().registerWorkItemHandler ("Human Task" , workItemHandler );
1403
-
1404
- Map <String , Object > parameters = new HashMap <>();
1405
- KogitoProcessInstance processInstance = kruntime .startProcess ("SubProcessInAdHocProcess" , parameters );
1406
- assertProcessInstanceActive (processInstance );
1407
-
1408
- kruntime .getKogitoWorkItemManager ().registerWorkItemHandler ("Human Task" , workItemHandler );
1414
+ ProcessTestHelper .registerHandler (app , "Human Task" , workItemHandler );
1415
+ org .kie .kogito .process .Process <SubProcessInAdHocProcessModel > processDefinition = SubProcessInAdHocProcessProcess .newProcess (app );
1416
+ SubProcessInAdHocProcessModel model = processDefinition .createModel ();
1417
+ org .kie .kogito .process .ProcessInstance <SubProcessInAdHocProcessModel > instance = processDefinition .createInstance (model );
1418
+ instance .start ();
1409
1419
1420
+ assertThat (instance ).extracting (ProcessInstance ::status ).isEqualTo (ProcessInstance .STATE_ACTIVE );
1410
1421
org .kie .kogito .internal .process .runtime .KogitoWorkItem workItem = workItemHandler .getWorkItem ();
1411
1422
assertThat (workItem ).isNotNull ();
1412
- kruntime . getKogitoWorkItemManager (). completeWorkItem (workItem .getStringId (), null );
1413
- assertProcessInstanceFinished ( processInstance , kruntime );
1423
+ instance . completeWorkItem (workItem .getStringId (), Collections . emptyMap () );
1424
+ assertThat ( instance ). extracting ( ProcessInstance :: status ). isEqualTo ( org . kie . kogito . process . ProcessInstance . STATE_COMPLETED );
1414
1425
}
1415
1426
1416
1427
@ Test
1417
- public void testCallActivityWithDataAssignment () throws Exception {
1418
- kruntime = createKogitoProcessRuntime ("org/jbpm/bpmn2/subprocess/BPMN2-AssignmentProcess.bpmn2" ,
1419
- "org/jbpm/bpmn2/subprocess/BPMN2-AssignmentSubProcess.bpmn2" );
1428
+ public void testCallActivityWithDataAssignment () {
1429
+ Application app = ProcessTestHelper .newApplication ();
1430
+ org .kie .kogito .process .Process <AssignmentSubProcessModel > assignmentSubProcessProcess = AssignmentSubProcessProcess .newProcess (app );
1431
+ AssignmentSubProcessModel assignmentSubProcessModel = assignmentSubProcessProcess .createModel ();
1432
+ org .kie .kogito .process .ProcessInstance <AssignmentSubProcessModel > assignmentSubProcessInstance = assignmentSubProcessProcess .createInstance (assignmentSubProcessModel );
1433
+ org .kie .kogito .process .Process <AssignmentProcessModel > processDefinition = AssignmentProcessProcess .newProcess (app );
1434
+ AssignmentProcessModel model = processDefinition .createModel ();
1435
+ model .setName ("oldValue" );
1436
+ org .kie .kogito .process .ProcessInstance <AssignmentProcessModel > instance = processDefinition .createInstance (model );
1437
+ instance .start ();
1420
1438
1421
- Map <String , Object > params = new HashMap <>();
1422
- params .put ("name" , "oldValue" );
1423
- KogitoProcessInstance processInstance = kruntime .startProcess ("AssignmentProcess" , params );
1424
- assertProcessInstanceCompleted (processInstance );
1425
- assertThat (((KogitoWorkflowProcessInstance ) processInstance ).getVariable ("message" )).isEqualTo ("Hello Genworth welcome to jBPMS!" );
1439
+ assertThat (instance ).extracting (ProcessInstance ::status ).isEqualTo (org .kie .kogito .process .ProcessInstance .STATE_COMPLETED );
1440
+ assertThat (instance .variables ().getMessage ()).isEqualTo ("Hello Genworth welcome to jBPMS!" );
1426
1441
}
1427
1442
1428
1443
@ Test
@@ -1614,18 +1629,20 @@ public void testBusinessRuleTaskException() throws Exception {
1614
1629
}
1615
1630
1616
1631
@ Test
1617
- public void testXORWithSameTargetProcess () throws Exception {
1618
- kruntime = createKogitoProcessRuntime ("org/jbpm/bpmn2/flow/BPMN2-XORSameTarget.bpmn2" );
1619
-
1620
- Map <String , Object > params = new HashMap <>();
1621
- params .put ("choice" , 1 );
1622
- KogitoProcessInstance processInstance = kruntime .startProcess ("XORSameTarget" , params );
1623
- assertProcessInstanceCompleted (processInstance );
1624
-
1625
- params = new HashMap <>();
1626
- params .put ("choice" , 2 );
1627
- processInstance = kruntime .startProcess ("XORSameTarget" , params );
1628
- assertProcessInstanceCompleted (processInstance );
1632
+ public void testXORWithSameTargetProcess () {
1633
+ Application app = ProcessTestHelper .newApplication ();
1634
+ org .kie .kogito .process .Process <XORSameTargetModel > processDefinition = XORSameTargetProcess .newProcess (app );
1635
+ XORSameTargetModel model = processDefinition .createModel ();
1636
+ model .setChoice (1 );
1637
+ org .kie .kogito .process .ProcessInstance <XORSameTargetModel > instance = processDefinition .createInstance (model );
1638
+ instance .start ();
1639
+ assertThat (instance ).extracting (ProcessInstance ::status ).isEqualTo (org .kie .kogito .process .ProcessInstance .STATE_COMPLETED );
1640
+ processDefinition = XORSameTargetProcess .newProcess (app );
1641
+ model = processDefinition .createModel ();
1642
+ model .setChoice (2 );
1643
+ instance = processDefinition .createInstance (model );
1644
+ instance .start ();
1645
+ assertThat (instance ).extracting (ProcessInstance ::status ).isEqualTo (org .kie .kogito .process .ProcessInstance .STATE_COMPLETED );
1629
1646
}
1630
1647
1631
1648
@ Test
@@ -1651,47 +1668,48 @@ public void testUserTaskWithExpressionsForIO() throws Exception {
1651
1668
}
1652
1669
1653
1670
@ Test
1654
- public void testCallActivitykWithExpressionsForIO () throws Exception {
1655
- kruntime = createKogitoProcessRuntime ("org/jbpm/bpmn2/subprocess/BPMN2-CallActivityWithIOexpression.bpmn2" ,
1656
- "org/jbpm/bpmn2/subprocess/BPMN2-CallActivitySubProcess.bpmn2" );
1657
-
1671
+ public void testCallActivitykWithExpressionsForIO () {
1672
+ Application app = ProcessTestHelper .newApplication ();
1658
1673
TestWorkItemHandler workItemHandler = new TestWorkItemHandler ();
1659
- kruntime .getKogitoWorkItemManager ().registerWorkItemHandler ("Human Task" , workItemHandler );
1660
- Map <String , Object > params = new HashMap <>();
1661
- params .put ("person" , new Person ("john" ));
1662
- KogitoProcessInstance processInstance = kruntime .startProcess ("CallActivityWithIOexpression" , params );
1663
- assertProcessInstanceActive (processInstance );
1674
+ ProcessTestHelper .registerHandler (app , "Human Task" , workItemHandler );
1675
+ CallActivitySubProcessProcess .newProcess (app );
1676
+ org .kie .kogito .process .Process <CallActivityWithIOexpressionModel > processDefinition = CallActivityWithIOexpressionProcess .newProcess (app );
1677
+ CallActivityWithIOexpressionModel model = processDefinition .createModel ();
1678
+ model .setPerson (new Person ("john" ));
1679
+ org .kie .kogito .process .ProcessInstance <CallActivityWithIOexpressionModel > instance = processDefinition .createInstance (model );
1680
+ instance .start ();
1664
1681
1665
- Person person = (Person ) processInstance .getVariables ().get ("person" );
1682
+ assertThat (instance ).extracting (ProcessInstance ::status ).isEqualTo (ProcessInstance .STATE_ACTIVE );
1683
+ Person person = instance .variables ().getPerson ();
1666
1684
assertThat (person .getName ()).isEqualTo ("new value" );
1667
-
1668
1685
org .kie .kogito .internal .process .runtime .KogitoWorkItem workItem = workItemHandler .getWorkItem ();
1669
1686
assertThat (workItem ).isNotNull ();
1670
1687
assertThat (workItem .getParameter ("ActorId" )).isEqualTo ("krisv" );
1671
- kruntime .getKogitoWorkItemManager ().completeWorkItem (workItem .getStringId (), null );
1672
-
1673
- assertProcessInstanceFinished (processInstance , kruntime );
1688
+ instance .completeWorkItem (workItem .getStringId (), Collections .emptyMap ());
1689
+ assertThat (instance ).extracting (ProcessInstance ::status ).isEqualTo (org .kie .kogito .process .ProcessInstance .STATE_COMPLETED );
1674
1690
}
1675
1691
1676
1692
@ Test
1677
- public void testCallSubprocessWithGroup () throws Exception {
1678
- kruntime = createKogitoProcessRuntime ("org/jbpm/bpmn2/subprocess/BPMN2-MainGroupAssignment.bpmn2" ,
1679
- "org/jbpm/bpmn2/subprocess/BPMN2-SubprocessGroupAssignment.bpmn2" );
1680
-
1693
+ public void testCallSubprocessWithGroup () {
1694
+ Application app = ProcessTestHelper .newApplication ();
1681
1695
TestWorkItemHandler workItemHandler = new TestWorkItemHandler ();
1682
- kruntime .getKogitoWorkItemManager ().registerWorkItemHandler ("Human Task" , workItemHandler );
1683
-
1684
- KogitoProcessInstance processInstance = kruntime .startProcess ("MainGroupAssignment" );
1685
- assertProcessInstanceActive (processInstance );
1696
+ ProcessTestHelper .registerHandler (app , "Human Task" , workItemHandler );
1697
+ org .kie .kogito .process .Process <SubprocessGroupAssignmentModel > subprocessGroupAssignmentProcess = SubprocessGroupAssignmentProcess .newProcess (app );
1698
+ SubprocessGroupAssignmentModel subprocessGroupAssignmentModel = subprocessGroupAssignmentProcess .createModel ();
1699
+ ProcessInstance <SubprocessGroupAssignmentModel > subprocessGroupAssignmentProcessInstance = subprocessGroupAssignmentProcess .createInstance (subprocessGroupAssignmentModel );
1700
+ org .kie .kogito .process .Process <MainGroupAssignmentModel > processDefinition = MainGroupAssignmentProcess .newProcess (app );
1701
+ MainGroupAssignmentModel model = processDefinition .createModel ();
1702
+ org .kie .kogito .process .ProcessInstance <MainGroupAssignmentModel > instance = processDefinition .createInstance (model );
1703
+ instance .start ();
1686
1704
1705
+ assertThat (instance ).extracting (ProcessInstance ::status ).isEqualTo (ProcessInstance .STATE_ACTIVE );
1687
1706
List <org .kie .kogito .internal .process .runtime .KogitoWorkItem > workItems = workItemHandler .getWorkItems ();
1688
- for (org .kie .kogito .internal .process .runtime .KogitoWorkItem item : workItems ) {
1689
- assertThat (item ).isNotNull ();
1690
- assertThat (item .getParameter ("GroupId" )).isEqualTo ("GRUPA TESTOWA" );
1691
- kruntime .getKogitoWorkItemManager ().completeWorkItem (item .getStringId (), null );
1692
- }
1693
-
1694
- assertProcessInstanceFinished (processInstance , kruntime );
1707
+ workItems .forEach (workItem -> {
1708
+ assertThat (workItem ).isNotNull ();
1709
+ assertThat (workItem .getParameter ("GroupId" )).isEqualTo ("GRUPA TESTOWA" );
1710
+ subprocessGroupAssignmentProcessInstance .completeWorkItem (workItem .getStringId (), Collections .emptyMap ());
1711
+ });
1712
+ assertThat (instance ).extracting (ProcessInstance ::status ).isEqualTo (org .kie .kogito .process .ProcessInstance .STATE_COMPLETED );
1695
1713
}
1696
1714
1697
1715
@ Test
0 commit comments