diff --git a/src/WireMock.Net.Minimal/ResponseProviders/WebSocketResponseProvider.cs b/src/WireMock.Net.Minimal/ResponseProviders/WebSocketResponseProvider.cs index af1ecbb0..ef7593c8 100644 --- a/src/WireMock.Net.Minimal/ResponseProviders/WebSocketResponseProvider.cs +++ b/src/WireMock.Net.Minimal/ResponseProviders/WebSocketResponseProvider.cs @@ -97,10 +97,6 @@ internal class WebSocketResponseProvider : IResponseProvider { await HandleCustomAsync(wsContext, _builder.MessageHandler).ConfigureAwait(false); } - else if (_builder.MessageSequence != null) - { - await HandleSequenceAsync(wsContext, _builder.MessageSequence).ConfigureAwait(false); - } else { // Default: keep connection open until client closes @@ -216,11 +212,6 @@ internal class WebSocketResponseProvider : IResponseProvider } } - private async Task HandleSequenceAsync(WireMockWebSocketContext context, WebSocketMessageSequence sequence) - { - await sequence.ExecuteAsync(context).ConfigureAwait(false); - } - private async Task HandleProxyAsync(WireMockWebSocketContext context, ProxyAndRecordSettings settings) { using var clientWebSocket = new ClientWebSocket(); diff --git a/src/WireMock.Net.Minimal/WebSockets/WebSocketBuilder.cs b/src/WireMock.Net.Minimal/WebSockets/WebSocketBuilder.cs index 7b83f9a4..7e078c16 100644 --- a/src/WireMock.Net.Minimal/WebSockets/WebSocketBuilder.cs +++ b/src/WireMock.Net.Minimal/WebSockets/WebSocketBuilder.cs @@ -1,7 +1,6 @@ // Copyright © WireMock.Net using System; -using System.Collections.Generic; using System.Threading.Tasks; using Stef.Validation; using WireMock.Settings; @@ -23,9 +22,6 @@ internal class WebSocketBuilder : IWebSocketBuilder /// public Func? MessageHandler { get; private set; } - /// - public WebSocketMessageSequence? MessageSequence { get; private set; } - /// public ProxyAndRecordSettings? ProxySettings { get; private set; } @@ -65,7 +61,7 @@ internal class WebSocketBuilder : IWebSocketBuilder return this; } - public IWebSocketBuilder WithMessage(Action configure) + public IWebSocketBuilder SendMessage(Action configure) { Guard.NotNull(configure); var messageBuilder = new WebSocketMessageBuilder(); @@ -82,7 +78,7 @@ internal class WebSocketBuilder : IWebSocketBuilder }); } - public IWebSocketBuilder WithMessages(Action configure) + public IWebSocketBuilder SendMessages(Action configure) { Guard.NotNull(configure); var messagesBuilder = new WebSocketMessagesBuilder(); @@ -109,15 +105,6 @@ internal class WebSocketBuilder : IWebSocketBuilder return this; } - public IWebSocketBuilder WithMessageSequence(Action configure) - { - var sequenceBuilder = new WebSocketMessageSequenceBuilder(); - configure(sequenceBuilder); - MessageSequence = sequenceBuilder.Build(); - IsEcho = false; - return this; - } - public IWebSocketBuilder WithBroadcast() { IsBroadcast = true; diff --git a/src/WireMock.Net.Minimal/WebSockets/WebSocketMessageSequence.cs b/src/WireMock.Net.Minimal/WebSockets/WebSocketMessageSequence.cs deleted file mode 100644 index 1e5850b9..00000000 --- a/src/WireMock.Net.Minimal/WebSockets/WebSocketMessageSequence.cs +++ /dev/null @@ -1,14 +0,0 @@ -// Copyright © WireMock.Net - -using System.Threading.Tasks; - -namespace WireMock.WebSockets; - -// Placeholder classes for future implementation -internal class WebSocketMessageSequence -{ - public Task ExecuteAsync(WireMockWebSocketContext context) - { - return Task.CompletedTask; - } -} diff --git a/src/WireMock.Net.Minimal/WebSockets/WebSocketMessageSequenceBuilder.cs b/src/WireMock.Net.Minimal/WebSockets/WebSocketMessageSequenceBuilder.cs deleted file mode 100644 index e8acd0f8..00000000 --- a/src/WireMock.Net.Minimal/WebSockets/WebSocketMessageSequenceBuilder.cs +++ /dev/null @@ -1,11 +0,0 @@ -// Copyright © WireMock.Net - -namespace WireMock.WebSockets; - -internal class WebSocketMessageSequenceBuilder : IWebSocketMessageSequenceBuilder -{ - public WebSocketMessageSequence Build() - { - return new WebSocketMessageSequence(); - } -} diff --git a/src/WireMock.Net.Shared/WebSockets/IWebSocketBuilder.cs b/src/WireMock.Net.Shared/WebSockets/IWebSocketBuilder.cs index d45d8fb2..41bd5ca0 100644 --- a/src/WireMock.Net.Shared/WebSockets/IWebSocketBuilder.cs +++ b/src/WireMock.Net.Shared/WebSockets/IWebSocketBuilder.cs @@ -28,14 +28,14 @@ public interface IWebSocketBuilder /// /// Action to configure the message [PublicAPI] - IWebSocketBuilder WithMessage(Action configure); + IWebSocketBuilder SendMessage(Action configure); /// /// Configure and send multiple messages in response to any received message /// /// Action to configure the messages [PublicAPI] - IWebSocketBuilder WithMessages(Action configure); + IWebSocketBuilder SendMessages(Action configure); /// /// Handle incoming WebSocket messages @@ -43,12 +43,6 @@ public interface IWebSocketBuilder [PublicAPI] IWebSocketBuilder WithMessageHandler(Func handler); - /// - /// Define a sequence of messages to send - /// - [PublicAPI] - IWebSocketBuilder WithMessageSequence(Action configure); - /// /// Enable broadcast mode for this mapping /// diff --git a/src/WireMock.Net.Shared/WebSockets/IWebSocketMessageSequenceBuilder.cs b/src/WireMock.Net.Shared/WebSockets/IWebSocketMessageSequenceBuilder.cs deleted file mode 100644 index bb5a229a..00000000 --- a/src/WireMock.Net.Shared/WebSockets/IWebSocketMessageSequenceBuilder.cs +++ /dev/null @@ -1,11 +0,0 @@ -// Copyright © WireMock.Net - -namespace WireMock.WebSockets; - -/// -/// WebSocket Message Sequence Builder interface (placeholder for future implementation) -/// -public interface IWebSocketMessageSequenceBuilder -{ - // Future: Methods for building message sequences -} diff --git a/test/WireMock.Net.Tests/WebSockets/WebSocketIntegrationTests.cs b/test/WireMock.Net.Tests/WebSockets/WebSocketIntegrationTests.cs index 64e79a6c..44531b4a 100644 --- a/test/WireMock.Net.Tests/WebSockets/WebSocketIntegrationTests.cs +++ b/test/WireMock.Net.Tests/WebSockets/WebSocketIntegrationTests.cs @@ -72,7 +72,7 @@ public class WebSocketIntegrationTests(ITestOutputHelper output) ) .RespondWith(Response.Create() .WithWebSocket(ws => ws - .WithMessage(m => m.WithText(responseMessage)) + .SendMessage(m => m.WithText(responseMessage)) ) ); @@ -117,7 +117,7 @@ public class WebSocketIntegrationTests(ITestOutputHelper output) ) .RespondWith(Response.Create() .WithWebSocket(ws => ws - .WithMessage(m => m.WithText(responseMessage)) + .SendMessage(m => m.WithText(responseMessage)) ) ); @@ -161,7 +161,7 @@ public class WebSocketIntegrationTests(ITestOutputHelper output) ) .RespondWith(Response.Create() .WithWebSocket(ws => ws - .WithMessage(m => m.WithBytes(responseBytes)) + .SendMessage(m => m.WithBytes(responseBytes)) ) ); @@ -207,7 +207,7 @@ public class WebSocketIntegrationTests(ITestOutputHelper output) ) .RespondWith(Response.Create() .WithWebSocket(ws => ws - .WithMessage(m => m.WithBytes(responseBytes)) + .SendMessage(m => m.WithBytes(responseBytes)) ) ); @@ -258,7 +258,7 @@ public class WebSocketIntegrationTests(ITestOutputHelper output) ) .RespondWith(Response.Create() .WithWebSocket(ws => ws - .WithMessage(m => m.WithJson(responseData)) + .SendMessage(m => m.WithJson(responseData)) ) ); @@ -311,7 +311,7 @@ public class WebSocketIntegrationTests(ITestOutputHelper output) ) .RespondWith(Response.Create() .WithWebSocket(ws => ws - .WithMessage(m => m.WithJson(responseData)) + .SendMessage(m => m.WithJson(responseData)) ) );