[riftsaw-commits] riftsaw SVN: r495 - in trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests: testcases and 1 other directory.

Author: objectiser Date: 2010-02-11 06:27:57 -0500 (Thu, 11 Feb 2010) New Revision: 495 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/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/QuickstartBPELSimplePickTestCase.java trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw118TestCase.java Log: Updated integration tests to cope with the slightly different format of the messages when using CXF. Currently doing this work in each test, rather than in the message verification code, to make it explicit that this is happening. Later might want to move into the common code, or find a DOM comparison utility that can compare the messages to the necessary level of detail. 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-02-10 18:29:21 UTC (rev 494) +++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldExtendedTimeoutTestCase.java 2010-02-11 11:27:57 UTC (rev 495) @@ -46,6 +46,14 @@ 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>"); + } + 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-02-10 18:29:21 UTC (rev 494) +++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldHeaderWSDLTestCase.java 2010-02-11 11:27:57 UTC (rev 495) @@ -47,6 +47,13 @@ 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("\"","'"); + } + 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-02-10 18:29:21 UTC (rev 494) +++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELHelloWorldTestCase.java 2010-02-11 11:27:57 UTC (rev 495) @@ -46,6 +46,14 @@ 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>"); + } + 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-02-10 18:29:21 UTC (rev 494) +++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/samples/QuickstartBPELSimplePickTestCase.java 2010-02-11 11:27:57 UTC (rev 495) @@ -46,11 +46,27 @@ 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>"); + } + 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>"); + } + assertMessageFromFile(result2, "hello_response1.xml"); } @@ -58,11 +74,27 @@ 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>"); + } + 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>"); + } + assertMessageFromFile(result2, "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-02-10 18:29:21 UTC (rev 494) +++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/testcases/RiftSaw118TestCase.java 2010-02-11 11:27:57 UTC (rev 495) @@ -46,6 +46,14 @@ 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>"); + } + // Comment out until RIFTSAW-118 is fixed assertMessageFromFile(result, "hello_response1.xml"); }