This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch 2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
The following commit(s) were added to refs/heads/2.x by this push:
new c705a446c7 Fix broken tests due to Palantir formatting
c705a446c7 is described below
commit c705a446c7c6219d32b4fc4217323efcf4c98182
Author: Volkan Yazıcı <[email protected]>
AuthorDate: Thu Nov 16 14:56:37 2023 +0100
Fix broken tests due to Palantir formatting
Tests ideally shouldn't rely on hardcoded line numbers.
---
.../org/apache/logging/log4j/util/java9/StackLocatorTest.java | 2 +-
.../src/test/java/org/apache/logging/log4j/LoggerTest.java | 4 ++--
.../test/java/org/apache/logging/log4j/core/LoggerTest.java | 2 +-
.../org/apache/logging/log4j/core/PatternSelectorTest.java | 10 +++++-----
.../log4j/core/appender/MemoryMappedFileAppenderTest.java | 4 ++--
.../apache/logging/log4j/core/layout/PatternSelectorTest.java | 4 ++--
.../apache/logging/log4j/core/pattern/PatternParserTest.java | 2 +-
7 files changed, 14 insertions(+), 14 deletions(-)
diff --git
a/log4j-api-java9/src/test/java/org/apache/logging/log4j/util/java9/StackLocatorTest.java
b/log4j-api-java9/src/test/java/org/apache/logging/log4j/util/java9/StackLocatorTest.java
index e570071151..1e8591c207 100644
---
a/log4j-api-java9/src/test/java/org/apache/logging/log4j/util/java9/StackLocatorTest.java
+++
b/log4j-api-java9/src/test/java/org/apache/logging/log4j/util/java9/StackLocatorTest.java
@@ -131,7 +131,7 @@ public class StackLocatorTest {
final StackTraceElement element = new Foo().foo();
assertEquals("org.apache.logging.log4j.util.java9.StackLocatorTest$Foo",
element.getClassName());
// The line number below may need adjustment if this file is changed.
- assertEquals(100, element.getLineNumber());
+ assertEquals(99, element.getLineNumber());
}
@Test
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 9ea0639fb5..db46820465 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
@@ -76,7 +76,7 @@ public class LoggerTest {
assertThat(
"Incorrect message 1",
results.get(0),
- equalTo(" DEBUG
org.apache.logging.log4j.LoggerTest.builder(LoggerTest.java:73) Hello"));
+ equalTo(" DEBUG
org.apache.logging.log4j.LoggerTest.builder(LoggerTest.java:72) Hello"));
assertThat("Incorrect message 2", results.get(1), equalTo("test ERROR
Hello John"));
assertThat(
"Incorrect message 3",
@@ -85,7 +85,7 @@ public class LoggerTest {
assertThat(
"Throwable incorrect in message 3",
results.get(2),
-
containsString("org.apache.logging.log4j.LoggerTest.builder(LoggerTest.java:75)"));
+
containsString("org.apache.logging.log4j.LoggerTest.builder(LoggerTest.java:74)"));
}
@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 ac24f415b7..dacfbcb1f0 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
@@ -127,7 +127,7 @@ public class LoggerTest {
final List<LogEvent> events = app.getEvents();
assertEventCount(events, 3);
assertEquals(
-
"org.apache.logging.log4j.core.LoggerTest.builder(LoggerTest.java:116)",
+
"org.apache.logging.log4j.core.LoggerTest.builder(LoggerTest.java:123)",
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 ecba000103..848ff1923c 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
@@ -49,7 +49,7 @@ public class PatternSelectorTest {
final String expect = String.format(
"[TRACE] TestMarkerPatternSelector ====== "
+
"o.a.l.l.c.PatternSelectorTest.testMarkerPatternSelector:%d Enter ======%n",
- CURRENT_LINE + 5);
+ CURRENT_LINE + 4);
assertEquals(expect, messages.get(0));
assertEquals("[INFO ] TestMarkerPatternSelector Hello World" +
Strings.LINE_SEPARATOR, messages.get(1));
app.clear();
@@ -72,12 +72,12 @@ public class PatternSelectorTest {
String expect = String.format(
"[TRACE] TestScriptPatternSelector ====== "
+
"o.a.l.l.c.PatternSelectorTest.testScriptPatternSelector:%d Enter ======%n",
- CURRENT_LINE + 23);
+ CURRENT_LINE + 26);
assertEquals(expect, messages.get(0));
expect = String.format(
"[INFO ] TestScriptPatternSelector
o.a.l.l.c.PatternSelectorTest.testScriptPatternSelector.%d "
+ "Hello World%n",
- CURRENT_LINE + 24);
+ CURRENT_LINE + 27);
assertEquals(expect, messages.get(1));
assertEquals("[INFO ] NoLocation No location information" +
Strings.LINE_SEPARATOR, messages.get(2));
app.clear();
@@ -100,12 +100,12 @@ public class PatternSelectorTest {
String expect = String.format(
"[TRACE] TestJavaScriptPatternSelector ====== "
+
"o.a.l.l.c.PatternSelectorTest.testJavaScriptPatternSelector:%d Enter ======%n",
- CURRENT_LINE + 45);
+ CURRENT_LINE + 54);
assertEquals(expect, messages.get(0));
expect = String.format(
"[INFO ] TestJavaScriptPatternSelector "
+
"o.a.l.l.c.PatternSelectorTest.testJavaScriptPatternSelector.%d Hello World%n",
- CURRENT_LINE + 46);
+ CURRENT_LINE + 55);
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 a2702bfd7c..04d17100f0 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
@@ -116,7 +116,7 @@ public class MemoryMappedFileAppenderTest {
both(hasSize(2))
.and(
contains(
-
"org.apache.logging.log4j.core.appender.MemoryMappedFileAppenderTest.testMemMapLocation(MemoryMappedFileAppenderTest.java:104):
Test log1",
-
"org.apache.logging.log4j.core.appender.MemoryMappedFileAppenderTest.testMemMapLocation(MemoryMappedFileAppenderTest.java:107):
Test log2")));
+
"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/layout/PatternSelectorTest.java
b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/layout/PatternSelectorTest.java
index 67bfff1dd7..0a86884cf8 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
@@ -57,7 +57,7 @@ public class PatternSelectorTest {
.build();
final String result1 = new FauxLogger().formatEvent(event1, layout);
final String expectSuffix1 =
- String.format("======
PatternSelectorTest.testMarkerPatternSelector:53 entry ======%n");
+ String.format("======
PatternSelectorTest.testMarkerPatternSelector:58 entry ======%n");
assertTrue(result1.endsWith(expectSuffix1), "Unexpected result: " +
result1);
final LogEvent event2 = Log4jLogEvent.newBuilder() //
.setLoggerName(this.getClass().getName())
@@ -89,7 +89,7 @@ public class PatternSelectorTest {
.build();
final String result1 = new FauxLogger().formatEvent(event1, layout);
final String expectSuffix1 =
- String.format("======
PatternSelectorTest.testLevelPatternSelector:78 entry ======%n");
+ String.format("======
PatternSelectorTest.testLevelPatternSelector:90 entry ======%n");
assertTrue(result1.endsWith(expectSuffix1), "Unexpected result: " +
result1);
final LogEvent event2 = Log4jLogEvent.newBuilder() //
.setLoggerName(this.getClass().getName())
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 1598adb6d3..43e3f30b84 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
@@ -113,7 +113,7 @@ public class PatternParserTest {
formatter.format(event, buf);
}
final String str = buf.toString();
- final String expected = "INFO [PatternParserTest :99 ] -
Hello, world" + Strings.LINE_SEPARATOR;
+ final String expected = "INFO [PatternParserTest :98 ] -
Hello, world" + Strings.LINE_SEPARATOR;
assertTrue(str.endsWith(expected), "Expected to end with: " + expected
+ ". Actual: " + str);
}
