svn commit: r1053402 - in /cxf/trunk/systests/jaxrs/src/test: java/org/apache/cxf/systest/jaxrs/ java/org/apache/cxf/systest/jaxrs/resources/ resources/jaxrs_non_spring/WEB-INF/

[sergeyb]

Author: sergeyb
Date: Tue Dec 28 17:55:14 2010
New Revision: 1053402

URL: http://svn.apache.org/viewvc?rev=1053402&view=rev
Log:
[JAX-RS]Adding a test with the user model using a header parameter

Modified:
    
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreNoAnnotations.java
    
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerNonSpringBookTest.java
    
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/resources/resources.xml
    
cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_non_spring/WEB-INF/resources.xml

Modified: 
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreNoAnnotations.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreNoAnnotations.java?rev=1053402&r1=1053401&r2=1053402&view=diff
==============================================================================
--- 
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreNoAnnotations.java
 (original)
+++ 
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreNoAnnotations.java
 Tue Dec 28 17:55:14 2010
@@ -22,6 +22,9 @@ package org.apache.cxf.systest.jaxrs;
 import java.util.HashMap;
 import java.util.Map;
 
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.Response;
+
 public class BookStoreNoAnnotations {
 
     private Map<Long, Book> books = new HashMap<Long, Book>();
@@ -47,4 +50,12 @@ public class BookStoreNoAnnotations {
         return ch2;
     }
     
+    public Book getBookWithAuthorization(Long id, String authorizationHeader) 
throws BookNotFoundFault {
+        
+        if (authorizationHeader == null || 
!authorizationHeader.startsWith("Basic")) {
+            throw new WebApplicationException(Response.Status.FORBIDDEN);
+        }
+        
+        return books.get(id);
+    }
 }

Modified: 
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerNonSpringBookTest.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerNonSpringBookTest.java?rev=1053402&r1=1053401&r2=1053402&view=diff
==============================================================================
--- 
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerNonSpringBookTest.java
 (original)
+++ 
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerNonSpringBookTest.java
 Tue Dec 28 17:55:14 2010
@@ -29,6 +29,7 @@ import org.apache.commons.httpclient.met
 import org.apache.cxf.helpers.IOUtils;
 import org.apache.cxf.io.CachedOutputStream;
 import org.apache.cxf.jaxrs.client.JAXRSClientFactory;
+import org.apache.cxf.jaxrs.client.JAXRSClientFactoryBean;
 import org.apache.cxf.jaxrs.client.WebClient;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 
@@ -62,6 +63,23 @@ public class JAXRSClientServerNonSpringB
     }
     
     @Test
+    public void testGetBook123UserModelAuthorize() throws Exception {
+        JAXRSClientFactoryBean bean = new JAXRSClientFactoryBean();
+        bean.setAddress("http://localhost:"; + PORT + 
"/usermodel/bookstore/books");
+        bean.setUsername("Barry");
+        bean.setPassword("password");
+        
bean.setModelRef("classpath:org/apache/cxf/systest/jaxrs/resources/resources.xml");
+        WebClient proxy = bean.createWebClient();
+        proxy.path("{id}/authorize", 123);
+        
+        Book book = proxy.get(Book.class);
+        assertEquals(123L, book.getId());
+        
+        
+        
+    }
+    
+    @Test
     public void testGetChapterUserModel() throws Exception {
         
         getAndCompareAsStrings("http://localhost:"; + PORT + 
"/usermodel/bookstore/books/123/chapter",

Modified: 
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/resources/resources.xml
URL: 
http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/resources/resources.xml?rev=1053402&r1=1053401&r2=1053402&view=diff
==============================================================================
--- 
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/resources/resources.xml
 (original)
+++ 
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/resources/resources.xml
 Tue Dec 28 17:55:14 2010
@@ -6,6 +6,10 @@
     </operation>
     <operation name="getBookChapter" path="/books/{id}/chapter">
         <param name="id" type="PATH"/>
+    </operation>
+    <operation name="getBookWithAuthorization" verb="GET" 
path="/books/{id}/authorize">
+        <param name="id" type="PATH"/>
+        <param name="authorization" type="HEADER"/>
     </operation> 
  </resource>
  <resource name="org.apache.cxf.systest.jaxrs.ChapterNoAnnotations">

Modified: 
cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_non_spring/WEB-INF/resources.xml
URL: 
http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_non_spring/WEB-INF/resources.xml?rev=1053402&r1=1053401&r2=1053402&view=diff
==============================================================================
--- 
cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_non_spring/WEB-INF/resources.xml
 (original)
+++ 
cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_non_spring/WEB-INF/resources.xml
 Tue Dec 28 17:55:14 2010
@@ -7,6 +7,10 @@
     <operation name="getBookChapter" path="/books/{id}/chapter">
         <param name="id" type="PATH"/>
     </operation> 
+    <operation name="getBookWithAuthorization" verb="GET" 
path="/books/{id}/authorize">
+        <param name="id" type="PATH"/>
+        <param name="authorization" type="HEADER"/>
+    </operation>
  </resource>
  <resource name="org.apache.cxf.systest.jaxrs.ChapterNoAnnotations">
     <operation name="getItself" verb="GET"/>