/*
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements. See the NOTICE file distributed with
 * this work for additional information regarding copyright ownership.
 * The ASF licenses this file to You under the Apache license, Version 2.0
 * (the "License"); you may not use this file except in compliance with
 * the License. You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the license for the specific language governing permissions and
 * limitations under the license.
 */
package org.apache.logging.log4j.core.pattern;

import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.ThreadContext;
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.Test;

import static org.junit.Assert.assertEquals;

public class NdcPatternConverterTest {

    @Test
    public void testEmpty() {
        testConverter("[]");
    }

    @Test
    public void test1() {
        ThreadContext.push("foo");
        testConverter("[foo]");
    }

    @Test
    public void test2() {
        ThreadContext.push("foo");
        ThreadContext.push("bar");
        testConverter("[foo, bar]");
    }

    @Test
    public void test3() {
        ThreadContext.push("foo");
        ThreadContext.push("bar");
        ThreadContext.push("baz");
        testConverter("[foo, bar, baz]");
    }

    private void testConverter(final String expected) {
        final Message msg = new SimpleMessage("Hello");
        final NdcPatternConverter converter = NdcPatternConverter.newInstance(null);
        final LogEvent event = Log4jLogEvent.newBuilder() //
                .setLoggerName("MyLogger") //
                .setLevel(Level.DEBUG) //
                .setMessage(msg) //
                .build();
        final StringBuilder sb = new StringBuilder();
        converter.format(event, sb);
        final String str = sb.toString();
        assertEquals(expected, str);
    }

    @After
    public void tearDown() {
        ThreadContext.clearStack();
    }
}


@@ -842,16 +842,62 @@
 ttern;%0A%0A
+import static org.junit.Assert.assertEquals;%0A%0A
 import o
@@ -1070,32 +1070,94 @@
 .Log4jLogEvent;%0A
+import org.apache.logging.log4j.junit.ThreadContextStackRule;%0A
 import org.apach
@@ -1261,21 +1261,20 @@
 g.junit.
-After
+Rule
 ;%0Aimport
@@ -1295,92 +1295,148 @@
 t;%0A%0A
-import static org.junit.Assert.assertEquals;%0A%0Apublic class NdcPatternConverterTest %7B
+public class NdcPatternConverterTest %7B%0A%0A    @Rule%0A    public final ThreadContextStackRule threadContextRule = new ThreadContextStackRule(); 
 %0A%0A  
@@ -2548,89 +2548,7 @@
  %7D%0A%0A
-    @After%0A    public void tearDown() %7B%0A        ThreadContext.clearStack();%0A    %7D%0A
 %7D%0A%0A

Use a ThreadContextRule to clean up tests.