Repository: logging-log4j2 Updated Branches: refs/heads/LOG4J2-1136 cb061f1fe -> dee44fffd
Use system property for line endings, adjust line references by +1 to account for added import statement for Constants.LINE_SEPARATOR. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/dee44fff Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/dee44fff Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/dee44fff Branch: refs/heads/LOG4J2-1136 Commit: dee44fffd19ed9a51462088910472c44cfc0a86a Parents: cb061f1 Author: ggregory <[email protected]> Authored: Mon Sep 28 23:45:34 2015 -0700 Committer: ggregory <[email protected]> Committed: Mon Sep 28 23:45:34 2015 -0700 ---------------------------------------------------------------------- .../logging/log4j/core/PatternSelectorTest.java | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/dee44fff/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 40f6f2c..7ab7583 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 @@ -17,6 +17,7 @@ package org.apache.logging.log4j.core; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.core.util.Constants; import org.apache.logging.log4j.junit.LoggerContextRule; import org.apache.logging.log4j.test.appender.ListAppender; import org.junit.ClassRule; @@ -48,9 +49,9 @@ public class PatternSelectorTest { assertNotNull("No Messages", messages); assertTrue("Incorrect number of messages. Expected 3, Actual " + messages.size(), messages.size() == 3); final String expect = String.format("[TRACE] TestMarkerPatternSelector ====== " - + "o.a.l.l.c.PatternSelectorTest.testMarkerPatternSelector:42 entry ======%n"); + + "o.a.l.l.c.PatternSelectorTest.testMarkerPatternSelector:43 entry ======%n"); assertEquals(expect, messages.get(0)); - assertEquals("[INFO ] TestMarkerPatternSelector Hello World\n", messages.get(1)); + assertEquals("[INFO ] TestMarkerPatternSelector Hello World" + Constants.LINE_SEPARATOR, messages.get(1)); app.clear(); } @@ -68,12 +69,12 @@ public class PatternSelectorTest { assertNotNull("No Messages", messages); assertTrue("Incorrect number of messages. Expected 4, Actual " + messages.size(), messages.size() == 4); String expect = "[TRACE] TestScriptPatternSelector ====== " + - "o.a.l.l.c.PatternSelectorTest.testScriptPatternSelector:61 entry ======\n"; + "o.a.l.l.c.PatternSelectorTest.testScriptPatternSelector:62 entry ======" + Constants.LINE_SEPARATOR; assertEquals(expect, messages.get(0)); - expect = "[INFO ] TestScriptPatternSelector o.a.l.l.c.PatternSelectorTest.testScriptPatternSelector.62 " + - "Hello World\n"; + expect = "[INFO ] TestScriptPatternSelector o.a.l.l.c.PatternSelectorTest.testScriptPatternSelector.63 " + + "Hello World" + Constants.LINE_SEPARATOR; assertEquals(expect, messages.get(1)); - assertEquals("[INFO ] NoLocation No location information\n", messages.get(2)); + assertEquals("[INFO ] NoLocation No location information" + Constants.LINE_SEPARATOR, messages.get(2)); app.clear(); } @@ -91,12 +92,12 @@ public class PatternSelectorTest { assertNotNull("No Messages", messages); assertTrue("Incorrect number of messages. Expected 4, Actual " + messages.size(), messages.size() == 4); String expect = "[TRACE] TestJavaScriptPatternSelector ====== " + - "o.a.l.l.c.PatternSelectorTest.testJavaScriptPatternSelector:84 entry ======\n"; + "o.a.l.l.c.PatternSelectorTest.testJavaScriptPatternSelector:85 entry ======" + Constants.LINE_SEPARATOR; assertEquals(expect, messages.get(0)); expect = "[INFO ] TestJavaScriptPatternSelector " + - "o.a.l.l.c.PatternSelectorTest.testJavaScriptPatternSelector.85 Hello World\n"; + "o.a.l.l.c.PatternSelectorTest.testJavaScriptPatternSelector.86 Hello World" + Constants.LINE_SEPARATOR; assertEquals(expect, messages.get(1)); - assertEquals("[INFO ] JavascriptNoLocation No location information\n", messages.get(2)); + assertEquals("[INFO ] JavascriptNoLocation No location information" + Constants.LINE_SEPARATOR, messages.get(2)); app.clear(); } }
