Reset sys prop at the end of the test. Use specific static imports instead of *.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/1f8d5454 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/1f8d5454 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/1f8d5454 Branch: refs/heads/master Commit: 1f8d545498d73e1a03c69ae196b92256a0d57679 Parents: d4c9b3a Author: ggregory <[email protected]> Authored: Tue Sep 1 15:04:26 2015 -0700 Committer: ggregory <[email protected]> Committed: Tue Sep 1 15:04:26 2015 -0700 ---------------------------------------------------------------------- .../builder/ConfigurationAssemblerTest.java | 46 +++++++++++--------- 1 file changed, 26 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f8d5454/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationAssemblerTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationAssemblerTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationAssemblerTest.java index 332e86a..e6df9d7 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationAssemblerTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationAssemblerTest.java @@ -16,6 +16,12 @@ */ package org.apache.logging.log4j.core.config.builder; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + +import java.util.Map; + import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.core.Appender; @@ -23,16 +29,11 @@ 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.junit.Test; -import java.util.Map; - -import static org.junit.Assert.*; - /** * */ @@ -40,20 +41,25 @@ public class ConfigurationAssemblerTest { @Test public void doConfigure() throws Exception { - System.setProperty(ConfigurationFactory.CONFIGURATION_FACTORY_PROPERTY, "org.apache.logging.log4j.core.config.builder.CustomConfigurationFactory"); - Configuration config = ((LoggerContext)LogManager.getContext(false)).getConfiguration(); - assertNotNull("No configuration created", config); - assertEquals("Incorrect State: " + config.getState(), config.getState(), LifeCycle.State.STARTED); - Map<String, Appender> appenders = config.getAppenders(); - assertNotNull(appenders); - assertTrue("Incorrect number of Appenders: " + appenders.size(), appenders.size() == 1); - Map<String, LoggerConfig> loggers = config.getLoggers(); - assertNotNull(loggers); - assertTrue("Incorrect number of LoggerConfigs: " + loggers.size(), loggers.size() == 2); - Filter filter = config.getFilter(); - assertNotNull("No Filter", filter); - assertTrue("Not a Threshold Filter", filter instanceof ThresholdFilter); - Logger logger = LogManager.getLogger(getClass()); - logger.info("Welcome to Log4j!"); + try { + System.setProperty(ConfigurationFactory.CONFIGURATION_FACTORY_PROPERTY, + "org.apache.logging.log4j.core.config.builder.CustomConfigurationFactory"); + Configuration config = ((LoggerContext) LogManager.getContext(false)).getConfiguration(); + assertNotNull("No configuration created", config); + assertEquals("Incorrect State: " + config.getState(), config.getState(), LifeCycle.State.STARTED); + Map<String, Appender> appenders = config.getAppenders(); + assertNotNull(appenders); + assertTrue("Incorrect number of Appenders: " + appenders.size(), appenders.size() == 1); + Map<String, LoggerConfig> loggers = config.getLoggers(); + assertNotNull(loggers); + assertTrue("Incorrect number of LoggerConfigs: " + loggers.size(), loggers.size() == 2); + Filter filter = config.getFilter(); + assertNotNull("No Filter", filter); + assertTrue("Not a Threshold Filter", filter instanceof ThresholdFilter); + Logger logger = LogManager.getLogger(getClass()); + logger.info("Welcome to Log4j!"); + } finally { + System.getProperties().remove(ConfigurationFactory.CONFIGURATION_FACTORY_PROPERTY); + } } }
