Removed all obsolete methods. (#191)

Author: dnperfors

CHANGELOG.md

@@ -4,6 +4,13 @@ All notable changes to TestableHttpClient will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and 
 this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.10] - unplanned
+### Removed
+- `TestableHttpMessageHandler.SimulateTimeout` has been removed, and can be replaced with `RespondWith(Responses.Timeout())`.
+- `TestableHttpMessageHandler.RespondWith(Func<HttpRequestMessage, HttpResponseMessage>)` has been removed, it's functionality is replaced by IResponse.
+- `RespondWith(this TestableHttpMessageHandler, HttpResponseMessage)` has been removed, the response is modified with every call, so it doesn't work reliably and is different from how HttpClientHandler works, which creates a HttpResponseMessage for every request.
+- `HttpResponseMessageBuilder` and `RespondWith(this TestableHttpMessageHandler, HttpResponseMessageBuilder)` has been removed, it's functionality can be replaced with ConfiguredResponse or a custom IResponse.
+
 ## [0.9] - 2022-11-25
 ### Deprecated
 - `Responses.NoContent()` has been deprecated, since it doesn't fit well with the rest of the API. Please use `Responses.StatusCode(HttpStatusCode.NoContent)` instead.

src/TestableHttpClient/HttpRequestMessagesCheckExtensions.cs

@@ -1,6 +1,4 @@
-using System.Diagnostics.CodeAnalysis;
-
-namespace TestableHttpClient;
+namespace TestableHttpClient;
 
 public static class HttpRequestMessagesCheckExtensions
 {

src/TestableHttpClient/HttpResponseMessageBuilder.cs

@@ -2,7 +2,6 @@
 TestableHttpClient.TestableHttpMessageHandler
 TestableHttpClient.TestableHttpMessageHandler.Options.get -> TestableHttpClient.TestableHttpMessageHandlerOptions!
 TestableHttpClient.TestableHttpMessageHandler.Requests.get -> System.Collections.Generic.IEnumerable<System.Net.Http.HttpRequestMessage!>!
-TestableHttpClient.TestableHttpMessageHandler.RespondWith(System.Func<System.Net.Http.HttpRequestMessage!, System.Net.Http.HttpResponseMessage!>! httpResponseMessageFactory) -> void
 TestableHttpClient.TestableHttpMessageHandler.RespondWith(TestableHttpClient.IResponse! response) -> void
 TestableHttpClient.TestableHttpMessageHandler.TestableHttpMessageHandler() -> void
 override TestableHttpClient.TestableHttpMessageHandler.SendAsync(System.Net.Http.HttpRequestMessage! request, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task<System.Net.Http.HttpResponseMessage!>!
@@ -35,7 +34,6 @@ static TestableHttpClient.Responses.Delayed(TestableHttpClient.IResponse! delaye
 static TestableHttpClient.Responses.Extensions.get -> TestableHttpClient.IResponsesExtensions!
 static TestableHttpClient.Responses.Json(object? content, string? contentType = null, System.Text.Json.JsonSerializerOptions? jsonSerializerOptions = null) -> TestableHttpClient.IResponse!
 static TestableHttpClient.Responses.Json(object? content, System.Net.HttpStatusCode statusCode, string? contentType = null, System.Text.Json.JsonSerializerOptions? jsonSerializerOptions = null) -> TestableHttpClient.IResponse!
-static TestableHttpClient.Responses.NoContent() -> TestableHttpClient.IResponse!
 static TestableHttpClient.Responses.Route(System.Action<TestableHttpClient.IRoutingResponseBuilder!>! builder) -> TestableHttpClient.IResponse!
 static TestableHttpClient.Responses.SelectResponse(System.Func<TestableHttpClient.HttpResponseContext!, TestableHttpClient.IResponse!>! selector) -> TestableHttpClient.IResponse!
 static TestableHttpClient.Responses.Sequenced(params TestableHttpClient.IResponse![]! responses) -> TestableHttpClient.IResponse!
@@ -62,11 +60,6 @@ static TestableHttpClient.TestableHttpMessageHandlerAssertionExtensions.ShouldHa
 static TestableHttpClient.TestableHttpMessageHandlerAssertionExtensions.ShouldHaveMadeRequestsTo(this TestableHttpClient.TestableHttpMessageHandler! handler, string! pattern, bool ignoreCase, int expectedNumberOfRequests) -> TestableHttpClient.IHttpRequestMessagesCheck!
 static TestableHttpClient.TestableHttpMessageHandlerAssertionExtensions.ShouldHaveMadeRequestsTo(this TestableHttpClient.TestableHttpMessageHandler! handler, string! pattern, int expectedNumberOfRequests) -> TestableHttpClient.IHttpRequestMessagesCheck!
 
-TestableHttpClient.TestableHttpMessageHandlerResponseExtensions
-static TestableHttpClient.TestableHttpMessageHandlerResponseExtensions.RespondWith(this TestableHttpClient.TestableHttpMessageHandler! handler, System.Action<TestableHttpClient.HttpResponseMessageBuilder!>! httpResponseMessageBuilderAction) -> void
-static TestableHttpClient.TestableHttpMessageHandlerResponseExtensions.RespondWith(this TestableHttpClient.TestableHttpMessageHandler! handler, System.Net.Http.HttpResponseMessage! httpResponseMessage) -> void
-static TestableHttpClient.TestableHttpMessageHandlerResponseExtensions.SimulateTimeout(this TestableHttpClient.TestableHttpMessageHandler! handler) -> void
-
 TestableHttpClient.IHttpRequestMessagesCheck
 TestableHttpClient.IHttpRequestMessagesCheck.Options.get -> TestableHttpClient.TestableHttpMessageHandlerOptions!
 TestableHttpClient.IHttpRequestMessagesCheck.WithFilter(System.Func<System.Net.Http.HttpRequestMessage!, bool>! requestFilter, int expectedNumberOfRequests, string! condition) -> TestableHttpClient.IHttpRequestMessagesCheck!
@@ -110,21 +103,6 @@ static TestableHttpClient.HttpRequestMessagesCheckExtensions.WithRequestUri(this
 static TestableHttpClient.HttpRequestMessagesCheckExtensions.WithRequestUri(this TestableHttpClient.IHttpRequestMessagesCheck! check, string! pattern, bool ignoreCase, int expectedNumberOfRequests) -> TestableHttpClient.IHttpRequestMessagesCheck!
 static TestableHttpClient.HttpRequestMessagesCheckExtensions.WithRequestUri(this TestableHttpClient.IHttpRequestMessagesCheck! check, string! pattern, int expectedNumberOfRequests) -> TestableHttpClient.IHttpRequestMessagesCheck!
 
-TestableHttpClient.HttpResponseMessageBuilder
-TestableHttpClient.HttpResponseMessageBuilder.Build() -> System.Net.Http.HttpResponseMessage!
-TestableHttpClient.HttpResponseMessageBuilder.HttpResponseMessageBuilder() -> void
-TestableHttpClient.HttpResponseMessageBuilder.WithContent(System.Net.Http.HttpContent! content) -> TestableHttpClient.HttpResponseMessageBuilder!
-TestableHttpClient.HttpResponseMessageBuilder.WithHttpStatusCode(System.Net.HttpStatusCode statusCode) -> TestableHttpClient.HttpResponseMessageBuilder!
-TestableHttpClient.HttpResponseMessageBuilder.WithHttpVersion(System.Version! httpVersion) -> TestableHttpClient.HttpResponseMessageBuilder!
-TestableHttpClient.HttpResponseMessageBuilder.WithJsonContent(object? jsonObject) -> TestableHttpClient.HttpResponseMessageBuilder!
-TestableHttpClient.HttpResponseMessageBuilder.WithJsonContent(object? jsonObject, string? mediaType) -> TestableHttpClient.HttpResponseMessageBuilder!
-TestableHttpClient.HttpResponseMessageBuilder.WithRequestMessage(System.Net.Http.HttpRequestMessage? requestMessage) -> TestableHttpClient.HttpResponseMessageBuilder!
-TestableHttpClient.HttpResponseMessageBuilder.WithResponseHeader(string! header, string! value) -> TestableHttpClient.HttpResponseMessageBuilder!
-TestableHttpClient.HttpResponseMessageBuilder.WithResponseHeaders(System.Action<System.Net.Http.Headers.HttpResponseHeaders!>! responseHeaderBuilder) -> TestableHttpClient.HttpResponseMessageBuilder!
-TestableHttpClient.HttpResponseMessageBuilder.WithStringContent(string! content) -> TestableHttpClient.HttpResponseMessageBuilder!
-TestableHttpClient.HttpResponseMessageBuilder.WithStringContent(string! content, System.Text.Encoding? encoding) -> TestableHttpClient.HttpResponseMessageBuilder!
-TestableHttpClient.HttpResponseMessageBuilder.WithStringContent(string! content, System.Text.Encoding? encoding, string! mediaType) -> TestableHttpClient.HttpResponseMessageBuilder!
-
 TestableHttpClient.Utils.RouteParserException
 TestableHttpClient.Utils.RouteParserException.RouteParserException() -> void
 TestableHttpClient.Utils.RouteParserException.RouteParserException(string! message) -> void

src/TestableHttpClient/PublicAPI.Shipped.txt

@@ -52,12 +52,6 @@ public static class Responses
     /// <returns>An HttpResponse with the configured StatusCode.</returns>
     public static IResponse StatusCode(HttpStatusCode statusCode) => new HttpResponse(statusCode);
     /// <summary>
-    /// Create a response with the NoContent status code.
-    /// </summary>
-    /// <returns>An HttpResponse with the configured StatusCode.</returns>
-    [Obsolete("Please use StatusCode(HttpStatusCode.NoContent) instead.")]
-    public static IResponse NoContent() => StatusCode(HttpStatusCode.NoContent);
-    /// <summary>
     /// Create a response with some text content.
     /// </summary>
     /// <param name="content">The content to put in the response.</param>

src/TestableHttpClient/Response/BuilderResponse.cs

@@ -10,7 +10,6 @@ public class TestableHttpMessageHandler : HttpMessageHandler
 {
     private readonly ConcurrentQueue<HttpRequestMessage> httpRequestMessages = new();
     private IResponse response = new HttpResponse(HttpStatusCode.OK);
-    private Func<HttpRequestMessage, HttpResponseMessage>? responseFactory;
 
     public TestableHttpMessageHandlerOptions Options { get; } = new TestableHttpMessageHandlerOptions();
 
@@ -24,16 +23,9 @@ protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage
         httpRequestMessages.Enqueue(request);
 
         HttpResponseMessage responseMessage;
-        if (responseFactory is not null)
-        {
-            responseMessage = responseFactory(request);
-        }
-        else
-        {
-            responseMessage = new();
-            HttpResponseContext context = new(request, responseMessage, Options);
-            await response.ExecuteAsync(context, cancellationToken).ConfigureAwait(false);
-        }
+        responseMessage = new();
+        HttpResponseContext context = new(request, responseMessage, Options);
+        await response.ExecuteAsync(context, cancellationToken).ConfigureAwait(false);
 
         if (responseMessage.RequestMessage is null)
         {
@@ -62,19 +54,4 @@ public void RespondWith(IResponse response)
     {
         this.response = response ?? throw new ArgumentNullException(nameof(response));
     }
-
-    /// <summary>
-    /// Configure a factory method that creates a <see cref="HttpResponseMessage"/> that should be returned for a request.
-    /// </summary>
-    /// <param name="handler">The <see cref="TestableHttpMessageHandler"/> that should be configured.</param>
-    /// <param name="httpResponseMessageFactory">The factory method that should be called for every request. The request is passed as a parameter to the factory method and it is expected to return a HttpResponseMessage.</param>
-    /// <remarks>By default each request will receive a new response, however this is dependend on the implementation.</remarks>
-    /// <example>
-    /// testableHttpMessageHander.RespondWith(request => new ResponseMessage(HttpStatusCode.Unauthorized) { RequestMessage = request };
-    /// </example>
-    [Obsolete("Use a custom IResponse instead.")]
-    public void RespondWith(Func<HttpRequestMessage, HttpResponseMessage> httpResponseMessageFactory)
-    {
-        responseFactory = httpResponseMessageFactory ?? throw new ArgumentNullException(nameof(httpResponseMessageFactory));
-    }
 }