You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2012/04/06 16:29:07 UTC
svn commit: r1310341 - in
/cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs:
SelectMethodCandidatesTest.java client/ResponseReaderTest.java
Author: dkulp
Date: Fri Apr 6 14:29:07 2012
New Revision: 1310341
URL: http://svn.apache.org/viewvc?rev=1310341&view=rev
Log:
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.5.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/SelectMethodCandidatesTest.java
cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/client/ResponseReaderTest.java
Modified: cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/SelectMethodCandidatesTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/SelectMethodCandidatesTest.java?rev=1310341&r1=1310340&r2=1310341&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/SelectMethodCandidatesTest.java (original)
+++ cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/SelectMethodCandidatesTest.java Fri Apr 6 14:29:07 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.5.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/client/ResponseReaderTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/client/ResponseReaderTest.java?rev=1310341&r1=1310340&r2=1310341&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/client/ResponseReaderTest.java (original)
+++ cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/client/ResponseReaderTest.java Fri Apr 6 14:29:07 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();