You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by pk...@apache.org on 2023/01/20 18:40:19 UTC
[logging-log4j2] branch release-2.x updated: Fix JeroMqAppenderTest
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
The following commit(s) were added to refs/heads/release-2.x by this push:
new 63d016eb0d Fix JeroMqAppenderTest
63d016eb0d is described below
commit 63d016eb0d48763ff119c2482323ff30904e6dd4
Author: Piotr P. Karwasz <pi...@karwasz.org>
AuthorDate: Fri Jan 20 19:39:59 2023 +0100
Fix JeroMqAppenderTest
---
.../log4j/core/appender/mom/jeromq/JeroMqAppenderTest.java | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/mom/jeromq/JeroMqAppenderTest.java b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/mom/jeromq/JeroMqAppenderTest.java
index adba52fed0..b5022d09bd 100644
--- a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/mom/jeromq/JeroMqAppenderTest.java
+++ b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/mom/jeromq/JeroMqAppenderTest.java
@@ -22,13 +22,14 @@ import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
+import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.ThreadContext;
-import org.apache.logging.log4j.core.Logger;
+import org.apache.logging.log4j.core.LoggerContext;
import org.apache.logging.log4j.core.test.junit.LoggerContextSource;
import org.apache.logging.log4j.core.test.junit.Named;
import org.apache.logging.log4j.core.util.ExecutorServices;
-import org.junit.Test;
import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Timeout;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -55,7 +56,8 @@ public class JeroMqAppenderTest {
}
@Test
- public void testClientServer(@Named(APPENDER_NAME) final JeroMqAppender appender, final Logger logger) throws Exception {
+ public void testClientServer(@Named(APPENDER_NAME) final JeroMqAppender appender, final LoggerContext ctx) throws Exception {
+ final Logger logger = ctx.getLogger(getClass());
final int expectedReceiveCount = 3;
final JeroMqTestClient client = new JeroMqTestClient(JeroMqManager.getContext(), ENDPOINT, expectedReceiveCount);
final ExecutorService executor = Executors.newSingleThreadExecutor();
@@ -79,7 +81,8 @@ public class JeroMqAppenderTest {
}
@Test
- public void testMultiThreadedServer(@Named(APPENDER_NAME) final JeroMqAppender appender, final Logger logger) throws Exception {
+ public void testMultiThreadedServer(@Named(APPENDER_NAME) final JeroMqAppender appender, final LoggerContext ctx) throws Exception {
+ final Logger logger = ctx.getLogger(getClass());
final int nThreads = 10;
final int expectedReceiveCount = 2 * nThreads;
final JeroMqTestClient client = new JeroMqTestClient(JeroMqManager.getContext(), ENDPOINT,
@@ -122,7 +125,8 @@ public class JeroMqAppenderTest {
}
@Test
- public void testServerOnly(@Named(APPENDER_NAME) final JeroMqAppender appender, final Logger logger) {
+ public void testServerOnly(@Named(APPENDER_NAME) final JeroMqAppender appender, final LoggerContext ctx) {
+ final Logger logger = ctx.getLogger(getClass());
appender.resetSendRcs();
logger.info("Hello");
logger.info("Again");