upstream/keycloak
1
0
Fork 0
mirror of https://github.com/keycloak/keycloak.git synced 2026-02-03 20:39:33 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Do not use deprecated test containers in tests (#45942)

Browse source 
Closes #45941

Signed-off-by: Martin Bartoš <mabartos@redhat.com>
This commit is contained in:
Martin Bartoš 2026-02-02 20:10:42 +01:00 committed by GitHub
parent 3adcca44a7
commit dde0725206
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
quarkus/tests/junit5/src/main/java/org/keycloak/it/junit5/extension/DatabaseContainer.java
View file

@ -26,10 +26,10 @@ import org.jboss.logmanager.Level;
import org.jboss.logmanager.LogManager;
import org.testcontainers.containers.GenericContainer;
import org.testcontainers.containers.JdbcDatabaseContainer;
import org.testcontainers.containers.MSSQLServerContainer;
import org.testcontainers.containers.MariaDBContainer;
import org.testcontainers.containers.MySQLContainer;
import org.testcontainers.containers.PostgreSQLContainer;
import org.testcontainers.mariadb.MariaDBContainer;
import org.testcontainers.mssqlserver.MSSQLServerContainer;
import org.testcontainers.mysql.MySQLContainer;
import org.testcontainers.postgresql.PostgreSQLContainer;
import org.testcontainers.tidb.TiDBContainer;
import org.testcontainers.utility.DockerImageName;
@ -60,19 +60,19 @@ public class DatabaseContainer {
}
private String getJdbcUrl() {
return ((JdbcDatabaseContainer)container).getJdbcUrl();
return ((JdbcDatabaseContainer<?>)container).getJdbcUrl();
}
String getUsername() {
if (container instanceof MSSQLServerContainer) {
return ((JdbcDatabaseContainer) container).getUsername();
return ((JdbcDatabaseContainer<?>) container).getUsername();
}
return "keycloak";
}
String getPassword() {
if (container instanceof MSSQLServerContainer) {
return ((JdbcDatabaseContainer) container).getPassword();
return ((JdbcDatabaseContainer<?>) container).getPassword();
}
return DEFAULT_PASSWORD;
}
@ -82,7 +82,7 @@ public class DatabaseContainer {
container = null;
}
private JdbcDatabaseContainer configureJdbcContainer(JdbcDatabaseContainer jdbcDatabaseContainer) {
private JdbcDatabaseContainer<?> configureJdbcContainer(JdbcDatabaseContainer<?> jdbcDatabaseContainer) {
if (jdbcDatabaseContainer instanceof MSSQLServerContainer) {
return jdbcDatabaseContainer;
}
@ -104,13 +104,13 @@ public class DatabaseContainer {
switch (alias) {
case "postgres":
DockerImageName POSTGRES = DockerImageName.parse(POSTGRES_IMAGE).asCompatibleSubstituteFor("postgres");
return configureJdbcContainer(new PostgreSQLContainer<>(POSTGRES));
return configureJdbcContainer(new PostgreSQLContainer(POSTGRES));
case "mariadb":
DockerImageName MARIADB = DockerImageName.parse(MARIADB_IMAGE).asCompatibleSubstituteFor("mariadb");
return configureJdbcContainer(new MariaDBContainer<>(MARIADB));
return configureJdbcContainer(new MariaDBContainer(MARIADB));
case "mysql":
DockerImageName MYSQL = DockerImageName.parse(MYSQL_IMAGE).asCompatibleSubstituteFor("mysql");
return configureJdbcContainer(new MySQLContainer<>(MYSQL));
return configureJdbcContainer(new MySQLContainer(MYSQL));
case "mssql":
DockerImageName MSSQL = DockerImageName.parse(MSSQL_IMAGE).asCompatibleSubstituteFor("sqlserver");
return configureJdbcContainer(new MSSQLServerContainer(MSSQL) {