Adding a new test, still failing with handshake

Author: arun-gupta

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

@@ -62,6 +62,7 @@ public void onOpen(final Session session, EndpointConfig ec) {
             @Override
             public void onMessage(String text) {
                 try {
+                    MyEndpointTextClient.latch.countDown();
                     session.getBasicRemote().sendText(text);
                 } catch (IOException ex) {
                     Logger.getLogger(MyEndpoint.class.getName()).log(Level.SEVERE, null, ex);
@@ -74,6 +75,7 @@ public void onMessage(String text) {
             @Override
             public void onMessage(ByteBuffer t) {
                 try {
+                    MyEndpointBinaryClient.latch.countDown();
                     session.getBasicRemote().sendBinary(t);
                 } catch (IOException ex) {
                     Logger.getLogger(MyEndpoint.class.getName()).log(Level.SEVERE, null, ex);
@@ -93,11 +95,11 @@ public void onMessage(PongMessage t) {
 
     @Override
     public void onClose(Session session, CloseReason closeReason) {
-        System.out.println("Closing: " + closeReason.getReasonPhrase());
+        System.err.println("Closing: " + closeReason.getReasonPhrase());
     }
 
     @Override
     public void onError(Session session, Throwable t) {
-        System.out.println("Error: " + t.getLocalizedMessage());
+        System.err.println("Error: " + t.getLocalizedMessage());
     }
 }

websocket/endpoint-programmatic/src/main/java/org/javaee7/websocket/endpoint/programmatic/MyEndpointBinaryClient.java

@@ -0,0 +1,28 @@
+package org.javaee7.websocket.endpoint.programmatic;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.util.concurrent.CountDownLatch;
+
+import javax.websocket.ClientEndpoint;
+import javax.websocket.OnOpen;
+import javax.websocket.Session;
+
+/**
+ * @author Arun Gupta
+ */
+@ClientEndpoint
+public class MyEndpointBinaryClient {
+    public static CountDownLatch latch= new CountDownLatch(2);
+    public static byte[] response;
+
+    @OnOpen
+    public void onOpen(Session session) {
+        try {
+            latch.countDown();
+            session.getBasicRemote().sendBinary(ByteBuffer.wrap("Hello World!".getBytes()));
+        } catch (IOException ioe) {
+            ioe.printStackTrace();
+        }
+    }
+}

…nt/programmatic/MyApplicationConfig.java …point/programmatic/MyEndpointConfig.javawebsocket/endpoint-programmatic/src/main/java/org/javaee7/websocket/endpoint/programmatic/MyApplicationConfig.java renamed to websocket/endpoint-programmatic/src/main/java/org/javaee7/websocket/endpoint/programmatic/MyEndpointConfig.java websocket/endpoint-programmatic/src/main/java/org/javaee7/websocket/endpoint/programmatic/MyApplicationConfig.java renamed to websocket/endpoint-programmatic/src/main/java/org/javaee7/websocket/endpoint/programmatic/MyEndpointConfig.java

@@ -49,7 +49,7 @@
 /**
  * @author Arun Gupta
  */
-public class MyApplicationConfig implements ServerApplicationConfig {
+public class MyEndpointConfig implements ServerApplicationConfig {
 
     @Override
     public Set<ServerEndpointConfig> getEndpointConfigs(Set<Class<? extends Endpoint>> set) {

websocket/endpoint-programmatic/src/main/java/org/javaee7/websocket/endpoint/programmatic/MyEndpointTextClient.java

@@ -0,0 +1,27 @@
+package org.javaee7.websocket.endpoint.programmatic;
+
+import java.io.IOException;
+import java.util.concurrent.CountDownLatch;
+
+import javax.websocket.ClientEndpoint;
+import javax.websocket.OnOpen;
+import javax.websocket.Session;
+
+/**
+ * @author Arun Gupta
+ */
+@ClientEndpoint
+public class MyEndpointTextClient {
+    public static CountDownLatch latch= new CountDownLatch(2);
+    public static byte[] response;
+
+    @OnOpen
+    public void onOpen(Session session) {
+        try {
+            latch.countDown();
+            session.getBasicRemote().sendText("Hello world!");
+        } catch (IOException ioe) {
+            ioe.printStackTrace();
+        }
+    }
+}

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

@@ -0,0 +1,82 @@
+package org.javaee7.websocket.endpoint.programmatic;
+
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.nio.ByteBuffer;
+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 static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * @author Arun Gupta
+ */
+@RunWith(Arquillian.class)
+public class MyEndpointTest {
+
+    @ArquillianResource
+    URI base;
+
+    @Deployment(testable=false)
+    public static WebArchive createDeployment() {
+        return ShrinkWrap.create(WebArchive.class)
+                .addClasses(MyEndpoint.class,
+                        MyEndpointConfig.class,
+                        MyEndpointTextClient.class,
+                        MyEndpointBinaryClient.class);
+    }
+    
+    @Test
+    public void testTextEndpoint() throws URISyntaxException, DeploymentException, IOException, InterruptedException {
+        final String TEXT = "Hello World!";
+        Session session = connectToServer(MyEndpointTextClient.class);
+        assertNotNull(session);
+        session.addMessageHandler(new MessageHandler.Whole<String>() {
+            @Override
+            public void onMessage(String text) {
+                assertEquals(TEXT, text);
+            }
+        });
+        assertTrue(MyEndpointTextClient.latch.await(2, TimeUnit.SECONDS));
+    }
+    
+    @Test
+    public void testBinaryEndpoint() throws URISyntaxException, DeploymentException, IOException, InterruptedException {
+        final String TEXT = "Hello World!";
+        Session session = connectToServer(MyEndpointBinaryClient.class);
+        assertNotNull(session);
+        session.addMessageHandler(new MessageHandler.Whole<ByteBuffer>() {
+            @Override
+            public void onMessage(ByteBuffer binary) {
+                assertEquals(TEXT, binary);
+            }
+        });
+        assertTrue(MyEndpointBinaryClient.latch.await(2, TimeUnit.SECONDS));
+    }
+
+    public Session connectToServer(Class endpoint) throws DeploymentException, IOException, URISyntaxException {
+        WebSocketContainer container = ContainerProvider.getWebSocketContainer();
+        URI uri = new URI("ws://"
+                        + base.getHost()
+                        + ":"
+                        + base.getPort()
+                        + "/"
+                        + base.getPath()
+                        + "/websocket");
+        System.out.println("Connecting to: " + uri);
+        return container.connectToServer(endpoint, uri);
+    }
+}