From 14c7877fa26725017c1ed03c32018c1a575279d9 Mon Sep 17 00:00:00 2001
From: nkzawa <naoyuki.kanezawa@gmail.com>
Date: Thu, 13 Jul 2017 16:48:40 +0900
Subject: [PATCH] improve tests

---
 .../io/socket/client/executions/Connection.java     | 13 +++++++++++++
 .../socket/client/executions/ConnectionFailure.java |  7 +++++++
 .../io/socket/client/executions/ImmediateClose.java | 13 +++++++++++++
 3 files changed, 33 insertions(+)

diff --git a/src/test/java/io/socket/client/executions/Connection.java b/src/test/java/io/socket/client/executions/Connection.java
index 1d1a8c8..432be17 100644
--- a/src/test/java/io/socket/client/executions/Connection.java
+++ b/src/test/java/io/socket/client/executions/Connection.java
@@ -3,6 +3,7 @@ package io.socket.client.executions;
 import io.socket.emitter.Emitter;
 import io.socket.client.IO;
 import io.socket.client.Socket;
+import okhttp3.OkHttpClient;
 
 import java.net.URISyntaxException;
 
@@ -11,6 +12,11 @@ public class Connection {
     public static void main(String[] args) throws URISyntaxException {
         IO.Options options = new IO.Options();
         options.forceNew = true;
+
+        final OkHttpClient client = new OkHttpClient();
+        options.webSocketFactory = client;
+        options.callFactory = client;
+
         final Socket socket = IO.socket("http://localhost:" + System.getenv("PORT"), options);
         socket.on(Socket.EVENT_CONNECT, new Emitter.Listener() {
             @Override
@@ -19,6 +25,13 @@ public class Connection {
                 socket.close();
             }
         });
+        socket.io().on(io.socket.engineio.client.Socket.EVENT_CLOSE, new Emitter.Listener() {
+            @Override
+            public void call(Object... args) {
+                System.out.println("engine close");
+                client.dispatcher().executorService().shutdown();
+            }
+        });
         socket.open();
     }
 }
diff --git a/src/test/java/io/socket/client/executions/ConnectionFailure.java b/src/test/java/io/socket/client/executions/ConnectionFailure.java
index 92c9b3b..d87f033 100644
--- a/src/test/java/io/socket/client/executions/ConnectionFailure.java
+++ b/src/test/java/io/socket/client/executions/ConnectionFailure.java
@@ -3,6 +3,7 @@ package io.socket.client.executions;
 import io.socket.emitter.Emitter;
 import io.socket.client.IO;
 import io.socket.client.Socket;
+import okhttp3.OkHttpClient;
 
 import java.net.URISyntaxException;
 
@@ -14,6 +15,11 @@ public class ConnectionFailure {
         IO.Options options = new IO.Options();
         options.forceNew = true;
         options.reconnection = false;
+
+        final OkHttpClient client = new OkHttpClient();
+        options.webSocketFactory = client;
+        options.callFactory = client;
+
         final Socket socket = IO.socket("http://localhost:" + port, options);
         socket.on(Socket.EVENT_CONNECT_TIMEOUT, new Emitter.Listener() {
             @Override
@@ -24,6 +30,7 @@ public class ConnectionFailure {
             @Override
             public void call(Object... args) {
                 System.out.println("connect error");
+                client.dispatcher().executorService().shutdown();
             }
         }).on(Socket.EVENT_DISCONNECT, new Emitter.Listener() {
             @Override
diff --git a/src/test/java/io/socket/client/executions/ImmediateClose.java b/src/test/java/io/socket/client/executions/ImmediateClose.java
index 1e889fd..fa23d16 100644
--- a/src/test/java/io/socket/client/executions/ImmediateClose.java
+++ b/src/test/java/io/socket/client/executions/ImmediateClose.java
@@ -3,6 +3,7 @@ package io.socket.client.executions;
 import io.socket.emitter.Emitter;
 import io.socket.client.IO;
 import io.socket.client.Socket;
+import okhttp3.OkHttpClient;
 
 import java.net.URISyntaxException;
 
@@ -11,6 +12,11 @@ public class ImmediateClose {
     public static void main(String[] args) throws URISyntaxException {
         IO.Options options = new IO.Options();
         options.forceNew = true;
+
+        final OkHttpClient client = new OkHttpClient();
+        options.webSocketFactory = client;
+        options.callFactory = client;
+
         final Socket socket = IO.socket("http://localhost:" + System.getenv("PORT"), options);
         socket.on(Socket.EVENT_CONNECT, new Emitter.Listener() {
             @Override
@@ -23,6 +29,13 @@ public class ImmediateClose {
                 System.out.println("disconnect");
             }
         });
+        socket.io().on(io.socket.engineio.client.Socket.EVENT_CLOSE, new Emitter.Listener() {
+            @Override
+            public void call(Object... args) {
+                System.out.println("engine close");
+                client.dispatcher().executorService().shutdown();
+            }
+        });
         socket.connect();
         socket.disconnect();
     }