You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ma...@apache.org on 2014/05/22 16:48:00 UTC

svn commit: r1596892 - in /logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core: appender/ net/ net/server/

Author: mattsicker
Date: Thu May 22 14:48:00 2014
New Revision: 1596892

URL: http://svn.apache.org/r1596892
Log:
Update tests to use AvailablePortFinder.

Modified:
    logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SmtpAppenderTest.java
    logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java
    logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/SocketMessageLossTest.java
    logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/SocketReconnectTest.java
    logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/SocketTest.java
    logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/AbstractSocketServerTest.java

Modified: logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SmtpAppenderTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SmtpAppenderTest.java?rev=1596892&r1=1596891&r2=1596892&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SmtpAppenderTest.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SmtpAppenderTest.java Thu May 22 14:48:00 2014
@@ -31,6 +31,7 @@ import org.apache.logging.log4j.core.Log
 import org.apache.logging.log4j.core.LoggerContext;
 import org.apache.logging.log4j.core.net.MimeMessageBuilder;
 import org.apache.logging.log4j.core.util.CyclicBuffer;
+import org.apache.logging.log4j.test.AvailablePortFinder;
 import org.junit.Test;
 
 import static org.junit.Assert.*;
@@ -38,8 +39,8 @@ import static org.junit.Assert.*;
 public class SmtpAppenderTest {
 
     private static final String HOST = "localhost";
-    private static final String PORT = "8199";
-    private static final int PORTNUM = Integer.parseInt(PORT);
+    private static final int PORTNUM = AvailablePortFinder.getNextAvailable();
+    private static final String PORT = String.valueOf(PORTNUM);
 
     @Test
     public void testMessageFactorySetFrom() throws MessagingException {

Modified: logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java?rev=1596892&r1=1596891&r2=1596892&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java Thu May 22 14:48:00 2014
@@ -36,6 +36,7 @@ import org.apache.logging.log4j.core.App
 import org.apache.logging.log4j.core.LogEvent;
 import org.apache.logging.log4j.core.Logger;
 import org.apache.logging.log4j.core.LoggerContext;
+import org.apache.logging.log4j.test.AvailablePortFinder;
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
@@ -48,11 +49,12 @@ import static org.junit.Assert.*;
  */
 public class SocketAppenderTest {
 
-    private static final String PORT = "8199";
-    private static final String DYN_PORT = "8300";
-    private static final String ERROR_PORT = "8301";
-    private static final int PORTNUM1 = Integer.parseInt(PORT);
-    private static final int PORTNUM2 = Integer.parseInt(DYN_PORT);
+    private static final int PORTNUM1 = AvailablePortFinder.getNextAvailable();
+    private static final int PORTNUM2 = AvailablePortFinder.getNextAvailable();
+
+    private static final String PORT = String.valueOf(PORTNUM1);
+    private static final String DYN_PORT = String.valueOf(PORTNUM2);
+    private static final String ERROR_PORT = String.valueOf(AvailablePortFinder.getNextAvailable());
 
     private static BlockingQueue<LogEvent> list = new ArrayBlockingQueue<LogEvent>(10);
 
@@ -182,6 +184,7 @@ public class SocketAppenderTest {
             root.debug("This message is written because a deadlock never.");
             fail("No Exception was thrown");
         } catch (final Exception ex) {
+            // TODO: move exception to @Test(expect = Exception.class)
             // Failure is expected.
         }
     }

Modified: logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/SocketMessageLossTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/SocketMessageLossTest.java?rev=1596892&r1=1596891&r2=1596892&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/SocketMessageLossTest.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/SocketMessageLossTest.java Thu May 22 14:48:00 2014
@@ -30,6 +30,7 @@ import java.util.concurrent.Future;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.core.appender.AppenderLoggingException;
 import org.apache.logging.log4j.junit.InitialLoggerContext;
+import org.apache.logging.log4j.test.AvailablePortFinder;
 import org.junit.ClassRule;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -38,7 +39,7 @@ import static org.junit.Assert.*;
 
 @Ignore("Currently needs better port choosing support")
 public class SocketMessageLossTest {
-    private static final int SOCKET_PORT = 5514;
+    private static final int SOCKET_PORT = AvailablePortFinder.getNextAvailable();
 
     private static final String CONFIG = "log4j-socket2.xml";
 

Modified: logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/SocketReconnectTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/SocketReconnectTest.java?rev=1596892&r1=1596891&r2=1596892&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/SocketReconnectTest.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/SocketReconnectTest.java Thu May 22 14:48:00 2014
@@ -27,6 +27,7 @@ import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.core.appender.AppenderLoggingException;
 import org.apache.logging.log4j.core.util.Constants;
 import org.apache.logging.log4j.junit.InitialLoggerContext;
+import org.apache.logging.log4j.test.AvailablePortFinder;
 import org.junit.ClassRule;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -35,7 +36,7 @@ import static org.junit.Assert.*;
 
 @Ignore("Currently needs better port choosing support")
 public class SocketReconnectTest {
-    private static final int SOCKET_PORT = 5514;
+    private static final int SOCKET_PORT = AvailablePortFinder.getNextAvailable();
 
     private static final String CONFIG = "log4j-socket.xml";
 

Modified: logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/SocketTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/SocketTest.java?rev=1596892&r1=1596891&r2=1596892&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/SocketTest.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/SocketTest.java Thu May 22 14:48:00 2014
@@ -25,6 +25,7 @@ import java.util.concurrent.Callable;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.core.appender.AppenderLoggingException;
 import org.apache.logging.log4j.junit.InitialLoggerContext;
+import org.apache.logging.log4j.test.AvailablePortFinder;
 import org.junit.ClassRule;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -33,7 +34,7 @@ import static org.junit.Assert.*;
 
 @Ignore("Currently needs better port choosing support")
 public class SocketTest {
-    private static final int SOCKET_PORT = 5514;
+    private static final int SOCKET_PORT = AvailablePortFinder.getNextAvailable();
 
     private static final String CONFIG = "log4j-socket.xml";
 
@@ -42,6 +43,7 @@ public class SocketTest {
 
     @Test
     public void testConnect() throws Exception {
+        // TODO: there's a JUnit rule that simplifies this (matt)
         System.err.println("Initializing logger");
         Logger logger = null;
         try {

Modified: logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/AbstractSocketServerTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/AbstractSocketServerTest.java?rev=1596892&r1=1596891&r2=1596892&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/AbstractSocketServerTest.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/AbstractSocketServerTest.java Thu May 22 14:48:00 2014
@@ -37,6 +37,7 @@ import org.apache.logging.log4j.core.fil
 import org.apache.logging.log4j.core.layout.JsonLayout;
 import org.apache.logging.log4j.core.layout.PatternLayout;
 import org.apache.logging.log4j.core.layout.XmlLayout;
+import org.apache.logging.log4j.test.AvailablePortFinder;
 import org.apache.logging.log4j.test.appender.ListAppender;
 import org.junit.After;
 import org.junit.Ignore;
@@ -67,9 +68,9 @@ public abstract class AbstractSocketServ
 
     private static final String MESSAGE_2 = "This is test message 2";
 
-    static final String PORT = "8199";
+    static final int PORT_NUM = AvailablePortFinder.getNextAvailable();
 
-    static final int PORT_NUM = Integer.parseInt(PORT);
+    static final String PORT = String.valueOf(PORT_NUM);
 
     private final LoggerContext ctx = (LoggerContext) LogManager.getContext(false);