From b474ce29733c85909bcbf397969ca5355b1d595e Mon Sep 17 00:00:00 2001 From: trademak Date: Wed, 21 Mar 2012 10:08:54 +0000 Subject: [PATCH] Upgraded to 5.10-SNAPSHOT and applied patch ACT-1156 thanks Capacia --- modules/activiti-cactus/pom.xml | 2 +- modules/activiti-camel/pom.xml | 2 +- modules/activiti-cdi/pom.xml | 2 +- modules/activiti-cxf/pom.xml | 2 +- modules/activiti-engine/pom.xml | 2 +- .../bpmn/behavior/CallActivityBehavior.java | 2 +- .../CallActivityAdvancedTest.java | 59 +++++++++++++++++++ ...ty.testCallSequentialSubProcess.bpmn20.xml | 25 ++++++++ .../callactivity/simpleSubProcess2.bpmn20.xml | 21 +++++++ modules/activiti-mule/pom.xml | 2 +- modules/activiti-osgi/pom.xml | 2 +- modules/activiti-spring/pom.xml | 2 +- modules/activiti-upgrade/pom.xml | 2 +- modules/activiti-webapp-explorer2/pom.xml | 2 +- modules/activiti-webapp-rest2/pom.xml | 2 +- pom.xml | 2 +- 16 files changed, 118 insertions(+), 13 deletions(-) create mode 100644 modules/activiti-engine/src/test/resources/org/activiti/engine/test/bpmn/callactivity/CallActivity.testCallSequentialSubProcess.bpmn20.xml create mode 100644 modules/activiti-engine/src/test/resources/org/activiti/engine/test/bpmn/callactivity/simpleSubProcess2.bpmn20.xml diff --git a/modules/activiti-cactus/pom.xml b/modules/activiti-cactus/pom.xml index 0f1d860841..b5a669ed46 100644 --- a/modules/activiti-cactus/pom.xml +++ b/modules/activiti-cactus/pom.xml @@ -12,7 +12,7 @@ org.activiti activiti-root ../.. - 5.9-SNAPSHOT + 5.10-SNAPSHOT diff --git a/modules/activiti-camel/pom.xml b/modules/activiti-camel/pom.xml index 34e820bd6c..fb2f83d51c 100644 --- a/modules/activiti-camel/pom.xml +++ b/modules/activiti-camel/pom.xml @@ -12,7 +12,7 @@ org.activiti activiti-root ../.. - 5.9-SNAPSHOT + 5.10-SNAPSHOT diff --git a/modules/activiti-cdi/pom.xml b/modules/activiti-cdi/pom.xml index 4eccbc75da..ae29e5640d 100644 --- a/modules/activiti-cdi/pom.xml +++ b/modules/activiti-cdi/pom.xml @@ -12,7 +12,7 @@ org.activiti activiti-root ../.. - 5.9-SNAPSHOT + 5.10-SNAPSHOT diff --git a/modules/activiti-cxf/pom.xml b/modules/activiti-cxf/pom.xml index b1b72ff6d5..cc82ff7f4a 100644 --- a/modules/activiti-cxf/pom.xml +++ b/modules/activiti-cxf/pom.xml @@ -11,7 +11,7 @@ org.activiti activiti-root ../.. - 5.9-SNAPSHOT + 5.10-SNAPSHOT diff --git a/modules/activiti-engine/pom.xml b/modules/activiti-engine/pom.xml index 79cdb0ad6e..0d1752fd06 100644 --- a/modules/activiti-engine/pom.xml +++ b/modules/activiti-engine/pom.xml @@ -11,7 +11,7 @@ org.activiti activiti-root ../.. - 5.9-SNAPSHOT + 5.10-SNAPSHOT diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/behavior/CallActivityBehavior.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/behavior/CallActivityBehavior.java index 10f33f23b9..57693b77db 100644 --- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/behavior/CallActivityBehavior.java +++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/behavior/CallActivityBehavior.java @@ -58,7 +58,7 @@ public class CallActivityBehavior extends AbstractBpmnActivityBehavior implement public void execute(ActivityExecution execution) throws Exception { - if ((processDefinitonKey == null) && (processDefinitionExpression != null)) { + if (processDefinitionExpression != null) { processDefinitonKey = (String) processDefinitionExpression.getValue(execution); } diff --git a/modules/activiti-engine/src/test/java/org/activiti/engine/test/bpmn/callactivity/CallActivityAdvancedTest.java b/modules/activiti-engine/src/test/java/org/activiti/engine/test/bpmn/callactivity/CallActivityAdvancedTest.java index c6599a03c9..0f1a2b0abd 100644 --- a/modules/activiti-engine/src/test/java/org/activiti/engine/test/bpmn/callactivity/CallActivityAdvancedTest.java +++ b/modules/activiti-engine/src/test/java/org/activiti/engine/test/bpmn/callactivity/CallActivityAdvancedTest.java @@ -138,6 +138,65 @@ public class CallActivityAdvancedTest extends PluggableActivitiTestCase { taskService.complete(taskB.getId()); assertEquals(0, runtimeService.createExecutionQuery().count()); } + + @Deployment(resources = { "org/activiti/engine/test/bpmn/callactivity/CallActivity.testCallSequentialSubProcess.bpmn20.xml", + "org/activiti/engine/test/bpmn/callactivity/CallActivity.testCallSimpleSubProcessWithExpressions.bpmn20.xml", + "org/activiti/engine/test/bpmn/callactivity/simpleSubProcess.bpmn20.xml", + "org/activiti/engine/test/bpmn/callactivity/simpleSubProcess2.bpmn20.xml"}) + public void testCallSequentialSubProcessWithExpressions() { + + ProcessInstance processInstance = runtimeService.startProcessInstanceByKey("callSequentialSubProcess"); + + // FIRST sub process calls simpleSubProcess + + // one task in the subprocess should be active after starting the process + // instance + TaskQuery taskQuery = taskService.createTaskQuery(); + Task taskBeforeSubProcess = taskQuery.singleResult(); + assertEquals("Task before subprocess", taskBeforeSubProcess.getName()); + + // Completing the task continues the process which leads to calling the + // subprocess. The sub process we want to call is passed in as a variable + // into this task + taskService.setVariable(taskBeforeSubProcess.getId(), "simpleSubProcessExpression", "simpleSubProcess"); + taskService.complete(taskBeforeSubProcess.getId()); + Task taskInSubProcess = taskQuery.singleResult(); + assertEquals("Task in subprocess", taskInSubProcess.getName()); + + // Completing the task in the subprocess, finishes the subprocess + taskService.complete(taskInSubProcess.getId()); + Task taskAfterSubProcess = taskQuery.singleResult(); + assertEquals("Task after subprocess", taskAfterSubProcess.getName()); + + // Completing this task end the process instance + taskService.complete(taskAfterSubProcess.getId()); + + + // SECOND sub process calls simpleSubProcess2 + + // one task in the subprocess should be active after starting the process + // instance + taskQuery = taskService.createTaskQuery(); + taskBeforeSubProcess = taskQuery.singleResult(); + assertEquals("Task before subprocess", taskBeforeSubProcess.getName()); + + // Completing the task continues the process which leads to calling the + // subprocess. The sub process we want to call is passed in as a variable + // into this task + taskService.setVariable(taskBeforeSubProcess.getId(), "simpleSubProcessExpression", "simpleSubProcess2"); + taskService.complete(taskBeforeSubProcess.getId()); + taskInSubProcess = taskQuery.singleResult(); + assertEquals("Task in subprocess 2", taskInSubProcess.getName()); + + // Completing the task in the subprocess, finishes the subprocess + taskService.complete(taskInSubProcess.getId()); + taskAfterSubProcess = taskQuery.singleResult(); + assertEquals("Task after subprocess", taskAfterSubProcess.getName()); + + // Completing this task end the process instance + taskService.complete(taskAfterSubProcess.getId()); + assertProcessEnded(processInstance.getId()); + } @Deployment(resources = { "org/activiti/engine/test/bpmn/callactivity/CallActivity.testTimerOnCallActivity.bpmn20.xml", diff --git a/modules/activiti-engine/src/test/resources/org/activiti/engine/test/bpmn/callactivity/CallActivity.testCallSequentialSubProcess.bpmn20.xml b/modules/activiti-engine/src/test/resources/org/activiti/engine/test/bpmn/callactivity/CallActivity.testCallSequentialSubProcess.bpmn20.xml new file mode 100644 index 0000000000..aa87ff69b0 --- /dev/null +++ b/modules/activiti-engine/src/test/resources/org/activiti/engine/test/bpmn/callactivity/CallActivity.testCallSequentialSubProcess.bpmn20.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + 2 + + + + + + + + + + diff --git a/modules/activiti-engine/src/test/resources/org/activiti/engine/test/bpmn/callactivity/simpleSubProcess2.bpmn20.xml b/modules/activiti-engine/src/test/resources/org/activiti/engine/test/bpmn/callactivity/simpleSubProcess2.bpmn20.xml new file mode 100644 index 0000000000..fcff7af6b1 --- /dev/null +++ b/modules/activiti-engine/src/test/resources/org/activiti/engine/test/bpmn/callactivity/simpleSubProcess2.bpmn20.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/modules/activiti-mule/pom.xml b/modules/activiti-mule/pom.xml index 24dbde236d..6483944db6 100644 --- a/modules/activiti-mule/pom.xml +++ b/modules/activiti-mule/pom.xml @@ -11,7 +11,7 @@ org.activiti activiti-root ../.. - 5.9-SNAPSHOT + 5.10-SNAPSHOT diff --git a/modules/activiti-osgi/pom.xml b/modules/activiti-osgi/pom.xml index 2067a26285..9f23534b3a 100644 --- a/modules/activiti-osgi/pom.xml +++ b/modules/activiti-osgi/pom.xml @@ -12,7 +12,7 @@ org.activiti activiti-root ../.. - 5.9-SNAPSHOT + 5.10-SNAPSHOT diff --git a/modules/activiti-spring/pom.xml b/modules/activiti-spring/pom.xml index e6c93dec30..0f0b342a99 100644 --- a/modules/activiti-spring/pom.xml +++ b/modules/activiti-spring/pom.xml @@ -10,7 +10,7 @@ org.activiti activiti-root ../.. - 5.9-SNAPSHOT + 5.10-SNAPSHOT diff --git a/modules/activiti-upgrade/pom.xml b/modules/activiti-upgrade/pom.xml index af07951b69..ec3bca1ef9 100644 --- a/modules/activiti-upgrade/pom.xml +++ b/modules/activiti-upgrade/pom.xml @@ -6,7 +6,7 @@ Activiti - Upgrade org.activiti activiti-upgrade - 5.9-ALWAYS-SNAPSHOT + 5.10-ALWAYS-SNAPSHOT true diff --git a/modules/activiti-webapp-explorer2/pom.xml b/modules/activiti-webapp-explorer2/pom.xml index 7f54a1a19d..e46e3904cc 100644 --- a/modules/activiti-webapp-explorer2/pom.xml +++ b/modules/activiti-webapp-explorer2/pom.xml @@ -12,7 +12,7 @@ org.activiti activiti-root ../.. - 5.9-SNAPSHOT + 5.10-SNAPSHOT diff --git a/modules/activiti-webapp-rest2/pom.xml b/modules/activiti-webapp-rest2/pom.xml index 3149d200e2..e4657ac00a 100644 --- a/modules/activiti-webapp-rest2/pom.xml +++ b/modules/activiti-webapp-rest2/pom.xml @@ -10,7 +10,7 @@ org.activiti activiti-root ../.. - 5.9-SNAPSHOT + 5.10-SNAPSHOT diff --git a/pom.xml b/pom.xml index 530764f885..0c90dc26e5 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ activiti-root pom - 5.9-SNAPSHOT + 5.10-SNAPSHOT 3.0.3.RELEASE 3.1.0 -- GitLab