build(model-server): use Testcontainers for tests with PostgreSQL

Author: Oleksandr Dzhychko

gradle/libs.versions.toml

@@ -40,6 +40,7 @@ dokka = "1.9.20"
 detekt = "1.23.6"
 xmlunit = "2.10.0"
 kotest = "5.9.1"
+testcontainers = "1.20.1"
 
 [libraries]
 
@@ -130,3 +131,6 @@ detekt-api = { group = "io.gitlab.arturbosch.detekt", name= "detekt-api", versio
 detekt-test = { group = "io.gitlab.arturbosch.detekt", name= "detekt-test", version.ref = "detekt" }
 
 jimfs = { group = "com.google.jimfs", name = "jimfs", version = "1.3.0" }
+
+testcontainers = { group = "org.testcontainers", name = "testcontainers", version.ref = "testcontainers" }
+testcontainers-postgresql = { group = "org.testcontainers", name = "postgresql", version.ref = "testcontainers" }

model-server-test/build.gradle.kts

@@ -1,22 +1,10 @@
 plugins {
     `modelix-kotlin-jvm-with-junit`
-    alias(libs.plugins.docker.compose)
 }
 
 dependencies {
     testImplementation(kotlin("test"))
     testImplementation(project(":model-server"))
-}
-
-tasks.test {
-    dependsOn(":model-server:compileTestKotlin")
-    doFirst {
-        val db = dockerCompose.servicesInfos.getValue("db")
-        systemProperty("jdbc.url", "jdbc:postgresql://${db.host}:${db.port}/")
-    }
-}
-
-dockerCompose {
-    isRequiredBy(tasks.test)
-    setProjectName("model-server-test-started-from-gradle")
+    testImplementation(libs.testcontainers)
+    testImplementation(libs.testcontainers.postgresql)
 }

model-server-test/docker-compose.yaml

@@ -13,33 +13,51 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import org.junit.jupiter.api.AfterAll
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.assertDoesNotThrow
 import org.modelix.model.lazy.RepositoryId
 import org.modelix.model.server.store.IgniteStoreClient
 import org.modelix.model.server.store.ObjectInRepository
+import org.testcontainers.containers.PostgreSQLContainer
+import org.testcontainers.utility.DockerImageName
 import java.sql.Connection
 import java.sql.DriverManager
+import java.util.Properties
 import kotlin.test.AfterTest
+import kotlin.test.BeforeTest
 import kotlin.test.assertEquals
 import kotlin.test.assertFalse
 import kotlin.test.assertTrue
 
 class IgnitePostgresRepositoryRemovalTest {
-    private val store = IgniteStoreClient()
+    private lateinit var postgres: PostgreSQLContainer<*>
+    private lateinit var store: IgniteStoreClient
+    private lateinit var dbConnection: Connection
 
     private val toDelete = RepositoryId("repository-removal-toDelete")
     private val existing = RepositoryId("repository-removal-existing")
 
+    @BeforeTest
+    fun beforeTest() {
+        postgres = PostgreSQLContainer(DockerImageName.parse("postgres:16.2-alpine"))
+            .withDatabaseName("modelix")
+            .withUsername("modelix")
+            .withPassword("modelix")
+            .withExposedPorts(5432)
+        postgres.start()
+
+        val jdbcProperties = Properties()
+        jdbcProperties.setProperty("jdbc.url", "jdbc:postgresql://${postgres.host}:${postgres.firstMappedPort}/")
+
+        store = IgniteStoreClient(jdbcProperties)
+
+        dbConnection = DriverManager.getConnection(System.getProperty("jdbc.url"), "modelix", "modelix")
+    }
+
     @AfterTest
-    fun cleanup() {
-        dbConnection.prepareStatement("DELETE FROM modelix.model WHERE repository IN ( ? , ? )").use {
-            it.setString(1, toDelete.id)
-            it.setString(2, existing.id)
-        }
-        store.putAll(store.getAll().keys.associateWith { null })
-        store.close()
+    fun afterTest() {
+        store.dispose()
+        postgres.stop()
     }
 
     @Test
@@ -118,14 +136,4 @@ class IgnitePostgresRepositoryRemovalTest {
             store.removeRepositoryObjects(RepositoryId("invalid"))
         }
     }
-
-    companion object {
-        val dbConnection: Connection = DriverManager.getConnection(System.getProperty("jdbc.url"), "modelix", "modelix")
-
-        @JvmStatic
-        @AfterAll
-        fun closeDbConnection() {
-            dbConnection.close()
-        }
-    }
 }

model-server-test/src/test/kotlin/IgnitePostgresRepositoryRemovalTest.kt

@@ -17,23 +17,43 @@ import org.modelix.model.lazy.RepositoryId
 import org.modelix.model.persistent.HashUtil
 import org.modelix.model.server.store.IgniteStoreClient
 import org.modelix.model.server.store.ObjectInRepository
+import org.testcontainers.containers.PostgreSQLContainer
+import org.testcontainers.utility.DockerImageName
+import org.testcontainers.utility.MountableFile
+import java.util.Properties
 import kotlin.test.AfterTest
 import kotlin.test.BeforeTest
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertTrue
 
 class IgnitePostgresTest {
-    lateinit var store: IgniteStoreClient
+    private lateinit var postgres: PostgreSQLContainer<*>
+    private lateinit var store: IgniteStoreClient
 
     @BeforeTest
     fun beforeTest() {
-        store = IgniteStoreClient()
+        postgres = PostgreSQLContainer(DockerImageName.parse("postgres:16.2-alpine"))
+            .withDatabaseName("modelix")
+            .withUsername("modelix")
+            .withPassword("modelix")
+            .withCopyFileToContainer(
+                MountableFile.forClasspathResource("/legacy-database.sql"),
+                "/docker-entrypoint-initdb.d/initdb.sql",
+            )
+            .withExposedPorts(5432)
+        postgres.start()
+
+        val jdbcProperties = Properties()
+        jdbcProperties.setProperty("jdbc.url", "jdbc:postgresql://${postgres.host}:${postgres.firstMappedPort}/")
+
+        store = IgniteStoreClient(jdbcProperties)
     }
 
     @AfterTest
     fun afterTest() {
         store.dispose()
+        postgres.stop()
     }
 
     @Test