modelcontextprotocol · kpavlov · Jan 10, 2026 · Jan 10, 2026
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -69,7 +69,8 @@ jobs:
             :kotlin-sdk-client:compileKotlinJvm \
             :kotlin-sdk-server:compileKotlinJvm \
             :kotlin-sdk:compileKotlinJvm \
-            :kotlin-sdk-test:compileKotlinJvm \
+            :integration-test:compileKotlinJvm \
+            :conformance-test:testClasses \
             -Pkotlin.incremental=false \
             --no-daemon --stacktrace --rerun-tasks
 

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -12,7 +12,7 @@ dependencies {
     kover(project(":kotlin-sdk-core"))
     kover(project(":kotlin-sdk-client"))
     kover(project(":kotlin-sdk-server"))
-    kover(project(":kotlin-sdk-test"))
+    "kover"(project(":integration-test"))
 }
 
 subprojects {

diff --git a/conformance-test/build.gradle.kts b/conformance-test/build.gradle.kts
@@ -7,6 +7,7 @@ plugins {
 dependencies {
     testImplementation(project(":kotlin-sdk"))
     testImplementation(kotlin("test"))
+    testImplementation(project(":test-utils"))
     testImplementation(libs.kotlin.logging)
     testImplementation(libs.ktor.client.cio)
     testImplementation(libs.ktor.server.cio)

diff --git a/...ce-test/src/test/kotlin/io/modelcontextprotocol/kotlin/sdk/conformance/ConformanceTest.kt b/...ce-test/src/test/kotlin/io/modelcontextprotocol/kotlin/sdk/conformance/ConformanceTest.kt
@@ -17,6 +17,8 @@ import kotlin.properties.Delegates
 
 private val logger = KotlinLogging.logger {}
 
+private const val CONFORMANCE_VERSION = "0.1.8"
+
 enum class TransportType {
     SSE,
     WEBSOCKET,
@@ -215,7 +217,7 @@ class ConformanceTest {
                 val serverUrl = "http://127.0.0.1:$serverPort/mcp"
                 ProcessBuilder(
                     "npx",
-                    "@modelcontextprotocol/conformance",
+                    "@modelcontextprotocol/conformance@$CONFORMANCE_VERSION",
                     "server",
                     "--url",
                     serverUrl,
@@ -230,7 +232,7 @@ class ConformanceTest {
                 val serverUrl = "ws://127.0.0.1:$serverPort/ws"
                 ProcessBuilder(
                     "npx",
-                    "@modelcontextprotocol/conformance",
+                    "@modelcontextprotocol/conformance@$CONFORMANCE_VERSION",
                     "server",
                     "--url",
                     serverUrl,
@@ -274,7 +276,7 @@ class ConformanceTest {
 
         val processBuilder = ProcessBuilder(
             "npx",
-            "@modelcontextprotocol/conformance",
+            "@modelcontextprotocol/conformance@$CONFORMANCE_VERSION",
             "client",
             "--command",
             clientCommand.joinToString(" "),

diff --git a/kotlin-sdk-test/build.gradle.kts → integration-test/build.gradle.kts b/kotlin-sdk-test/build.gradle.kts → integration-test/build.gradle.kts
@@ -25,9 +25,7 @@ kotlin {
         }
         jvmTest {
             dependencies {
-                implementation(libs.awaitility)
-                implementation(libs.junit.jupiter.params)
-                runtimeOnly(libs.slf4j.simple)
+                implementation(project(":test-utils"))
             }
         }
     }

diff --git a/...tprotocol/kotlin/sdk/client/ClientTest.kt → ...tprotocol/kotlin/sdk/client/ClientTest.kt b/...tprotocol/kotlin/sdk/client/ClientTest.kt → ...tprotocol/kotlin/sdk/client/ClientTest.kt
diff --git a/.../kotlin/sdk/client/OldSchemaClientTest.kt → .../kotlin/sdk/client/OldSchemaClientTest.kt b/.../kotlin/sdk/client/OldSchemaClientTest.kt → .../kotlin/sdk/client/OldSchemaClientTest.kt
diff --git a/...n/sdk/client/OldSchemaSseTransportTest.kt → ...n/sdk/client/OldSchemaSseTransportTest.kt b/...n/sdk/client/OldSchemaSseTransportTest.kt → ...n/sdk/client/OldSchemaSseTransportTest.kt
diff --git a/...col/kotlin/sdk/client/SseTransportTest.kt → ...col/kotlin/sdk/client/SseTransportTest.kt b/...col/kotlin/sdk/client/SseTransportTest.kt → ...col/kotlin/sdk/client/SseTransportTest.kt
diff --git a/...tlin/sdk/client/WebSocketTransportTest.kt → ...tlin/sdk/client/WebSocketTransportTest.kt b/...tlin/sdk/client/WebSocketTransportTest.kt → ...tlin/sdk/client/WebSocketTransportTest.kt
diff --git a/.../sdk/integration/InMemoryTransportTest.kt → .../sdk/integration/InMemoryTransportTest.kt b/.../sdk/integration/InMemoryTransportTest.kt → .../sdk/integration/InMemoryTransportTest.kt
diff --git a/...gration/OldSchemaInMemoryTransportTest.kt → ...gration/OldSchemaInMemoryTransportTest.kt b/...gration/OldSchemaInMemoryTransportTest.kt → ...gration/OldSchemaInMemoryTransportTest.kt
diff --git a/...ol/kotlin/sdk/shared/BaseTransportTest.kt → ...ol/kotlin/sdk/shared/BaseTransportTest.kt b/...ol/kotlin/sdk/shared/BaseTransportTest.kt → ...ol/kotlin/sdk/shared/BaseTransportTest.kt
diff --git a/...ol/kotlin/sdk/shared/InMemoryTransport.kt → ...ol/kotlin/sdk/shared/InMemoryTransport.kt b/...ol/kotlin/sdk/shared/InMemoryTransport.kt → ...ol/kotlin/sdk/shared/InMemoryTransport.kt
diff --git a/.../sdk/shared/OldSchemaBaseTransportTest.kt → .../sdk/shared/OldSchemaBaseTransportTest.kt b/.../sdk/shared/OldSchemaBaseTransportTest.kt → .../sdk/shared/OldSchemaBaseTransportTest.kt
diff --git a/.../sdk/shared/OldSchemaInMemoryTransport.kt → .../sdk/shared/OldSchemaInMemoryTransport.kt b/.../sdk/shared/OldSchemaInMemoryTransport.kt → .../sdk/shared/OldSchemaInMemoryTransport.kt
diff --git a/...in/sdk/client/StdioClientTransportTest.kt → ...in/sdk/client/StdioClientTransportTest.kt b/...in/sdk/client/StdioClientTransportTest.kt → ...in/sdk/client/StdioClientTransportTest.kt
@@ -3,6 +3,8 @@ package io.modelcontextprotocol.kotlin.sdk.client
 import io.modelcontextprotocol.kotlin.sdk.shared.BaseTransportTest
 import io.modelcontextprotocol.kotlin.sdk.types.Implementation
 import io.modelcontextprotocol.kotlin.sdk.types.McpException
+import io.modelcontextprotocol.kotlin.test.utils.createSleepyProcessBuilder
+import io.modelcontextprotocol.kotlin.test.utils.createTeeProcessBuilder
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.test.runTest

diff --git a/...n/kotlin/AbstractPromptIntegrationTest.kt → ...n/kotlin/AbstractPromptIntegrationTest.kt b/...n/kotlin/AbstractPromptIntegrationTest.kt → ...n/kotlin/AbstractPromptIntegrationTest.kt
diff --git a/...kotlin/AbstractResourceIntegrationTest.kt → ...kotlin/AbstractResourceIntegrationTest.kt b/...kotlin/AbstractResourceIntegrationTest.kt → ...kotlin/AbstractResourceIntegrationTest.kt
diff --git a/...ion/kotlin/AbstractToolIntegrationTest.kt → ...ion/kotlin/AbstractToolIntegrationTest.kt b/...ion/kotlin/AbstractToolIntegrationTest.kt → ...ion/kotlin/AbstractToolIntegrationTest.kt
diff --git a/.../sdk/integration/kotlin/KotlinTestBase.kt → .../sdk/integration/kotlin/KotlinTestBase.kt b/.../sdk/integration/kotlin/KotlinTestBase.kt → .../sdk/integration/kotlin/KotlinTestBase.kt
@@ -10,13 +10,13 @@ import io.ktor.server.routing.routing
 import io.modelcontextprotocol.kotlin.sdk.client.Client
 import io.modelcontextprotocol.kotlin.sdk.client.SseClientTransport
 import io.modelcontextprotocol.kotlin.sdk.client.StdioClientTransport
-import io.modelcontextprotocol.kotlin.sdk.integration.utils.Retry
 import io.modelcontextprotocol.kotlin.sdk.server.Server
 import io.modelcontextprotocol.kotlin.sdk.server.ServerOptions
 import io.modelcontextprotocol.kotlin.sdk.server.StdioServerTransport
 import io.modelcontextprotocol.kotlin.sdk.server.mcp
 import io.modelcontextprotocol.kotlin.sdk.types.Implementation
 import io.modelcontextprotocol.kotlin.sdk.types.ServerCapabilities
+import io.modelcontextprotocol.kotlin.test.utils.Retry
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withTimeout
 import kotlinx.io.Sink

diff --git a/...OldSchemaAbstractPromptIntegrationTest.kt → ...OldSchemaAbstractPromptIntegrationTest.kt b/...OldSchemaAbstractPromptIntegrationTest.kt → ...OldSchemaAbstractPromptIntegrationTest.kt
diff --git a/...dSchemaAbstractResourceIntegrationTest.kt → ...dSchemaAbstractResourceIntegrationTest.kt b/...dSchemaAbstractResourceIntegrationTest.kt → ...dSchemaAbstractResourceIntegrationTest.kt
diff --git a/...n/OldSchemaAbstractToolIntegrationTest.kt → ...n/OldSchemaAbstractToolIntegrationTest.kt b/...n/OldSchemaAbstractToolIntegrationTest.kt → ...n/OldSchemaAbstractToolIntegrationTest.kt
diff --git a/...gration/kotlin/OldSchemaKotlinTestBase.kt → ...gration/kotlin/OldSchemaKotlinTestBase.kt b/...gration/kotlin/OldSchemaKotlinTestBase.kt → ...gration/kotlin/OldSchemaKotlinTestBase.kt
@@ -11,11 +11,11 @@ import io.modelcontextprotocol.kotlin.sdk.Implementation
 import io.modelcontextprotocol.kotlin.sdk.client.Client
 import io.modelcontextprotocol.kotlin.sdk.client.SseClientTransport
 import io.modelcontextprotocol.kotlin.sdk.client.StdioClientTransport
-import io.modelcontextprotocol.kotlin.sdk.integration.utils.Retry
 import io.modelcontextprotocol.kotlin.sdk.server.Server
 import io.modelcontextprotocol.kotlin.sdk.server.ServerOptions
 import io.modelcontextprotocol.kotlin.sdk.server.StdioServerTransport
 import io.modelcontextprotocol.kotlin.sdk.server.mcp
+import io.modelcontextprotocol.kotlin.test.utils.Retry
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withTimeout
 import kotlinx.io.Sink

diff --git a/.../sse/OldSchemaPromptIntegrationTestSse.kt → .../sse/OldSchemaPromptIntegrationTestSse.kt b/.../sse/OldSchemaPromptIntegrationTestSse.kt → .../sse/OldSchemaPromptIntegrationTestSse.kt
diff --git a/...n/sse/OldSchemaResourceIntegrationTestSse → ...n/sse/OldSchemaResourceIntegrationTestSse b/...n/sse/OldSchemaResourceIntegrationTestSse → ...n/sse/OldSchemaResourceIntegrationTestSse
diff --git a/...in/sse/OldSchemaToolIntegrationTestSse.kt → ...in/sse/OldSchemaToolIntegrationTestSse.kt b/...in/sse/OldSchemaToolIntegrationTestSse.kt → ...in/sse/OldSchemaToolIntegrationTestSse.kt
diff --git a/...on/kotlin/sse/PromptIntegrationTestSse.kt → ...on/kotlin/sse/PromptIntegrationTestSse.kt b/...on/kotlin/sse/PromptIntegrationTestSse.kt → ...on/kotlin/sse/PromptIntegrationTestSse.kt
diff --git a/.../kotlin/sse/ResourceIntegrationTestSse.kt → .../kotlin/sse/ResourceIntegrationTestSse.kt b/.../kotlin/sse/ResourceIntegrationTestSse.kt → .../kotlin/sse/ResourceIntegrationTestSse.kt
diff --git a/...tion/kotlin/sse/ToolIntegrationTestSse.kt → ...tion/kotlin/sse/ToolIntegrationTestSse.kt b/...tion/kotlin/sse/ToolIntegrationTestSse.kt → ...tion/kotlin/sse/ToolIntegrationTestSse.kt
diff --git a/...io/OldSchemaPromptIntegrationTestStdio.kt → ...io/OldSchemaPromptIntegrationTestStdio.kt b/...io/OldSchemaPromptIntegrationTestStdio.kt → ...io/OldSchemaPromptIntegrationTestStdio.kt
diff --git a/.../OldSchemaResourceIntegrationTestStdio.kt → .../OldSchemaResourceIntegrationTestStdio.kt b/.../OldSchemaResourceIntegrationTestStdio.kt → .../OldSchemaResourceIntegrationTestStdio.kt
diff --git a/...tdio/OldSchemaToolIntegrationTestStdio.kt → ...tdio/OldSchemaToolIntegrationTestStdio.kt b/...tdio/OldSchemaToolIntegrationTestStdio.kt → ...tdio/OldSchemaToolIntegrationTestStdio.kt
diff --git a/...otlin/stdio/PromptIntegrationTestStdio.kt → ...otlin/stdio/PromptIntegrationTestStdio.kt b/...otlin/stdio/PromptIntegrationTestStdio.kt → ...otlin/stdio/PromptIntegrationTestStdio.kt
diff --git a/...lin/stdio/ResourceIntegrationTestStdio.kt → ...lin/stdio/ResourceIntegrationTestStdio.kt b/...lin/stdio/ResourceIntegrationTestStdio.kt → ...lin/stdio/ResourceIntegrationTestStdio.kt
diff --git a/.../kotlin/stdio/ToolIntegrationTestStdio.kt → .../kotlin/stdio/ToolIntegrationTestStdio.kt b/.../kotlin/stdio/ToolIntegrationTestStdio.kt → .../kotlin/stdio/ToolIntegrationTestStdio.kt
diff --git a/...cket/OldSchemaWebSocketIntegrationTest.kt → ...cket/OldSchemaWebSocketIntegrationTest.kt b/...cket/OldSchemaWebSocketIntegrationTest.kt → ...cket/OldSchemaWebSocketIntegrationTest.kt
diff --git a/...lin/websocket/WebSocketIntegrationTest.kt → ...lin/websocket/WebSocketIntegrationTest.kt b/...lin/websocket/WebSocketIntegrationTest.kt → ...lin/websocket/WebSocketIntegrationTest.kt
diff --git a/...gration/sse/AbstractSseIntegrationTest.kt → ...gration/sse/AbstractSseIntegrationTest.kt b/...gration/sse/AbstractSseIntegrationTest.kt → ...gration/sse/AbstractSseIntegrationTest.kt
diff --git a/...se/OldSchemaAbstractSseIntegrationTest.kt → ...se/OldSchemaAbstractSseIntegrationTest.kt b/...se/OldSchemaAbstractSseIntegrationTest.kt → ...se/OldSchemaAbstractSseIntegrationTest.kt
diff --git a/...ration/sse/OldSchemaSseIntegrationTest.kt → ...ration/sse/OldSchemaSseIntegrationTest.kt b/...ration/sse/OldSchemaSseIntegrationTest.kt → ...ration/sse/OldSchemaSseIntegrationTest.kt
diff --git a/...sdk/integration/sse/SseIntegrationTest.kt → ...sdk/integration/sse/SseIntegrationTest.kt b/...sdk/integration/sse/SseIntegrationTest.kt → ...sdk/integration/sse/SseIntegrationTest.kt
diff --git a/...cript/AbstractKotlinClientTsServerTest.kt → ...cript/AbstractKotlinClientTsServerTest.kt b/...cript/AbstractKotlinClientTsServerTest.kt → ...cript/AbstractKotlinClientTsServerTest.kt
@@ -1,8 +1,8 @@
 package io.modelcontextprotocol.kotlin.sdk.integration.typescript
 
 import io.modelcontextprotocol.kotlin.sdk.client.Client
-import io.modelcontextprotocol.kotlin.sdk.integration.utils.DisabledOnCI
 import io.modelcontextprotocol.kotlin.sdk.types.TextContent
+import io.modelcontextprotocol.kotlin.test.utils.DisabledOnCI
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.runBlocking
 import org.junit.jupiter.api.Test

diff --git a/...cript/AbstractTsClientKotlinServerTest.kt → ...cript/AbstractTsClientKotlinServerTest.kt b/...cript/AbstractTsClientKotlinServerTest.kt → ...cript/AbstractTsClientKotlinServerTest.kt
@@ -1,6 +1,6 @@
 package io.modelcontextprotocol.kotlin.sdk.integration.typescript
 
-import io.modelcontextprotocol.kotlin.sdk.integration.utils.DisabledOnCI
+import io.modelcontextprotocol.kotlin.test.utils.DisabledOnCI
 import kotlinx.coroutines.test.runTest
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.Timeout

diff --git a/...SchemaAbstractKotlinClientTsServerTest.kt → ...SchemaAbstractKotlinClientTsServerTest.kt b/...SchemaAbstractKotlinClientTsServerTest.kt → ...SchemaAbstractKotlinClientTsServerTest.kt
diff --git a/.../sdk/integration/typescript/TsTestBase.kt → .../sdk/integration/typescript/TsTestBase.kt b/.../sdk/integration/typescript/TsTestBase.kt → .../sdk/integration/typescript/TsTestBase.kt
@@ -7,10 +7,10 @@ import io.modelcontextprotocol.kotlin.sdk.client.Client
 import io.modelcontextprotocol.kotlin.sdk.client.StdioClientTransport
 import io.modelcontextprotocol.kotlin.sdk.client.mcpStreamableHttp
 import io.modelcontextprotocol.kotlin.sdk.integration.typescript.sse.KotlinServerForTsClient
-import io.modelcontextprotocol.kotlin.sdk.integration.utils.Retry
 import io.modelcontextprotocol.kotlin.sdk.server.Server
 import io.modelcontextprotocol.kotlin.sdk.server.StdioServerTransport
 import io.modelcontextprotocol.kotlin.sdk.types.Implementation
+import io.modelcontextprotocol.kotlin.test.utils.Retry
 import kotlinx.coroutines.withTimeout
 import kotlinx.io.Sink
 import kotlinx.io.Source

diff --git a/...e/KotlinClientTsServerEdgeCasesTestSse.kt → ...e/KotlinClientTsServerEdgeCasesTestSse.kt b/...e/KotlinClientTsServerEdgeCasesTestSse.kt → ...e/KotlinClientTsServerEdgeCasesTestSse.kt
@@ -3,8 +3,8 @@ package io.modelcontextprotocol.kotlin.sdk.integration.typescript.sse
 import io.modelcontextprotocol.kotlin.sdk.client.Client
 import io.modelcontextprotocol.kotlin.sdk.integration.typescript.TransportKind
 import io.modelcontextprotocol.kotlin.sdk.integration.typescript.TsTestBase
-import io.modelcontextprotocol.kotlin.sdk.integration.utils.DisabledOnCI
 import io.modelcontextprotocol.kotlin.sdk.types.TextContent
+import io.modelcontextprotocol.kotlin.test.utils.DisabledOnCI
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
 import kotlinx.coroutines.awaitAll

diff --git a/...script/sse/KotlinClientTsServerTestSse.kt → ...script/sse/KotlinClientTsServerTestSse.kt b/...script/sse/KotlinClientTsServerTestSse.kt → ...script/sse/KotlinClientTsServerTestSse.kt
@@ -3,7 +3,7 @@ package io.modelcontextprotocol.kotlin.sdk.integration.typescript.sse
 import io.modelcontextprotocol.kotlin.sdk.client.Client
 import io.modelcontextprotocol.kotlin.sdk.integration.typescript.AbstractKotlinClientTsServerTest
 import io.modelcontextprotocol.kotlin.sdk.integration.typescript.TransportKind
-import io.modelcontextprotocol.kotlin.sdk.integration.utils.DisabledOnCI
+import io.modelcontextprotocol.kotlin.test.utils.DisabledOnCI
 import kotlinx.coroutines.withTimeout
 import org.junit.jupiter.api.AfterEach
 import org.junit.jupiter.api.BeforeEach

diff --git a/...escript/sse/KotlinServerForTsClientSse.kt → ...escript/sse/KotlinServerForTsClientSse.kt b/...escript/sse/KotlinServerForTsClientSse.kt → ...escript/sse/KotlinServerForTsClientSse.kt
diff --git a/...maKotlinClientTsServerEdgeCasesTestSse.kt → ...maKotlinClientTsServerEdgeCasesTestSse.kt b/...maKotlinClientTsServerEdgeCasesTestSse.kt → ...maKotlinClientTsServerEdgeCasesTestSse.kt
@@ -4,7 +4,7 @@ import io.modelcontextprotocol.kotlin.sdk.TextContent
 import io.modelcontextprotocol.kotlin.sdk.client.Client
 import io.modelcontextprotocol.kotlin.sdk.integration.typescript.TransportKind
 import io.modelcontextprotocol.kotlin.sdk.integration.typescript.TsTestBase
-import io.modelcontextprotocol.kotlin.sdk.integration.utils.DisabledOnCI
+import io.modelcontextprotocol.kotlin.test.utils.DisabledOnCI
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
 import kotlinx.coroutines.awaitAll

diff --git a/...e/OldSchemaKotlinClientTsServerTestSse.kt → ...e/OldSchemaKotlinClientTsServerTestSse.kt b/...e/OldSchemaKotlinClientTsServerTestSse.kt → ...e/OldSchemaKotlinClientTsServerTestSse.kt
@@ -3,7 +3,7 @@ package io.modelcontextprotocol.kotlin.sdk.integration.typescript.sse
 import io.modelcontextprotocol.kotlin.sdk.client.Client
 import io.modelcontextprotocol.kotlin.sdk.integration.typescript.OldSchemaAbstractKotlinClientTsServerTest
 import io.modelcontextprotocol.kotlin.sdk.integration.typescript.TransportKind
-import io.modelcontextprotocol.kotlin.sdk.integration.utils.DisabledOnCI
+import io.modelcontextprotocol.kotlin.test.utils.DisabledOnCI
 import kotlinx.coroutines.withTimeout
 import org.junit.jupiter.api.AfterEach
 import org.junit.jupiter.api.BeforeEach

diff --git a/...se/OldSchemaKotlinServerForTsClientSse.kt → ...se/OldSchemaKotlinServerForTsClientSse.kt b/...se/OldSchemaKotlinServerForTsClientSse.kt → ...se/OldSchemaKotlinServerForTsClientSse.kt
diff --git a/...script/sse/TsClientKotlinServerTestSse.kt → ...script/sse/TsClientKotlinServerTestSse.kt b/...script/sse/TsClientKotlinServerTestSse.kt → ...script/sse/TsClientKotlinServerTestSse.kt
@@ -2,7 +2,7 @@ package io.modelcontextprotocol.kotlin.sdk.integration.typescript.sse
 
 import io.modelcontextprotocol.kotlin.sdk.integration.typescript.AbstractTsClientKotlinServerTest
 import io.modelcontextprotocol.kotlin.sdk.integration.typescript.TransportKind
-import io.modelcontextprotocol.kotlin.sdk.integration.utils.DisabledOnCI
+import io.modelcontextprotocol.kotlin.test.utils.DisabledOnCI
 import org.junit.jupiter.api.AfterEach
 import org.junit.jupiter.api.BeforeEach
 

diff --git a/...tion/typescript/sse/TsEdgeCasesTestSse.kt → ...tion/typescript/sse/TsEdgeCasesTestSse.kt b/...tion/typescript/sse/TsEdgeCasesTestSse.kt → ...tion/typescript/sse/TsEdgeCasesTestSse.kt
@@ -2,7 +2,7 @@ package io.modelcontextprotocol.kotlin.sdk.integration.typescript.sse
 
 import io.modelcontextprotocol.kotlin.sdk.integration.typescript.TransportKind
 import io.modelcontextprotocol.kotlin.sdk.integration.typescript.TsTestBase
-import io.modelcontextprotocol.kotlin.sdk.integration.utils.DisabledOnCI
+import io.modelcontextprotocol.kotlin.test.utils.DisabledOnCI
 import kotlinx.coroutines.async
 import kotlinx.coroutines.awaitAll
 import kotlinx.coroutines.coroutineScope

diff --git a/...dk/integration/typescript/sse/myClient.ts → ...dk/integration/typescript/sse/myClient.ts b/...dk/integration/typescript/sse/myClient.ts → ...dk/integration/typescript/sse/myClient.ts
diff --git a/...on/typescript/sse/simpleStreamableHttp.ts → ...on/typescript/sse/simpleStreamableHttp.ts b/...on/typescript/sse/simpleStreamableHttp.ts → ...on/typescript/sse/simpleStreamableHttp.ts
diff --git a/...KotlinClientTsServerEdgeCasesTestStdio.kt → ...KotlinClientTsServerEdgeCasesTestStdio.kt b/...KotlinClientTsServerEdgeCasesTestStdio.kt → ...KotlinClientTsServerEdgeCasesTestStdio.kt
@@ -3,8 +3,8 @@ package io.modelcontextprotocol.kotlin.sdk.integration.typescript.stdio
 import io.modelcontextprotocol.kotlin.sdk.client.Client
 import io.modelcontextprotocol.kotlin.sdk.integration.typescript.TransportKind
 import io.modelcontextprotocol.kotlin.sdk.integration.typescript.TsTestBase
-import io.modelcontextprotocol.kotlin.sdk.integration.utils.DisabledOnCI
 import io.modelcontextprotocol.kotlin.sdk.types.TextContent
+import io.modelcontextprotocol.kotlin.test.utils.DisabledOnCI
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
 import kotlinx.coroutines.awaitAll

diff --git a/...pt/stdio/KotlinClientTsServerTestStdio.kt → ...pt/stdio/KotlinClientTsServerTestStdio.kt b/...pt/stdio/KotlinClientTsServerTestStdio.kt → ...pt/stdio/KotlinClientTsServerTestStdio.kt
@@ -3,7 +3,7 @@ package io.modelcontextprotocol.kotlin.sdk.integration.typescript.stdio
 import io.modelcontextprotocol.kotlin.sdk.client.Client
 import io.modelcontextprotocol.kotlin.sdk.integration.typescript.AbstractKotlinClientTsServerTest
 import io.modelcontextprotocol.kotlin.sdk.integration.typescript.TransportKind
-import io.modelcontextprotocol.kotlin.sdk.integration.utils.DisabledOnCI
+import io.modelcontextprotocol.kotlin.test.utils.DisabledOnCI
 
 @DisabledOnCI
 class KotlinClientTsServerTestStdio : AbstractKotlinClientTsServerTest() {

diff --git a/...KotlinClientTsServerEdgeCasesTestStdio.kt → ...KotlinClientTsServerEdgeCasesTestStdio.kt b/...KotlinClientTsServerEdgeCasesTestStdio.kt → ...KotlinClientTsServerEdgeCasesTestStdio.kt
@@ -4,7 +4,7 @@ import io.modelcontextprotocol.kotlin.sdk.TextContent
 import io.modelcontextprotocol.kotlin.sdk.client.Client
 import io.modelcontextprotocol.kotlin.sdk.integration.typescript.TransportKind
 import io.modelcontextprotocol.kotlin.sdk.integration.typescript.TsTestBase
-import io.modelcontextprotocol.kotlin.sdk.integration.utils.DisabledOnCI
+import io.modelcontextprotocol.kotlin.test.utils.DisabledOnCI
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
 import kotlinx.coroutines.awaitAll

diff --git a/...OldSchemaKotlinClientTsServerTestStdio.kt → ...OldSchemaKotlinClientTsServerTestStdio.kt b/...OldSchemaKotlinClientTsServerTestStdio.kt → ...OldSchemaKotlinClientTsServerTestStdio.kt
@@ -3,7 +3,7 @@ package io.modelcontextprotocol.kotlin.sdk.integration.typescript.stdio
 import io.modelcontextprotocol.kotlin.sdk.client.Client
 import io.modelcontextprotocol.kotlin.sdk.integration.typescript.OldSchemaAbstractKotlinClientTsServerTest
 import io.modelcontextprotocol.kotlin.sdk.integration.typescript.TransportKind
-import io.modelcontextprotocol.kotlin.sdk.integration.utils.DisabledOnCI
+import io.modelcontextprotocol.kotlin.test.utils.DisabledOnCI
 
 @DisabledOnCI
 class OldSchemaKotlinClientTsServerTestStdio : OldSchemaAbstractKotlinClientTsServerTest() {

diff --git a/...pt/stdio/TsClientKotlinServerTestStdio.kt → ...pt/stdio/TsClientKotlinServerTestStdio.kt b/...pt/stdio/TsClientKotlinServerTestStdio.kt → ...pt/stdio/TsClientKotlinServerTestStdio.kt
@@ -2,7 +2,7 @@ package io.modelcontextprotocol.kotlin.sdk.integration.typescript.stdio
 
 import io.modelcontextprotocol.kotlin.sdk.integration.typescript.AbstractTsClientKotlinServerTest
 import io.modelcontextprotocol.kotlin.sdk.integration.typescript.TransportKind
-import io.modelcontextprotocol.kotlin.sdk.integration.utils.DisabledOnCI
+import io.modelcontextprotocol.kotlin.test.utils.DisabledOnCI
 
 @DisabledOnCI
 class TsClientKotlinServerTestStdio : AbstractTsClientKotlinServerTest() {

diff --git a/.../typescript/stdio/TsEdgeCasesTestStdio.kt → .../typescript/stdio/TsEdgeCasesTestStdio.kt b/.../typescript/stdio/TsEdgeCasesTestStdio.kt → .../typescript/stdio/TsEdgeCasesTestStdio.kt
@@ -2,7 +2,7 @@ package io.modelcontextprotocol.kotlin.sdk.integration.typescript.stdio
 
 import io.modelcontextprotocol.kotlin.sdk.integration.typescript.TransportKind
 import io.modelcontextprotocol.kotlin.sdk.integration.typescript.TsTestBase
-import io.modelcontextprotocol.kotlin.sdk.integration.utils.DisabledOnCI
+import io.modelcontextprotocol.kotlin.test.utils.DisabledOnCI
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.Timeout
 import org.junit.jupiter.api.condition.EnabledOnOs

diff --git a/.../integration/typescript/stdio/myClient.ts → .../integration/typescript/stdio/myClient.ts b/.../integration/typescript/stdio/myClient.ts → .../integration/typescript/stdio/myClient.ts
diff --git a/...tegration/typescript/stdio/simpleStdio.ts → ...tegration/typescript/stdio/simpleStdio.ts b/...tegration/typescript/stdio/simpleStdio.ts → ...tegration/typescript/stdio/simpleStdio.ts
@@ -1,7 +1,7 @@
 // @ts-nocheck
-import { z } from 'zod';
+import {z} from 'zod';
 import path from 'node:path';
-import { pathToFileURL } from 'node:url';
+import {pathToFileURL} from 'node:url';
 
 const SDK_DIR = process.env.TYPESCRIPT_SDK_DIR;
 if (!SDK_DIR) {

diff --git a/.../sdk/server/AbstractServerFeaturesTest.kt → .../sdk/server/AbstractServerFeaturesTest.kt b/.../sdk/server/AbstractServerFeaturesTest.kt → .../sdk/server/AbstractServerFeaturesTest.kt
diff --git a/...er/OldSchemaAbstractServerFeaturesTest.kt → ...er/OldSchemaAbstractServerFeaturesTest.kt b/...er/OldSchemaAbstractServerFeaturesTest.kt → ...er/OldSchemaAbstractServerFeaturesTest.kt
diff --git a/...server/OldSchemaServerInstructionsTest.kt → ...server/OldSchemaServerInstructionsTest.kt b/...server/OldSchemaServerInstructionsTest.kt → ...server/OldSchemaServerInstructionsTest.kt
diff --git a/.../sdk/server/OldSchemaServerPromptsTest.kt → .../sdk/server/OldSchemaServerPromptsTest.kt b/.../sdk/server/OldSchemaServerPromptsTest.kt → .../sdk/server/OldSchemaServerPromptsTest.kt
diff --git a/...dk/server/OldSchemaServerResourcesTest.kt → ...dk/server/OldSchemaServerResourcesTest.kt b/...dk/server/OldSchemaServerResourcesTest.kt → ...dk/server/OldSchemaServerResourcesTest.kt
diff --git a/...in/sdk/server/OldSchemaServerToolsTest.kt → ...in/sdk/server/OldSchemaServerToolsTest.kt b/...in/sdk/server/OldSchemaServerToolsTest.kt → ...in/sdk/server/OldSchemaServerToolsTest.kt
diff --git a/...tlin/sdk/server/ServerInstructionsTest.kt → ...tlin/sdk/server/ServerInstructionsTest.kt b/...tlin/sdk/server/ServerInstructionsTest.kt → ...tlin/sdk/server/ServerInstructionsTest.kt
diff --git a/...k/server/ServerPromptsNotificationTest.kt → ...k/server/ServerPromptsNotificationTest.kt b/...k/server/ServerPromptsNotificationTest.kt → ...k/server/ServerPromptsNotificationTest.kt
diff --git a/...ol/kotlin/sdk/server/ServerPromptsTest.kt → ...ol/kotlin/sdk/server/ServerPromptsTest.kt b/...ol/kotlin/sdk/server/ServerPromptsTest.kt → ...ol/kotlin/sdk/server/ServerPromptsTest.kt
diff --git a/...rverResourcesNotificationSubscribeTest.kt → ...rverResourcesNotificationSubscribeTest.kt b/...rverResourcesNotificationSubscribeTest.kt → ...rverResourcesNotificationSubscribeTest.kt
diff --git a/...server/ServerResourcesNotificationTest.kt → ...server/ServerResourcesNotificationTest.kt b/...server/ServerResourcesNotificationTest.kt → ...server/ServerResourcesNotificationTest.kt
diff --git a/.../kotlin/sdk/server/ServerResourcesTest.kt → .../kotlin/sdk/server/ServerResourcesTest.kt b/.../kotlin/sdk/server/ServerResourcesTest.kt → .../kotlin/sdk/server/ServerResourcesTest.kt
diff --git a/...sdk/server/ServerToolsNotificationTest.kt → ...sdk/server/ServerToolsNotificationTest.kt b/...sdk/server/ServerToolsNotificationTest.kt → ...sdk/server/ServerToolsNotificationTest.kt
diff --git a/...ocol/kotlin/sdk/server/ServerToolsTest.kt → ...ocol/kotlin/sdk/server/ServerToolsTest.kt b/...ocol/kotlin/sdk/server/ServerToolsTest.kt → ...ocol/kotlin/sdk/server/ServerToolsTest.kt
diff --git a/...jvmTest/resources/simplelogger.properties → ...jvmTest/resources/simplelogger.properties b/...jvmTest/resources/simplelogger.properties → ...jvmTest/resources/simplelogger.properties
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -18,10 +18,11 @@ dependencyResolutionManagement {
 }
 
 include(
+    ":test-utils",
     ":kotlin-sdk-core",
     ":kotlin-sdk-client",
     ":kotlin-sdk-server",
     ":kotlin-sdk",
-    ":kotlin-sdk-test",
+    ":integration-test",
     ":conformance-test",
 )
diff --git a/test-utils/build.gradle.kts b/test-utils/build.gradle.kts
@@ -0,0 +1,22 @@
+plugins {
+    kotlin("jvm")
+}
+
+kotlin {
+    explicitApi()
+
+    dependencies {
+        api(kotlin("test"))
+        api(libs.kotest.assertions.core)
+        api(libs.kotest.assertions.json)
+        api(libs.kotlinx.coroutines.test)
+        api(libs.mockk)
+        api(libs.awaitility)
+        api(libs.junit.jupiter.params)
+        runtimeOnly(libs.slf4j.simple)
+    }
+
+    tasks.withType<Test> {
+        useJUnitPlatform()
+    }
+}
diff --git a/...lin/sdk/integration/utils/DisabledOnCI.kt → ...rotocol/kotlin/test/utils/DisabledOnCI.kt b/...lin/sdk/integration/utils/DisabledOnCI.kt → ...rotocol/kotlin/test/utils/DisabledOnCI.kt
@@ -1,6 +1,6 @@
-package io.modelcontextprotocol.kotlin.sdk.integration.utils
+package io.modelcontextprotocol.kotlin.test.utils
 
 import org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable
 
 @DisabledIfEnvironmentVariable(named = "CI", matches = "true")
-annotation class DisabledOnCI
+public annotation class DisabledOnCI
diff --git a/...col/kotlin/sdk/integration/utils/Retry.kt → ...ontextprotocol/kotlin/test/utils/Retry.kt b/...col/kotlin/sdk/integration/utils/Retry.kt → ...ontextprotocol/kotlin/test/utils/Retry.kt
@@ -1,4 +1,4 @@
-package io.modelcontextprotocol.kotlin.sdk.integration.utils
+package io.modelcontextprotocol.kotlin.test.utils
 
 import org.junit.jupiter.api.extension.ExtendWith
 import org.junit.jupiter.api.extension.ExtensionContext
@@ -7,15 +7,16 @@ import org.junit.jupiter.api.extension.InvocationInterceptor.Invocation
 import org.junit.jupiter.api.extension.ReflectiveInvocationContext
 import org.opentest4j.TestAbortedException
 import java.lang.reflect.AnnotatedElement
+import java.lang.reflect.InvocationTargetException
 import java.lang.reflect.Method
 import java.util.Optional
 
 @Target(AnnotationTarget.CLASS)
 @Retention(AnnotationRetention.RUNTIME)
 @ExtendWith(RetryExtension::class)
-annotation class Retry(val times: Int = 3, val delayMs: Long = 1000)
+public annotation class Retry(val times: Int = 3, val delayMs: Long = 1000)
 
-class RetryExtension : InvocationInterceptor {
+public class RetryExtension : InvocationInterceptor {
     override fun interceptTestMethod(
         invocation: Invocation<Void>,
         invocationContext: ReflectiveInvocationContext<Method>,
@@ -65,7 +66,7 @@ class RetryExtension : InvocationInterceptor {
                 return
             } catch (t: Throwable) {
                 if (t is TestAbortedException) throw t
-                lastError = if (t is java.lang.reflect.InvocationTargetException) t.targetException ?: t else t
+                lastError = if (t is InvocationTargetException) t.targetException ?: t else t
                 if (attempt == maxAttempts) {
                     println(
                         "[Retry] Giving up after $attempt attempts for ${