Updated Branches: refs/heads/master fdc485544 -> 206626dce
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/206626dc Tree: http://git-wip-us.apache.org/repos/asf/ode/tree/206626dc Diff: http://git-wip-us.apache.org/repos/asf/ode/diff/206626dc Branch: refs/heads/master Commit: 206626dced4587f306809859175aa1c1e7dc917e Parents: fdc4855 Author: sathwik <[email protected]> Authored: Mon Jun 17 15:34:43 2013 +0530 Committer: sathwik <[email protected]> Committed: Mon Jun 17 15:34:43 2013 +0530 ---------------------------------------------------------------------- Rakefile | 36 +------------------- .../org/apache/ode/axis2/SoapHeader2Test.java | 6 ++-- .../rampart/basic/SecuredProcessesTest.java | 2 +- .../rampart/basic/SecuredServicesTest.java | 2 +- .../rampart/policy/SecuredProcessesTest.java | 2 +- .../rampart/policy/SecuredServicesTest.java | 2 +- .../http-binding-ext-POST.bpel | 4 +-- 7 files changed, 10 insertions(+), 44 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ode/blob/206626dc/Rakefile ---------------------------------------------------------------------- diff --git a/Rakefile b/Rakefile index f0f0338..155b618 100644 --- a/Rakefile +++ b/Rakefile @@ -126,8 +126,7 @@ define "ode" do end end - test.using :testng, :forkmode=>'perTest', :properties=>{ "log4j.debug" => true, "log4j.configuration"=>"test-log4j.properties", "test.ports" => ENV['TEST_PORTS'], "org.apache.ode.scheduler.deleteJobsOnStart" => "true", "org.apache.ode.autoRetireProcess"=>"true" } - #:java_args=>['-Xdebug', '-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=6001', '-Xmx1024M', '-XX:MaxPermSize=1024m'] + test.using :testng, :forkmode=>'perTest', :properties=>{ "log4j.debug" => true, "log4j.configuration"=>"test-log4j.properties", "test.ports" => ENV['TEST_PORTS'], "org.apache.ode.scheduler.deleteJobsOnStart" => "true", "org.apache.ode.autoRetireProcess"=>"true" } #, :java_args=>['-Xdebug', '-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=6001', '-Xmx2048m', '-XX:MaxPermSize=256m'] test.with projects("tools"), libs, AXIS2_MODULES.mods, AXIOM, JAVAX.servlet, Buildr::Jetty::REQUIRES, HIBERNATE, DOM4J, H2::REQUIRES, SPRING_TEST webapp_dir = "#{test.compile.target}/webapp" test.setup task(:prepare_webapp) do |task| @@ -151,38 +150,6 @@ define "ode" do test.setup unzip("#{webapp_dir}/WEB-INF"=>project("dao-jpa-ojpa-derby").package(:zip)) test.setup unzip("#{webapp_dir}/WEB-INF"=>project("dao-hibernate-db").package(:zip)) # test.exclude('*') if Buildr.environment == 'hudson' || ENV["notestng"] - test.exclude 'org.apache.ode.axis2.rampart', 'org.apache.ode.axis2.hydration', - 'org.apache.ode.axis2.BpelActivityTest', - 'org.apache.ode.axis2.ClusteredOutgoingTrafficTest', - 'org.apache.ode.axis2.EndpointConfigurationTest', - 'org.apache.ode.axis2.EndpointTimeoutsTest', - 'org.apache.ode.axis2.MessageStructureTest', - 'org.apache.ode.axis2.MultiPartMessageTest', - 'org.apache.ode.axis2.NoP2PTest', - 'org.apache.ode.axis2.SelectorsTest', - 'org.apache.ode.axis2.ServiceFaultCatchTest', - 'org.apache.ode.axis2.SoapHeader2Test', - 'org.apache.ode.axis2.SoapHeaderTest', - 'org.apache.ode.axis2.XSDReferencesDeployTest', - 'org.apache.ode.axis2.correlation.CorrelationJoinHibTest', - 'org.apache.ode.axis2.correlation.CorrelationJoinLazyHibTest', - 'org.apache.ode.axis2.correlation.CorrelationJoinLazyTest', - 'org.apache.ode.axis2.correlation.CorrelationJoinTest', - 'org.apache.ode.axis2.correlation.CorrelationMultiHibTest', - 'org.apache.ode.axis2.correlation.CorrelationMultiTest', - 'org.apache.ode.axis2.correlation.CorrelationUnicityTest', - 'org.apache.ode.axis2.httpbinding.HttpBindingTest', - 'org.apache.ode.axis2.instancecleanup.CleanFailureHibTest', - 'org.apache.ode.axis2.instancecleanup.CleanFailureTest', - 'org.apache.ode.axis2.instancecleanup.CleanFaultHibTest', - 'org.apache.ode.axis2.instancecleanup.CleanFaultTest', - 'org.apache.ode.axis2.instancecleanup.CleanSuccessHibTest', - 'org.apache.ode.axis2.instancecleanup.CleanSuccessTest', - 'org.apache.ode.axis2.management.DeploymentTest', - 'org.apache.ode.axis2.management.InstanceManagementTest', - 'org.apache.ode.axis2.management.Retire2Test', - 'org.apache.ode.axis2.management.RetireTest', - 'org.apache.ode.axis2.management.RetireTestVar' NativeDB.prepare_configs test, _(".") @@ -314,7 +281,6 @@ define "ode" do "bpel-scripts"), COMMONS.collections, COMMONS.lang, DERBY, JAVAX.connector, JAVAX.stream, JAVAX.transaction, JAVAX.connector, JAXEN, HSQLDB, SAXON, XERCES, XMLBEANS, XALAN, GERONIMO.transaction, SPRING, HIBERNATE, DOM4J - test.exclude 'org.apache.ode.test.StructuredActivities20Test' package :jar end http://git-wip-us.apache.org/repos/asf/ode/blob/206626dc/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 82cecf2..42e8853 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" + @@ -113,7 +113,7 @@ public class SoapHeader2Test extends Axis2TestBase { String response = sendRequestFile("http://localhost:8888/processes/hello/hello/process/client";, bundleName, "testRequest.soap"); if (log.isDebugEnabled()) log.debug(response); - assertTrue("Soap headers missing!", response.contains("TestSoapHeader2 passed")); + assertTrue("Soap headers missing in: " + response, response.contains("TestSoapHeader2 passed")); } finally { server.undeployProcess(bundleName); } http://git-wip-us.apache.org/repos/asf/ode/blob/206626dc/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 997281b..bf99584 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/206626dc/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 74243fa..0c0a72b 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 = 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/206626dc/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/206626dc/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 07bd5af..5b14d54 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 = 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/206626dc/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>
