You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rp...@apache.org on 2016/08/30 14:45:50 UTC
[06/50] logging-log4j2 git commit: Unit test for ConfigurationBuilder
XML generation
Unit test for ConfigurationBuilder XML generation
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/ce08bfbe
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/ce08bfbe
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/ce08bfbe
Branch: refs/heads/LOG4J2-1349-gcfree-threadcontext
Commit: ce08bfbe41cc96b891446fd76595ac3611f92b5e
Parents: cc215c7
Author: Mikael St�ldal <mi...@staldal.nu>
Authored: Sun Aug 21 10:41:39 2016 +0200
Committer: Mikael St�ldal <mi...@staldal.nu>
Committed: Sun Aug 21 10:41:39 2016 +0200
----------------------------------------------------------------------
.../impl/DefaultConfigurationBuilder.java | 1 +
.../builder/ConfigurationBuilderTest.java | 61 ++++++++++++++++++++
2 files changed, 62 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce08bfbe/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 2fc78f4..b32b037 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
@@ -262,6 +262,7 @@ public class DefaultConfigurationBuilder<T extends BuiltConfiguration> implement
}
xmlWriter.writeEndElement(); // "Configuration"
+ xmlWriter.writeCharacters(System.lineSeparator());
xmlWriter.writeEndDocument();
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce08bfbe/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
new file mode 100644
index 0000000..3d8c4d2
--- /dev/null
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationBuilderTest.java
@@ -0,0 +1,61 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache license, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the license for the specific language governing permissions and
+ * limitations under the license.
+ */
+package org.apache.logging.log4j.core.config.builder;
+
+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;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class ConfigurationBuilderTest {
+
+ private final static String expectedXml =
+ "<?xml version='1.0' encoding='UTF-8'?>" + System.lineSeparator() +
+ "<Configuration name=\"config name\" status=\"ERROR\">" + System.lineSeparator() +
+ "\t<Scripts>" + System.lineSeparator() +
+ "\t\t<ScriptFile path=\"target/test-classes/scripts/filter.groovy\" name=\"target/test-classes/scripts/filter.groovy\" isWatched=\"true\"/>" + System.lineSeparator() +
+ "\t</Scripts>" + System.lineSeparator() +
+ "\t<Filters>" + System.lineSeparator() +
+ "\t\t<ThresholdFilter onMatch=\"ACCEPT\" level=\"DEBUG\" onMisMatch=\"NEUTRAL\"/>" + System.lineSeparator() +
+ "\t</Filters>" + System.lineSeparator() +
+ "\t<Appenders>" + System.lineSeparator() +
+ "\t\t<CONSOLE name=\"Stdout\" target=\"SYSTEM_OUT\">" + System.lineSeparator() +
+ "\t\t\t<PatternLayout pattern=\"%d [%t] %-5level: %msg%n%throwable\"/>" + System.lineSeparator() +
+ "\t\t\t<MarkerFilter onMatch=\"DENY\" onMisMatch=\"NEUTRAL\" marker=\"FLOW\"/>" + System.lineSeparator() +
+ "\t\t</CONSOLE>" + System.lineSeparator() +
+ "\t</Appenders>" + System.lineSeparator() +
+ "\t<Loggers>" + System.lineSeparator() +
+ "\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\t<AppenderRef ref=\"Stdout\"/>" + System.lineSeparator() +
+ "\t\t</Root>" + System.lineSeparator() +
+ "\t</Loggers>" + System.lineSeparator() +
+ "</Configuration>" + System.lineSeparator();
+
+ @Test
+ public void testXmlConstructing() throws Exception {
+ final ConfigurationBuilder<BuiltConfiguration> builder = ConfigurationBuilderFactory.newConfigurationBuilder();
+ CustomConfigurationFactory.addTestFixtures("config name", builder);
+ final String xmlConfiguration = builder.toXmlConfiguration();
+ assertEquals(expectedXml, xmlConfiguration);
+ }
+
+}