Fix test failure due to stacktrace format changes

Author: ppkarwasz

log4j-layout-template-json-test/src/test/java/org/apache/logging/log4j/layout/template/json/GcpLayoutTest.java

@@ -27,6 +27,7 @@
 import org.junit.jupiter.api.Test;
 
 import static org.apache.logging.log4j.layout.template.json.TestHelpers.CONFIGURATION;
+import static org.apache.logging.log4j.layout.template.json.TestHelpers.JAVA_BASE_PREFIX;
 import static org.apache.logging.log4j.layout.template.json.TestHelpers.usingSerializedLogEventAccessor;
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -88,7 +89,7 @@ private static void verifySerialization(final LogEvent logEvent) {
                         .contains(logEvent.getMessage().getFormattedMessage())
                         .contains(exception.getLocalizedMessage())
                         .contains("at org.apache.logging.log4j.layout.template.json")
-                        .contains("at java.lang.reflect.Method")
+                        .contains("at " + JAVA_BASE_PREFIX + "java.lang.reflect.Method")
                         .contains("at org.junit.platform.engine");
             }
 
@@ -158,7 +159,7 @@ private static void verifySerialization(final LogEvent logEvent) {
                         new String[]{"_exception", "stackTrace"}))
                         .contains(exception.getLocalizedMessage())
                         .contains("at org.apache.logging.log4j.layout.template.json")
-                        .contains("at java.lang.reflect.Method")
+                        .contains("at " + JAVA_BASE_PREFIX + "java.lang.reflect.Method")
                         .contains("at org.junit.platform.engine");
 
             } else {

log4j-layout-template-json-test/src/test/java/org/apache/logging/log4j/layout/template/json/JsonTemplateLayoutGcFreeTest.java

@@ -35,6 +35,7 @@ void test_no_allocation_during_steady_state_logging() throws Exception {
     public static void main(final String[] args) throws Exception {
         System.setProperty("log4j.layout.jsonTemplate.recyclerFactory", "threadLocal");
         System.setProperty("log4j2.garbagefree.threadContextMap", "true");
+        System.setProperty("log4j2.clock", "SystemMillisClock");
         GcFreeLoggingTestUtil.executeLogging(
                 "gcFreeJsonTemplateLayoutLogging.xml",
                 JsonTemplateLayoutGcFreeTest.class);

log4j-layout-template-json-test/src/test/java/org/apache/logging/log4j/layout/template/json/TestHelpers.java

@@ -35,11 +35,14 @@
 import org.apache.logging.log4j.layout.template.json.util.JsonReader;
 import org.apache.logging.log4j.layout.template.json.util.JsonWriter;
 import org.apache.logging.log4j.layout.template.json.util.MapAccessor;
+import org.apache.logging.log4j.util.Constants;
 
 public final class TestHelpers {
 
     public static final Configuration CONFIGURATION = new DefaultConfiguration();
 
+    public static final String JAVA_BASE_PREFIX = Constants.JAVA_MAJOR_VERSION > 8 ? "java.base/" : "";
+
     private static final JsonWriter JSON_WRITER = JsonWriter
             .newBuilder()
             .setMaxStringLength(10_000)

log4j-layout-template-json-test/src/test/java/org/apache/logging/log4j/layout/template/json/resolver/StackTraceStringResolverTest.java

@@ -33,12 +33,18 @@
 import org.apache.logging.log4j.core.impl.Log4jLogEvent;
 import org.apache.logging.log4j.layout.template.json.JsonTemplateLayout;
 import org.apache.logging.log4j.layout.template.json.JsonTemplateLayoutDefaults;
+import org.apache.logging.log4j.util.Constants;
 import org.assertj.core.api.AbstractStringAssert;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 
-import static org.apache.logging.log4j.layout.template.json.TestHelpers.*;
+import static org.apache.logging.log4j.layout.template.json.TestHelpers.CONFIGURATION;
+import static org.apache.logging.log4j.layout.template.json.TestHelpers.JAVA_BASE_PREFIX;
+import static org.apache.logging.log4j.layout.template.json.TestHelpers.asMap;
+import static org.apache.logging.log4j.layout.template.json.TestHelpers.usingSerializedLogEventAccessor;
+import static org.apache.logging.log4j.layout.template.json.TestHelpers.writeJson;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 
 class StackTraceStringResolverTest {
 
@@ -61,7 +67,7 @@ private static Throwable exception1() {
     private static String exception1Regex(final boolean truncated) {
         final String truncationCorrectionRegex = truncationSuffixRegexOr(truncated, ".divide\\(");
         return "java.lang.ArithmeticException: Division by zero\r?\n" +
-                "\t+at java.math.BigDecimal" + truncationCorrectionRegex + ".*";
+                "\t+at " + JAVA_BASE_PREFIX + "java.math.BigDecimal" + truncationCorrectionRegex + ".*";
     }
 
     @SuppressWarnings("ConstantConditions")
@@ -72,7 +78,7 @@ private static Throwable exception2() {
     private static String exception2Regex(final boolean truncated) {
         final String truncationCorrectionRegex = truncationSuffixRegexOr(truncated, ".add\\(");
         return "java.lang.UnsupportedOperationException\r?\n" +
-                "\t+at java.util.AbstractList" + truncationCorrectionRegex + ".*";
+                "\t+at " + JAVA_BASE_PREFIX + "java.util.AbstractList" + truncationCorrectionRegex + ".*";
     }
 
     private static Throwable exception3() {
@@ -82,7 +88,7 @@ private static Throwable exception3() {
     private static String exception3Regex(final boolean truncated) {
         final String truncationCorrectionRegex = truncationSuffixRegexOr(truncated, ".<init>");
         return "java.lang.IllegalArgumentException: Port value out of range: -1\r?\n" +
-                "\t+at java.net.ServerSocket" + truncationCorrectionRegex + ".*";
+                "\t+at " + JAVA_BASE_PREFIX + "java.net.ServerSocket" + truncationCorrectionRegex + ".*";
     }
 
     private static String truncationSuffixRegexOr(final boolean truncated, final String fallback) {
@@ -576,7 +582,15 @@ void point_matchers_should_work() {
         private String pointMatcherString(final Throwable exception) {
             final StackTraceElement stackTraceElement = exception.getStackTrace()[0];
             final String className = stackTraceElement.getClassName();
-            return "at " + className;
+            final String moduleName;
+            if (Constants.JAVA_MAJOR_VERSION > 8) {
+                moduleName = assertDoesNotThrow(
+                        () -> (String) StackTraceElement.class.getDeclaredMethod("getModuleName")
+                                .invoke(stackTraceElement));
+            } else {
+                moduleName = null;
+            }
+            return moduleName != null ? "at " + moduleName + "/" + className : "at " + className;
         }
 
         private String pointMatcherRegex(final Throwable exception) {