Refactor integration tests

- Remove unused `TestUtils` utility class.
- Replace `runTest` with `runBlocking` in test cases.
- Adjust imports and formatting for consistency.
- Add `Awaitility` dependency for dynamic server setup.
- Update `Duration` usage from milliseconds to seconds.
- Minor configuration and code formatting updates.

Author: kpavlov

buildSrc/build.gradle.kts

@@ -13,4 +13,4 @@ dependencies {
     implementation(libs.kotlinx.atomicfu.gradle)
     implementation(libs.dokka.gradle)
     implementation(libs.jreleaser.gradle)
-}
+}

buildSrc/settings.gradle.kts

@@ -4,4 +4,4 @@ dependencyResolutionManagement {
             from(files("../gradle/libs.versions.toml"))
         }
     }
-}
+}

buildSrc/src/main/kotlin/mcp.dokka.gradle.kts

@@ -20,4 +20,4 @@ dokka {
     dokkaPublications.html {
         outputDirectory = rootProject.layout.projectDirectory.dir("docs/${project.name}")
     }
-}
+}

buildSrc/src/main/kotlin/mcp.jreleaser.gradle.kts

@@ -34,9 +34,9 @@ jreleaser {
                         if (publication is MavenPublication) {
                             val pubName = publication.name
 
-                            if (!pubName.contains("jvm", ignoreCase = true)
-                                && !pubName.contains("metadata", ignoreCase = true)
-                                && !pubName.contains("kotlinMultiplatform", ignoreCase = true)
+                            if (!pubName.contains("jvm", ignoreCase = true) &&
+                                !pubName.contains("metadata", ignoreCase = true) &&
+                                !pubName.contains("kotlinMultiplatform", ignoreCase = true)
                             ) {
                                 artifactOverride {
                                     artifactId = when {

buildSrc/src/main/kotlin/mcp.multiplatform.gradle.kts

@@ -24,7 +24,7 @@ val generateLibVersion by tasks.registering {
 
             public const val LIB_VERSION: String = "${project.version}"
             
-            """.trimIndent()
+            """.trimIndent(),
         )
     }
 }
@@ -33,8 +33,10 @@ kotlin {
     jvm {
         compilerOptions.jvmTarget = JvmTarget.JVM_1_8
     }
-    macosX64(); macosArm64()
-    linuxX64(); linuxArm64()
+    macosX64()
+    macosArm64()
+    linuxX64()
+    linuxArm64()
     mingwX64()
     js { nodejs() }
     wasmJs { nodejs() }

buildSrc/src/main/kotlin/mcp.publishing.gradle.kts

@@ -68,4 +68,4 @@ signing {
         useInMemoryPgpKeys(signingKey.get(), signingPassphrase.get())
         sign(publishing.publications)
     }
-}
+}

gradle/libs.versions.toml

@@ -17,6 +17,7 @@ jreleaser = "1.19.0"
 binaryCompatibilityValidatorPlugin = "0.18.1"
 slf4j = "2.0.17"
 kotest = "5.9.1"
+awaitility = "4.3.0"
 
 # Samples
 mcp-kotlin = "0.7.0"
@@ -45,11 +46,12 @@ ktor-server-websockets = { group = "io.ktor", name = "ktor-server-websockets", v
 ktor-server-core = { group = "io.ktor", name = "ktor-server-core", version.ref = "ktor" }
 
 # Testing
+awaitility = { group = "org.awaitility", name = "awaitility-kotlin", version.ref = "awaitility" }
+kotest-assertions-json = { group = "io.kotest", name = "kotest-assertions-json", version.ref = "kotest" }
 kotlinx-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "coroutines" }
-ktor-server-test-host = { group = "io.ktor", name = "ktor-server-test-host", version.ref = "ktor" }
 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" }
 slf4j-simple = { group = "org.slf4j", name = "slf4j-simple", version.ref = "slf4j" }
-kotest-assertions-json = { group = "io.kotest", name = "kotest-assertions-json", version.ref = "kotest" }
 
 # Samples
 ktor-client-cio = { group = "io.ktor", name = "ktor-client-cio", version.ref = "ktor" }

kotlin-sdk-core/src/commonMain/kotlin/io/modelcontextprotocol/kotlin/sdk/shared/Protocol.kt

@@ -36,11 +36,10 @@ import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.JsonPrimitive
 import kotlinx.serialization.json.encodeToJsonElement
 import kotlinx.serialization.serializer
-import kotlin.collections.get
 import kotlin.reflect.KType
 import kotlin.reflect.typeOf
 import kotlin.time.Duration
-import kotlin.time.Duration.Companion.milliseconds
+import kotlin.time.Duration.Companion.seconds
 
 private val LOGGER = KotlinLogging.logger { }
 
@@ -85,7 +84,7 @@ public open class ProtocolOptions(
 /**
  * The default request timeout.
  */
-public val DEFAULT_REQUEST_TIMEOUT: Duration = 60000.milliseconds
+public val DEFAULT_REQUEST_TIMEOUT: Duration = 60.seconds
 
 /**
  * Options that can be given per request.

kotlin-sdk-core/src/commonMain/kotlin/io/modelcontextprotocol/kotlin/sdk/types.kt

@@ -302,6 +302,7 @@ public data class JSONRPCError(val code: ErrorCode, val message: String, val dat
 public sealed interface NotificationParams : WithMeta
 
 /* Cancellation */
+
 /**
  * This notification can be sent by either side to indicate that it is cancelling a previously issued request.
  *
@@ -334,6 +335,7 @@ public data class CancelledNotification(override val params: Params) :
 }
 
 /* Initialization */
+
 /**
  * Describes the name and version of an MCP implementation.
  */
@@ -527,6 +529,7 @@ public data class InitializedNotification(override val params: Params = Params()
 }
 
 /* Ping */
+
 /**
  * A ping, issued by either the server or the client, to check that the other party is still alive.
  * The receiver must promptly respond, or else it may be disconnected.
@@ -560,6 +563,7 @@ public sealed interface ProgressBase {
 }
 
 /* Progress notifications */
+
 /**
  * Represents a progress notification.
  *
@@ -619,6 +623,7 @@ public data class ProgressNotification(override val params: Params) :
 }
 
 /* Pagination */
+
 /**
  * Represents a request supporting pagination.
  */
@@ -646,6 +651,7 @@ public sealed interface PaginatedResult : RequestResult {
 }
 
 /* Resources */
+
 /**
  * The contents of a specific resource or sub-resource.
  */
@@ -888,6 +894,7 @@ public data class ResourceUpdatedNotification(override val params: Params) : Ser
 }
 
 /* Prompts */
+
 /**
  * Describes an argument that a prompt can accept.
  */
@@ -1158,6 +1165,7 @@ public data class PromptListChangedNotification(override val params: Params = Pa
 }
 
 /* Tools */
+
 /**
  * Additional properties describing a Tool to clients.
  *
@@ -1336,6 +1344,7 @@ public data class ToolListChangedNotification(override val params: Params = Para
 }
 
 /* Logging */
+
 /**
  * The severity of a log message.
  */
@@ -1395,6 +1404,7 @@ public data class LoggingMessageNotification(override val params: Params) : Serv
 }
 
 /* Sampling */
+
 /**
  * Hints to use for model selection.
  */
@@ -1639,6 +1649,7 @@ public data class CompleteResult(val completion: Completion, override val _meta:
 }
 
 /* Roots */
+
 /**
  * Represents a root directory or file that the server can operate on.
  */

kotlin-sdk-test/build.gradle.kts

@@ -24,6 +24,7 @@ kotlin {
         jvmTest {
             dependencies {
                 implementation(kotlin("test-junit5"))
+                implementation(libs.awaitility)
                 runtimeOnly(libs.slf4j.simple)
             }
         }