Author: lwaterman
Date: Mon Sep 25 22:42:11 2006
New Revision: 449914
URL: http://svn.apache.org/viewvc?view=rev&rev=449914
Log:
Update AssignActivityTest to get it working.
Added:
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity1/
- copied from r449900,
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity/
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity2/
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity2/TestAssign.bpel
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity2/TestAssign.wsdl
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity2/deploy.xml
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity2/test.properties
Removed:
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity/
Modified:
incubator/ode/trunk/bpel-test/ (props changed)
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/TestAssignActivity1/TestAssign.bpel
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity1/test.properties
Propchange: incubator/ode/trunk/bpel-test/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Sep 25 22:42:11 2006
@@ -0,0 +1,2 @@
+
+target
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=449914&r1=449913&r2=449914
==============================================================================
---
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 Sep 25 22:42:11 2006
@@ -101,8 +101,11 @@
public void testFaultHandlers() throws Exception {
go("target/test-classes/bpel/2.0/TestFaultHandlers");
}
- public void testAssignActivity() throws Exception {
- go("target/test-classes/bpel/2.0/TestAssignActivity");
+ public void testAssignActivity1() throws Exception {
+ go("target/test-classes/bpel/2.0/TestAssignActivity1");
+ }
+ public void testAssignActivity2() throws Exception {
+ go("target/test-classes/bpel/2.0/TestAssignActivity2");
}
/** These tests compile however they fail at runtime */
Modified:
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity1/TestAssign.bpel
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity1/TestAssign.bpel?view=diff&rev=449914&r1=449900&r2=449914
==============================================================================
---
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity1/TestAssign.bpel
(original)
+++
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity1/TestAssign.bpel
Mon Sep 25 22:42:11 2006
@@ -64,13 +64,20 @@
<to variable="strVar"/>
</copy>
<copy>
- <from>concat($strVar,' World', $intVar)"</from>
+ <from>concat($strVar,' World', $intVar)</from>
<to variable="myVar" part="TestPart"/>
</copy>
<copy>
<from variable="myVar" part="TestPart"/>
+ <to variable="otherMsgVar" part="TestPart"/>
+ </copy>
+
+<!--
+ <copy>
+ <from variable="myVar" part="TestPart"/>
<to>$otherMsgVar.TestPart</to>
</copy>
+-->
</assign>
<reply name="end" partnerLink="TestAssignPartnerLink"
portType="test:TestAssignPortType"
operation="testAssign" variable="otherMsgVar"/>
Modified:
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity1/test.properties
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity1/test.properties?view=diff&rev=449914&r1=449900&r2=449914
==============================================================================
---
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity1/test.properties
(original)
+++
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity1/test.properties
Mon Sep 25 22:42:11 2006
@@ -1,5 +1,5 @@
namespace=http://ode/bpel/unit-test.wsdl
service=TestAssignService
operation=testAssign
-request=<message><TestPart>Hello</TestPart></message>
-response=.*Hello World6.*
\ No newline at end of file
+request1=<message><TestPart>Hello</TestPart></message>
+response1=.*Hello World6.*
\ No newline at end of file
Added:
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity2/TestAssign.bpel
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity2/TestAssign.bpel?view=auto&rev=449914
==============================================================================
---
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity2/TestAssign.bpel
(added)
+++
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity2/TestAssign.bpel
Mon Sep 25 22:42:11 2006
@@ -0,0 +1,86 @@
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+
+<process name="TestAssign"
+ targetNamespace="http://ode/bpel/unit-test";
+ xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/";
+ xmlns="http://schemas.xmlsoap.org/ws/2004/03/business-process/";
+ xmlns:tns="http://ode/bpel/unit-test";
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema";
+ xmlns:test="http://ode/bpel/unit-test.wsdl";
+ queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
+ expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
+
+ <import location="TestAssign.wsdl"
+ namespace="http://ode/bpel/unit-test.wsdl";
+ importType="http://schemas.xmlsoap.org/wsdl/"; />
+
+ <partnerLinks>
+ <partnerLink name="TestAssignPartnerLink"
partnerLinkType="test:TestAssignPartnerLinkType" myRole="me" />
+ </partnerLinks>
+
+ <variables>
+ <variable name="myVar" messageType="test:TestAssignMessage"/>
+ <variable name="otherMsgVar" messageType="test:TestAssignMessage"/>
+ <variable name="strVar" type="xsd:string"/>
+ <variable name="intVar" type="xsd:int"/>
+ </variables>
+
+ <sequence>
+ <receive name="start" partnerLink="TestAssignPartnerLink"
portType="test:TestAssignPortType"
+ operation="testAssign" variable="myVar" createInstance="yes"/>
+
+ <assign name="assign1">
+ <copy>
+ <from>2 + 1</from>
+ <to variable="intVar"/>
+ </copy>
+ <copy>
+ <from>$intVar + 1</from>
+ <to variable="intVar"/>
+ </copy>
+ <copy>
+ <from>$intVar + number('2')</from>
+ <to variable="intVar"/>
+ </copy>
+ <copy>
+ <from variable="myVar" part="TestPart"/>
+ <to variable="strVar"/>
+ </copy>
+ <copy>
+ <from>concat($strVar,' World', $intVar)</from>
+ <to variable="myVar" part="TestPart"/>
+ </copy>
+<!--
+ <copy>
+ <from variable="myVar" part="TestPart"/>
+ <to variable="otherMsgVar" part="TestPart"/>
+ </copy>
+-->
+
+ <copy>
+ <from variable="myVar" part="TestPart"/>
+ <to>$otherMsgVar.TestPart</to>
+ </copy>
+
+ </assign>
+ <reply name="end" partnerLink="TestAssignPartnerLink"
portType="test:TestAssignPortType"
+ operation="testAssign" variable="otherMsgVar"/>
+ </sequence>
+</process>
Added:
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity2/TestAssign.wsdl
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity2/TestAssign.wsdl?view=auto&rev=449914
==============================================================================
---
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity2/TestAssign.wsdl
(added)
+++
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity2/TestAssign.wsdl
Mon Sep 25 22:42:11 2006
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8" ?>
+
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+
+<wsdl:definitions
+ targetNamespace="http://ode/bpel/unit-test.wsdl";
+ xmlns="http://schemas.xmlsoap.org/wsdl/";
+ xmlns:tns="http://ode/bpel/unit-test.wsdl";
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/";
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema";
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/";
+ xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/";
+ xmlns:plnk="http://schemas.xmlsoap.org/ws/2004/03/partner-link/";>
+
+ <wsdl:message name="TestAssignMessage">
+ <wsdl:part name="TestPart" type="xsd:string"/>
+ </wsdl:message>
+
+ <wsdl:portType name="TestAssignPortType">
+ <wsdl:operation name="testAssign">
+ <wsdl:input message="tns:TestAssignMessage" name="TestIn"/>
+ <wsdl:output message="tns:TestAssignMessage" name="TestOut"/>
+ </wsdl:operation>
+ </wsdl:portType>
+
+ <wsdl:binding name="TestAssignSoapBinding" type="tns:TestAssignPortType">
+ <soap:binding style="rpc"
transport="http://schemas.xmlsoap.org/soap/http"/>
+ <wsdl:operation name="testAssign">
+ <soap:operation soapAction="" style="rpc"/>
+ <wsdl:input>
+ <soap:body namespace="http://ode/bpel/unit-test.wsdl";
use="literal"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body namespace="http://ode/bpel/unit-test.wsdl";
use="literal"/>
+ </wsdl:output>
+ </wsdl:operation>
+ </wsdl:binding>
+ <wsdl:service name="TestAssignService">
+ <wsdl:port name="TestAssignPort"
binding="tns:TestAssignSoapBinding">
+ <soap:address
location="http://localhost:8080/ode/processes/TestAssign"/>
+ </wsdl:port>
+ </wsdl:service>
+
+ <plnk:partnerLinkType name="TestAssignPartnerLinkType">
+ <plnk:role name="me" portType="tns:TestAssignPortType"/>
+ <plnk:role name="you" portType="tns:TestAssignPortType"/>
+ </plnk:partnerLinkType>
+</wsdl:definitions>
+
Added:
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity2/deploy.xml
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity2/deploy.xml?view=auto&rev=449914
==============================================================================
---
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity2/deploy.xml
(added)
+++
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity2/deploy.xml
Mon Sep 25 22:42:11 2006
@@ -0,0 +1,32 @@
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+
+<deploy xmlns="http://ode.fivesight.com/schemas/2006/06/27/dd";
+ xmlns:pns="http://ode/bpel/unit-test";
+ xmlns:wns="http://ode/bpel/unit-test.wsdl";>
+
+
+ <process name="pns:TestAssign">
+ <active>true</active>
+ <provide partnerLink="TestAssignPartnerLink">
+ <service name="wns:TestAssignService"
port="TestAssignPort"/>
+ <service name="wns:TestAssignService"
port="TestAssignPort"/>
+ </provide>
+ </process>
+</deploy>
Added:
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity2/test.properties
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity2/test.properties?view=auto&rev=449914
==============================================================================
---
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity2/test.properties
(added)
+++
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity2/test.properties
Mon Sep 25 22:42:11 2006
@@ -0,0 +1,5 @@
+namespace=http://ode/bpel/unit-test.wsdl
+service=TestAssignService
+operation=testAssign
+request1=<message><TestPart>Hello</TestPart></message>
+response1=.*Hello World6.*
\ No newline at end of file
