diff --git a/api/test/integration/services/UserServiceTest.kt b/api/test/integration/services/UserServiceTest.kt index 8ed0548..8a6cb1c 100644 --- a/api/test/integration/services/UserServiceTest.kt +++ b/api/test/integration/services/UserServiceTest.kt @@ -11,7 +11,6 @@ import org.kodein.di.generic.bind import org.kodein.di.generic.instance import org.kodein.di.generic.singleton import utils.KMariadbContainer -import utils.testContainerDataSource import javax.sql.DataSource @@ -23,7 +22,7 @@ class UserServiceTest { private val kodein = Kodein { import(mainModule, allowOverride = true) - bind(overrides = true) with singleton { testContainerDataSource(mariadb) } + bind(overrides = true) with singleton { mariadb.datasource() } } private val migration by kodein.instance() diff --git a/api/test/utils/TestContainers.kt b/api/test/utils/TestContainers.kt index 1254a68..db245fe 100644 --- a/api/test/utils/TestContainers.kt +++ b/api/test/utils/TestContainers.kt @@ -5,14 +5,14 @@ import com.zaxxer.hikari.HikariDataSource import org.testcontainers.containers.MariaDBContainer import javax.sql.DataSource -class KMariadbContainer : MariaDBContainer() +class KMariadbContainer : MariaDBContainer() { + fun datasource() : DataSource { + val hikariConfig = HikariConfig().apply { + jdbcUrl = this@KMariadbContainer.jdbcUrl + username = this@KMariadbContainer.username + password = this@KMariadbContainer.password + } -fun testContainerDataSource(container: KMariadbContainer): DataSource { - val hikariConfig = HikariConfig().apply { - jdbcUrl = container.jdbcUrl - username = container.username - password = container.password + return HikariDataSource(hikariConfig) } - - return HikariDataSource(hikariConfig) }