This is an automated email from the ASF dual-hosted git repository. pkarwasz pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit a4b46ba957401adb79fd88224b6896145321e288 Author: Piotr P. Karwasz <[email protected]> AuthorDate: Mon Nov 20 18:40:13 2023 +0100 Fix failing location-based tests --- .../java/org/apache/logging/log4j/LoggerTest.java | 4 ++-- .../logging/log4j/util/StackLocatorUtilTest.java | 2 +- .../org/apache/logging/log4j/core/LoggerTest.java | 2 +- .../core/appender/MemoryMappedFileAppenderTest.java | 21 +++++++++------------ .../log4j/core/layout/PatternSelectorTest.java | 4 ++-- .../log4j/script/layout/PatternSelectorTest.java | 10 +++++----- 6 files changed, 20 insertions(+), 23 deletions(-) diff --git a/log4j-api-test/src/test/java/org/apache/logging/log4j/LoggerTest.java b/log4j-api-test/src/test/java/org/apache/logging/log4j/LoggerTest.java index 183cc93a50..387e86c887 100644 --- a/log4j-api-test/src/test/java/org/apache/logging/log4j/LoggerTest.java +++ b/log4j-api-test/src/test/java/org/apache/logging/log4j/LoggerTest.java @@ -75,7 +75,7 @@ public class LoggerTest { assertThat( "Incorrect message 1", results.get(0), - equalTo(" DEBUG org.apache.logging.log4j.LoggerTest.builder(LoggerTest.java:72) Hello")); + equalTo(" DEBUG org.apache.logging.log4j.LoggerTest.builder(LoggerTest.java:71) Hello")); assertThat("Incorrect message 2", results.get(1), equalTo("test ERROR Hello John")); assertThat( "Incorrect message 3", @@ -84,7 +84,7 @@ public class LoggerTest { assertThat( "Throwable incorrect in message 3", results.get(2), - containsString("org.apache.logging.log4j.LoggerTest.builder(LoggerTest.java:74)")); + containsString("org.apache.logging.log4j.LoggerTest.builder(LoggerTest.java:73)")); } @Test diff --git a/log4j-api-test/src/test/java/org/apache/logging/log4j/util/StackLocatorUtilTest.java b/log4j-api-test/src/test/java/org/apache/logging/log4j/util/StackLocatorUtilTest.java index f02aa39cb9..be55269d2e 100644 --- a/log4j-api-test/src/test/java/org/apache/logging/log4j/util/StackLocatorUtilTest.java +++ b/log4j-api-test/src/test/java/org/apache/logging/log4j/util/StackLocatorUtilTest.java @@ -149,7 +149,7 @@ public class StackLocatorUtilTest { final StackTraceElement element = new Foo().foo(); assertEquals("org.apache.logging.log4j.util.StackLocatorUtilTest$Foo", element.getClassName()); // The line number below may need adjustment if this file is changed. - assertEquals(116, element.getLineNumber()); + assertEquals(117, element.getLineNumber()); } @Test 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 b976de768f..f7ed642eaa 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 @@ -119,7 +119,7 @@ public class LoggerTest { final List<LogEvent> events = app.getEvents(); assertEventCount(events, 3); assertEquals( - "org.apache.logging.log4j.core.LoggerTest.builder(LoggerTest.java:110)", + "org.apache.logging.log4j.core.LoggerTest.builder(LoggerTest.java:115)", 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 20ccfac7bd..e5a141014c 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 @@ -16,8 +16,7 @@ */ package org.apache.logging.log4j.core.appender; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.*; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -65,7 +64,7 @@ public class MemoryMappedFileAppenderTest { assertEquals(18 + 2 * LINESEP, Files.size(logFile)); final List<String> lines = Files.readAllLines(logFile); - assertThat(lines, both(hasSize(2)).and(contains("Test log1", "Test log2"))); + assertThat(lines).hasSize(2).contains("Test log1", "Test log2"); } @Test @@ -90,7 +89,7 @@ public class MemoryMappedFileAppenderTest { assertEquals(521 + 3 * System.lineSeparator().length(), Files.size(logFile), "Expected file size to shrink"); final List<String> lines = Files.readAllLines(logFile); - assertThat(lines, both(hasSize(3)).and(contains("Test log1", str, str))); + assertThat(lines).hasSize(3).contains("Test log1", str, str); } @Test @@ -117,13 +116,11 @@ public class MemoryMappedFileAppenderTest { final List<String> lines = Files.readAllLines(logFile); assertEquals(2, lines.size()); - assertTrue( - lines.get(0) - .endsWith( - "org.apache.logging.log4j.core.appender.MemoryMappedFileAppenderTest.testMemMapLocation(MemoryMappedFileAppenderTest.java:105): Test log1")); - assertTrue( - lines.get(1) - .endsWith( - "org.apache.logging.log4j.core.appender.MemoryMappedFileAppenderTest.testMemMapLocation(MemoryMappedFileAppenderTest.java:108): Test log2")); + 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"); } } diff --git a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/layout/PatternSelectorTest.java b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/layout/PatternSelectorTest.java index 01243c7b30..ada7f66148 100644 --- a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/layout/PatternSelectorTest.java +++ b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/layout/PatternSelectorTest.java @@ -64,7 +64,7 @@ public class PatternSelectorTest { .build(); final String result1 = new FauxLogger().formatEvent(event1, layout); final String expectSuffix1 = - String.format("====== PatternSelectorTest.testMarkerPatternSelector:61 entry ======%n"); + String.format("====== PatternSelectorTest.testMarkerPatternSelector:65 entry ======%n"); assertThat(result1).endsWith(expectSuffix1); final LogEvent event2 = Log4jLogEvent.newBuilder() // .setLoggerName(this.getClass().getName()) @@ -100,7 +100,7 @@ public class PatternSelectorTest { .build(); final String result1 = new FauxLogger().formatEvent(event1, layout); final String expectSuffix1 = - String.format("====== PatternSelectorTest.testLevelPatternSelector:90 entry ======%n"); + String.format("====== PatternSelectorTest.testLevelPatternSelector:101 entry ======%n"); assertThat(result1).endsWith(expectSuffix1); final LogEvent event2 = Log4jLogEvent.newBuilder() // .setLoggerName(this.getClass().getName()) 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 16f651a10c..ca7f8d9c31 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 @@ -47,7 +47,7 @@ public class PatternSelectorTest { 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:41 Enter ======%n"); + + "o.a.l.l.s.l.PatternSelectorTest.testMarkerPatternSelector:40 Enter ======%n"); assertEquals(expect, messages.get(0)); assertEquals("[INFO ] TestMarkerPatternSelector Hello World" + Strings.LINE_SEPARATOR, messages.get(1)); app.clear(); @@ -68,9 +68,9 @@ public class PatternSelectorTest { messages.size(), "Incorrect number of messages. Expected 4, Actual " + messages.size() + ": " + messages); String expect = "[TRACE] TestScriptPatternSelector ====== " - + "o.a.l.l.s.l.PatternSelectorTest.testScriptPatternSelector:59 Enter ======" + Strings.LINE_SEPARATOR; + + "o.a.l.l.s.l.PatternSelectorTest.testScriptPatternSelector:60 Enter ======" + Strings.LINE_SEPARATOR; assertEquals(expect, messages.get(0)); - expect = "[INFO ] TestScriptPatternSelector o.a.l.l.s.l.PatternSelectorTest.testScriptPatternSelector.60 " + expect = "[INFO ] TestScriptPatternSelector o.a.l.l.s.l.PatternSelectorTest.testScriptPatternSelector.61 " + "Hello World" + Strings.LINE_SEPARATOR; assertEquals(expect, messages.get(1)); assertEquals("[INFO ] NoLocation No location information" + Strings.LINE_SEPARATOR, messages.get(2)); @@ -92,11 +92,11 @@ public class PatternSelectorTest { messages.size(), "Incorrect number of messages. Expected 4, Actual " + messages.size() + ": " + messages); String expect = "[TRACE] TestJavaScriptPatternSelector ====== " - + "o.a.l.l.s.l.PatternSelectorTest.testJavaScriptPatternSelector:81 Enter ======" + + "o.a.l.l.s.l.PatternSelectorTest.testJavaScriptPatternSelector:84 Enter ======" + Strings.LINE_SEPARATOR; assertEquals(expect, messages.get(0)); expect = "[INFO ] TestJavaScriptPatternSelector " - + "o.a.l.l.s.l.PatternSelectorTest.testJavaScriptPatternSelector.82 Hello World" + + "o.a.l.l.s.l.PatternSelectorTest.testJavaScriptPatternSelector.85 Hello World" + Strings.LINE_SEPARATOR; assertEquals(expect, messages.get(1)); assertEquals("[INFO ] JavascriptNoLocation No location information" + Strings.LINE_SEPARATOR, messages.get(2));
