Extract meat of test for reuse. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/4efaa3da Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/4efaa3da Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/4efaa3da
Branch: refs/heads/master Commit: 4efaa3da3b58a96ea9c0373180b772e4635c89ff Parents: 1223e55 Author: ggregory <[email protected]> Authored: Tue Sep 1 15:11:02 2015 -0700 Committer: ggregory <[email protected]> Committed: Tue Sep 1 15:11:02 2015 -0700 ---------------------------------------------------------------------- .../builder/ConfigurationAssemblerTest.java | 34 +++++++++++--------- 1 file changed, 19 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4efaa3da/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 27b5357..5e2bbd5 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 @@ -46,23 +46,27 @@ public class ConfigurationAssemblerTest { System.setProperty(ConfigurationFactory.CONFIGURATION_FACTORY_PROPERTY, "org.apache.logging.log4j.core.config.builder.CustomConfigurationFactory"); Configuration config = ((LoggerContext) LogManager.getContext(false)).getConfiguration(); - assertNotNull(config.getName()); - assertFalse(config.getName().isEmpty()); - 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!"); + validate(config); } finally { System.getProperties().remove(ConfigurationFactory.CONFIGURATION_FACTORY_PROPERTY); } } + + private void validate(Configuration config) { + assertNotNull(config.getName()); + assertFalse(config.getName().isEmpty()); + 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!"); + } }
