[riftsaw-commits] riftsaw SVN: r842 - branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests and 24 other directories.

Author: objectiser Date: 2010-07-07 07:57:36 -0400 (Wed, 07 Jul 2010) New Revision: 842 Added: branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSayHelloTestCase.java branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/ branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/bpel/ branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/bpel/SayHello.bpel branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/bpel/SayHelloArtifacts.wsdl branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/bpel/bpel-deploy.xml branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/build.xml branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/messages/ branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/messages/sayHello_request1.xml branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/messages/sayHello_response1.xml trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSayHelloTestCase.java trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/bpel/ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/bpel/SayHello.bpel trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/bpel/SayHelloArtifacts.wsdl trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/bpel/bpel-deploy.xml trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/build.xml trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/messages/ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/messages/sayHello_request1.xml trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/messages/sayHello_response1.xml Modified: branches/RiftSaw-2.1.x/integration-tests/build.xml branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/RiftSawTest.java branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldExtendedTimeoutTestCase.java branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldHeaderODETestCase.java branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldHeaderWSDLTestCase.java branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldTestCase.java branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELInvokeESBEBWSTestCase.java branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELLoanApprovalTestCase.java branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSecureInvokeTestCase.java branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSimpleCorrelationTestCase.java branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSimpleCorrelationWithOneWayTestCase.java branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSimpleInvokeTestCase.java branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSimplePickTestCase.java branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartSimpleESBProxyInvoke2TestCase.java branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartSimpleESBProxyInvokeTestCase.java branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw118TestCase.java branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw163TestCase.java branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw209TestCase.java branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw70TestCase.java branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint1/BluePrint1TestCase.java branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint2/BluePrint2TestCase.java branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint3/BluePrint3TestCase.java branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint4/BluePrint4TestCase.java branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint5/BluePrint5TestCase.java trunk/integration-tests/build.xml trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/RiftSawTest.java trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldExtendedTimeoutTestCase.java trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldHeaderODETestCase.java trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldHeaderWSDLTestCase.java trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldTestCase.java trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELInvokeESBEBWSTestCase.java trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELLoanApprovalTestCase.java trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSecureInvokeTestCase.java trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSimpleCorrelationTestCase.java trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSimpleCorrelationWithOneWayTestCase.java trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSimpleInvokeTestCase.java trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSimplePickTestCase.java trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartSimpleESBProxyInvoke2TestCase.java trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartSimpleESBProxyInvokeTestCase.java trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw118TestCase.java trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw163TestCase.java trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw209TestCase.java trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw70TestCase.java trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint1/BluePrint1TestCase.java trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint2/BluePrint2TestCase.java trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint3/BluePrint3TestCase.java trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint4/BluePrint4TestCase.java trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint5/BluePrint5TestCase.java Log: Added 'say_hello' as integration test, to provide another doc/lit example. Refactored response message processing, dependent upon which stack is used, into superclass. Modified: branches/RiftSaw-2.1.x/integration-tests/build.xml =================================================================== --- branches/RiftSaw-2.1.x/integration-tests/build.xml 2010-07-07 08:26:58 UTC (rev 841) +++ branches/RiftSaw-2.1.x/integration-tests/build.xml 2010-07-07 11:57:36 UTC (rev 842) @@ -131,6 +131,7 @@ <ant antfile="src/test/resources/samples/Quickstart_bpel_hello_world_extended_timeout/build.xml" /> <ant antfile="src/test/resources/samples/Quickstart_bpel_hello_world_header_ode/build.xml" /> <ant antfile="src/test/resources/samples/Quickstart_bpel_hello_world_header_wsdl/build.xml" /> + <ant antfile="src/test/resources/samples/Quickstart_bpel_say_hello/build.xml" /> <ant antfile="src/test/resources/samples/Quickstart_bpel_simple_correlation/build.xml" /> <ant antfile="src/test/resources/samples/Quickstart_bpel_simple_correlation_with_oneway/build.xml" /> <ant antfile="src/test/resources/samples/Quickstart_bpel_simple_invoke/build.xml" /> Modified: branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/RiftSawTest.java =================================================================== --- branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/RiftSawTest.java 2010-07-07 08:26:58 UTC (rev 841) +++ branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/RiftSawTest.java 2010-07-07 11:57:36 UTC (rev 842) @@ -158,4 +158,20 @@ return(result); } + + protected String processResult(String result) { + // If testing against cxf, then result is presented slightly differently + if (result.indexOf("SOAP-ENV") != -1) { + result = result.replaceAll("SOAP-ENV", "env"); + result = result.replaceAll(" xmlns=\"\"",""); + result = result.replaceAll("\"","'"); + result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); + + result = result.replaceAll("<env:Fault>","<env:Fault xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>"); + result = result.replaceAll("ns0","valueNS"); + result = result.replaceAll("<faultstring>Fault string, and possibly fault code, not set</faultstring>",""); + } + + return(result); + } } Modified: branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldExtendedTimeoutTestCase.java =================================================================== --- branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldExtendedTimeoutTestCase.java 2010-07-07 08:26:58 UTC (rev 841) +++ branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldExtendedTimeoutTestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -46,13 +46,7 @@ String result=sendSOAPMessage("hello_request1.xml", "http://localhost:8080/Quickstart_bpel_hello_world_extended_timeoutWS"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result = processResult(result); assertMessageFromFile(result, "hello_response1.xml"); } Modified: branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldHeaderODETestCase.java =================================================================== --- branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldHeaderODETestCase.java 2010-07-07 08:26:58 UTC (rev 841) +++ branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldHeaderODETestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -46,12 +46,7 @@ String result=sendSOAPMessage("hello_request1.xml", "http://localhost:8080/Quickstart_bpel_hello_world_header_odeWS"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - } + result = processResult(result); // TODO: Commented out until fixed assertMessageFromFile(result, "hello_response1.xml"); Modified: branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldHeaderWSDLTestCase.java =================================================================== --- branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldHeaderWSDLTestCase.java 2010-07-07 08:26:58 UTC (rev 841) +++ branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldHeaderWSDLTestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -47,12 +47,7 @@ String result=sendSOAPMessage("hello_request1.xml", "http://localhost:8080/Quickstart_bpel_hello_world_header_wsdlWS"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - } + result = processResult(result); assertMessageFromFile(result, "hello_response1.xml"); } Modified: branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldTestCase.java =================================================================== --- branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldTestCase.java 2010-07-07 08:26:58 UTC (rev 841) +++ branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldTestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -46,13 +46,7 @@ String result=sendSOAPMessage("hello_request1.xml", "http://localhost:8080/Quickstart_bpel_hello_worldWS"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result = processResult(result); assertMessageFromFile(result, "hello_response1.xml"); } Modified: branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELInvokeESBEBWSTestCase.java =================================================================== --- branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELInvokeESBEBWSTestCase.java 2010-07-07 08:26:58 UTC (rev 841) +++ branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELInvokeESBEBWSTestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -54,14 +54,8 @@ String result=sendSOAPMessage("approve_request1.xml", "http://localhost:8080/Quickstart_bpel_approval_serviceWS"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - } - + result = processResult(result); + assertMessageFromFile(result, "approve_response1.xml"); } } Modified: branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELLoanApprovalTestCase.java =================================================================== --- branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELLoanApprovalTestCase.java 2010-07-07 08:26:58 UTC (rev 841) +++ branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELLoanApprovalTestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -46,13 +46,7 @@ String result=sendSOAPMessage("loanreq1.xml", "http://localhost:8080/Quickstart_bpel_loan_approvalWS"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result = processResult(result); assertMessageFromFile(result, "loanresp1.xml"); } @@ -61,13 +55,7 @@ String result=sendSOAPMessage("loanreq2.xml", "http://localhost:8080/Quickstart_bpel_loan_approvalWS"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result = processResult(result); assertMessageFromFile(result, "loanresp2.xml"); } Added: branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSayHelloTestCase.java =================================================================== --- branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSayHelloTestCase.java (rev 0) +++ branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSayHelloTestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -0,0 +1,53 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.soa.bpel.tests.samples; + +import org.jboss.soa.bpel.tests.RiftSawTest; +import org.jboss.soa.bpel.tests.RiftSawTestSetup; + +import junit.framework.Test; + +/** + * Test case for running the Quickstart_bpel_say_hello sample. + */ +public class QuickstartBPELSayHelloTestCase extends RiftSawTest { + + private static final String TEST_NAME = "Quickstart_bpel_say_hello"; + + public QuickstartBPELSayHelloTestCase() { + super(TEST_NAME); + } + + public static Test suite() { + return(new RiftSawTestSetup(QuickstartBPELSayHelloTestCase.class, + TEST_NAME, "Quickstart_bpel_say_hello-1.jar")); + } + + public void testSendHello() throws Exception { + String result=sendSOAPMessage("sayHello_request1.xml", + "http://localhost:8080/SayHelloProcess"); + + result = processResult(result); + + assertMessageFromFile(result, "sayHello_response1.xml"); + } +} Modified: branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSecureInvokeTestCase.java =================================================================== --- branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSecureInvokeTestCase.java 2010-07-07 08:26:58 UTC (rev 841) +++ branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSecureInvokeTestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -54,13 +54,7 @@ String result=sendSOAPMessage("hello_request1.xml", "http://localhost:8080/Quickstart_bpel_secure_invokeWS"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result = processResult(result); assertMessageFromFile(result, "hello_response1.xml"); } Modified: branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSimpleCorrelationTestCase.java =================================================================== --- branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSimpleCorrelationTestCase.java 2010-07-07 08:26:58 UTC (rev 841) +++ branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSimpleCorrelationTestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -58,26 +58,14 @@ String result1=sendSOAPMessage("hello_request1.xml", "http://localhost:8080/Quickstart_bpel_simple_correlationWS"); - // If testing against cxf, then result is presented slightly differently - if (result1.indexOf("SOAP-ENV") != -1) { - result1 = result1.replaceAll("SOAP-ENV", "env"); - result1 = result1.replaceAll(" xmlns=\"\"",""); - result1 = result1.replaceAll("\"","'"); - result1 = result1.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result1 = processResult(result1); assertMessageFromFile(result1, "hello_response1.xml"); String result2=sendSOAPMessage("goodbye_request1.xml", "http://localhost:8080/Quickstart_bpel_simple_correlationWS"); - // If testing against cxf, then result is presented slightly differently - if (result2.indexOf("SOAP-ENV") != -1) { - result2 = result2.replaceAll("SOAP-ENV", "env"); - result2 = result2.replaceAll(" xmlns=\"\"",""); - result2 = result2.replaceAll("\"","'"); - result2 = result2.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result2 = processResult(result2); assertMessageFromFile(result2, "goodbye_response1.xml"); } Modified: branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSimpleCorrelationWithOneWayTestCase.java =================================================================== --- branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSimpleCorrelationWithOneWayTestCase.java 2010-07-07 08:26:58 UTC (rev 841) +++ branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSimpleCorrelationWithOneWayTestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -58,13 +58,7 @@ String result2=sendSOAPMessage("goodbye_request1.xml", "http://localhost:8080/Quickstart_bpel_simple_correlation_onewayWS"); - // If testing against cxf, then result is presented slightly differently - if (result2.indexOf("SOAP-ENV") != -1) { - result2 = result2.replaceAll("SOAP-ENV", "env"); - result2 = result2.replaceAll(" xmlns=\"\"",""); - result2 = result2.replaceAll("\"","'"); - result2 = result2.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result2 = processResult(result2); assertMessageFromFile(result2, "goodbye_response1.xml"); } Modified: branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSimpleInvokeTestCase.java =================================================================== --- branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSimpleInvokeTestCase.java 2010-07-07 08:26:58 UTC (rev 841) +++ branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSimpleInvokeTestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -46,13 +46,7 @@ String result=sendSOAPMessage("hello_request1.xml", "http://localhost:8080/Quickstart_bpel_simple_invokeWS"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result = processResult(result); assertMessageFromFile(result, "hello_response1.xml"); } Modified: branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSimplePickTestCase.java =================================================================== --- branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSimplePickTestCase.java 2010-07-07 08:26:58 UTC (rev 841) +++ branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSimplePickTestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -46,26 +46,14 @@ String result1=sendSOAPMessage("hello_request1.xml", "http://localhost:8080/Quickstart_bpel_simple_pickWS"); - // If testing against cxf, then result is presented slightly differently - if (result1.indexOf("SOAP-ENV") != -1) { - result1 = result1.replaceAll("SOAP-ENV", "env"); - result1 = result1.replaceAll(" xmlns=\"\"",""); - result1 = result1.replaceAll("\"","'"); - result1 = result1.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result1 = processResult(result1); assertMessageFromFile(result1, "hello_response1.xml"); String result2=sendSOAPMessage("hello_request1.xml", "http://localhost:8080/Quickstart_bpel_simple_pickWS"); - // If testing against cxf, then result is presented slightly differently - if (result2.indexOf("SOAP-ENV") != -1) { - result2 = result2.replaceAll("SOAP-ENV", "env"); - result2 = result2.replaceAll(" xmlns=\"\"",""); - result2 = result2.replaceAll("\"","'"); - result2 = result2.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result2 = processResult(result2); assertMessageFromFile(result2, "hello_response1.xml"); } @@ -74,26 +62,14 @@ String result1=sendSOAPMessage("goodbye_request1.xml", "http://localhost:8080/Quickstart_bpel_simple_pickWS"); - // If testing against cxf, then result is presented slightly differently - if (result1.indexOf("SOAP-ENV") != -1) { - result1 = result1.replaceAll("SOAP-ENV", "env"); - result1 = result1.replaceAll(" xmlns=\"\"",""); - result1 = result1.replaceAll("\"","'"); - result1 = result1.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result1 = processResult(result1); assertMessageFromFile(result1, "goodbye_response1.xml"); String result2=sendSOAPMessage("hello_request1.xml", "http://localhost:8080/Quickstart_bpel_simple_pickWS"); - // If testing against cxf, then result is presented slightly differently - if (result2.indexOf("SOAP-ENV") != -1) { - result2 = result2.replaceAll("SOAP-ENV", "env"); - result2 = result2.replaceAll(" xmlns=\"\"",""); - result2 = result2.replaceAll("\"","'"); - result2 = result2.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result2 = processResult(result2); assertMessageFromFile(result2, "hello_response1.xml"); } Modified: branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartSimpleESBProxyInvoke2TestCase.java =================================================================== --- branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartSimpleESBProxyInvoke2TestCase.java 2010-07-07 08:26:58 UTC (rev 841) +++ branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartSimpleESBProxyInvoke2TestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -54,14 +54,8 @@ String result=sendSOAPMessage("hello_request1.xml", "http://localhost:8080/Quickstart_bpel_simple_invokeWS"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - } - + result = processResult(result); + assertMessageFromFile(result, "hello_response1.xml"); } } Modified: branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartSimpleESBProxyInvokeTestCase.java =================================================================== --- branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartSimpleESBProxyInvokeTestCase.java 2010-07-07 08:26:58 UTC (rev 841) +++ branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartSimpleESBProxyInvokeTestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -54,13 +54,7 @@ String result=sendSOAPMessage("hello_request1.xml", "http://localhost:8080/Quickstart_bpel_simple_invokeWS"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result = processResult(result); assertMessageFromFile(result, "hello_response1.xml"); } Modified: branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw118TestCase.java =================================================================== --- branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw118TestCase.java 2010-07-07 08:26:58 UTC (rev 841) +++ branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw118TestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -46,13 +46,7 @@ String result=sendSOAPMessage("hello_request1.xml", "http://localhost:8080/RiftSaw_118WS"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result = processResult(result); // Comment out until RIFTSAW-118 is fixed assertMessageFromFile(result, "hello_response1.xml"); Modified: branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw163TestCase.java =================================================================== --- branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw163TestCase.java 2010-07-07 08:26:58 UTC (rev 841) +++ branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw163TestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -46,13 +46,7 @@ String result=sendSOAPMessage("hello_request1.xml", "http://localhost:8080/RiftSaw_163WS"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result = processResult(result); // Comment out until RIFTSAW-118 is fixed assertMessageFromFile(result, "hello_response1.xml"); Modified: branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw209TestCase.java =================================================================== --- branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw209TestCase.java 2010-07-07 08:26:58 UTC (rev 841) +++ branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw209TestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -46,13 +46,7 @@ String result=sendSOAPMessage("hello_request1.xml", "http://localhost:8080/RiftSaw_209WS"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result = processResult(result); assertMessageFromFile(result, "hello_response1.xml"); } Modified: branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw70TestCase.java =================================================================== --- branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw70TestCase.java 2010-07-07 08:26:58 UTC (rev 841) +++ branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw70TestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -46,13 +46,7 @@ String result=sendSOAPMessage("hello_request1.xml", "http://localhost:8080/RiftSaw_70WS"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result = processResult(result); result = result.replaceAll(" xmlns:pol='http://www.example.org/policyQuote'>";, ">"); Modified: branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint1/BluePrint1TestCase.java =================================================================== --- branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint1/BluePrint1TestCase.java 2010-07-07 08:26:58 UTC (rev 841) +++ branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint1/BluePrint1TestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -30,13 +30,7 @@ String result=sendSOAPMessage("valid.xml", "http://localhost:8080/BPEL_BluePrint1_PurchaseOrderService"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result = processResult(result); assertMessageFromFile(result, "valid_response.xml"); } @@ -45,16 +39,7 @@ String result=sendSOAPMessage("invalid.xml", "http://localhost:8080/BPEL_BluePrint1_PurchaseOrderService"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - result = result.replaceAll("<env:Fault>","<env:Fault xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>"); - result = result.replaceAll("ns0","valueNS"); - result = result.replaceAll("<faultstring>Fault string, and possibly fault code, not set</faultstring>",""); - } + result = processResult(result); assertMessageFromFile(result, "invalid_response.xml"); } Modified: branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint2/BluePrint2TestCase.java =================================================================== --- branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint2/BluePrint2TestCase.java 2010-07-07 08:26:58 UTC (rev 841) +++ branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint2/BluePrint2TestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -30,13 +30,7 @@ String result=sendSOAPMessage("valid.xml", "http://localhost:8080/BPEL_BluePrint2_PurchaseOrderService"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result = processResult(result); assertMessageFromFile(result, "valid_response.xml"); } @@ -45,16 +39,7 @@ String result=sendSOAPMessage("invalid.xml", "http://localhost:8080/BPEL_BluePrint2_PurchaseOrderService"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - result = result.replaceAll("<env:Fault>","<env:Fault xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>"); - result = result.replaceAll("ns0","valueNS"); - result = result.replaceAll("<faultstring>Fault string, and possibly fault code, not set</faultstring>",""); - } + result = processResult(result); assertMessageFromFile(result, "invalid_response.xml"); } @@ -63,16 +48,7 @@ String result=sendSOAPMessage("timeout.xml", "http://localhost:8080/BPEL_BluePrint2_PurchaseOrderService"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - result = result.replaceAll("<env:Fault>","<env:Fault xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>"); - result = result.replaceAll("ns0","valueNS"); - result = result.replaceAll("<faultstring>Fault string, and possibly fault code, not set</faultstring>",""); - } + result = processResult(result); assertMessageFromFile(result, "timeout_response.xml"); } Modified: branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint3/BluePrint3TestCase.java =================================================================== --- branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint3/BluePrint3TestCase.java 2010-07-07 08:26:58 UTC (rev 841) +++ branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint3/BluePrint3TestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -30,13 +30,7 @@ String result=sendSOAPMessage("valid.xml", "http://localhost:8080/BPEL_BluePrint3_PurchaseOrderService"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result = processResult(result); assertMessageFromFile(result, "valid_response.xml"); } @@ -45,16 +39,7 @@ String result=sendSOAPMessage("invalid.xml", "http://localhost:8080/BPEL_BluePrint3_PurchaseOrderService"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - result = result.replaceAll("<env:Fault>","<env:Fault xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>"); - result = result.replaceAll("ns0","valueNS"); - result = result.replaceAll("<faultstring>Fault string, and possibly fault code, not set</faultstring>",""); - } + result = processResult(result); assertMessageFromFile(result, "invalid_response.xml"); } @@ -63,16 +48,7 @@ String result=sendSOAPMessage("throw_po_fault.xml", "http://localhost:8080/BPEL_BluePrint3_PurchaseOrderService"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - result = result.replaceAll("<env:Fault>","<env:Fault xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>"); - result = result.replaceAll("ns0","valueNS"); - result = result.replaceAll("<faultstring>Fault string, and possibly fault code, not set</faultstring>",""); - } + result = processResult(result); assertMessageFromFile(result, "throw_po_fault_response.xml"); } @@ -83,16 +59,11 @@ // If testing against cxf, then result is presented slightly differently if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - result = result.replaceAll("<env:Fault>","<env:Fault xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>"); - result = result.replaceAll("ns0","valueNS"); - result = result.replaceAll("<faultstring>Fault string, and possibly fault code, not set</faultstring>",""); result = result.replaceAll("<tns:FaultCode xmlns:tns='http://manufacturing.org/xsd/inventory' />","<tns:FaultCode xmlns:tns='http://manufacturing.org/xsd/inventory'/>"); } + result = processResult(result); + assertMessageFromFile(result, "throw_inv_fault_response.xml"); } Modified: branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint4/BluePrint4TestCase.java =================================================================== --- branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint4/BluePrint4TestCase.java 2010-07-07 08:26:58 UTC (rev 841) +++ branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint4/BluePrint4TestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -30,13 +30,7 @@ String result=sendSOAPMessage("valid.xml", "http://localhost:8080/BPEL_BluePrint4_PurchaseOrderService"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result = processResult(result); assertMessageFromFile(result, "valid_response.xml"); } @@ -47,16 +41,11 @@ // If testing against cxf, then result is presented slightly differently if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - result = result.replaceAll("<env:Fault>","<env:Fault xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>"); - result = result.replaceAll("ns0","valueNS"); - result = result.replaceAll("<faultstring>Fault string, and possibly fault code, not set</faultstring>",""); result = result.replaceAll("<tns:FaultCode xmlns:tns='http://manufacturing.org/xsd/purchase' />","<tns:FaultCode xmlns:tns='http://manufacturing.org/xsd/purchase'/>"); } + result = processResult(result); + assertMessageFromFile(result, "invalid_response.xml"); } Modified: branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint5/BluePrint5TestCase.java =================================================================== --- branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint5/BluePrint5TestCase.java 2010-07-07 08:26:58 UTC (rev 841) +++ branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint5/BluePrint5TestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -30,13 +30,7 @@ String result=sendSOAPMessage("book_airline.xml", "http://localhost:8080/BPEL_BluePrint5_ReservationService"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result = processResult(result); assertMessageFromFile(result, "book_airline_response.xml"); } @@ -45,13 +39,7 @@ String result=sendSOAPMessage("book_car.xml", "http://localhost:8080/BPEL_BluePrint5_ReservationService"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result = processResult(result); assertMessageFromFile(result, "book_car_response.xml"); } @@ -60,13 +48,7 @@ String result=sendSOAPMessage("book_hotel.xml", "http://localhost:8080/BPEL_BluePrint5_ReservationService"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result = processResult(result); assertMessageFromFile(result, "book_hotel_response.xml"); } @@ -75,13 +57,7 @@ String result=sendSOAPMessage("book_all.xml", "http://localhost:8080/BPEL_BluePrint5_ReservationService"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result = processResult(result); assertMessageFromFile(result, "book_all_response.xml"); } Added: branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/bpel/SayHello.bpel =================================================================== --- branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/bpel/SayHello.bpel (rev 0) +++ branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/bpel/SayHello.bpel 2010-07-07 11:57:36 UTC (rev 842) @@ -0,0 +1,81 @@ +<!-- HelloWorld BPEL Process [Generated by the Eclipse BPEL Designer] --> +<bpel:process name="HelloWorld" + targetNamespace="http://www.jboss.org/bpel/examples" + suppressJoinFailure="yes" + xmlns:tns="http://www.jboss.org/bpel/examples" + xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable... + > + + <!-- Import the client WSDL --> + <bpel:import location="SayHelloArtifacts.wsdl" namespace="http://www.jboss.org/bpel/examples" + importType="http://schemas.xmlsoap.org/wsdl/" /> + + <!-- ================================================================= --> + <!-- PARTNERLINKS --> + <!-- List of services participating in this BPEL process --> + <!-- ================================================================= --> + <bpel:partnerLinks> + <!-- The 'client' role represents the requester of this service. --> + <bpel:partnerLink name="client" + partnerLinkType="tns:SayHello" + myRole="SayHelloProvider" + /> + </bpel:partnerLinks> + + <!-- ================================================================= --> + <!-- VARIABLES --> + <!-- List of messages and XML documents used within this BPEL process --> + <!-- ================================================================= --> + <bpel:variables> + <!-- Reference to the message passed as input during initiation --> + <bpel:variable name="ReceiveSayHelloVar" + messageType="tns:SayHelloRequestMessage"/> + + <!-- + Reference to the message that will be returned to the requester + --> + <bpel:variable name="ReplySayHelloVar" + messageType="tns:SayHelloResponseMessage"/> + </bpel:variables> + + <!-- ================================================================= --> + <!-- ORCHESTRATION LOGIC --> + <!-- Set of activities coordinating the flow of messages across the --> + <!-- services integrated within this business process --> + <!-- ================================================================= --> + <bpel:sequence name="main"> + + <!-- Receive input from requester. + Note: This maps to operation defined in HelloWorld.wsdl + --> + <bpel:receive name="ReceiveSayHello" partnerLink="client" + portType="tns:SayHello" + operation="sayHello" variable="ReceiveSayHelloVar" + createInstance="yes"/> + + <!-- Generate reply to synchronous request --> + <bpel:assign validate="no" name="AssignName"> + <bpel:copy> + <bpel:from><bpel:literal><tns:HelloWorldResponse xmlns:tns="http://www.jboss.org/bpel/examples" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <tns:result></tns:result> +</tns:HelloWorldResponse> +</bpel:literal></bpel:from> + <bpel:to variable="ReplySayHelloVar" part="parameters"></bpel:to> + </bpel:copy> + <bpel:copy> + <bpel:from> + <![CDATA[concat('Hello ', $ReceiveSayHelloVar.parameters/tns:input)]]> + </bpel:from> + <bpel:to part="parameters" variable="ReplySayHelloVar"> + <bpel:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath1.0"><![CDATA[tns:result]]></bpel:query> + </bpel:to> + </bpel:copy> + </bpel:assign> + <bpel:reply name="ReplySayHello" + partnerLink="client" + portType="tns:SayHello" + operation="sayHello" + variable="ReplySayHelloVar" + /> + </bpel:sequence> +</bpel:process> \ No newline at end of file Added: branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/bpel/SayHelloArtifacts.wsdl =================================================================== --- branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/bpel/SayHelloArtifacts.wsdl (rev 0) +++ branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/bpel/SayHelloArtifacts.wsdl 2010-07-07 11:57:36 UTC (rev 842) @@ -0,0 +1,90 @@ +<?xml version="1.0"?> +<definitions name="SayHello" + targetNamespace="http://www.jboss.org/bpel/examples" + xmlns:tns="http://www.jboss.org/bpel/examples" + xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype" + xmlns="http://schemas.xmlsoap.org/wsdl/" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"> + +<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + TYPE DEFINITION - List of types participating in this BPEL process + The BPEL Designer will generate default request and response types + but you can define or import any XML Schema type and use them as part + of the message types. + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --> + <types> + <schema attributeFormDefault="unqualified" elementFormDefault="qualified" + targetNamespace="http://www.jboss.org/bpel/examples" + xmlns="http://www.w3.org/2001/XMLSchema"> + + <element name="SayHelloRequest"> + <complexType> + <sequence> + <element name="input" type="string"/> + </sequence> + </complexType> + </element> + + <element name="SayHelloResponse"> + <complexType> + <sequence> + <element name="result" type="string"/> + </sequence> + </complexType> + </element> + </schema> + </types> + + +<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + MESSAGE TYPE DEFINITION - Definition of the message types used as + part of the port type defintions + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --> + <message name="SayHelloRequestMessage"> + <part name="parameters" element="tns:SayHelloRequest"/> + </message> + <message name="SayHelloResponseMessage"> + <part name="parameters" element="tns:SayHelloResponse"/> + </message> + +<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + PORT TYPE DEFINITION - A port type groups a set of operations into + a logical service unit. + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --> + + <!-- portType implemented by the HelloWorld BPEL process --> + <portType name="SayHello"> + <operation name="sayHello"> + <input message="tns:SayHelloRequestMessage" /> + <output message="tns:SayHelloResponseMessage"/> + </operation> + </portType> + + +<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + PARTNER LINK TYPE DEFINITION + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --> + <plnk:partnerLinkType name="SayHello"> + <plnk:role name="SayHelloProvider" portType="tns:SayHello"/> + </plnk:partnerLinkType> + + <binding name="SayHelloBinding" type="tns:SayHello"> + <soap:binding style="document" + transport="http://schemas.xmlsoap.org/soap/http" /> + <operation name="sayHello"> + <soap:operation + soapAction="http://www.jboss.org/bpel/examples/sayHello" /> + <input> + <soap:body use="literal" /> + </input> + <output> + <soap:body use="literal" /> + </output> + </operation> + </binding> + <service name="SayHelloService"> + <port name="SayHelloPort" binding="tns:SayHelloBinding"> + <soap:address location="http://localhost:8080/SayHelloProcess" /> + </port> + </service> +</definitions> Added: branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/bpel/bpel-deploy.xml =================================================================== --- branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/bpel/bpel-deploy.xml (rev 0) +++ branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/bpel/bpel-deploy.xml 2010-07-07 11:57:36 UTC (rev 842) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<deploy xmlns="http://www.apache.org/ode/schemas/dd/2007/03" xmlns:examples="http://www.jboss.org/bpel/examples"> + <process name="examples:HelloWorld"> + <active>true</active> + <retired>false</retired> + <process-events generate="all"/> + <provide partnerLink="client"> + <service name="examples:SayHelloService" port="SayHelloPort"/> + </provide> + </process> +</deploy> \ No newline at end of file Added: branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/build.xml =================================================================== --- branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/build.xml (rev 0) +++ branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/build.xml 2010-07-07 11:57:36 UTC (rev 842) @@ -0,0 +1,30 @@ +<project name="Quickstart_bpel_say_hello" default="deploy" basedir="."> + + <description> + ${ant.project.name} + ${line.separator} + </description> + + <property name="version" value="1" /> + + <property name="deploy.dir" value="${basedir}/target/tests"/> + <property name="test.dir" value="${basedir}/src/test/resources/samples/${ant.project.name}" /> + + <property name="sample.jar.name" value="${ant.project.name}-${version}.jar" /> + + <target name="deploy"> + <echo>Deploy ${ant.project.name}</echo> + <mkdir dir="${deploy.dir}/${ant.project.name}" /> + <jar basedir="${test.dir}/bpel" destfile="${deploy.dir}/${ant.project.name}/${sample.jar.name}" /> + + <copy todir="${deploy.dir}/${ant.project.name}"> + <fileset dir="${test.dir}/messages"/> + </copy> + </target> + + <target name="undeploy"> + <echo>Undeploy ${ant.project.name}</echo> + <delete file="${deploy.dir}/${sample.jar.name}" /> + </target> + +</project> Added: branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/messages/sayHello_request1.xml =================================================================== --- branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/messages/sayHello_request1.xml (rev 0) +++ branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/messages/sayHello_request1.xml 2010-07-07 11:57:36 UTC (rev 842) @@ -0,0 +1,8 @@ +<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:exam="http://www.jboss.org/bpel/examples"> + <soapenv:Header/> + <soapenv:Body> + <exam:SayHelloRequest> + <exam:input>Dolly</exam:input> + </exam:SayHelloRequest> + </soapenv:Body> +</soapenv:Envelope> Added: branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/messages/sayHello_response1.xml =================================================================== --- branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/messages/sayHello_response1.xml (rev 0) +++ branches/RiftSaw-2.1.x/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/messages/sayHello_response1.xml 2010-07-07 11:57:36 UTC (rev 842) @@ -0,0 +1,3 @@ +<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'><env:... xmlns='http://www.jboss.org/bpel/examples'> + <tns:result xmlns:tns='http://www.jboss.org/bpel/examples'>Hello Dolly</tns:result> +</SayHelloResponse></env:Body></env:Envelope> \ No newline at end of file Modified: trunk/integration-tests/build.xml =================================================================== --- trunk/integration-tests/build.xml 2010-07-07 08:26:58 UTC (rev 841) +++ trunk/integration-tests/build.xml 2010-07-07 11:57:36 UTC (rev 842) @@ -131,6 +131,7 @@ <ant antfile="src/test/resources/samples/Quickstart_bpel_hello_world_extended_timeout/build.xml" /> <ant antfile="src/test/resources/samples/Quickstart_bpel_hello_world_header_ode/build.xml" /> <ant antfile="src/test/resources/samples/Quickstart_bpel_hello_world_header_wsdl/build.xml" /> + <ant antfile="src/test/resources/samples/Quickstart_bpel_say_hello/build.xml" /> <ant antfile="src/test/resources/samples/Quickstart_bpel_simple_correlation/build.xml" /> <ant antfile="src/test/resources/samples/Quickstart_bpel_simple_correlation_with_oneway/build.xml" /> <ant antfile="src/test/resources/samples/Quickstart_bpel_simple_invoke/build.xml" /> Modified: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/RiftSawTest.java =================================================================== --- trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/RiftSawTest.java 2010-07-07 08:26:58 UTC (rev 841) +++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/RiftSawTest.java 2010-07-07 11:57:36 UTC (rev 842) @@ -158,4 +158,20 @@ return(result); } + + protected String processResult(String result) { + // If testing against cxf, then result is presented slightly differently + if (result.indexOf("SOAP-ENV") != -1) { + result = result.replaceAll("SOAP-ENV", "env"); + result = result.replaceAll(" xmlns=\"\"",""); + result = result.replaceAll("\"","'"); + result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); + + result = result.replaceAll("<env:Fault>","<env:Fault xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>"); + result = result.replaceAll("ns0","valueNS"); + result = result.replaceAll("<faultstring>Fault string, and possibly fault code, not set</faultstring>",""); + } + + return(result); + } } Modified: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldExtendedTimeoutTestCase.java =================================================================== --- trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldExtendedTimeoutTestCase.java 2010-07-07 08:26:58 UTC (rev 841) +++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldExtendedTimeoutTestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -46,13 +46,7 @@ String result=sendSOAPMessage("hello_request1.xml", "http://localhost:8080/Quickstart_bpel_hello_world_extended_timeoutWS"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result = processResult(result); assertMessageFromFile(result, "hello_response1.xml"); } Modified: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldHeaderODETestCase.java =================================================================== --- trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldHeaderODETestCase.java 2010-07-07 08:26:58 UTC (rev 841) +++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldHeaderODETestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -46,12 +46,7 @@ String result=sendSOAPMessage("hello_request1.xml", "http://localhost:8080/Quickstart_bpel_hello_world_header_odeWS"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - } + result = processResult(result); // TODO: Commented out until fixed assertMessageFromFile(result, "hello_response1.xml"); Modified: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldHeaderWSDLTestCase.java =================================================================== --- trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldHeaderWSDLTestCase.java 2010-07-07 08:26:58 UTC (rev 841) +++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldHeaderWSDLTestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -47,12 +47,7 @@ String result=sendSOAPMessage("hello_request1.xml", "http://localhost:8080/Quickstart_bpel_hello_world_header_wsdlWS"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - } + result = processResult(result); assertMessageFromFile(result, "hello_response1.xml"); } Modified: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldTestCase.java =================================================================== --- trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldTestCase.java 2010-07-07 08:26:58 UTC (rev 841) +++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldTestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -46,13 +46,7 @@ String result=sendSOAPMessage("hello_request1.xml", "http://localhost:8080/Quickstart_bpel_hello_worldWS"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result = processResult(result); assertMessageFromFile(result, "hello_response1.xml"); } Modified: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELInvokeESBEBWSTestCase.java =================================================================== --- trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELInvokeESBEBWSTestCase.java 2010-07-07 08:26:58 UTC (rev 841) +++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELInvokeESBEBWSTestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -54,14 +54,8 @@ String result=sendSOAPMessage("approve_request1.xml", "http://localhost:8080/Quickstart_bpel_approval_serviceWS"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - } - + result = processResult(result); + assertMessageFromFile(result, "approve_response1.xml"); } } Modified: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELLoanApprovalTestCase.java =================================================================== --- trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELLoanApprovalTestCase.java 2010-07-07 08:26:58 UTC (rev 841) +++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELLoanApprovalTestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -46,13 +46,7 @@ String result=sendSOAPMessage("loanreq1.xml", "http://localhost:8080/Quickstart_bpel_loan_approvalWS"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result = processResult(result); assertMessageFromFile(result, "loanresp1.xml"); } @@ -61,13 +55,7 @@ String result=sendSOAPMessage("loanreq2.xml", "http://localhost:8080/Quickstart_bpel_loan_approvalWS"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result = processResult(result); assertMessageFromFile(result, "loanresp2.xml"); } Added: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSayHelloTestCase.java =================================================================== --- trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSayHelloTestCase.java (rev 0) +++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSayHelloTestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -0,0 +1,53 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.soa.bpel.tests.samples; + +import org.jboss.soa.bpel.tests.RiftSawTest; +import org.jboss.soa.bpel.tests.RiftSawTestSetup; + +import junit.framework.Test; + +/** + * Test case for running the Quickstart_bpel_say_hello sample. + */ +public class QuickstartBPELSayHelloTestCase extends RiftSawTest { + + private static final String TEST_NAME = "Quickstart_bpel_say_hello"; + + public QuickstartBPELSayHelloTestCase() { + super(TEST_NAME); + } + + public static Test suite() { + return(new RiftSawTestSetup(QuickstartBPELSayHelloTestCase.class, + TEST_NAME, "Quickstart_bpel_say_hello-1.jar")); + } + + public void testSendHello() throws Exception { + String result=sendSOAPMessage("sayHello_request1.xml", + "http://localhost:8080/SayHelloProcess"); + + result = processResult(result); + + assertMessageFromFile(result, "sayHello_response1.xml"); + } +} Modified: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSecureInvokeTestCase.java =================================================================== --- trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSecureInvokeTestCase.java 2010-07-07 08:26:58 UTC (rev 841) +++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSecureInvokeTestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -54,13 +54,7 @@ String result=sendSOAPMessage("hello_request1.xml", "http://localhost:8080/Quickstart_bpel_secure_invokeWS"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result = processResult(result); assertMessageFromFile(result, "hello_response1.xml"); } Modified: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSimpleCorrelationTestCase.java =================================================================== --- trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSimpleCorrelationTestCase.java 2010-07-07 08:26:58 UTC (rev 841) +++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSimpleCorrelationTestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -58,26 +58,14 @@ String result1=sendSOAPMessage("hello_request1.xml", "http://localhost:8080/Quickstart_bpel_simple_correlationWS"); - // If testing against cxf, then result is presented slightly differently - if (result1.indexOf("SOAP-ENV") != -1) { - result1 = result1.replaceAll("SOAP-ENV", "env"); - result1 = result1.replaceAll(" xmlns=\"\"",""); - result1 = result1.replaceAll("\"","'"); - result1 = result1.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result1 = processResult(result1); assertMessageFromFile(result1, "hello_response1.xml"); String result2=sendSOAPMessage("goodbye_request1.xml", "http://localhost:8080/Quickstart_bpel_simple_correlationWS"); - // If testing against cxf, then result is presented slightly differently - if (result2.indexOf("SOAP-ENV") != -1) { - result2 = result2.replaceAll("SOAP-ENV", "env"); - result2 = result2.replaceAll(" xmlns=\"\"",""); - result2 = result2.replaceAll("\"","'"); - result2 = result2.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result2 = processResult(result2); assertMessageFromFile(result2, "goodbye_response1.xml"); } Modified: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSimpleCorrelationWithOneWayTestCase.java =================================================================== --- trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSimpleCorrelationWithOneWayTestCase.java 2010-07-07 08:26:58 UTC (rev 841) +++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSimpleCorrelationWithOneWayTestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -58,13 +58,7 @@ String result2=sendSOAPMessage("goodbye_request1.xml", "http://localhost:8080/Quickstart_bpel_simple_correlation_onewayWS"); - // If testing against cxf, then result is presented slightly differently - if (result2.indexOf("SOAP-ENV") != -1) { - result2 = result2.replaceAll("SOAP-ENV", "env"); - result2 = result2.replaceAll(" xmlns=\"\"",""); - result2 = result2.replaceAll("\"","'"); - result2 = result2.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result2 = processResult(result2); assertMessageFromFile(result2, "goodbye_response1.xml"); } Modified: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSimpleInvokeTestCase.java =================================================================== --- trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSimpleInvokeTestCase.java 2010-07-07 08:26:58 UTC (rev 841) +++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSimpleInvokeTestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -46,13 +46,7 @@ String result=sendSOAPMessage("hello_request1.xml", "http://localhost:8080/Quickstart_bpel_simple_invokeWS"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result = processResult(result); assertMessageFromFile(result, "hello_response1.xml"); } Modified: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSimplePickTestCase.java =================================================================== --- trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSimplePickTestCase.java 2010-07-07 08:26:58 UTC (rev 841) +++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSimplePickTestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -46,26 +46,14 @@ String result1=sendSOAPMessage("hello_request1.xml", "http://localhost:8080/Quickstart_bpel_simple_pickWS"); - // If testing against cxf, then result is presented slightly differently - if (result1.indexOf("SOAP-ENV") != -1) { - result1 = result1.replaceAll("SOAP-ENV", "env"); - result1 = result1.replaceAll(" xmlns=\"\"",""); - result1 = result1.replaceAll("\"","'"); - result1 = result1.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result1 = processResult(result1); assertMessageFromFile(result1, "hello_response1.xml"); String result2=sendSOAPMessage("hello_request1.xml", "http://localhost:8080/Quickstart_bpel_simple_pickWS"); - // If testing against cxf, then result is presented slightly differently - if (result2.indexOf("SOAP-ENV") != -1) { - result2 = result2.replaceAll("SOAP-ENV", "env"); - result2 = result2.replaceAll(" xmlns=\"\"",""); - result2 = result2.replaceAll("\"","'"); - result2 = result2.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result2 = processResult(result2); assertMessageFromFile(result2, "hello_response1.xml"); } @@ -74,26 +62,14 @@ String result1=sendSOAPMessage("goodbye_request1.xml", "http://localhost:8080/Quickstart_bpel_simple_pickWS"); - // If testing against cxf, then result is presented slightly differently - if (result1.indexOf("SOAP-ENV") != -1) { - result1 = result1.replaceAll("SOAP-ENV", "env"); - result1 = result1.replaceAll(" xmlns=\"\"",""); - result1 = result1.replaceAll("\"","'"); - result1 = result1.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result1 = processResult(result1); assertMessageFromFile(result1, "goodbye_response1.xml"); String result2=sendSOAPMessage("hello_request1.xml", "http://localhost:8080/Quickstart_bpel_simple_pickWS"); - // If testing against cxf, then result is presented slightly differently - if (result2.indexOf("SOAP-ENV") != -1) { - result2 = result2.replaceAll("SOAP-ENV", "env"); - result2 = result2.replaceAll(" xmlns=\"\"",""); - result2 = result2.replaceAll("\"","'"); - result2 = result2.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result2 = processResult(result2); assertMessageFromFile(result2, "hello_response1.xml"); } Modified: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartSimpleESBProxyInvoke2TestCase.java =================================================================== --- trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartSimpleESBProxyInvoke2TestCase.java 2010-07-07 08:26:58 UTC (rev 841) +++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartSimpleESBProxyInvoke2TestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -54,14 +54,8 @@ String result=sendSOAPMessage("hello_request1.xml", "http://localhost:8080/Quickstart_bpel_simple_invokeWS"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - } - + result = processResult(result); + assertMessageFromFile(result, "hello_response1.xml"); } } Modified: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartSimpleESBProxyInvokeTestCase.java =================================================================== --- trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartSimpleESBProxyInvokeTestCase.java 2010-07-07 08:26:58 UTC (rev 841) +++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartSimpleESBProxyInvokeTestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -54,13 +54,7 @@ String result=sendSOAPMessage("hello_request1.xml", "http://localhost:8080/Quickstart_bpel_simple_invokeWS"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result = processResult(result); assertMessageFromFile(result, "hello_response1.xml"); } Modified: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw118TestCase.java =================================================================== --- trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw118TestCase.java 2010-07-07 08:26:58 UTC (rev 841) +++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw118TestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -46,13 +46,7 @@ String result=sendSOAPMessage("hello_request1.xml", "http://localhost:8080/RiftSaw_118WS"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result = processResult(result); // Comment out until RIFTSAW-118 is fixed assertMessageFromFile(result, "hello_response1.xml"); Modified: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw163TestCase.java =================================================================== --- trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw163TestCase.java 2010-07-07 08:26:58 UTC (rev 841) +++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw163TestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -46,13 +46,7 @@ String result=sendSOAPMessage("hello_request1.xml", "http://localhost:8080/RiftSaw_163WS"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result = processResult(result); // Comment out until RIFTSAW-118 is fixed assertMessageFromFile(result, "hello_response1.xml"); Modified: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw209TestCase.java =================================================================== --- trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw209TestCase.java 2010-07-07 08:26:58 UTC (rev 841) +++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw209TestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -46,13 +46,7 @@ String result=sendSOAPMessage("hello_request1.xml", "http://localhost:8080/RiftSaw_209WS"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result = processResult(result); assertMessageFromFile(result, "hello_response1.xml"); } Modified: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw70TestCase.java =================================================================== --- trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw70TestCase.java 2010-07-07 08:26:58 UTC (rev 841) +++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw70TestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -46,13 +46,7 @@ String result=sendSOAPMessage("hello_request1.xml", "http://localhost:8080/RiftSaw_70WS"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result = processResult(result); result = result.replaceAll(" xmlns:pol='http://www.example.org/policyQuote'>";, ">"); Modified: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint1/BluePrint1TestCase.java =================================================================== --- trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint1/BluePrint1TestCase.java 2010-07-07 08:26:58 UTC (rev 841) +++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint1/BluePrint1TestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -30,13 +30,7 @@ String result=sendSOAPMessage("valid.xml", "http://localhost:8080/BPEL_BluePrint1_PurchaseOrderService"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result = processResult(result); assertMessageFromFile(result, "valid_response.xml"); } @@ -45,16 +39,7 @@ String result=sendSOAPMessage("invalid.xml", "http://localhost:8080/BPEL_BluePrint1_PurchaseOrderService"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - result = result.replaceAll("<env:Fault>","<env:Fault xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>"); - result = result.replaceAll("ns0","valueNS"); - result = result.replaceAll("<faultstring>Fault string, and possibly fault code, not set</faultstring>",""); - } + result = processResult(result); assertMessageFromFile(result, "invalid_response.xml"); } Modified: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint2/BluePrint2TestCase.java =================================================================== --- trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint2/BluePrint2TestCase.java 2010-07-07 08:26:58 UTC (rev 841) +++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint2/BluePrint2TestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -30,13 +30,7 @@ String result=sendSOAPMessage("valid.xml", "http://localhost:8080/BPEL_BluePrint2_PurchaseOrderService"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result = processResult(result); assertMessageFromFile(result, "valid_response.xml"); } @@ -45,16 +39,7 @@ String result=sendSOAPMessage("invalid.xml", "http://localhost:8080/BPEL_BluePrint2_PurchaseOrderService"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - result = result.replaceAll("<env:Fault>","<env:Fault xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>"); - result = result.replaceAll("ns0","valueNS"); - result = result.replaceAll("<faultstring>Fault string, and possibly fault code, not set</faultstring>",""); - } + result = processResult(result); assertMessageFromFile(result, "invalid_response.xml"); } @@ -63,16 +48,7 @@ String result=sendSOAPMessage("timeout.xml", "http://localhost:8080/BPEL_BluePrint2_PurchaseOrderService"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - result = result.replaceAll("<env:Fault>","<env:Fault xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>"); - result = result.replaceAll("ns0","valueNS"); - result = result.replaceAll("<faultstring>Fault string, and possibly fault code, not set</faultstring>",""); - } + result = processResult(result); assertMessageFromFile(result, "timeout_response.xml"); } Modified: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint3/BluePrint3TestCase.java =================================================================== --- trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint3/BluePrint3TestCase.java 2010-07-07 08:26:58 UTC (rev 841) +++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint3/BluePrint3TestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -30,13 +30,7 @@ String result=sendSOAPMessage("valid.xml", "http://localhost:8080/BPEL_BluePrint3_PurchaseOrderService"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result = processResult(result); assertMessageFromFile(result, "valid_response.xml"); } @@ -45,16 +39,7 @@ String result=sendSOAPMessage("invalid.xml", "http://localhost:8080/BPEL_BluePrint3_PurchaseOrderService"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - result = result.replaceAll("<env:Fault>","<env:Fault xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>"); - result = result.replaceAll("ns0","valueNS"); - result = result.replaceAll("<faultstring>Fault string, and possibly fault code, not set</faultstring>",""); - } + result = processResult(result); assertMessageFromFile(result, "invalid_response.xml"); } @@ -63,16 +48,7 @@ String result=sendSOAPMessage("throw_po_fault.xml", "http://localhost:8080/BPEL_BluePrint3_PurchaseOrderService"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - result = result.replaceAll("<env:Fault>","<env:Fault xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>"); - result = result.replaceAll("ns0","valueNS"); - result = result.replaceAll("<faultstring>Fault string, and possibly fault code, not set</faultstring>",""); - } + result = processResult(result); assertMessageFromFile(result, "throw_po_fault_response.xml"); } @@ -83,16 +59,11 @@ // If testing against cxf, then result is presented slightly differently if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - result = result.replaceAll("<env:Fault>","<env:Fault xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>"); - result = result.replaceAll("ns0","valueNS"); - result = result.replaceAll("<faultstring>Fault string, and possibly fault code, not set</faultstring>",""); result = result.replaceAll("<tns:FaultCode xmlns:tns='http://manufacturing.org/xsd/inventory' />","<tns:FaultCode xmlns:tns='http://manufacturing.org/xsd/inventory'/>"); } + result = processResult(result); + assertMessageFromFile(result, "throw_inv_fault_response.xml"); } Modified: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint4/BluePrint4TestCase.java =================================================================== --- trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint4/BluePrint4TestCase.java 2010-07-07 08:26:58 UTC (rev 841) +++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint4/BluePrint4TestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -30,13 +30,7 @@ String result=sendSOAPMessage("valid.xml", "http://localhost:8080/BPEL_BluePrint4_PurchaseOrderService"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result = processResult(result); assertMessageFromFile(result, "valid_response.xml"); } @@ -47,16 +41,11 @@ // If testing against cxf, then result is presented slightly differently if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - result = result.replaceAll("<env:Fault>","<env:Fault xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>"); - result = result.replaceAll("ns0","valueNS"); - result = result.replaceAll("<faultstring>Fault string, and possibly fault code, not set</faultstring>",""); result = result.replaceAll("<tns:FaultCode xmlns:tns='http://manufacturing.org/xsd/purchase' />","<tns:FaultCode xmlns:tns='http://manufacturing.org/xsd/purchase'/>"); } + result = processResult(result); + assertMessageFromFile(result, "invalid_response.xml"); } Modified: trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint5/BluePrint5TestCase.java =================================================================== --- trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint5/BluePrint5TestCase.java 2010-07-07 08:26:58 UTC (rev 841) +++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint5/BluePrint5TestCase.java 2010-07-07 11:57:36 UTC (rev 842) @@ -30,13 +30,7 @@ String result=sendSOAPMessage("book_airline.xml", "http://localhost:8080/BPEL_BluePrint5_ReservationService"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result = processResult(result); assertMessageFromFile(result, "book_airline_response.xml"); } @@ -45,13 +39,7 @@ String result=sendSOAPMessage("book_car.xml", "http://localhost:8080/BPEL_BluePrint5_ReservationService"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result = processResult(result); assertMessageFromFile(result, "book_car_response.xml"); } @@ -60,13 +48,7 @@ String result=sendSOAPMessage("book_hotel.xml", "http://localhost:8080/BPEL_BluePrint5_ReservationService"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result = processResult(result); assertMessageFromFile(result, "book_hotel_response.xml"); } @@ -75,13 +57,7 @@ String result=sendSOAPMessage("book_all.xml", "http://localhost:8080/BPEL_BluePrint5_ReservationService"); - // If testing against cxf, then result is presented slightly differently - if (result.indexOf("SOAP-ENV") != -1) { - result = result.replaceAll("SOAP-ENV", "env"); - result = result.replaceAll(" xmlns=\"\"",""); - result = result.replaceAll("\"","'"); - result = result.replaceAll("<env:Header />","<env:Header></env:Header>"); - } + result = processResult(result); assertMessageFromFile(result, "book_all_response.xml"); } Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/bpel/SayHello.bpel =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/bpel/SayHello.bpel (rev 0) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/bpel/SayHello.bpel 2010-07-07 11:57:36 UTC (rev 842) @@ -0,0 +1,81 @@ +<!-- HelloWorld BPEL Process [Generated by the Eclipse BPEL Designer] --> +<bpel:process name="HelloWorld" + targetNamespace="http://www.jboss.org/bpel/examples" + suppressJoinFailure="yes" + xmlns:tns="http://www.jboss.org/bpel/examples" + xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable... + > + + <!-- Import the client WSDL --> + <bpel:import location="SayHelloArtifacts.wsdl" namespace="http://www.jboss.org/bpel/examples" + importType="http://schemas.xmlsoap.org/wsdl/" /> + + <!-- ================================================================= --> + <!-- PARTNERLINKS --> + <!-- List of services participating in this BPEL process --> + <!-- ================================================================= --> + <bpel:partnerLinks> + <!-- The 'client' role represents the requester of this service. --> + <bpel:partnerLink name="client" + partnerLinkType="tns:SayHello" + myRole="SayHelloProvider" + /> + </bpel:partnerLinks> + + <!-- ================================================================= --> + <!-- VARIABLES --> + <!-- List of messages and XML documents used within this BPEL process --> + <!-- ================================================================= --> + <bpel:variables> + <!-- Reference to the message passed as input during initiation --> + <bpel:variable name="ReceiveSayHelloVar" + messageType="tns:SayHelloRequestMessage"/> + + <!-- + Reference to the message that will be returned to the requester + --> + <bpel:variable name="ReplySayHelloVar" + messageType="tns:SayHelloResponseMessage"/> + </bpel:variables> + + <!-- ================================================================= --> + <!-- ORCHESTRATION LOGIC --> + <!-- Set of activities coordinating the flow of messages across the --> + <!-- services integrated within this business process --> + <!-- ================================================================= --> + <bpel:sequence name="main"> + + <!-- Receive input from requester. + Note: This maps to operation defined in HelloWorld.wsdl + --> + <bpel:receive name="ReceiveSayHello" partnerLink="client" + portType="tns:SayHello" + operation="sayHello" variable="ReceiveSayHelloVar" + createInstance="yes"/> + + <!-- Generate reply to synchronous request --> + <bpel:assign validate="no" name="AssignName"> + <bpel:copy> + <bpel:from><bpel:literal><tns:HelloWorldResponse xmlns:tns="http://www.jboss.org/bpel/examples" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <tns:result></tns:result> +</tns:HelloWorldResponse> +</bpel:literal></bpel:from> + <bpel:to variable="ReplySayHelloVar" part="parameters"></bpel:to> + </bpel:copy> + <bpel:copy> + <bpel:from> + <![CDATA[concat('Hello ', $ReceiveSayHelloVar.parameters/tns:input)]]> + </bpel:from> + <bpel:to part="parameters" variable="ReplySayHelloVar"> + <bpel:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath1.0"><![CDATA[tns:result]]></bpel:query> + </bpel:to> + </bpel:copy> + </bpel:assign> + <bpel:reply name="ReplySayHello" + partnerLink="client" + portType="tns:SayHello" + operation="sayHello" + variable="ReplySayHelloVar" + /> + </bpel:sequence> +</bpel:process> \ No newline at end of file Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/bpel/SayHelloArtifacts.wsdl =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/bpel/SayHelloArtifacts.wsdl (rev 0) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/bpel/SayHelloArtifacts.wsdl 2010-07-07 11:57:36 UTC (rev 842) @@ -0,0 +1,90 @@ +<?xml version="1.0"?> +<definitions name="SayHello" + targetNamespace="http://www.jboss.org/bpel/examples" + xmlns:tns="http://www.jboss.org/bpel/examples" + xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype" + xmlns="http://schemas.xmlsoap.org/wsdl/" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"> + +<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + TYPE DEFINITION - List of types participating in this BPEL process + The BPEL Designer will generate default request and response types + but you can define or import any XML Schema type and use them as part + of the message types. + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --> + <types> + <schema attributeFormDefault="unqualified" elementFormDefault="qualified" + targetNamespace="http://www.jboss.org/bpel/examples" + xmlns="http://www.w3.org/2001/XMLSchema"> + + <element name="SayHelloRequest"> + <complexType> + <sequence> + <element name="input" type="string"/> + </sequence> + </complexType> + </element> + + <element name="SayHelloResponse"> + <complexType> + <sequence> + <element name="result" type="string"/> + </sequence> + </complexType> + </element> + </schema> + </types> + + +<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + MESSAGE TYPE DEFINITION - Definition of the message types used as + part of the port type defintions + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --> + <message name="SayHelloRequestMessage"> + <part name="parameters" element="tns:SayHelloRequest"/> + </message> + <message name="SayHelloResponseMessage"> + <part name="parameters" element="tns:SayHelloResponse"/> + </message> + +<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + PORT TYPE DEFINITION - A port type groups a set of operations into + a logical service unit. + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --> + + <!-- portType implemented by the HelloWorld BPEL process --> + <portType name="SayHello"> + <operation name="sayHello"> + <input message="tns:SayHelloRequestMessage" /> + <output message="tns:SayHelloResponseMessage"/> + </operation> + </portType> + + +<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + PARTNER LINK TYPE DEFINITION + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --> + <plnk:partnerLinkType name="SayHello"> + <plnk:role name="SayHelloProvider" portType="tns:SayHello"/> + </plnk:partnerLinkType> + + <binding name="SayHelloBinding" type="tns:SayHello"> + <soap:binding style="document" + transport="http://schemas.xmlsoap.org/soap/http" /> + <operation name="sayHello"> + <soap:operation + soapAction="http://www.jboss.org/bpel/examples/sayHello" /> + <input> + <soap:body use="literal" /> + </input> + <output> + <soap:body use="literal" /> + </output> + </operation> + </binding> + <service name="SayHelloService"> + <port name="SayHelloPort" binding="tns:SayHelloBinding"> + <soap:address location="http://localhost:8080/SayHelloProcess" /> + </port> + </service> +</definitions> Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/bpel/bpel-deploy.xml =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/bpel/bpel-deploy.xml (rev 0) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/bpel/bpel-deploy.xml 2010-07-07 11:57:36 UTC (rev 842) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<deploy xmlns="http://www.apache.org/ode/schemas/dd/2007/03" xmlns:examples="http://www.jboss.org/bpel/examples"> + <process name="examples:HelloWorld"> + <active>true</active> + <retired>false</retired> + <process-events generate="all"/> + <provide partnerLink="client"> + <service name="examples:SayHelloService" port="SayHelloPort"/> + </provide> + </process> +</deploy> \ No newline at end of file Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/build.xml =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/build.xml (rev 0) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/build.xml 2010-07-07 11:57:36 UTC (rev 842) @@ -0,0 +1,30 @@ +<project name="Quickstart_bpel_say_hello" default="deploy" basedir="."> + + <description> + ${ant.project.name} + ${line.separator} + </description> + + <property name="version" value="1" /> + + <property name="deploy.dir" value="${basedir}/target/tests"/> + <property name="test.dir" value="${basedir}/src/test/resources/samples/${ant.project.name}" /> + + <property name="sample.jar.name" value="${ant.project.name}-${version}.jar" /> + + <target name="deploy"> + <echo>Deploy ${ant.project.name}</echo> + <mkdir dir="${deploy.dir}/${ant.project.name}" /> + <jar basedir="${test.dir}/bpel" destfile="${deploy.dir}/${ant.project.name}/${sample.jar.name}" /> + + <copy todir="${deploy.dir}/${ant.project.name}"> + <fileset dir="${test.dir}/messages"/> + </copy> + </target> + + <target name="undeploy"> + <echo>Undeploy ${ant.project.name}</echo> + <delete file="${deploy.dir}/${sample.jar.name}" /> + </target> + +</project> Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/messages/sayHello_request1.xml =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/messages/sayHello_request1.xml (rev 0) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/messages/sayHello_request1.xml 2010-07-07 11:57:36 UTC (rev 842) @@ -0,0 +1,8 @@ +<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:exam="http://www.jboss.org/bpel/examples"> + <soapenv:Header/> + <soapenv:Body> + <exam:SayHelloRequest> + <exam:input>Dolly</exam:input> + </exam:SayHelloRequest> + </soapenv:Body> +</soapenv:Envelope> Added: trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/messages/sayHello_response1.xml =================================================================== --- trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/messages/sayHello_response1.xml (rev 0) +++ trunk/integration-tests/src/test/resources/samples/Quickstart_bpel_say_hello/messages/sayHello_response1.xml 2010-07-07 11:57:36 UTC (rev 842) @@ -0,0 +1,3 @@ +<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'><env:... xmlns='http://www.jboss.org/bpel/examples'> + <tns:result xmlns:tns='http://www.jboss.org/bpel/examples'>Hello Dolly</tns:result> +</SayHelloResponse></env:Body></env:Envelope> \ No newline at end of file