Skip to content

Commit ea6647d

Browse files
committed
Convert integration tests to java
1 parent b1f72b6 commit ea6647d

9 files changed

+476
-464
lines changed

testing-common/integration-tests/build.gradle.kts

+2-15
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ dependencies {
1111
testCompileOnly(project(":javaagent-bootstrap"))
1212
testCompileOnly(project(":javaagent-extension-api"))
1313
testCompileOnly(project(":muzzle"))
14+
testCompileOnly("com.google.auto.service:auto-service-annotations")
15+
testCompileOnly("com.google.code.findbugs:annotations")
1416

1517
testImplementation("net.bytebuddy:byte-buddy")
1618
testImplementation("net.bytebuddy:byte-buddy-agent")
@@ -47,25 +49,10 @@ tasks {
4749
jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
4850
}
4951

50-
val testIndyModuleOldBytecodeInstrumentation by registering(Test::class) {
51-
filter {
52-
includeTestsMatching("InstrumentOldBytecode")
53-
}
54-
include("**/InstrumentOldBytecode.*")
55-
}
56-
57-
val testInlineModuleOldBytecodeInstrumentation by registering(Test::class) {
58-
filter {
59-
includeTestsMatching("InstrumentOldBytecode")
60-
}
61-
include("**/InstrumentOldBytecode.*")
62-
}
63-
6452
test {
6553
filter {
6654
excludeTestsMatching("context.FieldInjectionDisabledTest")
6755
excludeTestsMatching("context.FieldBackedImplementationTest")
68-
excludeTestsMatching("InstrumentOldBytecode")
6956
}
7057
// this is needed for AgentInstrumentationSpecificationTest
7158
jvmArgs("-Dotel.javaagent.exclude-classes=config.exclude.packagename.*,config.exclude.SomeClass,config.exclude.SomeClass\$NestedClass")

testing-common/integration-tests/src/test/groovy/AgentInstrumentationSpecificationTest.groovy

-154
This file was deleted.

testing-common/integration-tests/src/test/groovy/InstrumentOldBytecode.groovy

-14
This file was deleted.

0 commit comments

Comments
 (0)