svn commit: r1200922 - in /cxf/branches/2.4.x-fixes: ./ systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSSoapBookTest.java

[sergeyb]

Author: sergeyb
Date: Fri Nov 11 15:48:02 2011
New Revision: 1200922

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

........
  r1200920 | sergeyb | 2011-11-11 15:43:08 +0000 (Fri, 11 Nov 2011) | 1 line
  
  [CXF-3902] Fixing a system test
........

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

Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 11 15:48:02 2011
@@ -1 +1 @@
-/cxf/trunk:1197048,1198584,1198875,1198884,1199905,1200850,1200876
+/cxf/trunk:1197048,1198584,1198875,1198884,1199905,1200850,1200876,1200920

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

Modified: 
cxf/branches/2.4.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSSoapBookTest.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSSoapBookTest.java?rev=1200922&r1=1200921&r2=1200922&view=diff
==============================================================================
--- 
cxf/branches/2.4.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSSoapBookTest.java
 (original)
+++ 
cxf/branches/2.4.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSSoapBookTest.java
 Fri Nov 11 15:48:02 2011
@@ -740,18 +740,17 @@ public class JAXRSSoapBookTest extends A
         assertTrue(listings.contains("http://localhost:"; + PORT + 
"/test/services/soap/bookservice?wsdl"));
         assertFalse(listings.contains("http://localhost:"; + PORT + 
"/test/services/soap/bookservice2?wsdl"));
         
-        assertTrue(listings.contains("http://localhost:"; + PORT + 
"/test/services/rest?_wadl&type=xml"));
+        assertTrue(listings.contains("http://localhost:"; + PORT + 
"/test/services/rest?_wadl"));
         assertEquals(200, WebClient.create(
             "http://localhost:"; + PORT + 
"/test/services/rest?_wadl&type=xml").get().getStatus());
-        assertTrue(listings.contains("http://localhost:"; + PORT + 
"/test/services/rest2?_wadl&type=xml"));
+        assertTrue(listings.contains("http://localhost:"; + PORT + 
"/test/services/rest2?_wadl"));
         assertEquals(200, WebClient.create(
             "http://localhost:"; + PORT + 
"/test/services/rest2?_wadl&type=xml").get().getStatus());
-        assertFalse(listings.contains("http://localhost:"; + PORT + 
"/test/services/rest3?_wadl&type=xml"));
+        assertFalse(listings.contains("http://localhost:"; + PORT + 
"/test/services/rest3?_wadl"));
         assertFalse(listings.contains("Atom Log Feed"));
     
         WebClient webClient = 
-            WebClient.create("http://localhost:"; + PORT + 
"/test/services/rest3?_wadl&type=xml");
-        
WebClient.getConfig(webClient).getHttpConduit().getClient().setReceiveTimeout(1000000);
+            WebClient.create("http://localhost:"; + PORT + 
"/test/services/rest3?_wadl");
         assertEquals(404, webClient.get().getStatus());
     }