From 75ce9689c2d2030e2fcd5a1aaa7b0755428be02e Mon Sep 17 00:00:00 2001 From: emeroad Date: Mon, 14 Dec 2015 18:03:00 +0900 Subject: [PATCH] Avoid port conflicts of test cases --- .../receiver/udp/SpanStreamUDPSenderTest.java | 22 ++----------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/collector/src/test/java/com/navercorp/pinpoint/collector/receiver/udp/SpanStreamUDPSenderTest.java b/collector/src/test/java/com/navercorp/pinpoint/collector/receiver/udp/SpanStreamUDPSenderTest.java index 01de9c75f..1b5fe33c4 100644 --- a/collector/src/test/java/com/navercorp/pinpoint/collector/receiver/udp/SpanStreamUDPSenderTest.java +++ b/collector/src/test/java/com/navercorp/pinpoint/collector/receiver/udp/SpanStreamUDPSenderTest.java @@ -44,6 +44,7 @@ import com.navercorp.pinpoint.thrift.dto.TResult; import com.navercorp.pinpoint.thrift.dto.TSpan; import com.navercorp.pinpoint.thrift.dto.TSpanChunk; import com.navercorp.pinpoint.thrift.dto.TSpanEvent; +import org.springframework.util.SocketUtils; /** * @author emeroad @@ -57,7 +58,7 @@ public class SpanStreamUDPSenderTest { @BeforeClass public static void setUp() throws IOException { - port = getAvaiableUDPPort(21111); + port = SocketUtils.findAvailableUdpPort(21111); try { messageHolder = new MessageHolderDispatchHandler(); @@ -75,25 +76,6 @@ public class SpanStreamUDPSenderTest { } } - private static int getAvaiableUDPPort(int defaultPort) throws IOException { - int bindPort = defaultPort; - - DatagramSocket dagagramSocket = null; - while (0xFFFF >= bindPort && dagagramSocket == null) { - try { - dagagramSocket = new DatagramSocket(bindPort); - } catch (IOException ex) { - bindPort++; - } - } - - if (dagagramSocket != null) { - dagagramSocket.close(); - return bindPort; - } - - throw new IOException("can't find available port."); - } @Test public void sendTest1() throws InterruptedException {