Skip to content

Commit 7278c11

Browse files
authored
Remove deprecated API's from TestableHttpClient.
These API's were deprecated in version 0.3 and by removing these methods we get a more consistent API. Fixes #39
1 parent 36d77bd commit 7278c11

File tree

3 files changed

+1
-108
lines changed

3 files changed

+1
-108
lines changed

src/TestableHttpClient/HttpResponseMessageBuilder.cs

Lines changed: 0 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,6 @@ public sealed class HttpResponseMessageBuilder
1919
Content = new StringContent("")
2020
};
2121

22-
/// <summary>
23-
/// Specifies the version of the response.
24-
/// </summary>
25-
/// <param name="httpVersion">The <see cref="HttpVersion"/> of the response.</param>
26-
/// <returns>The <see cref="HttpResponseMessageBuilder"/> for further building of the response.</returns>
27-
[Obsolete("Renamed to WithHttpVersion.", true)]
28-
public HttpResponseMessageBuilder WithVersion(Version httpVersion)
29-
{
30-
return WithHttpVersion(httpVersion);
31-
}
32-
3322
/// <summary>
3423
/// Specifies the version of the response.
3524
/// </summary>
@@ -41,17 +30,6 @@ public HttpResponseMessageBuilder WithHttpVersion(Version httpVersion)
4130
return this;
4231
}
4332

44-
/// <summary>
45-
/// Specifies the status code of the response.
46-
/// </summary>
47-
/// <param name="statusCode">The <see cref="HttpStatusCode"/> of the response.</param>
48-
/// <returns>The <see cref="HttpResponseMessageBuilder"/> for further building of the response.</returns>
49-
[Obsolete("Renamed to WithHttpStatusCode.", true)]
50-
public HttpResponseMessageBuilder WithStatusCode(HttpStatusCode httpStatusCode)
51-
{
52-
return WithHttpStatusCode(httpStatusCode);
53-
}
54-
5533
/// <summary>
5634
/// Specifies the status code of the response.
5735
/// </summary>
@@ -63,17 +41,6 @@ public HttpResponseMessageBuilder WithHttpStatusCode(HttpStatusCode statusCode)
6341
return this;
6442
}
6543

66-
/// <summary>
67-
/// Configure request headers using a builder by directly accessing the <see cref="HttpResponseHeaders"/>.
68-
/// </summary>
69-
/// <param name="responseHeaderBuilder">The builder for configuring the response headers.</param>
70-
/// <returns>The <see cref="HttpResponseMessageBuilder"/> for further building of the response.</returns>
71-
[Obsolete("Renamed to WithResponseHeaders.", true)]
72-
public HttpResponseMessageBuilder WithHeaders(Action<HttpResponseHeaders> responseHeaderBuilder)
73-
{
74-
return WithResponseHeaders(responseHeaderBuilder);
75-
}
76-
7744
/// <summary>
7845
/// Configure request headers using a builder by directly accessing the <see cref="HttpResponseHeaders"/>.
7946
/// </summary>
@@ -90,18 +57,6 @@ public HttpResponseMessageBuilder WithResponseHeaders(Action<HttpResponseHeaders
9057
return this;
9158
}
9259

93-
/// <summary>
94-
/// Adds a request header to the response.
95-
/// </summary>
96-
/// <param name="header">The name of the header to add.</param>
97-
/// <param name="value">The value of the header to add.</param>
98-
/// <returns>The <see cref="HttpResponseMessageBuilder"/> for further building of the response.</returns>
99-
[Obsolete("Renamed to WithResponseHeader.", true)]
100-
public HttpResponseMessageBuilder WithHeader(string header, string value)
101-
{
102-
return WithResponseHeader(header, value);
103-
}
104-
10560
/// <summary>
10661
/// Adds a request header to the response.
10762
/// </summary>

src/TestableHttpClient/HttpResponseMessageExtensions.cs

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -30,28 +30,6 @@ public static bool HasHttpVersion(this HttpResponseMessage httpResponseMessage,
3030
return httpResponseMessage.Version == httpVersion;
3131
}
3232

33-
/// <summary>
34-
/// Determines whether a specific HttpVersion is set on a response.
35-
/// </summary>
36-
/// <param name="httpResponseMessage">A <see cref="HttpResponseMessage"/> to check the correct version on.</param>
37-
/// <param name="httpVersion">The expected version.</param>
38-
/// <returns>true when the HttpVersion matches; otherwise, false.</returns>
39-
[Obsolete("Use overload with System.Version instead.", true)]
40-
public static bool HasHttpVersion(this HttpResponseMessage httpResponseMessage, string httpVersion)
41-
{
42-
if (httpResponseMessage == null)
43-
{
44-
throw new ArgumentNullException(nameof(httpResponseMessage));
45-
}
46-
47-
if (string.IsNullOrEmpty(httpVersion))
48-
{
49-
throw new ArgumentNullException(nameof(httpVersion));
50-
}
51-
52-
return HasHttpVersion(httpResponseMessage, new Version(httpVersion));
53-
}
54-
5533
/// <summary>
5634
/// Determines whether a specific status code is set on a response.
5735
/// </summary>

test/TestableHttpClient.Tests/HttpResponseMessageExtensionsTests.HasHttpVersion.cs

Lines changed: 1 addition & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -18,34 +18,12 @@ public void HasHttpVersion_WithVersion_NullResponse_ThrowsArgumentNullException(
1818
Assert.Equal("httpResponseMessage", exception.ParamName);
1919
}
2020

21-
[Fact]
22-
[Obsolete("Tests obsolete message", true)]
23-
public void HasHttpVersion_WithString_NullResponse_ThrowsArgumentNullException()
24-
{
25-
HttpResponseMessage sut = null;
26-
27-
var exception = Assert.Throws<ArgumentNullException>(() => sut.HasHttpVersion("1.1"));
28-
Assert.Equal("httpResponseMessage", exception.ParamName);
29-
}
30-
3121
[Fact]
3222
public void HasHttpVersion_WithVersion_NullVersion_ThrowsArgumentNullException()
3323
{
3424
using var sut = new HttpResponseMessage { Version = HttpVersion.Unknown };
3525

36-
var exception = Assert.Throws<ArgumentNullException>(() => sut.HasHttpVersion((Version)null));
37-
Assert.Equal("httpVersion", exception.ParamName);
38-
}
39-
40-
[Theory]
41-
[InlineData(null)]
42-
[InlineData("")]
43-
[Obsolete("Tests obsolete message", true)]
44-
public void HasHttpVersion_WithString_NullVersion_ThrowsArgumentNullException(string httpVersion)
45-
{
46-
using var sut = new HttpResponseMessage { Version = HttpVersion.Unknown };
47-
48-
var exception = Assert.Throws<ArgumentNullException>(() => sut.HasHttpVersion(httpVersion));
26+
var exception = Assert.Throws<ArgumentNullException>(() => sut.HasHttpVersion(null));
4927
Assert.Equal("httpVersion", exception.ParamName);
5028
}
5129
#nullable restore
@@ -58,30 +36,12 @@ public void HasHttpVersion_WithVersion_CorrectVersion_ReturnsTrue()
5836
Assert.True(sut.HasHttpVersion(HttpVersion.Version11));
5937
}
6038

61-
[Fact]
62-
[Obsolete("Tests obsolete message", true)]
63-
public void HasHttpVersion_WithString_CorrectVersion_ReturnsTrue()
64-
{
65-
using var sut = new HttpResponseMessage { Version = HttpVersion.Version11 };
66-
67-
Assert.True(sut.HasHttpVersion("1.1"));
68-
}
69-
7039
[Fact]
7140
public void HasHttpVersion_WithVersion_IncorrectVersion_ReturnsFalse()
7241
{
7342
using var sut = new HttpResponseMessage { Version = HttpVersion.Version11 };
7443

7544
Assert.False(sut.HasHttpVersion(HttpVersion.Version20));
7645
}
77-
78-
[Fact]
79-
[Obsolete("Tests obsolete message", true)]
80-
public void HasHttpVersion_WithString_IncorrectVersion_ReturnsFalse()
81-
{
82-
using var sut = new HttpResponseMessage { Version = HttpVersion.Version11 };
83-
84-
Assert.False(sut.HasHttpVersion("1.0"));
85-
}
8646
}
8747
}

0 commit comments

Comments
 (0)