More Java 25 support fixes

Author: dividedmind

agent/src/main/java/com/appland/appmap/reflect/HttpHeaders.java

@@ -32,13 +32,14 @@ default Enumeration<String> getHeaderNames() {
 
   /**
    * Non-standard utility method. Retrieves all headers.
+   * Header names are normalized to lowercase since HTTP headers are case-insensitive.
    */
   default Map<String, String> getHeaders() {
     HashMap<String, String> headers = new HashMap<>();
 
     for (Enumeration<String> e = getHeaderNames(); e.hasMoreElements();) {
       String headerName = (String) e.nextElement();
-      headers.put(headerName, this.getHeader(headerName));
+      headers.put(headerName.toLowerCase(), this.getHeader(headerName));
     }
 
     return headers;

agent/test/intellij/intellij.bats

@@ -43,9 +43,11 @@ run_petclinic_test() {
   run cat ./tmp/appmap/junit/org_springframework_samples_petclinic_${TEST_NAME}_testOwnerDetails.appmap.json
   assert_success
 
-  # Thread 1 is the test runner's main thread. Check to make sure that parent_id
-  # of the "return" event matches the id of the "call" event.
-  assert_json_eq '.events | map(select(.thread_id == 1)) | ((.[0].event == "call" and .[1].event == "return") and (.[1].parent_id == .[0].id))' "true"
+  # Find the test runner's main thread (the one with testOwnerDetails method).
+  # Check to make sure that parent_id of the "return" event matches the id of the "call" event.
+  # Note: In Java 21 the main thread is typically thread 1, but in Java 25 it can be thread 3.
+  local main_thread_id=$(jq -r '[.events[] | select(.method_id == "testOwnerDetails")][0].thread_id' ./tmp/appmap/junit/org_springframework_samples_petclinic_${TEST_NAME}_testOwnerDetails.appmap.json)
+  assert_json_eq ".events | map(select(.thread_id == ${main_thread_id})) | ((.[0].event == \"call\" and .[1].event == \"return\") and (.[1].parent_id == .[0].id))" "true"
 }
 
 @test "extra properties in appmap.yml are ignored when config is loaded" {

agent/test/petclinic/petclinic-tests.bats

@@ -211,7 +211,8 @@ setup() {
   assert_success
   stop_recording
 
-  assert_json_eq '.events[] | .http_server_response | .headers["Content-Type"]' "text/html;charset=UTF-8"
+  # HTTP headers are case-insensitive and are normalized to lowercase
+  assert_json_eq '.events[] | .http_server_response | .headers["content-type"]' "text/html;charset=UTF-8"
 }
 
 @test "recordings capture elapsed time" {

agent/test/petclinic/petclinic.bats

@@ -36,6 +36,9 @@ def addAgentArgs = [
   ]
 
 task test_junit(type: Test) {
+  testClassesDirs = sourceSets.test.output.classesDirs
+  classpath = sourceSets.test.runtimeClasspath
+
   testLogging {
     events TestLogEvent.STANDARD_OUT
   }
@@ -44,6 +47,9 @@ task test_junit(type: Test) {
 }
 
 task test_testng(type: Test) {
+  testClassesDirs = sourceSets.test.output.classesDirs
+  classpath = sourceSets.test.runtimeClasspath
+
   useTestNG()
   testLogging {
     showStandardStreams = true
@@ -57,21 +63,14 @@ task test_testng(type: Test) {
 def jdk8Dependency = 'org.testng:testng:7.5.1'
 def jdk11Dependency = 'org.testng:testng:7.9.0'
 
-tasks.register('setTestDependencies') {
-  doLast {
-    def jdkVersion = javaToolchains.launcherFor(java.toolchain).get().metadata.languageVersion.asInt()
-    if (jdkVersion <= 8) {
-      dependencies {
-          testImplementation jdk8Dependency
-      }
-    } else {
-      dependencies {
-        testImplementation jdk11Dependency
-      }
-    }
+// Add TestNG dependency during configuration phase (not execution phase)
+def jdkVersion = System.getProperty('java.version').split('\\.')[0] as Integer
+if (jdkVersion <= 8) {
+  dependencies {
+    testImplementation jdk8Dependency
+  }
+} else {
+  dependencies {
+    testImplementation jdk11Dependency
   }
-}
-
-tasks.named("compileTestJava") {
-  dependsOn 'setTestDependencies'
 }