PAYARA-2399 Add Tyrus client dependencies to Micro profile, and use @RunAsClient

Author: Pandrex247

pom.xml

@@ -442,6 +442,20 @@
                     <version>1.0.Beta3-m1</version> 
                     <scope>test</scope>
                 </dependency>
+                
+                <!-- WebSocket client dependencies -->
+                <dependency>
+                    <groupId>org.glassfish.tyrus</groupId>
+                    <artifactId>tyrus-client</artifactId>
+                    <version>1.13</version>
+                    <scope>test</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.glassfish.tyrus</groupId>
+                    <artifactId>tyrus-container-grizzly-client</artifactId>
+                    <version>1.13</version>
+                    <scope>test</scope>
+                </dependency>
             </dependencies>
 
             <build>

websocket/binary/src/test/java/org/javaee7/websocket/binary/test/MyEndpointTest.java

@@ -20,6 +20,7 @@
 import org.javaee7.websocket.binary.MyEndpointClient;
 import org.javaee7.websocket.binary.MyEndpointInputStream;
 import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.RunAsClient;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.arquillian.test.api.ArquillianResource;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
@@ -43,7 +44,7 @@ public class MyEndpointTest {
      * Arquillian specific method for creating a file which can be deployed
      * while executing the test.
      */
-    @Deployment(testable = false)
+    @Deployment
     public static WebArchive createDeployment() {
         return ShrinkWrap.create(WebArchive.class)
             .addClasses(MyEndpointByteBuffer.class,
@@ -60,6 +61,7 @@ public static WebArchive createDeployment() {
      * @throws IOException
      */
     @Test
+    @RunAsClient
     public void testEndpointByteBuffer() throws URISyntaxException, DeploymentException, IOException, InterruptedException {
         MyEndpointClient.latch = new CountDownLatch(1);
         Session session = connectToServer("bytebuffer");
@@ -79,6 +81,7 @@ public void testEndpointByteBuffer() throws URISyntaxException, DeploymentExcept
      * @throws URISyntaxException
      */
     @Test
+    @RunAsClient
     public void testEndpointByteArray() throws DeploymentException, IOException, URISyntaxException, InterruptedException {
         MyEndpointClient.latch = new CountDownLatch(1);
         Session session = connectToServer("bytearray");
@@ -98,6 +101,7 @@ public void testEndpointByteArray() throws DeploymentException, IOException, URI
      * @throws URISyntaxException
      */
     @Test
+    @RunAsClient
     public void testEndpointInputStream() throws DeploymentException, IOException, URISyntaxException, InterruptedException {
         MyEndpointClient.latch = new CountDownLatch(1);
         Session session = connectToServer("inputstream");

websocket/chat/src/test/java/org/javaee7/websocket/chat/ChatTest.java

@@ -10,6 +10,7 @@
 import javax.websocket.Session;
 import javax.websocket.WebSocketContainer;
 import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.RunAsClient;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.arquillian.test.api.ArquillianResource;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
@@ -27,7 +28,7 @@ public class ChatTest {
     @ArquillianResource
     URI base;
 
-    @Deployment(testable = false)
+    @Deployment()
     public static WebArchive createDeployment() {
         return ShrinkWrap.create(WebArchive.class)
             .addClasses(ChatEndpoint.class,
@@ -36,6 +37,7 @@ public static WebArchive createDeployment() {
     }
 
     @Test
+    @RunAsClient
     public void testConnect() throws URISyntaxException, DeploymentException, IOException, InterruptedException {
         ChatClientEndpoint1.latch = new CountDownLatch(1);
         final Session session1 = connectToServer(ChatClientEndpoint1.class);

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

@@ -15,6 +15,7 @@
 import javax.websocket.WebSocketContainer;
 
 import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.RunAsClient;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.arquillian.test.api.ArquillianResource;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
@@ -34,7 +35,7 @@ public class MyClientTest {
      * Arquillian specific method for creating a file which can be deployed
      * while executing the test.
      */
-    @Deployment(testable = false)
+    @Deployment
     public static WebArchive createDeployment() {
         return ShrinkWrap.create(WebArchive.class)
             .addClasses(MyEndpoint.class,
@@ -44,6 +45,7 @@ public static WebArchive createDeployment() {
     }
 
     @Test
+    @RunAsClient
     public void testEndpoint() throws URISyntaxException, DeploymentException, IOException, InterruptedException {
         String JSON = "{\"apple\":\"red\",\"banana\":\"yellow\"}";
         Session session = connectToServer(MyClient.class);

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

@@ -15,6 +15,7 @@
 import javax.websocket.WebSocketContainer;
 
 import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.RunAsClient;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.arquillian.test.api.ArquillianResource;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
@@ -30,7 +31,7 @@ public class MyClientTest {
     @ArquillianResource
     URI base;
 
-    @Deployment(testable = false)
+    @Deployment
     public static WebArchive createDeployment() {
         return ShrinkWrap.create(WebArchive.class)
             .addClasses(MyEndpoint.class,
@@ -41,6 +42,7 @@ public static WebArchive createDeployment() {
     }
 
     @Test
+    @RunAsClient
     public void testEndpoint() throws URISyntaxException, DeploymentException, IOException, InterruptedException {
         final String JSON = "{\"apple\":\"red\",\"banana\":\"yellow\"}";
         Session session = connectToServer(MyClient.class);

websocket/encoder/src/test/java/org/javaee7/websocket/encoder/EncoderEndpointTest.java

@@ -15,6 +15,7 @@
 import javax.websocket.WebSocketContainer;
 
 import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.RunAsClient;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.arquillian.test.api.ArquillianResource;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
@@ -36,7 +37,7 @@ public class EncoderEndpointTest {
      * Arquillian specific method for creating a file which can be deployed
      * while executing the test.
      */
-    @Deployment(testable = false)
+    @Deployment
     public static WebArchive createDeployment() {
         return ShrinkWrap.create(WebArchive.class)
             .addClasses(MyEndpoint.class,
@@ -46,6 +47,7 @@ public static WebArchive createDeployment() {
     }
 
     @Test
+    @RunAsClient
     public void testEndpointEmptyJSONArray() throws URISyntaxException, DeploymentException, IOException, InterruptedException {
         final Session session = connectToServer(MyEndpointClientEmptyJSONArray.class);
         assertNotNull(session);
@@ -54,6 +56,7 @@ public void testEndpointEmptyJSONArray() throws URISyntaxException, DeploymentEx
     }
 
     @Test
+    @RunAsClient
     public void testEndpointEmptyJSONObject() throws URISyntaxException, DeploymentException, IOException, InterruptedException {
         String JSON = "{\"apple\":\"red\",\"banana\":\"yellow\"}";
         Session session = connectToServer(MyEndpointClientJSONObject.class);

websocket/endpoint-async/src/test/java/org/javaee7/websocket/endpoint/async/MyAsyncEndpointTest.java

@@ -19,6 +19,7 @@
 import static com.jayway.awaitility.Awaitility.*;
 import static org.hamcrest.Matchers.*;
 import static org.hamcrest.MatcherAssert.*;
+import org.jboss.arquillian.container.test.api.RunAsClient;
 
 /**
  *
@@ -32,14 +33,15 @@ public class MyAsyncEndpointTest {
     @ArquillianResource
     private URL base;
 
-    @Deployment(testable = false)
+    @Deployment
     public static WebArchive deploy() throws URISyntaxException {
         return ShrinkWrap.create(WebArchive.class)
             .addClass(MyAsyncEndpointText.class)
             .addClass(MyAsyncEndpointByteBuffer.class);
     }
 
     @Test
+    @RunAsClient
     public void shouldReceiveAsyncTextMessage() throws URISyntaxException, IOException, DeploymentException {
         MyAsyncEndpointTextClient endpoint = new MyAsyncEndpointTextClient();
         Session session = connectToEndpoint(endpoint, "text");
@@ -50,6 +52,7 @@ public void shouldReceiveAsyncTextMessage() throws URISyntaxException, IOExcepti
     }
 
     @Test
+    @RunAsClient
     public void shouldReceiveAsyncByteBufferMessage() throws URISyntaxException, IOException, DeploymentException {
         final ByteBuffer buffer = ByteBuffer.wrap(TEST_MESSAGE.getBytes());
         MyAsyncEndpointByteBufferClient endpoint = new MyAsyncEndpointByteBufferClient();

websocket/endpoint-programmatic/src/test/java/org/javaee7/websocket/endpoint/programmatic/MyEndpointTest.java

@@ -12,6 +12,7 @@
 import javax.websocket.Session;
 import javax.websocket.WebSocketContainer;
 import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.RunAsClient;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.arquillian.test.api.ArquillianResource;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
@@ -31,7 +32,7 @@ public class MyEndpointTest {
     @ArquillianResource
     URI base;
 
-    @Deployment(testable = false)
+    @Deployment
     public static WebArchive createDeployment() {
         return ShrinkWrap.create(WebArchive.class)
             .addClasses(MyEndpoint.class,
@@ -41,6 +42,7 @@ public static WebArchive createDeployment() {
     }
 
     @Test
+    @RunAsClient
     public void testTextEndpoint() throws URISyntaxException, DeploymentException, IOException, InterruptedException {
         MyEndpointTextClient.latch = new CountDownLatch(1);
         final String TEXT = "Hello World!";
@@ -56,6 +58,7 @@ public void onMessage(String text) {
     }
 
     @Test
+    @RunAsClient
     public void testBinaryEndpoint() throws URISyntaxException, DeploymentException, IOException, InterruptedException {
         MyEndpointBinaryClient.latch = new CountDownLatch(1);
         final String TEXT = "Hello World!";

websocket/endpoint/src/test/java/org/javaee7/websocket/endpoint/MyEndpointTest.java

@@ -17,6 +17,7 @@
 import javax.websocket.WebSocketContainer;
 
 import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.RunAsClient;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.arquillian.test.api.ArquillianResource;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
@@ -34,7 +35,7 @@ public class MyEndpointTest {
     @ArquillianResource
     URI base;
 
-    @Deployment(testable = false)
+    @Deployment
     public static WebArchive createDeployment() {
         return ShrinkWrap.create(WebArchive.class)
             .addClasses(MyEndpointText.class,
@@ -48,6 +49,7 @@ public static WebArchive createDeployment() {
     }
 
     @Test
+    @RunAsClient
     public void testTextEndpoint() throws URISyntaxException, DeploymentException, IOException, InterruptedException {
         MyEndpointTextClient.latch = new CountDownLatch(1);
         Session session = connectToServer(MyEndpointTextClient.class, "text");
@@ -57,6 +59,7 @@ public void testTextEndpoint() throws URISyntaxException, DeploymentException, I
     }
 
     @Test
+    @RunAsClient
     public void testEndpointByteBuffer() throws URISyntaxException, DeploymentException, IOException, InterruptedException {
         MyEndpointByteBufferClient.latch = new CountDownLatch(1);
         Session session = connectToServer(MyEndpointByteBufferClient.class, "bytebuffer");
@@ -66,6 +69,7 @@ public void testEndpointByteBuffer() throws URISyntaxException, DeploymentExcept
     }
 
     @Test
+    @RunAsClient
     public void testEndpointByteArray() throws DeploymentException, IOException, URISyntaxException, InterruptedException {
         MyEndpointByteArrayClient.latch = new CountDownLatch(1);
         Session session = connectToServer(MyEndpointByteArrayClient.class, "bytearray");
@@ -76,6 +80,7 @@ public void testEndpointByteArray() throws DeploymentException, IOException, URI
     }
 
     @Test
+    @RunAsClient
     public void testEndpointInputStream() throws DeploymentException, IOException, URISyntaxException, InterruptedException {
         MyEndpointInputStreamClient.latch = new CountDownLatch(1);
         Session session = connectToServer(MyEndpointInputStreamClient.class, "inputstream");