Clean up WebSocket tests

* Remove recursive send/receive.

* Correct the CountDownLatch count numbers. Mixes between Client and
Server Encoder/Decoders and rely on multiple messages being echoed.

* GlassFish is more sensible to double slashes in WS URL's. Remove
the extra forward slashes.

* Pr spec you can only register a single Message Handler pr type. Change
to store Message in static to verify content.

Author: aslakknutsen

pom.xml

@@ -207,6 +207,12 @@
                     <version>4.0</version>
                     <scope>test</scope>
                 </dependency>
+                <dependency>
+                   <groupId>org.glassfish</groupId>
+                   <artifactId>javax.json</artifactId>
+                   <version>1.0.4</version>
+                   <scope>test</scope>
+                </dependency>
                 <dependency>
                     <groupId>org.glassfish.tyrus</groupId>
                     <artifactId>tyrus-client</artifactId>
@@ -236,6 +242,12 @@
         <profile>
             <id>glassfish-remote-arquillian</id>
             <dependencies>
+                <dependency>
+                   <groupId>org.glassfish</groupId>
+                   <artifactId>javax.json</artifactId>
+                   <version>1.0.4</version>
+                   <scope>test</scope>
+                </dependency>
                 <dependency>
                     <groupId>org.glassfish.tyrus</groupId>
                     <artifactId>tyrus-client</artifactId>

websocket/encoder-client/src/main/java/org/javaee7/websocket/encoder/client/MyClient.java

@@ -43,6 +43,7 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+
 import javax.websocket.ClientEndpoint;
 import javax.websocket.EncodeException;
 import javax.websocket.OnError;
@@ -57,6 +58,7 @@
         decoders={MyMessageDecoder.class})
 public class MyClient {
     public static CountDownLatch latch= new CountDownLatch(3);
+    public static MyMessage response;
 
     @OnOpen
     public void onOpen(Session session) {
@@ -69,9 +71,9 @@ public void onOpen(Session session) {
     }
 
     @OnMessage
-    public MyMessage processMessage(MyMessage message) {
-        latch.countDown();
-        return message;
+    public void processMessage(MyMessage message) {
+       response = message;
+       latch.countDown();
     }
 
     @OnError

websocket/encoder-client/src/test/java/org/javaee7/websocket/encoder/client/MyClientTest.java

@@ -6,22 +6,26 @@
 
 package org.javaee7.websocket.encoder.client;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.concurrent.TimeUnit;
+
 import javax.websocket.ContainerProvider;
 import javax.websocket.DeploymentException;
-import javax.websocket.MessageHandler;
 import javax.websocket.Session;
 import javax.websocket.WebSocketContainer;
+
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.arquillian.test.api.ArquillianResource;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.Test;
-import static org.junit.Assert.*;
 import org.junit.runner.RunWith;
 
 /**
@@ -47,16 +51,11 @@ public static WebArchive createDeployment() {
 
     @Test
     public void testEndpoint() throws URISyntaxException, DeploymentException, IOException, InterruptedException {
-        final String JSON = "{\"apple\" : \"red\", \"banana\": \"yellow\"}";
+        String JSON = "{\"apple\":\"red\",\"banana\":\"yellow\"}";
         Session session = connectToServer(MyClient.class);
         assertNotNull(session);
-        session.addMessageHandler(new MessageHandler.Whole<String>() {
-            @Override
-            public void onMessage(String text) {
-                assertEquals(JSON, text);
-            }
-        });
         assertTrue(MyClient.latch.await(2, TimeUnit.SECONDS));
+        assertEquals(JSON, MyClient.response.toString());
     }
 
     public Session connectToServer(Class endpoint) throws DeploymentException, IOException, URISyntaxException {
@@ -67,9 +66,8 @@ public Session connectToServer(Class endpoint) throws DeploymentException, IOExc
                 + base.getHost()
                 + ":"
                 + base.getPort()
-                + "/"
                 + base.getPath()
-                + "/encoder-client");
+                + "encoder-client");
         return container.connectToServer(endpoint, uri);
     }
 

websocket/encoder-programmatic/src/main/java/org/javaee7/websocket/encoder/programmatic/MyClient.java

@@ -17,7 +17,8 @@
 @ClientEndpoint(encoders = {MyMessageEncoder.class},
         decoders={MyMessageDecoder.class})
 public class MyClient {
-    public static CountDownLatch latch= new CountDownLatch(4);
+    public static CountDownLatch latch= new CountDownLatch(3);
+    public static MyMessage response;
 
     @OnOpen
     public void onOpen(Session session) {
@@ -30,9 +31,9 @@ public void onOpen(Session session) {
     }
 
     @OnMessage
-    public MyMessage processMessage(MyMessage message) {
-        latch.countDown();
-        return message;
+    public void processMessage(MyMessage message) {
+       response = message;
+       latch.countDown();
     }
 
     @OnError

websocket/encoder-programmatic/src/main/java/org/javaee7/websocket/encoder/programmatic/MyEndpoint.java

@@ -42,6 +42,7 @@
 import java.io.IOException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+
 import javax.websocket.Endpoint;
 import javax.websocket.EndpointConfig;
 import javax.websocket.MessageHandler;
@@ -59,7 +60,6 @@ public void onOpen(final Session session, EndpointConfig ec) {
             @Override
             public void onMessage(String text) {
                 try {
-                    MyClient.latch.countDown();
                     session.getBasicRemote().sendText(text);
                 } catch (IOException ex) {
                     Logger.getLogger(MyEndpoint.class.getName()).log(Level.SEVERE, null, ex);

websocket/encoder-programmatic/src/main/java/org/javaee7/websocket/encoder/programmatic/MyEndpointConfiguration.java

@@ -44,6 +44,7 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+
 import javax.websocket.Decoder;
 import javax.websocket.Encoder;
 import javax.websocket.Endpoint;
@@ -65,14 +66,12 @@ public MyEndpointConfiguration() {
 
     @Override
     public Set<ServerEndpointConfig> getEndpointConfigs(Set<Class<? extends Endpoint>> set) {
-        return new HashSet<ServerEndpointConfig>() {
-            {
-                add(ServerEndpointConfig.Builder.create(MyEndpoint.class, "/encoder-programmatic")
+       Set<ServerEndpointConfig> config = new HashSet<ServerEndpointConfig>();
+       config.add(ServerEndpointConfig.Builder.create(MyEndpoint.class, "/encoder-programmatic")
                         .encoders(encoders)
                         .decoders(decoders)
                         .build());
-            }
-        };
+       return config;
     }
 
     @Override

websocket/encoder-programmatic/src/test/java/org/javaee7/websocket/encoder/programmatic/MyClientTest.java

@@ -1,21 +1,25 @@
 package org.javaee7.websocket.encoder.programmatic;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.concurrent.TimeUnit;
+
 import javax.websocket.ContainerProvider;
 import javax.websocket.DeploymentException;
-import javax.websocket.MessageHandler;
 import javax.websocket.Session;
 import javax.websocket.WebSocketContainer;
+
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.arquillian.test.api.ArquillianResource;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.Test;
-import static org.junit.Assert.*;
 import org.junit.runner.RunWith;
 
 /**
@@ -31,37 +35,30 @@ public static WebArchive createDeployment() {
         return ShrinkWrap.create(WebArchive.class)
                 .addClasses(MyEndpoint.class,
                         MyEndpointConfiguration.class,
-                        MyClient.class,
                         MyMessage.class,
                         MyMessageEncoder.class,
                         MyMessageDecoder.class);
     }
 
     @Test
     public void testEndpoint() throws URISyntaxException, DeploymentException, IOException, InterruptedException {
-        final String JSON = "{\"apple\" : \"red\", \"banana\": \"yellow\"}";
+        final String JSON = "{\"apple\":\"red\",\"banana\":\"yellow\"}";
         Session session = connectToServer(MyClient.class);
         assertNotNull(session);
-        session.addMessageHandler(new MessageHandler.Whole<String>() {
-            @Override
-            public void onMessage(String text) {
-                assertEquals(JSON, text);
-            }
-        });
         assertTrue(MyClient.latch.await(2, TimeUnit.SECONDS));
+        assertEquals(JSON, MyClient.response.toString());
     }
 
-    public Session connectToServer(Class endpoint) throws DeploymentException, IOException, URISyntaxException {
+    public Session connectToServer(Class<?> endpoint) throws DeploymentException, IOException, URISyntaxException {
         WebSocketContainer container = ContainerProvider.getWebSocketContainer();
         assertNotNull(container);
         assertNotNull(base);
         URI uri = new URI("ws://"
                 + base.getHost()
                 + ":"
                 + base.getPort()
-                + "/"
                 + base.getPath()
-                + "/encoder-programmatic");
+                + "encoder-programmatic");
         return container.connectToServer(endpoint, uri);
     }
 

websocket/encoder/src/main/java/org/javaee7/websocket/encoder/MyEndpointClientEmptyJSONArray.java

@@ -15,7 +15,8 @@
 @ClientEndpoint
 public class MyEndpointClientEmptyJSONArray {
     public static String JSON = "{}";
-    public static CountDownLatch latch= new CountDownLatch(3);
+    public static CountDownLatch latch= new CountDownLatch(1);
+    public static String response;
 
     @OnOpen
     public void onOpen(Session session) {
@@ -27,8 +28,8 @@ public void onOpen(Session session) {
     }
 
     @OnMessage
-    public String processMessage(String message) {
+    public void processMessage(String message) {
+        response = message;
         latch.countDown();
-        return message;
     }
 }

websocket/encoder/src/main/java/org/javaee7/websocket/encoder/MyEndpointClientJSONObject.java

@@ -14,8 +14,9 @@
  */
 @ClientEndpoint
 public class MyEndpointClientJSONObject {
-    public static CountDownLatch latch = new CountDownLatch(3);
+    public static CountDownLatch latch = new CountDownLatch(1);
     public static String JSON = "{\"apple\" : \"red\", \"banana\": \"yellow\"}";
+    public static String response;
 
     @OnOpen
     public void onOpen(Session session) {
@@ -27,8 +28,8 @@ public void onOpen(Session session) {
     }
 
     @OnMessage
-    public String processMessage(String message) {
+    public void processMessage(String message) {
+        response = message;
         latch.countDown();
-        return message;
     }
 }

websocket/encoder/src/main/java/org/javaee7/websocket/encoder/MyMessageDecoder.java

@@ -52,12 +52,6 @@ public class MyMessageDecoder implements Decoder.Text<MyMessage> {
 
     @Override
     public MyMessage decode(String string) throws DecodeException {
-        if (MyEndpointClientEmptyJSONArray.latch != null)
-            MyEndpointClientEmptyJSONArray.latch.countDown();
-        
-        if (MyEndpointClientJSONObject.latch != null)
-            MyEndpointClientJSONObject.latch.countDown();
-        
         MyMessage myMessage = new MyMessage(Json.createReader(new StringReader(string)).readObject());
         return myMessage;
     }