create a FrameChannelConverter

src/test/kotlin/eventDemo/app/query/GameStateTest.kt

@@ -20,6 +20,8 @@ import eventDemo.app.notification.PlayerWasReadyNotification
 import eventDemo.app.notification.TheGameWasStartedNotification
 import eventDemo.app.notification.WelcomeToTheGameNotification
 import eventDemo.configuration.appKoinModule
+import eventDemo.libs.fromFrameChannel
+import eventDemo.libs.toObjectChannel
 import eventDemo.shared.toFrame
 import eventDemo.shared.toNotification
 import io.kotest.core.spec.style.FunSpec
@@ -138,10 +140,10 @@ class GameStateTest :
                 playerNotificationListener.startListening(channelNotification2, player2)
 
                 GlobalScope.launch(Dispatchers.IO) {
-                    commandHandler.handle(player1, channelCommand1, channelNotification1)
+                    commandHandler.handle(player1, toObjectChannel(channelCommand1), fromFrameChannel(channelNotification1))
                 }
                 GlobalScope.launch(Dispatchers.IO) {
-                    commandHandler.handle(player2, channelCommand2, channelNotification2)
+                    commandHandler.handle(player2, toObjectChannel(channelCommand2), fromFrameChannel(channelNotification2))
                 }
 
                 joinAll(player1Job, player2Job)

src/test/kotlin/eventDemo/app/query/TestHttpClient.kt

@@ -1,26 +1,15 @@
 package eventDemo.app.query
-import eventDemo.app.entity.GameId
-import eventDemo.configuration.GameIdSerializer
-import eventDemo.configuration.UUIDSerializer
+import eventDemo.configuration.defaultJsonSerializer
 import io.ktor.client.HttpClient
 import io.ktor.client.plugins.contentnegotiation.ContentNegotiation
 import io.ktor.serialization.kotlinx.json.json
 import io.ktor.server.testing.ApplicationTestBuilder
-import kotlinx.serialization.json.Json
-import kotlinx.serialization.modules.SerializersModule
-import java.util.UUID
 
 fun ApplicationTestBuilder.httpClient(): HttpClient =
     createClient {
         install(ContentNegotiation) {
             json(
-                Json {
-                    serializersModule =
-                        SerializersModule {
-                            contextual(UUID::class) { UUIDSerializer }
-                            contextual(GameId::class) { GameIdSerializer }
-                        }
-                },
+                defaultJsonSerializer(),
             )
         }
     }

src/test/kotlin/eventDemo/libs/FrameChannelConverterTest.kt

@@ -0,0 +1,55 @@
+package eventDemo.libs
+
+import eventDemo.libs.command.Command
+import eventDemo.libs.command.CommandId
+import io.kotest.core.spec.style.FunSpec
+import io.kotest.matchers.equals.shouldBeEqual
+import io.ktor.websocket.Frame
+import io.ktor.websocket.readText
+import kotlinx.coroutines.channels.Channel
+import kotlinx.coroutines.launch
+import kotlinx.serialization.Serializable
+import java.util.UUID
+import kotlin.test.assertIs
+
+@Serializable
+data class CommandTest(
+    override val id: CommandId,
+) : Command
+
+class FrameChannelConverterTest :
+    FunSpec({
+
+        test("toObjectChannel") {
+            val uuid = "d737c631-76af-406e-bc29-f3e5b97226a5"
+            val id = CommandId(UUID.fromString(uuid))
+            val jsonCommand = """{"id":"$uuid"}"""
+
+            val channel = Channel<Frame>()
+
+            launch {
+                val commandChannel = toObjectChannel<CommandTest>(channel)
+                commandChannel.receive().id shouldBeEqual id
+                channel.close()
+            }
+
+            channel.send(Frame.Text(jsonCommand))
+        }
+
+        test("fromFrameChannel") {
+            val uuid = "d737c631-76af-406e-bc29-f3e5b97226a5"
+            val id = CommandId(UUID.fromString(uuid))
+            val command = CommandTest(id)
+            val jsonCommand = """{"id":"$uuid"}"""
+
+            val channel = Channel<Frame>()
+
+            launch {
+                val commandChannel = fromFrameChannel<CommandTest>(channel)
+                commandChannel.send(command)
+                commandChannel.close()
+            }
+
+            assertIs<Frame.Text>(channel.receive()).readText() shouldBeEqual jsonCommand
+        }
+    })

src/test/kotlin/eventDemo/libs/command/CommandStreamChannelTest.kt

@@ -1,12 +1,10 @@
 package eventDemo.libs.command
 
 import io.kotest.core.spec.style.FunSpec
-import io.ktor.websocket.Frame
 import io.mockk.mockk
 import io.mockk.verify
 import kotlinx.coroutines.channels.Channel
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.json.Json
 
 @Serializable
 class CommandTest(
@@ -19,12 +17,9 @@ class CommandStreamChannelTest :
         test("send and receive") {
             val command = CommandTest(CommandId())
 
-            val channel = Channel<Frame>()
+            val channel = Channel<CommandTest>()
             val stream =
-                CommandStreamChannel<CommandTest>(
-                    incoming = channel,
-                    deserializer = { Json.decodeFromString(it) },
-                )
+                CommandStreamChannel(channel)
 
             val spyCall: () -> Unit = mockk(relaxed = true)
 
@@ -32,7 +27,7 @@ class CommandStreamChannelTest :
                 println("In action ${it.id}")
                 spyCall()
             }
-            channel.send(Frame.Text(Json.encodeToString(command)))
+            channel.send(command)
             verify(exactly = 1) { spyCall() }
         }
     })