Update Mokksy, set test timeout, set workflow timeout

Author: kpavlov

.github/workflows/build.yml

@@ -16,6 +16,7 @@ jobs:
   validate-pr:
     runs-on: macos-latest-xlarge
     name: Validate PR
+    timeout-minutes: 20
     env:
       JAVA_OPTS: "-Xmx8g -Dfile.encoding=UTF-8 -Djava.awt.headless=true -Dkotlin.daemon.jvm.options=-Xmx6g"
     steps:

gradle/libs.versions.toml

@@ -18,7 +18,7 @@ logging = "7.0.13"
 slf4j = "2.0.17"
 kotest = "6.0.3"
 awaitility = "4.3.0"
-mokksy = "0.5.1"
+mokksy = "0.6.1"
 
 # Samples
 mcp-kotlin = "0.7.2"
@@ -46,6 +46,7 @@ ktor-bom = { group = "io.ktor", name = "ktor-bom", version.ref = "ktor" }
 ktor-client-core = { group = "io.ktor", name = "ktor-client-core", version.ref = "ktor" }
 ktor-client-logging = { group = "io.ktor", name = "ktor-client-logging"}
 ktor-client-apache5 = { group = "io.ktor", name = "ktor-client-apache5" }
+ktor-client-okhttp = { group = "io.ktor", name = "ktor-client-okhttp" }
 ktor-server-sse = { group = "io.ktor", name = "ktor-server-sse", version.ref = "ktor" }
 ktor-server-websockets = { group = "io.ktor", name = "ktor-server-websockets", version.ref = "ktor" }
 ktor-server-core = { group = "io.ktor", name = "ktor-server-core", version.ref = "ktor" }
@@ -57,7 +58,7 @@ kotest-assertions-json = { group = "io.kotest", name = "kotest-assertions-json",
 kotlinx-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "coroutines" }
 ktor-client-mock = { group = "io.ktor", name = "ktor-client-mock", version.ref = "ktor" }
 ktor-server-test-host = { group = "io.ktor", name = "ktor-server-test-host", version.ref = "ktor" }
-mokksy = { group = "me.kpavlov.mokksy", name = "mokksy", version.ref = "mokksy" }
+mokksy = { group = "dev.mokksy", name = "mokksy", version.ref = "mokksy" }
 slf4j-simple = { group = "org.slf4j", name = "slf4j-simple", version.ref = "slf4j" }
 
 # Samples

kotlin-sdk-client/src/jvmTest/kotlin/io/modelcontextprotocol/kotlin/sdk/client/StreamableHttpClientTest.kt

@@ -1,8 +1,12 @@
 package io.modelcontextprotocol.kotlin.sdk.client
 
+import dev.mokksy.mokksy.Mokksy
+import dev.mokksy.mokksy.StubConfiguration
 import io.kotest.matchers.collections.shouldContain
 import io.ktor.client.HttpClient
 import io.ktor.client.engine.apache5.Apache5
+import io.ktor.client.plugins.logging.LogLevel
+import io.ktor.client.plugins.logging.Logging
 import io.ktor.client.plugins.sse.SSE
 import io.ktor.http.HttpStatusCode
 import io.ktor.sse.ServerSentEvent
@@ -16,8 +20,6 @@ import kotlinx.coroutines.runBlocking
 import kotlinx.serialization.json.buildJsonObject
 import kotlinx.serialization.json.put
 import kotlinx.serialization.json.putJsonObject
-import me.kpavlov.mokksy.MokksyServer
-import me.kpavlov.mokksy.StubConfiguration
 import org.junit.jupiter.api.AfterAll
 import org.junit.jupiter.api.TestInstance
 import java.util.UUID
@@ -28,7 +30,7 @@ import kotlin.time.Duration.Companion.milliseconds
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 class StreamableHttpClientTest {
 
-    private val mokksy = MokksyServer(verbose = true)
+    private val mokksy = Mokksy(verbose = true)
 
     @AfterTest
     fun afterEach() {
@@ -90,7 +92,7 @@ class StreamableHttpClientTest {
         mokksy.get(name = "MCP GETs", requestType = Any::class) {
             path("/mcp")
             containsHeader("Mcp-Session-Id", sessionId)
-            containsHeader("Connection", "keep-alive")
+            containsHeader("Accept", "text/event-stream,text/event-stream") // todo: why 2 times?
             containsHeader("Cache-Control", "no-store")
         } respondsWithSseStream {
             headers += "Mcp-Session-Id" to sessionId
@@ -122,6 +124,9 @@ class StreamableHttpClientTest {
                 url = "http://localhost:${mokksy.port()}/mcp",
                 client = HttpClient(Apache5) {
                     install(SSE)
+                    install(Logging) {
+                        level = LogLevel.ALL
+                    }
                 },
             ),
         )
@@ -172,6 +177,8 @@ class StreamableHttpClientTest {
 
         val listToolsResult = client.listTools()
 
+        println("✅  $listToolsResult")
+
         listToolsResult.tools shouldContain Tool(
             name = "get_weather",
             title = "Weather Information Provider",

kotlin-sdk-client/src/jvmTest/resources/junit-platform.properties

@@ -3,3 +3,4 @@ junit.jupiter.execution.parallel.enabled=true
 junit.jupiter.execution.parallel.config.strategy=dynamic
 junit.jupiter.execution.parallel.mode.default=concurrent
 junit.jupiter.execution.parallel.mode.classes.default=concurrent
+junit.jupiter.execution.timeout.default=90s

kotlin-sdk-client/src/jvmTest/resources/simplelogger.properties

@@ -11,4 +11,4 @@ org.slf4j.simpleLogger.showShortLogName=false
 # Log level for specific packages or classes
 org.slf4j.simpleLogger.log.io.ktor.server=DEBUG
 org.slf4j.simpleLogger.log.io.modelcontextprotocol=TRACE
-org.slf4j.simpleLogger.log.me.kpavlov=DEBUG
+org.slf4j.simpleLogger.log.dev.mokksy=DEBUG