From c521c72178691dc9a0fe12a726c09590ca085738 Mon Sep 17 00:00:00 2001 From: Scott Mitchell Date: Tue, 14 Feb 2017 17:28:11 -0800 Subject: [PATCH] SSLEngineTest cleanup Motivation: OpenSslEngineTest has unused imports and SSLEngineTest uses a fixed port which was used for debugging. Modifications: - Remove unused imports - Use ephemeral port Result: Cleaner test code. --- .../netty/handler/ssl/OpenSslEngineTest.java | 20 ------------------- .../io/netty/handler/ssl/SSLEngineTest.java | 2 +- 2 files changed, 1 insertion(+), 21 deletions(-) diff --git a/handler/src/test/java/io/netty/handler/ssl/OpenSslEngineTest.java b/handler/src/test/java/io/netty/handler/ssl/OpenSslEngineTest.java index 659a623c44..bc96c8ffb3 100644 --- a/handler/src/test/java/io/netty/handler/ssl/OpenSslEngineTest.java +++ b/handler/src/test/java/io/netty/handler/ssl/OpenSslEngineTest.java @@ -15,43 +15,23 @@ */ package io.netty.handler.ssl; -import io.netty.bootstrap.Bootstrap; -import io.netty.bootstrap.ServerBootstrap; import io.netty.buffer.UnpooledByteBufAllocator; -import io.netty.channel.Channel; -import io.netty.channel.ChannelFuture; -import io.netty.channel.ChannelHandlerContext; -import io.netty.channel.ChannelInboundHandlerAdapter; -import io.netty.channel.ChannelInitializer; -import io.netty.channel.ChannelPipeline; -import io.netty.channel.nio.NioEventLoopGroup; -import io.netty.channel.socket.nio.NioServerSocketChannel; -import io.netty.channel.socket.nio.NioSocketChannel; import io.netty.handler.ssl.ApplicationProtocolConfig.Protocol; import io.netty.handler.ssl.ApplicationProtocolConfig.SelectedListenerFailureBehavior; import io.netty.handler.ssl.ApplicationProtocolConfig.SelectorFailureBehavior; import io.netty.handler.ssl.util.InsecureTrustManagerFactory; import io.netty.handler.ssl.util.SelfSignedCertificate; -import io.netty.util.NetUtil; import io.netty.util.internal.ThreadLocalRandom; import org.junit.Assume; import org.junit.BeforeClass; import org.junit.Test; -import java.io.File; -import java.net.InetSocketAddress; import java.nio.ByteBuffer; -import java.nio.channels.ClosedChannelException; -import java.security.KeyStore; import java.util.ArrayList; import java.util.List; -import java.util.concurrent.TimeUnit; - -import javax.net.ssl.KeyManagerFactory; import javax.net.ssl.SSLEngine; import javax.net.ssl.SSLEngineResult; import javax.net.ssl.SSLException; -import javax.net.ssl.SSLHandshakeException; import static io.netty.tcnative.jni.SSL.SSL_CVERIFY_IGNORED; import static org.junit.Assert.assertEquals; diff --git a/handler/src/test/java/io/netty/handler/ssl/SSLEngineTest.java b/handler/src/test/java/io/netty/handler/ssl/SSLEngineTest.java index fe903cc0a9..66879dd120 100644 --- a/handler/src/test/java/io/netty/handler/ssl/SSLEngineTest.java +++ b/handler/src/test/java/io/netty/handler/ssl/SSLEngineTest.java @@ -712,7 +712,7 @@ public abstract class SSLEngineTest { } }); - serverChannel = sb.bind(new InetSocketAddress(9999)).sync().channel(); + serverChannel = sb.bind(new InetSocketAddress(0)).sync().channel(); int port = ((InetSocketAddress) serverChannel.localAddress()).getPort(); ChannelFuture ccf = cb.connect(new InetSocketAddress(NetUtil.LOCALHOST, port));