Convert finatra tests to test suites (#7946)
Part of https://github.com/open-telemetry/opentelemetry-java-instrumentation/issues/7911
This commit is contained in:
parent
dd32ff30f1
commit
0a9466523f
|
@ -1,12 +1,6 @@
|
||||||
plugins {
|
plugins {
|
||||||
id("otel.javaagent-instrumentation")
|
id("otel.javaagent-instrumentation")
|
||||||
id("otel.scala-conventions")
|
id("otel.scala-conventions")
|
||||||
id("org.unbroken-dome.test-sets")
|
|
||||||
}
|
|
||||||
|
|
||||||
testSets {
|
|
||||||
// We need separate test sources to compile against latest Finatra.
|
|
||||||
create("latestDepTest")
|
|
||||||
}
|
}
|
||||||
|
|
||||||
muzzle {
|
muzzle {
|
||||||
|
@ -26,6 +20,13 @@ muzzle {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Test suites don't allow excluding transitive dependencies. We use this configuration to declare
|
||||||
|
// dependency to latest finatra and exclude netty-transport-native-epoll.
|
||||||
|
val finatraLatest by configurations.creating {
|
||||||
|
isCanBeConsumed = false
|
||||||
|
isCanBeResolved = false
|
||||||
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
// TODO(anuraaga): Something about library configuration doesn't work well with scala compilation
|
// TODO(anuraaga): Something about library configuration doesn't work well with scala compilation
|
||||||
// here.
|
// here.
|
||||||
|
@ -33,10 +34,7 @@ dependencies {
|
||||||
|
|
||||||
testInstrumentation(project(":instrumentation:netty:netty-4.1:javaagent"))
|
testInstrumentation(project(":instrumentation:netty:netty-4.1:javaagent"))
|
||||||
|
|
||||||
if (!(findProperty("testLatestDeps") as Boolean)) {
|
testImplementation(enforcedPlatform("com.fasterxml.jackson:jackson-bom:2.9.10"))
|
||||||
// Requires old version of Jackson
|
|
||||||
testImplementation(enforcedPlatform("com.fasterxml.jackson:jackson-bom:2.9.10"))
|
|
||||||
}
|
|
||||||
testImplementation("com.twitter:finatra-http_2.11:19.12.0") {
|
testImplementation("com.twitter:finatra-http_2.11:19.12.0") {
|
||||||
// Finatra POM references linux-aarch64 version of this which we don't need. Including it
|
// Finatra POM references linux-aarch64 version of this which we don't need. Including it
|
||||||
// prevents us from managing Netty version because the classifier name changed to linux-aarch_64
|
// prevents us from managing Netty version because the classifier name changed to linux-aarch_64
|
||||||
|
@ -47,11 +45,28 @@ dependencies {
|
||||||
// Required for older versions of finatra on JDKs >= 11
|
// Required for older versions of finatra on JDKs >= 11
|
||||||
testImplementation("com.sun.activation:javax.activation:1.2.0")
|
testImplementation("com.sun.activation:javax.activation:1.2.0")
|
||||||
|
|
||||||
add("latestDepTestImplementation", "com.twitter:finatra-http_2.13:+") {
|
finatraLatest("com.twitter:finatra-http_2.13:+") {
|
||||||
exclude("io.netty", "netty-transport-native-epoll")
|
exclude("io.netty", "netty-transport-native-epoll")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
testing {
|
||||||
|
suites {
|
||||||
|
val latestDepTest by registering(JvmTestSuite::class) {
|
||||||
|
dependencies {
|
||||||
|
// finatra is included via finatraLatest configuation
|
||||||
|
implementation("io.netty:netty-transport-native-epoll:4.1.51.Final:linux-x86_64")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
configurations {
|
||||||
|
named("latestDepTestImplementation") {
|
||||||
|
extendsFrom(configurations["finatraLatest"])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
tasks {
|
tasks {
|
||||||
if (findProperty("testLatestDeps") as Boolean) {
|
if (findProperty("testLatestDeps") as Boolean) {
|
||||||
// Separate task
|
// Separate task
|
||||||
|
@ -62,6 +77,10 @@ tasks {
|
||||||
enabled = false
|
enabled = false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
check {
|
||||||
|
dependsOn(testing.suites)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.withType<Test>().configureEach {
|
tasks.withType<Test>().configureEach {
|
||||||
|
@ -69,12 +88,3 @@ tasks.withType<Test>().configureEach {
|
||||||
jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")
|
jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")
|
||||||
jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
|
jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
|
||||||
}
|
}
|
||||||
|
|
||||||
if (findProperty("testLatestDeps") as Boolean) {
|
|
||||||
configurations {
|
|
||||||
// finatra artifact name is different for regular and latest tests
|
|
||||||
testImplementation {
|
|
||||||
exclude("com.twitter", "finatra-http_2.11")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
Loading…
Reference in New Issue