Repository: logging-log4j2 Updated Branches: refs/heads/master 8bbc02cce -> d9daa31f3
Test LOG4J2-962. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/d9daa31f Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/d9daa31f Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/d9daa31f Branch: refs/heads/master Commit: d9daa31f3b5ed0c6e129b667f47b2e2aca7d59df Parents: 8bbc02c Author: ggregory <[email protected]> Authored: Tue Sep 1 22:54:32 2015 -0700 Committer: ggregory <[email protected]> Committed: Tue Sep 1 22:54:32 2015 -0700 ---------------------------------------------------------------------- .../log4j/core/layout/PatternLayoutTest.java | 21 +++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d9daa31f/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/PatternLayoutTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/PatternLayoutTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/PatternLayoutTest.java index e0715f9..4cffa6f 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/PatternLayoutTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/PatternLayoutTest.java @@ -74,7 +74,7 @@ public class PatternLayoutTest { // % does not work here. final String pattern = "%d{UNIX} MyApp%n${java:version}%n${java:runtime}%n${java:vm}%n${java:os}%n${java:hw}"; final PatternLayout layout = PatternLayout.newBuilder().withConfiguration(ctx.getConfiguration()) - .withHeader("Header: " + pattern).withFooter("Footer: "+ pattern).build(); + .withHeader("Header: " + pattern).withFooter("Footer: " + pattern).build(); final byte[] header = layout.getHeader(); assertNotNull("No header", header); final String headerStr = new String(header); @@ -94,6 +94,25 @@ public class PatternLayoutTest { assertTrue(footerStr, footerStr.contains(" architecture: ")); } + /** + * Tests LOG4J2-962. + */ + @Test + public void testHeaderFooterMainLookup() { + MainMapLookup.setMainArguments(new String[] { "value0", "value1", "value2" }); + final PatternLayout layout = PatternLayout.newBuilder().withConfiguration(ctx.getConfiguration()) + .withHeader("${main:0}").withFooter("${main:2}").build(); + final byte[] header = layout.getHeader(); + assertNotNull("No header", header); + final String headerStr = new String(header); + assertTrue(headerStr, headerStr.contains("value0")); + // + final byte[] footer = layout.getFooter(); + assertNotNull("No footer", footer); + final String footerStr = new String(footer); + assertTrue(footerStr, footerStr.contains("value2")); + } + @Test public void testHeaderFooterThreadContext() throws Exception { final PatternLayout layout = PatternLayout.newBuilder().withPattern("%d{UNIX} %m")
