cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject git commit: Minor test update
Date Thu, 13 Mar 2014 16:46:47 GMT
Repository: cxf
Updated Branches:
  refs/heads/master 9d4ddb5a8 -> aff4f5d14


Minor test update


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

Branch: refs/heads/master
Commit: aff4f5d14c7bba6f3b542b61a2a5c80430a1d350
Parents: 9d4ddb5
Author: Sergey Beryozkin <sberyozkin@talend.com>
Authored: Thu Mar 13 16:46:34 2014 +0000
Committer: Sergey Beryozkin <sberyozkin@talend.com>
Committed: Thu Mar 13 16:46:34 2014 +0000

----------------------------------------------------------------------
 .../JAXRSClientServerWebSocketSpringWebAppTest.java   |  9 ---------
 .../websocket/JAXRSClientServerWebSocketTest.java     | 14 ++++++++++----
 2 files changed, 10 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/aff4f5d1/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/websocket/JAXRSClientServerWebSocketSpringWebAppTest.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/websocket/JAXRSClientServerWebSocketSpringWebAppTest.java
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/websocket/JAXRSClientServerWebSocketSpringWebAppTest.java
index 002a42c..068e532 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/websocket/JAXRSClientServerWebSocketSpringWebAppTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/websocket/JAXRSClientServerWebSocketSpringWebAppTest.java
@@ -73,15 +73,6 @@ public class JAXRSClientServerWebSocketSpringWebAppTest extends JAXRSClientServe
         assertEquals(1L, book.getId());
     }
     
-    @Test
-    public void testGetBookHTTPFromWebSocketEndpoint() throws Exception {
-        String address = "http://localhost:" + getPort() + "/websocket/web/bookstore/books/1";
-        WebClient wc = WebClient.create(address);
-        wc.accept("application/xml");
-        Book book = wc.get(Book.class);
-        assertEquals(1L, book.getId());
-    }
-
     protected String getPort() {
         return PORT;
     }

http://git-wip-us.apache.org/repos/asf/cxf/blob/aff4f5d1/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/websocket/JAXRSClientServerWebSocketTest.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/websocket/JAXRSClientServerWebSocketTest.java
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/websocket/JAXRSClientServerWebSocketTest.java
index 9aad879..ff3e7c4 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/websocket/JAXRSClientServerWebSocketTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/websocket/JAXRSClientServerWebSocketTest.java
@@ -121,10 +121,7 @@ public class JAXRSClientServerWebSocketTest extends AbstractBusClientServerTestB
             String value = resp.getTextEntity();
             assertEquals("CXF in Action", value);
            
-            WebClient wc = WebClient.create("http://localhost:" + getPort() + "/websocket/web/bookstore/books/1");
-            wc.accept("application/xml");
-            Book book = wc.get(Book.class);
-            assertEquals(1L, book.getId());
+            testGetBookHTTPFromWebSocketEndpoint();
             
         } finally {
             wsclient.close();
@@ -132,6 +129,15 @@ public class JAXRSClientServerWebSocketTest extends AbstractBusClientServerTestB
     }
     
     @Test
+    public void testGetBookHTTPFromWebSocketEndpoint() throws Exception {
+        String address = "http://localhost:" + getPort() + "/websocket/web/bookstore/books/1";
+        WebClient wc = WebClient.create(address);
+        wc.accept("application/xml");
+        Book book = wc.get(Book.class);
+        assertEquals(1L, book.getId());
+    }
+    
+    @Test
     public void testBookWithWebSocketServletStream() throws Exception {
         String address = "ws://localhost:" + getPort() + "/websocket/web/bookstore";
 


Mime
View raw message