This is an automated email from the ASF dual-hosted git repository. klease pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push: new 404ac2a0e91 cAMEL-18413?: improve tests using log4j2 appenders (#8188) 404ac2a0e91 is described below commit 404ac2a0e913d1d386db5b3aceea195de60260e3 Author: klease <38634989+kle...@users.noreply.github.com> AuthorDate: Fri Aug 19 17:21:35 2022 +0200 cAMEL-18413?: improve tests using log4j2 appenders (#8188) Avoid LogBodyWithNewLineTest adding messages from other tests to log file. Replace use of deprecated method to build LoggerConfig. --- .../apache/camel/component/log/ConsumingAppender.java | 11 ++++++++--- .../camel/component/log/LogBodyWithNewLineTest.java | 19 +++++++++++++++---- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/core/camel-core/src/test/java/org/apache/camel/component/log/ConsumingAppender.java b/core/camel-core/src/test/java/org/apache/camel/component/log/ConsumingAppender.java index 47d807c6438..2618de61b12 100644 --- a/core/camel-core/src/test/java/org/apache/camel/component/log/ConsumingAppender.java +++ b/core/camel-core/src/test/java/org/apache/camel/component/log/ConsumingAppender.java @@ -66,9 +66,14 @@ public class ConsumingAppender extends AbstractAppender { ConsumingAppender appender = new ConsumingAppender(appenderName, patter, consumer); appender.start(); - LoggerConfig loggerConfig = LoggerConfig.createLogger(true, level, loggerName, "true", - new AppenderRef[] { AppenderRef.createAppenderRef(appenderName, null, null) }, null, - config, null); + LoggerConfig loggerConfig = LoggerConfig.newBuilder() + .withIncludeLocation("true") + .withLoggerName(loggerName) + .withLevel(level) + .withAdditivity(true) + .withConfig(config) + .withRefs(new AppenderRef[] { AppenderRef.createAppenderRef(appenderName, null, null) }) + .build(); loggerConfig.addAppender(appender, null, null); config.addLogger(loggerName, loggerConfig); diff --git a/core/camel-core/src/test/java/org/apache/camel/component/log/LogBodyWithNewLineTest.java b/core/camel-core/src/test/java/org/apache/camel/component/log/LogBodyWithNewLineTest.java index 7d72c1de330..fb253a800fb 100644 --- a/core/camel-core/src/test/java/org/apache/camel/component/log/LogBodyWithNewLineTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/component/log/LogBodyWithNewLineTest.java @@ -25,7 +25,9 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.core.Appender; import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.core.appender.WriterAppender; +import org.apache.logging.log4j.core.config.AppenderRef; import org.apache.logging.log4j.core.config.Configuration; +import org.apache.logging.log4j.core.config.LoggerConfig; import org.apache.logging.log4j.core.layout.PatternLayout; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -49,13 +51,22 @@ public class LogBodyWithNewLineTest extends ContextTestSupport { .setLayout(PatternLayout.newBuilder().withPattern(PatternLayout.SIMPLE_CONVERSION_PATTERN).build()) .setTarget(writer) .setName("Writer").build(); - appender.start(); - config.addAppender(appender); - config.getRootLogger().removeAppender("Writer"); - config.getRootLogger().addAppender(appender, Level.INFO, null); + final String loggerName = "logger_name"; + + config.removeLogger(loggerName); + LoggerConfig loggerConfig = LoggerConfig.newBuilder() + .withIncludeLocation("true") + .withLoggerName(loggerName) + .withLevel(Level.INFO) + .withAdditivity(true) + .withConfig(config) + .withRefs(new AppenderRef[] { AppenderRef.createAppenderRef("Writer", null, null) }) + .build(); + loggerConfig.addAppender(appender, Level.INFO, null); + config.addLogger(loggerName, loggerConfig); ctx.updateLoggers(); }