[jbpm-commits] JBoss JBPM SVN: r3486 - in projects/spec/trunk/modules/cts/src/test: java/org/jboss/bpm/cts/feature/gateway/exclusive and 9 other directories.

Author: thomas.diesler(a)jboss.com Date: 2008-12-20 10:46:33 -0500 (Sat, 20 Dec 2008) New Revision: 3486 Added: projects/spec/trunk/modules/cts/src/test/resources/cts/feature/ projects/spec/trunk/modules/cts/src/test/resources/cts/feature/deployment/ projects/spec/trunk/modules/cts/src/test/resources/cts/feature/deployment/simple-process-jbpm3.xml projects/spec/trunk/modules/cts/src/test/resources/cts/feature/gateway/ projects/spec/trunk/modules/cts/src/test/resources/cts/feature/gateway/exclusive/ projects/spec/trunk/modules/cts/src/test/resources/cts/feature/gateway/exclusive/exclusive-split-jbpm3.xml projects/spec/trunk/modules/cts/src/test/resources/cts/pattern/ projects/spec/trunk/modules/cts/src/test/resources/cts/pattern/control/ projects/spec/trunk/modules/cts/src/test/resources/cts/pattern/control/exclusivechoice/ projects/spec/trunk/modules/cts/src/test/resources/cts/pattern/control/exclusivechoice/exclusive-choice-jbpm3.xml Removed: projects/spec/trunk/modules/cts/src/test/resources/cts/deployment/ Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/feature/deployment/DeploymentXMLTest.java projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/feature/gateway/exclusive/ExclusiveGatewaySplitTest.java projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/pattern/control/exclusivechoice/ExclusiveChoiceTest.java Log: jbpm3 all good Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/feature/deployment/DeploymentXMLTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/feature/deployment/DeploymentXMLTest.java 2008-12-20 14:33:15 UTC (rev 3485) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/feature/deployment/DeploymentXMLTest.java 2008-12-20 15:46:33 UTC (rev 3486) @@ -43,7 +43,7 @@ { public void testSimpleXMLDeploy() throws Exception { - URL pdURL = getResourceURL("cts/deployment/simple-process-" + getDialect() + ".xml"); + URL pdURL = getResourceURL("cts/feature/deployment/simple-process-" + getDialect() + ".xml"); DeploymentService depService = getProcessEngine().getService(DeploymentService.class); Deployment dep = depService.createDeployment(pdURL); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/feature/gateway/exclusive/ExclusiveGatewaySplitTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/feature/gateway/exclusive/ExclusiveGatewaySplitTest.java 2008-12-20 14:33:15 UTC (rev 3485) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/feature/gateway/exclusive/ExclusiveGatewaySplitTest.java 2008-12-20 15:46:33 UTC (rev 3486) @@ -24,6 +24,7 @@ // $Id$ import java.io.IOException; +import java.net.URL; import org.jboss.bpm.api.model.ProcessDefinition; import org.jboss.bpm.api.model.ProcessInstance; @@ -31,6 +32,7 @@ import org.jboss.bpm.api.runtime.BasicAttachments; import org.jboss.bpm.api.runtime.Token; import org.jboss.bpm.api.runtime.Token.TokenStatus; +import org.jboss.bpm.api.service.ProcessDefinitionService; import org.jboss.bpm.api.test.CTSTestCase; /** @@ -40,7 +42,7 @@ * @author thomas.diesler(a)jboss.com * @since 06-Aug-2008 */ -public abstract class ExclusiveGatewaySplitTest extends CTSTestCase +public class ExclusiveGatewaySplitTest extends CTSTestCase { public void testGateA() throws Exception { @@ -53,7 +55,7 @@ Token tok = proc.startProcess(att); String nodeName = tok.getNode().getName(); - assertEquals("EndA", nodeName); + assertEquals("endA", nodeName); assertEquals(TokenStatus.Destroyed, tok.getTokenStatus()); assertEquals(ProcessStatus.Completed, proc.getProcessStatus()); @@ -70,7 +72,7 @@ Token tok = proc.startProcess(att); String nodeName = tok.getNode().getName(); - assertEquals("EndB", nodeName); + assertEquals("endB", nodeName); assertEquals(TokenStatus.Destroyed, tok.getTokenStatus()); assertEquals(ProcessStatus.Completed, proc.getProcessStatus()); @@ -97,6 +99,9 @@ protected ProcessDefinition getProcessDefinition() throws IOException { - return null; + URL pdURL = getResourceURL("cts/feature/gateway/exclusive/exclusive-split-" + getDialect() + ".xml"); + ProcessDefinitionService pdService = getProcessEngine().getService(ProcessDefinitionService.class); + ProcessDefinition procDef = pdService.parseProcessDefinition(pdURL); + return procDef; } } Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/pattern/control/exclusivechoice/ExclusiveChoiceTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/pattern/control/exclusivechoice/ExclusiveChoiceTest.java 2008-12-20 14:33:15 UTC (rev 3485) +++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/pattern/control/exclusivechoice/ExclusiveChoiceTest.java 2008-12-20 15:46:33 UTC (rev 3486) @@ -24,11 +24,17 @@ // $Id$ import java.io.IOException; +import java.net.URL; import java.util.List; import org.jboss.bpm.api.model.ProcessDefinition; +import org.jboss.bpm.api.model.ProcessInstance; import org.jboss.bpm.api.model.Signal; +import org.jboss.bpm.api.model.ProcessInstance.ProcessStatus; import org.jboss.bpm.api.runtime.BasicAttachments; +import org.jboss.bpm.api.runtime.Token; +import org.jboss.bpm.api.runtime.Token.TokenStatus; +import org.jboss.bpm.api.service.ProcessDefinitionService; import org.jboss.bpm.api.test.CTSTestCase; import org.jboss.bpm.incubator.client.ProcessInstanceExt; import org.jboss.bpm.incubator.model.Gateway; @@ -44,49 +50,53 @@ * @author thomas.diesler(a)jboss.com * @since 06-Aug-2008 */ -public abstract class ExclusiveChoiceTest extends CTSTestCase +public class ExclusiveChoiceTest extends CTSTestCase { public void testGateA() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance(); + ProcessInstance proc = procDef.newInstance(); BasicAttachments att = new BasicAttachments(); att.addAttachment("foo", "5"); - proc.startProcessAsync(att); - proc.waitForEnd(); - List<Signal> endSignals = getSignals(Signal.SignalType.SYSTEM_END_EVENT_EXIT); - assertEquals(1, endSignals.size()); - assertEquals("EndA", endSignals.get(0).getFromRef().getKeyProperty("name")); + Token tok = proc.startProcess(att); + + String nodeName = tok.getNode().getName(); + assertEquals("endA", nodeName); + + assertEquals(TokenStatus.Destroyed, tok.getTokenStatus()); + assertEquals(ProcessStatus.Completed, proc.getProcessStatus()); } public void testGateB() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance(); + ProcessInstance proc = procDef.newInstance(); BasicAttachments att = new BasicAttachments(); att.addAttachment("foo", "15"); - proc.startProcessAsync(att); - proc.waitForEnd(); + + Token tok = proc.startProcess(att); - List<Signal> endSignals = getSignals(Signal.SignalType.SYSTEM_END_EVENT_EXIT); - assertEquals(1, endSignals.size()); - assertEquals("EndB", endSignals.get(0).getFromRef().getKeyProperty("name")); + String nodeName = tok.getNode().getName(); + assertEquals("endB", nodeName); + + assertEquals(TokenStatus.Destroyed, tok.getTokenStatus()); + assertEquals(ProcessStatus.Completed, proc.getProcessStatus()); } public void testInvalidGate() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - ProcessInstanceExt proc = (ProcessInstanceExt)procDef.newInstance(); + ProcessInstance proc = procDef.newInstance(); BasicAttachments att = new BasicAttachments(); att.addAttachment("foo", "10"); - proc.startProcessAsync(att); + try { - proc.waitForEnd(); + proc.startProcess(att); fail("No gate defined for foo==10"); } catch (RuntimeException rte) @@ -95,15 +105,11 @@ } } - public ProcessDefinition getProcessDefinition() throws IOException + protected ProcessDefinition getProcessDefinition() throws IOException { - ProcessBuilderService pbService = getProcessEngine().getService(ProcessBuilderService.class); - ProcessBuilderExt procBuilder = (ProcessBuilderExt)pbService.getProcessBuilder(); - procBuilder.addProcess(getName()).addStartEvent("Start").addSequenceFlow("Split"); - GatewayBuilder gatewayBuilder = procBuilder.addGateway("Split", Gateway.GatewayType.Exclusive); - gatewayBuilder.addConditionalGate("EndA", ExpressionLanguage.MVEL, "foo < 10"); - gatewayBuilder.addConditionalGate("EndB", ExpressionLanguage.MVEL, "foo > 10"); - procBuilder.addEndEventExt("EndA").addEndEventExt("EndB"); - return procBuilder.getProcessDefinition(); + URL pdURL = getResourceURL("cts/pattern/control/exclusivechoice/exclusive-choice-" + getDialect() + ".xml"); + ProcessDefinitionService pdService = getProcessEngine().getService(ProcessDefinitionService.class); + ProcessDefinition procDef = pdService.parseProcessDefinition(pdURL); + return procDef; } } Copied: projects/spec/trunk/modules/cts/src/test/resources/cts/feature/deployment/simple-process-jbpm3.xml (from rev 3474, projects/spec/trunk/modules/cts/src/test/resources/cts/deployment/simple-process-jbpm3.xml) =================================================================== --- projects/spec/trunk/modules/cts/src/test/resources/cts/feature/deployment/simple-process-jbpm3.xml (rev 0) +++ projects/spec/trunk/modules/cts/src/test/resources/cts/feature/deployment/simple-process-jbpm3.xml 2008-12-20 15:46:33 UTC (rev 3486) @@ -0,0 +1,16 @@ +<process-definition name="simpleProcess" xmlns="urn:jbpm.org:jpdl-3.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:jbpm.org:jpdl-3.2 http://jbpm.org/xsd/jpdl-3.2.xsd"> + <start-state name='start'> + <transition to='a' /> + </start-state> + <state name='a'> + <transition to='b' /> + </state> + <state name='b'> + <transition to='c' /> + </state> + <state name='c'> + <transition to='end' /> + </state> + <end-state name='end' /> +</process-definition> Added: projects/spec/trunk/modules/cts/src/test/resources/cts/feature/gateway/exclusive/exclusive-split-jbpm3.xml =================================================================== --- projects/spec/trunk/modules/cts/src/test/resources/cts/feature/gateway/exclusive/exclusive-split-jbpm3.xml (rev 0) +++ projects/spec/trunk/modules/cts/src/test/resources/cts/feature/gateway/exclusive/exclusive-split-jbpm3.xml 2008-12-20 15:46:33 UTC (rev 3486) @@ -0,0 +1,17 @@ +<process-definition name="exclusiveSplit" xmlns="urn:jbpm.org:jpdl-3.2"> + + <start-state name='start'> + <transition to='gateway' /> + </start-state> + <decision name="gateway"> + <transition to="endA"> + <condition>#{foo &lt; 10}</condition> + </transition> + <transition to="endB"> + <condition>#{foo &gt; 10}</condition> + </transition> + </decision> + <end-state name='endA' /> + <end-state name='endB' /> + +</process-definition> \ No newline at end of file Property changes on: projects/spec/trunk/modules/cts/src/test/resources/cts/feature/gateway/exclusive/exclusive-split-jbpm3.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/spec/trunk/modules/cts/src/test/resources/cts/pattern/control/exclusivechoice/exclusive-choice-jbpm3.xml =================================================================== --- projects/spec/trunk/modules/cts/src/test/resources/cts/pattern/control/exclusivechoice/exclusive-choice-jbpm3.xml (rev 0) +++ projects/spec/trunk/modules/cts/src/test/resources/cts/pattern/control/exclusivechoice/exclusive-choice-jbpm3.xml 2008-12-20 15:46:33 UTC (rev 3486) @@ -0,0 +1,17 @@ +<process-definition name="exclusiveSplit" xmlns="urn:jbpm.org:jpdl-3.2"> + + <start-state name='start'> + <transition to='gateway' /> + </start-state> + <decision name="gateway"> + <transition to="endA"> + <condition>#{foo &lt; 10}</condition> + </transition> + <transition to="endB"> + <condition>#{foo &gt; 10}</condition> + </transition> + </decision> + <end-state name='endA' /> + <end-state name='endB' /> + +</process-definition> \ No newline at end of file Property changes on: projects/spec/trunk/modules/cts/src/test/resources/cts/pattern/control/exclusivechoice/exclusive-choice-jbpm3.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF