You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2022/01/06 13:45:12 UTC
[logging-log4j2] 02/03: Sort methods.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 1b1513bcd92c8f4b29f4c453b76a4c8296e8d856
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu Jan 6 08:33:04 2022 -0500
Sort methods.
---
.../log4j/core/appender/AsyncAppenderTest.java | 60 +++++++++++-----------
1 file changed, 30 insertions(+), 30 deletions(-)
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/AsyncAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/AsyncAppenderTest.java
index 3c4e0a3..33ae365 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/AsyncAppenderTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/AsyncAppenderTest.java
@@ -35,39 +35,46 @@ import static org.junit.jupiter.api.Assertions.*;
public class AsyncAppenderTest {
- static void rewriteTest(final LoggerContext context) throws InterruptedException {
+ static void exceptionTest(final LoggerContext context) throws InterruptedException {
final ExtendedLogger logger = context.getLogger(AsyncAppender.class);
- logger.error("This is a test");
- logger.warn("Hello world!");
+ final Exception parent = new IllegalStateException("Test");
+ final Throwable child = new LoggingException("This is a test", parent);
+ logger.error("This is a test", child);
final ListAppender appender = context.getConfiguration().getAppender("List");
final List<String> messages;
try {
- messages = appender.getMessages(2, 2, TimeUnit.SECONDS);
+ messages = appender.getMessages(1, 2, TimeUnit.SECONDS);
} finally {
appender.clear();
}
assertNotNull(messages);
- assertEquals(2, messages.size());
- final String messagePrefix = AsyncAppenderTest.class.getName() + " rewriteTest ";
- assertEquals(messagePrefix + "This is a test", messages.get(0));
- assertEquals(messagePrefix + "Hello world!", messages.get(1));
+ assertEquals(1, messages.size());
+ assertTrue(messages.get(0).contains(parent.getClass().getName()));
}
- static void exceptionTest(final LoggerContext context) throws InterruptedException {
+ static void rewriteTest(final LoggerContext context) throws InterruptedException {
final ExtendedLogger logger = context.getLogger(AsyncAppender.class);
- final Exception parent = new IllegalStateException("Test");
- final Throwable child = new LoggingException("This is a test", parent);
- logger.error("This is a test", child);
+ logger.error("This is a test");
+ logger.warn("Hello world!");
final ListAppender appender = context.getConfiguration().getAppender("List");
final List<String> messages;
try {
- messages = appender.getMessages(1, 2, TimeUnit.SECONDS);
+ messages = appender.getMessages(2, 2, TimeUnit.SECONDS);
} finally {
appender.clear();
}
assertNotNull(messages);
- assertEquals(1, messages.size());
- assertTrue(messages.get(0).contains(parent.getClass().getName()));
+ assertEquals(2, messages.size());
+ final String messagePrefix = AsyncAppenderTest.class.getName() + " rewriteTest ";
+ assertEquals(messagePrefix + "This is a test", messages.get(0));
+ assertEquals(messagePrefix + "Hello world!", messages.get(1));
+ }
+
+ @Test
+ @LoggerContextSource("BlockingQueueFactory-ArrayBlockingQueue.xml")
+ public void testArrayBlockingQueue(final LoggerContext context) throws InterruptedException {
+ rewriteTest(context);
+ exceptionTest(context);
}
@Test
@@ -86,13 +93,6 @@ public class AsyncAppenderTest {
}
@Test
- @LoggerContextSource("BlockingQueueFactory-ArrayBlockingQueue.xml")
- public void testArrayBlockingQueue(final LoggerContext context) throws InterruptedException {
- rewriteTest(context);
- exceptionTest(context);
- }
-
- @Test
@Tag("disruptor")
@LoggerContextSource("BlockingQueueFactory-DisruptorBlockingQueue.xml")
public void testDisruptorBlockingQueue(final LoggerContext context) throws InterruptedException {
@@ -116,14 +116,6 @@ public class AsyncAppenderTest {
}
@Test
- @Timeout(5)
- @LoggerContextSource("log4j-asynch-shutdownTimeout.xml")
- public void testShutdownTimeout(final LoggerContext context) {
- context.getLogger("Logger").info("This is a test");
- context.stop();
- }
-
- @Test
@LoggerContextSource("log4j-asynch-no-location.xml")
public void testNoLocationInformation(final LoggerContext context, @Named("List") final ListAppender appender) throws InterruptedException {
final ExtendedLogger logger = context.getLogger(getClass());
@@ -140,4 +132,12 @@ public class AsyncAppenderTest {
assertEquals("? This is a test", messages.get(0));
assertEquals("? Hello world!", messages.get(1));
}
+
+ @Test
+ @Timeout(5)
+ @LoggerContextSource("log4j-asynch-shutdownTimeout.xml")
+ public void testShutdownTimeout(final LoggerContext context) {
+ context.getLogger("Logger").info("This is a test");
+ context.stop();
+ }
}