fixup! Introduce Kotlin integration tests

Author: skarpovdev

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

@@ -41,13 +41,10 @@ class TypeScriptClientKotlinServerTest : TypeScriptTestBase() {
     @Test
     @Timeout(20, unit = TimeUnit.SECONDS)
     fun testToolCall() {
-        val projectRoot = File(System.getProperty("user.dir"))
-        val clientDir = File(projectRoot, "src/jvmTest/kotlin/io/modelcontextprotocol/kotlin/sdk/integration/utils")
-
         // call the "greet" tool
         val testName = "TestUser"
         val command = "npx tsx myClient.ts $serverUrl greet $testName"
-        val output = executeCommand(command, clientDir)
+        val output = executeCommand(command, tsClientDir)
 
         assertTrue(
             output.contains("Hello, $testName!"),
@@ -65,12 +62,9 @@ class TypeScriptClientKotlinServerTest : TypeScriptTestBase() {
     @Test
     @Timeout(20, unit = TimeUnit.SECONDS)
     fun testToolCallWithSessionManagement() {
-        val projectRoot = File(System.getProperty("user.dir"))
-        val clientDir = File(projectRoot, "src/jvmTest/kotlin/io/modelcontextprotocol/kotlin/sdk/integration/utils")
-
         val testName = "SessionTest"
         val command = "npx tsx myClient.ts $serverUrl greet $testName"
-        val output = executeCommand(command, clientDir)
+        val output = executeCommand(command, tsClientDir)
 
         assertTrue(output.contains("Connected to server"), "Client should connect to server")
         assertTrue(
@@ -82,7 +76,7 @@ class TypeScriptClientKotlinServerTest : TypeScriptTestBase() {
 
         val multiGreetName = "NotificationTest"
         val multiGreetCommand = "npx tsx myClient.ts $serverUrl multi-greet $multiGreetName"
-        val multiGreetOutput = executeCommand(multiGreetCommand, clientDir)
+        val multiGreetOutput = executeCommand(multiGreetCommand, tsClientDir)
 
         assertTrue(multiGreetOutput.contains("Connected to server"), "Client should connect to server")
         assertTrue(
@@ -95,20 +89,17 @@ class TypeScriptClientKotlinServerTest : TypeScriptTestBase() {
     @Test
     @Timeout(30, unit = TimeUnit.SECONDS)
     fun testMultipleClientSequence() {
-        val projectRoot = File(System.getProperty("user.dir"))
-        val clientDir = File(projectRoot, "src/jvmTest/kotlin/io/modelcontextprotocol/kotlin/sdk/integration/utils")
-
         val testName1 = "FirstClient"
         val command1 = "npx tsx myClient.ts $serverUrl greet $testName1"
-        val output1 = executeCommand(command1, clientDir)
+        val output1 = executeCommand(command1, tsClientDir)
 
         assertTrue(output1.contains("Connected to server"), "First client should connect to server")
         assertTrue(output1.contains("Hello, $testName1!"), "Tool response should contain the greeting for first client")
         assertTrue(output1.contains("Disconnected from server"), "First client should disconnect cleanly")
 
         val testName2 = "SecondClient"
         val command2 = "npx tsx myClient.ts $serverUrl multi-greet $testName2"
-        val output2 = executeCommand(command2, clientDir)
+        val output2 = executeCommand(command2, tsClientDir)
 
         assertTrue(output2.contains("Connected to server"), "Second client should connect to server")
         assertTrue(
@@ -118,7 +109,7 @@ class TypeScriptClientKotlinServerTest : TypeScriptTestBase() {
         assertTrue(output2.contains("Disconnected from server"), "Second client should disconnect cleanly")
 
         val command3 = "npx tsx myClient.ts $serverUrl"
-        val output3 = executeCommand(command3, clientDir)
+        val output3 = executeCommand(command3, tsClientDir)
 
         assertTrue(output3.contains("Connected to server"), "Third client should connect to server")
         assertTrue(output3.contains("Available utils:"), "Third client should list available utils")
@@ -130,9 +121,6 @@ class TypeScriptClientKotlinServerTest : TypeScriptTestBase() {
     @Test
     @Timeout(30, unit = TimeUnit.SECONDS)
     fun testMultipleClientParallel() {
-        val projectRoot = File(System.getProperty("user.dir"))
-        val clientDir = File(projectRoot, "src/jvmTest/kotlin/io/modelcontextprotocol/kotlin/sdk/integration/utils")
-
         val clientCount = 3
         val clients = listOf(
             "FirstClient" to "greet",
@@ -154,7 +142,7 @@ class TypeScriptClientKotlinServerTest : TypeScriptTestBase() {
                         "npx tsx myClient.ts $serverUrl $toolName $clientName"
                     }
 
-                    val output = executeCommand(command, clientDir)
+                    val output = executeCommand(command, tsClientDir)
                     synchronized(outputs) {
                         outputs.add(i to output)
                     }

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

@@ -42,19 +42,16 @@ class TypeScriptEdgeCasesTest : TypeScriptTestBase() {
     @Test
     @Timeout(20, unit = TimeUnit.SECONDS)
     fun testErrorHandling() {
-        val projectRoot = File(System.getProperty("user.dir"))
-        val clientDir = File(projectRoot, "src/jvmTest/kotlin/io/modelcontextprotocol/kotlin/sdk/integration/utils")
-
         val nonExistentToolCommand = "npx tsx myClient.ts $serverUrl non-existent-tool"
-        val nonExistentToolOutput = executeCommandAllowingFailure(nonExistentToolCommand, clientDir)
+        val nonExistentToolOutput = executeCommandAllowingFailure(nonExistentToolCommand, tsClientDir)
 
         assertTrue(
             nonExistentToolOutput.contains("Tool \"non-existent-tool\" not found"),
             "Client should handle non-existent tool gracefully"
         )
 
         val invalidUrlCommand = "npx tsx myClient.ts http://localhost:${port + 1000}/mcp greet TestUser"
-        val invalidUrlOutput = executeCommandAllowingFailure(invalidUrlCommand, clientDir)
+        val invalidUrlOutput = executeCommandAllowingFailure(invalidUrlCommand, tsClientDir)
 
         assertTrue(
             invalidUrlOutput.contains("Error:") || invalidUrlOutput.contains("ECONNREFUSED"),
@@ -65,16 +62,13 @@ class TypeScriptEdgeCasesTest : TypeScriptTestBase() {
     @Test
     @Timeout(20, unit = TimeUnit.SECONDS)
     fun testSpecialCharacters() {
-        val projectRoot = File(System.getProperty("user.dir"))
-        val clientDir = File(projectRoot, "src/jvmTest/kotlin/io/modelcontextprotocol/kotlin/sdk/integration/utils")
-
         val specialChars = "!@#$+-[].,?"
 
-        val tempFile = File(clientDir, "special_chars.txt")
+        val tempFile = File(tsClientDir, "special_chars.txt")
         tempFile.writeText(specialChars)
 
         val specialCharsCommand = "npx tsx myClient.ts $serverUrl greet \"$(cat special_chars.txt)\""
-        val specialCharsOutput = executeCommand(specialCharsCommand, clientDir)
+        val specialCharsOutput = executeCommand(specialCharsCommand, tsClientDir)
 
         tempFile.delete()
 
@@ -91,16 +85,13 @@ class TypeScriptEdgeCasesTest : TypeScriptTestBase() {
     @Test
     @Timeout(30, unit = TimeUnit.SECONDS)
     fun testLargePayload() {
-        val projectRoot = File(System.getProperty("user.dir"))
-        val clientDir = File(projectRoot, "src/jvmTest/kotlin/io/modelcontextprotocol/kotlin/sdk/integration/utils")
-
         val largeName = "A".repeat(10 * 1024)
 
-        val tempFile = File(clientDir, "large_name.txt")
+        val tempFile = File(tsClientDir, "large_name.txt")
         tempFile.writeText(largeName)
 
         val largePayloadCommand = "npx tsx myClient.ts $serverUrl greet \"$(cat large_name.txt)\""
-        val largePayloadOutput = executeCommand(largePayloadCommand, clientDir)
+        val largePayloadOutput = executeCommand(largePayloadCommand, tsClientDir)
 
         tempFile.delete()
 
@@ -117,9 +108,6 @@ class TypeScriptEdgeCasesTest : TypeScriptTestBase() {
     @Test
     @Timeout(60, unit = TimeUnit.SECONDS)
     fun testComplexConcurrentRequests() {
-        val projectRoot = File(System.getProperty("user.dir"))
-        val clientDir = File(projectRoot, "src/jvmTest/kotlin/io/modelcontextprotocol/kotlin/sdk/integration/utils")
-
         val commands = listOf(
             "npx tsx myClient.ts $serverUrl greet \"Client1\"",
             "npx tsx myClient.ts $serverUrl multi-greet \"Client2\"",
@@ -131,7 +119,7 @@ class TypeScriptEdgeCasesTest : TypeScriptTestBase() {
         val threads = commands.mapIndexed { index, command ->
             Thread {
                 println("Starting client $index")
-                val output = executeCommand(command, clientDir)
+                val output = executeCommand(command, tsClientDir)
                 println("Client $index completed")
 
                 assertTrue(
@@ -168,12 +156,9 @@ class TypeScriptEdgeCasesTest : TypeScriptTestBase() {
     @Test
     @Timeout(120, unit = TimeUnit.SECONDS)
     fun testRapidSequentialRequests() {
-        val projectRoot = File(System.getProperty("user.dir"))
-        val clientDir = File(projectRoot, "src/jvmTest/kotlin/io/modelcontextprotocol/kotlin/sdk/integration/utils")
-
         val outputs = (1..10).map { i ->
             val command = "npx tsx myClient.ts $serverUrl greet \"RapidClient$i\""
-            val output = executeCommand(command, clientDir)
+            val output = executeCommand(command, tsClientDir)
 
             assertTrue(
                 output.contains("Connected to server"),
@@ -193,23 +178,4 @@ class TypeScriptEdgeCasesTest : TypeScriptTestBase() {
 
         assertEquals(10, outputs.size, "All 10 rapid requests should complete successfully")
     }
-
-    private fun executeCommandAllowingFailure(command: String, workingDir: File): String {
-        val process = ProcessBuilder()
-            .command("bash", "-c", command)
-            .directory(workingDir)
-            .redirectErrorStream(true)
-            .start()
-
-        val output = StringBuilder()
-        process.inputStream.bufferedReader().useLines { lines ->
-            for (line in lines) {
-                println(line)
-                output.append(line).append("\n")
-            }
-        }
-
-        process.waitFor(20, TimeUnit.SECONDS)
-        return output.toString()
-    }
 }

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

@@ -11,6 +11,9 @@ import java.util.concurrent.TimeUnit
 
 abstract class TypeScriptTestBase {
 
+    protected val projectRoot: File get() = File(System.getProperty("user.dir"))
+    protected val tsClientDir: File get() = File(projectRoot, "src/jvmTest/kotlin/io/modelcontextprotocol/kotlin/sdk/integration/utils")
+
     companion object {
         @JvmStatic
         protected val sdkDir = File("src/jvmTest/resources/typescript-sdk")
@@ -120,4 +123,23 @@ abstract class TypeScriptTestBase {
         }
         return false
     }
+
+    protected fun executeCommandAllowingFailure(command: String, workingDir: File, timeoutSeconds: Long = 20): String {
+        val process = ProcessBuilder()
+            .command("bash", "-c", command)
+            .directory(workingDir)
+            .redirectErrorStream(true)
+            .start()
+
+        val output = StringBuilder()
+        process.inputStream.bufferedReader().useLines { lines ->
+            for (line in lines) {
+                println(line)
+                output.append(line).append("\n")
+            }
+        }
+
+        process.waitFor(timeoutSeconds, TimeUnit.SECONDS)
+        return output.toString()
+    }
 }