[jbpm-commits] JBoss JBPM SVN: r1885 - in jbossbpm/spec/trunk/modules: samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket and 1 other directory.

Author: thomas.diesler(a)jboss.com Date: 2008-08-13 12:04:11 -0400 (Wed, 13 Aug 2008) New Revision: 1885 Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/test/AbstractAPITestCase.java jbossbpm/spec/trunk/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket/AbstractAirticketTest.java Log: Pull up MessageListener setup 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 15:50:48 UTC (rev 1884) +++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/test/AbstractAPITestCase.java 2008-08-13 16:04:11 UTC (rev 1885) @@ -36,6 +36,7 @@ import org.apache.commons.logging.LogFactory; import org.jboss.bpm.BPMException; import org.jboss.bpm.client.MessageListener; +import org.jboss.bpm.client.MessageManager; import org.jboss.bpm.client.ObjectNameFactory; import org.jboss.bpm.client.SignalListener; import org.jboss.bpm.client.SignalManager; @@ -72,37 +73,28 @@ 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); - } - }; + MessageManager messageManager = MessageManager.locateMessageManager(); + messageManager.addMessageListener(getMessageListener()); } @Override protected void tearDown() throws Exception { log.debug("tearDown: " + getClass().getName() + "." + getName()); + + // Tear down the SignalListener + SignalManager signalManager = SignalManager.locateSignalManager(); + signalManager.removeSignalListeners(getName()); + + // Tear down the MessageListener + MessageManager messageManager = MessageManager.locateMessageManager(); + messageManager.removeMessageListener(getMessageListenerID()); + super.tearDown(); } @@ -142,6 +134,16 @@ public SignalListener getSignalListener() { + if (signalListener == null) + { + signalListener = new SignalListener() + { + public void catchSignal(Signal signal) + { + signals.add(signal); + } + }; + } return signalListener; } @@ -163,6 +165,22 @@ public MessageListener getMessageListener() { + if (messageListener == null) + { + messageListener = new MessageListener() + { + public ObjectName getID() + { + return getMessageListenerID(); + } + + public void catchMessage(Message message) + { + log.debug("catchMessage: " + message); + messages.add(message); + } + }; + } return messageListener; } Modified: jbossbpm/spec/trunk/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket/AbstractAirticketTest.java =================================================================== --- jbossbpm/spec/trunk/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket/AbstractAirticketTest.java 2008-08-13 15:50:48 UTC (rev 1884) +++ jbossbpm/spec/trunk/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket/AbstractAirticketTest.java 2008-08-13 16:04:11 UTC (rev 1885) @@ -52,11 +52,10 @@ } @Override - protected void setUp() throws Exception + public MessageListener getMessageListener() { - super.setUp(); msgListener = new AirticketMessageListener(getMessageListenerID()); - messageManager.addMessageListener(msgListener); + return msgListener; } @Override