svn commit: r1552614 - in /cxf/trunk/systests/jaxrs: pom.xml src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java

[sergeyb]

Author: sergeyb
Date: Fri Dec 20 12:30:09 2013
New Revision: 1552614

URL: http://svn.apache.org/r1552614
Log:
Adding the http-hc dependency back, disabling all async tests depending on 
Future or InvocationCallback

Modified:
    cxf/trunk/systests/jaxrs/pom.xml
    
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java
    
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java

Modified: cxf/trunk/systests/jaxrs/pom.xml
URL: 
http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/pom.xml?rev=1552614&r1=1552613&r2=1552614&view=diff
==============================================================================
--- cxf/trunk/systests/jaxrs/pom.xml (original)
+++ cxf/trunk/systests/jaxrs/pom.xml Fri Dec 20 12:30:09 2013
@@ -238,14 +238,12 @@
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
-<!--
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http-hc</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
--->
         <dependency>
             <groupId>javax.annotation</groupId>
             <artifactId>jsr250-api</artifactId>

Modified: 
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java?rev=1552614&r1=1552613&r2=1552614&view=diff
==============================================================================
--- 
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java
 (original)
+++ 
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java
 Fri Dec 20 12:30:09 2013
@@ -59,6 +59,7 @@ import org.apache.cxf.testutil.common.Ab
 
 import org.junit.Before;
 import org.junit.BeforeClass;
+import org.junit.Ignore;
 import org.junit.Test;
 
 public class JAXRS20ClientServerBookTest extends 
AbstractBusClientServerTestBase {
@@ -158,12 +159,14 @@ public class JAXRS20ClientServerBookTest
     }
     
     @Test
+    @Ignore
     public void testGetBookAsync() throws Exception {
         String address = "http://localhost:"; + PORT + 
"/bookstore/bookheaders/simple";
         doTestGetBookAsync(address, false);
     }
     
     @Test
+    @Ignore
     public void testGetBookAsyncNoCallback() throws Exception {
         String address = "http://localhost:"; + PORT + 
"/bookstore/bookheaders/simple";
         WebClient wc = createWebClient(address);
@@ -174,12 +177,14 @@ public class JAXRS20ClientServerBookTest
     }
     
     @Test
+    @Ignore
     public void testGetBookAsyncResponse() throws Exception {
         String address = "http://localhost:"; + PORT + 
"/bookstore/bookheaders/simple";
         doTestGetBookAsyncResponse(address, false);
     }
     
     @Test
+    @Ignore
     public void testGetBookAsyncInvoker() throws Exception {
         String address = "http://localhost:"; + PORT + 
"/bookstore/bookheaders/simple";
         doTestGetBookAsync(address, true);
@@ -226,12 +231,14 @@ public class JAXRS20ClientServerBookTest
         doTestGetBook(address, false);
     }
     @Test
+    @Ignore
     public void testGetBookWrongPathAsync() throws Exception {
         String address = "http://localhost:"; + PORT + "/wrongpath";
         doTestGetBookAsync(address, false);
     }
     
     @Test
+    @Ignore
     public void testPostCollectionGenericEntity() throws Exception {
         
         String endpointAddress =
@@ -252,6 +259,7 @@ public class JAXRS20ClientServerBookTest
     }
     
     @Test
+    @Ignore
     public void testPostCollectionGenericEntityAsEntity() throws Exception {
         
         String endpointAddress =
@@ -307,6 +315,7 @@ public class JAXRS20ClientServerBookTest
     }
     
     @Test
+    @Ignore
     public void testPostGetCollectionGenericEntityAndType() throws Exception {
         
         String endpointAddress =
@@ -336,6 +345,7 @@ public class JAXRS20ClientServerBookTest
     }
     
     @Test
+    @Ignore
     public void testPostGetCollectionGenericEntityAndType2() throws Exception {
         
         String endpointAddress =
@@ -563,6 +573,7 @@ public class JAXRS20ClientServerBookTest
     }
     
     @Test
+    @Ignore
     public void testPostBookAsync() throws Exception {
         String address = "http://localhost:"; + PORT + 
"/bookstore/bookheaders/simple/async";
         WebClient wc = createWebClientPost(address);
@@ -572,6 +583,7 @@ public class JAXRS20ClientServerBookTest
     }
     
     @Test
+    @Ignore
     public void testPostBookAsyncHandler() throws Exception {
         String address = "http://localhost:"; + PORT + 
"/bookstore/bookheaders/simple/async";
         doTestPostBookAsyncHandler(address);

Modified: 
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java?rev=1552614&r1=1552613&r2=1552614&view=diff
==============================================================================
--- 
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
 (original)
+++ 
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
 Fri Dec 20 12:30:09 2013
@@ -71,7 +71,6 @@ public class JAXRSAsyncClientTest extend
     }
     
     @Test
-    @Ignore
     public void testRetrieveBookCustomMethodAsyncSync() throws Exception {
         String address = "http://localhost:"; + PORT + "/bookstore/retrieve";
         WebClient wc = WebClient.create(address);
@@ -82,7 +81,6 @@ public class JAXRSAsyncClientTest extend
     }
     
     @Test
-    @Ignore
     public void testDeleteWithBody() throws Exception {
         String address = "http://localhost:"; + PORT + "/bookstore/deletebody";
         WebClient wc = WebClient.create(address);
@@ -104,6 +102,7 @@ public class JAXRSAsyncClientTest extend
     }
     
     @Test
+    @Ignore
     public void testGetBookAsyncResponse404() throws Exception {
         String address = "http://localhost:"; + PORT + 
"/bookstore/bookheaders/404";
         WebClient wc = createWebClient(address);
@@ -112,6 +111,7 @@ public class JAXRSAsyncClientTest extend
     }
     
     @Test
+    @Ignore
     public void testGetBookAsync404() throws Exception {
         String address = "http://localhost:"; + PORT + 
"/bookstore/bookheaders/404";
         WebClient wc = createWebClient(address);
@@ -125,6 +125,7 @@ public class JAXRSAsyncClientTest extend
     }
     
     @Test
+    @Ignore
     public void testPostBookProcessingException() throws Exception {
         String address = "http://localhost:"; + PORT + "/bookstore/";
         List<Object> providers = new ArrayList<Object>();
@@ -141,6 +142,7 @@ public class JAXRSAsyncClientTest extend
     }
     
     @Test
+    @Ignore
     public void testGetBookResponseProcessingException() throws Exception {
         String address = "http://localhost:"; + PORT + "/bookstore/books/123";
         List<Object> providers = new ArrayList<Object>();
@@ -157,6 +159,7 @@ public class JAXRSAsyncClientTest extend
     }
     
     @Test
+    @Ignore
     public void testGetBookAsync404Callback() throws Exception {
         String address = "http://localhost:"; + PORT + 
"/bookstore/bookheaders/404";
         WebClient wc = createWebClient(address);