diff --git a/netty-socketio-core/src/test/java/com/socketio4j/socketio/transport/SocketIoJavaClientSslTest.java b/netty-socketio-core/src/test/java/com/socketio4j/socketio/transport/SocketIoJavaClientSslTest.java index 3a018052..99d653fd 100644 --- a/netty-socketio-core/src/test/java/com/socketio4j/socketio/transport/SocketIoJavaClientSslTest.java +++ b/netty-socketio-core/src/test/java/com/socketio4j/socketio/transport/SocketIoJavaClientSslTest.java @@ -55,6 +55,23 @@ public class SocketIoJavaClientSslTest { private SocketIOServer server; + private X509TrustManager trustAllManager() { + return new X509TrustManager() { + @Override + public void checkClientTrusted(X509Certificate[] chain, String authType) { + } + + @Override + public void checkServerTrusted(X509Certificate[] chain, String authType) { + } + + @Override + public X509Certificate[] getAcceptedIssuers() { + return new X509Certificate[0]; + } + }; + } + @AfterEach public void tearDown() { if (server != null) { @@ -74,20 +91,7 @@ public void shouldReceiveHelloEventAndAckOverWssFromJavaClient() throws Exceptio int port = awaitBoundPort(server); assertTrue(port > 0, "server did not bind an ephemeral port"); - X509TrustManager trustAll = new X509TrustManager() { - @Override - public void checkClientTrusted(X509Certificate[] chain, String authType) { - } - - @Override - public void checkServerTrusted(X509Certificate[] chain, String authType) { - } - - @Override - public X509Certificate[] getAcceptedIssuers() { - return new X509Certificate[0]; - } - }; + X509TrustManager trustAll = trustAllManager(); SSLContext sslContext = SSLContext.getInstance("TLS"); sslContext.init(null, new TrustManager[] { trustAll }, new SecureRandom()); @@ -97,12 +101,7 @@ public X509Certificate[] getAcceptedIssuers() { .readTimeout(1, TimeUnit.MINUTES) .build(); - IO.Options opts = new IO.Options(); - opts.forceNew = true; - opts.reconnection = false; - opts.transports = new String[] { "websocket" }; - opts.webSocketFactory = okHttp; - opts.callFactory = okHttp; + IO.Options opts = createIoOptions(okHttp, "websocket"); Socket socket = IO.socket("https://127.0.0.1:" + port, opts); try { @@ -153,20 +152,7 @@ public void shouldHandshakeOverWssWhenSslProtocolNotExplicitlyConfigured() throw int port = awaitBoundPort(server); assertTrue(port > 0, "server did not bind an ephemeral port"); - X509TrustManager trustAll = new X509TrustManager() { - @Override - public void checkClientTrusted(X509Certificate[] chain, String authType) { - } - - @Override - public void checkServerTrusted(X509Certificate[] chain, String authType) { - } - - @Override - public X509Certificate[] getAcceptedIssuers() { - return new X509Certificate[0]; - } - }; + X509TrustManager trustAll = trustAllManager(); SSLContext sslContext = SSLContext.getInstance("TLS"); sslContext.init(null, new TrustManager[] { trustAll }, new SecureRandom()); @@ -176,12 +162,7 @@ public X509Certificate[] getAcceptedIssuers() { .readTimeout(1, TimeUnit.MINUTES) .build(); - IO.Options opts = new IO.Options(); - opts.forceNew = true; - opts.reconnection = false; - opts.transports = new String[] { "websocket" }; - opts.webSocketFactory = okHttp; - opts.callFactory = okHttp; + IO.Options opts = createIoOptions(okHttp, "websocket"); Socket socket = IO.socket("https://127.0.0.1:" + port, opts); try { @@ -238,20 +219,7 @@ public void shouldPollUpgradeToWebSocketWithServerPushAndClientHelloAckOverWss() int port = awaitBoundPort(server); assertTrue(port > 0, "server did not bind an ephemeral port"); - X509TrustManager trustAll = new X509TrustManager() { - @Override - public void checkClientTrusted(X509Certificate[] chain, String authType) { - } - - @Override - public void checkServerTrusted(X509Certificate[] chain, String authType) { - } - - @Override - public X509Certificate[] getAcceptedIssuers() { - return new X509Certificate[0]; - } - }; + X509TrustManager trustAll = trustAllManager(); SSLContext sslContext = SSLContext.getInstance("TLS"); sslContext.init(null, new TrustManager[] { trustAll }, new SecureRandom()); @@ -261,12 +229,7 @@ public X509Certificate[] getAcceptedIssuers() { .readTimeout(1, TimeUnit.MINUTES) .build(); - IO.Options opts = new IO.Options(); - opts.forceNew = true; - opts.reconnection = false; - opts.transports = new String[] { "polling", "websocket" }; - opts.webSocketFactory = okHttp; - opts.callFactory = okHttp; + IO.Options opts = createIoOptions(okHttp, "polling","websocket"); Socket socket = IO.socket("https://127.0.0.1:" + port, opts); try { @@ -322,10 +285,7 @@ public void shouldReceiveHelloEventAndAckOverPlainWebSocketFromJavaClient() thro int port = awaitBoundPort(server); assertTrue(port > 0, "server did not bind an ephemeral port"); - IO.Options opts = new IO.Options(); - opts.forceNew = true; - opts.reconnection = false; - opts.transports = new String[] { "websocket" }; + IO.Options opts = createIoOptions(null, "websocket"); Socket socket = IO.socket("http://127.0.0.1:" + port, opts); try { @@ -376,20 +336,7 @@ public void shouldReceiveHelloEventAndAckOverPollingFromJavaClient() throws Exce int port = awaitBoundPort(server); assertTrue(port > 0, "server did not bind an ephemeral port"); - X509TrustManager trustAll = new X509TrustManager() { - @Override - public void checkClientTrusted(X509Certificate[] chain, String authType) { - } - - @Override - public void checkServerTrusted(X509Certificate[] chain, String authType) { - } - - @Override - public X509Certificate[] getAcceptedIssuers() { - return new X509Certificate[0]; - } - }; + X509TrustManager trustAll = trustAllManager(); SSLContext sslContext = SSLContext.getInstance("TLS"); sslContext.init(null, new TrustManager[] { trustAll }, new SecureRandom()); @@ -399,12 +346,7 @@ public X509Certificate[] getAcceptedIssuers() { .readTimeout(1, TimeUnit.MINUTES) .build(); - IO.Options opts = new IO.Options(); - opts.forceNew = true; - opts.reconnection = false; - opts.transports = new String[] { "polling" }; - opts.webSocketFactory = okHttp; - opts.callFactory = okHttp; + IO.Options opts = createIoOptions(okHttp, "polling"); Socket socket = IO.socket("https://127.0.0.1:" + port, opts); try { @@ -455,10 +397,7 @@ public void shouldReceiveHelloEventAndAckOverPlainPollingFromJavaClient() throws int port = awaitBoundPort(server); assertTrue(port > 0, "server did not bind an ephemeral port"); - IO.Options opts = new IO.Options(); - opts.forceNew = true; - opts.reconnection = false; - opts.transports = new String[] { "polling" }; + IO.Options opts = createIoOptions(null, "polling"); Socket socket = IO.socket("http://127.0.0.1:" + port, opts); try { @@ -557,4 +496,13 @@ private static int awaitBoundPort(SocketIOServer server) throws InterruptedExcep } return port; } + private IO.Options createIoOptions(OkHttpClient okHttp, String... transports) { + IO.Options opts = new IO.Options(); + opts.forceNew = true; + opts.reconnection = false; + opts.transports = transports; + opts.webSocketFactory = okHttp; + opts.callFactory = okHttp; + return opts; + } }