From b75328b74d361b7afd6197a5b240f5f76ce2c5e0 Mon Sep 17 00:00:00 2001
From: Paul-Christian Volkmer
Date: Tue, 8 Aug 2023 15:16:58 +0200
Subject: Move integration tests into own source-set
---
.../etl/processor/AbstractTestcontainerTest.kt | 51 --------
.../etl/processor/EtlProcessorApplicationTests.kt | 37 ------
.../services/RequestServiceIntegrationTest.kt | 131 ---------------------
3 files changed, 219 deletions(-)
delete mode 100644 src/test/kotlin/dev/dnpm/etl/processor/AbstractTestcontainerTest.kt
delete mode 100644 src/test/kotlin/dev/dnpm/etl/processor/EtlProcessorApplicationTests.kt
delete mode 100644 src/test/kotlin/dev/dnpm/etl/processor/services/RequestServiceIntegrationTest.kt
(limited to 'src/test')
diff --git a/src/test/kotlin/dev/dnpm/etl/processor/AbstractTestcontainerTest.kt b/src/test/kotlin/dev/dnpm/etl/processor/AbstractTestcontainerTest.kt
deleted file mode 100644
index 13b57d0..0000000
--- a/src/test/kotlin/dev/dnpm/etl/processor/AbstractTestcontainerTest.kt
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * This file is part of ETL-Processor
- *
- * Copyright (c) 2023 Comprehensive Cancer Center Mainfranken, Datenintegrationszentrum Philipps-Universität Marburg and Contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
-
-package dev.dnpm.etl.processor
-
-import org.springframework.test.context.DynamicPropertyRegistry
-import org.springframework.test.context.DynamicPropertySource
-import org.testcontainers.containers.PostgreSQLContainer
-import org.testcontainers.junit.jupiter.Container
-
-abstract class AbstractTestcontainerTest {
-
- companion object {
- @Container
- val dbContainer = CustomPostgreSQLContainer("postgres:10-alpine")
- .withDatabaseName("test")
- .withUsername("test")
- .withPassword("test") ?: throw RuntimeException("Failed to create testcontainer!")
-
- @DynamicPropertySource
- @JvmStatic
- fun registerDynamicProperties(registry: DynamicPropertyRegistry) {
- registry.add("spring.datasource.url", dbContainer::getJdbcUrl)
- registry.add("spring.datasource.username", dbContainer::getUsername)
- registry.add("spring.datasource.password", dbContainer::getPassword)
- }
- }
-
-}
-
-class CustomPostgreSQLContainer(dockerImageName: String) : PostgreSQLContainer(dockerImageName) {
- override fun stop() {
- // Keep Testcontainer alive until JVM destroys it
- }
-}
\ No newline at end of file
diff --git a/src/test/kotlin/dev/dnpm/etl/processor/EtlProcessorApplicationTests.kt b/src/test/kotlin/dev/dnpm/etl/processor/EtlProcessorApplicationTests.kt
deleted file mode 100644
index 07a201b..0000000
--- a/src/test/kotlin/dev/dnpm/etl/processor/EtlProcessorApplicationTests.kt
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * This file is part of ETL-Processor
- *
- * Copyright (c) 2023 Comprehensive Cancer Center Mainfranken, Datenintegrationszentrum Philipps-Universität Marburg and Contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
-
-package dev.dnpm.etl.processor
-
-import org.junit.jupiter.api.Test
-import org.junit.jupiter.api.extension.ExtendWith
-import org.springframework.boot.test.context.SpringBootTest
-import org.springframework.test.context.junit.jupiter.SpringExtension
-import org.testcontainers.junit.jupiter.Testcontainers
-
-@Testcontainers
-@ExtendWith(SpringExtension::class)
-@SpringBootTest
-class EtlProcessorApplicationTests : AbstractTestcontainerTest() {
-
- @Test
- fun contextLoads() {
- }
-
-}
diff --git a/src/test/kotlin/dev/dnpm/etl/processor/services/RequestServiceIntegrationTest.kt b/src/test/kotlin/dev/dnpm/etl/processor/services/RequestServiceIntegrationTest.kt
deleted file mode 100644
index d71e011..0000000
--- a/src/test/kotlin/dev/dnpm/etl/processor/services/RequestServiceIntegrationTest.kt
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * This file is part of ETL-Processor
- *
- * Copyright (c) 2023 Comprehensive Cancer Center Mainfranken, Datenintegrationszentrum Philipps-Universität Marburg and Contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
-
-package dev.dnpm.etl.processor.services
-
-import dev.dnpm.etl.processor.AbstractTestcontainerTest
-import dev.dnpm.etl.processor.monitoring.Request
-import dev.dnpm.etl.processor.monitoring.RequestRepository
-import dev.dnpm.etl.processor.monitoring.RequestStatus
-import dev.dnpm.etl.processor.monitoring.RequestType
-import org.assertj.core.api.Assertions.assertThat
-import org.junit.jupiter.api.BeforeEach
-import org.junit.jupiter.api.Test
-import org.junit.jupiter.api.extension.ExtendWith
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.boot.test.context.SpringBootTest
-import org.springframework.test.context.junit.jupiter.SpringExtension
-import org.springframework.transaction.annotation.Transactional
-import org.testcontainers.junit.jupiter.Testcontainers
-import java.time.Instant
-import java.util.*
-
-@Testcontainers
-@ExtendWith(SpringExtension::class)
-@SpringBootTest
-@Transactional
-class RequestServiceIntegrationTest : AbstractTestcontainerTest() {
-
- private lateinit var requestRepository: RequestRepository
-
- private lateinit var requestService: RequestService
-
- @BeforeEach
- fun setup(
- @Autowired requestRepository: RequestRepository
- ) {
- this.requestRepository = requestRepository
- this.requestService = RequestService(requestRepository)
- }
-
- @Test
- fun shouldResultInEmptyRequestList() {
- val actual = requestService.allRequestsByPatientPseudonym("TEST_12345678901")
-
- assertThat(actual).isEmpty()
- }
-
- private fun setupTestData() {
- // Prepare DB
- this.requestRepository.saveAll(
- listOf(
- Request(
- uuid = UUID.randomUUID().toString(),
- patientId = "TEST_12345678901",
- pid = "P1",
- fingerprint = "0123456789abcdef1",
- type = RequestType.MTB_FILE,
- status = RequestStatus.SUCCESS,
- processedAt = Instant.parse("2023-07-07T02:00:00Z")
- ),
- // Should be ignored - wrong patient ID -->
- Request(
- uuid = UUID.randomUUID().toString(),
- patientId = "TEST_12345678902",
- pid = "P2",
- fingerprint = "0123456789abcdef2",
- type = RequestType.MTB_FILE,
- status = RequestStatus.WARNING,
- processedAt = Instant.parse("2023-08-08T00:00:00Z")
- ),
- // <--
- Request(
- uuid = UUID.randomUUID().toString(),
- patientId = "TEST_12345678901",
- pid = "P2",
- fingerprint = "0123456789abcdee1",
- type = RequestType.DELETE,
- status = RequestStatus.SUCCESS,
- processedAt = Instant.parse("2023-08-08T02:00:00Z")
- )
- )
- )
- }
-
- @Test
- fun shouldResultInSortedRequestList() {
- setupTestData()
-
- val actual = requestService.allRequestsByPatientPseudonym("TEST_12345678901")
-
- assertThat(actual).hasSize(2)
- assertThat(actual[0].fingerprint).isEqualTo("0123456789abcdee1")
- assertThat(actual[1].fingerprint).isEqualTo("0123456789abcdef1")
- }
-
- @Test
- fun shouldReturnDeleteRequestAsLastRequest() {
- setupTestData()
-
- val actual = requestService.isLastRequestDeletion("TEST_12345678901")
-
- assertThat(actual).isTrue()
- }
-
- @Test
- fun shouldReturnLastMtbFileRequest() {
- setupTestData()
-
- val actual = requestService.lastMtbFileRequestForPatientPseudonym("TEST_12345678901")
-
- assertThat(actual).isNotNull
- assertThat(actual?.fingerprint).isEqualTo("0123456789abcdef1")
- }
-
-}
\ No newline at end of file
--
cgit v1.2.3