The @After public void tearDown() currently clears the *stack* while we put data in the *map*.
Away from PC, but if I remember correctly there is a method ThreadContext.clear () that clears both. That should be fine. Sent from my iPhone > On 2016/08/14, at 2:13, [email protected] wrote: > > Clear ThreadContext after test > > > Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo > Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/a40b28f2 > Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/a40b28f2 > Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/a40b28f2 > > Branch: refs/heads/master > Commit: a40b28f26901c5549810d36fa6763a8697207740 > Parents: f32c0fe > Author: Mikael Ståldal <[email protected]> > Authored: Sat Aug 13 19:00:47 2016 +0200 > Committer: Mikael Ståldal <[email protected]> > Committed: Sat Aug 13 19:00:47 2016 +0200 > > ---------------------------------------------------------------------- > .../core/pattern/MdcPatternConverterTest.java | 26 +++++++++++--------- > 1 file changed, 14 insertions(+), 12 deletions(-) > ---------------------------------------------------------------------- > > > http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a40b28f2/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/MdcPatternConverterTest.java > ---------------------------------------------------------------------- > diff --git > a/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/MdcPatternConverterTest.java > > b/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/MdcPatternConverterTest.java > index dcacbcf..abdae00 100644 > --- > a/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/MdcPatternConverterTest.java > +++ > b/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/MdcPatternConverterTest.java > @@ -22,6 +22,8 @@ import org.apache.logging.log4j.core.LogEvent; > import org.apache.logging.log4j.core.impl.Log4jLogEvent; > import org.apache.logging.log4j.message.Message; > import org.apache.logging.log4j.message.SimpleMessage; > +import org.junit.After; > +import org.junit.Before; > import org.junit.Test; > > import static org.junit.Assert.*; > @@ -31,13 +33,16 @@ import static org.junit.Assert.*; > */ > public class MdcPatternConverterTest { > > - @Test > - public void testConverter() { > - > - final Message msg = new SimpleMessage("Hello"); > + @Before > + public void setup() { > ThreadContext.put("subject", "I"); > ThreadContext.put("verb", "love"); > ThreadContext.put("object", "Log4j"); > + } > + > + @Test > + public void testConverter() { > + final Message msg = new SimpleMessage("Hello"); > final MdcPatternConverter converter = > MdcPatternConverter.newInstance(null); > final LogEvent event = Log4jLogEvent.newBuilder() // > .setLoggerName("MyLogger") // > @@ -53,12 +58,8 @@ public class MdcPatternConverterTest { > > @Test > public void testConverterWithKey() { > - > final Message msg = new SimpleMessage("Hello"); > final String [] options = new String[] {"object"}; > - ThreadContext.put("subject", "I"); > - ThreadContext.put("verb", "love"); > - ThreadContext.put("object", "Log4j"); > final MdcPatternConverter converter = > MdcPatternConverter.newInstance(options); > final LogEvent event = Log4jLogEvent.newBuilder() // > .setLoggerName("MyLogger") // > @@ -74,12 +75,8 @@ public class MdcPatternConverterTest { > > @Test > public void testConverterWithKeys() { > - > final Message msg = new SimpleMessage("Hello"); > final String [] options = new String[] {"object, subject"}; > - ThreadContext.put("subject", "I"); > - ThreadContext.put("verb", "love"); > - ThreadContext.put("object", "Log4j"); > final MdcPatternConverter converter = > MdcPatternConverter.newInstance(options); > final LogEvent event = Log4jLogEvent.newBuilder() // > .setLoggerName("MyLogger") // > @@ -92,5 +89,10 @@ public class MdcPatternConverterTest { > final String expected = "{object=Log4j, subject=I}"; > assertEquals(expected, str); > } > + > + @After > + public void tearDown() { > + ThreadContext.clearStack(); > + } > } > > --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
