[jbpm-commits] JBoss JBPM SVN: r1866 - in jbossbpm/spec/trunk/modules: testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive and 5 other directories.

Author: thomas.diesler(a)jboss.com Date: 2008-08-11 08:30:14 -0400 (Mon, 11 Aug 2008) New Revision: 1866 Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/GatewayImpl.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveMergeTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveSplitTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveMergeTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveSplitTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelMergeTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelSplitTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/parallelsplit/ParallelSplitTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/sequence/BasicSequenceTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/task/BasicTaskTest.java Log: WIP Modified: jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/GatewayImpl.java =================================================================== --- jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/GatewayImpl.java 2008-08-11 12:26:17 UTC (rev 1865) +++ jbossbpm/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/model/internal/GatewayImpl.java 2008-08-11 12:30:14 UTC (rev 1866) @@ -34,7 +34,6 @@ import org.jboss.bpm.model.ConnectingObject; import org.jboss.bpm.model.Gate; import org.jboss.bpm.model.Gateway; -import org.jboss.bpm.model.Process; import org.jboss.bpm.model.SequenceFlow; import org.jboss.bpm.model.Signal; import org.jboss.bpm.model.SequenceFlow.ConditionType; Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveMergeTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveMergeTest.java 2008-08-11 12:26:17 UTC (rev 1865) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveMergeTest.java 2008-08-11 12:30:14 UTC (rev 1866) @@ -23,13 +23,17 @@ // $Id$ +import java.util.List; + import org.jboss.bpm.client.SignalManager; import org.jboss.bpm.model.EventBuilder; import org.jboss.bpm.model.Process; import org.jboss.bpm.model.ProcessBuilder; import org.jboss.bpm.model.ProcessBuilderFactory; +import org.jboss.bpm.model.Signal; import org.jboss.bpm.model.Gateway.GatewayType; import org.jboss.bpm.model.Signal.SignalType; +import org.jboss.bpm.runtime.BasicAttachments; import org.jboss.bpm.test.DefaultEngineTestCase; /** @@ -46,16 +50,38 @@ protected void setUp() throws Exception { super.setUp(); - SignalManager engine = SignalManager.locateSignalManager(); - engine.addSignalListener(getName(), this); + SignalManager signalManager = SignalManager.locateSignalManager(); + signalManager.addSignalListener(getName(), this); } public void testGateA() throws Exception { Process proc = getProcess(); - assertNotNull(proc); + proc.startProcess(); + + SignalManager signalManager = SignalManager.locateSignalManager(); + + proc.waitForEnd(); + + List<Signal> endSignals = getSignals(Signal.SignalType.EXIT_END_EVENT); + assertEquals(1, endSignals.size()); + assertEquals("EndA", endSignals.get(0).getFromRef()); } + public void testGateB() throws Exception + { + Process proc = getProcess(); + + BasicAttachments att = new BasicAttachments(); + att.addAttachment("foo", "15"); + proc.startProcess(att); + proc.waitForEnd(); + + List<Signal> endSignals = getSignals(Signal.SignalType.EXIT_END_EVENT); + assertEquals(1, endSignals.size()); + assertEquals("EndB", endSignals.get(0).getFromRef()); + } + private Process getProcess() { ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder(); Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveSplitTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveSplitTest.java 2008-08-11 12:26:17 UTC (rev 1865) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveSplitTest.java 2008-08-11 12:30:14 UTC (rev 1866) @@ -49,8 +49,8 @@ protected void setUp() throws Exception { super.setUp(); - SignalManager engine = SignalManager.locateSignalManager(); - engine.addSignalListener(getName(), this); + SignalManager signalManager = SignalManager.locateSignalManager(); + signalManager.addSignalListener(getName(), this); } public void testGateA() throws Exception Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveMergeTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveMergeTest.java 2008-08-11 12:26:17 UTC (rev 1865) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveMergeTest.java 2008-08-11 12:30:14 UTC (rev 1866) @@ -40,8 +40,8 @@ protected void setUp() throws Exception { super.setUp(); - SignalManager engine = SignalManager.locateSignalManager(); - engine.addSignalListener(getName(), this); + SignalManager signalManager = SignalManager.locateSignalManager(); + signalManager.addSignalListener(getName(), this); } public void testGateA() throws Exception Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveSplitTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveSplitTest.java 2008-08-11 12:26:17 UTC (rev 1865) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveSplitTest.java 2008-08-11 12:30:14 UTC (rev 1866) @@ -39,8 +39,8 @@ protected void setUp() throws Exception { super.setUp(); - SignalManager engine = SignalManager.locateSignalManager(); - engine.addSignalListener(getName(), this); + SignalManager signalManager = SignalManager.locateSignalManager(); + signalManager.addSignalListener(getName(), this); } public void testGateA() throws Exception Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelMergeTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelMergeTest.java 2008-08-11 12:26:17 UTC (rev 1865) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelMergeTest.java 2008-08-11 12:30:14 UTC (rev 1866) @@ -40,8 +40,8 @@ protected void setUp() throws Exception { super.setUp(); - SignalManager engine = SignalManager.locateSignalManager(); - engine.addSignalListener(getName(), this); + SignalManager signalManager = SignalManager.locateSignalManager(); + signalManager.addSignalListener(getName(), this); } public void testGateA() throws Exception Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelSplitTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelSplitTest.java 2008-08-11 12:26:17 UTC (rev 1865) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelSplitTest.java 2008-08-11 12:30:14 UTC (rev 1866) @@ -39,8 +39,8 @@ protected void setUp() throws Exception { super.setUp(); - SignalManager engine = SignalManager.locateSignalManager(); - engine.addSignalListener(getName(), this); + SignalManager signalManager = SignalManager.locateSignalManager(); + signalManager.addSignalListener(getName(), this); } public void testGateA() throws Exception Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/parallelsplit/ParallelSplitTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/parallelsplit/ParallelSplitTest.java 2008-08-11 12:26:17 UTC (rev 1865) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/parallelsplit/ParallelSplitTest.java 2008-08-11 12:30:14 UTC (rev 1866) @@ -50,8 +50,8 @@ protected void setUp() throws Exception { super.setUp(); - SignalManager engine = SignalManager.locateSignalManager(); - engine.addSignalListener(getName(), this); + SignalManager signalManager = SignalManager.locateSignalManager(); + signalManager.addSignalListener(getName(), this); } /** Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/sequence/BasicSequenceTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/sequence/BasicSequenceTest.java 2008-08-11 12:26:17 UTC (rev 1865) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/sequence/BasicSequenceTest.java 2008-08-11 12:30:14 UTC (rev 1866) @@ -47,8 +47,8 @@ protected void setUp() throws Exception { super.setUp(); - SignalManager engine = SignalManager.locateSignalManager(); - engine.addSignalListener(getName(), this); + SignalManager signalManager = SignalManager.locateSignalManager(); + signalManager.addSignalListener(getName(), this); } /** Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/task/BasicTaskTest.java =================================================================== --- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/task/BasicTaskTest.java 2008-08-11 12:26:17 UTC (rev 1865) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/task/BasicTaskTest.java 2008-08-11 12:30:14 UTC (rev 1866) @@ -47,8 +47,8 @@ protected void setUp() throws Exception { super.setUp(); - SignalManager engine = SignalManager.locateSignalManager(); - engine.addSignalListener(getName(), this); + SignalManager signalManager = SignalManager.locateSignalManager(); + signalManager.addSignalListener(getName(), this); } /**