You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by mi...@apache.org on 2017/05/15 14:21:57 UTC
[1/2] logging-log4j2 git commit: Ignore socket option tests which
does not work on Java 8+
Repository: logging-log4j2
Updated Branches:
refs/heads/LOG4J2-1442 bcb726449 -> 9caf597d1
Ignore socket option tests which does not work on Java 8+
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/f78adaae
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/f78adaae
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/f78adaae
Branch: refs/heads/LOG4J2-1442
Commit: f78adaae8ec2ed0c4d6e31a25c207bbe0b8ff30a
Parents: 68e43b8
Author: Mikael Ståldal <mi...@magine.com>
Authored: Fri May 12 17:11:21 2017 +0200
Committer: Mikael Ståldal <mi...@magine.com>
Committed: Fri May 12 17:11:21 2017 +0200
----------------------------------------------------------------------
.../appender/SecureSocketAppenderSocketOptionsTest.java | 11 ++++++++++-
.../core/appender/SocketAppenderSocketOptionsTest.java | 11 ++++++++++-
2 files changed, 20 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f78adaae/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SecureSocketAppenderSocketOptionsTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SecureSocketAppenderSocketOptionsTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SecureSocketAppenderSocketOptionsTest.java
index 1d480b1..25a6f50 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SecureSocketAppenderSocketOptionsTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SecureSocketAppenderSocketOptionsTest.java
@@ -36,6 +36,7 @@ import org.apache.logging.log4j.junit.LoggerContextRule;
import org.apache.logging.log4j.test.AvailablePortFinder;
import org.junit.AfterClass;
import org.junit.Assert;
+import org.junit.Assume;
import org.junit.ClassRule;
import org.junit.Test;
@@ -109,11 +110,19 @@ public class SecureSocketAppenderSocketOptionsTest {
Assert.assertEquals(false, socket.getKeepAlive());
Assert.assertEquals(false, socket.getReuseAddress());
Assert.assertEquals(false, socket.getTcpNoDelay());
- Assert.assertEquals(Rfc1349TrafficClass.IPTOS_LOWCOST.value(), socket.getTrafficClass());
// Assert.assertEquals(10000, socket.getReceiveBufferSize());
// This settings changes while we are running, so we cannot assert it.
// Assert.assertEquals(8000, socket.getSendBufferSize());
Assert.assertEquals(12345, socket.getSoLinger());
Assert.assertEquals(54321, socket.getSoTimeout());
}
+
+ @Test
+ public void testSocketTrafficClass() throws IOException {
+ Assume.assumeTrue("Run only on Java 7", System.getProperty("java.specification.version").equals("1.7"));
+ final SocketAppender appender = loggerContextRule.getAppender("socket", SocketAppender.class);
+ final TcpSocketManager manager = (TcpSocketManager) appender.getManager();
+ final Socket socket = manager.getSocket();
+ Assert.assertEquals(Rfc1349TrafficClass.IPTOS_LOWCOST.value(), socket.getTrafficClass());
+ }
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f78adaae/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderSocketOptionsTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderSocketOptionsTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderSocketOptionsTest.java
index a5b3067..475e849 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderSocketOptionsTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderSocketOptionsTest.java
@@ -29,6 +29,7 @@ import org.apache.logging.log4j.junit.LoggerContextRule;
import org.apache.logging.log4j.test.AvailablePortFinder;
import org.junit.AfterClass;
import org.junit.Assert;
+import org.junit.Assume;
import org.junit.ClassRule;
import org.junit.Test;
@@ -89,11 +90,19 @@ public class SocketAppenderSocketOptionsTest {
Assert.assertEquals(false, socket.getOOBInline());
Assert.assertEquals(false, socket.getReuseAddress());
Assert.assertEquals(false, socket.getTcpNoDelay());
- Assert.assertEquals(Rfc1349TrafficClass.IPTOS_LOWCOST.value(), socket.getTrafficClass());
// Assert.assertEquals(10000, socket.getReceiveBufferSize());
// This settings changes while we are running, so we cannot assert it.
// Assert.assertEquals(8000, socket.getSendBufferSize());
Assert.assertEquals(12345, socket.getSoLinger());
Assert.assertEquals(54321, socket.getSoTimeout());
}
+
+ @Test
+ public void testSocketTrafficClass() throws IOException {
+ Assume.assumeTrue("Run only on Java 7", System.getProperty("java.specification.version").equals("1.7"));
+ final SocketAppender appender = loggerContextRule.getAppender("socket", SocketAppender.class);
+ final TcpSocketManager manager = (TcpSocketManager) appender.getManager();
+ final Socket socket = manager.getSocket();
+ Assert.assertEquals(Rfc1349TrafficClass.IPTOS_LOWCOST.value(), socket.getTrafficClass());
+ }
}
[2/2] logging-log4j2 git commit: Merge branch 'master' into
LOG4J2-1442
Posted by mi...@apache.org.
Merge branch 'master' into LOG4J2-1442
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/9caf597d
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/9caf597d
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/9caf597d
Branch: refs/heads/LOG4J2-1442
Commit: 9caf597d1dc08b7bb64e0b6f5a128ddf18684fdb
Parents: bcb7264 f78adaa
Author: Mikael Ståldal <mi...@magine.com>
Authored: Mon May 15 16:21:42 2017 +0200
Committer: Mikael Ståldal <mi...@magine.com>
Committed: Mon May 15 16:21:42 2017 +0200
----------------------------------------------------------------------
.../appender/SecureSocketAppenderSocketOptionsTest.java | 11 ++++++++++-
.../core/appender/SocketAppenderSocketOptionsTest.java | 11 ++++++++++-
2 files changed, 20 insertions(+), 2 deletions(-)
----------------------------------------------------------------------