Skip to content

Commit 8abd2e9

Browse files
Copilotstephentoub
andcommitted
Replace all Mock<McpServer> usages with McpServer.Create() + TestServerTransport
Co-authored-by: stephentoub <2642209+stephentoub@users.noreply.github.com>
1 parent 5546543 commit 8abd2e9

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

tests/ModelContextProtocol.Tests/Configuration/McpServerBuilderExtensionsPromptsTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using ModelContextProtocol.Client;
66
using ModelContextProtocol.Protocol;
77
using ModelContextProtocol.Server;
8-
using Moq;
8+
using ModelContextProtocol.Tests.Utils;
99
using System.Collections;
1010
using System.ComponentModel;
1111
using System.Text.Json;
@@ -314,7 +314,7 @@ public async Task WithPrompts_TargetInstance_UsesTarget()
314314
sc.AddMcpServer().WithPrompts(target);
315315

316316
McpServerPrompt prompt = sc.BuildServiceProvider().GetServices<McpServerPrompt>().First(t => t.ProtocolPrompt.Name == "returns_string");
317-
var result = await prompt.GetAsync(new RequestContext<GetPromptRequestParams>(new Mock<McpServer>().Object, new JsonRpcRequest { Method = "test", Id = new RequestId("1") })
317+
var result = await prompt.GetAsync(new RequestContext<GetPromptRequestParams>(McpServer.Create(new TestServerTransport(), new McpServerOptions()), new JsonRpcRequest { Method = "test", Id = new RequestId("1") })
318318
{
319319
Params = new GetPromptRequestParams
320320
{

tests/ModelContextProtocol.Tests/Configuration/McpServerBuilderExtensionsResourcesTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using ModelContextProtocol.Client;
66
using ModelContextProtocol.Protocol;
77
using ModelContextProtocol.Server;
8-
using Moq;
8+
using ModelContextProtocol.Tests.Utils;
99
using System.Collections;
1010
using System.ComponentModel;
1111
using System.Threading.Channels;
@@ -345,7 +345,7 @@ public async Task WithResources_TargetInstance_UsesTarget()
345345
sc.AddMcpServer().WithResources(target);
346346

347347
McpServerResource resource = sc.BuildServiceProvider().GetServices<McpServerResource>().First(t => t.ProtocolResource?.Name == "returns_string");
348-
var result = await resource.ReadAsync(new RequestContext<ReadResourceRequestParams>(new Mock<McpServer>().Object, new JsonRpcRequest { Method = "test", Id = new RequestId("1") })
348+
var result = await resource.ReadAsync(new RequestContext<ReadResourceRequestParams>(McpServer.Create(new TestServerTransport(), new McpServerOptions()), new JsonRpcRequest { Method = "test", Id = new RequestId("1") })
349349
{
350350
Params = new()
351351
{

tests/ModelContextProtocol.Tests/Configuration/McpServerBuilderExtensionsToolsTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using ModelContextProtocol.Client;
66
using ModelContextProtocol.Protocol;
77
using ModelContextProtocol.Server;
8-
using Moq;
8+
using ModelContextProtocol.Tests.Utils;
99
using System.Collections;
1010
using System.Collections.Concurrent;
1111
using System.ComponentModel;
@@ -594,7 +594,7 @@ public async Task WithTools_TargetInstance_UsesTarget()
594594
sc.AddMcpServer().WithTools(target, BuilderToolsJsonContext.Default.Options);
595595

596596
McpServerTool tool = sc.BuildServiceProvider().GetServices<McpServerTool>().First(t => t.ProtocolTool.Name == "get_ctor_parameter");
597-
var result = await tool.InvokeAsync(new RequestContext<CallToolRequestParams>(new Mock<McpServer>().Object, new JsonRpcRequest { Method = "test", Id = new RequestId("1") }), TestContext.Current.CancellationToken);
597+
var result = await tool.InvokeAsync(new RequestContext<CallToolRequestParams>(McpServer.Create(new TestServerTransport(), new McpServerOptions()), new JsonRpcRequest { Method = "test", Id = new RequestId("1") }), TestContext.Current.CancellationToken);
598598

599599
Assert.Equal(target.GetCtorParameter(), (result.Content[0] as TextContentBlock)?.Text);
600600
}

0 commit comments

Comments
 (0)