fixup! Introduce Kotlin integration tests

skarpovdev · devcrocod · commit 60a760e3b66c · 2025-09-09T13:55:34.000+02:00
diff --git a/kotlin-sdk-test/src/jvmTest/kotlin/io/modelcontextprotocol/kotlin/sdk/integration/kotlin/ToolEdgeCasesTest.kt b/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
         }
     }
 
diff --git a/kotlin-sdk-test/src/jvmTest/kotlin/io/modelcontextprotocol/kotlin/sdk/integration/kotlin/ToolIntegrationTest.kt b/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,
diff --git a/kotlin-sdk-test/src/jvmTest/kotlin/io/modelcontextprotocol/kotlin/sdk/integration/typescript/TypeScriptTestBase.kt b/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 {

Original file line number	Diff line number	Diff line change
`@@ -296,7 +296,7 @@ class ToolEdgeCasesTest : KotlinTestBase() {`
`296`	`296`	`}`
`297`	`297`	`""".trimIndent()`
`298`	`298`
`299`		`- actualContent.shouldEqualJson(expectedContent)`
	`299`	`+ actualContent shouldEqualJson expectedContent`
`300`	`300`	`}`
`301`	`301`	`}`
`302`	`302`
`@@ -348,7 +348,7 @@ class ToolEdgeCasesTest : KotlinTestBase() {`
`348`	`348`	`}`
`349`	`349`	`""".trimIndent()`
`350`	`350`
`351`		`- actualContent.shouldEqualJson(expectedContent)`
	`351`	`+ actualContent shouldEqualJson expectedContent`
`352`	`352`	`}`
`353`	`353`	`}`
`354`	`354`
`@@ -370,7 +370,7 @@ class ToolEdgeCasesTest : KotlinTestBase() {`
`370`	`370`	`}`
`371`	`371`	`""".trimIndent()`
`372`	`372`
`373`		`- actualContent.shouldEqualJson(expectedContent)`
	`373`	`+ actualContent shouldEqualJson expectedContent`
`374`	`374`	`}`
`375`	`375`	`}`
`376`	`376`
`@@ -396,7 +396,7 @@ class ToolEdgeCasesTest : KotlinTestBase() {`
`396`	`396`	`}`
`397`	`397`	`""".trimIndent()`
`398`	`398`
`399`		`- actualContent.shouldEqualJson(expectedContent)`
	`399`	`+ actualContent shouldEqualJson expectedContent`
`400`	`400`	`}`
`401`	`401`	`}`
`402`	`402`
`@@ -421,7 +421,7 @@ class ToolEdgeCasesTest : KotlinTestBase() {`
`421`	`421`	`}`
`422`	`422`	`""".trimIndent()`
`423`	`423`
`424`		`- actualContent.shouldEqualJson(expectedContent)`
	`424`	`+ actualContent shouldEqualJson expectedContent`
`425`	`425`	`}`
`426`	`426`	`}`
`427`	`427`
Original file line number	Diff line number	Diff line change
`@@ -325,7 +325,7 @@ class ToolIntegrationTest : KotlinTestBase() {`
`325`	`325`	`{"result":"Hello, world!"}`
`326`	`326`	`""".trimIndent()`
`327`	`327`
`328`		`- actualContent.shouldEqualJson(expectedContent)`
	`328`	`+ actualContent shouldEqualJson expectedContent`
`329`	`329`	`}`
`330`	`330`	`}`
`331`	`331`
`@@ -361,7 +361,7 @@ class ToolIntegrationTest : KotlinTestBase() {`
`361`	`361`	`}`
`362`	`362`	`""".trimIndent()`
`363`	`363`
`364`		`- actualContent.shouldEqualJson(expectedContent)`
	`364`	`+ actualContent shouldEqualJson expectedContent`
`365`	`365`	`}`
`366`	`366`	`}`
`367`	`367`
`@@ -378,7 +378,7 @@ class ToolIntegrationTest : KotlinTestBase() {`
`378`	`378`	`}`
`379`	`379`	`""".trimIndent()`
`380`	`380`
`381`		`- actualContent.shouldEqualJson(expectedContent)`
	`381`	`+ actualContent shouldEqualJson expectedContent`
`382`	`382`
`383`	`383`	`val errorArgs = mapOf(`
`384`	`384`	`"errorType" to "error",`
`@@ -394,7 +394,7 @@ class ToolIntegrationTest : KotlinTestBase() {`
`394`	`394`	`}`
`395`	`395`	`""".trimIndent()`
`396`	`396`
`397`		`- actualError.shouldEqualJson(expectedError)`
	`397`	`+ actualError shouldEqualJson expectedError`
`398`	`398`
`399`	`399`	`val exceptionArgs = mapOf(`
`400`	`400`	`"errorType" to "exception",`
`@@ -451,7 +451,7 @@ class ToolIntegrationTest : KotlinTestBase() {`
`451`	`451`	`}`
`452`	`452`	`""".trimIndent()`
`453`	`453`
`454`		`- actualContent.shouldEqualJson(expectedContent)`
	`454`	`+ actualContent shouldEqualJson expectedContent`
`455`	`455`
`456`	`456`	`val textOnlyArgs = mapOf(`
`457`	`457`	`"text" to testText,`
Original file line number	Diff line number	Diff line change
`@@ -57,13 +57,9 @@ abstract class TypeScriptTestBase {`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`println("Installing TypeScript SDK dependencies")`
`60`		`- executeCommand("npm install", sdkDir)`
	`60`	`+ executeCommand("npm install", sdkDir, allowFailure = false, timeoutSeconds = null)`
`61`	`61`	`}`
`62`	`62`
`63`		`- @JvmStatic`
`64`		`- protected fun executeCommand(command: String, workingDir: File): String =`
`65`		`- runCommand(command, workingDir, allowFailure = false, timeoutSeconds = null)`
`66`		`-`
`67`	`63`	`@JvmStatic`
`68`	`64`	`protected fun killProcessOnPort(port: Int) {`
`69`	`65`	`val isWindows = System.getProperty("os.name").lowercase().contains("windows")`
`@@ -72,7 +68,7 @@ abstract class TypeScriptTestBase {`
`72`	`68`	`} else {`
`73`	`69`	`"lsof -ti:$port \| xargs kill -9 2>/dev/null \|\| true"`
`74`	`70`	`}`
`75`		`- runCommand(killCommand, File("."), allowFailure = true, timeoutSeconds = null)`
	`71`	`+ executeCommand(killCommand, File("."), allowFailure = true, timeoutSeconds = null)`
`76`	`72`	`}`
`77`	`73`
`78`	`74`	`@JvmStatic`
`@@ -82,11 +78,12 @@ abstract class TypeScriptTestBase {`
`82`	`78`	`}`
`83`	`79`	`}`
`84`	`80`
`85`		`- private fun runCommand(`
	`81`	`+ @JvmStatic`
	`82`	`+ protected fun executeCommand(`
`86`	`83`	`command: String,`
`87`	`84`	`workingDir: File,`
`88`		`- allowFailure: Boolean,`
`89`		`- timeoutSeconds: Long?,`
	`85`	`+ allowFailure: Boolean = false,`
	`86`	`+ timeoutSeconds: Long? = null,`
`90`	`87`	`): String {`
`91`	`88`	`if (!workingDir.exists()) {`
`92`	`89`	`if (!workingDir.mkdirs()) {`
`@@ -174,7 +171,7 @@ abstract class TypeScriptTestBase {`
`174`	`171`	`}`
`175`	`172`
`176`	`173`	`protected fun executeCommandAllowingFailure(command: String, workingDir: File, timeoutSeconds: Long = 20): String =`
`177`		`- runCommand(command, workingDir, allowFailure = true, timeoutSeconds = timeoutSeconds)`
	`174`	`+ executeCommand(command, workingDir, allowFailure = true, timeoutSeconds = timeoutSeconds)`
`178`	`175`
`179`	`176`	`protected fun startTypeScriptServer(port: Int): Process {`
`180`	`177`	`killProcessOnPort(port)`
`@@ -227,7 +224,7 @@ abstract class TypeScriptTestBase {`
`227`	`224`	`}`
`228`	`225`	`}`
`229`	`226`
`230`		`- private suspend fun newClient(serverUrl: String): Client =`
	`227`	`+ protected suspend fun newClient(serverUrl: String): Client =`
`231`	`228`	`HttpClient(CIO) { install(SSE) }.mcpStreamableHttp(serverUrl)`
`232`	`229`
`233`	`230`	`protected suspend fun <T> withClient(serverUrl: String, block: suspend (Client) -> T): T {`