Add NFluent checks for TestableHttpMessageHandler.

With these NFluent checks, it is now possible to make the same assertions using either the build in checks or the NFluent checks:

```csharp
var handler = new TestableHttpHandler();

handler.ShouldHaveMadeRequests().WithHttpMethod(HttpMethod.Post);
Check.That(handler).HasMadeRequests().WithHttpMethod(HttpMethod.Post);
```

Closes # 31.

Author: dnperfors

CHANGELOG.md

@@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Added
+- It is now possible to use NFluent to check `TestableHttpMessageHandler` by using `Check.That(handler).HasMadeRequests()` and `Check.That(handler).HasMadeRequestsTo("https://github.com/dnperfors/testablehttpclient")`. All existing `With` checks are supported.
 ### Changed
 - Introduced `IHttpRequestMessagesCheck` as the public interface for all checks on requests made to `TestableHttpMessageHandler`. It contains the following api:
   - `With(Func<HttpRequestMessage, bool>, string)`

README.md

@@ -9,7 +9,7 @@ This repository contains multiple related libraries. The separation is mainly ma
 |Libary|Description|Main dependency|Nuget|
 |------|-----------|---------------|-----|
 |TestableHttpClient|Basic library for mocking HttpMessageHandler and to make manual assertions on HttpResponseMessage.|None|![Nuget](https://img.shields.io/nuget/v/TestableHttpClient)|
-|TestableHttpClient.NFluent|Library containing [NFluent](https://github.com/tpierrain/NFluent) checks for HttpResponseMessage. Currently there is no dependency between the two libraries.|NFluent|![Nuget](https://img.shields.io/nuget/v/TestableHttpClient.NFluent)|
+|TestableHttpClient.NFluent|Library containing [NFluent](https://github.com/tpierrain/NFluent) checks for HttpResponseMessage and TestableHttpMessageHandler.|NFluent|![Nuget](https://img.shields.io/nuget/v/TestableHttpClient.NFluent)|
 
 ## How to install
 
@@ -22,9 +22,9 @@ dotnet add package TestableHttpClient.NFluent
 
 ## How to use TestableHttpClient
 
-```c#
+```csharp
 var testHandler = new TestableHttpMessageHandler();
-var httpClient = new HttpClient(testHandler);
+var httpClient = new HttpClient(testHandler); // or testHandler.CreateClient();
 
 var result = await httpClient.GetAsync("http://httpbin.org/status/200");
 
@@ -33,16 +33,27 @@ testHandler.ShouldHaveMadeRequestsTo("https://httpbin.org/*");
 
 More examples can be found in the [IntegrationTests project](test/TestableHttpClient.IntegrationTests)
 
-## How to use TestableHttpClient.NFluent
+## How to use TestableHttpClient.NFluent to test responses
 
-```c#
+```csharp
 var client = new HttpClient();
 
 var result = await httpClient.GetAsync("https://httpbin.org/status/200");
 
 Check.That(result).HasStatusCode(HttpStatusCode.OK).And.HasContentHeader("Content-Type", "*/json*");
 ```
 
+## How to use TestableHttpClient.NFluent to which requests are made
+
+```csharp
+var testHandler = new TestableHttpMessageHandler();
+var httpClient = new HttpClient(testHandler); // or testHandler.CreateClient();
+
+var result = await httpClient.GetAsync("http://httpbin.org/status/200");
+
+Check.That(testHandler).HasMadeRequestsTo("https://httpbin.org/*");
+```
+
 ## Contributing
 
 Please read [CONTRIBUTING.md](CONTRIBUTING.md) for details on how you can help us out.

TestableHttpClient.sln

@@ -25,14 +25,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestableHttpClient.NFluent"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestableHttpClient.NFluent.Tests", "test\TestableHttpClient.NFluent.Tests\TestableHttpClient.NFluent.Tests.csproj", "{29F350FB-5901-41AC-8605-F3413EE49E4A}"
 EndProject
-Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "SharedUtilities", "src\SharedUtilities\SharedUtilities.shproj", "{E405AF28-9C17-4580-AEBD-58B1BD4B116C}"
-EndProject
 Global
-	GlobalSection(SharedMSBuildProjectFiles) = preSolution
-		src\SharedUtilities\SharedUtilities.projitems*{127e2f48-cb33-488e-88e3-1bb0043c8cc1}*SharedItemsImports = 5
-		src\SharedUtilities\SharedUtilities.projitems*{e405af28-9c17-4580-aebd-58b1bd4b116c}*SharedItemsImports = 13
-		src\SharedUtilities\SharedUtilities.projitems*{fd5111e1-2970-4dc4-84dd-e4966e17dcb3}*SharedItemsImports = 5
-	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Debug|x64 = Debug|x64
@@ -112,7 +105,6 @@ Global
 		{37A6C1C0-1117-43DE-BD15-290BC8AD32BE} = {BBCED492-E92B-4FA8-A4A5-B5A76091F25E}
 		{127E2F48-CB33-488E-88E3-1BB0043C8CC1} = {4C8914F8-D732-462B-978E-3BB5DBE547D7}
 		{29F350FB-5901-41AC-8605-F3413EE49E4A} = {BBCED492-E92B-4FA8-A4A5-B5A76091F25E}
-		{E405AF28-9C17-4580-AEBD-58B1BD4B116C} = {4C8914F8-D732-462B-978E-3BB5DBE547D7}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {CD31CAB7-6661-4E80-9A70-BC8BA6B9B764}

src/SharedUtilities/SharedUtilities.projitems

@@ -0,0 +1,3 @@
+using System.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo("TestableHttpClient.NFluent.Tests")]

src/SharedUtilities/SharedUtilities.shproj

@@ -0,0 +1,79 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.Http;
+
+using NFluent;
+using NFluent.Extensibility;
+using NFluent.Kernel;
+
+using TestableHttpClient.Utils;
+
+namespace TestableHttpClient.NFluent
+{
+    /// <summary>
+    /// Class that implement NFluent checks on a collection of HttpRequestMessages.
+    /// </summary>
+    internal class FluentHttpRequestMessagesChecks : FluentSut<IEnumerable<HttpRequestMessage>>, IHttpRequestMessagesCheck
+    {
+        private IEnumerable<HttpRequestMessage> requests;
+        private readonly List<string> requestConditions = new List<string>();
+
+        public FluentHttpRequestMessagesChecks(IEnumerable<HttpRequestMessage> httpRequestMessages)
+            : base(httpRequestMessages, Check.Reporter, false)
+        {
+            if (httpRequestMessages == null)
+            {
+                throw new ArgumentNullException(nameof(httpRequestMessages));
+            }
+            requests = httpRequestMessages;
+        }
+
+        public IHttpRequestMessagesCheck With(Func<HttpRequestMessage, bool> predicate, string message)
+        {
+            if (!string.IsNullOrEmpty(message))
+            {
+                requestConditions.Add(message);
+            }
+
+            var checkLogic = ExtensibilityHelper.BeginCheck(this)
+                .CantBeNegated(nameof(With))
+                .FailWhen(_ => predicate == null, "The predicate should not be null.", MessageOption.NoCheckedBlock | MessageOption.NoExpectedBlock)
+                .Analyze((sut, _) => requests = requests.Where(predicate));
+
+            AnalyzeNumberOfRequests(checkLogic, null);
+            return this;
+        }
+
+        public IHttpRequestMessagesCheck Times(int count)
+        {
+            var checkLogic = ExtensibilityHelper.BeginCheck(this)
+                .CantBeNegated(nameof(Times))
+                .SetSutName("number of requests")
+                .DefineExpectedResult(count, null, null)
+                .FailWhen(_ => count < 0, "The {1} should not be below zero.", MessageOption.NoCheckedBlock);
+            AnalyzeNumberOfRequests(checkLogic, count);
+            return this;
+        }
+
+        private void AnalyzeNumberOfRequests(ICheckLogic<IEnumerable<HttpRequestMessage>> checkLogic, int? expectedCount)
+        {
+            checkLogic.Analyze((sut, check) =>
+            {
+                var actualCount = requests.Count();
+                var pass = expectedCount switch
+                {
+                    null => actualCount > 0,
+                    _ => actualCount == expectedCount
+                };
+
+                var message = MessageBuilder.BuildMessage(expectedCount, actualCount, requestConditions);
+                if (!pass)
+                {
+                    check.Fail(message, MessageOption.NoCheckedBlock | MessageOption.NoExpectedBlock);
+                }
+            })
+            .EndCheck();
+        }
+    }
+}

src/TestableHttpClient.NFluent/AssemblyInfo.cs

@@ -6,6 +6,8 @@
 using NFluent;
 using NFluent.Extensibility;
 
+using TestableHttpClient.Utils;
+
 namespace TestableHttpClient.NFluent
 {
     /// <summary>

src/TestableHttpClient.NFluent/FluentHttpRequestMessagesChecks.cs

@@ -1,9 +1,10 @@
 # TestableHttpClient.NFluent
 
-In integration tests, asserting HttpResponseMessages can be a real challenge, especially since error messages are sometimes not very clear. NFluent is known for giving clear error messages and `TestableHttpClient.NFluent` is designed to easily verify HttpResponseMessages and give clear error messages.
+In integration tests, asserting HttpResponseMessages can be a real challenge, especially since error messages are sometimes not very clear. NFluent is known for giving clear error messages.
+`TestableHttpClient.NFluent` is designed to make it easier to check `HttpResponseMessage`s and `TestableHttpClient`s and give clear error messages.
 
 For example when the following check fails:
-```c#
+```csharp
 Check.That(response).HasResponseHeader("Server");
 ```
 it will return the following message:
@@ -24,14 +25,27 @@ dotnet add package TestableHttpClient.NFluent
 
 ## How to use
 
-```c#
+### Asserting HttpResponseMessages
+
+```csharp
 var client = new HttpClient();
 
 var result = await httpClient.GetAsync("https://httpbin.org/status/200");
 
 Check.That(result).HasStatusCode(HttpStatusCode.OK).And.HasContentHeader("Content-Type", "*/json*");
 ```
 
+### Asserting TestableHttpMessageHandler
+
+```csharp
+var handler = new TestableHttpMessageHandler();
+var client = new HttpClient(handler);
+
+_ = await httpClient.GetAsync("https://httpbin.org/status/200");
+
+Check.That(handler).HasMadeRequestsTo("https://httpbin.org*").WithHttpMethod(HttpMethod.Get);
+```
+
 ## Authors
 
 * **David Perfors** - [dnperfors](https://github.com/dnperfors)
@@ -40,4 +54,4 @@ See also the list of [contributors](https://github.com/dnperfors/TestableHttpCli
 
 ## License
 
-This project is released under the MIT license, see [LICENSE.md](LICENSE.md) for more information.
+This project is released under the MIT license, see [LICENSE.md](../../LICENSE.md) for more information.

src/TestableHttpClient.NFluent/HttpResponseMessageChecks.cs

@@ -15,6 +15,8 @@
     <PackageReference Include="NFluent" Version="2.7.0" />
   </ItemGroup>
 
-  <Import Project="..\SharedUtilities\SharedUtilities.projitems" Label="Shared" />
+  <ItemGroup>
+    <ProjectReference Include="..\TestableHttpClient\TestableHttpClient.csproj" />
+  </ItemGroup>
 
 </Project>