Skip to content

ManagedWebSocket: report actual messageType in invalid-type ArgumentException #129069

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Copilot wants to merge 3 commits into
base: main
Choose a base branch
from
+11 −4
Open

ManagedWebSocket: report actual messageType in invalid-type ArgumentException #129069

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
86d128d
Initial plan
Copilot Jun 6, 2026
5e26c64
Report actual messageType value in ThrowIfInvalidMessageType Argument…
Copilot Jun 6, 2026
d42950a
Add undefined message-type assertion to websocket send test
Copilot Jun 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion src/libraries/System.Net.WebSockets.Client/tests/SendReceiveTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,10 +185,17 @@ protected async Task RunClient_SendAsync_SendCloseMessageType_ThrowsArgumentExce
var expectedException = new ArgumentException(expectedInnerMessage, "messageType");
string expectedMessage = expectedException.Message;

AssertExtensions.Throws<ArgumentException>("messageType", () =>
ArgumentException ex = AssertExtensions.Throws<ArgumentException>("messageType", () =>
{
Task t = SendAsync(cws, new ArraySegment<byte>(), WebSocketMessageType.Close, true, cts.Token);
});
Assert.Equal(expectedMessage, ex.Message);

ArgumentException ex2 = AssertExtensions.Throws<ArgumentException>("messageType", () =>
{
Task t = SendAsync(cws, new ArraySegment<byte>(), (WebSocketMessageType)999, true, cts.Token);
});
Assert.Contains("999", ex2.Message);

Assert.Equal(WebSocketState.Open, cws.State);
}
Expand Down
6 changes: 3 additions & 3 deletions src/libraries/System.Net.WebSockets/src/System/Net/WebSockets/ManagedWebSocket.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1918,13 +1918,13 @@ internal static void ThrowIfInvalidMessageType(WebSocketMessageType messageType,
{
if (messageType is not (WebSocketMessageType.Text or WebSocketMessageType.Binary))
{
ThrowInvalidMessageType(paramName);
ThrowInvalidMessageType(messageType, paramName);
}

static void ThrowInvalidMessageType(string? paramName) =>
static void ThrowInvalidMessageType(WebSocketMessageType messageType, string? paramName) =>
throw new ArgumentException(SR.Format(
SR.net_WebSockets_Argument_InvalidMessageType,
nameof(WebSocketMessageType.Close), nameof(SendAsync), nameof(WebSocketMessageType.Binary), nameof(WebSocketMessageType.Text), nameof(CloseOutputAsync)),
messageType, nameof(SendAsync), nameof(WebSocketMessageType.Binary), nameof(WebSocketMessageType.Text), nameof(CloseOutputAsync)),
Comment thread
MihaZupan marked this conversation as resolved.
paramName);
}

Expand Down
Loading