You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2014/06/26 05:22:34 UTC
svn commit: r1605658 - in /logging/log4j/log4j2/trunk/log4j-flume-ng: ./
src/test/java/org/apache/logging/log4j/core/
src/test/java/org/apache/logging/log4j/flume/appender/
Author: ggregory
Date: Thu Jun 26 03:22:33 2014
New Revision: 1605658
URL: http://svn.apache.org/r1605658
Log:
Re-used AvailablePortFinder from the Core tests and remove the recently refactored FreePortFinder.
Removed:
logging/log4j/log4j2/trunk/log4j-flume-ng/src/test/java/org/apache/logging/log4j/core/
Modified:
logging/log4j/log4j2/trunk/log4j-flume-ng/pom.xml
logging/log4j/log4j2/trunk/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeAppenderTest.java
logging/log4j/log4j2/trunk/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAgentTest.java
logging/log4j/log4j2/trunk/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAppenderTest.java
logging/log4j/log4j2/trunk/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentAppenderTest.java
logging/log4j/log4j2/trunk/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentPerf.java
Modified: logging/log4j/log4j2/trunk/log4j-flume-ng/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-flume-ng/pom.xml?rev=1605658&r1=1605657&r2=1605658&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-flume-ng/pom.xml (original)
+++ logging/log4j/log4j2/trunk/log4j-flume-ng/pom.xml Thu Jun 26 03:22:33 2014
@@ -61,6 +61,12 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
Modified: logging/log4j/log4j2/trunk/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeAppenderTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeAppenderTest.java?rev=1605658&r1=1605657&r2=1605658&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeAppenderTest.java (original)
+++ logging/log4j/log4j2/trunk/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeAppenderTest.java Thu Jun 26 03:22:33 2014
@@ -45,9 +45,9 @@ import org.apache.logging.log4j.LogManag
import org.apache.logging.log4j.ThreadContext;
import org.apache.logging.log4j.core.Appender;
import org.apache.logging.log4j.core.Logger;
-import org.apache.logging.log4j.core.net.FreePortFinder;
import org.apache.logging.log4j.message.StructuredDataMessage;
import org.apache.logging.log4j.status.StatusLogger;
+import org.apache.logging.log4j.test.AvailablePortFinder;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
@@ -83,8 +83,7 @@ public class FlumeAppenderTest {
*/
removeAppenders(avroLogger);
final Context context = new Context();
- final int[] ports = FreePortFinder.findFreePorts(1);
- testPort = String.valueOf(ports[0]);
+ testPort = String.valueOf(AvailablePortFinder.getNextAvailable());
context.put("port", testPort);
context.put("bind", "0.0.0.0");
Configurables.configure(eventSource, context);
Modified: logging/log4j/log4j2/trunk/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAgentTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAgentTest.java?rev=1605658&r1=1605657&r2=1605658&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAgentTest.java (original)
+++ logging/log4j/log4j2/trunk/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAgentTest.java Thu Jun 26 03:22:33 2014
@@ -23,7 +23,6 @@ import java.io.IOException;
import java.io.InputStream;
import java.lang.management.ManagementFactory;
import java.net.InetSocketAddress;
-import java.net.ServerSocket;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -49,9 +48,9 @@ import org.apache.logging.log4j.LogManag
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.core.LoggerContext;
import org.apache.logging.log4j.core.config.ConfigurationFactory;
-import org.apache.logging.log4j.core.net.FreePortFinder;
import org.apache.logging.log4j.message.StructuredDataMessage;
import org.apache.logging.log4j.status.StatusLogger;
+import org.apache.logging.log4j.test.AvailablePortFinder;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Assert;
@@ -96,11 +95,12 @@ public class FlumeEmbeddedAgentTest {
* Clear out all other appenders associated with this logger to ensure we're
* only hitting the Avro appender.
*/
- final int[] ports = FreePortFinder.findFreePorts(2);
- System.setProperty("primaryPort", Integer.toString(ports[0]));
- System.setProperty("alternatePort", Integer.toString(ports[1]));
- primary = new EventCollector(ports[0]);
- alternate = new EventCollector(ports[1]);
+ int primaryPort = AvailablePortFinder.getNextAvailable();
+ int altPort = AvailablePortFinder.getNextAvailable();
+ System.setProperty("primaryPort", Integer.toString(primaryPort));
+ System.setProperty("alternatePort", Integer.toString(altPort));
+ primary = new EventCollector(primaryPort);
+ alternate = new EventCollector(altPort);
System.setProperty(ConfigurationFactory.CONFIGURATION_FILE_PROPERTY, CONFIG);
ctx = (LoggerContext) LogManager.getContext(false);
ctx.reconfigure();
Modified: logging/log4j/log4j2/trunk/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAppenderTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAppenderTest.java?rev=1605658&r1=1605657&r2=1605658&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAppenderTest.java (original)
+++ logging/log4j/log4j2/trunk/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAppenderTest.java Thu Jun 26 03:22:33 2014
@@ -23,7 +23,6 @@ import java.io.IOException;
import java.io.InputStream;
import java.lang.management.ManagementFactory;
import java.net.InetSocketAddress;
-import java.net.ServerSocket;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -49,9 +48,9 @@ import org.apache.logging.log4j.LogManag
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.core.LoggerContext;
import org.apache.logging.log4j.core.config.ConfigurationFactory;
-import org.apache.logging.log4j.core.net.FreePortFinder;
import org.apache.logging.log4j.message.StructuredDataMessage;
import org.apache.logging.log4j.status.StatusLogger;
+import org.apache.logging.log4j.test.AvailablePortFinder;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Assert;
@@ -96,11 +95,12 @@ public class FlumeEmbeddedAppenderTest {
* Clear out all other appenders associated with this logger to ensure we're
* only hitting the Avro appender.
*/
- final int[] ports = FreePortFinder.findFreePorts(2);
- System.setProperty("primaryPort", Integer.toString(ports[0]));
- System.setProperty("alternatePort", Integer.toString(ports[1]));
- primary = new EventCollector(ports[0]);
- alternate = new EventCollector(ports[1]);
+ int primaryPort = AvailablePortFinder.getNextAvailable();
+ int altPort = AvailablePortFinder.getNextAvailable();
+ System.setProperty("primaryPort", Integer.toString(primaryPort));
+ System.setProperty("alternatePort", Integer.toString(altPort));
+ primary = new EventCollector(primaryPort);
+ alternate = new EventCollector(altPort);
System.setProperty(ConfigurationFactory.CONFIGURATION_FILE_PROPERTY, CONFIG);
ctx = (LoggerContext) LogManager.getContext(false);
ctx.reconfigure();
Modified: logging/log4j/log4j2/trunk/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentAppenderTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentAppenderTest.java?rev=1605658&r1=1605657&r2=1605658&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentAppenderTest.java (original)
+++ logging/log4j/log4j2/trunk/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentAppenderTest.java Thu Jun 26 03:22:33 2014
@@ -50,9 +50,9 @@ import org.apache.logging.log4j.Marker;
import org.apache.logging.log4j.MarkerManager;
import org.apache.logging.log4j.core.LoggerContext;
import org.apache.logging.log4j.core.config.ConfigurationFactory;
-import org.apache.logging.log4j.core.net.FreePortFinder;
import org.apache.logging.log4j.message.StructuredDataMessage;
import org.apache.logging.log4j.status.StatusLogger;
+import org.apache.logging.log4j.test.AvailablePortFinder;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Assert;
@@ -97,11 +97,12 @@ public class FlumePersistentAppenderTest
* Clear out all other appenders associated with this logger to ensure we're
* only hitting the Avro appender.
*/
- final int[] ports = FreePortFinder.findFreePorts(2);
- System.setProperty("primaryPort", Integer.toString(ports[0]));
- System.setProperty("alternatePort", Integer.toString(ports[1]));
- primary = new EventCollector(ports[0]);
- alternate = new EventCollector(ports[1]);
+ int primaryPort = AvailablePortFinder.getNextAvailable();
+ int altPort = AvailablePortFinder.getNextAvailable();
+ System.setProperty("primaryPort", Integer.toString(primaryPort));
+ System.setProperty("alternatePort", Integer.toString(altPort));
+ primary = new EventCollector(primaryPort);
+ alternate = new EventCollector(altPort);
System.setProperty(ConfigurationFactory.CONFIGURATION_FILE_PROPERTY, CONFIG);
ctx = (LoggerContext) LogManager.getContext(false);
ctx.reconfigure();
Modified: logging/log4j/log4j2/trunk/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentPerf.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentPerf.java?rev=1605658&r1=1605657&r2=1605658&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentPerf.java (original)
+++ logging/log4j/log4j2/trunk/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentPerf.java Thu Jun 26 03:22:33 2014
@@ -23,7 +23,6 @@ import java.io.IOException;
import java.io.InputStream;
import java.lang.management.ManagementFactory;
import java.net.InetSocketAddress;
-import java.net.ServerSocket;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -48,9 +47,9 @@ import org.apache.logging.log4j.EventLog
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.core.LoggerContext;
import org.apache.logging.log4j.core.config.ConfigurationFactory;
-import org.apache.logging.log4j.core.net.FreePortFinder;
import org.apache.logging.log4j.message.StructuredDataMessage;
import org.apache.logging.log4j.status.StatusLogger;
+import org.apache.logging.log4j.test.AvailablePortFinder;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
@@ -94,11 +93,12 @@ public class FlumePersistentPerf {
* Clear out all other appenders associated with this logger to ensure we're
* only hitting the Avro appender.
*/
- final int[] ports = FreePortFinder.findFreePorts(2);
- System.setProperty("primaryPort", Integer.toString(ports[0]));
- System.setProperty("alternatePort", Integer.toString(ports[1]));
- primary = new EventCollector(ports[0]);
- alternate = new EventCollector(ports[1]);
+ int primaryPort = AvailablePortFinder.getNextAvailable();
+ int altPort = AvailablePortFinder.getNextAvailable();
+ System.setProperty("primaryPort", Integer.toString(primaryPort));
+ System.setProperty("alternatePort", Integer.toString(altPort));
+ primary = new EventCollector(primaryPort);
+ alternate = new EventCollector(altPort);
System.setProperty(ConfigurationFactory.CONFIGURATION_FILE_PROPERTY, CONFIG);
ctx = (LoggerContext) LogManager.getContext(false);
ctx.reconfigure();