svn commit: r1338441 - in /cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs: BookStore.java JAXRSClientServerStreamingTest.java

[sergeyb]

Author: sergeyb
Date: Mon May 14 21:35:37 2012
New Revision: 1338441

URL: http://svn.apache.org/viewvc?rev=1338441&view=rev
Log:
Few updates to the jaxrs system tests to avoid the ambiguous matches

Modified:
    
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
    
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerStreamingTest.java

Modified: 
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java?rev=1338441&r1=1338440&r2=1338441&view=diff
==============================================================================
--- 
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
 (original)
+++ 
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
 Mon May 14 21:35:37 2012
@@ -554,7 +554,7 @@ public class BookStore {
     }
     
     @GET
-    @Path("/books/{bookId}/")
+    @Path("/books/text/xml/{bookId}")
     @Produces("text/xml")
     public Book getBookTextXml(@PathParam("bookId") String id) throws 
BookNotFoundFault {
         return doGetBook(id);

Modified: 
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerStreamingTest.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerStreamingTest.java?rev=1338441&r1=1338440&r2=1338441&view=diff
==============================================================================
--- 
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerStreamingTest.java
 (original)
+++ 
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerStreamingTest.java
 Mon May 14 21:35:37 2012
@@ -111,7 +111,7 @@ public class JAXRSClientServerStreamingT
     
     @Test
     public void testGetBook123Fail() throws Exception {
-        WebClient wc = WebClient.create("http://localhost:"; + PORT + 
"/bookstore/books/123");
+        WebClient wc = WebClient.create("http://localhost:"; + PORT + 
"/bookstore/books/text/xml/123");
         wc.accept("text/xml");
         wc.header("fail-write", "");
         Response r = wc.get();
@@ -120,7 +120,7 @@ public class JAXRSClientServerStreamingT
     
     @Test
     public void testGetBookUsingStaxWriter() throws Exception {
-        getAndCompare("http://localhost:"; + PORT + "/bookstore/books/123",
+        getAndCompare("http://localhost:"; + PORT + 
"/bookstore/books/text/xml/123",
                       "text/xml", 200);
     }