From 2d9774c759e3188291c08c31150764d320f27969 Mon Sep 17 00:00:00 2001 From: "Piotr P. Karwasz" Date: Mon, 15 Jan 2024 14:13:24 +0100 Subject: [PATCH] Fix location-based tests --- .../apache/logging/log4j/core/LoggerTest.java | 2 +- .../MemoryMappedFileAppenderTest.java | 12 +++---- .../log4j/core/pattern/PatternParserTest.java | 2 +- .../script/layout/PatternSelectorTest.java | 34 ++++++++++++------- 4 files changed, 29 insertions(+), 21 deletions(-) diff --git a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/LoggerTest.java b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/LoggerTest.java index 201e55742cf..84aab071807 100644 --- a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/LoggerTest.java +++ b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/LoggerTest.java @@ -125,7 +125,7 @@ public void builder() { final List events = app.getEvents(); assertEventCount(events, 3); assertEquals( - "org.apache.logging.log4j.core.LoggerTest.builder(LoggerTest.java:115)", + "org.apache.logging.log4j.core.LoggerTest.builder(LoggerTest.java:121)", events.get(0).getSource().toString(), "Incorrect location"); assertEquals(Level.DEBUG, events.get(0).getLevel(), "Incorrect Level"); diff --git a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/MemoryMappedFileAppenderTest.java b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/MemoryMappedFileAppenderTest.java index e5a141014c7..1a393cd8904 100644 --- a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/MemoryMappedFileAppenderTest.java +++ b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/MemoryMappedFileAppenderTest.java @@ -115,12 +115,10 @@ void testMemMapLocation(final LoggerContext context) throws Exception { "Expected file size to shrink"); final List lines = Files.readAllLines(logFile); - assertEquals(2, lines.size()); - assertThat(lines.get(0)) - .endsWith("org.apache.logging.log4j.core.appender.MemoryMappedFileAppenderTest.testMemMapLocation" - + "(MemoryMappedFileAppenderTest.java:103): Test log1"); - assertThat(lines.get(1)) - .endsWith("org.apache.logging.log4j.core.appender.MemoryMappedFileAppenderTest.testMemMapLocation" - + "(MemoryMappedFileAppenderTest.java:106): Test log2"); + assertThat(lines) + .hasSize(2) + .contains( + "org.apache.logging.log4j.core.appender.MemoryMappedFileAppenderTest.testMemMapLocation(MemoryMappedFileAppenderTest.java:103): Test log1", + "org.apache.logging.log4j.core.appender.MemoryMappedFileAppenderTest.testMemMapLocation(MemoryMappedFileAppenderTest.java:106): Test log2"); } } diff --git a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/pattern/PatternParserTest.java b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/pattern/PatternParserTest.java index 4e6de0a94eb..6c6b763ca96 100644 --- a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/pattern/PatternParserTest.java +++ b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/pattern/PatternParserTest.java @@ -115,7 +115,7 @@ public void testCustomPattern() { formatter.format(event, buf); } final String str = buf.toString(); - final String expected = "INFO [PatternParserTest :98 ] - Hello, world" + Strings.LINE_SEPARATOR; + final String expected = "INFO [PatternParserTest :100 ] - Hello, world" + Strings.LINE_SEPARATOR; assertTrue(str.endsWith(expected), "Expected to end with: " + expected + ". Actual: " + str); } diff --git a/log4j-script/src/test/java/org/apache/logging/log4j/script/layout/PatternSelectorTest.java b/log4j-script/src/test/java/org/apache/logging/log4j/script/layout/PatternSelectorTest.java index ca7f8d9c31b..7d9fe5240ad 100644 --- a/log4j-script/src/test/java/org/apache/logging/log4j/script/layout/PatternSelectorTest.java +++ b/log4j-script/src/test/java/org/apache/logging/log4j/script/layout/PatternSelectorTest.java @@ -34,6 +34,8 @@ @LoggerContextSource(value = "log4j-patternSelector.xml", reconfigure = ReconfigurationPolicy.BEFORE_EACH) public class PatternSelectorTest { + private static final int CURRENT_LINE = 37; + @Test public void testMarkerPatternSelector(@Named("List") final ListAppender app) { final org.apache.logging.log4j.Logger logger = LogManager.getLogger("TestMarkerPatternSelector"); @@ -46,8 +48,10 @@ public void testMarkerPatternSelector(@Named("List") final ListAppender app) { 3, messages.size(), "Incorrect number of messages. Expected 3, Actual " + messages.size() + ": " + messages); - final String expect = String.format("[TRACE] TestMarkerPatternSelector ====== " - + "o.a.l.l.s.l.PatternSelectorTest.testMarkerPatternSelector:40 Enter ======%n"); + final String expect = String.format( + "[TRACE] TestMarkerPatternSelector ====== " + + "o.a.l.l.s.l.PatternSelectorTest.testMarkerPatternSelector:%d Enter ======%n", + CURRENT_LINE + 5); assertEquals(expect, messages.get(0)); assertEquals("[INFO ] TestMarkerPatternSelector Hello World" + Strings.LINE_SEPARATOR, messages.get(1)); app.clear(); @@ -67,11 +71,15 @@ public void testScriptPatternSelector(@Named("List2") final ListAppender app) { 4, messages.size(), "Incorrect number of messages. Expected 4, Actual " + messages.size() + ": " + messages); - String expect = "[TRACE] TestScriptPatternSelector ====== " - + "o.a.l.l.s.l.PatternSelectorTest.testScriptPatternSelector:60 Enter ======" + Strings.LINE_SEPARATOR; + String expect = String.format( + "[TRACE] TestScriptPatternSelector ====== " + + "o.a.l.l.s.l.PatternSelectorTest.testScriptPatternSelector:%d Enter ======%n", + CURRENT_LINE + 27); assertEquals(expect, messages.get(0)); - expect = "[INFO ] TestScriptPatternSelector o.a.l.l.s.l.PatternSelectorTest.testScriptPatternSelector.61 " - + "Hello World" + Strings.LINE_SEPARATOR; + expect = String.format( + "[INFO ] TestScriptPatternSelector o.a.l.l.s.l.PatternSelectorTest.testScriptPatternSelector.%d " + + "Hello World%n", + CURRENT_LINE + 28); assertEquals(expect, messages.get(1)); assertEquals("[INFO ] NoLocation No location information" + Strings.LINE_SEPARATOR, messages.get(2)); app.clear(); @@ -91,13 +99,15 @@ public void testJavaScriptPatternSelector(@Named("List3") final ListAppender app 4, messages.size(), "Incorrect number of messages. Expected 4, Actual " + messages.size() + ": " + messages); - String expect = "[TRACE] TestJavaScriptPatternSelector ====== " - + "o.a.l.l.s.l.PatternSelectorTest.testJavaScriptPatternSelector:84 Enter ======" - + Strings.LINE_SEPARATOR; + String expect = String.format( + "[TRACE] TestJavaScriptPatternSelector ====== " + + "o.a.l.l.s.l.PatternSelectorTest.testJavaScriptPatternSelector:%d Enter ======%n", + CURRENT_LINE + 55); assertEquals(expect, messages.get(0)); - expect = "[INFO ] TestJavaScriptPatternSelector " - + "o.a.l.l.s.l.PatternSelectorTest.testJavaScriptPatternSelector.85 Hello World" - + Strings.LINE_SEPARATOR; + expect = String.format( + "[INFO ] TestJavaScriptPatternSelector " + + "o.a.l.l.s.l.PatternSelectorTest.testJavaScriptPatternSelector.%d Hello World%n", + CURRENT_LINE + 56); assertEquals(expect, messages.get(1)); assertEquals("[INFO ] JavascriptNoLocation No location information" + Strings.LINE_SEPARATOR, messages.get(2)); app.clear();