From 7a3b734922968ab4aed1b5585ec700f54c866169 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yoann=20Rodi=C3=A8re?= Date: Tue, 9 Jan 2024 16:41:41 +0100 Subject: [PATCH] Fix swallowed failures in Reactive SQL Client tests --- .../reactive/mssql/client/MSSQLPoolProducerTest.java | 8 ++------ .../resources/application-default-datasource.properties | 2 ++ .../reactive/mysql/client/MySQLPoolProducerTest.java | 8 ++------ .../resources/application-default-datasource.properties | 4 ++++ .../reactive/oracle/client/OraclePoolProducerTest.java | 8 ++------ .../resources/application-default-datasource.properties | 2 ++ .../io/quarkus/reactive/pg/client/PgPoolProducerTest.java | 8 ++------ .../resources/application-default-datasource.properties | 4 +++- 8 files changed, 19 insertions(+), 25 deletions(-) diff --git a/extensions/reactive-mssql-client/deployment/src/test/java/io/quarkus/reactive/mssql/client/MSSQLPoolProducerTest.java b/extensions/reactive-mssql-client/deployment/src/test/java/io/quarkus/reactive/mssql/client/MSSQLPoolProducerTest.java index c07a671754e14..ecfa4c4530867 100644 --- a/extensions/reactive-mssql-client/deployment/src/test/java/io/quarkus/reactive/mssql/client/MSSQLPoolProducerTest.java +++ b/extensions/reactive-mssql-client/deployment/src/test/java/io/quarkus/reactive/mssql/client/MSSQLPoolProducerTest.java @@ -1,6 +1,5 @@ package io.quarkus.reactive.mssql.client; -import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; import jakarta.enterprise.context.ApplicationScoped; @@ -41,10 +40,8 @@ static class BeanUsingBareMSSQLClient { @Inject MSSQLPool mssqlClient; - public CompletionStage verify() { - CompletableFuture cf = new CompletableFuture<>(); - mssqlClient.query("SELECT 1").execute(ar -> cf.complete(null)); - return cf; + public CompletionStage verify() { + return mssqlClient.query("SELECT 1").execute().toCompletionStage(); } } @@ -57,7 +54,6 @@ static class BeanUsingMutinyMSSQLClient { public CompletionStage verify() { return mssqlClient.query("SELECT 1").execute() .onItem().ignore().andContinueWithNull() - .onFailure().recoverWithItem((Void) null) .subscribeAsCompletionStage(); } } diff --git a/extensions/reactive-mssql-client/deployment/src/test/resources/application-default-datasource.properties b/extensions/reactive-mssql-client/deployment/src/test/resources/application-default-datasource.properties index 582d07b7916b0..eea03fbbfe491 100644 --- a/extensions/reactive-mssql-client/deployment/src/test/resources/application-default-datasource.properties +++ b/extensions/reactive-mssql-client/deployment/src/test/resources/application-default-datasource.properties @@ -1,2 +1,4 @@ quarkus.datasource.db-kind=mssql +quarkus.datasource.username=sa +quarkus.datasource.password=yourStrong(!)Password quarkus.datasource.reactive.url=${reactive-mssql.url} diff --git a/extensions/reactive-mysql-client/deployment/src/test/java/io/quarkus/reactive/mysql/client/MySQLPoolProducerTest.java b/extensions/reactive-mysql-client/deployment/src/test/java/io/quarkus/reactive/mysql/client/MySQLPoolProducerTest.java index 6e20a49ce676d..79384608aa202 100644 --- a/extensions/reactive-mysql-client/deployment/src/test/java/io/quarkus/reactive/mysql/client/MySQLPoolProducerTest.java +++ b/extensions/reactive-mysql-client/deployment/src/test/java/io/quarkus/reactive/mysql/client/MySQLPoolProducerTest.java @@ -1,6 +1,5 @@ package io.quarkus.reactive.mysql.client; -import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; import jakarta.enterprise.context.ApplicationScoped; @@ -40,10 +39,8 @@ static class BeanUsingBareMySQLClient { @Inject MySQLPool mysqlClient; - public CompletionStage verify() { - CompletableFuture cf = new CompletableFuture<>(); - mysqlClient.query("SELECT 1").execute(ar -> cf.complete(null)); - return cf; + public CompletionStage verify() { + return mysqlClient.query("SELECT 1").execute().toCompletionStage(); } } @@ -56,7 +53,6 @@ static class BeanUsingMutinyMySQLClient { public CompletionStage verify() { return mysqlClient.query("SELECT 1").execute() .onItem().ignore().andContinueWithNull() - .onFailure().recoverWithItem((Void) null) .subscribeAsCompletionStage(); } } diff --git a/extensions/reactive-mysql-client/deployment/src/test/resources/application-default-datasource.properties b/extensions/reactive-mysql-client/deployment/src/test/resources/application-default-datasource.properties index e69de29bb2d1d..2040904f7af08 100644 --- a/extensions/reactive-mysql-client/deployment/src/test/resources/application-default-datasource.properties +++ b/extensions/reactive-mysql-client/deployment/src/test/resources/application-default-datasource.properties @@ -0,0 +1,4 @@ +quarkus.datasource.db-kind=mysql +quarkus.datasource.username=hibernate_orm_test +quarkus.datasource.password=hibernate_orm_test +quarkus.datasource.reactive.url=${reactive-mysql.url} \ No newline at end of file diff --git a/extensions/reactive-oracle-client/deployment/src/test/java/io/quarkus/reactive/oracle/client/OraclePoolProducerTest.java b/extensions/reactive-oracle-client/deployment/src/test/java/io/quarkus/reactive/oracle/client/OraclePoolProducerTest.java index 217882d82593b..770181b61f29b 100644 --- a/extensions/reactive-oracle-client/deployment/src/test/java/io/quarkus/reactive/oracle/client/OraclePoolProducerTest.java +++ b/extensions/reactive-oracle-client/deployment/src/test/java/io/quarkus/reactive/oracle/client/OraclePoolProducerTest.java @@ -1,6 +1,5 @@ package io.quarkus.reactive.oracle.client; -import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; import jakarta.enterprise.context.ApplicationScoped; @@ -41,10 +40,8 @@ static class BeanUsingBareOracleClient { @Inject OraclePool oracleClient; - public CompletionStage verify() { - CompletableFuture cf = new CompletableFuture<>(); - oracleClient.query("SELECT 1 FROM DUAL").execute(ar -> cf.complete(null)); - return cf; + public CompletionStage verify() { + return oracleClient.query("SELECT 1 FROM DUAL").execute().toCompletionStage(); } } @@ -57,7 +54,6 @@ static class BeanUsingMutinyOracleClient { public CompletionStage verify() { return oracleClient.query("SELECT 1 FROM DUAL").execute() .onItem().ignore().andContinueWithNull() - .onFailure().recoverWithItem((Void) null) .subscribeAsCompletionStage(); } } diff --git a/extensions/reactive-oracle-client/deployment/src/test/resources/application-default-datasource.properties b/extensions/reactive-oracle-client/deployment/src/test/resources/application-default-datasource.properties index c7d1e76b6b025..3fa61ded2b610 100644 --- a/extensions/reactive-oracle-client/deployment/src/test/resources/application-default-datasource.properties +++ b/extensions/reactive-oracle-client/deployment/src/test/resources/application-default-datasource.properties @@ -1,2 +1,4 @@ quarkus.datasource.db-kind=oracle +quarkus.datasource.username=SYSTEM +quarkus.datasource.password=hibernate_orm_test quarkus.datasource.reactive.url=${reactive-oracledb.url} diff --git a/extensions/reactive-pg-client/deployment/src/test/java/io/quarkus/reactive/pg/client/PgPoolProducerTest.java b/extensions/reactive-pg-client/deployment/src/test/java/io/quarkus/reactive/pg/client/PgPoolProducerTest.java index ba903f7bc6d91..a9f0d1cb84f90 100644 --- a/extensions/reactive-pg-client/deployment/src/test/java/io/quarkus/reactive/pg/client/PgPoolProducerTest.java +++ b/extensions/reactive-pg-client/deployment/src/test/java/io/quarkus/reactive/pg/client/PgPoolProducerTest.java @@ -1,6 +1,5 @@ package io.quarkus.reactive.pg.client; -import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; import jakarta.enterprise.context.ApplicationScoped; @@ -41,10 +40,8 @@ static class BeanUsingBarePgClient { @Inject PgPool pgClient; - public CompletionStage verify() { - CompletableFuture cf = new CompletableFuture<>(); - pgClient.query("SELECT 1").execute(ar -> cf.complete(null)); - return cf; + public CompletionStage verify() { + return pgClient.query("SELECT 1").execute().toCompletionStage(); } } @@ -57,7 +54,6 @@ static class BeanUsingMutinyPgClient { public CompletionStage verify() { return pgClient.query("SELECT 1").execute() .onItem().ignore().andContinueWithNull() - .onFailure().recoverWithItem(() -> null) .subscribeAsCompletionStage(); } } diff --git a/extensions/reactive-pg-client/deployment/src/test/resources/application-default-datasource.properties b/extensions/reactive-pg-client/deployment/src/test/resources/application-default-datasource.properties index cb550660510ba..d852d3611c719 100644 --- a/extensions/reactive-pg-client/deployment/src/test/resources/application-default-datasource.properties +++ b/extensions/reactive-pg-client/deployment/src/test/resources/application-default-datasource.properties @@ -1,2 +1,4 @@ quarkus.datasource.db-kind=postgresql -quarkus.datasource.username=username-default +quarkus.datasource.username=hibernate_orm_test +quarkus.datasource.password=hibernate_orm_test +quarkus.datasource.reactive.url=${reactive-postgres.url}