Repository: logging-log4j2 Updated Branches: refs/heads/master 4acb10591 -> 42d352c84
Sort methods. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/42d352c8 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/42d352c8 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/42d352c8 Branch: refs/heads/master Commit: 42d352c842be70f2c82c422c15f403a103651d5e Parents: 4acb105 Author: ggregory <[email protected]> Authored: Sat Feb 13 14:58:53 2016 -0800 Committer: ggregory <[email protected]> Committed: Sat Feb 13 14:58:53 2016 -0800 ---------------------------------------------------------------------- .../log4j/core/layout/PatternLayoutTest.java | 106 +++++++++---------- 1 file changed, 53 insertions(+), 53 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/42d352c8/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 b10c8f5..125f08e 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 @@ -42,10 +42,16 @@ import static org.junit.Assert.*; * */ public class PatternLayoutTest { + public class FauxLogger { + public String formatEvent(LogEvent event, Layout<?> layout) { + return new String(layout.toByteArray(event)); + } + } static ConfigurationFactory cf = new BasicConfigurationFactory(); static String msgPattern = "%m%n"; static String OUTPUT_FILE = "target/output/PatternParser"; static final String regexPattern = "%replace{%logger %msg}{\\.}{/}"; + static String WITNESS_FILE = "witness/PatternParser"; public static void cleanupClass() { @@ -69,6 +75,28 @@ public class PatternLayoutTest { } @Test + public void testEqualsEmptyMarker() throws Exception { + // replace "[]" with the empty string + final PatternLayout layout = PatternLayout.newBuilder().withPattern("[%logger]%equals{[%marker]}{[]}{} %msg") + .withConfiguration(ctx.getConfiguration()).build(); + // Not empty marker + final LogEvent event1 = Log4jLogEvent.newBuilder() // + .setLoggerName(this.getClass().getName()).setLoggerFqcn("org.apache.logging.log4j.core.Logger") // + .setLevel(Level.INFO) // + .setMarker(MarkerManager.getMarker("TestMarker")) // + .setMessage(new SimpleMessage("Hello, world!")).build(); + final byte[] result1 = layout.toByteArray(event1); + assertEquals("[org.apache.logging.log4j.core.layout.PatternLayoutTest][TestMarker] Hello, world!", new String(result1)); + // empty marker + final LogEvent event2 = Log4jLogEvent.newBuilder() // + .setLoggerName(this.getClass().getName()).setLoggerFqcn("org.apache.logging.log4j.core.Logger") // + .setLevel(Level.INFO) // + .setMessage(new SimpleMessage("Hello, world!")).build(); + final byte[] result2 = layout.toByteArray(event2); + assertEquals("[org.apache.logging.log4j.core.layout.PatternLayoutTest] Hello, world!", new String(result2)); + } + + @Test public void testHeaderFooterJavaLookup() throws Exception { // % 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}"; @@ -169,6 +197,31 @@ public class PatternLayoutTest { } @Test + public void testPatternSelector() throws Exception { + PatternMatch[] patterns = new PatternMatch[1]; + patterns[0] = new PatternMatch("FLOW", "%d %-5p [%t]: ====== %C{1}.%M:%L %m ======%n"); + PatternSelector selector = MarkerPatternSelector.createSelector(patterns, "%d %-5p [%t]: %m%n", true, true, ctx.getConfiguration()); + final PatternLayout layout = PatternLayout.newBuilder().withPatternSelector(selector) + .withConfiguration(ctx.getConfiguration()).build(); + final LogEvent event1 = Log4jLogEvent.newBuilder() // + .setLoggerName(this.getClass().getName()).setLoggerFqcn("org.apache.logging.log4j.core.layout.PatternLayoutTest$FauxLogger") + .setMarker(MarkerManager.getMarker("FLOW")) + .setLevel(Level.TRACE) // + .setIncludeLocation(true) + .setMessage(new SimpleMessage("entry")).build(); + final String result1 = new FauxLogger().formatEvent(event1, layout); + final String expectSuffix1 = String.format("====== PatternLayoutTest.testPatternSelector:327 entry ======%n"); + assertTrue("Unexpected result: " + result1, result1.endsWith(expectSuffix1)); + final LogEvent event2 = Log4jLogEvent.newBuilder() // + .setLoggerName(this.getClass().getName()).setLoggerFqcn("org.apache.logging.log4j.core.Logger") // + .setLevel(Level.INFO) // + .setMessage(new SimpleMessage("Hello, world 1!")).build(); + final String result2 = new String(layout.toByteArray(event2)); + final String expectSuffix2 = String.format("Hello, world 1!%n"); + assertTrue("Unexpected result: " + result2, result2.endsWith(expectSuffix2)); + } + + @Test public void testRegex() throws Exception { final PatternLayout layout = PatternLayout.newBuilder().withPattern(regexPattern) .withConfiguration(ctx.getConfiguration()).build(); @@ -203,28 +256,6 @@ public class PatternLayoutTest { } @Test - public void testEqualsEmptyMarker() throws Exception { - // replace "[]" with the empty string - final PatternLayout layout = PatternLayout.newBuilder().withPattern("[%logger]%equals{[%marker]}{[]}{} %msg") - .withConfiguration(ctx.getConfiguration()).build(); - // Not empty marker - final LogEvent event1 = Log4jLogEvent.newBuilder() // - .setLoggerName(this.getClass().getName()).setLoggerFqcn("org.apache.logging.log4j.core.Logger") // - .setLevel(Level.INFO) // - .setMarker(MarkerManager.getMarker("TestMarker")) // - .setMessage(new SimpleMessage("Hello, world!")).build(); - final byte[] result1 = layout.toByteArray(event1); - assertEquals("[org.apache.logging.log4j.core.layout.PatternLayoutTest][TestMarker] Hello, world!", new String(result1)); - // empty marker - final LogEvent event2 = Log4jLogEvent.newBuilder() // - .setLoggerName(this.getClass().getName()).setLoggerFqcn("org.apache.logging.log4j.core.Logger") // - .setLevel(Level.INFO) // - .setMessage(new SimpleMessage("Hello, world!")).build(); - final byte[] result2 = layout.toByteArray(event2); - assertEquals("[org.apache.logging.log4j.core.layout.PatternLayoutTest] Hello, world!", new String(result2)); - } - - @Test public void testSpecialChars() throws Exception { final PatternLayout layout = PatternLayout.newBuilder().withPattern("\\\\%level\\t%msg\\n\\t%logger\\r\\n\\f") .withConfiguration(ctx.getConfiguration()).build(); @@ -310,35 +341,4 @@ public class PatternLayoutTest { .withConfiguration(ctx.getConfiguration()).withCharset(StandardCharsets.UTF_8).build(); assertEquals(StandardCharsets.UTF_8, layout.getCharset()); } - - @Test - public void testPatternSelector() throws Exception { - PatternMatch[] patterns = new PatternMatch[1]; - patterns[0] = new PatternMatch("FLOW", "%d %-5p [%t]: ====== %C{1}.%M:%L %m ======%n"); - PatternSelector selector = MarkerPatternSelector.createSelector(patterns, "%d %-5p [%t]: %m%n", true, true, ctx.getConfiguration()); - final PatternLayout layout = PatternLayout.newBuilder().withPatternSelector(selector) - .withConfiguration(ctx.getConfiguration()).build(); - final LogEvent event1 = Log4jLogEvent.newBuilder() // - .setLoggerName(this.getClass().getName()).setLoggerFqcn("org.apache.logging.log4j.core.layout.PatternLayoutTest$FauxLogger") - .setMarker(MarkerManager.getMarker("FLOW")) - .setLevel(Level.TRACE) // - .setIncludeLocation(true) - .setMessage(new SimpleMessage("entry")).build(); - final String result1 = new FauxLogger().formatEvent(event1, layout); - final String expectSuffix1 = String.format("====== PatternLayoutTest.testPatternSelector:327 entry ======%n"); - assertTrue("Unexpected result: " + result1, result1.endsWith(expectSuffix1)); - final LogEvent event2 = Log4jLogEvent.newBuilder() // - .setLoggerName(this.getClass().getName()).setLoggerFqcn("org.apache.logging.log4j.core.Logger") // - .setLevel(Level.INFO) // - .setMessage(new SimpleMessage("Hello, world 1!")).build(); - final String result2 = new String(layout.toByteArray(event2)); - final String expectSuffix2 = String.format("Hello, world 1!%n"); - assertTrue("Unexpected result: " + result2, result2.endsWith(expectSuffix2)); - } - - public class FauxLogger { - public String formatEvent(LogEvent event, Layout<?> layout) { - return new String(layout.toByteArray(event)); - } - } }
