Author: kukeltje Date: 2010-03-10 14:31:36 -0500 (Wed, 10 Mar 2010) New Revision: 6219 Removed: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activity/forkjoin/fullynested.jpdl.xml jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activity/forkjoin/weirdForkAndJoin.jpdl.xml Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activity/forkjoin/JBPM2581ForkAndJoinTest.java Log: xml of tests embedded JBPM-2581 Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activity/forkjoin/JBPM2581ForkAndJoinTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activity/forkjoin/JBPM2581ForkAndJoinTest.java 2010-03-09 20:22:30 UTC (rev 6218) +++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activity/forkjoin/JBPM2581ForkAndJoinTest.java 2010-03-10 19:31:36 UTC (rev 6219) @@ -1,26 +1,75 @@ package org.jbpm.test.activity.forkjoin; +import java.util.Collection; import java.util.List; import org.jbpm.api.Execution; +import org.jbpm.api.ProcessDefinition; +import org.jbpm.api.ProcessDefinitionQuery; +import org.jbpm.api.model.Activity; +import org.jbpm.api.model.OpenExecution; import org.jbpm.api.task.Task; +import org.jbpm.pvm.internal.model.OpenProcessDefinition; import org.jbpm.test.JbpmTestCase; public class JBPM2581ForkAndJoinTest extends JbpmTestCase { - String deploymentId; + String deploymentId; - public void testFullyNested() { + public void testFullyNested() { - deploymentId = repositoryService - .createDeployment() - .addResourceFromClasspath( - "org/jbpm/test/activity/forkjoin/fullynested.jpdl.xml") - .deploy(); - + deployJpdlXmlString(" <process name='FullyNested' xmlns='http://jbpm.org/4.3/jpdl'>" + + " <start name='start1'>" + + " <transition to='fork2'/>" + + " </start>" + + " <end name='end1'/>" + + " " + + " <task assignee='otto' name='task2'>" + + " <transition to='join1'/>" + + " </task>" + + " <task assignee='otto' name='task3'>" + + " <transition to='join2'/>" + + " </task>" + + " <task assignee='otto' name='task8'>" + + " <transition to='end1'/>" + + " </task>" + + " <task assignee='otto' name='task9'>" + + " <transition to='join2'/>" + + " </task>" + + " <task assignee='otto' name='task1'>" + + " <transition to='join1'/>" + + " </task>" + + " <fork name='fork1'>" + + " <transition to='task1'/>" + + " <transition to='task2'/>" + + " </fork>" + + " <join name='join1'>" + + " <transition to='task9'/>" + + " </join>" + + " <join name='join2'>" + + " <transition to='task8'/>" + + " </join>" + + " <fork name='fork2'>" + + " <transition to='task3'/>" + + " <transition to='fork1'/>" + + " </fork>" + + "</process> "); + Execution execution = executionService .startProcessInstanceByKey("FullyNested"); + OpenExecution oe = (OpenExecution) execution; + Collection< ? > ec = oe.getExecutions(); + for (Object object : ec) { + System.out.println(((OpenExecution) object).getActivity().getName()); + } + + ProcessDefinitionQuery pdq = repositoryService.createProcessDefinitionQuery().processDefinitionId(oe.getProcessDefinitionId()); + + ProcessDefinition pd = pdq.uniqueResult(); + System.out.println(((OpenProcessDefinition) pd).getActivities()); + + assertActivitiesActive(execution.getId(), "task3", "task1", "task2"); List<Task> taskList = taskService.findPersonalTasks("otto"); @@ -51,44 +100,65 @@ taskService.completeTask(task.getId()); assertProcessInstanceEnded(execution.getId()); - - repositoryService.deleteDeploymentCascade(deploymentId); + } - - public void testWeirdNested() { - - deploymentId = repositoryService - .createDeployment() - .addResourceFromClasspath( - "org/jbpm/test/activity/forkjoin/weirdForkAndJoin.jpdl.xml") - .deploy(); + public void testWeirdNested() { - Execution execution = executionService - .startProcessInstanceByKey("WeirdNested"); + deployJpdlXmlString("<process name=\"WeirdNested\" xmlns=\"http://jbpm.org/4.3/jpdl\">" + + " <start name=\"start1\">" + + " <transition name=\"to fork2\" to=\"fork2\"/>" + + " </start>" + + "" + + " <fork name=\"fork2\">" + + " <transition name=\"to task1\" to=\"task1\"/>" + + " <transition name=\"to task2\" to=\"task2\"/>" + + " </fork>" + + "" + + " <task assignee=\"otto\" name=\"task1\">" + + " <transition name=\"to fork1\" to=\"fork1\"/>" + + " </task>" + + " <task assignee=\"otto\" name=\"task2\">" + + " <transition name=\"to join1-via2\" to=\"join1\"/>" + + " </task>" + + " " + + " <fork name=\"fork1\">" + + " <transition name=\"to task3\" to=\"task3\"/>" + + " <transition name=\"to join1-via1\" to=\"join1\"/>" + + " </fork>" + + "" + + " <join name=\"join1\">" + + " <transition name=\"to task4\" to=\"task4\"/>" + + " </join>" + + "" + + " <task assignee=\"otto\" name=\"task3\"/>" + + " <task assignee=\"otto\" name=\"task4\"/>" + + "" + + "</process>"); - List<Task> taskList = taskService.findPersonalTasks("otto"); - assertEquals(2, taskList.size()); - assertActivitiesActive(execution.getId(), "task1", "task2"); - - Task task1 = getTask(taskList, "task1"); - taskService.completeTask(task1.getId()); - - taskList = taskService.findPersonalTasks("otto"); - - assertEquals(2, taskList.size()); - assertActivitiesActive(execution.getId(), "task3", "task2"); - - Task task2 = getTask(taskList, "task2"); - taskService.completeTask(task2.getId()); - - taskList = taskService.findPersonalTasks("otto"); - - assertEquals(2, taskList.size()); - assertActivitiesActive(execution.getId(), "task3", "task4"); - - assertProcessInstanceActive(execution.getId()); - - repositoryService.deleteDeploymentCascade(deploymentId); - } + Execution execution = executionService.startProcessInstanceByKey("WeirdNested"); + List<Task> taskList = taskService.findPersonalTasks("otto"); + assertEquals(2, taskList.size()); + assertActivitiesActive(execution.getId(), "task1", "task2"); + + Task task1 = getTask(taskList, "task1"); + taskService.completeTask(task1.getId()); + + taskList = taskService.findPersonalTasks("otto"); + + assertEquals(2, taskList.size()); + assertActivitiesActive(execution.getId(), "task3", "task2"); + + Task task2 = getTask(taskList, "task2"); + taskService.completeTask(task2.getId()); + + taskList = taskService.findPersonalTasks("otto"); + + assertEquals(2, taskList.size()); + assertActivitiesActive(execution.getId(), "task3", "task4"); + + assertProcessInstanceActive(execution.getId()); + + } + } Deleted: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activity/forkjoin/fullynested.jpdl.xml =================================================================== --- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activity/forkjoin/fullynested.jpdl.xml 2010-03-09 20:22:30 UTC (rev 6218) +++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activity/forkjoin/fullynested.jpdl.xml 2010-03-10 19:31:36 UTC (rev 6219) @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<process name="FullyNested" xmlns="http://jbpm.org/4.3/jpdl"> - - <start g="24,132,48,48" name="start1"> - <transition to="fork2"/> - </start> - <end g="768,132,48,48" name="end1"/> - - <task assignee="otto" g="264,192,97,49" name="task2"> - <transition g="409,217:" to="join1"/> - </task> - <task assignee="otto" g="72,264,97,49" name="task3"> - <transition g="610,287:" to="join2"/> - </task> - <task assignee="otto" g="660,132,85,49" name="task8"> - <transition to="end1"/> - </task> - <task assignee="otto" g="456,132,92,52" name="task9"> - <transition to="join2"/> - </task> - <task assignee="otto" g="264,48,97,51" name="task1"> - <transition g="408,70:" to="join1"/> - </task> - <fork g="204,132,48,48" name="fork1"> - <transition g="228,73:" to="task1"/> - <transition g="230,219:" to="task2"/> - </fork> - <join g="384,132,48,48" name="join1"> - <transition to="task9"/> - </join> - <join g="588,132,48,48" name="join2"> - <transition to="task8"/> - </join> - <fork g="96,132,48,48" name="fork2"> - <transition to="task3"/> - <transition to="fork1"/> - </fork> -</process> \ No newline at end of file Deleted: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activity/forkjoin/weirdForkAndJoin.jpdl.xml =================================================================== --- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activity/forkjoin/weirdForkAndJoin.jpdl.xml 2010-03-09 20:22:30 UTC (rev 6218) +++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activity/forkjoin/weirdForkAndJoin.jpdl.xml 2010-03-10 19:31:36 UTC (rev 6219) @@ -1,32 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<process name="WeirdNested" xmlns="http://jbpm.org/4.3/jpdl"> - <start g="264,64,48,48" name="start1"> - <transition g="-43,-18" name="to fork2" to="fork2"/> - </start> - - <fork g="263,140,48,48" name="fork2"> - <transition g="-44,-18" name="to task1" to="task1"/> - <transition g="-44,-18" name="to task2" to="task2"/> - </fork> - - <task assignee="otto" g="102,169,92,52" name="task1"> - <transition g="-43,-18" name="to fork1" to="fork1"/> - </task> - <task assignee="otto" g="402,174,92,52" name="task2"> - <transition g="-41,-18" name="to join1-via2" to="join1"/> - </task> - - <fork g="119,280,48,48" name="fork1"> - <transition g="-44,-18" name="to task3" to="task3"/> - <transition g="-41,-18" name="to join1-via1" to="join1"/> - </fork> - - <join g="271,380,48,48" name="join1"> - <transition g="-44,-18" name="to task4" to="task4"/> - </join> - - <task assignee="otto" g="26,465,92,52" name="task3"/> - <task assignee="otto" g="248,466,92,52" name="task4"/> - -</process> \ No newline at end of file