Author: ggregory
Date: Fri May 16 20:24:49 2014
New Revision: 1595337
URL: http://svn.apache.org/r1595337
Log:
Refactor to avoid code duplication.
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/AbstractSocketServerTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/TcpJsonSocketServerTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/TcpSerializedSocketServerTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/TcpXmlSocketServerTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/UdpJsonSocketServerTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/UdpSerializedSocketServerTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/UdpXmlSocketServerTest.java
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=1595337&r1=1595336&r2=1595337&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
Fri May 16 20:24:49 2014
@@ -51,6 +51,8 @@ import org.junit.Test;
*/
public abstract class AbstractSocketServerTest {
+ protected static Thread thread;
+
private class ThreadFilter extends AbstractFilter {
public ThreadFilter(final Result onMatch, final Result onMismatch) {
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/TcpJsonSocketServerTest.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/TcpJsonSocketServerTest.java?rev=1595337&r1=1595336&r2=1595337&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/TcpJsonSocketServerTest.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/TcpJsonSocketServerTest.java
Fri May 16 20:24:49 2014
@@ -26,22 +26,20 @@ import org.junit.AfterClass;
import org.junit.BeforeClass;
public class TcpJsonSocketServerTest extends AbstractSocketServerTest {
- private static TCPSocketServer<InputStream> tcpSocketServer;
-
- private static Thread thread;
+
+ private static TCPSocketServer<InputStream> server;
@BeforeClass
public static void setupClass() throws Exception {
((LoggerContext) LogManager.getContext(false)).reconfigure();
- tcpSocketServer = TCPSocketServer.createJsonSocketServer(PORT_NUM);
- thread = new Thread(tcpSocketServer);
- thread.start();
+ server = TCPSocketServer.createJsonSocketServer(PORT_NUM);
+ thread = server.startNewThread();
}
@AfterClass
public static void tearDownClass() {
try {
- tcpSocketServer.shutdown();
+ server.shutdown();
} catch (final IOException e) {
e.printStackTrace();
}
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/TcpSerializedSocketServerTest.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/TcpSerializedSocketServerTest.java?rev=1595337&r1=1595336&r2=1595337&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/TcpSerializedSocketServerTest.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/TcpSerializedSocketServerTest.java
Fri May 16 20:24:49 2014
@@ -27,22 +27,20 @@ import org.junit.AfterClass;
import org.junit.BeforeClass;
public class TcpSerializedSocketServerTest extends AbstractSocketServerTest {
- private static TCPSocketServer<ObjectInputStream> tcpSocketServer;
-
- private static Thread thread;
+
+ private static TCPSocketServer<ObjectInputStream> server;
@BeforeClass
public static void setupClass() throws Exception {
((LoggerContext) LogManager.getContext(false)).reconfigure();
- tcpSocketServer =
TCPSocketServer.createSerializedSocketServer(PORT_NUM);
- thread = new Thread(tcpSocketServer);
- thread.start();
+ server = TCPSocketServer.createSerializedSocketServer(PORT_NUM);
+ thread = server.startNewThread();
}
@AfterClass
public static void tearDownClass() {
try {
- tcpSocketServer.shutdown();
+ server.shutdown();
} catch (final IOException e) {
e.printStackTrace();
}
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/TcpXmlSocketServerTest.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/TcpXmlSocketServerTest.java?rev=1595337&r1=1595336&r2=1595337&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/TcpXmlSocketServerTest.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/TcpXmlSocketServerTest.java
Fri May 16 20:24:49 2014
@@ -27,23 +27,22 @@ import org.junit.AfterClass;
import org.junit.BeforeClass;
public class TcpXmlSocketServerTest extends AbstractSocketServerTest {
- private static TCPSocketServer<InputStream> socketServer;
- private static Thread thread;
+
+ private static TCPSocketServer<InputStream> server;
@BeforeClass
public static void setupClass() throws Exception {
((LoggerContext) LogManager.getContext(false)).reconfigure();
// Use a large buffer just to test the code, the UDP test uses a tiny
buffer
- socketServer = new TCPSocketServer<InputStream>(PORT_NUM, new
XmlInputStreamLogEventBridge(1024 * 100,
+ server = new TCPSocketServer<InputStream>(PORT_NUM, new
XmlInputStreamLogEventBridge(1024 * 100,
Charset.defaultCharset()));
- thread = new Thread(socketServer);
- thread.start();
+ thread = server.startNewThread();
}
@AfterClass
public static void tearDownClass() {
try {
- socketServer.shutdown();
+ server.shutdown();
} catch (final IOException e) {
e.printStackTrace();
}
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/UdpJsonSocketServerTest.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/UdpJsonSocketServerTest.java?rev=1595337&r1=1595336&r2=1595337&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/UdpJsonSocketServerTest.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/UdpJsonSocketServerTest.java
Fri May 16 20:24:49 2014
@@ -26,20 +26,19 @@ import org.junit.AfterClass;
import org.junit.BeforeClass;
public class UdpJsonSocketServerTest extends AbstractSocketServerTest {
- private static Thread thread;
- private static UDPSocketServer<InputStream> udpSocketServer;
+
+ private static UDPSocketServer<InputStream> server;
@BeforeClass
public static void setupClass() throws Exception {
((LoggerContext) LogManager.getContext(false)).reconfigure();
- udpSocketServer = UDPSocketServer.createJsonSocketServer(PORT_NUM);
- thread = new Thread(udpSocketServer);
- thread.start();
+ server = UDPSocketServer.createJsonSocketServer(PORT_NUM);
+ thread = server.startNewThread();
}
@AfterClass
public static void tearDownClass() {
- udpSocketServer.shutdown();
+ server.shutdown();
try {
thread.join();
} catch (final InterruptedException e) {
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/UdpSerializedSocketServerTest.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/UdpSerializedSocketServerTest.java?rev=1595337&r1=1595336&r2=1595337&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/UdpSerializedSocketServerTest.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/UdpSerializedSocketServerTest.java
Fri May 16 20:24:49 2014
@@ -26,20 +26,19 @@ import org.junit.AfterClass;
import org.junit.BeforeClass;
public class UdpSerializedSocketServerTest extends AbstractSocketServerTest {
- private static Thread thread;
- private static UDPSocketServer<ObjectInputStream> udpSocketServer;
+
+ private static UDPSocketServer<ObjectInputStream> server;
@BeforeClass
public static void setupClass() throws Exception {
((LoggerContext) LogManager.getContext(false)).reconfigure();
- udpSocketServer =
UDPSocketServer.createSerializedSocketServer(PORT_NUM);
- thread = new Thread(udpSocketServer);
- thread.start();
+ server = UDPSocketServer.createSerializedSocketServer(PORT_NUM);
+ thread = server.startNewThread();
}
@AfterClass
public static void tearDownClass() {
- udpSocketServer.shutdown();
+ server.shutdown();
try {
thread.join();
} catch (final InterruptedException e) {
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/UdpXmlSocketServerTest.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/UdpXmlSocketServerTest.java?rev=1595337&r1=1595336&r2=1595337&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/UdpXmlSocketServerTest.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/UdpXmlSocketServerTest.java
Fri May 16 20:24:49 2014
@@ -27,22 +27,21 @@ import org.junit.AfterClass;
import org.junit.BeforeClass;
public class UdpXmlSocketServerTest extends AbstractSocketServerTest {
- private static UDPSocketServer<InputStream> socketServer;
- private static Thread thread;
+
+ private static UDPSocketServer<InputStream> server;
@BeforeClass
public static void setupClass() throws Exception {
((LoggerContext) LogManager.getContext(false)).reconfigure();
// Use a tiny buffer just to test the code, the TCP test uses a large
buffer
- socketServer = new UDPSocketServer<InputStream>(PORT_NUM, new
XmlInputStreamLogEventBridge(100,
+ server = new UDPSocketServer<InputStream>(PORT_NUM, new
XmlInputStreamLogEventBridge(100,
Charset.defaultCharset()));
- thread = new Thread(socketServer);
- thread.start();
+ thread = server.startNewThread();
}
@AfterClass
public static void tearDownClass() {
- socketServer.shutdown();
+ server.shutdown();
try {
thread.join();
} catch (final InterruptedException e) {
