Use LoggerContextRule as desired by LOG4J2-498
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/5b5773e3 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/5b5773e3 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/5b5773e3 Branch: refs/heads/LOG4J2-1161 Commit: 5b5773e37e2e52921f77d9bee5e30db3cf2f79a9 Parents: 13b480a Author: Matt Sicker <boa...@gmail.com> Authored: Wed Oct 21 01:11:08 2015 -0500 Committer: Matt Sicker <boa...@gmail.com> Committed: Wed Oct 21 01:11:08 2015 -0500 ---------------------------------------------------------------------- .../PropertiesConfigurationRootLoggerOnlyTest.java | 14 +++++++------- .../properties/PropertiesConfigurationTest.java | 14 +++++++------- .../config/properties/RollingFilePropertiesTest.java | 15 ++++++++------- .../log4j/core/filter/StructuredDataFilterTest.java | 15 ++++++++------- 4 files changed, 30 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b5773e3/log4j-core/src/test/java/org/apache/logging/log4j/core/config/properties/PropertiesConfigurationRootLoggerOnlyTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/properties/PropertiesConfigurationRootLoggerOnlyTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/properties/PropertiesConfigurationRootLoggerOnlyTest.java index 88b0709..5a8be67 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/properties/PropertiesConfigurationRootLoggerOnlyTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/properties/PropertiesConfigurationRootLoggerOnlyTest.java @@ -21,28 +21,28 @@ import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.core.Appender; import org.apache.logging.log4j.core.Filter; import org.apache.logging.log4j.core.LifeCycle; -import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.core.config.Configuration; -import org.apache.logging.log4j.core.config.ConfigurationFactory; import org.apache.logging.log4j.core.config.LoggerConfig; import org.apache.logging.log4j.core.filter.ThresholdFilter; +import org.apache.logging.log4j.junit.LoggerContextRule; +import org.junit.ClassRule; import org.junit.Test; import java.util.Map; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.*; /** * */ public class PropertiesConfigurationRootLoggerOnlyTest { + @ClassRule + public static LoggerContextRule context = new LoggerContextRule("log4j2-properties-root-only.properties"); + @Test public void testPropertiesConfiguration() { - System.setProperty(ConfigurationFactory.CONFIGURATION_FILE_PROPERTY, "target/test-classes/log4j2-properties-root-only.properties"); - Configuration config = ((LoggerContext)LogManager.getContext(false)).getConfiguration(); + Configuration config = context.getConfiguration(); assertNotNull("No configuration created", config); assertEquals("Incorrect State: " + config.getState(), config.getState(), LifeCycle.State.STARTED); Map<String, Appender> appenders = config.getAppenders(); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b5773e3/log4j-core/src/test/java/org/apache/logging/log4j/core/config/properties/PropertiesConfigurationTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/properties/PropertiesConfigurationTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/properties/PropertiesConfigurationTest.java index 6c78abb..dfe24a5 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/properties/PropertiesConfigurationTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/properties/PropertiesConfigurationTest.java @@ -21,28 +21,28 @@ import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.core.Appender; import org.apache.logging.log4j.core.Filter; import org.apache.logging.log4j.core.LifeCycle; -import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.core.config.Configuration; -import org.apache.logging.log4j.core.config.ConfigurationFactory; import org.apache.logging.log4j.core.config.LoggerConfig; import org.apache.logging.log4j.core.filter.ThresholdFilter; +import org.apache.logging.log4j.junit.LoggerContextRule; +import org.junit.ClassRule; import org.junit.Test; import java.util.Map; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.*; /** * */ public class PropertiesConfigurationTest { + @ClassRule + public static LoggerContextRule context = new LoggerContextRule("log4j2-properties.properties"); + @Test public void testPropertiesConfiguration() { - System.setProperty(ConfigurationFactory.CONFIGURATION_FILE_PROPERTY, "target/test-classes/log4j2-properties.properties"); - Configuration config = ((LoggerContext)LogManager.getContext(false)).getConfiguration(); + Configuration config = context.getConfiguration(); assertNotNull("No configuration created", config); assertEquals("Incorrect State: " + config.getState(), config.getState(), LifeCycle.State.STARTED); Map<String, Appender> appenders = config.getAppenders(); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b5773e3/log4j-core/src/test/java/org/apache/logging/log4j/core/config/properties/RollingFilePropertiesTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/properties/RollingFilePropertiesTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/properties/RollingFilePropertiesTest.java index 9607284..e216ff8 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/properties/RollingFilePropertiesTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/properties/RollingFilePropertiesTest.java @@ -21,27 +21,28 @@ import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.core.Appender; import org.apache.logging.log4j.core.Filter; import org.apache.logging.log4j.core.LifeCycle; -import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.core.config.Configuration; -import org.apache.logging.log4j.core.config.ConfigurationFactory; import org.apache.logging.log4j.core.config.LoggerConfig; import org.apache.logging.log4j.core.filter.ThresholdFilter; +import org.apache.logging.log4j.junit.LoggerContextRule; +import org.junit.ClassRule; import org.junit.Test; import java.util.Map; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.*; /** * */ public class RollingFilePropertiesTest { + + @ClassRule + public static LoggerContextRule context = new LoggerContextRule("log4j-rolling.properties"); + @Test public void testPropertiesConfiguration() { - System.setProperty(ConfigurationFactory.CONFIGURATION_FILE_PROPERTY, "target/test-classes/log4j-rolling.properties"); - Configuration config = ((LoggerContext) LogManager.getContext(false)).getConfiguration(); + Configuration config = context.getConfiguration(); assertNotNull("No configuration created", config); assertEquals("Incorrect State: " + config.getState(), config.getState(), LifeCycle.State.STARTED); Map<String, Appender> appenders = config.getAppenders(); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b5773e3/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/StructuredDataFilterTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/StructuredDataFilterTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/StructuredDataFilterTest.java index 21c4793..d313e7c 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/StructuredDataFilterTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/StructuredDataFilterTest.java @@ -16,18 +16,18 @@ */ package org.apache.logging.log4j.core.filter; -import java.util.List; -import java.util.Map; - import org.apache.logging.log4j.Level; import org.apache.logging.log4j.core.Filter; -import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.core.config.Configuration; -import org.apache.logging.log4j.core.config.Configurator; import org.apache.logging.log4j.core.util.KeyValuePair; +import org.apache.logging.log4j.junit.LoggerContextRule; import org.apache.logging.log4j.message.StructuredDataMessage; +import org.junit.ClassRule; import org.junit.Test; +import java.util.List; +import java.util.Map; + import static org.junit.Assert.*; /** @@ -35,6 +35,8 @@ import static org.junit.Assert.*; */ public class StructuredDataFilterTest { + @ClassRule + public static LoggerContextRule context = new LoggerContextRule("log4j2-sdfilter.xml"); @Test public void testFilter() { @@ -64,8 +66,7 @@ public class StructuredDataFilterTest { @Test public void testConfig() { - final LoggerContext ctx = Configurator.initialize("Test1", "target/test-classes/log4j2-sdfilter.xml"); - final Configuration config = ctx.getConfiguration(); + final Configuration config = context.getConfiguration(); final Filter filter = config.getFilter(); assertNotNull("No StructuredDataFilter", filter); assertTrue("Not a StructuredDataFilter", filter instanceof StructuredDataFilter);
