Author: lwaterman
Date: Thu Oct 19 23:25:46 2006
New Revision: 466006
URL: http://svn.apache.org/viewvc?view=rev&rev=466006
Log:
Added 2 New XPath Tests
Added:
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestXPathNamespace2/
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestXPathNamespace2/TestXPathNamespace2.bpel
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestXPathNamespace2/TestXPathNamespace2.wsdl
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestXPathNamespace2/deploy.xml
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestXPathNamespace2/test1.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/NegativeTargetNSTest1/test.properties
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestXPathNamespace1/TestXPathNamespace1.bpel
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestXPathNamespace1/TestXPathNamespace1.wsdl
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestXPathNamespace1/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=466006&r1=466005&r2=466006
==============================================================================
---
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
Thu Oct 19 23:25:46 2006
@@ -101,6 +101,7 @@
testProps.load(testPropsFile.toURL().openStream());
String responsePattern =
testProps.getProperty("response1");
testResponsePattern(bpelE.getMessage(),responsePattern);
+ return;
}
while ( testPropsFile.exists() ) {
@@ -265,6 +266,15 @@
public void testFaultWithVariable() throws Exception {
go("target/test-classes/bpel/2.0/TestFaultWithVariable");
}
+ public void testXPathNamespace1() throws Exception {
+ go("target/test-classes/bpel/2.0/TestXPathNamespace1");
+ }
+ public void testXPathNamespace2() throws Exception {
+ go("target/test-classes/bpel/2.0/TestXPathNamespace2");
+ }
+ public void testSubTreeAssign() throws Exception {
+ go("target/test-classes/bpel/2.0/TestSubTreeAssign");
+ }
public void testNegativeTargetNS1() throws Exception {
/**
@@ -272,8 +282,13 @@
* the WSDL.
*
* See JIRA ODE-67
+ *
+ * Test for a specific exception message.
+ *
*/
- negative("target/test-classes/bpel/2.0/NegativeTargetNSTest1");
+
+
+ go("target/test-classes/bpel/2.0/NegativeTargetNSTest1");
}
public void testNegativeCorrelation() throws Exception {
@@ -305,9 +320,7 @@
negative("target/test-classes/bpel/2.0/NegativeInitializationTest");
}
- public void testSubTreeAssign() throws Exception {
- go("target/test-classes/bpel/2.0/TestSubTreeAssign");
- }
+
/** These tests compile however they fail at runtime */
Modified:
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/NegativeTargetNSTest1/test.properties
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/NegativeTargetNSTest1/test.properties?view=diff&rev=466006&r1=466005&r2=466006
==============================================================================
---
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/NegativeTargetNSTest1/test.properties
(original)
+++
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/NegativeTargetNSTest1/test.properties
Thu Oct 19 23:25:46 2006
@@ -2,4 +2,4 @@
service=NegativeTargetNSTest1Service
operation=request
request1=<message><requestID>Start
NegativeTargetNSTest1</requestID><requestText>Event
NegativeTargetNSTest1</requestText></message>
-response1=.*Namespace Exception.*
+response1=.*Compilation failure.*
Modified:
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestXPathNamespace1/TestXPathNamespace1.bpel
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestXPathNamespace1/TestXPathNamespace1.bpel?view=diff&rev=466006&r1=466005&r2=466006
==============================================================================
---
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestXPathNamespace1/TestXPathNamespace1.bpel
(original)
+++
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestXPathNamespace1/TestXPathNamespace1.bpel
Thu Oct 19 23:25:46 2006
@@ -1,3 +1,21 @@
+<!--
+ ~ 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 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/TestXPathNamespace1";
@@ -38,17 +56,7 @@
<to variable="reply" part="replyID"/>
</copy>
<copy>
- <from
xmlns:foo="http://ode/bpel/unit-test/TestXPathNamespace1.wsdl.types1";>$request.requestMessageData/typeIndicators/foo:indicatorTwo</from>
- <to variable="reply" part="replyText"/>
- </copy>
- <copy>
-
<from>$request.requestMessageData/typeIndicators/types1:indicatorTwo</from>
- <to variable="reply" part="replyText"/>
- </copy>
- <copy>
- <from>
- <literal><![CDATA[pass]]></literal>
- </from>
+ <from
xmlns:foo="http://ode/bpel/unit-test/TestXPathNamespace1.wsdl.footypes";>$request.requestMessageData/typeIndicators/foo:indicatorTwo</from>
<to variable="reply" part="replyText"/>
</copy>
</assign>
Modified:
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestXPathNamespace1/TestXPathNamespace1.wsdl
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestXPathNamespace1/TestXPathNamespace1.wsdl?view=diff&rev=466006&r1=466005&r2=466006
==============================================================================
---
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestXPathNamespace1/TestXPathNamespace1.wsdl
(original)
+++
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestXPathNamespace1/TestXPathNamespace1.wsdl
Thu Oct 19 23:25:46 2006
@@ -54,7 +54,7 @@
</wsdl:types>
<wsdl:message name="requestMessage1">
- <part name="requestMessageData" type="types1:testMessage"/>
+ <wsdl:part name="requestMessageData" type="types1:testMessage"/>
</wsdl:message>
<wsdl:message name="replyMessage1">
Modified:
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestXPathNamespace1/test1.properties
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestXPathNamespace1/test1.properties?view=diff&rev=466006&r1=466005&r2=466006
==============================================================================
---
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestXPathNamespace1/test1.properties
(original)
+++
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestXPathNamespace1/test1.properties
Thu Oct 19 23:25:46 2006
@@ -1,5 +1,5 @@
namespace=http://ode/bpel/unit-test/TestXPathNamespace1.wsdl
service=TestXPathNamespace1Service
operation=request
-request1=<message><requestMessageData><testMessage
xmlns:foo="urn:foo:default"><requestID>Start
TestXPathNamespace1</requestID><requestText>Event
TestXPathNamespace1</requestText><typeIndicators
xmlns:foo="http://ode/bpel/unit-test/TestXPathNamespace1.wsdl.types1";><foo:indicatorOne>pass</foo:indicatorOne><foo:indicatorTwo>pass</foo:indicatorTwo></typeIndicators></testMessage></requestMessageData></message>
-response1=null
+request1=<message><requestMessageData><testMessage><requestID>Start
TestXPathNamespace1</requestID><requestText>Event
TestXPathNamespace1</requestText><typeIndicators
xmlns:foo="http://ode/bpel/unit-test/TestXPathNamespace1.wsdl.footypes";><foo:indicatorOne>pass</foo:indicatorOne><foo:indicatorTwo>pass</foo:indicatorTwo></typeIndicators></testMessage></requestMessageData></message>
+response1=.*<replyID>Start
TestXPathNamespace1</replyID><replyText>pass</replyText>.*
Added:
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestXPathNamespace2/TestXPathNamespace2.bpel
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestXPathNamespace2/TestXPathNamespace2.bpel?view=auto&rev=466006
==============================================================================
---
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestXPathNamespace2/TestXPathNamespace2.bpel
(added)
+++
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestXPathNamespace2/TestXPathNamespace2.bpel
Thu Oct 19 23:25:46 2006
@@ -0,0 +1,80 @@
+<!--
+ ~ 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.
+-->
+
+<bpel: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/TestXPathNamespace2";
+ xmlns:wns="http://ode/bpel/unit-test/TestXPathNamespace2.wsdl";
+ xmlns:ns0="http://www.company.org";
+ xmlns:ns1="http://www.person.org";
+ xmlns:bpel="http://schemas.xmlsoap.org/ws/2004/03/business-process/";
+ xmlns:ns2="http://www.product.org";
+ name="TestXPathNamespace2"
+ queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
+ expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
+ targetNamespace="http://ode/bpel/unit-test/TestXPathNamespace2";>
+
+
+ <bpel:import location="TestXPathNamespace2.wsdl"
+ namespace="http://ode/bpel/unit-test/TestXPathNamespace2.wsdl";
+ importType="http://schemas.xmlsoap.org/wsdl/"; />
+
+ <bpel:partnerLinks>
+ <bpel:partnerLink name="request"
partnerLinkType="wns:TestXPathNamespace2Request"
myRole="TestXPathNamespace2Service"/>
+ </bpel:partnerLinks>
+ <bpel:scope name="ID1125327950242396">
+ <bpel:variables>
+ <bpel:variable messageType="wns:operation1Request"
name="BP112532795028938"/>
+ <bpel:variable messageType="wns:operation1Response"
name="BP11253284037450"/>
+ <bpel:variable name="newVariable1" element="ns0:Company"/>
+ </bpel:variables>
+ <bpel:flow>
+ <bpel:sequence>
+ <bpel:receive name="ID1125327950289399" createInstance="yes"
operation="operation1" partnerLink="request"
portType="wns:TestXPathNamespace2PT" variable="BP112532795028938"/>
+ <bpel:assign name="BP11253340188129">
+ <bpel:copy>
+ <bpel:from>$BP112532795028938.newParameter1</bpel:from>
+ <bpel:to>$newVariable1</bpel:to>
+ </bpel:copy>
+ </bpel:assign>
+ <bpel:assign name="BP112533401973410">
+ <bpel:copy>
+ <bpel:from>
+ <bpel:literal>Foo Name</bpel:literal>
+ </bpel:from>
+ <bpel:to>$newVariable1/ns0:Person/ns1:Name</bpel:to>
+ </bpel:copy>
+ </bpel:assign>
+ <bpel:assign name="BP112533402114011">
+ <bpel:copy>
+ <bpel:from><bpel:literal>Foo Type</bpel:literal></bpel:from>
+ <bpel:to>$newVariable1/ns0:Product/ns2:Type</bpel:to>
+ </bpel:copy>
+ </bpel:assign>
+ <bpel:assign name="BP112533402345212">
+ <bpel:copy>
+ <bpel:from variable="newVariable1"/>
+ <bpel:to part="newParameter2" variable="BP11253284037450"/>
+ </bpel:copy>
+ </bpel:assign>
+ <bpel:reply name="ID11253284037292" operation="operation1"
partnerLink="request" portType="wns:TestXPathNamespace2PT"
variable="BP11253284037450"/>
+ </bpel:sequence>
+ </bpel:flow>
+ </bpel:scope>
+</bpel:process>
\ No newline at end of file
Added:
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestXPathNamespace2/TestXPathNamespace2.wsdl
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestXPathNamespace2/TestXPathNamespace2.wsdl?view=auto&rev=466006
==============================================================================
---
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestXPathNamespace2/TestXPathNamespace2.wsdl
(added)
+++
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestXPathNamespace2/TestXPathNamespace2.wsdl
Thu Oct 19 23:25:46 2006
@@ -0,0 +1,91 @@
+<!--
+ ~ 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/TestXPathNamespace2.wsdl";
+ xmlns:tns="http://ode/bpel/unit-test/TestXPathNamespace2.wsdl";
+ xmlns:tns1="http://www.person.org";
+ xmlns:tns2="http://www.product.org";
+ xmlns:tns3="http://www.company.org";
+ 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:types>
+ <xsd:schema elementFormDefault="unqualified"
targetNamespace="http://www.person.org"; xmlns="http://www.person.org";
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema";>
+ <xsd:complexType name="PersonType">
+ <xsd:sequence>
+ <xsd:element name="Name" type="xsd:string"/>
+ <xsd:element name="SSN" type="xsd:string"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:schema>
+ <xsd:schema elementFormDefault="unqualified"
targetNamespace="http://www.product.org"; xmlns="http://www.product.org";
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema";>
+ <xsd:complexType name="ProductType">
+ <xsd:sequence>
+ <xsd:element name="Type" type="xsd:string"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:schema>
+ <xsd:schema elementFormDefault="unqualified"
targetNamespace="http://www.company.org"; xmlns="http://www.company.org";
xmlns:per="http://www.person.org"; xmlns:pro="http://www.product.org";
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema";>
+ <xsd:import namespace="http://www.person.org";></xsd:import>
+ <xsd:import namespace="http://www.product.org";></xsd:import>
+ <xsd:element name="Company">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element maxOccurs="unbounded" name="Person"
type="per:PersonType"/>
+ <xsd:element maxOccurs="unbounded" name="Product"
type="pro:ProductType"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ </wsdl:types>
+
+ <wsdl:message name="operation1Request">
+ <wsdl:part name="newParameter1" element="tns3:Company"/>
+ </wsdl:message>
+ <wsdl:message name="operation1Response">
+ <wsdl:part name="newParameter2" element="tns3:Company"/>
+ </wsdl:message>
+ <wsdl:portType name="TestXPathNamespace2PT">
+ <wsdl:operation name="operation1">
+ <wsdl:input name="operation1Request"
message="tns:operation1Request"/>
+ <wsdl:output name="operation1Response"
message="tns:operation1Response"/>
+ </wsdl:operation>
+ </wsdl:portType>
+
+ <wsdl:binding name="TestXPathNamespace2Binding"
type="tns:TestXPathNamespace2PT">
+ <wsdl:operation name="operation1">
+ <wsdl:input name="operation1Request"/>
+ <wsdl:output name="operation1Response"/>
+ </wsdl:operation>
+ </wsdl:binding>
+ <wsdl:service name="TestXPathNamespace2Service">
+ <wsdl:port name="TestXPathNamespace2Port"
binding="tns:TestXPathNamespace2Binding">
+ </wsdl:port>
+ </wsdl:service>
+
+ <plnk:partnerLinkType name="TestXPathNamespace2Request">
+ <plnk:role name="TestXPathNamespace2Service"
portType="tns:TestXPathNamespace2PT"/>
+ </plnk:partnerLinkType>
+
+</wsdl:definitions>
Added:
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestXPathNamespace2/deploy.xml
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestXPathNamespace2/deploy.xml?view=auto&rev=466006
==============================================================================
---
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestXPathNamespace2/deploy.xml
(added)
+++
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestXPathNamespace2/deploy.xml
Thu Oct 19 23:25:46 2006
@@ -0,0 +1,31 @@
+<!--
+ ~ 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/TestXPathNamespace2";
+ xmlns:wns="http://ode/bpel/unit-test/TestXPathNamespace2.wsdl";>
+
+
+ <process name="pns:TestXPathNamespace2">
+ <active>true</active>
+ <provide partnerLink="request">
+ <service name="wns:TestXPathNamespace2Service"
port="wns:TestXPathNamespace2Port"/>
+ </provide>
+ </process>
+</deploy>
Added:
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestXPathNamespace2/test1.properties
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestXPathNamespace2/test1.properties?view=auto&rev=466006
==============================================================================
---
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestXPathNamespace2/test1.properties
(added)
+++
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestXPathNamespace2/test1.properties
Thu Oct 19 23:25:46 2006
@@ -0,0 +1,5 @@
+namespace=http://ode/bpel/unit-test/TestXPathNamespace2.wsdl
+service=TestXPathNamespace2Service
+operation=operation1
+request1=<message><newParameter1><c:Company xmlns:c="http://www.company.org";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation=
"http://www.company.org Company.xsd"><c:Person><per:Name
xmlns:per="http://www.person.org";>John Doe</per:Name><per:SSN
xmlns:per="http://www.person.org";>123-45-6789</per:SSN></c:Person><c:Product><pro:Type
xmlns:pro="http://www.product.org";>Widget</pro:Type></c:Product></c:Company></newParameter1></message>
+response1=.*Foo Name.*123-45-6789.*Foo Type.*
