Skip to content

Commit c2a3252

Browse files
committed
Fix nullability
1 parent 608cf0d commit c2a3252

File tree

4 files changed

+19
-17
lines changed

4 files changed

+19
-17
lines changed

tests/ModelContextProtocol.Tests/Client/McpClientTests.cs

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -56,15 +56,17 @@ public async Task CanReadServerInfo()
5656
Assert.NotNull(serverInfo.Icons);
5757
Assert.Equal(2, serverInfo.Icons.Count);
5858

59-
Assert.Equal("https://example.com/icon-48.png", serverInfo.Icons[0].Source);
60-
Assert.Equal("image/png", serverInfo.Icons[0].MimeType);
61-
Assert.Single(serverInfo.Icons[0].Sizes, "48x48");
62-
Assert.Equal("light", serverInfo.Icons[0].Theme);
63-
64-
Assert.Equal("https://example.com/icon.svg", serverInfo.Icons[1].Source);
65-
Assert.Equal("image/svg+xml", serverInfo.Icons[1].MimeType);
66-
Assert.Single(serverInfo.Icons[1].Sizes, "any");
67-
Assert.Equal("dark", serverInfo.Icons[1].Theme);
59+
var icon0 = serverInfo.Icons[0];
60+
Assert.Equal("https://example.com/icon-48.png", icon0.Source);
61+
Assert.Equal("image/png", icon0.MimeType);
62+
Assert.Single(icon0.Sizes!, "48x48");
63+
Assert.Equal("light", icon0.Theme);
64+
65+
var icon1 = serverInfo.Icons[1];
66+
Assert.Equal("https://example.com/icon.svg", icon1.Source);
67+
Assert.Equal("image/svg+xml", icon1.MimeType);
68+
Assert.Single(icon1.Sizes!, "any");
69+
Assert.Equal("dark", icon1.Theme);
6870
}
6971

7072
[Theory]

tests/ModelContextProtocol.Tests/Server/McpServerPromptTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -506,7 +506,7 @@ public void SupportsIconsInCreateOptions()
506506
Icons = icons
507507
});
508508

509-
var icon = Assert.Single(prompt.ProtocolPrompt.Icons);
509+
var icon = Assert.Single(prompt.ProtocolPrompt.Icons!);
510510
Assert.Equal("https://example.com/prompt-icon.png", icon.Source);
511511
Assert.Equal("image/png", icon.MimeType);
512512
}
@@ -516,7 +516,7 @@ public void SupportsIconSourceInAttribute()
516516
{
517517
McpServerPrompt prompt = McpServerPrompt.Create([McpServerPrompt(IconSource = "https://example.com/prompt-icon.svg")] () => "test prompt");
518518

519-
var icon = Assert.Single(prompt.ProtocolPrompt.Icons);
519+
var icon = Assert.Single(prompt.ProtocolPrompt.Icons!);
520520
Assert.Equal("https://example.com/prompt-icon.svg", icon.Source);
521521
Assert.Null(icon.MimeType);
522522
Assert.Null(icon.Sizes);
@@ -535,7 +535,7 @@ public void CreateOptionsIconsOverrideAttributeIconSource_Prompt()
535535
Icons = optionsIcons
536536
});
537537

538-
var icon = Assert.Single(prompt.ProtocolPrompt.Icons);
538+
var icon = Assert.Single(prompt.ProtocolPrompt.Icons!);
539539
Assert.Equal("https://example.com/override-icon.svg", icon.Source);
540540
Assert.Equal("image/svg+xml", icon.MimeType);
541541
}

tests/ModelContextProtocol.Tests/Server/McpServerResourceTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -691,7 +691,7 @@ public void SupportsIconsInResourceCreateOptions()
691691
Icons = icons
692692
});
693693

694-
var icon = Assert.Single(resource.ProtocolResourceTemplate.Icons);
694+
var icon = Assert.Single(resource.ProtocolResourceTemplate.Icons!);
695695
Assert.Equal("https://example.com/resource-icon.png", icon.Source);
696696
Assert.Equal("image/png", icon.MimeType);
697697
}
@@ -701,7 +701,7 @@ public void SupportsIconSourceInResourceAttribute()
701701
{
702702
McpServerResource resource = McpServerResource.Create([McpServerResource(UriTemplate = "test://resource", IconSource = "https://example.com/resource-icon.svg")] () => "test content");
703703

704-
var icon = Assert.Single(resource.ProtocolResourceTemplate.Icons);
704+
var icon = Assert.Single(resource.ProtocolResourceTemplate.Icons!);
705705
Assert.Equal("https://example.com/resource-icon.svg", icon.Source);
706706
Assert.Null(icon.MimeType);
707707
Assert.Null(icon.Sizes);
@@ -720,7 +720,7 @@ public void CreateOptionsIconsOverrideAttributeIconSource_Resource()
720720
Icons = optionsIcons
721721
});
722722

723-
var icon = Assert.Single(resource.ProtocolResourceTemplate.Icons);
723+
var icon = Assert.Single(resource.ProtocolResourceTemplate.Icons!);
724724
Assert.Equal("https://example.com/override-icon.svg", icon.Source);
725725
Assert.Equal("image/svg+xml", icon.MimeType);
726726
}

tests/ModelContextProtocol.Tests/Server/McpServerToolTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -711,7 +711,7 @@ public void SupportsIconSourceInAttribute()
711711
{
712712
McpServerTool tool = McpServerTool.Create([McpServerTool(IconSource = "https://example.com/tool-icon.png")] () => "result");
713713

714-
var icon = Assert.Single(tool.ProtocolTool.Icons);
714+
var icon = Assert.Single(tool.ProtocolTool.Icons!);
715715
Assert.Equal("https://example.com/tool-icon.png", icon.Source);
716716
Assert.Null(icon.MimeType);
717717
Assert.Null(icon.Sizes);
@@ -730,7 +730,7 @@ public void CreateOptionsIconsOverrideAttributeIconSource()
730730
Icons = optionsIcons
731731
});
732732

733-
var icon = Assert.Single(tool.ProtocolTool.Icons);
733+
var icon = Assert.Single(tool.ProtocolTool.Icons!);
734734
Assert.Equal("https://example.com/override-icon.svg", icon.Source);
735735
Assert.Equal("image/svg+xml", icon.MimeType);
736736
}

0 commit comments

Comments
 (0)