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/49035f84 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/49035f84 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/49035f84
Branch: refs/heads/LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure Commit: 49035f842475376ed04179da703efd8f9cb23d4f Parents: c8db038 Author: Gary Gregory <ggreg...@apache.org> Authored: Mon Aug 15 13:11:16 2016 -0700 Committer: Gary Gregory <ggreg...@apache.org> Committed: Mon Aug 15 13:11:16 2016 -0700 ---------------------------------------------------------------------- .../apache/logging/log4j/core/layout/Rfc5424LayoutTest.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/49035f84/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 7259080..ca327d6 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 @@ -30,6 +30,7 @@ import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.core.config.ConfigurationFactory; import org.apache.logging.log4j.core.net.Facility; import org.apache.logging.log4j.core.util.KeyValuePair; +import org.apache.logging.log4j.junit.ThreadContextRule; import org.apache.logging.log4j.message.StructuredDataMessage; import org.apache.logging.log4j.status.StatusLogger; import org.apache.logging.log4j.test.appender.ListAppender; @@ -37,6 +38,7 @@ import org.apache.logging.log4j.util.Strings; import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; +import org.junit.Rule; import org.junit.Test; import static org.junit.Assert.*; @@ -59,9 +61,11 @@ public class Rfc5424LayoutTest { static ConfigurationFactory cf = new BasicConfigurationFactory(); + @Rule + public final ThreadContextRule threadContextRule = new ThreadContextRule(); + @BeforeClass public static void setupClass() { - ThreadContext.clearAll(); StatusLogger.getLogger().setLevel(Level.OFF); ConfigurationFactory.setConfigurationFactory(cf); final LoggerContext ctx = LoggerContext.getContext(); @@ -71,7 +75,6 @@ public class Rfc5424LayoutTest { @AfterClass public static void cleanupClass() { ConfigurationFactory.removeConfigurationFactory(cf); - ThreadContext.clearAll(); } /**
