Cleanup usages of JUnit4. (#9500)

AlexeyKuznetsov-DD · nikita-tkachenko-datadog · web-flow · commit e42a5b28ba4b · 2025-09-10T09:00:00.000-04:00
* Cleanup usages of JUnit4.
* Fixed failed test.
* Fix Cucumber instrumentation tests
* Update latest test fixtures as well

---------

Co-authored-by: Nikita Tkachenko &lt;nikita.tkachenko@datadoghq.com&gt;
diff --git a/dd-java-agent/instrumentation/aerospike-4/src/test/groovy/datadog/trace/instrumentation/aerospike4/AerospikeAsyncClientTest.groovy b/dd-java-agent/instrumentation/aerospike-4/src/test/groovy/datadog/trace/instrumentation/aerospike4/AerospikeAsyncClientTest.groovy
@@ -11,7 +11,7 @@ import com.aerospike.client.policy.ClientPolicy
 import datadog.trace.api.Config
 import spock.lang.Shared
 
-import static org.junit.Assert.fail
+import static org.junit.jupiter.api.Assertions.fail
 
 abstract class AerospikeAsyncClientTest extends AerospikeBaseTest {
 
diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-dynamodb-2.0/src/test/groovy/DynamoDbUtilTest.groovy b/dd-java-agent/instrumentation/aws-java/aws-java-dynamodb-2.0/src/test/groovy/DynamoDbUtilTest.groovy
@@ -1,9 +1,9 @@
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan
 import datadog.trace.bootstrap.instrumentation.api.InstrumentationTags
 import datadog.trace.instrumentation.aws.v2.dynamodb.DynamoDbUtil
-import org.junit.Test
-import software.amazon.awssdk.services.dynamodb.model.AttributeValue
+import org.junit.jupiter.api.Test
 import software.amazon.awssdk.core.SdkBytes
+import software.amazon.awssdk.services.dynamodb.model.AttributeValue
 
 class DynamoDbUtilTest {
   static createMockSpan() {
diff --git a/dd-java-agent/instrumentation/cucumber/src/test/java/org/example/cucumber/calculator/CalculatorSteps.java b/dd-java-agent/instrumentation/cucumber/src/test/java/org/example/cucumber/calculator/CalculatorSteps.java
@@ -1,7 +1,7 @@
 package org.example.cucumber.calculator;
 
 import static java.util.Arrays.asList;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import io.cucumber.java.en.Given;
 import io.cucumber.java.en.Then;
diff --git a/dd-java-agent/instrumentation/jakarta-ws-annotations/src/test/groovy/WebServiceTest.groovy b/dd-java-agent/instrumentation/jakarta-ws-annotations/src/test/groovy/WebServiceTest.groovy
@@ -1,7 +1,7 @@
 import datadog.trace.agent.test.InstrumentationSpecification
 import datadog.trace.api.DDSpanTypes
 
-import static org.junit.Assert.fail
+import static org.junit.jupiter.api.Assertions.fail
 
 class WebServiceTest extends InstrumentationSpecification {
 
diff --git a/dd-java-agent/instrumentation/jax-ws-annotations-1/src/test/groovy/WebServiceTest.groovy b/dd-java-agent/instrumentation/jax-ws-annotations-1/src/test/groovy/WebServiceTest.groovy
@@ -1,7 +1,7 @@
 import datadog.trace.agent.test.InstrumentationSpecification
 import datadog.trace.api.DDSpanTypes
 
-import static org.junit.Assert.fail
+import static org.junit.jupiter.api.Assertions.fail
 
 class WebServiceTest extends InstrumentationSpecification {
 
diff --git a/dd-java-agent/instrumentation/jax-ws-annotations-2/src/test/groovy/WebServiceProviderTest.groovy b/dd-java-agent/instrumentation/jax-ws-annotations-2/src/test/groovy/WebServiceProviderTest.groovy
@@ -1,7 +1,7 @@
 import datadog.trace.agent.test.InstrumentationSpecification
 import datadog.trace.api.DDSpanTypes
 
-import static org.junit.Assert.fail
+import static org.junit.jupiter.api.Assertions.fail
 
 class WebServiceProviderTest extends InstrumentationSpecification {
 
diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/java/org/example/cucumber/calculator/CalculatorSteps.java b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/java/org/example/cucumber/calculator/CalculatorSteps.java
@@ -1,7 +1,7 @@
 package org.example.cucumber.calculator;
 
 import static java.util.Arrays.asList;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import io.cucumber.java.en.Given;
 import io.cucumber.java.en.Then;
diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-attempt-to-fix-disabled-failed/events.ftl
@@ -42,7 +42,7 @@
       "env" : "none",
       "error.message" : ${content_meta_error_message},
       "error.stack" : ${content_meta_error_stack},
-      "error.type" : "java.lang.AssertionError",
+      "error.type" : "org.opentest4j.AssertionFailedError",
       "language" : "jvm",
       "library_version" : ${content_meta_library_version},
       "runtime-id" : ${content_meta_runtime_id},
@@ -91,7 +91,7 @@
       "env" : "none",
       "error.message" : ${content_meta_error_message},
       "error.stack" : ${content_meta_error_stack_2},
-      "error.type" : "java.lang.AssertionError",
+      "error.type" : "org.opentest4j.AssertionFailedError",
       "language" : "jvm",
       "library_version" : ${content_meta_library_version},
       "runtime-id" : ${content_meta_runtime_id},
@@ -142,7 +142,7 @@
       "env" : "none",
       "error.message" : ${content_meta_error_message},
       "error.stack" : ${content_meta_error_stack_3},
-      "error.type" : "java.lang.AssertionError",
+      "error.type" : "org.opentest4j.AssertionFailedError",
       "language" : "jvm",
       "library_version" : ${content_meta_library_version},
       "runtime-id" : ${content_meta_runtime_id},
@@ -193,7 +193,7 @@
       "env" : "none",
       "error.message" : ${content_meta_error_message},
       "error.stack" : ${content_meta_error_stack_4},
-      "error.type" : "java.lang.AssertionError",
+      "error.type" : "org.opentest4j.AssertionFailedError",
       "language" : "jvm",
       "library_version" : ${content_meta_library_version},
       "runtime-id" : ${content_meta_runtime_id},
@@ -244,7 +244,7 @@
       "env" : "none",
       "error.message" : ${content_meta_error_message},
       "error.stack" : ${content_meta_error_stack_5},
-      "error.type" : "java.lang.AssertionError",
+      "error.type" : "org.opentest4j.AssertionFailedError",
       "language" : "jvm",
       "library_version" : ${content_meta_library_version},
       "runtime-id" : ${content_meta_runtime_id},
diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-attempt-to-fix-failed/events.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-attempt-to-fix-failed/events.ftl
@@ -42,7 +42,7 @@
       "env" : "none",
       "error.message" : ${content_meta_error_message},
       "error.stack" : ${content_meta_error_stack},
-      "error.type" : "java.lang.AssertionError",
+      "error.type" : "org.opentest4j.AssertionFailedError",
       "language" : "jvm",
       "library_version" : ${content_meta_library_version},
       "runtime-id" : ${content_meta_runtime_id},
@@ -89,7 +89,7 @@
       "env" : "none",
       "error.message" : ${content_meta_error_message},
       "error.stack" : ${content_meta_error_stack_2},
-      "error.type" : "java.lang.AssertionError",
+      "error.type" : "org.opentest4j.AssertionFailedError",
       "language" : "jvm",
       "library_version" : ${content_meta_library_version},
       "runtime-id" : ${content_meta_runtime_id},
@@ -138,7 +138,7 @@
       "env" : "none",
       "error.message" : ${content_meta_error_message},
       "error.stack" : ${content_meta_error_stack_3},
-      "error.type" : "java.lang.AssertionError",
+      "error.type" : "org.opentest4j.AssertionFailedError",
       "language" : "jvm",
       "library_version" : ${content_meta_library_version},
       "runtime-id" : ${content_meta_runtime_id},
@@ -187,7 +187,7 @@
       "env" : "none",
       "error.message" : ${content_meta_error_message},
       "error.stack" : ${content_meta_error_stack_4},
-      "error.type" : "java.lang.AssertionError",
+      "error.type" : "org.opentest4j.AssertionFailedError",
       "language" : "jvm",
       "library_version" : ${content_meta_library_version},
       "runtime-id" : ${content_meta_runtime_id},
@@ -236,7 +236,7 @@
       "env" : "none",
       "error.message" : ${content_meta_error_message},
       "error.stack" : ${content_meta_error_stack_5},
-      "error.type" : "java.lang.AssertionError",
+      "error.type" : "org.opentest4j.AssertionFailedError",
       "language" : "jvm",
       "library_version" : ${content_meta_library_version},
       "runtime-id" : ${content_meta_runtime_id},
diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-attempt-to-fix-quarantined-failed/events.ftl
@@ -42,7 +42,7 @@
       "env" : "none",
       "error.message" : ${content_meta_error_message},
       "error.stack" : ${content_meta_error_stack},
-      "error.type" : "java.lang.AssertionError",
+      "error.type" : "org.opentest4j.AssertionFailedError",
       "language" : "jvm",
       "library_version" : ${content_meta_library_version},
       "runtime-id" : ${content_meta_runtime_id},
@@ -91,7 +91,7 @@
       "env" : "none",
       "error.message" : ${content_meta_error_message},
       "error.stack" : ${content_meta_error_stack_2},
-      "error.type" : "java.lang.AssertionError",
+      "error.type" : "org.opentest4j.AssertionFailedError",
       "language" : "jvm",
       "library_version" : ${content_meta_library_version},
       "runtime-id" : ${content_meta_runtime_id},
@@ -142,7 +142,7 @@
       "env" : "none",
       "error.message" : ${content_meta_error_message},
       "error.stack" : ${content_meta_error_stack_3},
-      "error.type" : "java.lang.AssertionError",
+      "error.type" : "org.opentest4j.AssertionFailedError",
       "language" : "jvm",
       "library_version" : ${content_meta_library_version},
       "runtime-id" : ${content_meta_runtime_id},
@@ -193,7 +193,7 @@
       "env" : "none",
       "error.message" : ${content_meta_error_message},
       "error.stack" : ${content_meta_error_stack_4},
-      "error.type" : "java.lang.AssertionError",
+      "error.type" : "org.opentest4j.AssertionFailedError",
       "language" : "jvm",
       "library_version" : ${content_meta_library_version},
       "runtime-id" : ${content_meta_runtime_id},
@@ -244,7 +244,7 @@
       "env" : "none",
       "error.message" : ${content_meta_error_message},
       "error.stack" : ${content_meta_error_stack_5},
-      "error.type" : "java.lang.AssertionError",
+      "error.type" : "org.opentest4j.AssertionFailedError",
       "language" : "jvm",
       "library_version" : ${content_meta_library_version},
       "runtime-id" : ${content_meta_runtime_id},
diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-no-retry-failed/events.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-no-retry-failed/events.ftl
@@ -42,7 +42,7 @@
       "env" : "none",
       "error.message" : ${content_meta_error_message},
       "error.stack" : ${content_meta_error_stack},
-      "error.type" : "java.lang.AssertionError",
+      "error.type" : "org.opentest4j.AssertionFailedError",
       "language" : "jvm",
       "library_version" : ${content_meta_library_version},
       "runtime-id" : ${content_meta_runtime_id},
diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-parallel/coverages.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-parallel/coverages.ftl
@@ -1,15 +1,15 @@
 [ {
   "files" : [ {
-    "filename" : "org/example/cucumber/calculator/basic_arithmetic_skipped.feature"
+    "filename" : "org/example/cucumber/calculator/basic_arithmetic.feature"
   } ],
-  "span_id" : ${content_span_id_3},
+  "span_id" : ${content_span_id},
   "test_session_id" : ${content_test_session_id},
-  "test_suite_id" : ${content_test_suite_id_2}
+  "test_suite_id" : ${content_test_suite_id}
 }, {
   "files" : [ {
-    "filename" : "org/example/cucumber/calculator/basic_arithmetic.feature"
+    "filename" : "org/example/cucumber/calculator/basic_arithmetic_skipped.feature"
   } ],
-  "span_id" : ${content_span_id},
+  "span_id" : ${content_span_id_3},
   "test_session_id" : ${content_test_session_id},
-  "test_suite_id" : ${content_test_suite_id}
+  "test_suite_id" : ${content_test_suite_id_2}
 } ]
diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-quarantined-failed-atr/events.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-quarantined-failed-atr/events.ftl
@@ -42,7 +42,7 @@
       "env" : "none",
       "error.message" : ${content_meta_error_message},
       "error.stack" : ${content_meta_error_stack},
-      "error.type" : "java.lang.AssertionError",
+      "error.type" : "org.opentest4j.AssertionFailedError",
       "language" : "jvm",
       "library_version" : ${content_meta_library_version},
       "runtime-id" : ${content_meta_runtime_id},
@@ -90,7 +90,7 @@
       "env" : "none",
       "error.message" : ${content_meta_error_message},
       "error.stack" : ${content_meta_error_stack_2},
-      "error.type" : "java.lang.AssertionError",
+      "error.type" : "org.opentest4j.AssertionFailedError",
       "language" : "jvm",
       "library_version" : ${content_meta_library_version},
       "runtime-id" : ${content_meta_runtime_id},
@@ -140,7 +140,7 @@
       "env" : "none",
       "error.message" : ${content_meta_error_message},
       "error.stack" : ${content_meta_error_stack_3},
-      "error.type" : "java.lang.AssertionError",
+      "error.type" : "org.opentest4j.AssertionFailedError",
       "language" : "jvm",
       "library_version" : ${content_meta_library_version},
       "runtime-id" : ${content_meta_runtime_id},
@@ -190,7 +190,7 @@
       "env" : "none",
       "error.message" : ${content_meta_error_message},
       "error.stack" : ${content_meta_error_stack_4},
-      "error.type" : "java.lang.AssertionError",
+      "error.type" : "org.opentest4j.AssertionFailedError",
       "language" : "jvm",
       "library_version" : ${content_meta_library_version},
       "runtime-id" : ${content_meta_runtime_id},
@@ -240,7 +240,7 @@
       "env" : "none",
       "error.message" : ${content_meta_error_message},
       "error.stack" : ${content_meta_error_stack_5},
-      "error.type" : "java.lang.AssertionError",
+      "error.type" : "org.opentest4j.AssertionFailedError",
       "language" : "jvm",
       "library_version" : ${content_meta_library_version},
       "runtime-id" : ${content_meta_runtime_id},
diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-quarantined-failed-efd/events.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-quarantined-failed-efd/events.ftl
@@ -42,7 +42,7 @@
       "env" : "none",
       "error.message" : ${content_meta_error_message},
       "error.stack" : ${content_meta_error_stack},
-      "error.type" : "java.lang.AssertionError",
+      "error.type" : "org.opentest4j.AssertionFailedError",
       "language" : "jvm",
       "library_version" : ${content_meta_library_version},
       "runtime-id" : ${content_meta_runtime_id},
@@ -91,7 +91,7 @@
       "env" : "none",
       "error.message" : ${content_meta_error_message},
       "error.stack" : ${content_meta_error_stack_2},
-      "error.type" : "java.lang.AssertionError",
+      "error.type" : "org.opentest4j.AssertionFailedError",
       "language" : "jvm",
       "library_version" : ${content_meta_library_version},
       "runtime-id" : ${content_meta_runtime_id},
@@ -142,7 +142,7 @@
       "env" : "none",
       "error.message" : ${content_meta_error_message},
       "error.stack" : ${content_meta_error_stack_3},
-      "error.type" : "java.lang.AssertionError",
+      "error.type" : "org.opentest4j.AssertionFailedError",
       "language" : "jvm",
       "library_version" : ${content_meta_library_version},
       "runtime-id" : ${content_meta_runtime_id},
diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-quarantined-failed-known/events.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-quarantined-failed-known/events.ftl
@@ -42,7 +42,7 @@
       "env" : "none",
       "error.message" : ${content_meta_error_message},
       "error.stack" : ${content_meta_error_stack},
-      "error.type" : "java.lang.AssertionError",
+      "error.type" : "org.opentest4j.AssertionFailedError",
       "language" : "jvm",
       "library_version" : ${content_meta_library_version},
       "runtime-id" : ${content_meta_runtime_id},
diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-quarantined-failed/events.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-quarantined-failed/events.ftl
@@ -42,7 +42,7 @@
       "env" : "none",
       "error.message" : ${content_meta_error_message},
       "error.stack" : ${content_meta_error_stack},
-      "error.type" : "java.lang.AssertionError",
+      "error.type" : "org.opentest4j.AssertionFailedError",
       "language" : "jvm",
       "library_version" : ${content_meta_library_version},
       "runtime-id" : ${content_meta_runtime_id},
diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-retry-failed-scenario-outline-5.4.0/events.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-retry-failed-scenario-outline-5.4.0/events.ftl
@@ -42,7 +42,7 @@
       "env" : "none",
       "error.message" : ${content_meta_error_message},
       "error.stack" : ${content_meta_error_stack},
-      "error.type" : "java.lang.AssertionError",
+      "error.type" : "org.opentest4j.AssertionFailedError",
       "language" : "jvm",
       "library_version" : ${content_meta_library_version},
       "runtime-id" : ${content_meta_runtime_id},
@@ -89,7 +89,7 @@
       "env" : "none",
       "error.message" : ${content_meta_error_message},
       "error.stack" : ${content_meta_error_stack_2},
-      "error.type" : "java.lang.AssertionError",
+      "error.type" : "org.opentest4j.AssertionFailedError",
       "language" : "jvm",
       "library_version" : ${content_meta_library_version},
       "runtime-id" : ${content_meta_runtime_id},
@@ -138,7 +138,7 @@
       "env" : "none",
       "error.message" : ${content_meta_error_message},
       "error.stack" : ${content_meta_error_stack_3},
-      "error.type" : "java.lang.AssertionError",
+      "error.type" : "org.opentest4j.AssertionFailedError",
       "language" : "jvm",
       "library_version" : ${content_meta_library_version},
       "runtime-id" : ${content_meta_runtime_id},
@@ -187,7 +187,7 @@
       "env" : "none",
       "error.message" : ${content_meta_error_message},
       "error.stack" : ${content_meta_error_stack_4},
-      "error.type" : "java.lang.AssertionError",
+      "error.type" : "org.opentest4j.AssertionFailedError",
       "language" : "jvm",
       "library_version" : ${content_meta_library_version},
       "runtime-id" : ${content_meta_runtime_id},
@@ -236,7 +236,7 @@
       "env" : "none",
       "error.message" : ${content_meta_error_message},
       "error.stack" : ${content_meta_error_stack_5},
-      "error.type" : "java.lang.AssertionError",
+      "error.type" : "org.opentest4j.AssertionFailedError",
       "language" : "jvm",
       "library_version" : ${content_meta_library_version},
       "runtime-id" : ${content_meta_runtime_id},
@@ -285,7 +285,7 @@
       "env" : "none",
       "error.message" : ${content_meta_error_message_2},
       "error.stack" : ${content_meta_error_stack_6},
-      "error.type" : "java.lang.AssertionError",
+      "error.type" : "org.opentest4j.AssertionFailedError",
       "language" : "jvm",
       "library_version" : ${content_meta_library_version},
       "runtime-id" : ${content_meta_runtime_id},
diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-retry-failed-scenario-outline-latest/events.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-retry-failed-scenario-outline-latest/events.ftl
diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-retry-failed/events.ftl b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-retry-failed/events.ftl
diff --git a/dd-java-agent/instrumentation/karate/src/test/java/org/example/Flaky.java b/dd-java-agent/instrumentation/karate/src/test/java/org/example/Flaky.java
diff --git a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/AgentDebuggerIntegrationTest.java b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/AgentDebuggerIntegrationTest.java
diff --git a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/BaseIntegrationTest.java b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/BaseIntegrationTest.java
diff --git a/internal-api/src/test/java/datadog/trace/api/TagMapEntryTest.java b/internal-api/src/test/java/datadog/trace/api/TagMapEntryTest.java
diff --git a/internal-api/src/test/java/datadog/trace/api/TagMapTest.java b/internal-api/src/test/java/datadog/trace/api/TagMapTest.java
