Adds asserter for HttpVersion.

Author: dnperfors

README.md

@@ -1,2 +1,5 @@
 # httpclienttesthelpers
-A simple library to make testing with HttpClient and related classes easier
+Using HttpClient in code that is unittested is seen as rather difficult, this library aims to make it easier to assert the calls that are made via an HttpClient.
+
+This library is largly based on the HttpTest functionality from [Flurl](https://flurl.dev), but is focused around the use of HttpClient directly. Since I intend to replace my usage of Flurl.Http with this library, I kept the interface very similar.
+

src/HttpClientTestHelpers/HttpRequestMessageAsserter.cs

@@ -106,6 +106,11 @@ public HttpRequestMessageAsserter With(Func<HttpRequestMessage, bool> requestFil
         /// <returns>The <seealso cref="HttpRequestMessageAsserter"/> for further assertions.</returns>
         public HttpRequestMessageAsserter WithUriPattern(string pattern)
         {
+            if(string.IsNullOrEmpty(pattern))
+            {
+                throw new ArgumentNullException(nameof(pattern));
+            }
+
             string condition = string.Empty;
             if (pattern != "*")
             {
@@ -128,5 +133,20 @@ public HttpRequestMessageAsserter WithHttpMethod(HttpMethod httpMethod)
 
             return With(x => x.HasHttpMethod(httpMethod), $"HTTP Method '{httpMethod}'");
         }
+
+        /// <summary>
+        /// Asserts wheter requests were made using a specific HTTP Version.
+        /// </summary>
+        /// <param name="httpVersion">The <seealso cref="System.Net.HttpVersion"/> that is expected.</param>
+        /// <returns>The <seealso cref="HttpRequestMessageAsserter"/> for further assertions.</returns>
+        public HttpRequestMessageAsserter WithHttpVersion(Version httpVersion)
+        {
+            if(httpVersion == null)
+            {
+                throw new ArgumentNullException(nameof(httpVersion));
+            }
+
+            return With(x => x.HasHttpVersion(httpVersion), $"HTTP Version '{httpVersion}'");
+        }
     }
 }

test/HttpClientTestHelpers.Tests/HttpRequestMessageAsserterTests.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Linq;
+using System.Net;
 using System.Net.Http;
 
 using Xunit;
@@ -8,11 +9,25 @@ namespace HttpClientTestHelpers.Tests
 {
     public class HttpRequestMessageAsserterTests
     {
-#nullable disable
         [Fact]
         public void Constructor_NullRequestList_ThrowsArgumentNullException()
         {
+#nullable disable
             Assert.Throws<ArgumentNullException>(() => new HttpRequestMessageAsserter(null));
+#nullable restore
+        }
+
+#nullable disable
+        [Theory]
+        [InlineData(null)]
+        [InlineData("")]
+        public void WithUriPattern_NullOrEmptyPattern_ThrowsArgumentNullException(string pattern)
+        {
+            var sut = new HttpRequestMessageAsserter(Enumerable.Empty<HttpRequestMessage>());
+
+            var exception = Assert.Throws<ArgumentNullException>(() => sut.WithUriPattern(pattern));
+
+            Assert.Equal("pattern", exception.ParamName);
         }
 #nullable restore
 
@@ -51,20 +66,20 @@ public void WithUriPattern_RequestWithStarPatternAndNoRequests_ThrowsHttpRequest
             Assert.Equal("Expected at least one request to be made, but no requests were made.", exception.Message);
         }
 
-#nullable disable
         [Fact]
-        public void WithHttpmethod_NullHttpMethod_ThrowsArgumentNullException()
+        public void WithHttpMethod_NullHttpMethod_ThrowsArgumentNullException()
         {
             var sut = new HttpRequestMessageAsserter(Enumerable.Empty<HttpRequestMessage>());
 
+#nullable disable
             var exception = Assert.Throws<ArgumentNullException>(() => sut.WithHttpMethod(null));
+#nullable restore
 
             Assert.Equal("httpMethod", exception.ParamName);
         }
-#nullable restore
 
         [Fact]
-        public void WithHttpmethod_NoRequests_ThrowsHttpRequestMessageAssertionExceptionWithSpecificMessage()
+        public void WithHttpMethod_NoRequests_ThrowsHttpRequestMessageAssertionExceptionWithSpecificMessage()
         {
             var sut = new HttpRequestMessageAsserter(Enumerable.Empty<HttpRequestMessage>());
 
@@ -74,7 +89,7 @@ public void WithHttpmethod_NoRequests_ThrowsHttpRequestMessageAssertionException
         }
 
         [Fact]
-        public void WithHttpmethod_RequestsWithIncorrectHttpMethod_ThrowsHttpRequestMessageAssertionExceptionWithSpecificMessage()
+        public void WithHttpMethod_RequestsWithIncorrectHttpMethod_ThrowsHttpRequestMessageAssertionExceptionWithSpecificMessage()
         {
             var sut = new HttpRequestMessageAsserter(new[] { new HttpRequestMessage(HttpMethod.Post, new Uri("https://example.com")) });
 
@@ -93,5 +108,48 @@ public void WithHttpMethod_RequestsWithCorrectMethod_ReturnsHttpRequestMessageAs
             Assert.NotNull(result);
             Assert.IsType<HttpRequestMessageAsserter>(result);
         }
+
+        [Fact]
+        public void WithHttpVersion_NullHttpVersion_ThrowsArgumentNullException()
+        {
+            var sut = new HttpRequestMessageAsserter(Enumerable.Empty<HttpRequestMessage>());
+
+#nullable disable
+            var exception = Assert.Throws<ArgumentNullException>(() => sut.WithHttpVersion(null));
+#nullable restore
+
+            Assert.Equal("httpVersion", exception.ParamName);
+        }
+
+        [Fact]
+        public void WithHttpVersion_NoRequests_ThrowsHttpRequestMessageAssertionExceptionWithSpecificMessage()
+        {
+            var sut = new HttpRequestMessageAsserter(Enumerable.Empty<HttpRequestMessage>());
+
+            var exception = Assert.Throws<HttpRequestMessageAssertionException>(() => sut.WithHttpVersion(HttpVersion.Version11));
+
+            Assert.Equal("Expected at least one request to be made with HTTP Version '1.1', but no requests were made.", exception.Message);
+        }
+
+        [Fact]
+        public void WithHttpVersion_RequestsWithIncorrectHttpVersion_ThrowsHttpRequestMessageAssertionExceptionWithSpecificMessage()
+        {
+            var sut = new HttpRequestMessageAsserter(new[] { new HttpRequestMessage { Version = HttpVersion.Version20 } });
+
+            var exception = Assert.Throws<HttpRequestMessageAssertionException>(() => sut.WithHttpVersion(HttpVersion.Version11));
+
+            Assert.Equal("Expected at least one request to be made with HTTP Version '1.1', but no requests were made.", exception.Message);
+        }
+
+        [Fact]
+        public void WithHttpVersion_RequestsWithCorrectVersion_ReturnsHttpRequestMessageAsserter()
+        {
+            var sut = new HttpRequestMessageAsserter(new[] { new HttpRequestMessage { Version = HttpVersion.Version11 } });
+
+            var result = sut.WithHttpVersion(HttpVersion.Version11);
+
+            Assert.NotNull(result);
+            Assert.IsType<HttpRequestMessageAsserter>(result);
+        }
     }
 }