[646] ConnectSynchronouslyHangTest moved to non_deployable package

Bug: eclipse-ee4j#646 Signed-off-by: Vladimir Golyakov <[email protected]>
wgolyakov · Mar 5, 2021 · 38ac829 · 38ac829
1 parent e8ea50e
commit 38ac829
Showing 1 changed file with 9 additions and 26 deletions.
diff --git a/.../client/ConnectSynchronouslyHangTest.java → ...eployable/JdkClientContainerHangTest.java b/.../client/ConnectSynchronouslyHangTest.java → ...eployable/JdkClientContainerHangTest.java
@@ -14,44 +14,42 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package org.glassfish.tyrus.container.jdk.client;
+package org.glassfish.tyrus.test.e2e.non_deployable;
 
 import java.io.IOException;
 import java.net.ServerSocket;
 import java.net.Socket;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 
 import javax.websocket.ClientEndpoint;
+import javax.websocket.DeploymentException;
 
 import org.glassfish.tyrus.client.ClientManager;
-import org.glassfish.tyrus.client.ClientProperties;
+import org.glassfish.tyrus.container.jdk.client.JdkClientContainer;
 import org.glassfish.tyrus.test.tools.TestContainer;
 
 import org.junit.Test;
 import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
 
 /**
+ * Cannot be moved to standard tests due the expected deployment exception.
+ *
  * @author Vladimir Golyakov
  */
-public class ConnectSynchronouslyHangTest extends TestContainer {
+public class JdkClientContainerHangTest extends TestContainer {
 
     @Test
     public void testConnectSynchronouslyHang() throws IOException, InterruptedException {
-        final ClientManager client = ClientManager.createClient(JdkClientContainer.class.getName());
         Thread clientThread = null;
         ServerSocket server = startBadServer();
         try {
             clientThread = new Thread() {
                 @Override
                 public void run() {
                     try {
-                        client.getProperties().put(ClientProperties.HANDSHAKE_TIMEOUT, 1);
-                        client.getProperties().put(ClientProperties.SHARED_CONTAINER_IDLE_TIMEOUT, 1);
+                        final ClientManager client = ClientManager.createClient(JdkClientContainer.class.getName());
                         client.connectToServer(AnnotatedClientEndpoint.class, getURI("/any-endpoint", "wss"));
-                    } catch (Exception e) {
+                    } catch (DeploymentException | IOException e) {
                         // ignore
                     }
                 }
@@ -66,7 +64,6 @@ public void run() {
                 clientThread.interrupt();
             }
             server.close();
-            waitForThreadPoolShutdown(client);
         }
     }
 
@@ -84,7 +81,7 @@ public void run() {
                     } finally {
                         clientSocket.close();
                     }
-                } catch (Exception e) {
+                } catch (IOException | InterruptedException e) {
                     // ignore
                 }
             }
@@ -95,18 +92,4 @@ public void run() {
     @ClientEndpoint
     public static class AnnotatedClientEndpoint {
     }
-
-    private void waitForThreadPoolShutdown(ClientManager client) {
-        try {
-            /* Tests in the package are sensitive to freeing resources. Unclosed sessions might hinder the next test
-            (if the next test requires a fresh client thread pool) */
-            ExecutorService executorService = client.getExecutorService();
-            ScheduledExecutorService scheduledExecutorService = client.getScheduledExecutorService();
-            client.shutdown();
-            assertTrue(executorService.awaitTermination(5, TimeUnit.SECONDS));
-            assertTrue(scheduledExecutorService.awaitTermination(5, TimeUnit.SECONDS));
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-    }
 }