Skip to content

Commit 1009952

Browse files
committed
use a new LoggerContert instance when running LogbackListenerTest. This should fix
logback-classic UT Failures while building #915 #915 Signed-off-by: Ceki Gulcu <[email protected]>
1 parent a3bb4b0 commit 1009952

File tree

1 file changed

+12
-3
lines changed

1 file changed

+12
-3
lines changed

logback-classic/src/test/java/ch/qos/logback/classic/issue/logback1159/LogbackListenerTest.java

+12-3
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,10 @@
1111

1212
//import org.apache.commons.io.FileUtils;
1313
//import org.apache.commons.lang3.RandomStringUtils;
14+
import ch.qos.logback.classic.util.LogbackMDCAdapter;
1415
import org.junit.jupiter.api.AfterEach;
1516
import org.junit.jupiter.api.Assertions;
17+
import org.junit.jupiter.api.BeforeEach;
1618
import org.junit.jupiter.api.Test;
1719
import org.slf4j.Logger;
1820
import org.slf4j.LoggerFactory;
@@ -21,21 +23,28 @@
2123
import ch.qos.logback.classic.LoggerContext;
2224
import ch.qos.logback.classic.joran.JoranConfigurator;
2325
import ch.qos.logback.core.joran.spi.JoranException;
26+
import org.slf4j.spi.MDCAdapter;
2427

2528
public class LogbackListenerTest {
2629
private File logFile = new File("target/test.log");
2730

31+
LoggerContext loggerContext = new LoggerContext();
32+
LogbackMDCAdapter mdcAdapter = new LogbackMDCAdapter();
33+
34+
@BeforeEach
35+
void setUp() {
36+
loggerContext.setMDCAdapter(mdcAdapter);
37+
}
38+
2839
private void doConfigure() throws JoranException {
29-
LoggerContext context = (LoggerContext) LoggerFactory.getILoggerFactory();
3040
JoranConfigurator configurator = new JoranConfigurator();
31-
configurator.setContext(context);
41+
configurator.setContext(loggerContext);
3242
configurator.doConfigure(new File("src/test/input/issue/logback-1159.xml"));
3343
}
3444

3545
@AfterEach
3646
public void after() {
3747
logFile.delete();
38-
LoggerFactoryFriend.reset();
3948
}
4049

4150
private void disableLogFileAccess() throws IOException {

0 commit comments

Comments
 (0)