From c428711908102c6e254f3fc93bf9f55b42e101cf Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Sat, 12 Aug 2023 15:03:54 +0200 Subject: [PATCH] Use DefaultJoranConfigurator instead of copy/pasting configureByResource Signed-off-by: Matthias Kurz --- .../classic/util/ContextInitializerTest.java | 23 +++++-------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/util/ContextInitializerTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/util/ContextInitializerTest.java index 763369960d..28687eb0b7 100755 --- a/logback-classic/src/test/java/ch/qos/logback/classic/util/ContextInitializerTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/util/ContextInitializerTest.java @@ -15,7 +15,6 @@ import ch.qos.logback.classic.ClassicTestConstants; import ch.qos.logback.classic.Logger; import ch.qos.logback.classic.LoggerContext; -import ch.qos.logback.classic.joran.JoranConfigurator; import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.core.Appender; import ch.qos.logback.core.ConsoleAppender; @@ -161,7 +160,9 @@ public void shouldConfigureFromXmlFile() throws MalformedURLException, JoranExce URL configurationFileUrl = Loader.getResource("BOO_logback-test.xml", Thread.currentThread().getContextClassLoader()); - configureByResource(configurationFileUrl); + DefaultJoranConfigurator joranConfigurator = new DefaultJoranConfigurator(); + joranConfigurator.setContext(loggerContext); + joranConfigurator.configureByResource(configurationFileUrl); assertNotNull(loggerContext.getObject(CoreConstants.SAFE_JORAN_CONFIGURATION)); } @@ -178,25 +179,13 @@ public void shouldConfigureFromXmlFile() throws MalformedURLException, JoranExce // assertNotNull(loggerContext.getObject(CoreConstants.CONFIGURATION_WATCH_LIST)); // } - private void configureByResource(URL url) throws JoranException { - if (url == null) { - throw new IllegalArgumentException("URL argument cannot be null"); - } - final String urlString = url.toString(); - if (urlString.endsWith("xml")) { - JoranConfigurator configurator = new JoranConfigurator(); - configurator.setContext(loggerContext); - configurator.doConfigure(url); - } else { - throw new LogbackException("Unexpected filename extension of file [" + url + "]. Should be .xml"); - } - } - @Test public void shouldThrowExceptionIfUnexpectedConfigurationFileExtension() throws JoranException { URL configurationFileUrl = Loader.getResource("README.txt", Thread.currentThread().getContextClassLoader()); try { - this.configureByResource(configurationFileUrl); + DefaultJoranConfigurator joranConfigurator = new DefaultJoranConfigurator(); + joranConfigurator.setContext(loggerContext); + joranConfigurator.configureByResource(configurationFileUrl); fail("Should throw LogbackException"); } catch (LogbackException expectedException) { // pass