From c5530cf9c4c08c86201b6d08bd3a0628f4ae95c8 Mon Sep 17 00:00:00 2001
From: Anshuman Mishra <a.mishra@uber.com>
Date: Sat, 1 Mar 2025 11:32:44 +0530
Subject: [PATCH 1/2] fix: Use legacy reporting name

---
 .../junit5/TestCaseXmlRenderer.java                 | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/java/src/com/github/bazel_contrib/contrib_rules_jvm/junit5/TestCaseXmlRenderer.java b/java/src/com/github/bazel_contrib/contrib_rules_jvm/junit5/TestCaseXmlRenderer.java
index 01a6dc91..28359880 100644
--- a/java/src/com/github/bazel_contrib/contrib_rules_jvm/junit5/TestCaseXmlRenderer.java
+++ b/java/src/com/github/bazel_contrib/contrib_rules_jvm/junit5/TestCaseXmlRenderer.java
@@ -33,18 +33,7 @@ public void toXml(XMLStreamWriter xml, TestData test) throws XMLStreamException
     decimalFormat.setRoundingMode(RoundingMode.HALF_UP);
 
     TestIdentifier id = test.getId();
-
-    String name;
-    if (test.isDynamic()) {
-      name = id.getDisplayName(); // [ordinal] name=value...
-    } else {
-      // Massage the name
-      name = id.getLegacyReportingName();
-      int index = name.indexOf('(');
-      if (index != -1) {
-        name = name.substring(0, index);
-      }
-    }
+    String name = id.getLegacyReportingName();
 
     xml.writeStartElement("testcase");
     xml.writeAttribute("name", escapeIllegalCharacters(name));

From 63a7fc7d8a0196bd6d7147d2b2fcd6c710d6f3e4 Mon Sep 17 00:00:00 2001
From: Anshuman Mishra <a.mishra@uber.com>
Date: Sat, 1 Mar 2025 12:04:41 +0530
Subject: [PATCH 2/2] update test

---
 .../contrib_rules_jvm/junit5/BazelJUnitOutputListenerTest.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/test/com/github/bazel_contrib/contrib_rules_jvm/junit5/BazelJUnitOutputListenerTest.java b/java/test/com/github/bazel_contrib/contrib_rules_jvm/junit5/BazelJUnitOutputListenerTest.java
index 24001d8b..915d58cb 100644
--- a/java/test/com/github/bazel_contrib/contrib_rules_jvm/junit5/BazelJUnitOutputListenerTest.java
+++ b/java/test/com/github/bazel_contrib/contrib_rules_jvm/junit5/BazelJUnitOutputListenerTest.java
@@ -348,7 +348,7 @@ public void ensureTestCaseNamesAreProperlyEscaped() {
     Node item = xml.getElementsByTagName("testcase").item(0);
     String testName = item.getAttributes().getNamedItem("name").getNodeValue();
 
-    assertEquals("[engine:mocked]/[class:ExampleTest]/[method:Weird&#8;name", testName);
+    assertEquals("[engine:mocked]/[class:ExampleTest]/[method:Weird&#8;name()]", testName);
   }
 
   @Test