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/aad314e6 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/aad314e6 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/aad314e6
Branch: refs/heads/LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure Commit: aad314e69128b134042683d5683b3615ffaaf0cc Parents: eef6196 Author: Gary Gregory <ggreg...@apache.org> Authored: Mon Aug 15 13:13:07 2016 -0700 Committer: Gary Gregory <ggreg...@apache.org> Committed: Mon Aug 15 13:13:07 2016 -0700 ---------------------------------------------------------------------- .../org/apache/logging/log4j/core/layout/XmlLayoutTest.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/aad314e6/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/XmlLayoutTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/XmlLayoutTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/XmlLayoutTest.java index 2e87a94..aa49e73 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/XmlLayoutTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/XmlLayoutTest.java @@ -32,12 +32,14 @@ import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.core.config.ConfigurationFactory; import org.apache.logging.log4j.core.impl.Log4jLogEvent; import org.apache.logging.log4j.core.jackson.Log4jXmlObjectMapper; +import org.apache.logging.log4j.junit.ThreadContextRule; import org.apache.logging.log4j.message.SimpleMessage; import org.apache.logging.log4j.spi.AbstractLogger; import org.apache.logging.log4j.test.appender.ListAppender; import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; +import org.junit.Rule; import org.junit.Test; import com.fasterxml.jackson.core.JsonParseException; @@ -53,15 +55,16 @@ public class XmlLayoutTest { static ConfigurationFactory cf = new BasicConfigurationFactory(); private static final String markerTag = "<Marker name=\"EVENT\"/>"; + @Rule + public final ThreadContextRule threadContextRule = new ThreadContextRule(); + @AfterClass public static void cleanupClass() { ConfigurationFactory.removeConfigurationFactory(cf); - ThreadContext.clearAll(); } @BeforeClass public static void setupClass() { - ThreadContext.clearAll(); ConfigurationFactory.setConfigurationFactory(cf); final LoggerContext ctx = LoggerContext.getContext(); ctx.reconfigure();
