fixup! Introduce Kotlin integration tests

Author: skarpovdev

kotlin-sdk-test/src/jvmTest/kotlin/io/modelcontextprotocol/kotlin/sdk/integration/kotlin/ToolEdgeCasesTest.kt

@@ -296,7 +296,7 @@ class ToolEdgeCasesTest : KotlinTestBase() {
                 }
             """.trimIndent()
 
-            actualContent.shouldEqualJson(expectedContent)
+            actualContent shouldEqualJson expectedContent
         }
     }
 
@@ -348,7 +348,7 @@ class ToolEdgeCasesTest : KotlinTestBase() {
                 }
             """.trimIndent()
 
-            actualContent.shouldEqualJson(expectedContent)
+            actualContent shouldEqualJson expectedContent
         }
     }
 
@@ -370,7 +370,7 @@ class ToolEdgeCasesTest : KotlinTestBase() {
             }
         """.trimIndent()
 
-            actualContent.shouldEqualJson(expectedContent)
+            actualContent shouldEqualJson expectedContent
         }
     }
 
@@ -396,7 +396,7 @@ class ToolEdgeCasesTest : KotlinTestBase() {
             }
         """.trimIndent()
 
-            actualContent.shouldEqualJson(expectedContent)
+            actualContent shouldEqualJson expectedContent
         }
     }
 
@@ -421,7 +421,7 @@ class ToolEdgeCasesTest : KotlinTestBase() {
             }
         """.trimIndent()
 
-            actualContent.shouldEqualJson(expectedContent)
+            actualContent shouldEqualJson expectedContent
         }
     }
 

kotlin-sdk-test/src/jvmTest/kotlin/io/modelcontextprotocol/kotlin/sdk/integration/kotlin/ToolIntegrationTest.kt

@@ -325,7 +325,7 @@ class ToolIntegrationTest : KotlinTestBase() {
                 {"result":"Hello, world!"}
             """.trimIndent()
 
-            actualContent.shouldEqualJson(expectedContent)
+            actualContent shouldEqualJson expectedContent
         }
     }
 
@@ -361,7 +361,7 @@ class ToolIntegrationTest : KotlinTestBase() {
                 }
             """.trimIndent()
 
-            actualContent.shouldEqualJson(expectedContent)
+            actualContent shouldEqualJson expectedContent
         }
     }
 
@@ -378,7 +378,7 @@ class ToolIntegrationTest : KotlinTestBase() {
             }
         """.trimIndent()
 
-        actualContent.shouldEqualJson(expectedContent)
+        actualContent shouldEqualJson expectedContent
 
         val errorArgs = mapOf(
             "errorType" to "error",
@@ -394,7 +394,7 @@ class ToolIntegrationTest : KotlinTestBase() {
             }
         """.trimIndent()
 
-        actualError.shouldEqualJson(expectedError)
+        actualError shouldEqualJson expectedError
 
         val exceptionArgs = mapOf(
             "errorType" to "exception",
@@ -451,7 +451,7 @@ class ToolIntegrationTest : KotlinTestBase() {
             }
         """.trimIndent()
 
-        actualContent.shouldEqualJson(expectedContent)
+        actualContent shouldEqualJson expectedContent
 
         val textOnlyArgs = mapOf(
             "text" to testText,

kotlin-sdk-test/src/jvmTest/kotlin/io/modelcontextprotocol/kotlin/sdk/integration/typescript/TypeScriptTestBase.kt

@@ -57,13 +57,9 @@ abstract class TypeScriptTestBase {
             }
 
             println("Installing TypeScript SDK dependencies")
-            executeCommand("npm install", sdkDir)
+            executeCommand("npm install", sdkDir, allowFailure = false, timeoutSeconds = null)
         }
 
-        @JvmStatic
-        protected fun executeCommand(command: String, workingDir: File): String =
-            runCommand(command, workingDir, allowFailure = false, timeoutSeconds = null)
-
         @JvmStatic
         protected fun killProcessOnPort(port: Int) {
             val isWindows = System.getProperty("os.name").lowercase().contains("windows")
@@ -72,7 +68,7 @@ abstract class TypeScriptTestBase {
             } else {
                 "lsof -ti:$port | xargs kill -9 2>/dev/null || true"
             }
-            runCommand(killCommand, File("."), allowFailure = true, timeoutSeconds = null)
+            executeCommand(killCommand, File("."), allowFailure = true, timeoutSeconds = null)
         }
 
         @JvmStatic
@@ -82,11 +78,12 @@ abstract class TypeScriptTestBase {
             }
         }
 
-        private fun runCommand(
+        @JvmStatic
+        protected fun executeCommand(
             command: String,
             workingDir: File,
-            allowFailure: Boolean,
-            timeoutSeconds: Long?,
+            allowFailure: Boolean = false,
+            timeoutSeconds: Long? = null,
         ): String {
             if (!workingDir.exists()) {
                 if (!workingDir.mkdirs()) {
@@ -174,7 +171,7 @@ abstract class TypeScriptTestBase {
     }
 
     protected fun executeCommandAllowingFailure(command: String, workingDir: File, timeoutSeconds: Long = 20): String =
-        runCommand(command, workingDir, allowFailure = true, timeoutSeconds = timeoutSeconds)
+        executeCommand(command, workingDir, allowFailure = true, timeoutSeconds = timeoutSeconds)
 
     protected fun startTypeScriptServer(port: Int): Process {
         killProcessOnPort(port)
@@ -227,7 +224,7 @@ abstract class TypeScriptTestBase {
         }
     }
 
-    private suspend fun newClient(serverUrl: String): Client =
+    protected suspend fun newClient(serverUrl: String): Client =
         HttpClient(CIO) { install(SSE) }.mcpStreamableHttp(serverUrl)
 
     protected suspend fun <T> withClient(serverUrl: String, block: suspend (Client) -> T): T {