diff --git a/handler/src/test/java/io/netty/handler/ssl/ConscryptJdkSslEngineInteropTest.java b/handler/src/test/java/io/netty/handler/ssl/ConscryptJdkSslEngineInteropTest.java index 63d0e3d949..88b1cf0643 100644 --- a/handler/src/test/java/io/netty/handler/ssl/ConscryptJdkSslEngineInteropTest.java +++ b/handler/src/test/java/io/netty/handler/ssl/ConscryptJdkSslEngineInteropTest.java @@ -16,12 +16,9 @@ package io.netty.handler.ssl; import java.security.Provider; -import org.conscrypt.OpenSSLProvider; import org.junit.BeforeClass; import org.junit.Ignore; -import org.junit.Test; -import javax.net.ssl.SSLException; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; @@ -64,7 +61,7 @@ public class ConscryptJdkSslEngineInteropTest extends SSLEngineTest { @Override protected Provider clientSslContextProvider() { - return new OpenSSLProvider(); + return Java8SslUtils.conscryptProvider(); } @Ignore /* Does the JDK support a "max certificate chain length"? */ diff --git a/handler/src/test/java/io/netty/handler/ssl/Java8SslUtils.java b/handler/src/test/java/io/netty/handler/ssl/Java8SslUtils.java index e11ee5225e..c00cd37c53 100644 --- a/handler/src/test/java/io/netty/handler/ssl/Java8SslUtils.java +++ b/handler/src/test/java/io/netty/handler/ssl/Java8SslUtils.java @@ -16,9 +16,12 @@ package io.netty.handler.ssl; +import org.conscrypt.OpenSSLProvider; + import javax.net.ssl.SNIMatcher; import javax.net.ssl.SNIServerName; import javax.net.ssl.SSLParameters; +import java.security.Provider; import java.util.Collections; final class Java8SslUtils { @@ -34,4 +37,8 @@ final class Java8SslUtils { }; parameters.setSNIMatchers(Collections.singleton(matcher)); } + + static Provider conscryptProvider() { + return new OpenSSLProvider(); + } } diff --git a/handler/src/test/java/io/netty/handler/ssl/JdkConscryptSslEngineInteropTest.java b/handler/src/test/java/io/netty/handler/ssl/JdkConscryptSslEngineInteropTest.java index 425712baa5..49a5dc590f 100644 --- a/handler/src/test/java/io/netty/handler/ssl/JdkConscryptSslEngineInteropTest.java +++ b/handler/src/test/java/io/netty/handler/ssl/JdkConscryptSslEngineInteropTest.java @@ -16,7 +16,6 @@ package io.netty.handler.ssl; import java.security.Provider; -import org.conscrypt.OpenSSLProvider; import org.junit.BeforeClass; import org.junit.Ignore; import org.junit.Test; @@ -62,7 +61,7 @@ public class JdkConscryptSslEngineInteropTest extends SSLEngineTest { @Override protected Provider serverSslContextProvider() { - return new OpenSSLProvider(); + return Java8SslUtils.conscryptProvider(); } @Override