Follow-up with dd-trace-api Groovy to Java test file migration (#10811)

Follow-up with dd-trace-api Groovy to Java test file migration

Co-authored-by: sarah.chen <sarah.chen@datadoghq.com>

Author: sarahchen6

.claude/skills/migrate-groovy-to-java/SKILL.md

@@ -1,6 +1,9 @@
 ---
 name: migrate-groovy-to-java
-description: migrate test groovy files to java
+description: >
+  Converts Spock/Groovy test files in a Gradle module to equivalent JUnit 5 Java tests.
+  Use when asked to "migrate groovy", "convert groovy to java", "g2j", or when a module
+  has .groovy test files that need to be replaced with .java equivalents.
 ---
 
 Migrate test Groovy files to Java using JUnit 5
@@ -18,6 +21,8 @@ When converting Groovy code to Java code, make sure that:
 - Ensure parameterized test names are human-readable (i.e. no hashcodes); instead add a description string as the first `Arguments.arguments(...)` value or index the test case
 - When converting tuples, create a light dedicated structure instead to keep the typing system
 - Instead of checking a state and throwing an exception, use JUnit asserts
+- Instead of using `assertTrue(a.equals(b))` or `assertFalse(a.equals(b))`, use `assertEquals(expected, actual)` and `assertNotEquals(unexpected, actual)`
+- Import frequently used types rather than using fully-qualified names inline, to improve readability
 - Do not wrap checked exceptions and throw a Runtime exception; prefer adding a throws clause at method declaration
 - Do not mark local variables `final`
 - Ensure variables are human-readable; avoid single-letter names and pre-define variables that are referenced multiple times

dd-trace-api/src/test/java/datadog/trace/api/IdGenerationStrategyTest.java

@@ -6,28 +6,26 @@
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.security.SecureRandom;
 import java.util.HashSet;
 import java.util.Set;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
 import org.junit.jupiter.params.provider.ValueSource;
 
 class IdGenerationStrategyTest {
 
   @ParameterizedTest(name = "generate id with {1} and {0} bits")
-  @CsvSource(
-      value = {
-        "false|RANDOM",
-        "false|SEQUENTIAL",
-        "false|SECURE_RANDOM",
-        "true|RANDOM",
-        "true|SEQUENTIAL",
-        "true|SECURE_RANDOM"
-      },
-      delimiter = '|')
+  @CsvSource({
+    "false,RANDOM",
+    "false,SEQUENTIAL",
+    "false,SECURE_RANDOM",
+    "true,RANDOM",
+    "true,SEQUENTIAL",
+    "true,SECURE_RANDOM"
+  })
   void generateIdWithStrategyAndBitSize(
       boolean traceId128BitGenerationEnabled, String strategyName) {
     IdGenerationStrategy strategy =
@@ -37,10 +35,9 @@ void generateIdWithStrategyAndBitSize(
     for (int index = 0; index <= 32768; index++) {
       DDTraceId traceId = strategy.generateTraceId();
       assertNotNull(traceId);
-      assertFalse(traceId.equals(null));
-      assertFalse(traceId.equals("foo"));
+      assertNotEquals(null, traceId);
+      assertNotEquals("foo", traceId);
       assertNotEquals(DDTraceId.ZERO, traceId);
-      assertTrue(traceId.equals(traceId));
 
       int expectedHash =
           (int)
@@ -61,7 +58,7 @@ void returnNullForNonExistingStrategy(String strategyName) {
     assertNull(IdGenerationStrategy.fromName(strategyName));
   }
 
-  @org.junit.jupiter.api.Test
+  @Test
   void exceptionCreatedOnSecureRandomStrategy() {
     ExceptionInInitializerError error =
         assertThrows(
@@ -77,7 +74,7 @@ void exceptionCreatedOnSecureRandomStrategy() {
     assertEquals("SecureRandom init exception", error.getCause().getMessage());
   }
 
-  @org.junit.jupiter.api.Test
+  @Test
   void secureRandomIdsWillAlwaysBeNonZero() {
     ScriptedSecureRandom random = new ScriptedSecureRandom(new long[] {0L, 47L, 0L, 11L});
     CallCounter providerCallCounter = new CallCounter();

dd-trace-api/src/test/java/datadog/trace/api/internal/util/HexStringUtilsTest.java

@@ -8,25 +8,23 @@
 class HexStringUtilsTest {
 
   @ParameterizedTest(name = "test hexadecimal String representations high={0} low={1} size={2}")
-  @CsvSource(
-      value = {
-        "0|0|10",
-        "0|0|16",
-        "0|0|20",
-        "0|0|32",
-        "0|0|40",
-        "1|2|10",
-        "1|2|16",
-        "1|2|20",
-        "1|2|32",
-        "1|2|40",
-        "6536977903480360123|3270264562721133536|10",
-        "6536977903480360123|3270264562721133536|16",
-        "6536977903480360123|3270264562721133536|20",
-        "6536977903480360123|3270264562721133536|32",
-        "6536977903480360123|3270264562721133536|40"
-      },
-      delimiter = '|')
+  @CsvSource({
+    "0,0,10",
+    "0,0,16",
+    "0,0,20",
+    "0,0,32",
+    "0,0,40",
+    "1,2,10",
+    "1,2,16",
+    "1,2,20",
+    "1,2,32",
+    "1,2,40",
+    "6536977903480360123,3270264562721133536,10",
+    "6536977903480360123,3270264562721133536,16",
+    "6536977903480360123,3270264562721133536,20",
+    "6536977903480360123,3270264562721133536,32",
+    "6536977903480360123,3270264562721133536,40"
+  })
   void testHexadecimalStringRepresentations(long highOrderBits, long lowOrderBits, int size) {
     int highOrderSize = Math.min(16, Math.max(0, size - 16));
     int lowOrderSize = Math.min(16, size);