Use separate Spring profile in integration tests.

HSLdevcom · Oct 18, 2023 · d4d7525 · d4d7525
1 parent afe58eb
commit d4d7525
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 9 deletions.
diff --git a/src/test/kotlin/fi/hsl/jore4/timetables/IntTest.kt b/src/test/kotlin/fi/hsl/jore4/timetables/IntTest.kt
@@ -0,0 +1,14 @@
+package fi.hsl.jore4.timetables
+
+import org.springframework.boot.test.context.SpringBootTest
+import org.springframework.test.context.ActiveProfiles
+
+/**
+ * A custom annotation which configures integration tests which use the test database settings.
+ */
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+@MustBeDocumented
+@SpringBootTest
+@ActiveProfiles("test")
+annotation class IntTest
diff --git a/src/test/kotlin/fi/hsl/jore4/timetables/service/CombineTimetablesServiceTest.kt b/src/test/kotlin/fi/hsl/jore4/timetables/service/CombineTimetablesServiceTest.kt
@@ -1,6 +1,7 @@
 package fi.hsl.jore4.timetables.service
 
 import fi.hsl.jore.jore4.jooq.vehicle_schedule.tables.pojos.VehicleScheduleFrame
+import fi.hsl.jore4.timetables.IntTest
 import fi.hsl.jore4.timetables.TimetablesDataset
 import fi.hsl.jore4.timetables.enumerated.TimetablesPriority
 import fi.hsl.jore4.timetables.extensions.deepClone
@@ -12,15 +13,14 @@ import org.junit.jupiter.api.DisplayName
 import org.junit.jupiter.api.Nested
 import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.boot.test.context.SpringBootTest
 import java.util.UUID
 import kotlin.test.assertContains
 import kotlin.test.assertEquals
 import kotlin.test.assertFailsWith
 import kotlin.test.assertNotNull
 import kotlin.test.assertNull
 
-@SpringBootTest
+@IntTest
 class CombineTimetablesServiceTest @Autowired constructor(
     val combineTimetablesService: CombineTimetablesService,
     var timetablesDataInserterRunner: TimetablesDataInserterRunner,

diff --git a/src/test/kotlin/fi/hsl/jore4/timetables/service/ReplaceTimetablesServiceTest.kt b/src/test/kotlin/fi/hsl/jore4/timetables/service/ReplaceTimetablesServiceTest.kt
@@ -1,28 +1,25 @@
 package fi.hsl.jore4.timetables.service
 
 import fi.hsl.jore.jore4.jooq.vehicle_schedule.tables.pojos.VehicleScheduleFrame
+import fi.hsl.jore4.timetables.IntTest
 import fi.hsl.jore4.timetables.TimetablesDataset
 import fi.hsl.jore4.timetables.enumerated.TimetablesPriority
 import fi.hsl.jore4.timetables.extensions.deepClone
 import fi.hsl.jore4.timetables.extensions.getNested
 import fi.hsl.jore4.timetables.repository.VehicleScheduleFrameRepository
-import mu.KotlinLogging
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.DisplayName
 import org.junit.jupiter.api.Nested
 import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.boot.test.context.SpringBootTest
 import java.time.LocalDate
 import java.util.UUID
 import kotlin.test.assertContains
 import kotlin.test.assertEquals
 import kotlin.test.assertFailsWith
 import kotlin.test.assertNotNull
 
-private val LOGGER = KotlinLogging.logger {}
-
-@SpringBootTest
+@IntTest
 class ReplaceTimetablesServiceTest @Autowired constructor(
     val replaceTimetablesService: ReplaceTimetablesService,
     var timetablesDataInserterRunner: TimetablesDataInserterRunner,

diff --git a/src/test/resources/application.properties → ...est/resources/application-test.properties b/src/test/resources/application.properties → ...est/resources/application-test.properties
@@ -4,5 +4,3 @@ [email protected]@
 jore4.db.password[email protected]@
 jore4.db.minConnections[email protected]@
 jore4.db.maxConnections[email protected]@
-
-jooq.sql.dialect[email protected]@