Skip to content

Commit e9227c3

Browse files
authored
Convert vertx-rx-java-3.5 tests to java (#13117)
1 parent 3b267cb commit e9227c3

29 files changed

+1619
-1530
lines changed

instrumentation/vertx/vertx-rx-java-3.5/javaagent/build.gradle.kts

+8-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,11 @@ testing {
2929
suites {
3030
val version35Test by registering(JvmTestSuite::class) {
3131
dependencies {
32-
implementation("org.hsqldb:hsqldb:2.3.4")
32+
// this only exists to make Intellij happy since it doesn't (currently at least) understand our
33+
// inclusion of this artifact inside :testing-common
34+
compileOnly(project.dependencies.project(":testing:armeria-shaded-for-testing", configuration = "shadow"))
3335

36+
implementation("org.hsqldb:hsqldb:2.3.4")
3437
compileOnly("io.vertx:vertx-codegen:$vertxVersion")
3538
implementation("io.vertx:vertx-web:$vertxVersion")
3639
implementation("io.vertx:vertx-rx-java2:$vertxVersion")
@@ -42,8 +45,11 @@ testing {
4245

4346
val latestDepTest by registering(JvmTestSuite::class) {
4447
dependencies {
45-
implementation("org.hsqldb:hsqldb:2.3.4")
48+
// this only exists to make Intellij happy since it doesn't (currently at least) understand our
49+
// inclusion of this artifact inside :testing-common
50+
compileOnly(project.dependencies.project(":testing:armeria-shaded-for-testing", configuration = "shadow"))
4651

52+
implementation("org.hsqldb:hsqldb:2.3.4")
4753
implementation("io.vertx:vertx-web:latest.release")
4854
implementation("io.vertx:vertx-rx-java2:latest.release")
4955
implementation("io.vertx:vertx-web-client:latest.release")

instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/latestDepTest/groovy/VertxReactivePropagationTest.groovy

-219
This file was deleted.

instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/latestDepTest/groovy/client/VertxRxCircuitBreakerWebClientTest.groovy

-126
This file was deleted.

0 commit comments

Comments
 (0)