Convert vertx-rx-java-3.5 tests to java (#13117)

open-telemetry · Jan 28, 2025 · e9227c3 · e9227c3
1 parent 3b267cb
commit e9227c3
Show file tree

Hide file tree

Showing 29 changed files with 1,619 additions and 1,530 deletions.
diff --git a/instrumentation/vertx/vertx-rx-java-3.5/javaagent/build.gradle.kts b/instrumentation/vertx/vertx-rx-java-3.5/javaagent/build.gradle.kts
@@ -29,8 +29,11 @@ testing {
   suites {
     val version35Test by registering(JvmTestSuite::class) {
       dependencies {
-        implementation("org.hsqldb:hsqldb:2.3.4")
+        // this only exists to make Intellij happy since it doesn't (currently at least) understand our
+        // inclusion of this artifact inside :testing-common
+        compileOnly(project.dependencies.project(":testing:armeria-shaded-for-testing", configuration = "shadow"))
 
+        implementation("org.hsqldb:hsqldb:2.3.4")
         compileOnly("io.vertx:vertx-codegen:$vertxVersion")
         implementation("io.vertx:vertx-web:$vertxVersion")
         implementation("io.vertx:vertx-rx-java2:$vertxVersion")
@@ -42,8 +45,11 @@ testing {
 
     val latestDepTest by registering(JvmTestSuite::class) {
       dependencies {
-        implementation("org.hsqldb:hsqldb:2.3.4")
+        // this only exists to make Intellij happy since it doesn't (currently at least) understand our
+        // inclusion of this artifact inside :testing-common
+        compileOnly(project.dependencies.project(":testing:armeria-shaded-for-testing", configuration = "shadow"))
 
+        implementation("org.hsqldb:hsqldb:2.3.4")
         implementation("io.vertx:vertx-web:latest.release")
         implementation("io.vertx:vertx-rx-java2:latest.release")
         implementation("io.vertx:vertx-web-client:latest.release")

diff --git a/.../vertx-rx-java-3.5/javaagent/src/latestDepTest/groovy/VertxReactivePropagationTest.groovy b/.../vertx-rx-java-3.5/javaagent/src/latestDepTest/groovy/VertxReactivePropagationTest.groovy
diff --git a/...a-3.5/javaagent/src/latestDepTest/groovy/client/VertxRxCircuitBreakerWebClientTest.groovy b/...a-3.5/javaagent/src/latestDepTest/groovy/client/VertxRxCircuitBreakerWebClientTest.groovy