Clean datasource for tests

2020-06-18 17:51:28 +02:00
parent a786cc848c
commit 0ed9905ff5
2 changed files with 9 additions and 10 deletions
@@ -5,14 +5,14 @@ import com.zaxxer.hikari.HikariDataSource
 import org.testcontainers.containers.MariaDBContainer
 import javax.sql.DataSource

-class KMariadbContainer : MariaDBContainer<KMariadbContainer>()
+class KMariadbContainer : MariaDBContainer<KMariadbContainer>() {
+    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)
 }