fixup! Introduce Kotlin integration tests

Signed-off-by: Sergey Karpov <[email protected]>

Author: skarpovdev

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

@@ -30,27 +30,12 @@ class KotlinClientTypeScriptServerEdgeCasesTest : TypeScriptTestBase() {
     fun setUp() {
         port = findFreePort()
         serverUrl = "http://$host:$port/mcp"
-        killProcessOnPort(port)
-        println("Starting TypeScript server on port $port")
-        val processBuilder = ProcessBuilder()
-            .command("bash", "-c", "MCP_PORT=$port npx tsx src/examples/server/simpleStreamableHttp.ts")
-            .directory(sdkDir)
-            .redirectErrorStream(true)
-
-        tsServerProcess = processBuilder.start()
-        if (!waitForPort(host, port, 10)) {
-            throw IllegalStateException("TypeScript server did not become ready on $host:$port within timeout")
-        }
+        tsServerProcess = startTypeScriptServer(port)
         println("TypeScript server started on port $port")
-
-        // print TypeScript server process output
-        val outputReader = createProcessOutputReader(tsServerProcess, "TS-SERVER")
-        outputReader.start()
     }
 
     @AfterEach
     fun tearDown() {
-        // close the client
         if (::client.isInitialized) {
             try {
                 runBlocking {
@@ -63,16 +48,10 @@ class KotlinClientTypeScriptServerEdgeCasesTest : TypeScriptTestBase() {
             }
         }
 
-        // terminate TypeScript server
         if (::tsServerProcess.isInitialized) {
             try {
                 println("Stopping TypeScript server")
-                tsServerProcess.destroy()
-                if (waitForProcessTermination(tsServerProcess, 3)) {
-                    println("TypeScript server stopped gracefully")
-                } else {
-                    println("TypeScript server did not stop gracefully, forced termination")
-                }
+                stopProcess(tsServerProcess, 3, "TypeScript server")
             } catch (e: Exception) {
                 println("Warning: Error during TypeScript server stop: ${e.message}")
             }

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

@@ -35,27 +35,12 @@ class KotlinClientTypeScriptServerTest : TypeScriptTestBase() {
     fun setUp() {
         port = findFreePort()
         serverUrl = "http://$host:$port/mcp"
-        killProcessOnPort(port)
-        println("Starting TypeScript server on port $port")
-        val processBuilder = ProcessBuilder()
-            .command("bash", "-c", "MCP_PORT=$port npx tsx src/examples/server/simpleStreamableHttp.ts")
-            .directory(sdkDir)
-            .redirectErrorStream(true)
-
-        tsServerProcess = processBuilder.start()
-        if (!waitForPort(host, port, 10)) {
-            throw IllegalStateException("TypeScript server did not become ready on $host:$port within timeout")
-        }
+        tsServerProcess = startTypeScriptServer(port)
         println("TypeScript server started on port $port")
-
-        // print TypeScript server process output
-        val outputReader = createProcessOutputReader(tsServerProcess, "TS-SERVER")
-        outputReader.start()
     }
 
     @AfterEach
     fun tearDown() {
-        // close the client
         if (::client.isInitialized) {
             try {
                 runBlocking {
@@ -68,16 +53,10 @@ class KotlinClientTypeScriptServerTest : TypeScriptTestBase() {
             }
         }
 
-        // terminate TypeScript server
         if (::tsServerProcess.isInitialized) {
             try {
                 println("Stopping TypeScript server")
-                tsServerProcess.destroy()
-                if (waitForProcessTermination(tsServerProcess, 3)) {
-                    println("TypeScript server stopped gracefully")
-                } else {
-                    println("TypeScript server did not stop gracefully, forced termination")
-                }
+                stopProcess(tsServerProcess, 3, "TypeScript server")
             } catch (e: Exception) {
                 println("Warning: Error during TypeScript server stop: ${e.message}")
             }

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

@@ -21,9 +21,6 @@ abstract class TypeScriptTestBase {
         @JvmStatic
         protected val sdkDir: File = File(tempRootDir, "typescript-sdk")
 
-        /**
-         * clone TypeScript SDK and install dependencies
-         */
         @JvmStatic
         @BeforeAll
         fun setupTypeScriptSdk() {
@@ -46,8 +43,27 @@ abstract class TypeScriptTestBase {
         }
 
         @JvmStatic
-        protected fun executeCommand(command: String, workingDir: File): String {
-            // Prefer running TypeScript via ts-node to avoid npx network delays on CI
+        protected fun executeCommand(command: String, workingDir: File): String =
+            runCommand(command, workingDir, allowFailure = false, timeoutSeconds = null)
+
+        @JvmStatic
+        protected fun killProcessOnPort(port: Int) {
+            executeCommand("lsof -ti:$port | xargs kill -9 2>/dev/null || true", File("."))
+        }
+
+        @JvmStatic
+        protected fun findFreePort(): Int {
+            ServerSocket(0).use { socket ->
+                return socket.localPort
+            }
+        }
+
+        private fun runCommand(
+            command: String,
+            workingDir: File,
+            allowFailure: Boolean,
+            timeoutSeconds: Long?
+        ): String {
             val process = ProcessBuilder()
                 .command("bash", "-c", "TYPESCRIPT_SDK_DIR='${sdkDir.absolutePath}' $command")
                 .directory(workingDir)
@@ -63,25 +79,17 @@ abstract class TypeScriptTestBase {
                 }
             }
 
-            val exitCode = process.waitFor()
-            if (exitCode != 0) {
-                throw RuntimeException("Command execution failed with exit code $exitCode: $command\nOutput:\n$output")
+            if (timeoutSeconds == null) {
+                val exitCode = process.waitFor()
+                if (!allowFailure && exitCode != 0) {
+                    throw RuntimeException("Command execution failed with exit code $exitCode: $command\nOutput:\n$output")
+                }
+            } else {
+                process.waitFor(timeoutSeconds, TimeUnit.SECONDS)
             }
 
             return output.toString()
         }
-
-        @JvmStatic
-        protected fun killProcessOnPort(port: Int) {
-            executeCommand("lsof -ti:$port | xargs kill -9 2>/dev/null || true", File("."))
-        }
-
-        @JvmStatic
-        protected fun findFreePort(): Int {
-            ServerSocket(0).use { socket ->
-                return socket.localPort
-            }
-        }
     }
 
     protected fun waitForProcessTermination(process: Process, timeoutSeconds: Long): Boolean {
@@ -121,22 +129,29 @@ abstract class TypeScriptTestBase {
         return false
     }
 
-    protected fun executeCommandAllowingFailure(command: String, workingDir: File, timeoutSeconds: Long = 20): String {
-        val process = ProcessBuilder()
-            .command("bash", "-c", "TYPESCRIPT_SDK_DIR='${sdkDir.absolutePath}' $command")
-            .directory(workingDir)
-            .redirectErrorStream(true)
-            .start()
+    protected fun executeCommandAllowingFailure(command: String, workingDir: File, timeoutSeconds: Long = 20): String =
+        runCommand(command, workingDir, allowFailure = true, timeoutSeconds = timeoutSeconds)
 
-        val output = StringBuilder()
-        process.inputStream.bufferedReader().useLines { lines ->
-            for (line in lines) {
-                println(line)
-                output.append(line).append("\n")
-            }
+    protected fun startTypeScriptServer(port: Int): Process {
+        killProcessOnPort(port)
+        val processBuilder = ProcessBuilder()
+            .command("bash", "-c", "MCP_PORT=$port npx tsx src/examples/server/simpleStreamableHttp.ts")
+            .directory(sdkDir)
+            .redirectErrorStream(true)
+        val process = processBuilder.start()
+        if (!waitForPort("localhost", port, 10)) {
+            throw IllegalStateException("TypeScript server did not become ready on localhost:$port within timeout")
         }
+        createProcessOutputReader(process, "TS-SERVER").start()
+        return process
+    }
 
-        process.waitFor(timeoutSeconds, TimeUnit.SECONDS)
-        return output.toString()
+    protected fun stopProcess(process: Process, waitSeconds: Long = 3, name: String = "process") {
+        process.destroy()
+        if (waitForProcessTermination(process, waitSeconds)) {
+            println("$name stopped gracefully")
+        } else {
+            println("$name did not stop gracefully, forced termination")
+        }
     }
 }