testApplication

2025-03-27 11:57:58 +01:00
parent 027747a20b
commit 933907b608
7 changed files with 95 additions and 115 deletions
--- a/src/test/kotlin/eventDemo/Helpers.kt
+++ b/src/test/kotlin/eventDemo/Helpers.kt
@@ -5,6 +5,9 @@ import eventDemo.business.entity.Deck
 import eventDemo.configuration.injection.appKoinModule
 import eventDemo.configuration.ktor.configuration
 import io.ktor.server.config.ApplicationConfig
+import io.ktor.server.testing.ApplicationTestBuilder
+import io.ktor.server.testing.testApplication
+import io.ktor.utils.io.KtorDsl
 import org.koin.core.Koin
 import org.koin.core.module.KoinApplicationDslMarker
 import org.koin.dsl.koinApplication
@@ -16,8 +19,21 @@ fun Deck.allCards(): Set<Card> =
  stack + discard + playersHands.values.flatten()

@KoinApplicationDslMarker
-suspend fun testApplicationWithConfig(block: suspend Koin.() -> Unit) {
+suspend fun testKoinApplicationWithConfig(block: suspend Koin.() -> Unit) {
  koinApplication { modules(appKoinModule(ApplicationConfig("application.conf").configuration())) }.koin.apply {
    block()
  }
 }
+
+@KtorDsl
+suspend fun testApplicationWithConfig(block: suspend ApplicationTestBuilder.(koin: Koin) -> Unit) {
+  testApplication {
+    val conf = ApplicationConfig("application.conf")
+    environment {
+      config = conf
+    }
+
+    val koin = koinApplication { modules(appKoinModule(conf.configuration())) }.koin
+    block(koin)
+  }
+}
--- a/src/test/kotlin/eventDemo/adapter/infrastructureLayer/PostgresqlTest.kt
+++ b/src/test/kotlin/eventDemo/adapter/infrastructureLayer/PostgresqlTest.kt
@@ -1,12 +1,9 @@
 package eventDemo.adapter.infrastructureLayer

-import eventDemo.configuration.configure
+import eventDemo.testKoinApplicationWithConfig
 import io.kotest.core.NamedTag
 import io.kotest.core.spec.style.FunSpec
 import io.kotest.matchers.equals.shouldBeEqual
-import io.ktor.server.testing.testApplication
-import org.koin.core.context.stopKoin
-import org.koin.ktor.ext.inject
 import javax.sql.DataSource

 class PostgresqlTest :
@@ -14,11 +11,7 @@ class PostgresqlTest :
    tags(NamedTag("postgresql"))

    test("test connection with postgresql") {
-      testApplication {
-        application {
-          stopKoin()
-          configure()
-
+      testKoinApplicationWithConfig {
        val datasource by inject<DataSource>()
        datasource.connection.use { connection ->
          connection
@@ -33,5 +26,4 @@ class PostgresqlTest :
        }
      }
    }
-    }
  })
--- a/src/test/kotlin/eventDemo/adapter/interfaceLayer/query/GameListRouteTest.kt
+++ b/src/test/kotlin/eventDemo/adapter/interfaceLayer/query/GameListRouteTest.kt
@@ -7,7 +7,7 @@ import eventDemo.business.event.event.GameStartedEvent
 import eventDemo.business.event.event.NewPlayerEvent
 import eventDemo.business.event.event.PlayerReadyEvent
 import eventDemo.business.event.projection.gameList.GameList
-import eventDemo.configuration.configure
+import eventDemo.testApplicationWithConfig
 import io.kotest.assertions.nondeterministic.eventually
 import io.kotest.core.spec.style.FunSpec
 import io.kotest.matchers.collections.shouldContain
@@ -19,10 +19,7 @@ import io.ktor.client.request.get
 import io.ktor.client.statement.bodyAsText
 import io.ktor.http.ContentType
 import io.ktor.http.HttpStatusCode
-import io.ktor.server.testing.testApplication
 import kotlinx.coroutines.runBlocking
-import org.koin.core.context.stopKoin
-import org.koin.ktor.ext.inject
 import kotlin.test.assertEquals
 import kotlin.test.assertTrue
 import kotlin.time.Duration.Companion.seconds
@@ -30,12 +27,9 @@ import kotlin.time.Duration.Companion.seconds
 class GameListRouteTest :
  FunSpec({
    test("/games with no game started") {
-      testApplication {
+
+      testApplicationWithConfig {
        val player1 = Player(name = "Nikola")
-        application {
-          stopKoin()
-          configure()
-        }

        httpClient()
          .get("/games") {
@@ -50,19 +44,14 @@ class GameListRouteTest :
    }

    test("/games return a game with status OPENING") {
-      testApplication {
+      testApplicationWithConfig { koin ->
        val gameId = GameId()
        val player1 = Player(name = "Nikola")

-        application {
-          stopKoin()
-          configure()
-
-          val eventHandler by inject<GameEventHandler>()
+        val eventHandler = koin.get<GameEventHandler>()
        runBlocking {
          eventHandler.handle(gameId) { NewPlayerEvent(gameId, player1, it) }
        }
-        }

        // Wait until the projection is created
        eventually(3.seconds) {
@@ -84,16 +73,11 @@ class GameListRouteTest :
    }

    test("/games return a game with status IS_STARTED") {
-      testApplication {
+      testApplicationWithConfig { koin ->
        val gameId = GameId()
        val player1 = Player(name = "Nikola")
        val player2 = Player(name = "Einstein")
-
-        application {
-          stopKoin()
-          configure()
-
-          val eventHandler by inject<GameEventHandler>()
+        val eventHandler = koin.get<GameEventHandler>()
        runBlocking {
          eventHandler.handle(gameId) { NewPlayerEvent(gameId, player1, it) }
          eventHandler.handle(gameId) { NewPlayerEvent(gameId, player2, it) }
@@ -108,7 +92,6 @@ class GameListRouteTest :
            )
          }
        }
-        }

        httpClient()
          .get("/games") {
--- a/src/test/kotlin/eventDemo/adapter/interfaceLayer/query/GameSimulationTest.kt
+++ b/src/test/kotlin/eventDemo/adapter/interfaceLayer/query/GameSimulationTest.kt
@@ -23,7 +23,7 @@ import eventDemo.business.notification.PlayerWasReadyNotification
 import eventDemo.business.notification.TheGameWasStartedNotification
 import eventDemo.business.notification.WelcomeToTheGameNotification
 import eventDemo.libs.event.projection.ProjectionSnapshotRepositoryInMemory
-import eventDemo.testApplicationWithConfig
+import eventDemo.testKoinApplicationWithConfig
 import io.kotest.core.spec.style.FunSpec
 import io.kotest.matchers.collections.shouldHaveSize
 import io.kotest.matchers.equals.shouldBeEqual
@@ -169,7 +169,7 @@ class GameSimulationTest :
            }
          }

-        testApplicationWithConfig {
+        testKoinApplicationWithConfig {
          val commandHandler by inject<GameCommandHandler>()
          val eventStore by inject<GameEventStore>()
          val playerNotificationListener by inject<PlayerNotificationListener>()
--- a/src/test/kotlin/eventDemo/adapter/interfaceLayer/query/GameStateRouteTest.kt
+++ b/src/test/kotlin/eventDemo/adapter/interfaceLayer/query/GameStateRouteTest.kt
@@ -10,7 +10,7 @@ import eventDemo.business.event.event.NewPlayerEvent
 import eventDemo.business.event.event.PlayerReadyEvent
 import eventDemo.business.event.projection.gameState.GameState
 import eventDemo.business.event.projection.gameState.GameStateRepository
-import eventDemo.configuration.configure
+import eventDemo.testApplicationWithConfig
 import io.kotest.core.spec.style.FunSpec
 import io.kotest.matchers.collections.shouldHaveSize
 import io.kotest.matchers.equals.shouldBeEqual
@@ -20,11 +20,8 @@ import io.ktor.client.request.get
 import io.ktor.client.statement.bodyAsText
 import io.ktor.http.ContentType
 import io.ktor.http.HttpStatusCode
-import io.ktor.server.testing.testApplication
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.runBlocking
-import org.koin.core.context.stopKoin
-import org.koin.ktor.ext.inject
 import kotlin.test.assertEquals
 import kotlin.test.assertIs
 import kotlin.test.assertNotNull
@@ -32,13 +29,9 @@ import kotlin.test.assertNotNull
 class GameStateRouteTest :
  FunSpec({
    test("/games/{id}/state on empty game") {
-      testApplication {
+      testApplicationWithConfig {
        val id = GameId()
        val player1 = Player(name = "Nikola")
-        application {
-          stopKoin()
-          configure()
-        }

        httpClient()
          .get("/games/$id/state") {
@@ -55,18 +48,15 @@ class GameStateRouteTest :
    }

    test("/games/{id}/card/last") {
-      testApplication {
+      testApplicationWithConfig { koin ->
        val gameId = GameId()
        val player1 = Player(name = "Nikola")
        val player2 = Player(name = "Einstein")
        var lastPlayedCard: Card? = null

-        application {
-          stopKoin()
-          configure()
+        val eventHandler = koin.get<GameEventHandler>()
+        val stateRepo = koin.get<GameStateRepository>()

-          val eventHandler by inject<GameEventHandler>()
-          val stateRepo by inject<GameStateRepository>()
        runBlocking {
          eventHandler.handle(gameId) { NewPlayerEvent(gameId, player1, it) }
          eventHandler.handle(gameId) { NewPlayerEvent(gameId, player2, it) }
@@ -99,7 +89,6 @@ class GameStateRouteTest :
          }
          delay(100)
        }
-        }

        httpClient()
          .get("/games/$gameId/card/last") {
--- a/src/test/kotlin/eventDemo/business/command/GameCommandHandlerTest.kt
+++ b/src/test/kotlin/eventDemo/business/command/GameCommandHandlerTest.kt
@@ -9,7 +9,7 @@ import eventDemo.business.event.projection.projectionListener.ReactionListener
 import eventDemo.business.notification.CommandSuccessNotification
 import eventDemo.business.notification.Notification
 import eventDemo.business.notification.WelcomeToTheGameNotification
-import eventDemo.testApplicationWithConfig
+import eventDemo.testKoinApplicationWithConfig
 import io.kotest.core.spec.style.FunSpec
 import io.kotest.matchers.collections.shouldContain
 import io.kotest.matchers.equals.shouldBeEqual
@@ -27,7 +27,7 @@ class GameCommandHandlerTest :
  FunSpec({
    test("handle a command should execute the command") {
      withTimeout(1.seconds) {
-        testApplicationWithConfig {
+        testKoinApplicationWithConfig {
          val commandHandler by inject<GameCommandHandler>()
          val notificationListener by inject<PlayerNotificationListener>()
          val gameId = GameId()
--- a/src/test/kotlin/eventDemo/business/event/projection/GameStateRepositoryTest.kt
+++ b/src/test/kotlin/eventDemo/business/event/projection/GameStateRepositoryTest.kt
@@ -6,7 +6,7 @@ import eventDemo.business.event.GameEventHandler
 import eventDemo.business.event.event.NewPlayerEvent
 import eventDemo.business.event.projection.gameState.GameState
 import eventDemo.business.event.projection.gameState.GameStateRepository
-import eventDemo.testApplicationWithConfig
+import eventDemo.testKoinApplicationWithConfig
 import io.kotest.assertions.nondeterministic.eventually
 import io.kotest.assertions.nondeterministic.eventuallyConfig
 import io.kotest.core.spec.style.FunSpec
@@ -30,7 +30,7 @@ class GameStateRepositoryTest :

    test("GameStateRepository should build the projection when a new event occurs") {
      val aggregateId = GameId()
-      testApplicationWithConfig {
+      testKoinApplicationWithConfig {
        val repo = get<GameStateRepository>()
        val eventHandler = get<GameEventHandler>()
        eventHandler
@@ -52,7 +52,7 @@ class GameStateRepositoryTest :

    test("get should build the last version of the state") {
      val aggregateId = GameId()
-      testApplicationWithConfig {
+      testKoinApplicationWithConfig {
        val repo = get<GameStateRepository>()
        val eventHandler = get<GameEventHandler>()
        val projectionBus = get<GameProjectionBus>()
@@ -88,7 +88,7 @@ class GameStateRepositoryTest :
    test("getUntil should build the state until the event") {
      repeat(10) {
        val aggregateId = GameId()
-        testApplicationWithConfig {
+        testKoinApplicationWithConfig {
          val repo = get<GameStateRepository>()
          val eventHandler = get<GameEventHandler>()

@@ -117,7 +117,7 @@ class GameStateRepositoryTest :

    test("getUntil should be concurrently secure") {
      val aggregateId = GameId()
-      testApplicationWithConfig {
+      testKoinApplicationWithConfig {
        val repo = get<GameStateRepository>()
        val eventHandler = get<GameEventHandler>()