You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by lw...@apache.org on 2006/10/03 06:11:18 UTC
svn commit: r452308 - in /incubator/ode/trunk/bpel-test/src/test:
java/org/apache/ode/test/ resources/bpel/2.0/TestCorrelationAsync/
resources/bpel/2.0/TestStaticPick/
Author: lwaterman
Date: Mon Oct 2 21:11:16 2006
New Revision: 452308
URL: http://svn.apache.org/viewvc?view=rev&rev=452308
Log:
Add New Pick Test
Added:
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/TestStaticPick.bpel
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/TestStaticPick.wsdl
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/deploy.xml
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/test1.properties
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/test2.properties
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/test3.properties
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/test4.properties
Modified:
incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/BPELTest.java
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelationAsync/test1.properties
Modified: incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/BPELTest.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/BPELTest.java?view=diff&rev=452308&r1=452307&r2=452308
==============================================================================
--- incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/BPELTest.java (original)
+++ incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/BPELTest.java Mon Oct 2 21:11:16 2006
@@ -22,6 +22,7 @@
import org.apache.ode.bpel.engine.BpelServerImpl;
import org.apache.ode.bpel.iapi.Message;
import org.apache.ode.bpel.iapi.MyRoleMessageExchange;
+import org.apache.ode.bpel.iapi.MessageExchange.MessageExchangePattern;
import org.apache.ode.bpel.iapi.MessageExchange.Status;
import org.apache.ode.bpel.memdao.BpelDAOConnectionFactoryImpl;
import org.apache.ode.test.scheduler.TestScheduler;
@@ -133,9 +134,19 @@
testResponsePattern(mex.getResponse(),responsePattern);
// TODO: test for response fault
break;
- case ASYNC:
- if ( !responsePattern.equals("ASYNC"))
- assertTrue(false);
+ case ASYNC:
+
+ switch (mex.getMessageExchangePattern()) {
+ case REQUEST_ONLY:
+ if ( !responsePattern.equals("ASYNC"))
+ assertTrue(false);
+ break;
+ case REQUEST_RESPONSE:
+ testResponsePattern(mexContext.getCurrentResponse(),responsePattern);
+ default:
+ break;
+ }
+
break;
case COMPLETED_OK:
if ( !responsePattern.equals("COMPLETED_OK"))
@@ -158,9 +169,14 @@
}
private void testResponsePattern(Message response, String responsePattern){
- String resp = DOMUtils.domToString(response.getMessage());
- System.out.println(resp);
- assertTrue(Pattern.compile(responsePattern,Pattern.DOTALL).matcher(resp).matches());
+ String resp = ( response == null ) ? "null" : DOMUtils.domToString(response.getMessage());
+ boolean testValue = Pattern.compile(responsePattern,Pattern.DOTALL).matcher(resp).matches();
+
+ if ( !testValue ) {
+ System.out.println("=> Expected Response Pattern >> " + responsePattern);
+ System.out.println("=> Acutal Response >> " + resp);
+ }
+ assertTrue(testValue);
}
public void testHelloWorld2() throws Exception {
@@ -194,6 +210,9 @@
}
public void testXslTransform() throws Exception {
go("target/test-classes/bpel/2.0/TestXslTransform");
+ }
+ public void testStaticPick() throws Exception {
+ go("target/test-classes/bpel/2.0/TestStaticPick");
}
/** These tests compile however they fail at runtime */
Modified: incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelationAsync/test1.properties
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelationAsync/test1.properties?view=diff&rev=452308&r1=452307&r2=452308
==============================================================================
--- incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelationAsync/test1.properties (original)
+++ incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelationAsync/test1.properties Mon Oct 2 21:11:16 2006
@@ -2,4 +2,4 @@
service=testCorrelationService
operation=request
request1=<message><requestMessageData><testMessage><requestID>Start Test5.1</requestID><requestText>Event Start Test5.1</requestText><requestEnd>no</requestEnd></testMessage></requestMessageData></message>
-response1=ASYNC
\ No newline at end of file
+response1=null
\ No newline at end of file
Added: incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/TestStaticPick.bpel
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/TestStaticPick.bpel?view=auto&rev=452308
==============================================================================
--- incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/TestStaticPick.bpel (added)
+++ incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/TestStaticPick.bpel Mon Oct 2 21:11:16 2006
@@ -0,0 +1,184 @@
+<process xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://schemas.xmlsoap.org/ws/2004/03/business-process/ ../../../../../../../bpel-schemas/src/main/resources/wsbpel_main-draft-Apr-29-2006.xsd"
+ xmlns:tns="http://ode/bpel/unit-test/TestStaticPick"
+ xmlns:wns="http://ode/bpel/unit-test/TestStaticPick.wsdl"
+ xmlns:prb="http://ode/bpel/unit-test/ProbeService.wsdl"
+ xmlns="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
+ name="TestStaticPick"
+ targetNamespace="http://ode/bpel/unit-test/TestStaticPick"
+ queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
+ expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
+ suppressJoinFailure="yes">
+
+ <import location="TestStaticPick.wsdl"
+ namespace="http://ode/bpel/unit-test/TestStaticPick.wsdl"
+ importType="http://schemas.xmlsoap.org/wsdl/" />
+ <import location="../ProbeService/probeService.wsdl"
+ namespace="http://ode/bpel/unit-test/ProbeService.wsdl"
+ importType="http://schemas.xmlsoap.org/wsdl/"/>
+
+
+<!-- Unit test pick with blocking static key -->
+
+ <partnerLinks>
+ <partnerLink name="request1" partnerLinkType="wns:TestStaticPick1Request" myRole="TestStaticPick1Service"/>
+ <partnerLink name="request2" partnerLinkType="wns:TestStaticPick2Request" myRole="TestStaticPick2Service"/>
+ <partnerLink name="request3" partnerLinkType="wns:TestStaticPick3Request" myRole="TestStaticPick3Service"/>
+ <partnerLink name="probe" partnerLinkType="wns:probeRequest" partnerRole="probeService" initializePartnerRole="yes"/>
+ </partnerLinks>
+
+ <variables>
+ <variable name="request"
+ messageType="wns:requestMessage"/>
+ <variable name="probeInput"
+ messageType="prb:probeMessage"/>
+ <variable name="reply"
+ messageType="wns:replyMessage"/>
+ </variables>
+
+ <correlationSets>
+ <correlationSet name="testCorr1" properties="wns:testProbeID"/>
+ </correlationSets>
+
+ <sequence>
+ <receive name="receive1" partnerLink="request1"
+ portType="wns:TestStaticPick1PT"
+ operation="request" variable="request"
+ createInstance="yes">
+ </receive>
+
+ <assign name="assign1">
+ <copy>
+ <from variable="request" property="wns:testProbeID"/>
+ <to variable="probeInput" part="probeName"/>
+ </copy>
+ <copy>
+ <from variable="request" part="requestText"/>
+ <to variable="probeInput" part="probeData"/>
+ </copy>
+ </assign>
+
+
+ <assign>
+ <copy>
+ <from>
+ <literal><![CDATA[block for next message]]></literal>
+ </from>
+ <to variable="probeInput" part="probeName"/>
+ </copy>
+ </assign>
+
+ <invoke name="probe" partnerLink="probe"
+ portType="prb:probeMessagePT"
+ operation="probe"
+ inputVariable="probeInput"
+ outputVariable="probeInput">
+ </invoke>
+
+ <pick name="testPick">
+ <onMessage partnerLink="request2"
+ portType="wns:TestStaticPick2PT" operation="request" variable="request">
+ <sequence>
+ <assign>
+ <copy>
+ <from>
+ <literal><![CDATA[pick branch one invoked]]></literal>
+ </from>
+ <to variable="probeInput" part="probeName"/>
+ </copy>
+ </assign>
+
+ <invoke name="probe" partnerLink="probe"
+ portType="prb:probeMessagePT"
+ operation="probe"
+ inputVariable="probeInput"
+ outputVariable="probeInput">
+ </invoke>
+
+ <assign>
+ <copy>
+ <from>
+ <literal><![CDATA[process complete]]></literal>
+ </from>
+ <to variable="probeInput" part="probeName"/>
+ </copy>
+ </assign>
+
+ <invoke name="probe" partnerLink="probe"
+ portType="prb:probeMessagePT"
+ operation="probe"
+ inputVariable="probeInput"
+ outputVariable="probeInput">
+ </invoke>
+
+ <assign name="assign2">
+ <copy>
+ <from variable="probeInput" part="probeName"/>
+ <to variable="reply" part="replyID"/>
+ </copy>
+ <copy>
+ <from variable="probeInput" part="probeData"/>
+ <to variable="reply" part="replyText"/>
+ </copy>
+ </assign>
+
+ <reply name="reply" partnerLink="request2" portType="wns:TestStaticPick2PT"
+ operation="request" variable="reply">
+ </reply>
+
+ </sequence>
+ </onMessage>
+ <onMessage partnerLink="request3"
+ portType="wns:TestStaticPick3PT" operation="request" variable="request">
+ <sequence>
+ <assign>
+ <copy>
+ <from>
+ <literal><![CDATA[pick branch two invoked]]></literal>
+ </from>
+ <to variable="probeInput" part="probeName"/>
+ </copy>
+ </assign>
+
+ <invoke name="probe" partnerLink="probe"
+ portType="prb:probeMessagePT"
+ operation="probe"
+ inputVariable="probeInput"
+ outputVariable="probeInput">
+ </invoke>
+
+ <assign>
+ <copy>
+ <from>
+ <literal><![CDATA[process complete]]></literal>
+ </from>
+ <to variable="probeInput" part="probeName"/>
+ </copy>
+ </assign>
+
+ <invoke name="probe" partnerLink="probe"
+ portType="prb:probeMessagePT"
+ operation="probe"
+ inputVariable="probeInput"
+ outputVariable="probeInput">
+ </invoke>
+ <assign name="assign2">
+ <copy>
+ <from variable="probeInput" part="probeName"/>
+ <to variable="reply" part="replyID"/>
+ </copy>
+ <copy>
+ <from variable="probeInput" part="probeData"/>
+ <to variable="reply" part="replyText"/>
+ </copy>
+ </assign>
+
+ <reply name="reply" partnerLink="request3" portType="wns:TestStaticPick3PT"
+ operation="request" variable="reply">
+ </reply>
+
+ </sequence>
+ </onMessage>
+ </pick>
+ </sequence>
+</process>
Added: incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/TestStaticPick.wsdl
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/TestStaticPick.wsdl?view=auto&rev=452308
==============================================================================
--- incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/TestStaticPick.wsdl (added)
+++ incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/TestStaticPick.wsdl Mon Oct 2 21:11:16 2006
@@ -0,0 +1,90 @@
+
+<wsdl:definitions
+ targetNamespace="http://ode/bpel/unit-test/TestStaticPick.wsdl"
+ xmlns:tns="http://ode/bpel/unit-test/TestStaticPick.wsdl"
+ xmlns="http://ode/bpel/unit-test/TestStaticPick.wsdl"
+ xmlns:prb="http://ode/bpel/unit-test/ProbeService.wsdl"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:plnk="http://schemas.xmlsoap.org/ws/2004/03/partner-link/"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/">
+
+
+ <wsdl:message name="requestMessage">
+ <wsdl:part name="requestID" type="xsd:string"/>
+ <wsdl:part name="requestText" type="xsd:string"/>
+ </wsdl:message>
+
+ <wsdl:message name="replyMessage">
+ <wsdl:part name="replyID" type="xsd:string"/>
+ <wsdl:part name="replyText" type="xsd:string"/>
+ </wsdl:message>
+
+
+ <wsdl:portType name="TestStaticPick1PT">
+ <wsdl:operation name="request">
+ <wsdl:input message="requestMessage"/>
+ </wsdl:operation>
+ </wsdl:portType>
+
+ <wsdl:portType name="TestStaticPick2PT">
+ <wsdl:operation name="request">
+ <wsdl:input message="requestMessage"/>
+ <wsdl:output message="replyMessage"/>
+ </wsdl:operation>
+ </wsdl:portType>
+
+ <wsdl:portType name="TestStaticPick3PT">
+ <wsdl:operation name="request">
+ <wsdl:input message="requestMessage"/>
+ <wsdl:output message="replyMessage"/>
+ </wsdl:operation>
+ </wsdl:portType>
+
+ <wsdl:binding name="TestStaticPick1Binding" type="tns:TestStaticPick1PT">
+ <wsdl:operation name="request">
+ </wsdl:operation>
+ </wsdl:binding>
+ <wsdl:service name="TestStaticPick1Service">
+ <wsdl:port name="TestStaticPick1Port" binding="tns:TestStaticPick1Binding">
+ </wsdl:port>
+ </wsdl:service>
+
+ <wsdl:binding name="TestStaticPick2Binding" type="tns:TestStaticPick2PT">
+ <wsdl:operation name="request">
+ </wsdl:operation>
+ </wsdl:binding>
+ <wsdl:service name="TestStaticPick2Service">
+ <wsdl:port name="TestStaticPick2Port" binding="tns:TestStaticPick2Binding">
+ </wsdl:port>
+ </wsdl:service>
+
+ <wsdl:binding name="TestStaticPick3Binding" type="tns:TestStaticPick3PT">
+ <wsdl:operation name="request">
+ </wsdl:operation>
+ </wsdl:binding>
+ <wsdl:service name="TestStaticPick3Service">
+ <wsdl:port name="TestStaticPick3Port" binding="tns:TestStaticPick3Binding">
+ </wsdl:port>
+ </wsdl:service>
+
+ <plnk:partnerLinkType name="TestStaticPick1Request">
+ <plnk:role name="TestStaticPick1Service" portType="TestStaticPick1PT"/>
+ </plnk:partnerLinkType>
+
+ <plnk:partnerLinkType name="TestStaticPick2Request">
+ <plnk:role name="TestStaticPick2Service" portType="TestStaticPick2PT"/>
+ </plnk:partnerLinkType>
+
+ <plnk:partnerLinkType name="TestStaticPick3Request">
+ <plnk:role name="TestStaticPick3Service" portType="TestStaticPick3PT"/>
+ </plnk:partnerLinkType>
+
+ <plnk:partnerLinkType name="probeRequest">
+ <plnk:role name="probeService" portType="prb:probeMessagePT"/>
+ </plnk:partnerLinkType>
+
+ <bpws:property name="testProbeID" type="xsd:string"/>
+ <bpws:propertyAlias propertyName="tns:testProbeID" messageType="tns:requestMessage" part="requestID"/>
+
+</wsdl:definitions>
Added: incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/deploy.xml
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/deploy.xml?view=auto&rev=452308
==============================================================================
--- incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/deploy.xml (added)
+++ incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/deploy.xml Mon Oct 2 21:11:16 2006
@@ -0,0 +1,18 @@
+<deploy xmlns="http://ode.fivesight.com/schemas/2006/06/27/dd"
+ xmlns:pns="http://ode/bpel/unit-test/TestStaticPick"
+ xmlns:wns="http://ode/bpel/unit-test/TestStaticPick.wsdl">
+
+
+ <process name="pns:TestStaticPick">
+ <active>true</active>
+ <provide partnerLink="request1">
+ <service name="wns:TestStaticPick1Service" port="wns:TestStaticPick1Port"/>
+ </provide>
+ <provide partnerLink="request2">
+ <service name="wns:TestStaticPick2Service" port="wns:TestStaticPick2Port"/>
+ </provide>
+ <provide partnerLink="request3">
+ <service name="wns:TestStaticPick3Service" port="wns:TestStaticPick3Port"/>
+ </provide>
+ </process>
+</deploy>
Added: incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/test1.properties
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/test1.properties?view=auto&rev=452308
==============================================================================
--- incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/test1.properties (added)
+++ incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/test1.properties Mon Oct 2 21:11:16 2006
@@ -0,0 +1,5 @@
+namespace=http://ode/bpel/unit-test/TestStaticPick.wsdl
+service=TestStaticPick1Service
+operation=request
+request1=<message><requestID>Start TestStaticPick</requestID><requestText>TestStaticPick Request1</requestText></message>
+response1=ASYNC
Added: incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/test2.properties
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/test2.properties?view=auto&rev=452308
==============================================================================
--- incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/test2.properties (added)
+++ incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/test2.properties Mon Oct 2 21:11:16 2006
@@ -0,0 +1,5 @@
+namespace=http://ode/bpel/unit-test/TestStaticPick.wsdl
+service=TestStaticPick2Service
+operation=request
+request1=<message><requestID>Continue TestStaticPick</requestID><requestText>TestStaticPick Request2</requestText></message>
+response1=.*test.*
Added: incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/test3.properties
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/test3.properties?view=auto&rev=452308
==============================================================================
--- incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/test3.properties (added)
+++ incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/test3.properties Mon Oct 2 21:11:16 2006
@@ -0,0 +1,5 @@
+namespace=http://ode/bpel/unit-test/TestStaticPick.wsdl
+service=TestStaticPick1Service
+operation=request
+request1=<message><requestID>Start TestStaticPick</requestID><requestText>TestStaticPick Request1</requestText></message>
+response1=ASYNC
Added: incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/test4.properties
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/test4.properties?view=auto&rev=452308
==============================================================================
--- incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/test4.properties (added)
+++ incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/test4.properties Mon Oct 2 21:11:16 2006
@@ -0,0 +1,5 @@
+namespace=http://ode/bpel/unit-test/TestStaticPick.wsdl
+service=TestStaticPick3Service
+operation=request
+request1=<message><requestID>Continue TestStaticPick</requestID><requestText>TestStaticPick Request3</requestText></message>
+response1=.*test.*