cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject cxf git commit: [CXF-6450] Updating the tests, with one temp disabled
Date Thu, 23 Jul 2015 10:18:24 GMT
Repository: cxf
Updated Branches:
  refs/heads/master 05a01d691 -> 829cd5c41


[CXF-6450] Updating the tests, with one temp disabled


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/829cd5c4
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/829cd5c4
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/829cd5c4

Branch: refs/heads/master
Commit: 829cd5c41ccaad1902ef3ca7cb190816208566ae
Parents: 05a01d6
Author: Sergey Beryozkin <sberyozkin@talend.com>
Authored: Thu Jul 23 13:18:03 2015 +0300
Committer: Sergey Beryozkin <sberyozkin@talend.com>
Committed: Thu Jul 23 13:18:03 2015 +0300

----------------------------------------------------------------------
 .../cxf/systest/jaxrs/GenericBookInterface.java |  8 +++++++
 .../jaxrs/GenericBookStoreSpringInt1.java       | 11 ---------
 .../jaxrs/GenericBookStoreSpringInt2.java       | 11 ---------
 ...ServerResourceJacksonSpringProviderTest.java | 24 ++++++++++++--------
 .../jaxrs_jackson_provider/WEB-INF/beans.xml    | 12 ++++++++--
 5 files changed, 32 insertions(+), 34 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/829cd5c4/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/GenericBookInterface.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/GenericBookInterface.java
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/GenericBookInterface.java
index a0b4260..a8f3db2 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/GenericBookInterface.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/GenericBookInterface.java
@@ -22,7 +22,15 @@ package org.apache.cxf.systest.jaxrs;
 
 import java.util.List;
 
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+
+@Path("/int")
+@Produces({"application/json" })
 public interface GenericBookInterface<A> {
+    @GET
+    @Path("/books/superbook")
     List<A> getSuperBook();
 }
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/829cd5c4/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/GenericBookStoreSpringInt1.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/GenericBookStoreSpringInt1.java
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/GenericBookStoreSpringInt1.java
index 7aaf4e0..0f335fe 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/GenericBookStoreSpringInt1.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/GenericBookStoreSpringInt1.java
@@ -23,18 +23,7 @@ package org.apache.cxf.systest.jaxrs;
 import java.util.Collections;
 import java.util.List;
 
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-
-import org.apache.cxf.annotations.Logging;
-
-@Path("/int1")
-@Produces({"application/json" })
-@Logging
 public class GenericBookStoreSpringInt1 implements GenericBookInterface<SuperBook>
{
-    @GET
-    @Path("/books/superbook")
     public List<SuperBook> getSuperBook() {
         return Collections.singletonList(new SuperBook("super", 111L, true));
     }

http://git-wip-us.apache.org/repos/asf/cxf/blob/829cd5c4/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/GenericBookStoreSpringInt2.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/GenericBookStoreSpringInt2.java
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/GenericBookStoreSpringInt2.java
index 5c90772..a5a9c05 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/GenericBookStoreSpringInt2.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/GenericBookStoreSpringInt2.java
@@ -23,18 +23,7 @@ package org.apache.cxf.systest.jaxrs;
 import java.util.Collections;
 import java.util.List;
 
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-
-import org.apache.cxf.annotations.Logging;
-
-@Path("/int2")
-@Produces({"application/json" })
-@Logging
 public class GenericBookStoreSpringInt2 implements GenericBookServiceInterface {
-    @GET
-    @Path("/books/superbook")
     public List<SuperBook> getSuperBook() {
         return Collections.singletonList(new SuperBook("super", 111L, true));
     }

http://git-wip-us.apache.org/repos/asf/cxf/blob/829cd5c4/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceJacksonSpringProviderTest.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceJacksonSpringProviderTest.java
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceJacksonSpringProviderTest.java
index ce9e073..768e6ec 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceJacksonSpringProviderTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerResourceJacksonSpringProviderTest.java
@@ -44,6 +44,7 @@ import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
+import org.junit.Ignore;
 import org.junit.Test;
 
 public class JAXRSClientServerResourceJacksonSpringProviderTest extends AbstractBusClientServerTestBase
{
@@ -174,25 +175,28 @@ public class JAXRSClientServerResourceJacksonSpringProviderTest extends
Abstract
     }
     
     @Test
-    public void testGetGenericSuperBookProxy1() throws Exception {
+    public void testGetGenericSuperBookInt1() throws Exception {
         
         String endpointAddress =
-            "http://localhost:" + PORT + "/webapp/genericstoreInt";
-        GenericBookStoreSpringInt1 proxy = JAXRSClientFactory.create(endpointAddress, 
-            GenericBookStoreSpringInt1.class, Collections.singletonList(new JacksonJsonProvider()));
-        WebClient.getConfig(proxy).getHttpConduit().getClient().setReceiveTimeout(1000000000L);
-        List<SuperBook> books = proxy.getSuperBook();
+            "http://localhost:" + PORT + "/webapp/genericstoreInt1/int/books/superbook";
+        WebClient wc = WebClient.create(endpointAddress, 
+            Collections.singletonList(new JacksonJsonProvider()));
+        WebClient.getConfig(wc).getHttpConduit().getClient().setReceiveTimeout(1000000000L);
+        GenericType<List<SuperBook>> genericResponseType = new GenericType<List<SuperBook>>()
{        
+        };
+        List<SuperBook> books = wc.get(genericResponseType);
         assertEquals(1, books.size());
         assertEquals(111L, books.get(0).getId());
         
     }
     @Test
-    public void testGetGenericSuperBookProxy2() throws Exception {
+    @Ignore
+    public void testGetGenericSuperBookInt2() throws Exception {
         
         String endpointAddress =
-            "http://localhost:" + PORT + "/webapp/genericstoreInt";
-        GenericBookStoreSpringInt2 proxy = JAXRSClientFactory.create(endpointAddress, 
-            GenericBookStoreSpringInt2.class, Collections.singletonList(new JacksonJsonProvider()));
+            "http://localhost:" + PORT + "/webapp/genericstoreInt2";
+        GenericBookServiceInterface proxy = JAXRSClientFactory.create(endpointAddress, 
+            GenericBookServiceInterface.class, Collections.singletonList(new JacksonJsonProvider()));
         WebClient.getConfig(proxy).getHttpConduit().getClient().setReceiveTimeout(1000000000L);
         List<SuperBook> books = proxy.getSuperBook();
         assertEquals(1, books.size());

http://git-wip-us.apache.org/repos/asf/cxf/blob/829cd5c4/systests/jaxrs/src/test/resources/jaxrs_jackson_provider/WEB-INF/beans.xml
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/resources/jaxrs_jackson_provider/WEB-INF/beans.xml b/systests/jaxrs/src/test/resources/jaxrs_jackson_provider/WEB-INF/beans.xml
index 00aa45d..4ca5850 100644
--- a/systests/jaxrs/src/test/resources/jaxrs_jackson_provider/WEB-INF/beans.xml
+++ b/systests/jaxrs/src/test/resources/jaxrs_jackson_provider/WEB-INF/beans.xml
@@ -81,10 +81,18 @@ http://cxf.apache.org/schemas/jaxrs.xsd">
         </jaxrs:providers>
     </jaxrs:server>
     
-    <jaxrs:server id="genericBookStoreInt"
-                  address="/genericstoreInt">
+    <jaxrs:server id="genericBookStoreInt1"
+                  address="/genericstoreInt1">
         <jaxrs:serviceBeans>
             <ref bean="gBookStoreInt1"/>
+        </jaxrs:serviceBeans>
+        <jaxrs:providers>
+            <ref bean="jackson"/>
+        </jaxrs:providers>
+    </jaxrs:server>
+    <jaxrs:server id="genericBookStoreInt2"
+                  address="/genericstoreInt2">
+        <jaxrs:serviceBeans>
             <ref bean="gBookStoreInt2"/>
         </jaxrs:serviceBeans>
         <jaxrs:providers>


Mime
View raw message