You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2015/09/02 00:10:15 UTC
logging-log4j2 git commit: Test config name.
Repository: logging-log4j2
Updated Branches:
refs/heads/LOG4J2-952 1f8d54549 -> 1223e5512
Test config name.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/1223e551
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/1223e551
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/1223e551
Branch: refs/heads/LOG4J2-952
Commit: 1223e551292880f13ea72713cd734611d29acf29
Parents: 1f8d545
Author: ggregory <gg...@apache.org>
Authored: Tue Sep 1 15:10:13 2015 -0700
Committer: ggregory <gg...@apache.org>
Committed: Tue Sep 1 15:10:13 2015 -0700
----------------------------------------------------------------------
.../log4j/core/config/builder/ConfigurationAssemblerTest.java | 3 +++
.../log4j/core/config/builder/CustomConfigurationFactory.java | 1 +
2 files changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1223e551/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 e6df9d7..27b5357 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
@@ -17,6 +17,7 @@
package org.apache.logging.log4j.core.config.builder;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
@@ -45,6 +46,8 @@ 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();
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1223e551/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/CustomConfigurationFactory.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/CustomConfigurationFactory.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/CustomConfigurationFactory.java
index 319ccfe..4cd288b 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/CustomConfigurationFactory.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/CustomConfigurationFactory.java
@@ -49,6 +49,7 @@ public class CustomConfigurationFactory extends ConfigurationFactory {
@Override
public Configuration getConfiguration(final String name, final URI configLocation) {
ConfigurationBuilder<BuiltConfiguration> builder = newConfigurationBuilder();
+ builder.setConfigurationName(name);
builder.setStatusLevel(Level.ERROR);
builder.add(builder.newFilter("ThresholdFilter", Filter.Result.ACCEPT, Filter.Result.NEUTRAL)
.addAttribute("level", Level.DEBUG));