Adding a new test, still failing with handshake

Author: arun-gupta

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

@@ -0,0 +1,43 @@
+package org.javaee7.websocket.encoder.programmatic;
+
+import java.io.IOException;
+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;
+import javax.websocket.OnMessage;
+import javax.websocket.OnOpen;
+import javax.websocket.Session;
+
+/**
+ * @author Arun Gupta
+ */
+@ClientEndpoint(encoders = {MyMessageEncoder.class},
+        decoders={MyMessageDecoder.class})
+public class MyClient {
+    public static CountDownLatch latch= new CountDownLatch(4);
+    
+    @OnOpen
+    public void onOpen(Session session) {
+        System.out.println("Connected to endpoint: " + session.getBasicRemote());
+        try {
+            MyMessage message = new MyMessage("{\"apple\" : \"red\", \"banana\": \"yellow\"}");
+            session.getBasicRemote().sendObject(message);
+        } catch (IOException | EncodeException ex) {
+            Logger.getLogger(MyClient.class.getName()).log(Level.SEVERE, null, ex);
+        }
+    }
+    
+    @OnMessage
+    public MyMessage processMessage(MyMessage message) {
+        latch.countDown();
+        return message;
+    }
+    
+    @OnError
+    public void onError(Throwable t) {
+        t.printStackTrace();
+    }
+}

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

@@ -57,9 +57,10 @@ public void onOpen(final Session session, EndpointConfig ec) {
         session.addMessageHandler(new MessageHandler.Whole<String>() {
 
             @Override
-            public void onMessage(String name) {
+            public void onMessage(String text) {
                 try {
-                    session.getBasicRemote().sendText("Hello " + name);
+                    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

@@ -67,7 +67,7 @@ public MyEndpointConfiguration() {
     public Set<ServerEndpointConfig> getEndpointConfigs(Set<Class<? extends Endpoint>> set) {
         return new HashSet<ServerEndpointConfig>() {
             {
-                add(ServerEndpointConfig.Builder.create(MyEndpoint.class, "/websocket")
+                add(ServerEndpointConfig.Builder.create(MyEndpoint.class, "/encoder-programmatic")
                         .encoders(encoders)
                         .decoders(decoders)
                         .build());
@@ -79,6 +79,4 @@ public Set<ServerEndpointConfig> getEndpointConfigs(Set<Class<? extends Endpoint
     public Set<Class<?>> getAnnotatedEndpointClasses(Set<Class<?>> set) {
         return Collections.emptySet();
     }
-    
-    
 }

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

@@ -39,6 +39,8 @@
  */
 package org.javaee7.websocket.encoder.programmatic;
 
+import java.io.StringReader;
+import javax.json.Json;
 import javax.json.JsonObject;
 
 /**
@@ -50,6 +52,10 @@ public class MyMessage {
 
     public MyMessage() {
     }
+    
+    public MyMessage(String string) {
+        jsonObject = Json.createReader(new StringReader(string)).readObject();
+    }
 
     public MyMessage(JsonObject jsonObject) {
         this.jsonObject = jsonObject;

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

@@ -52,6 +52,7 @@ public class MyMessageDecoder implements Decoder.Text<MyMessage> {
 
     @Override
     public MyMessage decode(String string) throws DecodeException {
+        MyClient.latch.countDown();
         MyMessage myMessage = new MyMessage(Json.createReader(new StringReader(string)).readObject());
         return myMessage;
     }
@@ -62,12 +63,8 @@ public boolean willDecode(String string) {
     }
 
     @Override
-    public void init(EndpointConfig ec) {
-        System.out.println("init");
-    }
+    public void init(EndpointConfig ec) { }
 
     @Override
-    public void destroy() {
-        System.out.println("desroy");
-    }
+    public void destroy() { }
 }

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

@@ -49,16 +49,13 @@
 public class MyMessageEncoder implements Encoder.Text<MyMessage> {
     @Override
     public String encode(MyMessage myMessage) throws EncodeException {
+        MyClient.latch.countDown();
         return myMessage.getJsonObject().toString();
     }
 
     @Override
-    public void init(EndpointConfig ec) {
-        System.out.println("init");
-    }
+    public void init(EndpointConfig ec) { }
 
     @Override
-    public void destroy() {
-        System.out.println("desroy");
-    }    
+    public void destroy() { }    
 }

websocket/encoder-programmatic/src/main/webapp/index.jsp

@@ -0,0 +1,68 @@
+package org.javaee7.websocket.encoder.programmatic;
+
+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;
+
+/**
+ * @author Arun Gupta
+ */
+@RunWith(Arquillian.class)
+public class MyClientTest {
+    @ArquillianResource
+    URI base;
+
+    @Deployment(testable = false)
+    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\"}";
+        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));
+    }
+    
+    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");
+        return container.connectToServer(endpoint, uri);
+    }
+    
+}