Test clean ups. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/cb3d35e5 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/cb3d35e5 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/cb3d35e5
Branch: refs/heads/LOG4J2-649 Commit: cb3d35e572869b815766b9eb5986293fc5f3426f Parents: d49c49f Author: ggregory <ggreg...@apache.org> Authored: Wed Dec 2 09:21:49 2015 -0800 Committer: ggregory <ggreg...@apache.org> Committed: Wed Dec 2 09:21:49 2015 -0800 ---------------------------------------------------------------------- .../log4j/core/appender/SocketAppenderTest.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/cb3d35e5/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java index 87b06cb..21bf250 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java @@ -54,11 +54,8 @@ import org.junit.Test; */ public class SocketAppenderTest { - private static final int PORTNUM1 = AvailablePortFinder.getNextAvailable(); - private static final int PORTNUM2 = AvailablePortFinder.getNextAvailable(); - - private static final int PORT = PORTNUM1; - private static final int DYN_PORT = PORTNUM2; + private static final int PORT = AvailablePortFinder.getNextAvailable(); + private static final int DYN_PORT = AvailablePortFinder.getNextAvailable(); private static final int ERROR_PORT = AvailablePortFinder.getNextAvailable(); private static BlockingQueue<LogEvent> list = new ArrayBlockingQueue<>(10); @@ -74,7 +71,7 @@ public class SocketAppenderTest { @BeforeClass public static void setupClass() throws Exception { - tcpServer = new TCPSocketServer(PORTNUM1); + tcpServer = new TCPSocketServer(AvailablePortFinder.getNextAvailable()); tcpServer.start(); udpServer = new UDPSocketServer(); udpServer.start(); @@ -178,7 +175,7 @@ public class SocketAppenderTest { root.setAdditive(false); root.setLevel(Level.DEBUG); - new TCPSocketServer(PORTNUM2).start(); + new TCPSocketServer(AvailablePortFinder.getNextAvailable()).start(); root.debug("This message is written because a deadlock never."); @@ -212,7 +209,7 @@ public class SocketAppenderTest { private Thread thread; public UDPSocketServer() throws IOException { - this.sock = new DatagramSocket(PORTNUM1); + this.sock = new DatagramSocket(AvailablePortFinder.getNextAvailable()); } public void shutdown() {
