From c46b89dac548b53594dee1817bb33532ae0bc9f7 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 --- .../java/org/apache/logging/log4j/core/LoggerTest.java | 2 +- .../apache/logging/log4j/core/PatternSelectorTest.java | 10 +++++----- .../core/appender/MemoryMappedFileAppenderTest.java | 4 ++-- .../logging/log4j/core/pattern/PatternParserTest.java | 2 +- 4 files changed, 9 insertions(+), 9 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 2b5740517ce..258c41de705 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 @@ -133,7 +133,7 @@ public void builder() { final List events = app.getEvents(); assertEventCount(events, 3); assertEquals( - "org.apache.logging.log4j.core.LoggerTest.builder(LoggerTest.java:123)", + "org.apache.logging.log4j.core.LoggerTest.builder(LoggerTest.java:129)", 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/PatternSelectorTest.java b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/PatternSelectorTest.java index 5d25d6dcb7e..42913d50c34 100644 --- a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/PatternSelectorTest.java +++ b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/PatternSelectorTest.java @@ -50,7 +50,7 @@ public void testMarkerPatternSelector(@Named("List") final ListAppender app) { final String expect = String.format( "[TRACE] TestMarkerPatternSelector ====== " + "o.a.l.l.c.PatternSelectorTest.testMarkerPatternSelector:%d Enter ======%n", - CURRENT_LINE + 4); + CURRENT_LINE + 5); assertEquals(expect, messages.get(0)); assertEquals("[INFO ] TestMarkerPatternSelector Hello World" + Strings.LINE_SEPARATOR, messages.get(1)); app.clear(); @@ -73,12 +73,12 @@ public void testScriptPatternSelector(@Named("List2") final ListAppender app) { String expect = String.format( "[TRACE] TestScriptPatternSelector ====== " + "o.a.l.l.c.PatternSelectorTest.testScriptPatternSelector:%d Enter ======%n", - CURRENT_LINE + 26); + CURRENT_LINE + 27); assertEquals(expect, messages.get(0)); expect = String.format( "[INFO ] TestScriptPatternSelector o.a.l.l.c.PatternSelectorTest.testScriptPatternSelector.%d " + "Hello World%n", - CURRENT_LINE + 27); + CURRENT_LINE + 28); assertEquals(expect, messages.get(1)); assertEquals("[INFO ] NoLocation No location information" + Strings.LINE_SEPARATOR, messages.get(2)); app.clear(); @@ -101,12 +101,12 @@ public void testJavaScriptPatternSelector(@Named("List3") final ListAppender app String expect = String.format( "[TRACE] TestJavaScriptPatternSelector ====== " + "o.a.l.l.c.PatternSelectorTest.testJavaScriptPatternSelector:%d Enter ======%n", - CURRENT_LINE + 54); + CURRENT_LINE + 55); assertEquals(expect, messages.get(0)); expect = String.format( "[INFO ] TestJavaScriptPatternSelector " + "o.a.l.l.c.PatternSelectorTest.testJavaScriptPatternSelector.%d Hello World%n", - CURRENT_LINE + 55); + CURRENT_LINE + 56); assertEquals(expect, messages.get(1)); assertEquals("[INFO ] JavascriptNoLocation No location information" + Strings.LINE_SEPARATOR, messages.get(2)); app.clear(); 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 c819ebafdb7..8937864d0c7 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 @@ -118,7 +118,7 @@ void testMemMapLocation(final LoggerContext context) throws Exception { both(hasSize(2)) .and( 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"))); + "org.apache.logging.log4j.core.appender.MemoryMappedFileAppenderTest.testMemMapLocation(MemoryMappedFileAppenderTest.java:105): Test log1", + "org.apache.logging.log4j.core.appender.MemoryMappedFileAppenderTest.testMemMapLocation(MemoryMappedFileAppenderTest.java:108): 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 b82559a07de..d5c81c3d787 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); }