[jbpm-commits] JBoss JBPM SVN: r3676 - jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities.

Author: tom.baeyens(a)jboss.com Date: 2009-01-19 09:31:15 -0500 (Mon, 19 Jan 2009) New Revision: 3676 Removed: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionAsWaitStateTest.java Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeVariableTest.java jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/SubProcessTest.java jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionBasedConcurrencyTest.java jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionEventsTest.java jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/VariableTest.java Log: migrations of process factory to process definition builder Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeVariableTest.java =================================================================== --- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeVariableTest.java 2009-01-19 14:06:26 UTC (rev 3675) +++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/ScopeVariableTest.java 2009-01-19 14:31:15 UTC (rev 3676) @@ -29,6 +29,7 @@ import org.jbpm.client.ClientExecution; import org.jbpm.client.ClientProcessDefinition; import org.jbpm.model.OpenExecution; +import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder; import org.jbpm.pvm.model.ProcessFactory; import org.jbpm.test.JbpmTestCase; @@ -56,13 +57,18 @@ } public void testOuterscopeLookup() { - ClientProcessDefinition processDefinition = ProcessFactory.startProcess() - .startActivity("a").initial().behaviour(new WaitState()) - .flow().to("b") - .startActivity("b").behaviour(new WaitState()) + ClientProcessDefinition processDefinition = ProcessDefinitionBuilder + .startProcess() + .startActivity("a", new WaitState()) + .initial() + .flow("b") + .endActivity() + .startActivity("b", new WaitState()) .scope() // !!!! - .flow().to("c") - .startActivity("c").behaviour(new WaitState()) + .flow("c") + .endActivity() + .startActivity("c", new WaitState()) + .endActivity() .endProcess(); ClientExecution processInstance = processDefinition.startProcessInstance(); @@ -81,13 +87,18 @@ } public void testLocalVariableLookup() { - ClientProcessDefinition processDefinition = ProcessFactory.startProcess() - .startActivity("a").initial().behaviour(new WaitState()) - .flow().to("b") - .startActivity("b").behaviour(new WaitState()) + ClientProcessDefinition processDefinition = ProcessDefinitionBuilder + .startProcess() + .startActivity("a", new WaitState()) + .initial() + .flow("b") + .endActivity() + .startActivity("b", new WaitState()) .scope() // !!!! - .flow().to("c") - .startActivity("c").behaviour(new WaitState()) + .flow("c") + .endActivity() + .startActivity("c", new WaitState()) + .endActivity() .endProcess(); ClientExecution processInstance = processDefinition.startProcessInstance(); @@ -107,13 +118,18 @@ } public void testLocalVariableUpdate() { - ClientProcessDefinition processDefinition = ProcessFactory.startProcess() - .startActivity("a").initial().behaviour(new WaitState()) - .flow().to("b") - .startActivity("b").behaviour(new WaitState()) + ClientProcessDefinition processDefinition = ProcessDefinitionBuilder + .startProcess() + .startActivity("a", new WaitState()) + .initial() + .flow("b") + .endActivity() + .startActivity("b", new WaitState()) .scope() // !!!! - .flow().to("c") - .startActivity("c").behaviour(new WaitState()) + .flow("c") + .endActivity() + .startActivity("c", new WaitState()) + .endActivity() .endProcess(); ClientExecution processInstance = processDefinition.startProcessInstance(); @@ -133,13 +149,18 @@ } public void testDefaultCreationOnGlobalScope() { - ClientProcessDefinition processDefinition = ProcessFactory.startProcess() - .startActivity("a").initial().behaviour(new WaitState()) - .flow().to("b") - .startActivity("b").behaviour(new WaitState()) + ClientProcessDefinition processDefinition = ProcessDefinitionBuilder + .startProcess() + .startActivity("a", new WaitState()) + .initial() + .flow("b") + .endActivity() + .startActivity("b", new WaitState()) .scope() // !!!! - .flow().to("c") - .startActivity("c").behaviour(new WaitState()) + .flow("c") + .endActivity() + .startActivity("c", new WaitState()) + .endActivity() .endProcess(); ClientExecution processInstance = processDefinition.startProcessInstance(); @@ -157,13 +178,18 @@ } public void testVariableUpdatesOnEndedScope() { - ClientProcessDefinition processDefinition = ProcessFactory.startProcess() - .startActivity("a").initial().behaviour(new WaitState()) - .flow().to("b") - .startActivity("b").behaviour(new WaitState()) + ClientProcessDefinition processDefinition = ProcessDefinitionBuilder + .startProcess() + .startActivity("a", new WaitState()) + .initial() + .flow("b") + .endActivity() + .startActivity("b", new WaitState()) .scope() // !!!! - .flow().to("c") - .startActivity("c").behaviour(new WaitState()) + .flow("c") + .endActivity() + .startActivity("c", new WaitState()) + .endActivity() .endProcess(); ClientExecution processInstance = processDefinition.startProcessInstance(); Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/SubProcessTest.java =================================================================== --- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/SubProcessTest.java 2009-01-19 14:06:26 UTC (rev 3675) +++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/SubProcessTest.java 2009-01-19 14:31:15 UTC (rev 3676) @@ -28,6 +28,7 @@ import org.jbpm.activity.ExternalActivity; import org.jbpm.client.ClientExecution; import org.jbpm.client.ClientProcessDefinition; +import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder; import org.jbpm.pvm.model.ProcessFactory; import org.jbpm.test.JbpmTestCase; @@ -75,20 +76,30 @@ } public void testSubProcess() { - ClientProcessDefinition subProcess = ProcessFactory.startProcess("sub") - .startActivity("sub1").initial().behaviour(new AutomaticActivity()) - .flow().to("sub2") - .startActivity("sub2").behaviour(new WaitState()) - .flow().to("sub3") - .startActivity("sub3").behaviour(new EndState()) + ClientProcessDefinition subProcess = ProcessDefinitionBuilder + .startProcess("sub") + .startActivity("sub1", new AutomaticActivity()) + .initial() + .flow("sub2") + .endActivity() + .startActivity("sub2", new WaitState()) + .flow("sub3") + .endActivity() + .startActivity("sub3", new EndState()) + .endActivity() .endProcess(); - ClientProcessDefinition superProcess = ProcessFactory.startProcess("super") - .startActivity("super1").initial().behaviour(new AutomaticActivity()) - .flow().to("super2") - .startActivity("super2").behaviour(new SubProcess(subProcess)) - .flow().to("super3") - .startActivity("super3").behaviour(new WaitState()) + ClientProcessDefinition superProcess = ProcessDefinitionBuilder + .startProcess("super") + .startActivity("super1", new AutomaticActivity()) + .initial() + .flow("super2") + .endActivity() + .startActivity("super2", new SubProcess(subProcess)) + .flow("super3") + .endActivity() + .startActivity("super3", new WaitState()) + .endActivity() .endProcess(); ClientExecution superProcesInstance = superProcess.startProcessInstance(); Deleted: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionAsWaitStateTest.java =================================================================== --- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionAsWaitStateTest.java 2009-01-19 14:06:26 UTC (rev 3675) +++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionAsWaitStateTest.java 2009-01-19 14:31:15 UTC (rev 3676) @@ -1,83 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jbpm.test.activities; - -import java.util.Map; - -import org.jbpm.activity.Activity; -import org.jbpm.activity.ActivityExecution; -import org.jbpm.activity.ExternalActivity; -import org.jbpm.client.ClientExecution; -import org.jbpm.client.ClientProcessDefinition; -import org.jbpm.model.Condition; -import org.jbpm.model.OpenExecution; -import org.jbpm.pvm.model.ProcessFactory; -import org.jbpm.test.JbpmTestCase; - -/** this test shows how to implement a transition that behaves as a - * wait state. - * - * @author Tom Baeyens - */ -public class TransitionAsWaitStateTest extends JbpmTestCase -{ - - public static class AlwaysTrue implements Condition { - private static final long serialVersionUID = 1L; - public boolean evaluate(OpenExecution execution) { - return true; - } - }; - - public static class AutomaticActivity implements Activity { - private static final long serialVersionUID = 1L; - public void execute(ActivityExecution execution) { - } - } - - public static class WaitState implements ExternalActivity { - private static final long serialVersionUID = 1L; - public void execute(ActivityExecution execution) { - execution.waitForSignal(); - } - public void signal(ActivityExecution execution, String signalName, Map<String, Object> parameters){ - } - } - - public void testSmallAmount() { - ClientProcessDefinition processDefinition = ProcessFactory.startProcess() - .startActivity("make loss").initial().behaviour(new AutomaticActivity()) - .flow("use jbpm").to("make profit") - .waitCondition(new AlwaysTrue()) - .startActivity("make profit").behaviour(new WaitState()) - .endProcess(); - - ClientExecution execution = processDefinition.startProcessInstance(); - - assertNull(execution.getNode()); - - execution.signal(); - - assertEquals("make profit", execution.getNode().getName()); - } - -} Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionBasedConcurrencyTest.java =================================================================== --- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionBasedConcurrencyTest.java 2009-01-19 14:06:26 UTC (rev 3675) +++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionBasedConcurrencyTest.java 2009-01-19 14:31:15 UTC (rev 3676) @@ -14,6 +14,7 @@ import org.jbpm.model.Node; import org.jbpm.model.OpenExecution; import org.jbpm.model.Transition; +import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder; import org.jbpm.pvm.model.ProcessFactory; import org.jbpm.test.JbpmTestCase; @@ -123,17 +124,24 @@ public void testTransitionBasedConcurrency() { - ClientProcessDefinition processDefinition = ProcessFactory.startProcess() - .startActivity("fork").initial().behaviour(new Fork()) - .flow("billing").to("bill") - .flow("shipping").to("ship") - .startActivity("bill").behaviour(new WaitState()) - .flow().to("join") - .startActivity("ship").behaviour(new WaitState()) - .flow().to("join") - .startActivity("join").behaviour(new Join()) - .flow().to("end") - .startActivity("end").behaviour(new WaitState()) + ClientProcessDefinition processDefinition = ProcessDefinitionBuilder + .startProcess() + .startActivity("fork", new Fork()) + .initial() + .flow("bill", "billing") + .flow("ship", "shipping") + .endActivity() + .startActivity("bill", new WaitState()) + .flow("join") + .endActivity() + .startActivity("ship", new WaitState()) + .flow("join") + .endActivity() + .startActivity("join", new Join()) + .flow("end") + .endActivity() + .startActivity("end", new WaitState()) + .endActivity() .endProcess(); ClientExecution main = processDefinition.startProcessInstance(); Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionEventsTest.java =================================================================== --- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionEventsTest.java 2009-01-19 14:06:26 UTC (rev 3675) +++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/TransitionEventsTest.java 2009-01-19 14:31:15 UTC (rev 3676) @@ -32,6 +32,7 @@ import org.jbpm.listener.EventListener; import org.jbpm.listener.EventListenerExecution; import org.jbpm.model.Event; +import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder; import org.jbpm.pvm.model.ProcessFactory; import org.jbpm.test.JbpmTestCase; @@ -74,36 +75,52 @@ +--------------+ */ - ClientProcessDefinition processDefinition = ProcessFactory.startProcess("leave a super state") + ClientProcessDefinition processDefinition = ProcessDefinitionBuilder + .startProcess("leave a super state") + .startEvent(Event.NODE_END) + .listener(processListener) + .endEvent() + .startEvent(Event.NODE_BEGIN) + .listener(processListener) + .endEvent() + .startEvent(Event.TRANSITION_TAKE) + .listener(processListener) + .endEvent() + .startActivity("composite") .startEvent(Event.NODE_END) - .listener(processListener) + .listener(compositeListener) + .endEvent() .startEvent(Event.NODE_BEGIN) - .listener(processListener) + .listener(compositeListener) + .endEvent() .startEvent(Event.TRANSITION_TAKE) - .listener(processListener) - .compositeNode("composite") + .listener(compositeListener) + .endEvent() + .startActivity("inside", new WaitState()) + .initial() + .flow("outside") .startEvent(Event.NODE_END) - .listener(compositeListener) + .listener(insideListener) + .endEvent() .startEvent(Event.NODE_BEGIN) - .listener(compositeListener) + .listener(insideListener) + .endEvent() .startEvent(Event.TRANSITION_TAKE) - .listener(compositeListener) - .startActivity("inside").initial().behaviour(new WaitState()) - .startEvent(Event.NODE_END) - .listener(insideListener) - .startEvent(Event.NODE_BEGIN) - .listener(insideListener) - .startEvent(Event.TRANSITION_TAKE) - .listener(insideListener) - .flow().to("outside") - .compositeEnd() - .startActivity("outside").behaviour(new WaitState()) - .startEvent(Event.NODE_END) - .listener(outsideListener) - .startEvent(Event.NODE_BEGIN) - .listener(outsideListener) - .startEvent(Event.TRANSITION_TAKE) - .listener(outsideListener) + .listener(insideListener) + .endEvent() + .endActivity() + .endActivity() + .startActivity("outside", new WaitState()) + .startEvent(Event.NODE_END) + .listener(outsideListener) + .endEvent() + .startEvent(Event.NODE_BEGIN) + .listener(outsideListener) + .endEvent() + .startEvent(Event.TRANSITION_TAKE) + .listener(outsideListener) + .endEvent() + .endActivity() .endProcess(); ClientExecution execution = processDefinition.startProcessInstance(); @@ -149,36 +166,52 @@ +--------------+ */ - ClientProcessDefinition processDefinition = ProcessFactory.startProcess("enter a super state") + ClientProcessDefinition processDefinition = ProcessDefinitionBuilder + .startProcess("enter a super state") + .startEvent(Event.NODE_END) + .listener(processListener) + .endEvent() + .startEvent(Event.NODE_BEGIN) + .listener(processListener) + .endEvent() + .startEvent(Event.TRANSITION_TAKE) + .listener(processListener) + .endEvent() + .startActivity("outside", new WaitState()) + .initial() + .flow("inside") .startEvent(Event.NODE_END) - .listener(processListener) + .listener(outsideListener) + .endEvent() .startEvent(Event.NODE_BEGIN) - .listener(processListener) + .listener(outsideListener) + .endEvent() .startEvent(Event.TRANSITION_TAKE) - .listener(processListener) - .startActivity("outside").initial().behaviour(new WaitState()) + .listener(outsideListener) + .endEvent() + .endActivity() + .startActivity("composite") + .startEvent(Event.NODE_END) + .listener(compositeListener) + .endEvent() + .startEvent(Event.NODE_BEGIN) + .listener(compositeListener) + .endEvent() + .startEvent(Event.TRANSITION_TAKE) + .listener(compositeListener) + .endEvent() + .startActivity("inside", new WaitState()) .startEvent(Event.NODE_END) - .listener(outsideListener) + .listener(insideListener) + .endEvent() .startEvent(Event.NODE_BEGIN) - .listener(outsideListener) + .listener(insideListener) + .endEvent() .startEvent(Event.TRANSITION_TAKE) - .listener(outsideListener) - .flow().to("inside") - .compositeNode("composite") - .startEvent(Event.NODE_END) - .listener(compositeListener) - .startEvent(Event.NODE_BEGIN) - .listener(compositeListener) - .startEvent(Event.TRANSITION_TAKE) - .listener(compositeListener) - .startActivity("inside").behaviour(new WaitState()) - .startEvent(Event.NODE_END) - .listener(insideListener) - .startEvent(Event.NODE_BEGIN) - .listener(insideListener) - .startEvent(Event.TRANSITION_TAKE) - .listener(insideListener) - .compositeEnd() + .listener(insideListener) + .endEvent() + .endActivity() + .endActivity() .endProcess(); ClientExecution execution = processDefinition.startProcessInstance(); @@ -223,29 +256,41 @@ +-----------------+ */ - ClientProcessDefinition processDefinition = ProcessFactory.startProcess("leave a super state") + ClientProcessDefinition processDefinition = ProcessDefinitionBuilder + .startProcess("leave a super state") + .startEvent(Event.NODE_END) + .listener(processListener) + .endEvent() + .startEvent(Event.NODE_BEGIN) + .listener(processListener) + .endEvent() + .startEvent(Event.TRANSITION_TAKE) + .listener(processListener) + .endEvent() + .startActivity("composite") .startEvent(Event.NODE_END) - .listener(processListener) + .listener(compositeListener) + .endEvent() .startEvent(Event.NODE_BEGIN) - .listener(processListener) + .listener(compositeListener) + .endEvent() .startEvent(Event.TRANSITION_TAKE) - .listener(processListener) - .compositeNode("composite") + .listener(compositeListener) + .endEvent() + .startActivity("inside", new WaitState()) + .initial() + .flow("inside") .startEvent(Event.NODE_END) - .listener(compositeListener) + .listener(insideListener) + .endEvent() .startEvent(Event.NODE_BEGIN) - .listener(compositeListener) + .listener(insideListener) + .endEvent() .startEvent(Event.TRANSITION_TAKE) - .listener(compositeListener) - .startActivity("inside").initial().behaviour(new WaitState()) - .startEvent(Event.NODE_END) - .listener(insideListener) - .startEvent(Event.NODE_BEGIN) - .listener(insideListener) - .startEvent(Event.TRANSITION_TAKE) - .listener(insideListener) - .flow().to("inside") - .compositeEnd() + .listener(insideListener) + .endEvent() + .endActivity() + .endActivity() .endProcess(); ClientExecution execution = processDefinition.startProcessInstance(); @@ -289,36 +334,52 @@ +--------------+ */ - ClientProcessDefinition processDefinition = ProcessFactory.startProcess("leave a super state") + ClientProcessDefinition processDefinition = ProcessDefinitionBuilder + .startProcess("leave a super state") + .startEvent(Event.NODE_END) + .listener(processListener) + .endEvent() + .startEvent(Event.NODE_BEGIN) + .listener(processListener) + .endEvent() + .startEvent(Event.TRANSITION_TAKE) + .listener(processListener) + .endEvent() + .startActivity("composite") + .flow("outside") .startEvent(Event.NODE_END) - .listener(processListener) + .listener(compositeListener) + .endEvent() .startEvent(Event.NODE_BEGIN) - .listener(processListener) + .listener(compositeListener) + .endEvent() .startEvent(Event.TRANSITION_TAKE) - .listener(processListener) - .compositeNode("composite") + .listener(compositeListener) + .endEvent() + .startActivity("inside", new WaitState()) + .initial() .startEvent(Event.NODE_END) - .listener(compositeListener) + .listener(insideListener) + .endEvent() .startEvent(Event.NODE_BEGIN) - .listener(compositeListener) + .listener(insideListener) + .endEvent() .startEvent(Event.TRANSITION_TAKE) - .listener(compositeListener) - .flow().to("outside") - .startActivity("inside").initial().behaviour(new WaitState()) - .startEvent(Event.NODE_END) - .listener(insideListener) - .startEvent(Event.NODE_BEGIN) - .listener(insideListener) - .startEvent(Event.TRANSITION_TAKE) - .listener(insideListener) - .compositeEnd() - .startActivity("outside").behaviour(new WaitState()) - .startEvent(Event.NODE_END) - .listener(outsideListener) - .startEvent(Event.NODE_BEGIN) - .listener(outsideListener) - .startEvent(Event.TRANSITION_TAKE) - .listener(outsideListener) + .listener(insideListener) + .endEvent() + .endActivity() + .endActivity() + .startActivity("outside", new WaitState()) + .startEvent(Event.NODE_END) + .listener(outsideListener) + .endEvent() + .startEvent(Event.NODE_BEGIN) + .listener(outsideListener) + .endEvent() + .startEvent(Event.TRANSITION_TAKE) + .listener(outsideListener) + .endEvent() + .endActivity() .endProcess(); ClientExecution execution = processDefinition.startProcessInstance(); @@ -369,52 +430,74 @@ +--------------------------+ */ - ClientProcessDefinition processDefinition = ProcessFactory.startProcess("leave a super state") + ClientProcessDefinition processDefinition = ProcessDefinitionBuilder + .startProcess("leave a super state") + .startEvent(Event.NODE_END) + .listener(processListener) + .endEvent() + .startEvent(Event.NODE_BEGIN) + .listener(processListener) + .endEvent() + .startEvent(Event.TRANSITION_TAKE) + .listener(processListener) + .endEvent() + .startActivity("source outside") .startEvent(Event.NODE_END) - .listener(processListener) + .listener(sourceOutsideListener) + .endEvent() .startEvent(Event.NODE_BEGIN) - .listener(processListener) + .listener(sourceOutsideListener) + .endEvent() .startEvent(Event.TRANSITION_TAKE) - .listener(processListener) - .compositeNode("source outside") + .listener(sourceOutsideListener) + .endEvent() + .startActivity("source middle") + .flow("destination inside") .startEvent(Event.NODE_END) - .listener(sourceOutsideListener) + .listener(sourceMiddleListener) + .endEvent() .startEvent(Event.NODE_BEGIN) - .listener(sourceOutsideListener) + .listener(sourceMiddleListener) + .endEvent() .startEvent(Event.TRANSITION_TAKE) - .listener(sourceOutsideListener) - .compositeNode("source middle") + .listener(sourceMiddleListener) + .endEvent() + .startActivity("source inside", new WaitState()) + .initial() .startEvent(Event.NODE_END) - .listener(sourceMiddleListener) + .listener(sourceInsideListener) + .endEvent() .startEvent(Event.NODE_BEGIN) - .listener(sourceMiddleListener) + .listener(sourceInsideListener) + .endEvent() .startEvent(Event.TRANSITION_TAKE) - .listener(sourceMiddleListener) - .flow().to("destination inside") - .startActivity("source inside").initial().behaviour(new WaitState()) - .startEvent(Event.NODE_END) - .listener(sourceInsideListener) - .startEvent(Event.NODE_BEGIN) - .listener(sourceInsideListener) - .startEvent(Event.TRANSITION_TAKE) - .listener(sourceInsideListener) - .compositeEnd() - .compositeEnd() - .compositeNode("destination outside") + .listener(sourceInsideListener) + .endEvent() + .endActivity() + .endActivity() + .endActivity() + .startActivity("destination outside") + .startEvent(Event.NODE_END) + .listener(destinationOutsideListener) + .endEvent() + .startEvent(Event.NODE_BEGIN) + .listener(destinationOutsideListener) + .endEvent() + .startEvent(Event.TRANSITION_TAKE) + .listener(destinationOutsideListener) + .endEvent() + .startActivity("destination inside", new WaitState()) .startEvent(Event.NODE_END) - .listener(destinationOutsideListener) + .listener(destinationInsideListener) + .endEvent() .startEvent(Event.NODE_BEGIN) - .listener(destinationOutsideListener) + .listener(destinationInsideListener) + .endEvent() .startEvent(Event.TRANSITION_TAKE) - .listener(destinationOutsideListener) - .startActivity("destination inside").behaviour(new WaitState()) - .startEvent(Event.NODE_END) - .listener(destinationInsideListener) - .startEvent(Event.NODE_BEGIN) - .listener(destinationInsideListener) - .startEvent(Event.TRANSITION_TAKE) - .listener(destinationInsideListener) - .compositeEnd() + .listener(destinationInsideListener) + .endEvent() + .endActivity() + .endActivity() .endProcess(); Modified: jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/VariableTest.java =================================================================== --- jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/VariableTest.java 2009-01-19 14:06:26 UTC (rev 3675) +++ jbpm4/trunk/modules/test-pojo/src/main/java/org/jbpm/test/activities/VariableTest.java 2009-01-19 14:31:15 UTC (rev 3676) @@ -31,6 +31,7 @@ import org.jbpm.client.ClientExecution; import org.jbpm.client.ClientProcessDefinition; import org.jbpm.client.ClientProcessInstance; +import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder; import org.jbpm.pvm.model.ProcessFactory; import org.jbpm.test.JbpmTestCase; @@ -47,11 +48,19 @@ public void signal(ActivityExecution execution, String signalName, Map<String, Object> parameters){ } } - - public void testSetAndGetVariable() { - ClientProcessDefinition processDefinition = ProcessFactory.startProcess() - .startActivity("a").initial().behaviour(new WaitState()) + + protected ClientProcessDefinition createProcessDefinition() { + return ProcessDefinitionBuilder + .startProcess() + .startActivity("a", new WaitState()) + .initial() + .endActivity() .endProcess(); + } + + + public void testSetAndGetVariable() { + ClientProcessDefinition processDefinition = createProcessDefinition(); ClientExecution processInstance = processDefinition.startProcessInstance(); @@ -66,9 +75,7 @@ } public void testHasVariable() { - ClientProcessDefinition processDefinition = ProcessFactory.startProcess() - .startActivity("a").initial().behaviour(new WaitState()) - .endProcess(); + ClientProcessDefinition processDefinition = createProcessDefinition(); ClientExecution processInstance = processDefinition.startProcessInstance(); @@ -79,9 +86,7 @@ } public void testSetVariables() { - ClientProcessDefinition processDefinition = ProcessFactory.startProcess() - .startActivity("a").initial().behaviour(new WaitState()) - .endProcess(); + ClientProcessDefinition processDefinition = createProcessDefinition(); ClientExecution processInstance = processDefinition.startProcessInstance(); @@ -98,9 +103,7 @@ } public void testGetVariables() { - ClientProcessDefinition processDefinition = ProcessFactory.startProcess() - .startActivity("a").initial().behaviour(new WaitState()) - .endProcess(); + ClientProcessDefinition processDefinition = createProcessDefinition(); ClientExecution processInstance = processDefinition.startProcessInstance(); @@ -116,9 +119,7 @@ } public void testRemoveVariable() { - ClientProcessDefinition processDefinition = ProcessFactory.startProcess() - .startActivity("a").initial().behaviour(new WaitState()) - .endProcess(); + ClientProcessDefinition processDefinition = createProcessDefinition(); ClientExecution processInstance = processDefinition.startProcessInstance(); @@ -150,9 +151,7 @@ } public void testRemoveVariables() { - ClientProcessDefinition processDefinition = ProcessFactory.startProcess() - .startActivity("a").initial().behaviour(new WaitState()) - .endProcess(); + ClientProcessDefinition processDefinition = createProcessDefinition(); ClientExecution processInstance = processDefinition.startProcessInstance(); @@ -167,9 +166,7 @@ } public void testGetVariableKeys() { - ClientProcessDefinition processDefinition = ProcessFactory.startProcess() - .startActivity("a").initial().behaviour(new WaitState()) - .endProcess(); + ClientProcessDefinition processDefinition = createProcessDefinition(); ClientExecution processInstance = processDefinition.startProcessInstance(); @@ -185,9 +182,7 @@ } public void testGetUnexistingVariable() { - ClientProcessDefinition processDefinition = ProcessFactory.startProcess() - .startActivity("a").initial().behaviour(new WaitState()) - .endProcess(); + ClientProcessDefinition processDefinition = createProcessDefinition(); ClientExecution processInstance = processDefinition.startProcessInstance(); @@ -206,8 +201,11 @@ } public void testInitialiseVariablesBeforeProcessInstanceBegin() { - ClientProcessDefinition processDefinition = ProcessFactory.startProcess() - .startActivity("a").initial().behaviour(new VariableActivity()) + ClientProcessDefinition processDefinition = ProcessDefinitionBuilder + .startProcess() + .startActivity("a", new VariableActivity()) + .initial() + .endActivity() .endProcess(); // here, the process instance is created first, and only later it is begun @@ -218,9 +216,7 @@ } public void testNullValue() { - ClientProcessDefinition processDefinition = ProcessFactory.startProcess() - .startActivity("a").initial().behaviour(new WaitState()) - .endProcess(); + ClientProcessDefinition processDefinition = createProcessDefinition(); ClientExecution processInstance = processDefinition.startProcessInstance();