Fix broken tests due to Palantir formatting

vy · vy · commit c705a446c7c6 · 2023-11-16T14:56:37.000+01:00
Tests ideally shouldn't rely on hardcoded line numbers.
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
@@ -131,7 +131,7 @@ public void testCalcLocation() {
         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
@@ -76,7 +76,7 @@ public void builder() {
         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 void builder() {
         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
@@ -127,7 +127,7 @@ public void builder() {
         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
@@ -49,7 +49,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 + 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 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 + 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 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 + 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
@@ -116,7 +116,7 @@ void testMemMapLocation(final LoggerContext context) throws Exception {
                 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
@@ -57,7 +57,7 @@ public void testMarkerPatternSelector() throws Exception {
                 .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 void testLevelPatternSelector() throws Exception {
                 .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
@@ -113,7 +113,7 @@ public void testCustomPattern() {
             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);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ public void testCalcLocation() {`
`131`	`131`	`final StackTraceElement element = new Foo().foo();`
`132`	`132`	`assertEquals("org.apache.logging.log4j.util.java9.StackLocatorTest$Foo", element.getClassName());`
`133`	`133`	`// The line number below may need adjustment if this file is changed.`
`134`		`- assertEquals(100, element.getLineNumber());`
	`134`	`+ assertEquals(99, element.getLineNumber());`
`135`	`135`	`}`
`136`	`136`
`137`	`137`	`@Test`
Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ void testMemMapLocation(final LoggerContext context) throws Exception {`
`116`	`116`	`both(hasSize(2))`
`117`	`117`	`.and(`
`118`	`118`	`contains(`
`119`		`- "org.apache.logging.log4j.core.appender.MemoryMappedFileAppenderTest.testMemMapLocation(MemoryMappedFileAppenderTest.java:104): Test log1",`
`120`		`- "org.apache.logging.log4j.core.appender.MemoryMappedFileAppenderTest.testMemMapLocation(MemoryMappedFileAppenderTest.java:107): Test log2")));`
	`119`	`+ "org.apache.logging.log4j.core.appender.MemoryMappedFileAppenderTest.testMemMapLocation(MemoryMappedFileAppenderTest.java:103): Test log1",`
	`120`	`+ "org.apache.logging.log4j.core.appender.MemoryMappedFileAppenderTest.testMemMapLocation(MemoryMappedFileAppenderTest.java:106): Test log2")));`
`121`	`121`	`}`
`122`	`122`	`}`
Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ public void testCustomPattern() {`
`113`	`113`	`formatter.format(event, buf);`
`114`	`114`	`}`
`115`	`115`	`final String str = buf.toString();`
`116`		`- final String expected = "INFO [PatternParserTest :99 ] - Hello, world" + Strings.LINE_SEPARATOR;`
	`116`	`+ final String expected = "INFO [PatternParserTest :98 ] - Hello, world" + Strings.LINE_SEPARATOR;`
`117`	`117`	`assertTrue(str.endsWith(expected), "Expected to end with: " + expected + ". Actual: " + str);`
`118`	`118`	`}`
`119`	`119`