You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by ms...@apache.org on 2007/08/07 01:11:34 UTC
svn commit: r563328 - in /ode/branches/bart/bpel-test/src:
main/java/org/apache/ode/test/ test/java/org/apache/ode/test/
test/resources/bpel/2.0/TestAlarm/
Author: mszefler
Date: Mon Aug 6 16:11:33 2007
New Revision: 563328
URL: http://svn.apache.org/viewvc?view=rev&rev=563328
Log:
Catch up to trunk@563315
Added:
ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestAlarm/
- copied from r563315, ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestAlarm/
ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestAlarm/HandleTimer-Timer.bpel
- copied unchanged from r563315, ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestAlarm/HandleTimer-Timer.bpel
ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestAlarm/HandleTimer-Timer.deploy
- copied unchanged from r563315, ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestAlarm/HandleTimer-Timer.deploy
ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestAlarm/HandleTimer-Timer.wsdl
- copied unchanged from r563315, ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestAlarm/HandleTimer-Timer.wsdl
ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestAlarm/HandleTimer.wsdl
- copied unchanged from r563315, ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestAlarm/HandleTimer.wsdl
ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestAlarm/deploy.xml
- copied unchanged from r563315, ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestAlarm/deploy.xml
ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestAlarm/message.xsd
- copied unchanged from r563315, ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestAlarm/message.xsd
Modified:
ode/branches/bart/bpel-test/src/main/java/org/apache/ode/test/BPELTestAbstract.java
ode/branches/bart/bpel-test/src/main/java/org/apache/ode/test/MessageExchangeContextImpl.java
ode/branches/bart/bpel-test/src/test/java/org/apache/ode/test/BasicActivities20Test.java
ode/branches/bart/bpel-test/src/test/java/org/apache/ode/test/CompensationHandling20Test.java
Modified: ode/branches/bart/bpel-test/src/main/java/org/apache/ode/test/BPELTestAbstract.java
URL: http://svn.apache.org/viewvc/ode/branches/bart/bpel-test/src/main/java/org/apache/ode/test/BPELTestAbstract.java?view=diff&rev=563328&r1=563327&r2=563328
==============================================================================
--- ode/branches/bart/bpel-test/src/main/java/org/apache/ode/test/BPELTestAbstract.java (original)
+++ ode/branches/bart/bpel-test/src/main/java/org/apache/ode/test/BPELTestAbstract.java Mon Aug 6 16:11:33 2007
@@ -18,6 +18,7 @@
*/
package org.apache.ode.test;
+
import java.io.File;
import java.io.FileInputStream;
import java.io.InputStream;
@@ -42,16 +43,14 @@
import org.apache.ode.bpel.iapi.InvocationStyle;
import org.apache.ode.bpel.iapi.Message;
import org.apache.ode.bpel.iapi.MessageExchange;
-import org.apache.ode.bpel.iapi.MessageExchange.AckType;
-import org.apache.ode.bpel.iapi.MessageExchange.Status;
import org.apache.ode.bpel.iapi.MyRoleMessageExchange;
import org.apache.ode.bpel.iapi.ProcessStore;
import org.apache.ode.bpel.iapi.ProcessStoreEvent;
import org.apache.ode.bpel.iapi.ProcessStoreListener;
+import org.apache.ode.bpel.iapi.MessageExchange.AckType;
import org.apache.ode.bpel.iapi.MessageExchange.Status;
import org.apache.ode.bpel.iapi.MyRoleMessageExchange.CorrelationStatus;
import org.apache.ode.bpel.memdao.BpelDAOConnectionFactoryImpl;
-import org.apache.ode.dao.jpa.BPELDAOConnectionFactoryImpl;
import org.apache.ode.il.MockScheduler;
import org.apache.ode.store.ProcessConfImpl;
import org.apache.ode.store.ProcessStoreImpl;
@@ -106,7 +105,7 @@
if (Boolean.getBoolean("org.apache.ode.test.persistent")) {
emf = Persistence.createEntityManagerFactory("ode-unit-test-embedded");
em = emf.createEntityManager();
- _cf = new BPELDAOConnectionFactoryImpl();
+ _cf = new BpelDAOConnectionFactoryImpl(_txm);
_server.setDaoConnectionFactory(_cf);
_txm = new MockTransactionManager() {
Modified: ode/branches/bart/bpel-test/src/main/java/org/apache/ode/test/MessageExchangeContextImpl.java
URL: http://svn.apache.org/viewvc/ode/branches/bart/bpel-test/src/main/java/org/apache/ode/test/MessageExchangeContextImpl.java?view=diff&rev=563328&r1=563327&r2=563328
==============================================================================
--- ode/branches/bart/bpel-test/src/main/java/org/apache/ode/test/MessageExchangeContextImpl.java (original)
+++ ode/branches/bart/bpel-test/src/main/java/org/apache/ode/test/MessageExchangeContextImpl.java Mon Aug 6 16:11:33 2007
@@ -91,7 +91,7 @@
public void onMyRoleMessageExchangeStateChanged(MyRoleMessageExchange myRoleMex)
throws BpelEngineException {
-
+
}
private void invokeProbeService(PartnerRoleMessageExchange prmx) {
Modified: ode/branches/bart/bpel-test/src/test/java/org/apache/ode/test/BasicActivities20Test.java
URL: http://svn.apache.org/viewvc/ode/branches/bart/bpel-test/src/test/java/org/apache/ode/test/BasicActivities20Test.java?view=diff&rev=563328&r1=563327&r2=563328
==============================================================================
--- ode/branches/bart/bpel-test/src/test/java/org/apache/ode/test/BasicActivities20Test.java (original)
+++ ode/branches/bart/bpel-test/src/test/java/org/apache/ode/test/BasicActivities20Test.java Mon Aug 6 16:11:33 2007
@@ -18,16 +18,16 @@
*/
package org.apache.ode.test;
-import org.apache.ode.bpel.iapi.ContextException;
-import org.apache.ode.bpel.iapi.MessageExchange;
-import org.junit.Ignore;
-import org.junit.Test;
-
-import javax.xml.namespace.QName;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
+import javax.xml.namespace.QName;
+
+import org.apache.ode.bpel.iapi.ContextException;
+import org.apache.ode.bpel.iapi.MessageExchange.AckType;
+import org.junit.Test;
+
public class BasicActivities20Test extends BPELTestAbstract {
@Test public void testHelloWorld2() throws Throwable {
@@ -64,9 +64,9 @@
null);
inv.minimumWaitMs=5*1000L;
inv.maximumWaitMs=7*1000L;
- inv.expectedStatus = MessageExchange.Status.ASYNC;
- inv.expectedFinalStatus = MessageExchange.Status.ACK;
-
+ inv.expectedFinalStatus = AckType.RESPONSE;
+
+
go();
}
@@ -80,11 +80,25 @@
Invocation inv = addInvoke("WaitUntil", new QName("http://ode/bpel/unit-test.wsdl", "testService"), "testOperation",
"<message><TestPart/><Time>"+isountil+"</Time></message>",
null);
- inv.minimumWaitMs=5*1000L;
+ inv.minimumWaitMs=4*1000L;
inv.maximumWaitMs=7*1000L;
- inv.expectedStatus = MessageExchange.Status.ASYNC;
- inv.expectedFinalStatus = MessageExchange.Status.ACK;
+ inv.expectedFinalStatus = AckType.RESPONSE;
+ go();
+ }
+
+ /**
+ * Tests the wait "for" syntax.
+ * @throws Throwable
+ */
+ @Test public void testOnAlarm() throws Throwable {
+ deploy("/bpel/2.0/TestAlarm");
+ Invocation inv = addInvoke("Wait1#1", new QName("http://ode.apache.org/example", "CanonicServiceForClient"), "receive",
+ "<message><body><start xmlns=\"http://ode.apache.org/example\">start</start></body></message>",
+ null);
+ inv.maximumWaitMs=20*1000L;
+ inv.expectedFinalStatus = AckType.RESPONSE;
+
go();
}
Modified: ode/branches/bart/bpel-test/src/test/java/org/apache/ode/test/CompensationHandling20Test.java
URL: http://svn.apache.org/viewvc/ode/branches/bart/bpel-test/src/test/java/org/apache/ode/test/CompensationHandling20Test.java?view=diff&rev=563328&r1=563327&r2=563328
==============================================================================
--- ode/branches/bart/bpel-test/src/test/java/org/apache/ode/test/CompensationHandling20Test.java (original)
+++ ode/branches/bart/bpel-test/src/test/java/org/apache/ode/test/CompensationHandling20Test.java Mon Aug 6 16:11:33 2007
@@ -23,6 +23,7 @@
import javax.xml.namespace.QName;
import org.apache.ode.bpel.iapi.MessageExchange;
+import org.apache.ode.bpel.iapi.MessageExchange.AckType;
import org.junit.Ignore;
import org.junit.Test;
@@ -56,7 +57,7 @@
"testImplicitFaultHandlerService"), "request",
"<message><requestID>Start TestImplicitFaultHandler</requestID><requestText>Event TestImplicitFaultHandler</requestText><faultIndicator1>yes</faultIndicator1><faultIndicator2>no</faultIndicator2></message>",
null);
- inv.expectedFinalStatus = MessageExchange.Status.FAULT;
+ inv.expectedFinalStatus = AckType.FAULT;
inv.expectedResponsePattern = Pattern.compile(".*Event TestFaultWithVariable1 -> caught FaultMessage1 -> Event TestFaultWithVariable1 -> process complete.*");
go();