Author: ay Date: Thu Feb 16 11:41:34 2012 New Revision: 1244945 URL: http://svn.apache.org/viewvc?rev=1244945&view=rev Log: Merged revisions 1244940 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
................ r1244940 | ay | 2012-02-16 12:35:13 +0100 (Thu, 16 Feb 2012) | 9 lines Merged revisions 1244939 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1244939 | ay | 2012-02-16 12:31:11 +0100 (Thu, 16 Feb 2012) | 1 line improve the test cases for CXF-4096 ........ ................ Modified: cxf/branches/2.4.x-fixes/ (props changed) cxf/branches/2.4.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/interceptor/InterceptorFaultTest.java Propchange: cxf/branches/2.4.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Thu Feb 16 11:41:34 2012 @@ -0,0 +1,2 @@ +/cxf/branches/2.5.x-fixes:1244940 +/cxf/trunk:1244939 Propchange: cxf/branches/2.4.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.4.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/interceptor/InterceptorFaultTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/interceptor/InterceptorFaultTest.java?rev=1244945&r1=1244944&r2=1244945&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/interceptor/InterceptorFaultTest.java (original) +++ cxf/branches/2.4.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/interceptor/InterceptorFaultTest.java Thu Feb 16 11:41:34 2012 @@ -98,6 +98,7 @@ public class InterceptorFaultTest extend implementor.setAddress("http://localhost:"; + PORT + "/SoapContext/GreeterPort"); GreeterImpl greeterImplementor = new GreeterImpl(); greeterImplementor.setThrowAlways(true); + greeterImplementor.useLastOnewayArg(true); implementor.setImplementor(greeterImplementor); Endpoint.publish(CONTROL_PORT_ADDRESS, implementor); LOG.fine("Published control endpoint."); @@ -167,7 +168,7 @@ public class InterceptorFaultTest extend control.setRobustInOnlyMode(robust); // all interceptors pass - testInterceptorsPass(); + testInterceptorsPass(robust); // behaviour is identicial for all phases FaultLocation location = new org.apache.cxf.greeter_control.types.ObjectFactory() @@ -194,7 +195,7 @@ public class InterceptorFaultTest extend control.setRobustInOnlyMode(robust); // all interceptors pass - testInterceptorsPass(); + testInterceptorsPass(robust); // test failure in phases before Phase.PRE_LOGICAL FaultLocation location = new org.apache.cxf.greeter_control.types.ObjectFactory() @@ -220,9 +221,19 @@ public class InterceptorFaultTest extend } } - private void testInterceptorsPass() { + private void testInterceptorsPass(boolean robust) { greeter.greetMeOneWay("one"); - assertEquals("TWO", greeter.greetMe("two")); + + // wait 5 seconds for the non-robust case + if (!robust) { + try { + Thread.sleep(5000); + } catch (InterruptedException e) { + // ignore + } + } + // verify both the previous greetMeOneWay call and this greetMe call + assertEquals("one", greeter.greetMe("two")); try { greeter.pingMe(); fail("Expected PingMeFault not thrown.");
