Add more tests

Author: MackinnonBuck

tests/ModelContextProtocol.Tests/Client/McpClientTests.cs

@@ -27,6 +27,42 @@ protected override void ConfigureServices(ServiceCollection services, IMcpServer
         }
         mcpServerBuilder.WithTools([McpServerTool.Create([McpServerTool(Destructive = false, OpenWorld = true)] (string i) => $"{i} Result", new() { Name = "ValuesSetViaAttr" })]);
         mcpServerBuilder.WithTools([McpServerTool.Create([McpServerTool(Destructive = false, OpenWorld = true)] (string i) => $"{i} Result", new() { Name = "ValuesSetViaOptions", Destructive = true, OpenWorld = false, ReadOnly = true })]);
+
+        services.Configure<McpServerOptions>(o =>
+        {
+            o.ServerInfo = new Implementation
+            {
+                Name = "test-server",
+                Version = "1.0.0",
+                WebsiteUrl = "https://example.com",
+                Icons =
+                [
+                    new Icon { Source = "https://example.com/icon-48.png", MimeType = "image/png", Sizes = ["48x48"] },
+                    new Icon { Source = "https://example.com/icon.svg", MimeType = "image/svg+xml", Sizes = ["any"] }
+                ]
+            };
+        });
+    }
+
+    [Fact]
+    public async Task CanReadServerInfo()
+    {
+        await using McpClient client = await CreateMcpClientForServer();
+
+        var serverInfo = client.ServerInfo;
+        Assert.Equal("test-server", serverInfo.Name);
+        Assert.Equal("1.0.0", serverInfo.Version);
+        Assert.Equal("https://example.com", serverInfo.WebsiteUrl);
+        Assert.NotNull(serverInfo.Icons);
+        Assert.Equal(2, serverInfo.Icons.Count);
+
+        Assert.Equal("https://example.com/icon-48.png", serverInfo.Icons[0].Source);
+        Assert.Equal("image/png", serverInfo.Icons[0].MimeType);
+        var icon0Sizes = serverInfo.Icons[0].Sizes; Assert.NotNull(icon0Sizes); Assert.Contains("48x48", icon0Sizes);
+
+        Assert.Equal("https://example.com/icon.svg", serverInfo.Icons[1].Source);
+        Assert.Equal("image/svg+xml", serverInfo.Icons[1].MimeType);
+        var icon1Sizes = serverInfo.Icons[1].Sizes; Assert.NotNull(icon1Sizes); Assert.Contains("any", icon1Sizes);
     }
 
     [Theory]

tests/ModelContextProtocol.Tests/Configuration/McpServerBuilderExtensionsPromptsTests.cs

@@ -179,6 +179,22 @@ public async Task TitleAttributeProperty_PropagatedToTitle()
         Assert.Equal("This is a title", prompt.Title);
     }
 
+    [Fact]
+    public async Task IconSourceAttributeProperty_PropagatedToIcons()
+    {
+        await using McpClient client = await CreateMcpClientForServer();
+
+        var prompts = await client.ListPromptsAsync(cancellationToken: TestContext.Current.CancellationToken);
+        Assert.NotNull(prompts);
+        Assert.NotEmpty(prompts);
+
+        McpClientPrompt prompt = prompts.First(t => t.Name == "returns_string");
+
+        Assert.NotNull(prompt.ProtocolPrompt.Icons);
+        Assert.NotEmpty(prompt.ProtocolPrompt.Icons);
+        Assert.Equal("https://example.com/prompt-icon.svg", prompt.ProtocolPrompt.Icons[0].Source);
+    }
+
     [Fact]
     public async Task Throws_When_Prompt_Fails()
     {
@@ -325,12 +341,11 @@ public static ChatMessage[] ReturnsChatMessages([Description("The first paramete
                 new(ChatRole.User, "Summarize."),
             ];
 
-
         [McpServerPrompt, Description("Returns chat messages")]
         public static ChatMessage[] ThrowsException([Description("The first parameter")] string message) =>
             throw new FormatException("uh oh");
 
-        [McpServerPrompt(Title = "This is a title"), Description("Returns chat messages")]
+        [McpServerPrompt(Title = "This is a title", IconSource = "https://example.com/prompt-icon.svg"), Description("Returns chat messages")]
         public string ReturnsString([Description("The first parameter")] string message) =>
             $"The prompt is: {message}. The id is {id}.";
     }

tests/ModelContextProtocol.Tests/Configuration/McpServerBuilderExtensionsResourcesTests.cs

@@ -218,6 +218,28 @@ public async Task TitleAttributeProperty_PropagatedToTitle()
         Assert.Equal("This is another title", resourceTemplate.Title);
     }
 
+    [Fact]
+    public async Task IconSourceAttributeProperty_PropagatedToIcons()
+    {
+        await using McpClient client = await CreateMcpClientForServer();
+
+        var resources = await client.ListResourcesAsync(cancellationToken: TestContext.Current.CancellationToken);
+        Assert.NotNull(resources);
+        Assert.NotEmpty(resources);
+        McpClientResource resource = resources.First(t => t.Name == "some_neat_direct_resource");
+        Assert.NotNull(resource.ProtocolResource.Icons);
+        Assert.NotEmpty(resource.ProtocolResource.Icons);
+        Assert.Equal("https://example.com/direct-resource-icon.svg", resource.ProtocolResource.Icons[0].Source);
+
+        var resourceTemplates = await client.ListResourceTemplatesAsync(cancellationToken: TestContext.Current.CancellationToken);
+        Assert.NotNull(resourceTemplates);
+        Assert.NotEmpty(resourceTemplates);
+        McpClientResourceTemplate resourceTemplate = resourceTemplates.First(t => t.Name == "some_neat_templated_resource");
+        Assert.NotNull(resourceTemplate.ProtocolResourceTemplate.Icons);
+        Assert.NotEmpty(resourceTemplate.ProtocolResourceTemplate.Icons);
+        Assert.Equal("https://example.com/templated-resource-icon.svg", resourceTemplate.ProtocolResourceTemplate.Icons[0].Source);
+    }
+
     [Fact]
     public async Task Throws_When_Resource_Fails()
     {
@@ -341,10 +363,10 @@ public void Register_Resources_From_Multiple_Sources()
     [McpServerResourceType]
     public sealed class SimpleResources
     {
-        [McpServerResource(Title = "This is a title"), Description("Some neat direct resource")]
+        [McpServerResource(Title = "This is a title", IconSource = "https://example.com/direct-resource-icon.svg"), Description("Some neat direct resource")]
         public static string SomeNeatDirectResource() => "This is a neat resource";
 
-        [McpServerResource(Title = "This is another title"), Description("Some neat resource with parameters")]
+        [McpServerResource(Title = "This is another title", IconSource = "https://example.com/templated-resource-icon.svg"), Description("Some neat resource with parameters")]
         public static string SomeNeatTemplatedResource(string name) => $"This is a neat resource with parameters: {name}";
 
         [McpServerResource]

tests/ModelContextProtocol.Tests/Configuration/McpServerBuilderExtensionsToolsTests.cs

@@ -645,6 +645,22 @@ public async Task TitleAttributeProperty_PropagatedToTitle()
         Assert.Equal("This is a title", tool.ProtocolTool.Annotations?.Title);
     }
 
+    [Fact]
+    public async Task IconSourceAttributeProperty_PropagatedToIcons()
+    {
+        await using McpClient client = await CreateMcpClientForServer();
+
+        var tools = await client.ListToolsAsync(cancellationToken: TestContext.Current.CancellationToken);
+        Assert.NotNull(tools);
+        Assert.NotEmpty(tools);
+
+        McpClientTool tool = tools.First(t => t.Name == "echo_complex");
+
+        Assert.NotNull(tool.ProtocolTool.Icons);
+        Assert.NotEmpty(tool.ProtocolTool.Icons);
+        Assert.Equal("https://example.com/tool-icon.svg", tool.ProtocolTool.Icons[0].Source);
+    }
+
     [Fact]
     public async Task HandlesIProgressParameter()
     {
@@ -786,7 +802,7 @@ public static int ReturnCancellationToken(CancellationToken cancellationToken)
             return cancellationToken.GetHashCode();
         }
 
-        [McpServerTool(Title = "This is a title")]
+        [McpServerTool(Title = "This is a title", IconSource = "https://example.com/tool-icon.svg")]
         public static string EchoComplex(ComplexObject complex)
         {
             return complex.Name!;