Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

change database properties, to fix tests on windows #2214

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

change database properties, to fix tests on windows #2214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions sql-db/sql-app/src/test/java/io/quarkus/ts/sqldb/sqlapp/DB2DatabaseIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ public class DB2DatabaseIT extends AbstractSqlDatabaseIT {
@Container(image = "${db2.image}", port = 50000, expectedLog = "Setup has completed")
static Db2Service db2 = new Db2Service();

@QuarkusApplication
static RestService app = new RestService().withProperties("db2_app.properties")
@QuarkusApplication(properties = "db2_app.properties")
static RestService app = new RestService()
.withProperty("quarkus.datasource.username", db2.getUser())
.withProperty("quarkus.datasource.password", db2.getPassword())
.withProperty("quarkus.datasource.jdbc.url", db2::getJdbcUrl);
Expand Down
4 changes: 2 additions & 2 deletions sql-db/sql-app/src/test/java/io/quarkus/ts/sqldb/sqlapp/MariaDBDatabaseIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ public class MariaDBDatabaseIT extends AbstractSqlDatabaseIT {
+ MARIADB_PORT)
static MariaDbService database = new MariaDbService();

@QuarkusApplication
static RestService app = new RestService().withProperties("mariadb_app.properties")
@QuarkusApplication(properties = "mariadb_app.properties")
static RestService app = new RestService()
.withProperty("quarkus.datasource.username", database.getUser())
.withProperty("quarkus.datasource.password", database.getPassword())
.withProperty("quarkus.datasource.jdbc.url", database::getJdbcUrl);
Expand Down
3 changes: 1 addition & 2 deletions sql-db/sql-app/src/test/java/io/quarkus/ts/sqldb/sqlapp/MssqlDatabaseIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,9 @@ public class MssqlDatabaseIT extends AbstractSqlDatabaseIT {
@Dependency(groupId = "io.quarkus", artifactId = "quarkus-security"),
@Dependency(groupId = "org.bouncycastle", artifactId = "bctls-fips"),
@Dependency(groupId = "org.bouncycastle", artifactId = "bc-fips")
})
}, properties = "mssql.properties")
static final RestService app = new RestService()
.withProperties(database::getTlsProperties)
.withProperties("mssql.properties")
.withProperty("quarkus.security.security-providers", "BCFIPSJSSE")
.withProperty("quarkus.datasource.username", database.getUser())
.withProperty("quarkus.datasource.password", database.getPassword())
Expand Down
4 changes: 2 additions & 2 deletions sql-db/sql-app/src/test/java/io/quarkus/ts/sqldb/sqlapp/MySqlDatabaseIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ public class MySqlDatabaseIT extends AbstractSqlDatabaseIT {
@Container(image = "${mysql.80.image}", port = MYSQL_PORT, expectedLog = "port: " + MYSQL_PORT)
static MySqlService database = new MySqlService();

@QuarkusApplication
static RestService app = new RestService().withProperties("mysql.properties")
@QuarkusApplication(properties = "mysql.properties")
static RestService app = new RestService()
.withProperty("quarkus.datasource.username", database.getUser())
.withProperty("quarkus.datasource.password", database.getPassword())
.withProperty("quarkus.datasource.jdbc.url", database::getJdbcUrl);
Expand Down
4 changes: 2 additions & 2 deletions sql-db/sql-app/src/test/java/io/quarkus/ts/sqldb/sqlapp/OracleDatabaseIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ public class OracleDatabaseIT extends AbstractSqlDatabaseIT {
@Container(image = "${oracle.image}", port = ORACLE_PORT, expectedLog = "DATABASE IS READY TO USE!")
static OracleService database = new OracleService();

@QuarkusApplication
static RestService app = new RestService().withProperties("oracle.properties")
@QuarkusApplication(properties = "oracle.properties")
static RestService app = new RestService()
.withProperty("quarkus.datasource.username", database.getUser())
.withProperty("quarkus.datasource.password", database.getPassword())
.withProperty("quarkus.datasource.jdbc.url", database::getJdbcUrl);
Expand Down
4 changes: 2 additions & 2 deletions sql-db/sql-app/src/test/java/io/quarkus/ts/sqldb/sqlapp/PostgresqlDatabaseIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ public class PostgresqlDatabaseIT extends AbstractSqlDatabaseIT {
@Container(image = "${postgresql.latest.image}", port = POSTGRESQL_PORT, expectedLog = "listening on IPv4 address")
static PostgresqlService database = new PostgresqlService();

@QuarkusApplication
static RestService app = new RestService().withProperties("postgresql.properties")
@QuarkusApplication(properties = "postgresql.properties")
static RestService app = new RestService()
.withProperty("quarkus.datasource.username", database.getUser())
.withProperty("quarkus.datasource.password", database.getPassword())
.withProperty("quarkus.datasource.jdbc.url", database::getJdbcUrl);
Expand Down
Loading