Author: dkulp Date: Fri Apr 6 16:40:12 2012 New Revision: 1310463 URL: http://svn.apache.org/viewvc?rev=1310463&view=rev Log: Merged revisions 1310341 via svn merge from https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
........ r1310341 | dkulp | 2012-04-06 10:29:07 -0400 (Fri, 06 Apr 2012) | 9 lines Merged revisions 1307510 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1307510 | sergeyb | 2012-03-30 12:28:43 -0400 (Fri, 30 Mar 2012) | 2 lines Attempting to fix the tests on IBM JDK ........ ........ Modified: cxf/branches/2.4.x-fixes/ (props changed) cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/SelectMethodCandidatesTest.java cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/client/ResponseReaderTest.java Propchange: cxf/branches/2.4.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/SelectMethodCandidatesTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/SelectMethodCandidatesTest.java?rev=1310463&r1=1310462&r2=1310463&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/SelectMethodCandidatesTest.java (original) +++ cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/SelectMethodCandidatesTest.java Fri Apr 6 16:40:12 2012 @@ -91,6 +91,8 @@ public class SelectMethodCandidatesTest ex.setInMessage(m); m.setExchange(ex); Endpoint e = EasyMock.createMock(Endpoint.class); + e.isEmpty(); + EasyMock.expectLastCall().andReturn(true).anyTimes(); e.size(); EasyMock.expectLastCall().andReturn(0).anyTimes(); e.getEndpointInfo(); @@ -141,6 +143,8 @@ public class SelectMethodCandidatesTest ex.setInMessage(m); m.setExchange(ex); Endpoint e = EasyMock.createMock(Endpoint.class); + e.isEmpty(); + EasyMock.expectLastCall().andReturn(true).anyTimes(); e.size(); EasyMock.expectLastCall().andReturn(0).anyTimes(); e.getEndpointInfo(); @@ -188,6 +192,8 @@ public class SelectMethodCandidatesTest ex.setInMessage(m); m.setExchange(ex); Endpoint e = EasyMock.createMock(Endpoint.class); + e.isEmpty(); + EasyMock.expectLastCall().andReturn(true).anyTimes(); e.size(); EasyMock.expectLastCall().andReturn(0).anyTimes(); e.getEndpointInfo(); Modified: cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/client/ResponseReaderTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/client/ResponseReaderTest.java?rev=1310463&r1=1310462&r2=1310463&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/client/ResponseReaderTest.java (original) +++ cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/client/ResponseReaderTest.java Fri Apr 6 16:40:12 2012 @@ -59,6 +59,8 @@ public class ResponseReaderTest extends ProviderFactory instance = ProviderFactory.getInstance(); Endpoint endpoint = EasyMock.createMock(Endpoint.class); + endpoint.isEmpty(); + EasyMock.expectLastCall().andReturn(true).anyTimes(); endpoint.size(); EasyMock.expectLastCall().andReturn(0).anyTimes(); endpoint.getEndpointInfo();
