Use a ThreadContextRule to clean up tests. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/5ae77a9c Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/5ae77a9c Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/5ae77a9c
Branch: refs/heads/LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure Commit: 5ae77a9cddd9cf9e66eabd0fb1ff831c3c7f980a Parents: e982213 Author: Gary Gregory <ggreg...@apache.org> Authored: Mon Aug 15 13:26:19 2016 -0700 Committer: Gary Gregory <ggreg...@apache.org> Committed: Mon Aug 15 13:26:19 2016 -0700 ---------------------------------------------------------------------- .../logging/log4j/core/layout/Rfc5424LayoutTest.java | 14 -------------- 1 file changed, 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5ae77a9c/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/Rfc5424LayoutTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/Rfc5424LayoutTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/Rfc5424LayoutTest.java index ca327d6..bffbf55 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/Rfc5424LayoutTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/Rfc5424LayoutTest.java @@ -149,8 +149,6 @@ public class Rfc5424LayoutTest { assertTrue("No messages expected, found " + list.size(), list.isEmpty()); } finally { root.removeAppender(appender); - ThreadContext.clearMap(); - appender.stop(); } } @@ -211,8 +209,6 @@ public class Rfc5424LayoutTest { assertTrue("No messages expected, found " + list.size(), list.isEmpty()); } finally { root.removeAppender(appender); - ThreadContext.clearMap(); - appender.stop(); } } @@ -251,8 +247,6 @@ public class Rfc5424LayoutTest { appender.clear(); } finally { root.removeAppender(appender); - ThreadContext.clearMap(); - appender.stop(); } } @@ -293,8 +287,6 @@ public class Rfc5424LayoutTest { appender.clear(); } finally { root.removeAppender(appender); - ThreadContext.clearMap(); - appender.stop(); } } @@ -342,8 +334,6 @@ public class Rfc5424LayoutTest { appender.clear(); } finally { root.removeAppender(appender); - ThreadContext.clearMap(); - appender.stop(); } } @@ -390,8 +380,6 @@ public class Rfc5424LayoutTest { appender.clear(); } finally { root.removeAppender(appender); - ThreadContext.clearMap(); - appender.stop(); } } @@ -424,8 +412,6 @@ public class Rfc5424LayoutTest { appender.clear(); } finally { root.removeAppender(appender); - ThreadContext.clearMap(); - appender.stop(); } }