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 13:36:52 UTC
[logging-log4j2] branch release-2.x updated: Sync JeroMQ test with `master`
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 61bc6cb17d Sync JeroMQ test with `master`
61bc6cb17d is described below
commit 61bc6cb17d091d5f17da367fb31adb89f4a34c64
Author: Piotr P. Karwasz <pi...@karwasz.org>
AuthorDate: Fri Jan 20 14:19:44 2023 +0100
Sync JeroMQ test with `master`
On `master` the JeroMQ test uses JUnit5, on `release-2.x` JUnit4.
---
.../appender/mom/jeromq/JeroMqAppenderTest.java | 55 ++++++++++------------
1 file changed, 24 insertions(+), 31 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 63354e6168..4bc7c2ea6b 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
@@ -14,7 +14,6 @@
* See the license for the specific language governing permissions and
* limitations under the license.
*/
-
package org.apache.logging.log4j.core.appender.mom.jeromq;
import java.util.List;
@@ -33,7 +32,10 @@ import org.junit.ClassRule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-@Category(Appenders.ZeroMq.class)
+@Tag("zeromq")
+@Tag("sleepy")
+@Timeout(value = 60)
+@LoggerContextSource(value = "JeroMqAppenderTest.xml", timeout = 60)
public class JeroMqAppenderTest {
private static final String ENDPOINT = "tcp://localhost:5556";
@@ -42,46 +44,40 @@ public class JeroMqAppenderTest {
private static final int DEFAULT_TIMEOUT_MILLIS = 60000;
- @ClassRule
- public static LoggerContextRule ctx = new LoggerContextRule("JeroMqAppenderTest.xml");
-
- @Test(timeout = DEFAULT_TIMEOUT_MILLIS)
+ @Test
public void testAppenderLifeCycle() throws Exception {
// do nothing to make sure the appender starts and stops without
// locking up resources.
- Assert.assertNotNull(JeroMqManager.getContext());
+ assertNotNull(JeroMqManager.getContext());
}
- @Test(timeout = DEFAULT_TIMEOUT_MILLIS)
- public void testClientServer() throws Exception {
- final JeroMqAppender appender = ctx.getRequiredAppender(APPENDER_NAME, JeroMqAppender.class);
+ @Test
+ public void testClientServer(@Named(APPENDER_NAME) final JeroMqAppender appender, final Logger logger) throws Exception {
final int expectedReceiveCount = 3;
final JeroMqTestClient client = new JeroMqTestClient(JeroMqManager.getContext(), ENDPOINT, expectedReceiveCount);
final ExecutorService executor = Executors.newSingleThreadExecutor();
try {
final Future<List<String>> future = executor.submit(client);
Thread.sleep(100);
- final Logger logger = ctx.getLogger(getClass().getName());
appender.resetSendRcs();
logger.info("Hello");
logger.info("Again");
ThreadContext.put("foo", "bar");
logger.info("World");
final List<String> list = future.get();
- Assert.assertEquals(expectedReceiveCount, appender.getSendRcTrue());
- Assert.assertEquals(0, appender.getSendRcFalse());
- Assert.assertEquals("Hello", list.get(0));
- Assert.assertEquals("Again", list.get(1));
- Assert.assertEquals("barWorld", list.get(2));
+ assertEquals(expectedReceiveCount, appender.getSendRcTrue());
+ assertEquals(0, appender.getSendRcFalse());
+ assertEquals("Hello", list.get(0));
+ assertEquals("Again", list.get(1));
+ assertEquals("barWorld", list.get(2));
} finally {
executor.shutdown();
}
}
- @Test(timeout = DEFAULT_TIMEOUT_MILLIS)
- public void testMultiThreadedServer() throws Exception {
+ @Test
+ public void testMultiThreadedServer(@Named(APPENDER_NAME) final JeroMqAppender appender, final Logger logger) throws Exception {
final int nThreads = 10;
- final JeroMqAppender appender = ctx.getRequiredAppender(APPENDER_NAME, JeroMqAppender.class);
final int expectedReceiveCount = 2 * nThreads;
final JeroMqTestClient client = new JeroMqTestClient(JeroMqManager.getContext(), ENDPOINT,
expectedReceiveCount);
@@ -89,7 +85,6 @@ public class JeroMqAppenderTest {
try {
final Future<List<String>> future = executor.submit(client);
Thread.sleep(100);
- final Logger logger = ctx.getLogger(getClass().getName());
appender.resetSendRcs();
final ExecutorService fixedThreadPool = Executors.newFixedThreadPool(nThreads);
for (int i = 0; i < 10.; i++) {
@@ -99,8 +94,8 @@ public class JeroMqAppenderTest {
});
}
final List<String> list = future.get();
- Assert.assertEquals(expectedReceiveCount, appender.getSendRcTrue());
- Assert.assertEquals(0, appender.getSendRcFalse());
+ assertEquals(expectedReceiveCount, appender.getSendRcTrue());
+ assertEquals(0, appender.getSendRcFalse());
int hello = 0;
int again = 0;
for (final String string : list) {
@@ -112,25 +107,23 @@ public class JeroMqAppenderTest {
again++;
break;
default:
- Assert.fail("Unexpected message: " + string);
+ fail("Unexpected message: " + string);
}
}
- Assert.assertEquals(nThreads, hello);
- Assert.assertEquals(nThreads, again);
+ assertEquals(nThreads, hello);
+ assertEquals(nThreads, again);
} finally {
ExecutorServices.shutdown(executor, DEFAULT_TIMEOUT_MILLIS, TimeUnit.MILLISECONDS,
JeroMqAppenderTest.class.getSimpleName());
}
}
- @Test(timeout = DEFAULT_TIMEOUT_MILLIS)
- public void testServerOnly() throws Exception {
- final Logger logger = ctx.getLogger(getClass().getName());
- final JeroMqAppender appender = ctx.getRequiredAppender(APPENDER_NAME, JeroMqAppender.class);
+ @Test
+ public void testServerOnly(@Named(APPENDER_NAME) final JeroMqAppender appender, final Logger logger) {
appender.resetSendRcs();
logger.info("Hello");
logger.info("Again");
- Assert.assertEquals(2, appender.getSendRcTrue());
- Assert.assertEquals(0, appender.getSendRcFalse());
+ assertEquals(2, appender.getSendRcTrue());
+ assertEquals(0, appender.getSendRcFalse());
}
}