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/09/04 07:21:56 UTC
[08/50] logging-log4j2 git commit: Don't call same API over and over.
Don't call same API over and over.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/6ac5219d
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/6ac5219d
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/6ac5219d
Branch: refs/heads/LOG4J2-1349-gcfree-threadcontext
Commit: 6ac5219d5d421fc6e1306bc9fd962b04af4acad7
Parents: 114e687
Author: ggregory <gg...@apache.org>
Authored: Wed Aug 31 09:26:20 2016 -0700
Committer: ggregory <gg...@apache.org>
Committed: Wed Aug 31 09:26:20 2016 -0700
----------------------------------------------------------------------
.../builder/ConfigurationBuilderTest.java | 56 ++++++++++----------
1 file changed, 29 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/6ac5219d/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
index 4083f52..25772a7 100644
--- 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
@@ -30,6 +30,8 @@ import static org.junit.Assert.*;
public class ConfigurationBuilderTest {
+ private static final String EOL = System.lineSeparator();
+
private void addTestFixtures(final String name, final ConfigurationBuilder<BuiltConfiguration> builder) {
builder.setConfigurationName(name);
builder.setStatusLevel(Level.ERROR);
@@ -52,33 +54,33 @@ public class ConfigurationBuilderTest {
}
private final static String expectedXml =
- "<?xml version='1.0' encoding='UTF-8'?>" + System.lineSeparator() +
- "<Configuration name=\"config name\" status=\"ERROR\" packages=\"foo,bar\">" + System.lineSeparator() +
- "\t<Properties>" + System.lineSeparator() +
- "\t\t<Property name=\"MyKey\">MyValue</Property>" + System.lineSeparator() +
- "\t</Properties>" + 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<CustomLevels>" + System.lineSeparator() +
- "\t\t<CustomLevel name=\"Panic\" intLevel=\"17\"/>" + System.lineSeparator() +
- "\t</CustomLevels>" + System.lineSeparator() +
- "\t<ThresholdFilter onMatch=\"ACCEPT\" level=\"DEBUG\" onMisMatch=\"NEUTRAL\"/>" + 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\">" + System.lineSeparator() +
- "\t\t\t<AppenderRef ref=\"Stdout\"/>" + System.lineSeparator() +
- "\t\t</Root>" + System.lineSeparator() +
- "\t</Loggers>" + System.lineSeparator() +
- "</Configuration>" + System.lineSeparator();
+ "<?xml version='1.0' encoding='UTF-8'?>" + EOL +
+ "<Configuration name=\"config name\" status=\"ERROR\" packages=\"foo,bar\">" + EOL +
+ "\t<Properties>" + EOL +
+ "\t\t<Property name=\"MyKey\">MyValue</Property>" + EOL +
+ "\t</Properties>" + EOL +
+ "\t<Scripts>" + EOL +
+ "\t\t<ScriptFile path=\"target/test-classes/scripts/filter.groovy\" name=\"target/test-classes/scripts/filter.groovy\" isWatched=\"true\"/>" + EOL +
+ "\t</Scripts>" + EOL +
+ "\t<CustomLevels>" + EOL +
+ "\t\t<CustomLevel name=\"Panic\" intLevel=\"17\"/>" + EOL +
+ "\t</CustomLevels>" + EOL +
+ "\t<ThresholdFilter onMatch=\"ACCEPT\" level=\"DEBUG\" onMisMatch=\"NEUTRAL\"/>" + EOL +
+ "\t<Appenders>" + EOL +
+ "\t\t<CONSOLE name=\"Stdout\" target=\"SYSTEM_OUT\">" + EOL +
+ "\t\t\t<PatternLayout pattern=\"%d [%t] %-5level: %msg%n%throwable\"/>" + EOL +
+ "\t\t\t<MarkerFilter onMatch=\"DENY\" onMisMatch=\"NEUTRAL\" marker=\"FLOW\"/>" + EOL +
+ "\t\t</CONSOLE>" + EOL +
+ "\t</Appenders>" + EOL +
+ "\t<Loggers>" + EOL +
+ "\t\t<Logger additivity=\"false\" level=\"DEBUG\" includeLocation=\"true\" name=\"org.apache.logging.log4j\">" + EOL +
+ "\t\t\t<AppenderRef ref=\"Stdout\"/>" + EOL +
+ "\t\t</Logger>" + EOL +
+ "\t\t<Root level=\"ERROR\">" + EOL +
+ "\t\t\t<AppenderRef ref=\"Stdout\"/>" + EOL +
+ "\t\t</Root>" + EOL +
+ "\t</Loggers>" + EOL +
+ "</Configuration>" + EOL;
@Test
public void testXmlConstructing() throws Exception {