lag èn hikari instans, så man slipper unødvendig mange connections under test

Author: tanettrimas

core/src/test/kotlin/no/javazone/feedback/FeedbackEndpointsTest.kt

@@ -9,11 +9,13 @@ import io.ktor.serialization.kotlinx.json.*
 import io.ktor.server.testing.*
 import kotlinx.serialization.json.Json
 import no.javazone.feedback.database.TestDatabase
+import no.javazone.feedback.database.setupDatabase
 import no.javazone.feedback.request.channel.*
 import org.junit.jupiter.api.AfterAll
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.BeforeAll
+import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 
 class FeedbackEndpointsTest {
@@ -22,6 +24,7 @@ class FeedbackEndpointsTest {
         @JvmStatic
         fun setup() {
             TestDatabase.start()
+            setupDatabase(TestDatabase.config())
         }
 
         @AfterAll
@@ -31,6 +34,11 @@ class FeedbackEndpointsTest {
         }
     }
 
+    @BeforeEach
+    fun cleanDatabase() {
+        TestDatabase.cleanDatabase()
+    }
+
     @Test
     fun `test create feedback channel successfully`() = testApplication {
         application {

database/src/main/kotlin/no/javazone/feedback/database/SetupDatabase.kt

@@ -10,9 +10,13 @@ import org.jetbrains.exposed.sql.Database
 import kotlin.String
 import kotlin.use
 
+private var currentDataSource: HikariDataSource? = null
+
 fun setupDatabase(
     databaseConfig: FeedbackDatabaseConfig
 ) {
+    if (currentDataSource != null) return
+
     val connectionPoolConfig = HikariConfig().apply {
         jdbcUrl = "jdbc:postgresql://${databaseConfig.host}:${databaseConfig.port}/${databaseConfig.databaseName}"
         username = databaseConfig.username
@@ -21,6 +25,7 @@ fun setupDatabase(
         maximumPoolSize = 10
     }
     val dataSource = HikariDataSource(connectionPoolConfig)
+    currentDataSource = dataSource
     Database.connect(dataSource)
 
     dataSource.connection.use {

database/src/main/kotlin/no/javazone/feedback/database/TestDatabase.kt

@@ -1,5 +1,6 @@
 package no.javazone.feedback.database
 
+import org.jetbrains.exposed.sql.transactions.transaction
 import org.testcontainers.containers.PostgreSQLContainer
 import org.testcontainers.containers.wait.strategy.HostPortWaitStrategy
 
@@ -27,4 +28,10 @@ object TestDatabase {
             password = container.password
         )
     }
+
+    fun cleanDatabase() {
+        transaction {
+            exec("TRUNCATE feedback_rating, feedback, rating_type, feedback_channel RESTART IDENTITY CASCADE")
+        }
+    }
 }

database/src/test/kotlin/no/javazone/feedback/database/repository/FeedbackRepositoryDbTest.kt

@@ -11,6 +11,7 @@ import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Assertions.assertInstanceOf
 import org.junit.jupiter.api.Assertions.assertNotNull
 import org.junit.jupiter.api.BeforeAll
+import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.assertThrows
 
@@ -30,6 +31,11 @@ class FeedbackRepositoryDbTest {
         }
     }
 
+    @BeforeEach
+    fun cleanDatabase() {
+        TestDatabase.cleanDatabase()
+    }
+
     @Test
     fun `should throw ExternalIdAlreadyExistsError when inserting channel with duplicate external id`() {
         val channel = FeedbackChannel(