You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ma...@apache.org on 2016/09/04 18:38:18 UTC

[02/36] logging-log4j2 git commit: Use 2^n buffer size in test

Use 2^n buffer size in test

Disruptor queues use a power of 2 for queue sizes, so for portability reasons, this test has been expanded to use a buffer size of 4 instead of 3.


Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/e796f08d
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/e796f08d
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/e796f08d

Branch: refs/heads/master
Commit: e796f08dc8758d514221bace0dd365a52894612c
Parents: 9f2fb7d
Author: Matt Sicker <bo...@gmail.com>
Authored: Wed Jun 15 14:06:42 2016 -0500
Committer: Matt Sicker <bo...@gmail.com>
Committed: Wed Jun 15 14:06:42 2016 -0500

----------------------------------------------------------------------
 .../core/appender/AsyncAppenderQueueFullPolicyTest.java     | 9 +++++----
 log4j-core/src/test/resources/log4j-asynch-queue-full.xml   | 4 ++--
 2 files changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/e796f08d/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/AsyncAppenderQueueFullPolicyTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/AsyncAppenderQueueFullPolicyTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/AsyncAppenderQueueFullPolicyTest.java
index a5adf83..00fb2ef 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/AsyncAppenderQueueFullPolicyTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/AsyncAppenderQueueFullPolicyTest.java
@@ -55,8 +55,8 @@ public class AsyncAppenderQueueFullPolicyTest {
 
     @Before
     public void before() throws Exception {
-        blockingAppender = (BlockingAppender) context.getAppender("Block");
-        asyncAppender = (AsyncAppender) context.getAppender("Async");
+        blockingAppender = context.getAppender("Block", BlockingAppender.class);
+        asyncAppender = context.getAppender("Async", AsyncAppender.class);
 
         Field field = AsyncAppender.class.getDeclaredField("asyncQueueFullPolicy");
         field.setAccessible(true);
@@ -75,11 +75,12 @@ public class AsyncAppenderQueueFullPolicyTest {
     public void testRouter() throws Exception {
         final Logger logger = LogManager.getLogger(AsyncAppenderQueueFullPolicyTest.class);
 
-        assertEquals(3, asyncAppender.getQueueCapacity());
+        assertEquals(4, asyncAppender.getQueueCapacity());
         logger.error("event 1 - gets taken off the queue");
         logger.warn("event 2");
         logger.info("event 3");
-        logger.info("event 4 - now the queue is full");
+        logger.info("event 4");
+        logger.info("event 5 - now the queue is full");
         assertEquals("queue remaining capacity", 0, asyncAppender.getQueueRemainingCapacity());
         assertEquals("EventRouter invocations", 0, policy.queueFull.get());
 

http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/e796f08d/log4j-core/src/test/resources/log4j-asynch-queue-full.xml
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/resources/log4j-asynch-queue-full.xml b/log4j-core/src/test/resources/log4j-asynch-queue-full.xml
index 1495a3b..a535c43 100644
--- a/log4j-core/src/test/resources/log4j-asynch-queue-full.xml
+++ b/log4j-core/src/test/resources/log4j-asynch-queue-full.xml
@@ -24,7 +24,7 @@
     </Console>
     <Block name="Block">
     </Block>
-    <Async name="Async" bufferSize="3" includeLocation="false" error-ref="STDOUT">
+    <Async name="Async" bufferSize="4" includeLocation="false" error-ref="STDOUT">
       <AppenderRef ref="Block"/>
     </Async>
   </Appenders>
@@ -35,4 +35,4 @@
     </Root>
   </Loggers>
 
-</Configuration>
\ No newline at end of file
+</Configuration>