feat: Support injecting HttpClient

Closes #21

Author: picadoh

.gitignore

@@ -7,4 +7,4 @@
 *.nuget.props
 *.nuget.targets
 *.user
-
+.idea

package.json

@@ -0,0 +1,5 @@
+{
+  "name": "mockserver-client-net",
+  "version": "0.0.0",
+  "private": true
+}

src/MockServerClientNet/MockServerClient.cs

@@ -51,6 +51,16 @@ public MockServerClient(string host, int port, string contextPath = "",
             _httpClient = new HttpClient(httpHandler ?? new HttpClientHandler());
         }
 
+        public MockServerClient(string host, int port, HttpClient httpClient, string contextPath = "",
+            HttpScheme httpScheme = HttpScheme.Http)
+        {
+            _host = host;
+            _port = port;
+            _contextPath = contextPath;
+            _httpScheme = httpScheme;
+            _httpClient = httpClient;
+        }
+
         public void Dispose()
         {
             _httpClient.Dispose();
@@ -302,4 +312,4 @@ private string FullPath(string endpoint)
                 .PrefixWith("/");
         }
     }
-}
+}

tests/MockServerClientNet.Tests/CustomHttpClientTest.cs

@@ -0,0 +1,90 @@
+using System;
+using System.Net;
+using System.Net.Http;
+using System.Threading.Tasks;
+using MockServerClientNet.Model;
+using Xunit;
+using static MockServerClientNet.Model.HttpRequest;
+using static MockServerClientNet.Model.HttpResponse;
+
+namespace MockServerClientNet.Tests
+{
+    public class CustomHttpClientTest(MockServerFixture fixture) : MockServerClientTest(fixture, HttpClient)
+    {
+        private static readonly HttpClient HttpClient = GetHttpClient();
+
+        [Fact]
+        public async Task ShouldRespondToHttpsRequest()
+        {
+            // arrange
+            await SetupExpectation(MockServerClient, true);
+
+            // act
+            var response = await SendHello(HttpScheme.Https);
+
+            // assert
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal("{\"message\": \"hello\"}", await response.Content.ReadAsStringAsync());
+        }
+
+        [Fact]
+        public async Task ShouldNotMatchHttpsRequestWhenSecureIsFalse()
+        {
+            // arrange
+            await SetupExpectation(MockServerClient, false);
+
+            // act
+            var response = await SendHello(HttpScheme.Https);
+
+            // assert
+            Assert.Equal(HttpStatusCode.NotFound, response.StatusCode);
+        }
+
+        [Fact]
+        public async Task ShouldNotMatchHttpRequestWhenSecureIsTrue()
+        {
+            // arrange
+            await SetupExpectation(MockServerClient, true);
+
+            // act
+            var response = await SendHello(HttpScheme.Http);
+
+            // assert
+            Assert.Equal(HttpStatusCode.NotFound, response.StatusCode);
+        }
+
+        private static HttpClient GetHttpClient()
+        {
+            return new HttpClient(new HttpClientHandler
+            {
+                ServerCertificateCustomValidationCallback = (msg, cert, chain, errors) =>
+                {
+                    Assert.Contains("O=MockServer", cert.Issuer);
+                    return true;
+                }
+            }, false);
+        }
+
+        private static async Task SetupExpectation(MockServerClient mockServerClient, bool secure)
+        {
+            await mockServerClient.ResetAsync();
+
+            await mockServerClient.When(Request()
+                    .WithSecure(secure)
+                    .WithMethod(HttpMethod.Get)
+                    .WithPath("/hello"),
+                Times.Unlimited()
+            ).RespondAsync(Response()
+                .WithDelay(TimeSpan.FromSeconds(0))
+                .WithStatusCode(200)
+                .WithBody("{\"message\": \"hello\"}"));
+        }
+
+        private async Task<HttpResponseMessage> SendHello(HttpScheme scheme)
+        {
+            var host = MockServerClient.ServerAddress().Host;
+            var port = MockServerClient.ServerAddress().Port;
+            return await HttpClient.GetAsync(new Uri($"{scheme}://{host}:{port}/hello"));
+        }
+    }
+}

tests/MockServerClientNet.Tests/MockServerClientTest.cs

@@ -9,20 +9,40 @@
 namespace MockServerClientNet.Tests
 {
     [Collection(nameof(MockServerCollection))]
-    public class MockServerClientTest(
-        MockServerFixture fixture,
-        HttpScheme scheme = HttpScheme.Http,
-        HttpClientHandler handler = null
-    ) : IClassFixture<MockServerFixture>, IDisposable
+    public class MockServerClientTest : IClassFixture<MockServerFixture>, IDisposable
     {
-        protected readonly MockServerClient MockServerClient = new(
-            host: fixture.Host,
-            port: fixture.Port,
-            httpScheme: scheme,
-            httpHandler: handler
-        );
+        protected readonly MockServerClient MockServerClient;
+        protected readonly string HostHeader;
 
-        protected string HostHeader => $"{fixture.Host}:{fixture.Port}";
+        protected MockServerClientTest(
+            MockServerFixture fixture,
+            HttpScheme scheme = HttpScheme.Http,
+            HttpClientHandler handler = null
+        )
+        {
+            MockServerClient = new(
+                host: fixture.Host,
+                port: fixture.Port,
+                httpScheme: scheme,
+                httpHandler: handler
+            );
+            HostHeader = fixture.HostHeader;
+        }
+
+        protected MockServerClientTest(
+            MockServerFixture fixture,
+            HttpClient httpClient,
+            HttpScheme scheme = HttpScheme.Http
+        )
+        {
+            MockServerClient = new(
+                host: fixture.Host,
+                port: fixture.Port,
+                httpScheme: scheme,
+                httpClient: httpClient
+            );
+            HostHeader = fixture.HostHeader;
+        }
 
         public void Dispose()
         {
@@ -39,10 +59,8 @@ protected static void SendRequest(HttpRequestMessage request, out string respons
 
         protected static async Task<HttpResponseMessage> SendRequestAsync(HttpRequestMessage request)
         {
-            using (var client = new HttpClient())
-            {
-                return await client.SendAsync(request);
-            }
+            using var client = new HttpClient();
+            return await client.SendAsync(request);
         }
 
         protected HttpRequestMessage BuildRequest(HttpMethod method, string path, string body)
@@ -68,4 +86,4 @@ protected HttpRequestMessage BuildGetRequest(string path)
             return BuildRequest(HttpMethod.Get, path, string.Empty);
         }
     }
-}
+}

tests/MockServerClientNet.Tests/MockServerFixture.cs

@@ -26,6 +26,8 @@ public class MockServerFixture : IAsyncLifetime
     public int Port => int.Parse(Environment.GetEnvironmentVariable("MOCKSERVER_TEST_PORT")
                                  ?? _container.GetMappedPublicPort(1080).ToString());
 
+    public string HostHeader => $"{Host}:{Port}";
+    
     public Task InitializeAsync()
         => _container.StartAsync();