Add test and TODO for includeLocation on loggers
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/634df7cc Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/634df7cc Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/634df7cc Branch: refs/heads/LOG4J2-1553 Commit: 634df7cc1adddd9b38ff73508a83802c83922083 Parents: e0f5ec4 Author: Mikael Ståldal <mik...@staldal.nu> Authored: Sun Aug 21 17:40:44 2016 +0200 Committer: Mikael Ståldal <mik...@staldal.nu> Committed: Sun Aug 21 17:40:44 2016 +0200 ---------------------------------------------------------------------- .../core/config/AbstractConfiguration.java | 2 +- .../impl/DefaultConfigurationBuilder.java | 2 +- .../builder/ConfigurationBuilderTest.java | 39 +++++++++++++++----- 3 files changed, 31 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/634df7cc/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java index d89b8f5..b098334 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java @@ -265,7 +265,7 @@ public abstract class AbstractConfiguration extends AbstractFilterable implement } writeXmlSection(xmlWriter, lookupSection("Appenders")); - writeXmlSection(xmlWriter, lookupSection("Loggers")); + writeXmlSection(xmlWriter, lookupSection("Loggers")); // TODO includeLocation on loggers xmlWriter.writeEndElement(); // "Configuration" xmlWriter.writeCharacters(System.lineSeparator()); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/634df7cc/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultConfigurationBuilder.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultConfigurationBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultConfigurationBuilder.java index e3de1ae..849a9f4 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultConfigurationBuilder.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultConfigurationBuilder.java @@ -264,7 +264,7 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement writeXmlSection(xmlWriter, filters); } writeXmlSection(xmlWriter, appenders); - writeXmlSection(xmlWriter, loggers); + writeXmlSection(xmlWriter, loggers); // TODO includeLocation on loggers xmlWriter.writeEndElement(); // "Configuration" xmlWriter.writeCharacters(System.lineSeparator()); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/634df7cc/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationBuilderTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationBuilderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationBuilderTest.java index 951038f..15b9599 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationBuilderTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationBuilderTest.java @@ -16,8 +16,11 @@ */ package org.apache.logging.log4j.core.config.builder; +import org.apache.logging.log4j.Level; import org.apache.logging.log4j.core.Filter; +import org.apache.logging.log4j.core.appender.ConsoleAppender; import org.apache.logging.log4j.core.config.AbstractConfiguration; +import org.apache.logging.log4j.core.config.builder.api.AppenderComponentBuilder; import org.apache.logging.log4j.core.config.builder.api.ConfigurationBuilder; import org.apache.logging.log4j.core.config.builder.api.ConfigurationBuilderFactory; import org.apache.logging.log4j.core.config.builder.impl.BuiltConfiguration; @@ -27,6 +30,28 @@ import static org.junit.Assert.assertEquals; public class ConfigurationBuilderTest { + private void addTestFixtures(final String name, final ConfigurationBuilder<BuiltConfiguration> builder) { + builder.setConfigurationName(name); + builder.setStatusLevel(Level.ERROR); + builder.add(builder.newScriptFile("target/test-classes/scripts/filter.groovy").addIsWatched(true)); + builder.add(builder.newFilter("ThresholdFilter", Filter.Result.ACCEPT, Filter.Result.NEUTRAL) + .addAttribute("level", Level.DEBUG)); + final AppenderComponentBuilder appenderBuilder = builder.newAppender("Stdout", "CONSOLE").addAttribute("target", ConsoleAppender.Target.SYSTEM_OUT); + appenderBuilder.add(builder.newLayout("PatternLayout"). + addAttribute("pattern", "%d [%t] %-5level: %msg%n%throwable")); + appenderBuilder.add(builder.newFilter("MarkerFilter", Filter.Result.DENY, + Filter.Result.NEUTRAL).addAttribute("marker", "FLOW")); + builder.add(appenderBuilder); + builder.add(builder.newLogger("org.apache.logging.log4j", Level.DEBUG). + add(builder.newAppenderRef("Stdout")). + addAttribute("additivity", false). + addAttribute("includeLocation", true)); + builder.add(builder.newRootLogger(Level.ERROR).add(builder.newAppenderRef("Stdout"))); + builder.addProperty("MyKey", "MyValue"); + builder.add(builder.newCustomLevel("Panic", 17)); + builder.setPackages("foo,bar"); + } + private final static String expectedXml1 = "<?xml version='1.0' encoding='UTF-8'?>" + System.lineSeparator() + "<Configuration name=\"config name\" status=\"ERROR\" packages=\"foo,bar\">" + System.lineSeparator() + @@ -50,7 +75,7 @@ public class ConfigurationBuilderTest { "\t\t<Logger additivity=\"false\" level=\"DEBUG\" includeLocation=\"true\" name=\"org.apache.logging.log4j\">" + System.lineSeparator() + "\t\t\t<AppenderRef ref=\"Stdout\"/>" + System.lineSeparator() + "\t\t</Logger>" + System.lineSeparator() + - "\t\t<Root level=\"ERROR\" includeLocation=\"true\">" + System.lineSeparator() + + "\t\t<Root level=\"ERROR\">" + System.lineSeparator() + "\t\t\t<AppenderRef ref=\"Stdout\"/>" + System.lineSeparator() + "\t\t</Root>" + System.lineSeparator() + "\t</Loggers>" + System.lineSeparator() + @@ -59,10 +84,7 @@ public class ConfigurationBuilderTest { @Test public void testXmlConstructing() throws Exception { final ConfigurationBuilder<BuiltConfiguration> builder = ConfigurationBuilderFactory.newConfigurationBuilder(); - CustomConfigurationFactory.addTestFixtures("config name", builder); - builder.addProperty("MyKey", "MyValue"); - builder.add(builder.newCustomLevel("Panic", 17)); - builder.setPackages("foo,bar"); + addTestFixtures("config name", builder); final String xmlConfiguration = builder.toXmlConfiguration(); assertEquals(expectedXml1, xmlConfiguration); } @@ -90,7 +112,7 @@ public class ConfigurationBuilderTest { "\t\t<Logger name=\"org.apache.logging.log4j\" additivity=\"false\" level=\"DEBUG\" includeLocation=\"true\">" + System.lineSeparator() + "\t\t\t<AppenderRef ref=\"Stdout\"/>" + System.lineSeparator() + "\t\t</Logger>" + System.lineSeparator() + - "\t\t<Root level=\"ERROR\" includeLocation=\"true\">" + System.lineSeparator() + + "\t\t<Root level=\"ERROR\">" + System.lineSeparator() + "\t\t\t<AppenderRef ref=\"Stdout\"/>" + System.lineSeparator() + "\t\t</Root>" + System.lineSeparator() + "\t</Loggers>" + System.lineSeparator() + @@ -99,10 +121,7 @@ public class ConfigurationBuilderTest { @Test public void testXmlConstructingWithAbstractConfiguration() throws Exception { final ConfigurationBuilder<BuiltConfiguration> builder = ConfigurationBuilderFactory.newConfigurationBuilder(); - CustomConfigurationFactory.addTestFixtures("config name", builder); - builder.addProperty("MyKey", "MyValue"); - builder.add(builder.newCustomLevel("Panic", 17)); - builder.setPackages("foo,bar"); + addTestFixtures("config name", builder); AbstractConfiguration configuration = builder.build(false); configuration.setup(); final String xmlConfiguration = configuration.toXmlConfiguration();
