Skip to content

Commit 2216d60

Browse files
dnperforsdnperfors
authored
Bump version (#266)
Update Changelog Remove deprecated types and methods
1 parent 9cb37a5 commit 2216d60

File tree

9 files changed

+4
-179
lines changed

9 files changed

+4
-179
lines changed

‎CHANGELOG.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ All notable changes to TestableHttpClient will be documented in this file.
44
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and
55
this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
66

7+
## [0.12] - unplanned
8+
79
## [0.11] - 2024-06-15
810
### Removed
911
- .NET 7.0 target, since it is no longer supported
@@ -284,6 +286,7 @@ this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
284286
- Automatically build project when pushing changes to github and when creating a pull request
285287
- Automatically deploy to NuGet when creating a tag in github
286288

289+
[0.12]: https://github.com/testablehttpclient/TestableHttpClient/compare/v0.11...v0.12
287290
[0.11]: https://github.com/testablehttpclient/TestableHttpClient/compare/v0.10...v0.11
288291
[0.10]: https://github.com/testablehttpclient/TestableHttpClient/compare/v0.9...v0.10
289292
[0.9]: https://github.com/testablehttpclient/TestableHttpClient/compare/v0.8...v0.9

‎src/TestableHttpClient/HttpRequestMessagesCheckExtensions.cs‎

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ public static class HttpRequestMessagesCheckExtensions
1010
/// <returns>The <seealso cref="IHttpRequestMessagesCheck"/> for further assertions.</returns>
1111
public static IHttpRequestMessagesCheck WithRequestUri(this IHttpRequestMessagesCheck check, string pattern) => WithRequestUri(check, pattern, null);
1212

13-
[Obsolete("Please use an overload without the 'ignoreCase', since ignoring casing is now controlled globally.", true)]
14-
public static IHttpRequestMessagesCheck WithRequestUri(this IHttpRequestMessagesCheck check, string pattern, bool ignoreCase) => WithRequestUri(check, pattern, ignoreCase, null);
15-
1613
/// <summary>
1714
/// Asserts whether requests were made to a given URI based on a pattern.
1815
/// </summary>
@@ -22,9 +19,6 @@ public static class HttpRequestMessagesCheckExtensions
2219
/// <returns>The <seealso cref="IHttpRequestMessagesCheck"/> for further assertions.</returns>
2320
public static IHttpRequestMessagesCheck WithRequestUri(this IHttpRequestMessagesCheck check, string pattern, int expectedNumberOfRequests) => WithRequestUri(check, pattern, (int?)expectedNumberOfRequests);
2421

25-
[Obsolete("Please use an overload without the 'ignoreCase', since ignoring casing is now controlled globally.", true)]
26-
public static IHttpRequestMessagesCheck WithRequestUri(this IHttpRequestMessagesCheck check, string pattern, bool ignoreCase, int expectedNumberOfRequests) => WithRequestUri(check, pattern, ignoreCase, (int?)expectedNumberOfRequests);
27-
2822
private static IHttpRequestMessagesCheck WithRequestUri(this IHttpRequestMessagesCheck check, string pattern, int? expectedNumberOfRequests)
2923
{
3024
Guard.ThrowIfNull(check);
@@ -41,31 +35,6 @@ private static IHttpRequestMessagesCheck WithRequestUri(this IHttpRequestMessage
4135
return check.WithFilter(x => x.RequestUri is not null && uriPattern.Matches(x.RequestUri, check.Options.UriPatternMatchingOptions), expectedNumberOfRequests, condition);
4236
}
4337

44-
[Obsolete("Please use an overload without the 'ignoreCase', since ignoring casing is now controlled globally.", true)]
45-
private static IHttpRequestMessagesCheck WithRequestUri(this IHttpRequestMessagesCheck check, string pattern, bool ignoreCase, int? expectedNumberOfRequests) => check;
46-
47-
/// <summary>
48-
/// Asserts whether requests were made with a given querystring based on a pattern. For asserting the decoded version of the querystring is used.
49-
/// </summary>
50-
/// <param name="check">The implementation that hold all the request messages.</param>
51-
/// <param name="pattern">The querystring pattern that is expected.</param>
52-
/// <returns>The <seealso cref="IHttpRequestMessagesCheck"/> for further assertions.</returns>
53-
[Obsolete("Use WithRequestUri instead, since it now properly supports QueryStrings as well", true)]
54-
public static IHttpRequestMessagesCheck WithQueryString(this IHttpRequestMessagesCheck check, string pattern) => WithQueryString(check, pattern, null);
55-
56-
/// <summary>
57-
/// Asserts whether requests were made with a given querystring based on a pattern. For asserting the decoded version of the querystring is used.
58-
/// </summary>
59-
/// <param name="check">The implementation that hold all the request messages.</param>
60-
/// <param name="pattern">The querystring pattern that is expected.</param>
61-
/// <param name="expectedNumberOfRequests">The expected number of requests.</param>
62-
/// <returns>The <seealso cref="IHttpRequestMessagesCheck"/> for further assertions.</returns>
63-
[Obsolete("Use WithRequestUri instead, since it now properly supports QueryStrings as well", true)]
64-
public static IHttpRequestMessagesCheck WithQueryString(this IHttpRequestMessagesCheck check, string pattern, int expectedNumberOfRequests) => WithQueryString(check, pattern, (int?)expectedNumberOfRequests);
65-
66-
[Obsolete("Use WithRequestUri instead, since it now properly supports QueryStrings as well", true)]
67-
private static IHttpRequestMessagesCheck WithQueryString(this IHttpRequestMessagesCheck check, string pattern, int? expectedNumberOfRequests) => check;
68-
6938
/// <summary>
7039
/// Asserts whether requests were made with a given HTTP Method.
7140
/// </summary>

‎src/TestableHttpClient/PublicAPI.Shipped.txt‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,8 @@ override TestableHttpClient.TestableHttpMessageHandler.SendAsync(System.Net.Http
1010
TestableHttpClient.TestableHttpMessageHandlerOptions
1111
TestableHttpClient.TestableHttpMessageHandlerOptions.JsonSerializerOptions.get -> System.Text.Json.JsonSerializerOptions!
1212
TestableHttpClient.TestableHttpMessageHandlerOptions.TestableHttpMessageHandlerOptions() -> void
13-
TestableHttpClient.TestableHttpMessageHandlerOptions.RoutingOptions.get -> TestableHttpClient.RoutingOptions!
1413
TestableHttpClient.TestableHttpMessageHandlerOptions.UriPatternMatchingOptions.get -> TestableHttpClient.UriPatternMatchingOptions!
1514

16-
TestableHttpClient.RoutingOptions
17-
TestableHttpClient.RoutingOptions.HostCaseInsensitive.get -> bool
18-
TestableHttpClient.RoutingOptions.HostCaseInsensitive.set -> void
19-
TestableHttpClient.RoutingOptions.PathCaseInsensitive.get -> bool
20-
TestableHttpClient.RoutingOptions.PathCaseInsensitive.set -> void
21-
TestableHttpClient.RoutingOptions.RoutingOptions() -> void
22-
TestableHttpClient.RoutingOptions.SchemeCaseInsensitive.get -> bool
23-
TestableHttpClient.RoutingOptions.SchemeCaseInsensitive.set -> void
24-
2515
TestableHttpClient.UriPatternMatchingOptions
2616
TestableHttpClient.UriPatternMatchingOptions.DefaultQueryFormat.get -> System.UriFormat
2717
TestableHttpClient.UriPatternMatchingOptions.DefaultQueryFormat.set -> void
@@ -71,8 +61,6 @@ TestableHttpClient.TestableHttpMessageHandlerAssertionExtensions
7161
static TestableHttpClient.TestableHttpMessageHandlerAssertionExtensions.ShouldHaveMadeRequests(this TestableHttpClient.TestableHttpMessageHandler! handler) -> TestableHttpClient.IHttpRequestMessagesCheck!
7262
static TestableHttpClient.TestableHttpMessageHandlerAssertionExtensions.ShouldHaveMadeRequests(this TestableHttpClient.TestableHttpMessageHandler! handler, int expectedNumberOfRequests) -> TestableHttpClient.IHttpRequestMessagesCheck!
7363
static TestableHttpClient.TestableHttpMessageHandlerAssertionExtensions.ShouldHaveMadeRequestsTo(this TestableHttpClient.TestableHttpMessageHandler! handler, string! pattern) -> TestableHttpClient.IHttpRequestMessagesCheck!
74-
static TestableHttpClient.TestableHttpMessageHandlerAssertionExtensions.ShouldHaveMadeRequestsTo(this TestableHttpClient.TestableHttpMessageHandler! handler, string! pattern, bool ignoreCase) -> TestableHttpClient.IHttpRequestMessagesCheck!
75-
static TestableHttpClient.TestableHttpMessageHandlerAssertionExtensions.ShouldHaveMadeRequestsTo(this TestableHttpClient.TestableHttpMessageHandler! handler, string! pattern, bool ignoreCase, int expectedNumberOfRequests) -> TestableHttpClient.IHttpRequestMessagesCheck!
7664
static TestableHttpClient.TestableHttpMessageHandlerAssertionExtensions.ShouldHaveMadeRequestsTo(this TestableHttpClient.TestableHttpMessageHandler! handler, string! pattern, int expectedNumberOfRequests) -> TestableHttpClient.IHttpRequestMessagesCheck!
7765

7866
TestableHttpClient.IHttpRequestMessagesCheck
@@ -107,15 +95,11 @@ static TestableHttpClient.HttpRequestMessagesCheckExtensions.WithJsonContent(thi
10795
static TestableHttpClient.HttpRequestMessagesCheckExtensions.WithJsonContent(this TestableHttpClient.IHttpRequestMessagesCheck! check, object? jsonObject, int expectedNumberOfRequests) -> TestableHttpClient.IHttpRequestMessagesCheck!
10896
static TestableHttpClient.HttpRequestMessagesCheckExtensions.WithJsonContent(this TestableHttpClient.IHttpRequestMessagesCheck! check, object? jsonObject, System.Text.Json.JsonSerializerOptions! jsonSerializerOptions) -> TestableHttpClient.IHttpRequestMessagesCheck!
10997
static TestableHttpClient.HttpRequestMessagesCheckExtensions.WithJsonContent(this TestableHttpClient.IHttpRequestMessagesCheck! check, object? jsonObject, System.Text.Json.JsonSerializerOptions! jsonSerializerOptions, int expectedNumberOfRequests) -> TestableHttpClient.IHttpRequestMessagesCheck!
110-
static TestableHttpClient.HttpRequestMessagesCheckExtensions.WithQueryString(this TestableHttpClient.IHttpRequestMessagesCheck! check, string! pattern) -> TestableHttpClient.IHttpRequestMessagesCheck!
111-
static TestableHttpClient.HttpRequestMessagesCheckExtensions.WithQueryString(this TestableHttpClient.IHttpRequestMessagesCheck! check, string! pattern, int expectedNumberOfRequests) -> TestableHttpClient.IHttpRequestMessagesCheck!
11298
static TestableHttpClient.HttpRequestMessagesCheckExtensions.WithRequestHeader(this TestableHttpClient.IHttpRequestMessagesCheck! check, string! headerName) -> TestableHttpClient.IHttpRequestMessagesCheck!
11399
static TestableHttpClient.HttpRequestMessagesCheckExtensions.WithRequestHeader(this TestableHttpClient.IHttpRequestMessagesCheck! check, string! headerName, int expectedNumberOfRequests) -> TestableHttpClient.IHttpRequestMessagesCheck!
114100
static TestableHttpClient.HttpRequestMessagesCheckExtensions.WithRequestHeader(this TestableHttpClient.IHttpRequestMessagesCheck! check, string! headerName, string! headerValue) -> TestableHttpClient.IHttpRequestMessagesCheck!
115101
static TestableHttpClient.HttpRequestMessagesCheckExtensions.WithRequestHeader(this TestableHttpClient.IHttpRequestMessagesCheck! check, string! headerName, string! headerValue, int expectedNumberOfRequests) -> TestableHttpClient.IHttpRequestMessagesCheck!
116102
static TestableHttpClient.HttpRequestMessagesCheckExtensions.WithRequestUri(this TestableHttpClient.IHttpRequestMessagesCheck! check, string! pattern) -> TestableHttpClient.IHttpRequestMessagesCheck!
117-
static TestableHttpClient.HttpRequestMessagesCheckExtensions.WithRequestUri(this TestableHttpClient.IHttpRequestMessagesCheck! check, string! pattern, bool ignoreCase) -> TestableHttpClient.IHttpRequestMessagesCheck!
118-
static TestableHttpClient.HttpRequestMessagesCheckExtensions.WithRequestUri(this TestableHttpClient.IHttpRequestMessagesCheck! check, string! pattern, bool ignoreCase, int expectedNumberOfRequests) -> TestableHttpClient.IHttpRequestMessagesCheck!
119103
static TestableHttpClient.HttpRequestMessagesCheckExtensions.WithRequestUri(this TestableHttpClient.IHttpRequestMessagesCheck! check, string! pattern, int expectedNumberOfRequests) -> TestableHttpClient.IHttpRequestMessagesCheck!
120104

121105
TestableHttpClient.Utils.UriPatternParserException

‎src/TestableHttpClient/RoutingOptions.cs‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎src/TestableHttpClient/TestableHttpMessageHandlerAssertionExtensions.cs‎

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -50,25 +50,6 @@ public static IHttpRequestMessagesCheck ShouldHaveMadeRequestsTo(this TestableHt
5050
return new HttpRequestMessageAsserter(handler.Requests, handler.Options).WithRequestUri(pattern);
5151
}
5252

53-
/// <summary>
54-
/// Validates that requests to a specific uri have been made, throws an exception when no requests were made.
55-
/// </summary>
56-
/// <param name="handler">The <see cref="TestableHttpMessageHandler"/> that should be asserted.</param>
57-
/// <param name="pattern">The uri pattern to validate against, the pattern supports *.</param>
58-
/// <param name="ignoreCase">The uri validation should ignore cases.</param>
59-
/// <returns>An <see cref="IHttpRequestMessagesCheck"/> that can be used for additional assertions.</returns>
60-
/// <exception cref="ArgumentNullException">handler is `null` or pattern is `null`</exception>
61-
/// <exception cref="HttpRequestMessageAssertionException">When no requests are made</exception>
62-
[AssertionMethod]
63-
[Obsolete("Please use an overload without the 'ignoreCase', since ignoring casing is now controlled globally.")]
64-
public static IHttpRequestMessagesCheck ShouldHaveMadeRequestsTo(this TestableHttpMessageHandler handler, string pattern, bool ignoreCase)
65-
{
66-
Guard.ThrowIfNull(handler);
67-
Guard.ThrowIfNull(pattern);
68-
69-
return new HttpRequestMessageAsserter(handler.Requests, handler.Options).WithRequestUri(pattern, ignoreCase);
70-
}
71-
7253
/// <summary>
7354
/// Validates that requests to a specific uri have been made, throws an exception when no requests were made.
7455
/// </summary>
@@ -86,23 +67,4 @@ public static IHttpRequestMessagesCheck ShouldHaveMadeRequestsTo(this TestableHt
8667

8768
return new HttpRequestMessageAsserter(handler.Requests, handler.Options).WithRequestUri(pattern, expectedNumberOfRequests);
8869
}
89-
90-
/// <summary>
91-
/// Validates that requests to a specific uri have been made, throws an exception when no requests were made.
92-
/// </summary>
93-
/// <param name="handler">The <see cref="TestableHttpMessageHandler"/> that should be asserted.</param>
94-
/// <param name="pattern">The uri pattern to validate against, the pattern supports *.</param>
95-
/// <param name="expectedNumberOfRequests">The expected number of requests.</param>
96-
/// <returns>An <see cref="IHttpRequestMessagesCheck"/> that can be used for additional assertions.</returns>
97-
/// <exception cref="ArgumentNullException">handler is `null` or pattern is `null`</exception>
98-
/// <exception cref="HttpRequestMessageAssertionException">When no requests are made</exception>
99-
[AssertionMethod]
100-
[Obsolete("Please use an overload without the 'ignoreCase', since ignoring casing is now controlled globally.")]
101-
public static IHttpRequestMessagesCheck ShouldHaveMadeRequestsTo(this TestableHttpMessageHandler handler, string pattern, bool ignoreCase, int expectedNumberOfRequests)
102-
{
103-
Guard.ThrowIfNull(handler);
104-
Guard.ThrowIfNull(pattern);
105-
106-
return new HttpRequestMessageAsserter(handler.Requests, handler.Options).WithRequestUri(pattern, ignoreCase, expectedNumberOfRequests);
107-
}
10870
}

‎src/TestableHttpClient/TestableHttpMessageHandlerOptions.cs‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,5 @@ public sealed class TestableHttpMessageHandlerOptions
1010
PropertyNamingPolicy = JsonNamingPolicy.CamelCase
1111
};
1212

13-
[ExcludeFromCodeCoverage]
14-
[Obsolete("Renamed to UriPatternMatchingOptions", true)]
15-
public RoutingOptions RoutingOptions => new();
1613
public UriPatternMatchingOptions UriPatternMatchingOptions { get; } = new UriPatternMatchingOptions();
1714
}

‎test/TestableHttpClient.Tests/HttpRequestMessagesCheckExtensionsTests/WithQueryString.cs‎

Lines changed: 0 additions & 47 deletions
This file was deleted.

‎test/TestableHttpClient.Tests/HttpRequestMessagesCheckExtensionsTests/WithRequestUri.cs‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -55,26 +55,4 @@ public void WithRequestUri_WithoutNumberOfRequests_CallsWithCorrectly()
5555

5656
sut.Received(1).WithFilter(Args.AnyPredicate(), null, "uri pattern 'https://example.com/'");
5757
}
58-
59-
[Fact]
60-
[Obsolete("Please use an overload without the 'ignoreCase', since ignoring casing is now controlled globally.", true)]
61-
public void WithRequestUri_WithoutNumberOfRequestsAndNotIgnoringCase_CallsWithCorrectly()
62-
{
63-
IHttpRequestMessagesCheck sut = Substitute.For<IHttpRequestMessagesCheck>();
64-
65-
var result = sut.WithRequestUri("https://example.com/", ignoreCase: false);
66-
67-
Assert.Same(sut, result);
68-
}
69-
70-
[Fact]
71-
[Obsolete("Please use an overload without the 'ignoreCase', since ignoring casing is now controlled globally.", true)]
72-
public void WithRequestUri_WithNumberOfRequestsAndNotIgnoringCase_CallsWithCorrectly()
73-
{
74-
IHttpRequestMessagesCheck sut = Substitute.For<IHttpRequestMessagesCheck>();
75-
76-
var result = sut.WithRequestUri("https://example.com/", ignoreCase: false, 2);
77-
78-
Assert.Same(sut, result);
79-
}
8058
}

‎version.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
3-
"version": "0.11",
3+
"version": "0.12-alpha",
44
"versionHeightOffset": -1,
55
"publicReleaseRefSpec": [
66
"^refs/tags/v\\d+(?:\\.\\d+)?$"

0 commit comments

Comments
 (0)