Adding a new test and removing redundant files

Author: arun-gupta

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

@@ -40,6 +40,7 @@
 package org.javaee7.websocket.encoder.client;
 
 import java.io.IOException;
+import java.util.concurrent.CountDownLatch;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import javax.websocket.ClientEndpoint;
@@ -55,26 +56,27 @@
 @ClientEndpoint(encoders = {MyMessageEncoder.class},
         decoders={MyMessageDecoder.class})
 public class MyClient {
+    public static CountDownLatch latch= new CountDownLatch(3);
+    
     @OnOpen
     public void onOpen(Session session) {
         System.out.println("Connected to endpoint: " + session.getBasicRemote());
         try {
-            MyMessage message = new MyMessage("{ \"foo\" : \"bar\"}");
-//            MyMessage message = new MyMessage("{ foo : \"bar\"}");
+            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 void processMessage(MyMessage message) {
-        System.out.println("Received message in client: " + message);
+    public MyMessage processMessage(MyMessage message) {
+        latch.countDown();
+        return message;
     }
 
     @OnError
     public void onError(Throwable t) {
-        System.out.println("onError");
         t.printStackTrace();
     }
 }

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

@@ -46,17 +46,14 @@
 /**
  * @author Arun Gupta
  */
-@ServerEndpoint("/websocket")
+@ServerEndpoint("/encoder-client")
 public class MyEndpoint {
 
     @OnOpen
-    public void onOpen() {
-        System.out.println("MyEndpoint.onOpen");
-    }
+    public void onOpen() { }
 
     @OnMessage
-    public String echoText(String text) {
-        System.out.println("Received in endpoint: " + text);
+    public String echoText(String text) { 
         return text;
     }
 

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

@@ -52,6 +52,7 @@ public class MyMessageDecoder implements Decoder.Text<MyMessage> {
 
     @Override
     public MyMessage decode(String string) throws DecodeException {
+        MyClient.latch.countDown();
         return new MyMessage(Json.createReader(new StringReader(string)).readObject());
     }
 
@@ -61,12 +62,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-client/src/main/java/org/javaee7/websocket/encoder/client/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-client/src/main/java/org/javaee7/websocket/encoder/client/TestClient.java

@@ -0,0 +1,76 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package org.javaee7.websocket.encoder.client;
+
+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;
+
+    /**
+     * Arquillian specific method for creating a file which can be deployed
+     * while executing the test.
+     */
+    @Deployment(testable = false)
+    public static WebArchive createDeployment() {
+        return ShrinkWrap.create(WebArchive.class)
+                .addClasses(MyEndpoint.class,
+                        MyMessage.class,
+                        MyMessageEncoder.class,
+                        MyMessageDecoder.class);
+    }
+
+    @Test
+    public void testEndpointEmptyJSONObject() 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-client");
+        return container.connectToServer(endpoint, uri);
+    }
+    
+}