Updated Branches: refs/heads/ode-1.3.6.x e25937516 -> f82a7be50
Fix for failing tests contributed by tammo Project: http://git-wip-us.apache.org/repos/asf/ode/repo Commit: http://git-wip-us.apache.org/repos/asf/ode/commit/f82a7be5 Tree: http://git-wip-us.apache.org/repos/asf/ode/tree/f82a7be5 Diff: http://git-wip-us.apache.org/repos/asf/ode/diff/f82a7be5 Branch: refs/heads/ode-1.3.6.x Commit: f82a7be507de731b21d149b0c81dd6d0592d531c Parents: e259375 Author: sathwik <[email protected]> Authored: Mon Jun 17 19:02:19 2013 +0530 Committer: sathwik <[email protected]> Committed: Mon Jun 17 19:02:19 2013 +0530 ---------------------------------------------------------------------- .../src/test/java/org/apache/ode/axis2/SoapHeader2Test.java | 4 ++-- .../org/apache/ode/axis2/rampart/basic/SecuredProcessesTest.java | 2 +- .../org/apache/ode/axis2/rampart/basic/SecuredServicesTest.java | 2 +- .../apache/ode/axis2/rampart/policy/SecuredProcessesTest.java | 2 +- .../org/apache/ode/axis2/rampart/policy/SecuredServicesTest.java | 2 +- .../resources/TestHttpBindingExt_POST/http-binding-ext-POST.bpel | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ode/blob/f82a7be5/axis2-war/src/test/java/org/apache/ode/axis2/SoapHeader2Test.java ---------------------------------------------------------------------- diff --git a/axis2-war/src/test/java/org/apache/ode/axis2/SoapHeader2Test.java b/axis2-war/src/test/java/org/apache/ode/axis2/SoapHeader2Test.java index 06c3005..6e4f837 100644 --- a/axis2-war/src/test/java/org/apache/ode/axis2/SoapHeader2Test.java +++ b/axis2-war/src/test/java/org/apache/ode/axis2/SoapHeader2Test.java @@ -73,8 +73,8 @@ public class SoapHeader2Test extends Axis2TestBase { boolean header1found = false, header2found = false; String line; while ((line = request.getReader().readLine()) != null && (!header1found || !header2found)) { - header1found = header1found || line.matches(".*header1-field1>Hello from TestSoapHeader2.*"); - header2found = header2found || line.matches(".*header2-field1>Hello from TestSoapHeader2.*"); + header1found = header1found || line.matches(".*header1-field1.*Hello from TestSoapHeader2.*header1-field1>"); + header2found = header2found || line.matches(".*header2-field1.*Hello from TestSoapHeader2.*header2-field1>"); } response.getOutputStream().print("<soapenv:Envelope xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\"; xmlns:unit=\"http://ode/bpel/unit-test.wsdl\";>\n" + " <soapenv:Header/>\n" + http://git-wip-us.apache.org/repos/asf/ode/blob/f82a7be5/axis2-war/src/test/java/org/apache/ode/axis2/rampart/basic/SecuredProcessesTest.java ---------------------------------------------------------------------- diff --git a/axis2-war/src/test/java/org/apache/ode/axis2/rampart/basic/SecuredProcessesTest.java b/axis2-war/src/test/java/org/apache/ode/axis2/rampart/basic/SecuredProcessesTest.java index a5af686..7764e25 100644 --- a/axis2-war/src/test/java/org/apache/ode/axis2/rampart/basic/SecuredProcessesTest.java +++ b/axis2-war/src/test/java/org/apache/ode/axis2/rampart/basic/SecuredProcessesTest.java @@ -97,7 +97,7 @@ public class SecuredProcessesTest extends Axis2TestBase { System.out.println(response); System.out.println(response); - assertTrue(response.contains("<helloResponse") && response.contains("Hello " + bundleName + "!")); + assertTrue("'" + response + "' didn't contain expected content.", response.contains("helloResponse") && response.contains("Hello " + bundleName + "!")); } finally { server.undeployProcess(bundleName); } http://git-wip-us.apache.org/repos/asf/ode/blob/f82a7be5/axis2-war/src/test/java/org/apache/ode/axis2/rampart/basic/SecuredServicesTest.java ---------------------------------------------------------------------- diff --git a/axis2-war/src/test/java/org/apache/ode/axis2/rampart/basic/SecuredServicesTest.java b/axis2-war/src/test/java/org/apache/ode/axis2/rampart/basic/SecuredServicesTest.java index 82cf5f1..0cc1bc1 100644 --- a/axis2-war/src/test/java/org/apache/ode/axis2/rampart/basic/SecuredServicesTest.java +++ b/axis2-war/src/test/java/org/apache/ode/axis2/rampart/basic/SecuredServicesTest.java @@ -79,7 +79,7 @@ public class SecuredServicesTest extends Axis2TestBase { String response = server.sendRequestFile("http://localhost:8888/processes/helloWorld";, bundleName, "testRequest.soap"); System.out.println(response); - assertTrue(response.contains("helloResponse") && response.contains("Hello World")); + assertTrue("'" + response + "' didn't contain expected content.", response.contains("helloResponse") && response.contains("Hello World")); } finally { server.undeployProcess(bundleName); } http://git-wip-us.apache.org/repos/asf/ode/blob/f82a7be5/axis2-war/src/test/java/org/apache/ode/axis2/rampart/policy/SecuredProcessesTest.java ---------------------------------------------------------------------- diff --git a/axis2-war/src/test/java/org/apache/ode/axis2/rampart/policy/SecuredProcessesTest.java b/axis2-war/src/test/java/org/apache/ode/axis2/rampart/policy/SecuredProcessesTest.java index f528e2d..9535b3a 100644 --- a/axis2-war/src/test/java/org/apache/ode/axis2/rampart/policy/SecuredProcessesTest.java +++ b/axis2-war/src/test/java/org/apache/ode/axis2/rampart/policy/SecuredProcessesTest.java @@ -108,7 +108,7 @@ public class SecuredProcessesTest extends Axis2TestBase { System.out.println(response); System.out.println(response); - assertTrue(response.contains("<helloResponse") && response.contains("Hello " + bundleName + "!")); + assertTrue("'" + response + "' didn't contain expected content.", response.contains("helloResponse") && response.contains("Hello " + bundleName + "!")); } finally { server.undeployProcess(bundleName); } http://git-wip-us.apache.org/repos/asf/ode/blob/f82a7be5/axis2-war/src/test/java/org/apache/ode/axis2/rampart/policy/SecuredServicesTest.java ---------------------------------------------------------------------- diff --git a/axis2-war/src/test/java/org/apache/ode/axis2/rampart/policy/SecuredServicesTest.java b/axis2-war/src/test/java/org/apache/ode/axis2/rampart/policy/SecuredServicesTest.java index 5340df3..82b9c27 100644 --- a/axis2-war/src/test/java/org/apache/ode/axis2/rampart/policy/SecuredServicesTest.java +++ b/axis2-war/src/test/java/org/apache/ode/axis2/rampart/policy/SecuredServicesTest.java @@ -73,7 +73,7 @@ public class SecuredServicesTest extends Axis2TestBase { String response = server.sendRequestFile("http://localhost:8888/processes/helloWorld";, bundleName, "testRequest.soap"); System.out.println(response); - assertTrue(response.contains("helloResponse") && response.contains("Hello World")); + assertTrue("'" + response + "' didn't contain expected content.", response.contains("helloResponse") && response.contains("Hello World")); } finally { server.undeployProcess(bundleName); } http://git-wip-us.apache.org/repos/asf/ode/blob/f82a7be5/axis2-war/src/test/resources/TestHttpBindingExt_POST/http-binding-ext-POST.bpel ---------------------------------------------------------------------- diff --git a/axis2-war/src/test/resources/TestHttpBindingExt_POST/http-binding-ext-POST.bpel b/axis2-war/src/test/resources/TestHttpBindingExt_POST/http-binding-ext-POST.bpel index 801c778..a7898be 100644 --- a/axis2-war/src/test/resources/TestHttpBindingExt_POST/http-binding-ext-POST.bpel +++ b/axis2-war/src/test/resources/TestHttpBindingExt_POST/http-binding-ext-POST.bpel @@ -68,12 +68,12 @@ </copy> <copy> <from> - <litteral> + <literal> <dummy:comment> <dummy:author>Voltaire</dummy:author> <dummy:content>When it is a question of money, everybody is of the same religion.</dummy:content> </dummy:comment> - </litteral> + </literal> </from> <to>$commentMsg.comment</to> </copy>
