Skip to content

Commit 4e1a3cc

Browse files
authored
Unskip tests (#12084)
Unskip tests Merge branch 'master' into sarahchen6/unskip-tests Co-authored-by: sarah.chen <sarah.chen@datadoghq.com>
1 parent 521ee6a commit 4e1a3cc

3 files changed

Lines changed: 4 additions & 16 deletions

File tree

dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/CapturedSnapshotTest.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -662,8 +662,6 @@ public void sourceFileProbeGroovy() throws IOException, URISyntaxException {
662662
}
663663

664664
@Test
665-
@EnabledForJreRange(
666-
max = JRE.JAVA_25) // TODO: Fix for Java 26. Delete once Java 26 is officially released.
667665
@DisabledIf(
668666
value = "datadog.environment.JavaVirtualMachine#isJ9",
669667
disabledReason = "Issue with J9 when compiling Kotlin code")
@@ -696,8 +694,6 @@ public void sourceFileProbeKotlin() throws IOException, URISyntaxException {
696694
}
697695

698696
@Test
699-
@EnabledForJreRange(
700-
max = JRE.JAVA_25) // TODO: Fix for Java 26. Delete once Java 26 is officially released.
701697
@DisabledIf(
702698
value = "datadog.environment.JavaVirtualMachine#isJ9",
703699
disabledReason = "Issue with J9 when compiling Kotlin code")
@@ -725,8 +721,6 @@ public void suspendKotlin() throws IOException, URISyntaxException {
725721
}
726722

727723
@Test
728-
@EnabledForJreRange(
729-
max = JRE.JAVA_25) // TODO: Fix for Java 26. Delete once Java 26 is officially released.
730724
@DisabledIf(
731725
value = "datadog.environment.JavaVirtualMachine#isJ9",
732726
disabledReason = "Issue with J9 when compiling Kotlin code")
@@ -760,8 +754,6 @@ public void suspendMethodKotlin() {
760754
}
761755

762756
@Test
763-
@EnabledForJreRange(
764-
max = JRE.JAVA_25) // TODO: Fix for Java 26. Delete once Java 26 is officially released.
765757
@DisabledIf(
766758
value = "datadog.environment.JavaVirtualMachine#isJ9",
767759
disabledReason = "Issue with J9 when compiling Kotlin code")

dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/tooling/muzzle/ReferenceCreatorTest.groovy

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package datadog.trace.agent.tooling.muzzle
22

33
import datadog.trace.test.util.DDSpecification
4-
import spock.lang.Ignore
54

65
import static TestAdviceClasses.InstanceofAdvice
76
import static TestAdviceClasses.LdcAdvice
@@ -114,8 +113,6 @@ class ReferenceCreatorTest extends DDSpecification {
114113
references.get('datadog.trace.agent.tooling.muzzle.TestAdviceClasses$MethodBodyAdvice$A') != null
115114
}
116115

117-
// TODO: remove ignore when we drop java 7 support.
118-
@Ignore
119116
def "invokedynamic creates references"() {
120117
setup:
121118
Map<String, Reference> references = ReferenceCreator.createReferencesFrom(TestAdviceClasses.InDyAdvice.name, this.class.classLoader)

dd-java-agent/agent-tooling/src/test/java/datadog/trace/agent/tooling/muzzle/TestAdviceClasses.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -97,11 +97,10 @@ public static boolean instanceofMethod(final Object a) {
9797
}
9898
}
9999

100-
// Can't test this until java 7 is dropped.
101100
public static class InDyAdvice {
102-
// public static MethodBodyAdvice.HasMethod indyMethod(final MethodBodyAdvice.HasMethod a) {
103-
// Runnable aStaticMethod = MethodBodyAdvice.B::aStaticMethod;
104-
// return a::requiredMethod;
105-
// }
101+
public static MethodBodyAdvice.HasMethod indyMethod(final MethodBodyAdvice.HasMethod a) {
102+
Runnable aStaticMethod = MethodBodyAdvice.B::aStaticMethod;
103+
return a::requiredMethod;
104+
}
106105
}
107106
}

0 commit comments

Comments
 (0)