bugfix: use OS-independent line separators to run on Windows also
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/5baac731 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/5baac731 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/5baac731 Branch: refs/heads/LOG4J2-1136 Commit: 5baac7315f735cccba461541c2fa035bb0025204 Parents: 1236fac Author: rpopma <[email protected]> Authored: Thu Sep 24 15:18:03 2015 +0200 Committer: Ralph Goers <[email protected]> Committed: Sun Sep 27 10:49:28 2015 -0700 ---------------------------------------------------------------------- .../logging/log4j/core/PatternSelectorTest.java | 20 ++++++++++++----- .../log4j/core/layout/PatternLayoutTest.java | 23 +++++++++++--------- 2 files changed, 28 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5baac731/log4j-core/src/test/java/org/apache/logging/log4j/core/PatternSelectorTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/PatternSelectorTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/PatternSelectorTest.java index c5971d4..40f6f2c 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/PatternSelectorTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/PatternSelectorTest.java @@ -47,7 +47,9 @@ public class PatternSelectorTest { List<String> messages = app.getMessages(); assertNotNull("No Messages", messages); assertTrue("Incorrect number of messages. Expected 3, Actual " + messages.size(), messages.size() == 3); - assertEquals("[TRACE] TestMarkerPatternSelector ====== o.a.l.l.c.PatternSelectorTest.testMarkerPatternSelector:42 entry ======\n", messages.get(0)); + final String expect = String.format("[TRACE] TestMarkerPatternSelector ====== " + + "o.a.l.l.c.PatternSelectorTest.testMarkerPatternSelector:42 entry ======%n"); + assertEquals(expect, messages.get(0)); assertEquals("[INFO ] TestMarkerPatternSelector Hello World\n", messages.get(1)); app.clear(); } @@ -65,8 +67,12 @@ public class PatternSelectorTest { List<String> messages = app.getMessages(); assertNotNull("No Messages", messages); assertTrue("Incorrect number of messages. Expected 4, Actual " + messages.size(), messages.size() == 4); - assertEquals("[TRACE] TestScriptPatternSelector ====== o.a.l.l.c.PatternSelectorTest.testScriptPatternSelector:59 entry ======\n", messages.get(0)); - assertEquals("[INFO ] TestScriptPatternSelector o.a.l.l.c.PatternSelectorTest.testScriptPatternSelector.60 Hello World\n", messages.get(1)); + String expect = "[TRACE] TestScriptPatternSelector ====== " + + "o.a.l.l.c.PatternSelectorTest.testScriptPatternSelector:61 entry ======\n"; + assertEquals(expect, messages.get(0)); + expect = "[INFO ] TestScriptPatternSelector o.a.l.l.c.PatternSelectorTest.testScriptPatternSelector.62 " + + "Hello World\n"; + assertEquals(expect, messages.get(1)); assertEquals("[INFO ] NoLocation No location information\n", messages.get(2)); app.clear(); } @@ -84,8 +90,12 @@ public class PatternSelectorTest { List<String> messages = app.getMessages(); assertNotNull("No Messages", messages); assertTrue("Incorrect number of messages. Expected 4, Actual " + messages.size(), messages.size() == 4); - assertEquals("[TRACE] TestJavaScriptPatternSelector ====== o.a.l.l.c.PatternSelectorTest.testJavaScriptPatternSelector:78 entry ======\n", messages.get(0)); - assertEquals("[INFO ] TestJavaScriptPatternSelector o.a.l.l.c.PatternSelectorTest.testJavaScriptPatternSelector.79 Hello World\n", messages.get(1)); + String expect = "[TRACE] TestJavaScriptPatternSelector ====== " + + "o.a.l.l.c.PatternSelectorTest.testJavaScriptPatternSelector:84 entry ======\n"; + assertEquals(expect, messages.get(0)); + expect = "[INFO ] TestJavaScriptPatternSelector " + + "o.a.l.l.c.PatternSelectorTest.testJavaScriptPatternSelector.85 Hello World\n"; + assertEquals(expect, messages.get(1)); assertEquals("[INFO ] JavascriptNoLocation No location information\n", messages.get(2)); app.clear(); } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5baac731/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 296492b..0b372bb 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 @@ -16,28 +16,28 @@ */ package org.apache.logging.log4j.core.layout; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.MarkerManager; import org.apache.logging.log4j.ThreadContext; -import org.apache.logging.log4j.core.*; +import org.apache.logging.log4j.core.BasicConfigurationFactory; +import org.apache.logging.log4j.core.Layout; +import org.apache.logging.log4j.core.LogEvent; +import org.apache.logging.log4j.core.Logger; +import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.core.config.ConfigurationFactory; -import org.apache.logging.log4j.core.config.Property; import org.apache.logging.log4j.core.impl.Log4jLogEvent; import org.apache.logging.log4j.core.lookup.MainMapLookup; -import org.apache.logging.log4j.core.util.KeyValuePair; import org.apache.logging.log4j.message.SimpleMessage; import org.apache.logging.log4j.util.Strings; import org.junit.After; import org.junit.BeforeClass; import org.junit.Test; +import static org.junit.Assert.*; + /** * */ @@ -211,6 +211,7 @@ public class PatternLayoutTest { // System.out.println("event2=" + event2.getTimeMillis() / 1000); } + @SuppressWarnings("unused") private void testUnixTime(final String pattern) throws Exception { final PatternLayout layout = PatternLayout.newBuilder().withPattern(pattern + " %m") .withConfiguration(ctx.getConfiguration()).build(); @@ -278,17 +279,19 @@ public class PatternLayoutTest { .setIncludeLocation(true) .setMessage(new SimpleMessage("entry")).build(); final String result1 = new FauxLogger().formatEvent(event1, layout); - assertTrue("Unexpected result: " + result1, result1.endsWith("====== PatternLayoutTest.testPatternSelector:280 entry ======\n")); + final String expectSuffix1 = String.format("====== PatternLayoutTest.testPatternSelector:281 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)); - assertTrue("Unexpected result: " + result2, result2.endsWith("Hello, world 1!\n")); + 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) { + public String formatEvent(LogEvent event, Layout<?> layout) { return new String(layout.toByteArray(event)); } }
