You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2013/07/08 13:45:35 UTC
svn commit: r1500672 - in /cxf/branches/2.7.x-fixes: ./
systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/
Author: sergeyb
Date: Mon Jul 8 11:45:35 2013
New Revision: 1500672
URL: http://svn.apache.org/r1500672
Log:
Merged revisions 1500513 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1500513 | sergeyb | 2013-07-07 20:25:28 +0100 (Sun, 07 Jul 2013) | 1 line
[CXF-5108] Adding a test with GET and query bean
........
Modified:
cxf/branches/2.7.x-fixes/ (props changed)
cxf/branches/2.7.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookSubresource.java
cxf/branches/2.7.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookSubresourceImpl.java
cxf/branches/2.7.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSSoapBookTest.java
Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
Merged /cxf/trunk:r1500513
Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.7.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookSubresource.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookSubresource.java?rev=1500672&r1=1500671&r2=1500672&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookSubresource.java (original)
+++ cxf/branches/2.7.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookSubresource.java Mon Jul 8 11:45:35 2013
@@ -91,5 +91,10 @@ public interface BookSubresource {
@Produces("application/xml")
OrderBean addOrder(@FormParam("") OrderBean order);
+ @GET
+ @Path("/thebook5")
+ @Produces("application/xml")
+ Book getTheBookQueryBean(@QueryParam("") Book book) throws BookNotFoundFault;
+
}
Modified: cxf/branches/2.7.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookSubresourceImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookSubresourceImpl.java?rev=1500672&r1=1500671&r2=1500672&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookSubresourceImpl.java (original)
+++ cxf/branches/2.7.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookSubresourceImpl.java Mon Jul 8 11:45:35 2013
@@ -111,4 +111,8 @@ public class BookSubresourceImpl impleme
return new Book(name, bookid);
}
+ public Book getTheBookQueryBean(Book book) throws BookNotFoundFault {
+ return book;
+ }
+
}
Modified: cxf/branches/2.7.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSSoapBookTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSSoapBookTest.java?rev=1500672&r1=1500671&r2=1500672&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSSoapBookTest.java (original)
+++ cxf/branches/2.7.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSSoapBookTest.java Mon Jul 8 11:45:35 2013
@@ -532,6 +532,7 @@ public class JAXRSSoapBookTest extends A
String baseAddress = "http://localhost:" + PORT + "/test/services/rest";
BookStoreJaxrsJaxws proxy = JAXRSClientFactory.create(baseAddress,
BookStoreJaxrsJaxws.class);
+ WebClient.getConfig(proxy).getOutInterceptors().add(new LoggingOutInterceptor());
BookSubresource bs = proxy.getBookSubresource("139");
Book bean = new Book("CXF Rocks", 139L);
Book b = bs.getTheBook4(bean, bean, bean, bean);
@@ -540,6 +541,20 @@ public class JAXRSSoapBookTest extends A
}
@Test
+ public void testGetBookSubresourceParamExtensions2() throws Exception {
+
+ String baseAddress = "http://localhost:" + PORT + "/test/services/rest";
+ BookStoreJaxrsJaxws proxy = JAXRSClientFactory.create(baseAddress,
+ BookStoreJaxrsJaxws.class);
+ WebClient.getConfig(proxy).getOutInterceptors().add(new LoggingOutInterceptor());
+ BookSubresource bs = proxy.getBookSubresource("139");
+ Book bean = new Book("CXF Rocks", 139L);
+ Book b = bs.getTheBookQueryBean(bean);
+ assertEquals(139, b.getId());
+ assertEquals("CXF Rocks", b.getName());
+ }
+
+ @Test
public void testGetBookSubresourceParamOrder() throws Exception {
String baseAddress = "http://localhost:" + PORT + "/test/services/rest";