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

Author: objectiser Date: 2010-07-07 10:37:19 -0400 (Wed, 07 Jul 2010) New Revision: 843 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/BluePrint4/BluePrint4TestCase.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 Log: Fix test failures when running with cxf ws stack. 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 11:57:36 UTC (rev 842) +++ branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint3/BluePrint3TestCase.java 2010-07-07 14:37:19 UTC (rev 843) @@ -59,11 +59,11 @@ // If testing against cxf, then result is presented slightly differently if (result.indexOf("SOAP-ENV") != -1) { + result = processResult(result); + 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 11:57:36 UTC (rev 842) +++ branches/RiftSaw-2.1.x/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint4/BluePrint4TestCase.java 2010-07-07 14:37:19 UTC (rev 843) @@ -41,11 +41,11 @@ // If testing against cxf, then result is presented slightly differently if (result.indexOf("SOAP-ENV") != -1) { + result = processResult(result); + 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/BluePrint3/BluePrint3TestCase.java =================================================================== --- trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint3/BluePrint3TestCase.java 2010-07-07 11:57:36 UTC (rev 842) +++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint3/BluePrint3TestCase.java 2010-07-07 14:37:19 UTC (rev 843) @@ -59,11 +59,11 @@ // If testing against cxf, then result is presented slightly differently if (result.indexOf("SOAP-ENV") != -1) { + result = processResult(result); + 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 11:57:36 UTC (rev 842) +++ trunk/integration-tests/src/test/java/org/jboss/soa/bpel/tests/tutorials/BluePrint4/BluePrint4TestCase.java 2010-07-07 14:37:19 UTC (rev 843) @@ -41,11 +41,11 @@ // If testing against cxf, then result is presented slightly differently if (result.indexOf("SOAP-ENV") != -1) { + result = processResult(result); + 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"); }