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

[2/2] logging-log4j2 git commit: LOG4J2-1349 extend context data injector tests to cover all combinations default threadcontextmap, copyOnWriteThreadContextData and garbage-free threadcontextdata with all combinations of synchronous, async appender, asyn

LOG4J2-1349 extend context data injector tests to cover all combinations default threadcontextmap, copyOnWriteThreadContextData and garbage-free threadcontextdata with all combinations of synchronous, async appender, async logger (pure), async logger (mixed), asyncAppender + asyncLogger(pure), asyncAppender+asyncLogger(mixed) and asyncAppender+asyncLogger(pure)+asyncLogger(mixed)


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

Branch: refs/heads/LOG4J2-1349-gcfree-threadcontext
Commit: e8a25a97cb0c1746383c11f7d9b4b5db81ebf9c7
Parents: 25615a4
Author: rpopma <rp...@apache.org>
Authored: Sat Sep 10 01:35:27 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Sat Sep 10 01:35:27 2016 +0900

----------------------------------------------------------------------
 ...ggerAllThreadContextImplementationsTest.java | 25 ++++++++++++--------
 ...nfigAllThreadContextImplementationsTest.java | 19 +++++++++++----
 .../AsyncLoggerConfigThreadContextTest.xml      | 20 ++++++++++++++++
 3 files changed, 49 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/e8a25a97/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerAllThreadContextImplementationsTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerAllThreadContextImplementationsTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerAllThreadContextImplementationsTest.java
index 6cd89f4..4283cbb 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerAllThreadContextImplementationsTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerAllThreadContextImplementationsTest.java
@@ -132,12 +132,15 @@ public class AsyncLoggerAllThreadContextImplementationsTest {
 
     @Test
     public void testAsyncLogWritesToLog() throws Exception {
-        final File file = new File("target", "AsyncLoggerTest.log");
-        // System.out.println(f.getAbsolutePath());
-        file.delete();
-
-        final File sync = new File("target", "SynchronousContextTest.log");
-        sync.delete();
+        final File[] files = new File[] {
+                new File("target", "AsyncLoggerTest.log"), //
+                new File("target", "SynchronousContextTest.log"), //
+                new File("target", "AsyncLoggerAndAsyncAppenderTest.log"), //
+                new File("target", "AsyncAppenderContextTest.log"), //
+        };
+        for (final File f : files) {
+            f.delete();
+        }
 
         ThreadContext.push("stackvalue");
         ThreadContext.put("KEY", "mapvalue");
@@ -159,11 +162,13 @@ public class AsyncLoggerAllThreadContextImplementationsTest {
             log.info("{} {} {} i={}", contextImpl, contextmap, loggerContextName, Unbox.box(i));
         }
         ThreadContext.pop();
-        CoreLoggerContexts.stopLoggerContext(false, file); // stop async thread
+        CoreLoggerContexts.stopLoggerContext(false, files[0]); // stop async thread
 
-        checkResult(file, loggerContextName);
+        checkResult(files[0], loggerContextName);
         if (asyncMode == Mode.MIXED || asyncMode == Mode.BOTH_ALL_ASYNC_AND_MIXED) {
-            checkResult(sync, loggerContextName);
+            for (int i = 1; i < files.length; i++) {
+                checkResult(files[i], loggerContextName);
+            }
         }
         LogManager.shutdown();
     }
@@ -180,7 +185,7 @@ public class AsyncLoggerAllThreadContextImplementationsTest {
                 } else {
                     expect = "INFO c.f.Bar mapvalue [stackvalue] {KEY=mapvalue} " + contextDesc + " i=" + i;
                 }
-                assertEquals("line " + i, expect, line);
+                assertEquals(file.getName() + ": line " + i, expect, line);
             }
             final String noMoreLines = reader.readLine();
             assertNull("done", noMoreLines);

http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/e8a25a97/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigAllThreadContextImplementationsTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigAllThreadContextImplementationsTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigAllThreadContextImplementationsTest.java
index 74de230..3c3d69c 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigAllThreadContextImplementationsTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigAllThreadContextImplementationsTest.java
@@ -105,8 +105,15 @@ public class AsyncLoggerConfigAllThreadContextImplementationsTest {
 
     @Test
     public void testAsyncLogWritesToLog() throws Exception {
-        final File file = new File("target", "SynchronousContextTest.log");
-        file.delete();
+        final File[] files = new File[] {
+                new File("target", "AsyncLoggerTest.log"), //
+                new File("target", "SynchronousContextTest.log"), //
+                new File("target", "AsyncLoggerAndAsyncAppenderTest.log"), //
+                new File("target", "AsyncAppenderContextTest.log"), //
+        };
+        for (final File f : files) {
+            f.delete();
+        }
 
         ThreadContext.push("stackvalue");
         ThreadContext.put("KEY", "mapvalue");
@@ -129,9 +136,11 @@ public class AsyncLoggerConfigAllThreadContextImplementationsTest {
             log.info("{} {} {} i={}", contextImpl, contextmap, loggerContextName, Unbox.box(i));
         }
         ThreadContext.pop();
-        CoreLoggerContexts.stopLoggerContext(false, file); // stop async thread
+        CoreLoggerContexts.stopLoggerContext(false, files[files.length - 1]); // stop async thread
 
-        checkResult(file, loggerContextName);
+        for (final File f : files) {
+            checkResult(f, loggerContextName);
+        }
         LogManager.shutdown();
     }
 
@@ -147,7 +156,7 @@ public class AsyncLoggerConfigAllThreadContextImplementationsTest {
                 } else {
                     expect = "INFO c.f.Bar mapvalue [stackvalue] {KEY=mapvalue} " + contextDesc + " i=" + i;
                 }
-                assertEquals("line " + i, expect, line);
+                assertEquals(file.getName() + ": line " + i, expect, line);
             }
             final String noMoreLines = reader.readLine();
             assertNull("done", noMoreLines);

http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/e8a25a97/log4j-core/src/test/resources/AsyncLoggerConfigThreadContextTest.xml
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/resources/AsyncLoggerConfigThreadContextTest.xml b/log4j-core/src/test/resources/AsyncLoggerConfigThreadContextTest.xml
index 5419e20..1ce6faa 100644
--- a/log4j-core/src/test/resources/AsyncLoggerConfigThreadContextTest.xml
+++ b/log4j-core/src/test/resources/AsyncLoggerConfigThreadContextTest.xml
@@ -4,6 +4,24 @@
     <Property name="configProp">configValue</Property>
   </Properties>
   <Appenders>
+    <RandomAccessFile name="AsyncLoggerAndAsyncAppenderFile" fileName="target/AsyncLoggerAndAsyncAppenderTest.log"
+        immediateFlush="false" append="false">
+      <PatternLayout>
+        <Pattern>%p %c{1.} %X{KEY} %x %X %m%ex%n</Pattern>
+      </PatternLayout>
+    </RandomAccessFile>
+    <Async name="AsyncLoggerAndAsyncAppender">
+      <AppenderRef ref="AsyncLoggerAndAsyncAppenderFile" />
+    </Async>
+    <RandomAccessFile name="AsyncAppenderFile" fileName="target/AsyncAppenderContextTest.log"
+        immediateFlush="false" append="false">
+      <PatternLayout>
+        <Pattern>%p %c{1.} %X{KEY} %x %X %m%ex%n</Pattern>
+      </PatternLayout>
+    </RandomAccessFile>
+    <Async name="AsyncAppender">
+      <AppenderRef ref="AsyncAppenderFile" />
+    </Async>
     <RandomAccessFile name="RandomAccessFile" fileName="target/AsyncLoggerTest.log"
         immediateFlush="false" append="false">
       <PatternLayout>
@@ -21,9 +39,11 @@
   <Loggers>
     <AsyncLogger name="com.foo" level="info" includeLocation="false" additivity="true">
       <AppenderRef ref="RandomAccessFile"/>
+      <AppenderRef ref="AsyncLoggerAndAsyncAppender"/>
     </AsyncLogger>
     <Root level="info" includeLocation="false">
       <AppenderRef ref="SynchronousRandomAccessFile"/>
+      <AppenderRef ref="AsyncAppender"/>
     </Root>
   </Loggers>
 </Configuration>
\ No newline at end of file