Fix 1. iteration_id ordering — Comparator couldn't match baseline vs candidate keys

  2. JFR tool not found — missing JAVA_HOME fallback
  3. JaCoCo coverage broken — -DargLine was overwriting JaCoCo's agent flag
  4. runtime=0 dropped — if result.runtime: was falsy for zero-nanosecond result

Author: HeshamHM28

codeflash-java-runtime/src/main/java/com/codeflash/ReplayHelper.java

@@ -84,7 +84,9 @@ public void replay(String className, String methodName, String descriptor, int i
     private void replayBehavior(Method method, Object instance, Object[] args,
                                  String className, String methodName,
                                  String testClassName, String testMethodName) throws Exception {
-        String invId = testIteration + "_" + testMethodName;
+        // testIteration goes at the END so the Comparator's lastUnderscore stripping
+        // removes it, making baseline (iteration=0) and candidate (iteration=N) keys match.
+        String invId = testMethodName + "_" + testIteration;
 
         // Print start marker (same format as behavior instrumentation)
         System.out.println("!$######" + testClassName + ":" + testClassName + "." + testMethodName

codeflash/languages/java/jfr_parser.py

@@ -2,6 +2,7 @@
 
 import json
 import logging
+import os
 import shutil
 import subprocess
 from datetime import datetime
@@ -42,6 +43,13 @@ def _find_jfr_tool(self) -> str | None:
                 candidate = Path(home) / "bin" / "jfr"
                 if candidate.exists():
                     return str(candidate)
+
+        java_home_env = os.environ.get("JAVA_HOME")
+        if java_home_env:
+            candidate = Path(java_home_env) / "bin" / "jfr"
+            if candidate.exists():
+                return str(candidate)
+
         return None
 
     def _parse(self) -> None:

codeflash/languages/java/maven_strategy.py

@@ -647,7 +647,15 @@ def run_tests_via_build_tool(
             " --add-opens java.base/java.net=ALL-UNNAMED"
             " --add-opens java.base/java.util.zip=ALL-UNNAMED"
         )
-        if javaagent_arg:
+        if enable_coverage:
+            # When coverage is enabled, JaCoCo's prepare-agent goal sets argLine via
+            # @{argLine}. Overriding -DargLine would clobber the JaCoCo agent flag.
+            # Pass add-opens and javaagent via JDK_JAVA_OPTIONS instead.
+            jdk_opts_parts = [add_opens_flags]
+            if javaagent_arg:
+                jdk_opts_parts.insert(0, javaagent_arg)
+            env["JDK_JAVA_OPTIONS"] = " ".join(jdk_opts_parts)
+        elif javaagent_arg:
             cmd.append(f"-DargLine={javaagent_arg} {add_opens_flags}")
         else:
             cmd.append(f"-DargLine={add_opens_flags}")

codeflash/models/models.py

@@ -949,7 +949,7 @@ def usable_runtime_data_by_test_case(self) -> dict[InvocationId, list[int]]:
         by_id: dict[InvocationId, list[int]] = {}
         for result in self.test_results:
             if result.did_pass:
-                if result.runtime:
+                if result.runtime is not None:
                     by_id.setdefault(result.id, []).append(result.runtime)
                 else:
                     msg = (