9:14 a.m.
Author: thomas.diesler(a)jboss.com
Date: 2008-10-29 10:14:52 -0400 (Wed, 29 Oct 2008)
New Revision: 2658
Modified:
projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ReceiveTaskImpl.java
projects/spec/trunk/modules/ri/src/main/resources/jbpm-cfg-beans.xml
projects/spec/trunk/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket/AirticketTest.java
projects/spec/trunk/pom.xml
Log:
Airticket sample test ok
Modified:
projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ReceiveTaskImpl.java
===================================================================
---
projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ReceiveTaskImpl.java 2008-10-29
14:12:23 UTC (rev 2657)
+++
projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ReceiveTaskImpl.java 2008-10-29
14:14:52 UTC (rev 2658)
@@ -106,7 +106,7 @@
if (receivedMessages.size() > 0)
{
// Copy the expected properties from the received message
- Message msg = receivedMessages.get(0);
+ Message msg = receivedMessages.remove(0);
ExecutionContext exContext = token.getExecutionContext();
for (String key : messageRef.getPropertyNames())
{
Modified: projects/spec/trunk/modules/ri/src/main/resources/jbpm-cfg-beans.xml
===================================================================
--- projects/spec/trunk/modules/ri/src/main/resources/jbpm-cfg-beans.xml 2008-10-29
14:12:23 UTC (rev 2657)
+++ projects/spec/trunk/modules/ri/src/main/resources/jbpm-cfg-beans.xml 2008-10-29
14:14:52 UTC (rev 2658)
@@ -61,7 +61,7 @@
<bean name="jBPMProcessService"
class="org.jbpm.ri.service.ProcessServiceImpl" >
<property name="interceptors">
<list elementClass="java.lang.String">
- <value>org.jbpm.ri.runtime.TransactionInterceptor</value>
+ <!-- value>org.jbpm.ri.runtime.TransactionInterceptor</value -->
<value>org.jbpm.ri.runtime.SignalHandlerInterceptor</value>
<value>org.jbpm.ri.runtime.FlowHandlerInterceptor</value>
<value>org.jbpm.ri.runtime.AssignmentInterceptor</value>
Modified:
projects/spec/trunk/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket/AirticketTest.java
===================================================================
---
projects/spec/trunk/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket/AirticketTest.java 2008-10-29
14:12:23 UTC (rev 2657)
+++
projects/spec/trunk/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket/AirticketTest.java 2008-10-29
14:14:52 UTC (rev 2658)
@@ -52,11 +52,12 @@
private MessageService messageManager = MessageService.locateMessageService();
private AirticketMessageListener msgListener;
+ private Process proc;
public void testValidData() throws Exception
{
- ProcessDefinition procDef = getProcessDefinition();
- Process proc = procDef.newInstance();
+ ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition());
+ proc = procDef.newInstance();
proc.startProcess();
messageManager.sendMessage(proc.getKey(),
AirticketProcessBuilder.TASK_RECEIVE_REQUEST, getValidRequestMessage());
@@ -70,8 +71,8 @@
public void testInvalidData() throws Exception
{
- ProcessDefinition procDef = getProcessDefinition();
- Process proc = procDef.newInstance();
+ ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition());
+ proc = procDef.newInstance();
proc.startProcess();
messageManager.sendMessage(proc.getKey(),
AirticketProcessBuilder.TASK_RECEIVE_REQUEST, getInvalidRequestMessage());
@@ -159,7 +160,7 @@
@Override
public ObjectName getKey()
{
- return
ObjectNameFactory.create("org.jbpm.listener:sample=AirticketService");
+ return listenerID;
}
public Message getConfirmMessage()
@@ -170,7 +171,7 @@
public void catchMessage(Message msg)
{
log.debug("catchMessage: " + msg);
- ObjectName procID = msg.getFromRef().getName();
+ ObjectName procID = proc.getKey();
MessageService mm = MessageService.locateMessageService();
if (msg.getName().equals(AirticketProcessBuilder.MESSAGE_INVALID_DATA))
mm.sendMessage(procID, AirticketProcessBuilder.TASK_RECEIVE_REQUEST,
getValidRequestMessage());
@@ -179,10 +180,5 @@
else if (msg.getName().equals(AirticketProcessBuilder.MESSAGE_CONFIRM))
confirmMessage = msg;
}
-
- public ObjectName getID()
- {
- return listenerID;
- }
}
}
\ No newline at end of file
Modified: projects/spec/trunk/pom.xml
===================================================================
--- projects/spec/trunk/pom.xml 2008-10-29 14:12:23 UTC (rev 2657)
+++ projects/spec/trunk/pom.xml 2008-10-29 14:14:52 UTC (rev 2658)
@@ -36,8 +36,8 @@
<module>modules/api</module>
<module>modules/dialects</module>
<module>modules/ri</module>
+ <module>modules/samples/airticket</module>
<module>modules/cts</module>
- <module>modules/samples/airticket</module>
</modules>
<!-- Properties -->