+ code coverage for ClientOptions/Capabilities code

Author: Esteban Solano

tests/ModelContextProtocol.Tests/Client/McpClientExtensionsTests.cs

@@ -79,7 +79,7 @@ public async Task CreateSamplingHandler_ShouldHandleTextMessages(float? temperat
         var handler = McpClientExtensions.CreateSamplingHandler(mockChatClient.Object);
 
         // Act
-        var result = await handler(requestParams, cancellationToken);
+        var result = await handler(requestParams, Mock.Of<IProgress<ProgressNotificationValue>>(), cancellationToken);
 
         // Assert
         Assert.NotNull(result);
@@ -96,19 +96,19 @@ public async Task CreateSamplingHandler_ShouldHandleImageMessages()
         var mockChatClient = new Mock<IChatClient>();
         var requestParams = new CreateMessageRequestParams
         {
-            Messages = new[]
-            {
-            new SamplingMessage
-            {
-                Role = Role.User,
-                Content = new Content
+            Messages =
+            [
+                new SamplingMessage
                 {
-                    Type = "image",
-                    MimeType = "image/png",
-                    Data = Convert.ToBase64String(new byte[] { 1, 2, 3 })
+                    Role = Role.User,
+                    Content = new Content
+                    {
+                        Type = "image",
+                        MimeType = "image/png",
+                        Data = Convert.ToBase64String(new byte[] { 1, 2, 3 })
+                    }
                 }
-            }
-        },
+            ],
             MaxTokens = 100
         };
         var cancellationToken = CancellationToken.None;
@@ -127,7 +127,7 @@ public async Task CreateSamplingHandler_ShouldHandleImageMessages()
         var handler = McpClientExtensions.CreateSamplingHandler(mockChatClient.Object);
 
         // Act
-        var result = await handler(requestParams, cancellationToken);
+        var result = await handler(requestParams, Mock.Of<IProgress<ProgressNotificationValue>>(), cancellationToken);
 
         // Assert
         Assert.NotNull(result);
@@ -144,24 +144,23 @@ public async Task CreateSamplingHandler_ShouldHandleResourceMessages()
         var mockChatClient = new Mock<IChatClient>();
         var requestParams = new CreateMessageRequestParams
         {
-            Messages = new[]
-            {
-            new SamplingMessage
-            {
-                Role = Role.User,
-                Content = new Content
+            Messages =
+            [
+                new SamplingMessage
                 {
-                    Type = "resource",
-                    Resource = new ResourceContents
+                    Role = Role.User,
+                    Content = new Content
                     {
-                        Text = "Resource text",
-                        Blob = Convert.ToBase64String(new byte[] { 4, 5, 6 }),
-                        MimeType = "application/octet-stream"
+                        Type = "resource",
+                        Resource = new BlobResourceContents
+                        {
+                            Blob = "Resource text",
+                            MimeType = "application/octet-stream"
+                        }
                     }
                 }
-            }
-        },
-            MaxTokens = 100
+            ],
+                MaxTokens = 100
         };
         var cancellationToken = CancellationToken.None;
 
@@ -179,7 +178,7 @@ public async Task CreateSamplingHandler_ShouldHandleResourceMessages()
         var handler = McpClientExtensions.CreateSamplingHandler(mockChatClient.Object);
 
         // Act
-        var result = await handler(requestParams, cancellationToken);
+        var result = await handler(requestParams, Mock.Of<IProgress<ProgressNotificationValue>>(), cancellationToken);
 
         // Assert
         Assert.NotNull(result);
@@ -189,7 +188,7 @@ public async Task CreateSamplingHandler_ShouldHandleResourceMessages()
         Assert.Equal("endTurn", result.StopReason);
     }
 
-    public ValueTask DisposeAsync()
+    public async ValueTask DisposeAsync()
     {
         await _cts.CancelAsync();
 

tests/ModelContextProtocol.Tests/Client/McpClientFactoryTests.cs

@@ -1,7 +1,9 @@
+using Microsoft.Extensions.Logging;
 using ModelContextProtocol.Client;
 using ModelContextProtocol.Protocol.Messages;
 using ModelContextProtocol.Protocol.Transport;
 using ModelContextProtocol.Protocol.Types;
+using Moq;
 using System.Text.Json;
 using System.Threading.Channels;
 
@@ -187,7 +189,68 @@ public async Task McpFactory_WithInvalidTransportOptions_ThrowsFormatException(s
         await Assert.ThrowsAsync<ArgumentException>(() => McpClientFactory.CreateAsync(config, _defaultOptions, cancellationToken: TestContext.Current.CancellationToken));
     }
 
-    private sealed class NopTransport : ITransport, IClientTransport
+    [Theory]
+    [InlineData(typeof(NopTransport))]
+    [InlineData(typeof(FailureTransport))]
+    public async Task CreateAsync_WithCapabilitiesOptions(Type transportType)
+    {
+        // Arrange
+        var serverConfig = new McpServerConfig
+        {
+            Id = "TestServer",
+            Name = "TestServer",
+            TransportType = "stdio",
+            Location = "test-location"
+        };
+
+        var clientOptions = new McpClientOptions
+        {
+            ClientInfo = new Implementation 
+            {
+                Name = "TestClient", 
+                Version = "1.0.0.0"
+            },
+            Capabilities = new ClientCapabilities
+            {
+                Sampling = new SamplingCapability
+                {
+                    SamplingHandler = (c, p, t) => Task.FromResult(
+                        new CreateMessageResult { 
+                            Content = new Content { Text = "result" }, 
+                            Model = "test-model", 
+                            Role = "test-role", 
+                            StopReason = "endTurn" 
+                    }),
+                },
+                Roots = new RootsCapability
+                {
+                    ListChanged = true,
+                    RootsHandler = (t, r) => Task.FromResult(new ListRootsResult { Roots = [] }),
+                }
+            }
+        };
+
+        var clientTransport = (IClientTransport?)Activator.CreateInstance(transportType);
+        IMcpClient? client = null;
+
+        var actionTask = McpClientFactory.CreateAsync(serverConfig, clientOptions, (config, logger) => clientTransport ?? new NopTransport(), new Mock<ILoggerFactory>().Object, CancellationToken.None);
+
+        // Act
+        if (clientTransport is FailureTransport)
+        {
+            var exception = await Assert.ThrowsAsync<InvalidOperationException>(async() => await actionTask);
+            Assert.Equal(FailureTransport.ExpectedMessage, exception.Message);
+        }
+        else
+        {
+            client = await actionTask;
+
+            // Assert
+            Assert.NotNull(client);
+        }        
+    }
+
+    private class NopTransport : ITransport, IClientTransport
     {
         private readonly Channel<IJsonRpcMessage> _channel = Channel.CreateUnbounded<IJsonRpcMessage>();
 
@@ -199,7 +262,7 @@ private sealed class NopTransport : ITransport, IClientTransport
 
         public ValueTask DisposeAsync() => default;
 
-        public Task SendMessageAsync(IJsonRpcMessage message, CancellationToken cancellationToken = default)
+        public virtual Task SendMessageAsync(IJsonRpcMessage message, CancellationToken cancellationToken = default)
         {
             switch (message)
             {
@@ -224,4 +287,14 @@ public Task SendMessageAsync(IJsonRpcMessage message, CancellationToken cancella
             return Task.CompletedTask;
         }
     }
+
+    private sealed class FailureTransport : NopTransport 
+    {
+        public const string ExpectedMessage = "Something failed";
+
+        public override Task SendMessageAsync(IJsonRpcMessage message, CancellationToken cancellationToken = default)
+        {
+            throw new InvalidOperationException(ExpectedMessage);
+        }
+    }
 }