Refactor integration tests (#256)
## Motivation and Context Flaky integration tests ## How Has This Been Tested? `./gradlew check` ## Changes - Use random port for Ktor in 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. ## Types of changes <!-- What types of changes does your code introduce? Put an `x` in all the boxes that apply: --> - [ ] Bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds functionality) - [ ] Breaking change (fix or feature that would cause existing functionality to change) - [ ] Documentation update - [x] Test update ## Checklist <!-- Go over all the following points, and put an `x` in all the boxes that apply. --> - [ ] I have read the [MCP Documentation](https://modelcontextprotocol.io) - [ ] My code follows the repository's style guidelines - [ ] New and existing tests pass locally - [ ] I have added appropriate error handling - [ ] I have added or updated documentation as needed ## Additional context <!-- Add any other context, implementation notes, or design decisions -->
This commit is contained in:
parent
be22708b67
commit
7bdd6b93f6
16 changed files with 174 additions and 195 deletions
|
|
@ -17,6 +17,7 @@ jreleaser = "1.19.0"
|
||||||
binaryCompatibilityValidatorPlugin = "0.18.1"
|
binaryCompatibilityValidatorPlugin = "0.18.1"
|
||||||
slf4j = "2.0.17"
|
slf4j = "2.0.17"
|
||||||
kotest = "5.9.1"
|
kotest = "5.9.1"
|
||||||
|
awaitility = "4.3.0"
|
||||||
|
|
||||||
# Samples
|
# Samples
|
||||||
mcp-kotlin = "0.7.0"
|
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" }
|
ktor-server-core = { group = "io.ktor", name = "ktor-server-core", version.ref = "ktor" }
|
||||||
|
|
||||||
# Testing
|
# Testing
|
||||||
kotlinx-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "coroutines" }
|
awaitility = { group = "org.awaitility", name = "awaitility-kotlin", version.ref = "awaitility" }
|
||||||
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" }
|
|
||||||
slf4j-simple = { group = "org.slf4j", name = "slf4j-simple", version.ref = "slf4j" }
|
|
||||||
kotest-assertions-json = { group = "io.kotest", name = "kotest-assertions-json", version.ref = "kotest" }
|
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-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" }
|
||||||
|
|
||||||
# Samples
|
# Samples
|
||||||
ktor-client-cio = { group = "io.ktor", name = "ktor-client-cio", version.ref = "ktor" }
|
ktor-client-cio = { group = "io.ktor", name = "ktor-client-cio", version.ref = "ktor" }
|
||||||
|
|
|
||||||
|
|
@ -36,11 +36,10 @@ import kotlinx.serialization.json.JsonObject
|
||||||
import kotlinx.serialization.json.JsonPrimitive
|
import kotlinx.serialization.json.JsonPrimitive
|
||||||
import kotlinx.serialization.json.encodeToJsonElement
|
import kotlinx.serialization.json.encodeToJsonElement
|
||||||
import kotlinx.serialization.serializer
|
import kotlinx.serialization.serializer
|
||||||
import kotlin.collections.get
|
|
||||||
import kotlin.reflect.KType
|
import kotlin.reflect.KType
|
||||||
import kotlin.reflect.typeOf
|
import kotlin.reflect.typeOf
|
||||||
import kotlin.time.Duration
|
import kotlin.time.Duration
|
||||||
import kotlin.time.Duration.Companion.milliseconds
|
import kotlin.time.Duration.Companion.seconds
|
||||||
|
|
||||||
private val LOGGER = KotlinLogging.logger { }
|
private val LOGGER = KotlinLogging.logger { }
|
||||||
|
|
||||||
|
|
@ -85,7 +84,7 @@ public open class ProtocolOptions(
|
||||||
/**
|
/**
|
||||||
* The default request timeout.
|
* 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.
|
* Options that can be given per request.
|
||||||
|
|
|
||||||
|
|
@ -24,6 +24,7 @@ kotlin {
|
||||||
jvmTest {
|
jvmTest {
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation(kotlin("test-junit5"))
|
implementation(kotlin("test-junit5"))
|
||||||
|
implementation(libs.awaitility)
|
||||||
runtimeOnly(libs.slf4j.simple)
|
runtimeOnly(libs.slf4j.simple)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -17,6 +17,7 @@ import io.modelcontextprotocol.kotlin.sdk.server.ServerOptions
|
||||||
import io.modelcontextprotocol.kotlin.sdk.server.mcp
|
import io.modelcontextprotocol.kotlin.sdk.server.mcp
|
||||||
import kotlinx.coroutines.runBlocking
|
import kotlinx.coroutines.runBlocking
|
||||||
import kotlinx.coroutines.withTimeout
|
import kotlinx.coroutines.withTimeout
|
||||||
|
import org.awaitility.kotlin.await
|
||||||
import org.junit.jupiter.api.AfterEach
|
import org.junit.jupiter.api.AfterEach
|
||||||
import org.junit.jupiter.api.BeforeEach
|
import org.junit.jupiter.api.BeforeEach
|
||||||
import kotlin.time.Duration.Companion.seconds
|
import kotlin.time.Duration.Companion.seconds
|
||||||
|
|
@ -27,7 +28,7 @@ import io.ktor.server.sse.SSE as ServerSSE
|
||||||
abstract class KotlinTestBase {
|
abstract class KotlinTestBase {
|
||||||
|
|
||||||
protected val host = "localhost"
|
protected val host = "localhost"
|
||||||
protected abstract val port: Int
|
protected var port: Int = 0
|
||||||
|
|
||||||
protected lateinit var server: Server
|
protected lateinit var server: Server
|
||||||
protected lateinit var client: Client
|
protected lateinit var client: Client
|
||||||
|
|
@ -39,6 +40,12 @@ abstract class KotlinTestBase {
|
||||||
@BeforeEach
|
@BeforeEach
|
||||||
fun setUp() {
|
fun setUp() {
|
||||||
setupServer()
|
setupServer()
|
||||||
|
await
|
||||||
|
.ignoreExceptions()
|
||||||
|
.until {
|
||||||
|
port = runBlocking { serverEngine.engine.resolvedConnectors().first().port }
|
||||||
|
port != 0
|
||||||
|
}
|
||||||
runBlocking {
|
runBlocking {
|
||||||
setupClient()
|
setupClient()
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -7,9 +7,10 @@ import io.modelcontextprotocol.kotlin.sdk.PromptMessage
|
||||||
import io.modelcontextprotocol.kotlin.sdk.Role
|
import io.modelcontextprotocol.kotlin.sdk.Role
|
||||||
import io.modelcontextprotocol.kotlin.sdk.ServerCapabilities
|
import io.modelcontextprotocol.kotlin.sdk.ServerCapabilities
|
||||||
import io.modelcontextprotocol.kotlin.sdk.TextContent
|
import io.modelcontextprotocol.kotlin.sdk.TextContent
|
||||||
import io.modelcontextprotocol.kotlin.sdk.integration.utils.TestUtils.runTest
|
import kotlinx.coroutines.Dispatchers
|
||||||
import kotlinx.coroutines.launch
|
import kotlinx.coroutines.launch
|
||||||
import kotlinx.coroutines.runBlocking
|
import kotlinx.coroutines.runBlocking
|
||||||
|
import kotlinx.coroutines.test.runTest
|
||||||
import org.junit.jupiter.api.Test
|
import org.junit.jupiter.api.Test
|
||||||
import org.junit.jupiter.api.assertThrows
|
import org.junit.jupiter.api.assertThrows
|
||||||
import kotlin.test.assertEquals
|
import kotlin.test.assertEquals
|
||||||
|
|
@ -18,8 +19,6 @@ import kotlin.test.assertTrue
|
||||||
|
|
||||||
class PromptEdgeCasesTest : KotlinTestBase() {
|
class PromptEdgeCasesTest : KotlinTestBase() {
|
||||||
|
|
||||||
override val port = 3008
|
|
||||||
|
|
||||||
private val basicPromptName = "basic-prompt"
|
private val basicPromptName = "basic-prompt"
|
||||||
private val basicPromptDescription = "A basic prompt for testing"
|
private val basicPromptDescription = "A basic prompt for testing"
|
||||||
|
|
||||||
|
|
@ -183,7 +182,7 @@ class PromptEdgeCasesTest : KotlinTestBase() {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun testBasicPrompt() = runTest {
|
fun testBasicPrompt() = runBlocking(Dispatchers.IO) {
|
||||||
val testName = "Alice"
|
val testName = "Alice"
|
||||||
val result = client.getPrompt(
|
val result = client.getPrompt(
|
||||||
GetPromptRequest(
|
GetPromptRequest(
|
||||||
|
|
@ -215,7 +214,7 @@ class PromptEdgeCasesTest : KotlinTestBase() {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun testComplexPromptWithManyArguments() = runTest {
|
fun testComplexPromptWithManyArguments() = runBlocking(Dispatchers.IO) {
|
||||||
val arguments = (1..10).associate { i -> "arg$i" to "value$i" }
|
val arguments = (1..10).associate { i -> "arg$i" to "value$i" }
|
||||||
|
|
||||||
val result = client.getPrompt(
|
val result = client.getPrompt(
|
||||||
|
|
@ -253,7 +252,7 @@ class PromptEdgeCasesTest : KotlinTestBase() {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun testLargePrompt() = runTest {
|
fun testLargePrompt() = runBlocking(Dispatchers.IO) {
|
||||||
val result = client.getPrompt(
|
val result = client.getPrompt(
|
||||||
GetPromptRequest(
|
GetPromptRequest(
|
||||||
name = largePromptName,
|
name = largePromptName,
|
||||||
|
|
@ -275,7 +274,7 @@ class PromptEdgeCasesTest : KotlinTestBase() {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun testSpecialCharacters() = runTest {
|
fun testSpecialCharacters() = runBlocking(Dispatchers.IO) {
|
||||||
val result = client.getPrompt(
|
val result = client.getPrompt(
|
||||||
GetPromptRequest(
|
GetPromptRequest(
|
||||||
name = specialCharsPromptName,
|
name = specialCharsPromptName,
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,7 @@ import io.modelcontextprotocol.kotlin.sdk.PromptMessageContent
|
||||||
import io.modelcontextprotocol.kotlin.sdk.Role
|
import io.modelcontextprotocol.kotlin.sdk.Role
|
||||||
import io.modelcontextprotocol.kotlin.sdk.ServerCapabilities
|
import io.modelcontextprotocol.kotlin.sdk.ServerCapabilities
|
||||||
import io.modelcontextprotocol.kotlin.sdk.TextContent
|
import io.modelcontextprotocol.kotlin.sdk.TextContent
|
||||||
import io.modelcontextprotocol.kotlin.sdk.integration.utils.TestUtils.runTest
|
import kotlinx.coroutines.Dispatchers
|
||||||
import kotlinx.coroutines.runBlocking
|
import kotlinx.coroutines.runBlocking
|
||||||
import org.junit.jupiter.api.Test
|
import org.junit.jupiter.api.Test
|
||||||
import org.junit.jupiter.api.assertThrows
|
import org.junit.jupiter.api.assertThrows
|
||||||
|
|
@ -19,7 +19,6 @@ import kotlin.test.assertTrue
|
||||||
|
|
||||||
class PromptIntegrationTest : KotlinTestBase() {
|
class PromptIntegrationTest : KotlinTestBase() {
|
||||||
|
|
||||||
override val port = 3004
|
|
||||||
private val testPromptName = "greeting"
|
private val testPromptName = "greeting"
|
||||||
private val testPromptDescription = "A simple greeting prompt"
|
private val testPromptDescription = "A simple greeting prompt"
|
||||||
private val complexPromptName = "multimodal-prompt"
|
private val complexPromptName = "multimodal-prompt"
|
||||||
|
|
@ -219,7 +218,7 @@ class PromptIntegrationTest : KotlinTestBase() {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun testListPrompts() = runTest {
|
fun testListPrompts() = runBlocking(Dispatchers.IO) {
|
||||||
val result = client.listPrompts()
|
val result = client.listPrompts()
|
||||||
|
|
||||||
assertNotNull(result, "List prompts result should not be null")
|
assertNotNull(result, "List prompts result should not be null")
|
||||||
|
|
@ -247,7 +246,7 @@ class PromptIntegrationTest : KotlinTestBase() {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun testGetPrompt() = runTest {
|
fun testGetPrompt() = runBlocking(Dispatchers.IO) {
|
||||||
val testName = "Alice"
|
val testName = "Alice"
|
||||||
val result = client.getPrompt(
|
val result = client.getPrompt(
|
||||||
GetPromptRequest(
|
GetPromptRequest(
|
||||||
|
|
@ -290,7 +289,7 @@ class PromptIntegrationTest : KotlinTestBase() {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun testMissingRequiredArguments() = runTest {
|
fun testMissingRequiredArguments() = runBlocking(Dispatchers.IO) {
|
||||||
val promptsList = client.listPrompts()
|
val promptsList = client.listPrompts()
|
||||||
assertNotNull(promptsList, "Prompts list should not be null")
|
assertNotNull(promptsList, "Prompts list should not be null")
|
||||||
val strictPrompt = promptsList.prompts.find { it.name == strictPromptName }
|
val strictPrompt = promptsList.prompts.find { it.name == strictPromptName }
|
||||||
|
|
@ -364,7 +363,7 @@ class PromptIntegrationTest : KotlinTestBase() {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun testComplexContentTypes() = runTest {
|
fun testComplexContentTypes() = runBlocking(Dispatchers.IO) {
|
||||||
val topic = "artificial intelligence"
|
val topic = "artificial intelligence"
|
||||||
val result = client.getPrompt(
|
val result = client.getPrompt(
|
||||||
GetPromptRequest(
|
GetPromptRequest(
|
||||||
|
|
@ -418,7 +417,7 @@ class PromptIntegrationTest : KotlinTestBase() {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun testMultipleMessagesAndRoles() = runTest {
|
fun testMultipleMessagesAndRoles() = runBlocking(Dispatchers.IO) {
|
||||||
val topic = "climate change"
|
val topic = "climate change"
|
||||||
val result = client.getPrompt(
|
val result = client.getPrompt(
|
||||||
GetPromptRequest(
|
GetPromptRequest(
|
||||||
|
|
|
||||||
|
|
@ -9,9 +9,10 @@ import io.modelcontextprotocol.kotlin.sdk.ServerCapabilities
|
||||||
import io.modelcontextprotocol.kotlin.sdk.SubscribeRequest
|
import io.modelcontextprotocol.kotlin.sdk.SubscribeRequest
|
||||||
import io.modelcontextprotocol.kotlin.sdk.TextResourceContents
|
import io.modelcontextprotocol.kotlin.sdk.TextResourceContents
|
||||||
import io.modelcontextprotocol.kotlin.sdk.UnsubscribeRequest
|
import io.modelcontextprotocol.kotlin.sdk.UnsubscribeRequest
|
||||||
import io.modelcontextprotocol.kotlin.sdk.integration.utils.TestUtils.runTest
|
import kotlinx.coroutines.Dispatchers
|
||||||
import kotlinx.coroutines.launch
|
import kotlinx.coroutines.launch
|
||||||
import kotlinx.coroutines.runBlocking
|
import kotlinx.coroutines.runBlocking
|
||||||
|
import kotlinx.coroutines.test.runTest
|
||||||
import org.junit.jupiter.api.Test
|
import org.junit.jupiter.api.Test
|
||||||
import org.junit.jupiter.api.assertThrows
|
import org.junit.jupiter.api.assertThrows
|
||||||
import java.util.concurrent.atomic.AtomicBoolean
|
import java.util.concurrent.atomic.AtomicBoolean
|
||||||
|
|
@ -21,8 +22,6 @@ import kotlin.test.assertTrue
|
||||||
|
|
||||||
class ResourceEdgeCasesTest : KotlinTestBase() {
|
class ResourceEdgeCasesTest : KotlinTestBase() {
|
||||||
|
|
||||||
override val port = 3007
|
|
||||||
|
|
||||||
private val testResourceUri = "test://example.txt"
|
private val testResourceUri = "test://example.txt"
|
||||||
private val testResourceName = "Test Resource"
|
private val testResourceName = "Test Resource"
|
||||||
private val testResourceDescription = "A test resource for integration testing"
|
private val testResourceDescription = "A test resource for integration testing"
|
||||||
|
|
@ -129,7 +128,7 @@ class ResourceEdgeCasesTest : KotlinTestBase() {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun testBinaryResource() = runTest {
|
fun testBinaryResource() = runBlocking(Dispatchers.IO) {
|
||||||
val result = client.readResource(ReadResourceRequest(uri = binaryResourceUri))
|
val result = client.readResource(ReadResourceRequest(uri = binaryResourceUri))
|
||||||
|
|
||||||
assertNotNull(result, "Read resource result should not be null")
|
assertNotNull(result, "Read resource result should not be null")
|
||||||
|
|
@ -142,7 +141,7 @@ class ResourceEdgeCasesTest : KotlinTestBase() {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun testLargeResource() = runTest {
|
fun testLargeResource() = runBlocking(Dispatchers.IO) {
|
||||||
val result = client.readResource(ReadResourceRequest(uri = largeResourceUri))
|
val result = client.readResource(ReadResourceRequest(uri = largeResourceUri))
|
||||||
|
|
||||||
assertNotNull(result, "Read resource result should not be null")
|
assertNotNull(result, "Read resource result should not be null")
|
||||||
|
|
@ -172,7 +171,7 @@ class ResourceEdgeCasesTest : KotlinTestBase() {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun testDynamicResource() = runTest {
|
fun testDynamicResource() = runBlocking(Dispatchers.IO) {
|
||||||
val initialResult = client.readResource(ReadResourceRequest(uri = dynamicResourceUri))
|
val initialResult = client.readResource(ReadResourceRequest(uri = dynamicResourceUri))
|
||||||
assertNotNull(initialResult, "Initial read result should not be null")
|
assertNotNull(initialResult, "Initial read result should not be null")
|
||||||
val initialContent = (initialResult.contents.firstOrNull() as? TextResourceContents)?.text
|
val initialContent = (initialResult.contents.firstOrNull() as? TextResourceContents)?.text
|
||||||
|
|
@ -188,7 +187,7 @@ class ResourceEdgeCasesTest : KotlinTestBase() {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun testResourceAddAndRemove() = runTest {
|
fun testResourceAddAndRemove() = runBlocking(Dispatchers.IO) {
|
||||||
val initialList = client.listResources()
|
val initialList = client.listResources()
|
||||||
assertNotNull(initialList, "Initial list result should not be null")
|
assertNotNull(initialList, "Initial list result should not be null")
|
||||||
val initialCount = initialList.resources.size
|
val initialCount = initialList.resources.size
|
||||||
|
|
@ -261,7 +260,7 @@ class ResourceEdgeCasesTest : KotlinTestBase() {
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun testSubscribeAndUnsubscribe() {
|
fun testSubscribeAndUnsubscribe() {
|
||||||
runTest {
|
runBlocking(Dispatchers.IO) {
|
||||||
val subscribeResult = client.subscribeResource(SubscribeRequest(uri = testResourceUri))
|
val subscribeResult = client.subscribeResource(SubscribeRequest(uri = testResourceUri))
|
||||||
assertNotNull(subscribeResult, "Subscribe result should not be null")
|
assertNotNull(subscribeResult, "Subscribe result should not be null")
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,8 @@ import io.modelcontextprotocol.kotlin.sdk.ServerCapabilities
|
||||||
import io.modelcontextprotocol.kotlin.sdk.SubscribeRequest
|
import io.modelcontextprotocol.kotlin.sdk.SubscribeRequest
|
||||||
import io.modelcontextprotocol.kotlin.sdk.TextResourceContents
|
import io.modelcontextprotocol.kotlin.sdk.TextResourceContents
|
||||||
import io.modelcontextprotocol.kotlin.sdk.UnsubscribeRequest
|
import io.modelcontextprotocol.kotlin.sdk.UnsubscribeRequest
|
||||||
import io.modelcontextprotocol.kotlin.sdk.integration.utils.TestUtils.runTest
|
import kotlinx.coroutines.Dispatchers
|
||||||
|
import kotlinx.coroutines.runBlocking
|
||||||
import org.junit.jupiter.api.Test
|
import org.junit.jupiter.api.Test
|
||||||
import kotlin.test.assertEquals
|
import kotlin.test.assertEquals
|
||||||
import kotlin.test.assertNotNull
|
import kotlin.test.assertNotNull
|
||||||
|
|
@ -16,7 +17,6 @@ import kotlin.test.assertTrue
|
||||||
|
|
||||||
class ResourceIntegrationTest : KotlinTestBase() {
|
class ResourceIntegrationTest : KotlinTestBase() {
|
||||||
|
|
||||||
override val port = 3005
|
|
||||||
private val testResourceUri = "test://example.txt"
|
private val testResourceUri = "test://example.txt"
|
||||||
private val testResourceName = "Test Resource"
|
private val testResourceName = "Test Resource"
|
||||||
private val testResourceDescription = "A test resource for integration testing"
|
private val testResourceDescription = "A test resource for integration testing"
|
||||||
|
|
@ -57,7 +57,7 @@ class ResourceIntegrationTest : KotlinTestBase() {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun testListResources() = runTest {
|
fun testListResources() = runBlocking(Dispatchers.IO) {
|
||||||
val result = client.listResources()
|
val result = client.listResources()
|
||||||
|
|
||||||
assertNotNull(result, "List resources result should not be null")
|
assertNotNull(result, "List resources result should not be null")
|
||||||
|
|
@ -70,7 +70,7 @@ class ResourceIntegrationTest : KotlinTestBase() {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun testReadResource() = runTest {
|
fun testReadResource() = runBlocking(Dispatchers.IO) {
|
||||||
val result = client.readResource(ReadResourceRequest(uri = testResourceUri))
|
val result = client.readResource(ReadResourceRequest(uri = testResourceUri))
|
||||||
|
|
||||||
assertNotNull(result, "Read resource result should not be null")
|
assertNotNull(result, "Read resource result should not be null")
|
||||||
|
|
@ -83,7 +83,7 @@ class ResourceIntegrationTest : KotlinTestBase() {
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun testSubscribeAndUnsubscribe() {
|
fun testSubscribeAndUnsubscribe() {
|
||||||
runTest {
|
runBlocking(Dispatchers.IO) {
|
||||||
val subscribeResult = client.subscribeResource(SubscribeRequest(uri = testResourceUri))
|
val subscribeResult = client.subscribeResource(SubscribeRequest(uri = testResourceUri))
|
||||||
assertNotNull(subscribeResult, "Subscribe result should not be null")
|
assertNotNull(subscribeResult, "Subscribe result should not be null")
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -7,10 +7,11 @@ import io.modelcontextprotocol.kotlin.sdk.CallToolResultBase
|
||||||
import io.modelcontextprotocol.kotlin.sdk.ServerCapabilities
|
import io.modelcontextprotocol.kotlin.sdk.ServerCapabilities
|
||||||
import io.modelcontextprotocol.kotlin.sdk.TextContent
|
import io.modelcontextprotocol.kotlin.sdk.TextContent
|
||||||
import io.modelcontextprotocol.kotlin.sdk.Tool
|
import io.modelcontextprotocol.kotlin.sdk.Tool
|
||||||
import io.modelcontextprotocol.kotlin.sdk.integration.utils.TestUtils.runTest
|
import kotlinx.coroutines.Dispatchers
|
||||||
import kotlinx.coroutines.delay
|
import kotlinx.coroutines.delay
|
||||||
import kotlinx.coroutines.launch
|
import kotlinx.coroutines.launch
|
||||||
import kotlinx.coroutines.runBlocking
|
import kotlinx.coroutines.runBlocking
|
||||||
|
import kotlinx.coroutines.test.runTest
|
||||||
import kotlinx.serialization.json.JsonArray
|
import kotlinx.serialization.json.JsonArray
|
||||||
import kotlinx.serialization.json.JsonObject
|
import kotlinx.serialization.json.JsonObject
|
||||||
import kotlinx.serialization.json.JsonPrimitive
|
import kotlinx.serialization.json.JsonPrimitive
|
||||||
|
|
@ -26,8 +27,6 @@ import kotlin.test.assertTrue
|
||||||
|
|
||||||
class ToolEdgeCasesTest : KotlinTestBase() {
|
class ToolEdgeCasesTest : KotlinTestBase() {
|
||||||
|
|
||||||
override val port = 3009
|
|
||||||
|
|
||||||
private val basicToolName = "basic-tool"
|
private val basicToolName = "basic-tool"
|
||||||
private val basicToolDescription = "A basic tool for testing"
|
private val basicToolDescription = "A basic tool for testing"
|
||||||
|
|
||||||
|
|
@ -279,8 +278,7 @@ class ToolEdgeCasesTest : KotlinTestBase() {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun testBasicTool() {
|
fun testBasicTool(): Unit = runBlocking(Dispatchers.IO) {
|
||||||
runTest {
|
|
||||||
val testText = "Hello, world!"
|
val testText = "Hello, world!"
|
||||||
val arguments = mapOf("text" to testText)
|
val arguments = mapOf("text" to testText)
|
||||||
|
|
||||||
|
|
@ -298,11 +296,9 @@ class ToolEdgeCasesTest : KotlinTestBase() {
|
||||||
|
|
||||||
actualContent shouldEqualJson expectedContent
|
actualContent shouldEqualJson expectedContent
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun testComplexNestedSchema() {
|
fun testComplexNestedSchema(): Unit = runBlocking(Dispatchers.IO) {
|
||||||
runTest {
|
|
||||||
val userJson = buildJsonObject {
|
val userJson = buildJsonObject {
|
||||||
put("name", JsonPrimitive("John Galt"))
|
put("name", JsonPrimitive("John Galt"))
|
||||||
put("age", JsonPrimitive(30))
|
put("age", JsonPrimitive(30))
|
||||||
|
|
@ -350,11 +346,9 @@ class ToolEdgeCasesTest : KotlinTestBase() {
|
||||||
|
|
||||||
actualContent shouldEqualJson expectedContent
|
actualContent shouldEqualJson expectedContent
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun testLargeResponse() {
|
fun testLargeResponse(): Unit = runBlocking(Dispatchers.IO) {
|
||||||
runTest {
|
|
||||||
val size = 10
|
val size = 10
|
||||||
val arguments = mapOf("size" to size)
|
val arguments = mapOf("size" to size)
|
||||||
|
|
||||||
|
|
@ -372,11 +366,9 @@ class ToolEdgeCasesTest : KotlinTestBase() {
|
||||||
|
|
||||||
actualContent shouldEqualJson expectedContent
|
actualContent shouldEqualJson expectedContent
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun testSlowTool() {
|
fun testSlowTool(): Unit = runBlocking(Dispatchers.IO) {
|
||||||
runTest {
|
|
||||||
val delay = 500
|
val delay = 500
|
||||||
val arguments = mapOf("delay" to delay)
|
val arguments = mapOf("delay" to delay)
|
||||||
|
|
||||||
|
|
@ -398,11 +390,10 @@ class ToolEdgeCasesTest : KotlinTestBase() {
|
||||||
|
|
||||||
actualContent shouldEqualJson expectedContent
|
actualContent shouldEqualJson expectedContent
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun testSpecialCharacters() {
|
fun testSpecialCharacters() {
|
||||||
runTest {
|
runBlocking(Dispatchers.IO) {
|
||||||
val arguments = mapOf("special" to specialCharsContent)
|
val arguments = mapOf("special" to specialCharsContent)
|
||||||
|
|
||||||
val result = client.callTool(specialCharsToolName, arguments) as CallToolResultBase
|
val result = client.callTool(specialCharsToolName, arguments) as CallToolResultBase
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,7 @@ import io.modelcontextprotocol.kotlin.sdk.PromptMessageContent
|
||||||
import io.modelcontextprotocol.kotlin.sdk.ServerCapabilities
|
import io.modelcontextprotocol.kotlin.sdk.ServerCapabilities
|
||||||
import io.modelcontextprotocol.kotlin.sdk.TextContent
|
import io.modelcontextprotocol.kotlin.sdk.TextContent
|
||||||
import io.modelcontextprotocol.kotlin.sdk.Tool
|
import io.modelcontextprotocol.kotlin.sdk.Tool
|
||||||
import io.modelcontextprotocol.kotlin.sdk.integration.utils.TestUtils.runTest
|
import kotlinx.coroutines.Dispatchers
|
||||||
import kotlinx.coroutines.runBlocking
|
import kotlinx.coroutines.runBlocking
|
||||||
import kotlinx.serialization.json.JsonArray
|
import kotlinx.serialization.json.JsonArray
|
||||||
import kotlinx.serialization.json.JsonPrimitive
|
import kotlinx.serialization.json.JsonPrimitive
|
||||||
|
|
@ -26,8 +26,6 @@ import kotlin.test.assertNotNull
|
||||||
import kotlin.test.assertTrue
|
import kotlin.test.assertTrue
|
||||||
|
|
||||||
class ToolIntegrationTest : KotlinTestBase() {
|
class ToolIntegrationTest : KotlinTestBase() {
|
||||||
|
|
||||||
override val port = 3006
|
|
||||||
private val testToolName = "echo"
|
private val testToolName = "echo"
|
||||||
private val testToolDescription = "A simple echo tool that returns the input text"
|
private val testToolDescription = "A simple echo tool that returns the input text"
|
||||||
private val complexToolName = "calculator"
|
private val complexToolName = "calculator"
|
||||||
|
|
@ -302,7 +300,7 @@ class ToolIntegrationTest : KotlinTestBase() {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun testListTools() = runTest {
|
fun testListTools(): Unit = runBlocking(Dispatchers.IO) {
|
||||||
val result = client.listTools()
|
val result = client.listTools()
|
||||||
|
|
||||||
assertNotNull(result, "List utils result should not be null")
|
assertNotNull(result, "List utils result should not be null")
|
||||||
|
|
@ -319,8 +317,7 @@ class ToolIntegrationTest : KotlinTestBase() {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun testCallTool() {
|
fun testCallTool(): Unit = runBlocking(Dispatchers.IO) {
|
||||||
runTest {
|
|
||||||
val testText = "Hello, world!"
|
val testText = "Hello, world!"
|
||||||
val arguments = mapOf("text" to testText)
|
val arguments = mapOf("text" to testText)
|
||||||
|
|
||||||
|
|
@ -333,11 +330,9 @@ class ToolIntegrationTest : KotlinTestBase() {
|
||||||
|
|
||||||
actualContent shouldEqualJson expectedContent
|
actualContent shouldEqualJson expectedContent
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun testComplexInputSchemaTool() {
|
fun testComplexInputSchemaTool(): Unit = runBlocking(Dispatchers.IO) {
|
||||||
runTest {
|
|
||||||
val toolsList = client.listTools()
|
val toolsList = client.listTools()
|
||||||
assertNotNull(toolsList, "Tools list should not be null")
|
assertNotNull(toolsList, "Tools list should not be null")
|
||||||
val calculatorTool = toolsList.tools.find { it.name == complexToolName }
|
val calculatorTool = toolsList.tools.find { it.name == complexToolName }
|
||||||
|
|
@ -369,10 +364,9 @@ class ToolIntegrationTest : KotlinTestBase() {
|
||||||
|
|
||||||
actualContent shouldEqualJson expectedContent
|
actualContent shouldEqualJson expectedContent
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun testToolErrorHandling() = runTest {
|
fun testToolErrorHandling(): Unit = runBlocking(Dispatchers.IO) {
|
||||||
val successArgs = mapOf("errorType" to "none")
|
val successArgs = mapOf("errorType" to "none")
|
||||||
val successResult = client.callTool(errorToolName, successArgs)
|
val successResult = client.callTool(errorToolName, successArgs)
|
||||||
|
|
||||||
|
|
@ -420,7 +414,7 @@ class ToolIntegrationTest : KotlinTestBase() {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun testMultiContentTool() = runTest {
|
fun testMultiContentTool(): Unit = runBlocking(Dispatchers.IO) {
|
||||||
val testText = "Test multi-content"
|
val testText = "Test multi-content"
|
||||||
val arguments = mapOf(
|
val arguments = mapOf(
|
||||||
"text" to testText,
|
"text" to testText,
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@ package io.modelcontextprotocol.kotlin.sdk.integration.typescript
|
||||||
import io.modelcontextprotocol.kotlin.sdk.CallToolResult
|
import io.modelcontextprotocol.kotlin.sdk.CallToolResult
|
||||||
import io.modelcontextprotocol.kotlin.sdk.TextContent
|
import io.modelcontextprotocol.kotlin.sdk.TextContent
|
||||||
import io.modelcontextprotocol.kotlin.sdk.client.Client
|
import io.modelcontextprotocol.kotlin.sdk.client.Client
|
||||||
import io.modelcontextprotocol.kotlin.sdk.integration.utils.TestUtils.runTest
|
import kotlinx.coroutines.Dispatchers
|
||||||
import kotlinx.coroutines.async
|
import kotlinx.coroutines.async
|
||||||
import kotlinx.coroutines.awaitAll
|
import kotlinx.coroutines.awaitAll
|
||||||
import kotlinx.coroutines.runBlocking
|
import kotlinx.coroutines.runBlocking
|
||||||
|
|
@ -64,7 +64,7 @@ class KotlinClientTypeScriptServerEdgeCasesTest : TypeScriptTestBase() {
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@Timeout(30, unit = TimeUnit.SECONDS)
|
@Timeout(30, unit = TimeUnit.SECONDS)
|
||||||
fun testNonExistentTool() = runTest {
|
fun testNonExistentTool(): Unit = runBlocking(Dispatchers.IO) {
|
||||||
withClient(serverUrl) { client ->
|
withClient(serverUrl) { client ->
|
||||||
val nonExistentToolName = "non-existent-tool"
|
val nonExistentToolName = "non-existent-tool"
|
||||||
val arguments = mapOf("name" to "TestUser")
|
val arguments = mapOf("name" to "TestUser")
|
||||||
|
|
@ -85,7 +85,7 @@ class KotlinClientTypeScriptServerEdgeCasesTest : TypeScriptTestBase() {
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@Timeout(30, unit = TimeUnit.SECONDS)
|
@Timeout(30, unit = TimeUnit.SECONDS)
|
||||||
fun testSpecialCharactersInArguments() = runTest {
|
fun testSpecialCharactersInArguments(): Unit = runBlocking(Dispatchers.IO) {
|
||||||
withClient(serverUrl) { client ->
|
withClient(serverUrl) { client ->
|
||||||
val specialChars = "!@#$%^&*()_+{}[]|\\:;\"'<>,.?/"
|
val specialChars = "!@#$%^&*()_+{}[]|\\:;\"'<>,.?/"
|
||||||
val arguments = mapOf("name" to specialChars)
|
val arguments = mapOf("name" to specialChars)
|
||||||
|
|
@ -107,7 +107,7 @@ class KotlinClientTypeScriptServerEdgeCasesTest : TypeScriptTestBase() {
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@Timeout(30, unit = TimeUnit.SECONDS)
|
@Timeout(30, unit = TimeUnit.SECONDS)
|
||||||
fun testLargePayload() = runTest {
|
fun testLargePayload(): Unit = runBlocking(Dispatchers.IO) {
|
||||||
withClient(serverUrl) { client ->
|
withClient(serverUrl) { client ->
|
||||||
val largeName = "A".repeat(10 * 1024)
|
val largeName = "A".repeat(10 * 1024)
|
||||||
val arguments = mapOf("name" to largeName)
|
val arguments = mapOf("name" to largeName)
|
||||||
|
|
@ -129,7 +129,7 @@ class KotlinClientTypeScriptServerEdgeCasesTest : TypeScriptTestBase() {
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@Timeout(60, unit = TimeUnit.SECONDS)
|
@Timeout(60, unit = TimeUnit.SECONDS)
|
||||||
fun testConcurrentRequests() = runTest {
|
fun testConcurrentRequests(): Unit = runBlocking(Dispatchers.IO) {
|
||||||
withClient(serverUrl) { client ->
|
withClient(serverUrl) { client ->
|
||||||
val concurrentCount = 5
|
val concurrentCount = 5
|
||||||
val responses = kotlinx.coroutines.coroutineScope {
|
val responses = kotlinx.coroutines.coroutineScope {
|
||||||
|
|
@ -165,7 +165,7 @@ class KotlinClientTypeScriptServerEdgeCasesTest : TypeScriptTestBase() {
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@Timeout(30, unit = TimeUnit.SECONDS)
|
@Timeout(30, unit = TimeUnit.SECONDS)
|
||||||
fun testInvalidArguments() = runTest {
|
fun testInvalidArguments(): Unit = runBlocking(Dispatchers.IO) {
|
||||||
withClient(serverUrl) { client ->
|
withClient(serverUrl) { client ->
|
||||||
val invalidArguments = mapOf(
|
val invalidArguments = mapOf(
|
||||||
"name" to JsonObject(mapOf("nested" to JsonPrimitive("value"))),
|
"name" to JsonObject(mapOf("nested" to JsonPrimitive("value"))),
|
||||||
|
|
@ -196,7 +196,7 @@ class KotlinClientTypeScriptServerEdgeCasesTest : TypeScriptTestBase() {
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@Timeout(30, unit = TimeUnit.SECONDS)
|
@Timeout(30, unit = TimeUnit.SECONDS)
|
||||||
fun testMultipleToolCalls() = runTest {
|
fun testMultipleToolCalls(): Unit = runBlocking(Dispatchers.IO) {
|
||||||
withClient(serverUrl) { client ->
|
withClient(serverUrl) { client ->
|
||||||
repeat(10) { i ->
|
repeat(10) { i ->
|
||||||
val name = "SequentialClient$i"
|
val name = "SequentialClient$i"
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@ package io.modelcontextprotocol.kotlin.sdk.integration.typescript
|
||||||
import io.modelcontextprotocol.kotlin.sdk.CallToolResult
|
import io.modelcontextprotocol.kotlin.sdk.CallToolResult
|
||||||
import io.modelcontextprotocol.kotlin.sdk.TextContent
|
import io.modelcontextprotocol.kotlin.sdk.TextContent
|
||||||
import io.modelcontextprotocol.kotlin.sdk.client.Client
|
import io.modelcontextprotocol.kotlin.sdk.client.Client
|
||||||
import io.modelcontextprotocol.kotlin.sdk.integration.utils.TestUtils.runTest
|
import kotlinx.coroutines.Dispatchers
|
||||||
import kotlinx.coroutines.runBlocking
|
import kotlinx.coroutines.runBlocking
|
||||||
import kotlinx.coroutines.withTimeout
|
import kotlinx.coroutines.withTimeout
|
||||||
import org.junit.jupiter.api.AfterEach
|
import org.junit.jupiter.api.AfterEach
|
||||||
|
|
@ -59,7 +59,7 @@ class KotlinClientTypeScriptServerTest : TypeScriptTestBase() {
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@Timeout(30, unit = TimeUnit.SECONDS)
|
@Timeout(30, unit = TimeUnit.SECONDS)
|
||||||
fun testKotlinClientConnectsToTypeScriptServer() = runTest {
|
fun testKotlinClientConnectsToTypeScriptServer(): Unit = runBlocking(Dispatchers.IO) {
|
||||||
withClient(serverUrl) { client ->
|
withClient(serverUrl) { client ->
|
||||||
assertNotNull(client, "Client should be initialized")
|
assertNotNull(client, "Client should be initialized")
|
||||||
|
|
||||||
|
|
@ -74,7 +74,7 @@ class KotlinClientTypeScriptServerTest : TypeScriptTestBase() {
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@Timeout(30, unit = TimeUnit.SECONDS)
|
@Timeout(30, unit = TimeUnit.SECONDS)
|
||||||
fun testListTools() = runTest {
|
fun testListTools(): Unit = runBlocking(Dispatchers.IO) {
|
||||||
withClient(serverUrl) { client ->
|
withClient(serverUrl) { client ->
|
||||||
val result = client.listTools()
|
val result = client.listTools()
|
||||||
assertNotNull(result, "Tools list should not be null")
|
assertNotNull(result, "Tools list should not be null")
|
||||||
|
|
@ -92,7 +92,7 @@ class KotlinClientTypeScriptServerTest : TypeScriptTestBase() {
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@Timeout(30, unit = TimeUnit.SECONDS)
|
@Timeout(30, unit = TimeUnit.SECONDS)
|
||||||
fun testToolCall() = runTest {
|
fun testToolCall(): Unit = runBlocking(Dispatchers.IO) {
|
||||||
withClient(serverUrl) { client ->
|
withClient(serverUrl) { client ->
|
||||||
val testName = "TestUser"
|
val testName = "TestUser"
|
||||||
val arguments = mapOf("name" to testName)
|
val arguments = mapOf("name" to testName)
|
||||||
|
|
@ -113,7 +113,7 @@ class KotlinClientTypeScriptServerTest : TypeScriptTestBase() {
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@Timeout(30, unit = TimeUnit.SECONDS)
|
@Timeout(30, unit = TimeUnit.SECONDS)
|
||||||
fun testMultipleClients() = runTest {
|
fun testMultipleClients(): Unit = runBlocking(Dispatchers.IO) {
|
||||||
val client1 = newClient(serverUrl)
|
val client1 = newClient(serverUrl)
|
||||||
val client2 = newClient(serverUrl)
|
val client2 = newClient(serverUrl)
|
||||||
try {
|
try {
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
package io.modelcontextprotocol.kotlin.sdk.integration.typescript
|
package io.modelcontextprotocol.kotlin.sdk.integration.typescript
|
||||||
|
|
||||||
import io.modelcontextprotocol.kotlin.sdk.integration.utils.TestUtils.runTest
|
import kotlinx.coroutines.test.runTest
|
||||||
import org.junit.jupiter.api.AfterEach
|
import org.junit.jupiter.api.AfterEach
|
||||||
import org.junit.jupiter.api.BeforeEach
|
import org.junit.jupiter.api.BeforeEach
|
||||||
import org.junit.jupiter.api.Test
|
import org.junit.jupiter.api.Test
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
package io.modelcontextprotocol.kotlin.sdk.integration.typescript
|
package io.modelcontextprotocol.kotlin.sdk.integration.typescript
|
||||||
|
|
||||||
import io.modelcontextprotocol.kotlin.sdk.integration.utils.TestUtils.runTest
|
import kotlinx.coroutines.test.runTest
|
||||||
import org.junit.jupiter.api.AfterEach
|
import org.junit.jupiter.api.AfterEach
|
||||||
import org.junit.jupiter.api.BeforeEach
|
import org.junit.jupiter.api.BeforeEach
|
||||||
import org.junit.jupiter.api.Test
|
import org.junit.jupiter.api.Test
|
||||||
|
|
|
||||||
|
|
@ -1,13 +0,0 @@
|
||||||
package io.modelcontextprotocol.kotlin.sdk.integration.utils
|
|
||||||
|
|
||||||
import kotlinx.coroutines.Dispatchers
|
|
||||||
import kotlinx.coroutines.runBlocking
|
|
||||||
import kotlinx.coroutines.withContext
|
|
||||||
|
|
||||||
object TestUtils {
|
|
||||||
fun <T> runTest(block: suspend () -> T): T = runBlocking {
|
|
||||||
withContext(Dispatchers.IO) {
|
|
||||||
block()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -25,21 +25,20 @@ import io.modelcontextprotocol.kotlin.sdk.server.Server
|
||||||
import io.modelcontextprotocol.kotlin.sdk.server.ServerOptions
|
import io.modelcontextprotocol.kotlin.sdk.server.ServerOptions
|
||||||
import io.modelcontextprotocol.kotlin.sdk.server.SseServerTransport
|
import io.modelcontextprotocol.kotlin.sdk.server.SseServerTransport
|
||||||
import io.modelcontextprotocol.kotlin.sdk.server.mcp
|
import io.modelcontextprotocol.kotlin.sdk.server.mcp
|
||||||
import kotlin.collections.set
|
|
||||||
|
|
||||||
fun configureServer(): Server {
|
fun configureServer(): Server {
|
||||||
val server = Server(
|
val server = Server(
|
||||||
Implementation(
|
Implementation(
|
||||||
name = "mcp-kotlin test server",
|
name = "mcp-kotlin test server",
|
||||||
version = "0.1.0"
|
version = "0.1.0",
|
||||||
),
|
),
|
||||||
ServerOptions(
|
ServerOptions(
|
||||||
capabilities = ServerCapabilities(
|
capabilities = ServerCapabilities(
|
||||||
prompts = ServerCapabilities.Prompts(listChanged = true),
|
prompts = ServerCapabilities.Prompts(listChanged = true),
|
||||||
resources = ServerCapabilities.Resources(subscribe = true, listChanged = true),
|
resources = ServerCapabilities.Resources(subscribe = true, listChanged = true),
|
||||||
tools = ServerCapabilities.Tools(listChanged = true),
|
tools = ServerCapabilities.Tools(listChanged = true),
|
||||||
)
|
),
|
||||||
)
|
),
|
||||||
)
|
)
|
||||||
|
|
||||||
server.addPrompt(
|
server.addPrompt(
|
||||||
|
|
@ -49,18 +48,20 @@ fun configureServer(): Server {
|
||||||
PromptArgument(
|
PromptArgument(
|
||||||
name = "Project Name",
|
name = "Project Name",
|
||||||
description = "Project name for the new project",
|
description = "Project name for the new project",
|
||||||
required = true
|
required = true,
|
||||||
)
|
),
|
||||||
)
|
),
|
||||||
) { request ->
|
) { request ->
|
||||||
GetPromptResult(
|
GetPromptResult(
|
||||||
"Description for ${request.name}",
|
"Description for ${request.name}",
|
||||||
messages = listOf(
|
messages = listOf(
|
||||||
PromptMessage(
|
PromptMessage(
|
||||||
role = Role.user,
|
role = Role.user,
|
||||||
content = TextContent("Develop a kotlin project named <name>${request.arguments?.get("Project Name")}</name>")
|
content = TextContent(
|
||||||
)
|
"Develop a kotlin project named <name>${request.arguments?.get("Project Name")}</name>",
|
||||||
)
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -68,10 +69,10 @@ fun configureServer(): Server {
|
||||||
server.addTool(
|
server.addTool(
|
||||||
name = "kotlin-sdk-tool",
|
name = "kotlin-sdk-tool",
|
||||||
description = "A test tool",
|
description = "A test tool",
|
||||||
inputSchema = Tool.Input()
|
inputSchema = Tool.Input(),
|
||||||
) { request ->
|
) { request ->
|
||||||
CallToolResult(
|
CallToolResult(
|
||||||
content = listOf(TextContent("Hello, world!"))
|
content = listOf(TextContent("Hello, world!")),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -80,19 +81,19 @@ fun configureServer(): Server {
|
||||||
uri = "https://search.com/",
|
uri = "https://search.com/",
|
||||||
name = "Web Search",
|
name = "Web Search",
|
||||||
description = "Web search engine",
|
description = "Web search engine",
|
||||||
mimeType = "text/html"
|
mimeType = "text/html",
|
||||||
) { request ->
|
) { request ->
|
||||||
ReadResourceResult(
|
ReadResourceResult(
|
||||||
contents = listOf(
|
contents = listOf(
|
||||||
TextResourceContents("Placeholder content for ${request.uri}", request.uri, "text/html")
|
TextResourceContents("Placeholder content for ${request.uri}", request.uri, "text/html"),
|
||||||
)
|
),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
return server
|
return server
|
||||||
}
|
}
|
||||||
|
|
||||||
suspend fun runSseMcpServerWithPlainConfiguration(port: Int): Unit {
|
suspend fun runSseMcpServerWithPlainConfiguration(port: Int) {
|
||||||
val servers = ConcurrentMap<String, Server>()
|
val servers = ConcurrentMap<String, Server>()
|
||||||
println("Starting sse server on port $port. ")
|
println("Starting sse server on port $port. ")
|
||||||
println("Use inspector to connect to the http://localhost:$port/sse")
|
println("Use inspector to connect to the http://localhost:$port/sse")
|
||||||
|
|
@ -139,7 +140,7 @@ suspend fun runSseMcpServerWithPlainConfiguration(port: Int): Unit {
|
||||||
* @param port The port number on which the SSE MCP server will listen for client connections.
|
* @param port The port number on which the SSE MCP server will listen for client connections.
|
||||||
* @return Unit This method does not return a value.
|
* @return Unit This method does not return a value.
|
||||||
*/
|
*/
|
||||||
suspend fun runSseMcpServerUsingKtorPlugin(port: Int): Unit {
|
suspend fun runSseMcpServerUsingKtorPlugin(port: Int) {
|
||||||
println("Starting sse server on port $port")
|
println("Starting sse server on port $port")
|
||||||
println("Use inspector to connect to the http://localhost:$port/sse")
|
println("Use inspector to connect to the http://localhost:$port/sse")
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue