cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r1399156 - in /cxf/branches/2.6.x-fixes: ./ systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
Date Wed, 17 Oct 2012 09:12:07 GMT
Author: sergeyb
Date: Wed Oct 17 09:12:07 2012
New Revision: 1399156

URL: http://svn.apache.org/viewvc?rev=1399156&view=rev
Log:
Merged revisions 1398331 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1398331 | sergeyb | 2012-10-15 16:24:14 +0100 (Mon, 15 Oct 2012) | 1 line
  
  Fixing the compilation failure
........

Modified:
    cxf/branches/2.6.x-fixes/   (props changed)
    cxf/branches/2.6.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
    cxf/branches/2.6.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java

Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
  Merged /cxf/trunk:r1398331

Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.6.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java?rev=1399156&r1=1399155&r2=1399156&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
(original)
+++ cxf/branches/2.6.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
Wed Oct 17 09:12:07 2012
@@ -120,6 +120,21 @@ public class BookStore {
     }
 
     @GET
+    @Path("emptybook")
+    @Produces({"application/xml", "application/json" })
+    public Book getEmptyBook() {
+        return null;
+    }
+    
+    @GET
+    @Path("emptybook/nillable")
+    @Produces({"application/xml", "application/json" })
+    @Nullable
+    public Book getEmptyBookNullable() {
+        return null;
+    }
+    
+    @GET
     @Path("allCharsButA-B/:@!$&'()*+,;=-._~")
     public Book getWithComplexPath() {
         return new Book("Encoded Path", 125L);

Modified: cxf/branches/2.6.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java?rev=1399156&r1=1399155&r2=1399156&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
(original)
+++ cxf/branches/2.6.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
Wed Oct 17 09:12:07 2012
@@ -1063,12 +1063,12 @@ public class JAXRSClientServerBookTest e
         assertEquals(444L, book.getId());
     }
     
-    @Test(expected = ClientException.class)
+    @Test(expected = ClientWebApplicationException.class)
     public void testEmptyJSON() {
         doTestEmptyResponse("application/json");
     }
     
-    @Test(expected = ClientException.class)
+    @Test(expected = ClientWebApplicationException.class)
     public void testEmptyJAXB() {
         doTestEmptyResponse("application/xml");
     }
@@ -1080,7 +1080,7 @@ public class JAXRSClientServerBookTest e
         wc.get(Book.class);
     }
     
-    @Test(expected = ClientException.class)
+    @Test(expected = ClientWebApplicationException.class)
     public void testEmptyResponseProxy() {
         BookStore store = JAXRSClientFactory.create("http://localhost:" + PORT, BookStore.class);
         WebClient.getConfig(store).getInInterceptors().add(new ReplaceStatusInterceptor());



Mime
View raw message