Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
xiaofang li
Logging Log4j2
Commits
f78adaae
Commit
f78adaae
authored
8 years ago
by
Mikael Ståldal
Browse files
Options
Download
Email Patches
Plain Diff
Ignore socket option tests which does not work on Java 8+
parent
68e43b84
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SecureSocketAppenderSocketOptionsTest.java
+10
-1
.../core/appender/SecureSocketAppenderSocketOptionsTest.java
log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderSocketOptionsTest.java
+10
-1
.../log4j/core/appender/SocketAppenderSocketOptionsTest.java
with
20 additions
and
2 deletions
+20
-2
log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SecureSocketAppenderSocketOptionsTest.java
+
10
-
1
View file @
f78adaae
...
...
@@ -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
());
}
}
This diff is collapsed.
Click to expand it.
log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderSocketOptionsTest.java
+
10
-
1
View file @
f78adaae
...
...
@@ -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
());
}
}
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment