From d548307f226032889299cdd08127541d72d8b894 Mon Sep 17 00:00:00 2001 From: Sarah Chen Date: Mon, 27 Jul 2026 16:00:18 -0400 Subject: [PATCH] Unskip tests --- .../com/datadog/debugger/agent/CapturedSnapshotTest.java | 8 -------- .../agent/tooling/muzzle/ReferenceCreatorTest.groovy | 3 --- .../trace/agent/tooling/muzzle/TestAdviceClasses.java | 9 ++++----- 3 files changed, 4 insertions(+), 16 deletions(-) diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/CapturedSnapshotTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/CapturedSnapshotTest.java index 249a36cb9cc..9d70e07c3e7 100644 --- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/CapturedSnapshotTest.java +++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/CapturedSnapshotTest.java @@ -662,8 +662,6 @@ public void sourceFileProbeGroovy() throws IOException, URISyntaxException { } @Test - @EnabledForJreRange( - max = JRE.JAVA_25) // TODO: Fix for Java 26. Delete once Java 26 is officially released. @DisabledIf( value = "datadog.environment.JavaVirtualMachine#isJ9", disabledReason = "Issue with J9 when compiling Kotlin code") @@ -696,8 +694,6 @@ public void sourceFileProbeKotlin() throws IOException, URISyntaxException { } @Test - @EnabledForJreRange( - max = JRE.JAVA_25) // TODO: Fix for Java 26. Delete once Java 26 is officially released. @DisabledIf( value = "datadog.environment.JavaVirtualMachine#isJ9", disabledReason = "Issue with J9 when compiling Kotlin code") @@ -725,8 +721,6 @@ public void suspendKotlin() throws IOException, URISyntaxException { } @Test - @EnabledForJreRange( - max = JRE.JAVA_25) // TODO: Fix for Java 26. Delete once Java 26 is officially released. @DisabledIf( value = "datadog.environment.JavaVirtualMachine#isJ9", disabledReason = "Issue with J9 when compiling Kotlin code") @@ -760,8 +754,6 @@ public void suspendMethodKotlin() { } @Test - @EnabledForJreRange( - max = JRE.JAVA_25) // TODO: Fix for Java 26. Delete once Java 26 is officially released. @DisabledIf( value = "datadog.environment.JavaVirtualMachine#isJ9", disabledReason = "Issue with J9 when compiling Kotlin code") diff --git a/dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/tooling/muzzle/ReferenceCreatorTest.groovy b/dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/tooling/muzzle/ReferenceCreatorTest.groovy index a71143892e6..1b821256f3e 100644 --- a/dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/tooling/muzzle/ReferenceCreatorTest.groovy +++ b/dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/tooling/muzzle/ReferenceCreatorTest.groovy @@ -1,7 +1,6 @@ package datadog.trace.agent.tooling.muzzle import datadog.trace.test.util.DDSpecification -import spock.lang.Ignore import static TestAdviceClasses.InstanceofAdvice import static TestAdviceClasses.LdcAdvice @@ -114,8 +113,6 @@ class ReferenceCreatorTest extends DDSpecification { references.get('datadog.trace.agent.tooling.muzzle.TestAdviceClasses$MethodBodyAdvice$A') != null } - // TODO: remove ignore when we drop java 7 support. - @Ignore def "invokedynamic creates references"() { setup: Map references = ReferenceCreator.createReferencesFrom(TestAdviceClasses.InDyAdvice.name, this.class.classLoader) diff --git a/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/muzzle/TestAdviceClasses.java b/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/muzzle/TestAdviceClasses.java index 5ee1bb20ef2..5bb7b23d986 100644 --- a/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/muzzle/TestAdviceClasses.java +++ b/dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/muzzle/TestAdviceClasses.java @@ -97,11 +97,10 @@ public static boolean instanceofMethod(final Object a) { } } - // Can't test this until java 7 is dropped. public static class InDyAdvice { - // public static MethodBodyAdvice.HasMethod indyMethod(final MethodBodyAdvice.HasMethod a) { - // Runnable aStaticMethod = MethodBodyAdvice.B::aStaticMethod; - // return a::requiredMethod; - // } + public static MethodBodyAdvice.HasMethod indyMethod(final MethodBodyAdvice.HasMethod a) { + Runnable aStaticMethod = MethodBodyAdvice.B::aStaticMethod; + return a::requiredMethod; + } } }