[savara-commits] savara SVN: r529 - in branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test: resources/generator/results and 1 other directory.
do-not-reply at jboss.org
do-not-reply at jboss.org
Tue Jan 4 11:22:31 EST 2011
Author: objectiser
Date: 2011-01-04 11:22:30 -0500 (Tue, 04 Jan 2011)
New Revision: 529
Modified:
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/java/org/savara/bpel/generator/GeneratorTest.java
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker at CreditAgency.bpel
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker at SupplierTxnProcessor.bpel
Log:
Fixed remaining BPEL tests.
Modified: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/java/org/savara/bpel/generator/GeneratorTest.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/java/org/savara/bpel/generator/GeneratorTest.java 2011-01-04 13:44:12 UTC (rev 528)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/java/org/savara/bpel/generator/GeneratorTest.java 2011-01-04 16:22:30 UTC (rev 529)
@@ -38,25 +38,12 @@
public static Test suite() {
TestSuite suite = new TestSuite("Choreography->BPEL Generator Tests");
- suite.addTest(new ChoreographyToBPELTester("ESBBroker", "Buyer"));
-
- // ISSUES:
- // Need to deal with case when top level protocol is not projected, but
- // the role to be projected belongs to a nested protocol. What happens
- // if two separate nested protocols use the same role name? Possibly
- // this needs to be reported as an unhandled case for now.
-
- //suite.addTest(new ChoreographyToBPELTester("ESBBroker", "SupplierTxnProcessor"));
- //suite.addTest(new ChoreographyToBPELTester("ESBBroker", "CreditAgency"));
-
-
+ suite.addTest(new ChoreographyToBPELTester("ESBBroker", "Buyer"));
+ suite.addTest(new ChoreographyToBPELTester("ESBBroker", "SupplierTxnProcessor"));
+ suite.addTest(new ChoreographyToBPELTester("ESBBroker", "CreditAgency"));
suite.addTest(new ChoreographyToBPELTester("ESBBroker", "Broker"));
+ suite.addTest(new ChoreographyToBPELTester("ESBBroker", "SupplierQuoteEngine"));
- suite.addTest(new ChoreographyToBPELTester("ESBBroker",
- "SupplierQuoteEngine"));
- /*
- */
-
suite.addTest(new ChoreographyToBPELTester("PurchaseGoods", "Buyer"));
suite.addTest(new ChoreographyToBPELTester("PurchaseGoods", "CreditAgency"));
suite.addTest(new ChoreographyToBPELTester("PurchaseGoods", "Store"));
Modified: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker at CreditAgency.bpel
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker at CreditAgency.bpel 2011-01-04 13:44:12 UTC (rev 528)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker at CreditAgency.bpel 2011-01-04 16:22:30 UTC (rev 529)
@@ -1,36 +1,29 @@
-<process xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:brk="http://www.pi4soa.org/ESBBroker/Broker" xmlns:byr="http://www.pi4soa.org/ESBBroker/Buyer" xmlns:cay="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns:spr="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:tns="http://www.pi4soa.org/ESBBroker" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="overlord.cdl.samples.Common at CreditAgency" name="ESBBrokerProcess_CreditAgency" targetNamespace="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable">
- <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_CreditAgency.wsdl" namespace="http://www.pi4soa.org/ESBBroker/CreditAgency"/>
- <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_Broker.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Broker"/>
- <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_Supplier.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Supplier"/>
- <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_CreditAgencyArtifacts.wsdl" namespace="http://www.pi4soa.org/ESBBroker/CreditAgency"/>
- <partnerLinks>
- <partnerLink myRole="CreditAgencyService" name="BrokerToCreditAgency" partnerLinkType="cay:BrokerToCreditAgencyServiceLT"/>
- </partnerLinks>
- <variables>
- <variable messageType="cay:checkCreditRequest" name="checkCreditRequestVar"/>
- <variable messageType="cay:checkCreditResponse" name="checkCreditResponseVar"/>
- <variable messageType="cay:invalidCreditFault" name="invalidCreditFaultVar"/>
- </variables>
- <sequence>
- <pick>
- <onMessage operation="checkCredit" partnerLink="BrokerToCreditAgency" portType="cay:CreditAgencyBehavior" variable="checkCreditRequestVar">
- <sequence>
- <scope>
- <sequence>
- <if>
- <sequence>
- <reply name="Send_CreditCheckOk" operation="checkCredit" partnerLink="BrokerToCreditAgency" portType="cay:CreditAgencyBehavior" variable="checkCreditResponseVar"/>
- </sequence>
- <else>
- <sequence>
- <reply faultName="cay:invalidCredit" name="Send_CreditCheckInvalid" operation="checkCredit" partnerLink="BrokerToCreditAgency" portType="cay:CreditAgencyBehavior" variable="invalidCreditFaultVar"/>
- </sequence>
- </else>
- </if>
- </sequence>
- </scope>
- </sequence>
- </onMessage>
- </pick>
- </sequence>
-</process>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<process xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:spr="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:tns="http://www.pi4soa.org/ESBBroker" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:cay="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns:byr="http://www.pi4soa.org/ESBBroker/Buyer" xmlns:brk="http://www.pi4soa.org/ESBBroker/Broker" name="ESBBrokerProcess_CreditAgency" targetNamespace="http://www.pi4soa.org/ESBBroker/CreditAgency">
+ <import namespace="http://www.pi4soa.org/ESBBroker/CreditAgency" location="ESBBrokerProcess_CreditAgency.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/>
+ <import namespace="http://www.pi4soa.org/ESBBroker/Broker" location="ESBBrokerProcess_Broker.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/>
+ <import namespace="http://www.pi4soa.org/ESBBroker/Supplier" location="ESBBrokerProcess_Supplier.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/>
+ <import namespace="http://www.pi4soa.org/ESBBroker/Supplier" location="ESBBrokerProcess_SupplierTxnProcessor.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/>
+ <import namespace="http://www.pi4soa.org/ESBBroker/CreditAgency" location="ESBBrokerProcess_CreditAgencyArtifacts.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/>
+ <partnerLinks>
+ <partnerLink name="BrokerToCreditAgency" partnerLinkType="cay:BrokerToCreditAgencyServiceLT" myRole="CreditAgency"/>
+ </partnerLinks>
+ <variables>
+ <variable name="checkCreditRequestVar" messageType="cay:checkCreditRequest"/>
+ <variable name="checkCreditResponseVar" messageType="cay:checkCreditResponse"/>
+ <variable name="invalidCreditFaultVar" messageType="cay:invalidCreditFault"/>
+ </variables>
+ <sequence>
+ <receive partnerLink="BrokerToCreditAgency" portType="cay:CreditAgencyBehavior" operation="checkCredit" variable="checkCreditRequestVar" createInstance="yes" name="Receive_CreditCheckRequest"/>
+ <if>
+ <sequence>
+ <reply partnerLink="BrokerToCreditAgency" portType="cay:CreditAgencyBehavior" operation="checkCredit" variable="checkCreditResponseVar" name="Send_CreditCheckOk"/>
+ </sequence>
+ <else>
+ <sequence>
+ <reply partnerLink="BrokerToCreditAgency" portType="cay:CreditAgencyBehavior" operation="checkCredit" variable="invalidCreditFaultVar" faultName="cay:invalidCredit" name="Send_CreditCheckInvalid"/>
+ </sequence>
+ </else>
+ </if>
+ </sequence>
+</process>
Modified: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker at SupplierTxnProcessor.bpel
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker at SupplierTxnProcessor.bpel 2011-01-04 13:44:12 UTC (rev 528)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker at SupplierTxnProcessor.bpel 2011-01-04 16:22:30 UTC (rev 529)
@@ -1,20 +1,16 @@
-<process xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:brk="http://www.pi4soa.org/ESBBroker/Broker" xmlns:byr="http://www.pi4soa.org/ESBBroker/Buyer" xmlns:cay="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns:spr="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:tns="http://www.pi4soa.org/ESBBroker" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="overlord.cdl.samples.LoanBroker at SupplierTxnProcessor" name="CompleteTransaction_SupplierTxnProcessor" targetNamespace="http://www.pi4soa.org/ESBBroker/Supplier" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable">
- <import importType="http://schemas.xmlsoap.org/wsdl/" location="CompleteTransaction_SupplierTxnProcessor.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Supplier"/>
- <import importType="http://schemas.xmlsoap.org/wsdl/" location="CompleteTransaction_SupplierTxnProcessorArtifacts.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Supplier"/>
- <partnerLinks>
- <partnerLink myRole="SupplierTxnProcessorService" name="BrokerToSupplierTxnProcessor" partnerLinkType="spr:BrokerToSupplierTxnProcessorServiceLT"/>
- </partnerLinks>
- <variables>
- <variable messageType="spr:confirmRequest" name="confirmRequestVar"/>
- <variable messageType="spr:confirmResponse" name="confirmResponseVar"/>
- </variables>
- <sequence>
- <pick createInstance="yes">
- <onMessage operation="confirm" partnerLink="BrokerToSupplierTxnProcessor" portType="spr:SupplierBehavior" variable="confirmRequestVar">
- <sequence>
- <reply name="Send_bookingReference" operation="confirm" partnerLink="BrokerToSupplierTxnProcessor" portType="spr:SupplierBehavior" variable="confirmResponseVar"/>
- </sequence>
- </onMessage>
- </pick>
- </sequence>
-</process>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<process xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:spr="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:tns="http://www.pi4soa.org/ESBBroker" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:cay="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns:byr="http://www.pi4soa.org/ESBBroker/Buyer" xmlns:brk="http://www.pi4soa.org/ESBBroker/Broker" name="CompleteTransaction_SupplierTxnProcessor" targetNamespace="http://www.pi4soa.org/ESBBroker/Supplier">
+ <import namespace="http://www.pi4soa.org/ESBBroker/Supplier" location="CompleteTransaction_SupplierTxnProcessor.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/>
+ <import namespace="http://www.pi4soa.org/ESBBroker/Supplier" location="CompleteTransaction_SupplierTxnProcessorArtifacts.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/>
+ <partnerLinks>
+ <partnerLink name="BrokerToSupplierTxnProcessor" partnerLinkType="spr:BrokerToSupplierTxnProcessorServiceLT" myRole="SupplierTxnProcessor"/>
+ </partnerLinks>
+ <variables>
+ <variable name="confirmRequestVar" messageType="spr:confirmRequest"/>
+ <variable name="confirmResponseVar" messageType="spr:confirmResponse"/>
+ </variables>
+ <sequence>
+ <receive partnerLink="BrokerToSupplierTxnProcessor" portType="spr:SupplierBehavior" operation="confirm" variable="confirmRequestVar" createInstance="yes" name="Receive_orderConfirmed"/>
+ <reply partnerLink="BrokerToSupplierTxnProcessor" portType="spr:SupplierBehavior" operation="confirm" variable="confirmResponseVar" name="Send_bookingReference"/>
+ </sequence>
+</process>
More information about the savara-commits
mailing list