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

Author: thomas.diesler(a)jboss.com Date: 2008-08-13 09:22:03 -0400 (Wed, 13 Aug 2008) New Revision: 1880 Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/test/AbstractAPITestCase.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/sequence/BasicSequenceTest.java jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/task/BasicTaskTest.java Log: Pull up signal/message listener Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/test/AbstractAPITestCase.java =================================================================== --- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/test/AbstractAPITestCase.java 2008-08-13 13:04:26 UTC (rev 1879) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/test/AbstractAPITestCase.java 2008-08-13 13:22:03 UTC (rev 1880) @@ -38,6 +38,7 @@ import org.jboss.bpm.client.MessageListener; import org.jboss.bpm.client.ObjectNameFactory; import org.jboss.bpm.client.SignalListener; +import org.jboss.bpm.client.SignalManager; import org.jboss.bpm.client.internal.EmbeddedBeansDeployer; import org.jboss.bpm.model.BPMNElement; import org.jboss.bpm.model.Message; @@ -67,8 +68,35 @@ { super.setUp(); log.debug("setUp: " + getClass().getName() + "." + getName()); + deployer = new EmbeddedBeansDeployer(); + + // Setup the SignalListener + signalListener = new SignalListener() + { + public void catchSignal(Signal signal) + { + signals.add(signal); + } + }; + SignalManager signalManager = SignalManager.locateSignalManager(); + signalManager.addSignalListener(getName(), getSignalListener()); signals.clear(); + + // Setup the MessageListener + messageListener = new MessageListener() + { + public ObjectName getID() + { + return getMessageListenerID(); + } + + public void catchMessage(Message message) + { + log.debug("catchMessage: " + message); + messages.add(message); + } + }; } @Override @@ -114,16 +142,6 @@ public SignalListener getSignalListener() { - if (signalListener == null) - { - signalListener = new SignalListener() - { - public void catchSignal(Signal signal) - { - signals.add(signal); - } - }; - } return signalListener; } @@ -145,22 +163,6 @@ public MessageListener getMessageListener() { - if (messageListener == null) - { - messageListener = new MessageListener() - { - public ObjectName getID() - { - return getMessageListenerID(); - } - - public void catchMessage(Message message) - { - messages.add(message); - log.debug("catchMessage: " + message); - } - }; - } return messageListener; } 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-13 13:04:26 UTC (rev 1879) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveMergeTest.java 2008-08-13 13:22:03 UTC (rev 1880) @@ -47,22 +47,13 @@ */ public class ExclusiveMergeTest extends DefaultEngineTestCase { - private SignalManager signalManager; - - @Override - protected void setUp() throws Exception - { - super.setUp(); - signalManager = SignalManager.locateSignalManager(); - signalManager.addSignalListener(getName(), getSignalListener()); - } - public void testGateA() throws Exception { Process proc = getProcess(); proc.startProcess(); // Add a signal listener that sends the other start trigger signal + SignalManager signalManager = SignalManager.locateSignalManager(); Signal startTrigger = new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "B"); signalManager.addSignalListener(getName(), new MergeListener(getName(), startTrigger)); @@ -82,6 +73,7 @@ proc.startProcess(); // Add a signal listener that sends the other start trigger signal + SignalManager signalManager = SignalManager.locateSignalManager(); Signal startTrigger = new Signal(getName(), SignalType.SYSTEM_START_TRIGGER, "A"); signalManager.addSignalListener(getName(), new MergeListener(getName(), startTrigger)); 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-13 13:04:26 UTC (rev 1879) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveSplitTest.java 2008-08-13 13:22:03 UTC (rev 1880) @@ -25,7 +25,6 @@ import java.util.List; -import org.jboss.bpm.client.SignalManager; import org.jboss.bpm.model.GatewayBuilder; import org.jboss.bpm.model.Process; import org.jboss.bpm.model.ProcessBuilder; @@ -45,14 +44,6 @@ */ public class ExclusiveSplitTest extends DefaultEngineTestCase { - @Override - protected void setUp() throws Exception - { - super.setUp(); - SignalManager signalManager = SignalManager.locateSignalManager(); - signalManager.addSignalListener(getName(), getSignalListener()); - } - public void testGateA() throws Exception { Process proc = getProcess(); 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-13 13:04:26 UTC (rev 1879) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveMergeTest.java 2008-08-13 13:22:03 UTC (rev 1880) @@ -23,7 +23,6 @@ // $Id$ -import org.jboss.bpm.client.SignalManager; import org.jboss.bpm.test.DefaultEngineTestCase; /** @@ -36,14 +35,6 @@ */ public class InclusiveMergeTest extends DefaultEngineTestCase { - @Override - protected void setUp() throws Exception - { - super.setUp(); - SignalManager signalManager = SignalManager.locateSignalManager(); - signalManager.addSignalListener(getName(), getSignalListener()); - } - public void testGateA() throws Exception { System.out.println("FIXME: InclusiveMergeTest"); 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-13 13:04:26 UTC (rev 1879) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveSplitTest.java 2008-08-13 13:22:03 UTC (rev 1880) @@ -23,7 +23,6 @@ // $Id$ -import org.jboss.bpm.client.SignalManager; import org.jboss.bpm.test.DefaultEngineTestCase; /** @@ -35,14 +34,6 @@ */ public class InclusiveSplitTest extends DefaultEngineTestCase { - @Override - protected void setUp() throws Exception - { - super.setUp(); - SignalManager signalManager = SignalManager.locateSignalManager(); - signalManager.addSignalListener(getName(), getSignalListener()); - } - public void testGateA() throws Exception { System.out.println("FIXME: InclusiveSplitTest"); 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-13 13:04:26 UTC (rev 1879) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelMergeTest.java 2008-08-13 13:22:03 UTC (rev 1880) @@ -23,7 +23,6 @@ // $Id$ -import org.jboss.bpm.client.SignalManager; import org.jboss.bpm.test.DefaultEngineTestCase; /** @@ -36,14 +35,6 @@ */ public class ParallelMergeTest extends DefaultEngineTestCase { - @Override - protected void setUp() throws Exception - { - super.setUp(); - SignalManager signalManager = SignalManager.locateSignalManager(); - signalManager.addSignalListener(getName(), getSignalListener()); - } - public void testGateA() throws Exception { System.out.println("FIXME: ParallelMergeTest"); 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-13 13:04:26 UTC (rev 1879) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelSplitTest.java 2008-08-13 13:22:03 UTC (rev 1880) @@ -25,7 +25,6 @@ import java.util.List; -import org.jboss.bpm.client.SignalManager; import org.jboss.bpm.model.Process; import org.jboss.bpm.model.ProcessBuilder; import org.jboss.bpm.model.ProcessBuilderFactory; @@ -43,14 +42,6 @@ */ public class ParallelSplitTest extends DefaultEngineTestCase { - @Override - protected void setUp() throws Exception - { - super.setUp(); - SignalManager signalManager = SignalManager.locateSignalManager(); - signalManager.addSignalListener(getName(), getSignalListener()); - } - public void testParallelSplit() throws Exception { Process proc = getProcess(); 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-13 13:04:26 UTC (rev 1879) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/sequence/BasicSequenceTest.java 2008-08-13 13:22:03 UTC (rev 1880) @@ -28,7 +28,6 @@ import java.util.concurrent.ExecutionException; import org.jboss.bpm.client.ProcessManager; -import org.jboss.bpm.client.SignalManager; import org.jboss.bpm.model.Process; import org.jboss.bpm.model.ProcessBuilder; import org.jboss.bpm.model.ProcessBuilderFactory; @@ -43,14 +42,6 @@ */ public class BasicSequenceTest extends DefaultEngineTestCase { - @Override - protected void setUp() throws Exception - { - super.setUp(); - SignalManager signalManager = SignalManager.locateSignalManager(); - signalManager.addSignalListener(getName(), getSignalListener()); - } - /** * Test a basic sequence */ 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-13 13:04:26 UTC (rev 1879) +++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/samples/task/BasicTaskTest.java 2008-08-13 13:22:03 UTC (rev 1880) @@ -28,7 +28,6 @@ import java.util.concurrent.ExecutionException; import org.jboss.bpm.client.ProcessManager; -import org.jboss.bpm.client.SignalManager; import org.jboss.bpm.model.Process; import org.jboss.bpm.model.ProcessBuilder; import org.jboss.bpm.model.ProcessBuilderFactory; @@ -43,14 +42,6 @@ */ public class BasicTaskTest extends DefaultEngineTestCase { - @Override - protected void setUp() throws Exception - { - super.setUp(); - SignalManager signalManager = SignalManager.locateSignalManager(); - signalManager.addSignalListener(getName(), getSignalListener()); - } - /** * Test that the execution context variables set by the Task are visible to the client. */