Update fluent assertions (#252)

andrewlock · web-flow · commit dac30af80f91 · 2025-07-27T16:56:36.000+01:00
* Update fluent assertions and add analyzers

* Convert xunit assertions to fluent assertions
diff --git a/test/NetEscapades.AspNetCore.SecurityHeaders.TagHelpers.Test/AttributeHashTagHelperTests.cs b/test/NetEscapades.AspNetCore.SecurityHeaders.TagHelpers.Test/AttributeHashTagHelperTests.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Threading.Tasks;
+using FluentAssertions;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Abstractions;
@@ -45,9 +46,9 @@ public async Task ProcessAsync_StyleAttribute_GeneratesExpectedOutput()
             await tagHelper.ProcessAsync(fixture.Context, fixture.Output);
 
             // Assert
-            Assert.Equal(tagName, fixture.Output.TagName);
-            Assert.Equal([styleAttribute], fixture.Output.Attributes);
-            Assert.Empty(fixture.Output.Content.GetContent());
+            fixture.Output.TagName.Should().Be(tagName);
+            fixture.Output.Attributes.Should().BeEquivalentTo([styleAttribute]);
+            fixture.Output.Content.GetContent().Should().BeEmpty();
         }
 
         [Fact]
@@ -68,9 +69,9 @@ public async Task ProcessAsync_StyleAttribute_AddsHashToHttpContext()
             await tagHelper.ProcessAsync(fixture.Context, fixture.Output);
 
             // Assert
-            var hash = Assert.Single(tagHelper.ViewContext.HttpContext.GetStyleCSPHashes());
             var expected = "'sha256-NerDAUWfwD31YdZHveMrq0GLjsNFMwxLpZl0dPUeCcw='";
-            Assert.Equal(expected, hash);
+            var hash = tagHelper.ViewContext.HttpContext.GetStyleCSPHashes().Should().ContainSingle()
+                .Which.Should().Be(expected);
         }
 
         [Fact]
@@ -91,9 +92,9 @@ public async Task ProcessAsync_StyleAttributeWithExplicitHashType_AddsHashToHttp
             await tagHelper.ProcessAsync(fixture.Context, fixture.Output);
 
             // Assert
-            var hash = Assert.Single(tagHelper.ViewContext.HttpContext.GetStyleCSPHashes());
             var expected = "'sha384-YoSV9pxydVBLyyDpluNe9tQWgtUWlnzHS/zCvuNc30tEu0YwLQPRgNAXk+h06DXU'";
-            Assert.Equal(expected, hash);
+            tagHelper.ViewContext.HttpContext.GetStyleCSPHashes().Should().ContainSingle()
+                .Which.Should().Be(expected);
         }
 
         [Fact]
@@ -114,9 +115,9 @@ public async Task ProcessAsync_StyleAttributeWithMultiLine_AddsHashToHttpContext
             await tagHelper.ProcessAsync(fixture.Context, fixture.Output);
 
             // Assert
-            var hash = Assert.Single(tagHelper.ViewContext.HttpContext.GetStyleCSPHashes());
             var expected = "'sha256-ly/Q8sGjROqYelSQCwIsD00L09JdMcVcMFTDyK7N7GM='";
-            Assert.Equal(expected, hash);
+            tagHelper.ViewContext.HttpContext.GetStyleCSPHashes().Should().ContainSingle()
+                .Which.Should().Be(expected);
         }
 
         [Fact]
@@ -136,9 +137,9 @@ public async Task ProcessAsync_StyleAttributeTargetingNonExistingAttribute_Doesn
             await tagHelper.ProcessAsync(fixture.Context, fixture.Output);
 
             // Assert
-            Assert.Equal(tagName, fixture.Output.TagName);
-            Assert.Empty(fixture.Output.Attributes);
-            Assert.Empty(fixture.Output.Content.GetContent());
+            fixture.Output.TagName.Should().Be(tagName);
+            fixture.Output.Attributes.Should().BeEmpty();
+            fixture.Output.Content.GetContent().Should().BeEmpty();
         }
 
         [Fact]
@@ -159,9 +160,9 @@ public async Task ProcessAsync_InlineScriptAttribute_GeneratesExpectedOutput()
             await tagHelper.ProcessAsync(fixture.Context, fixture.Output);
 
             // Assert
-            Assert.Equal(tagName, fixture.Output.TagName);
-            Assert.Equal([inlineScriptAttribute], fixture.Output.Attributes);
-            Assert.Empty(fixture.Output.Content.GetContent());
+            fixture.Output.TagName.Should().Be(tagName);
+            fixture.Output.Attributes.Should().BeEquivalentTo([inlineScriptAttribute]);
+            fixture.Output.Content.GetContent().Should().BeEmpty();
         }
 
         [Fact]
@@ -182,9 +183,9 @@ public async Task ProcessAsync_InlineScriptAttribute_AddsHashToHttpContext()
             await tagHelper.ProcessAsync(fixture.Context, fixture.Output);
 
             // Assert
-            var hash = Assert.Single(tagHelper.ViewContext.HttpContext.GetScriptCSPHashes());
             var expected = "'sha256-1lzfyKjJuCLGsHTaOB3al0SElf3ats68l7XOAdrWd+E='";
-            Assert.Equal(expected, hash);
+            tagHelper.ViewContext.HttpContext.GetScriptCSPHashes().Should().ContainSingle()
+                .Which.Should().Be(expected);
         }
 
         [Fact]
@@ -215,13 +216,12 @@ public async Task ProcessAsync_MultipleAttributes_AddsAllHashesToHttpContext()
             await tagHelper.ProcessAsync(fixture.Context, fixture.Output);
 
             // Assert
-            var styleHash = Assert.Single(tagHelper.ViewContext.HttpContext.GetStyleCSPHashes());
-            var scriptHash = Assert.Single(tagHelper.ViewContext.HttpContext.GetScriptCSPHashes());
             var expectedStyleHash = "'sha256-NerDAUWfwD31YdZHveMrq0GLjsNFMwxLpZl0dPUeCcw='";
             var expectedScriptHash = "'sha256-1lzfyKjJuCLGsHTaOB3al0SElf3ats68l7XOAdrWd+E='";
-
-            Assert.Equal(expectedStyleHash, styleHash);
-            Assert.Equal(expectedScriptHash, scriptHash);
+            tagHelper.ViewContext.HttpContext.GetStyleCSPHashes().Should().ContainSingle()
+                .Which.Should().Be(expectedStyleHash);
+            tagHelper.ViewContext.HttpContext.GetScriptCSPHashes().Should().ContainSingle()
+                .Which.Should().Be(expectedScriptHash);
         }
 
         private static Fixture CreateFixture(string id, string tagName, params TagHelperAttribute[] attributes)
diff --git a/test/NetEscapades.AspNetCore.SecurityHeaders.TagHelpers.Test/HashTagHelperTests.cs b/test/NetEscapades.AspNetCore.SecurityHeaders.TagHelpers.Test/HashTagHelperTests.cs
@@ -1,3 +1,8 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Threading.Tasks;
+using FluentAssertions;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Abstractions;
@@ -8,10 +13,6 @@
 using Microsoft.AspNetCore.Razor.TagHelpers;
 using Microsoft.AspNetCore.Routing;
 using Moq;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Threading.Tasks;
 using NetEscapades.AspNetCore.SecurityHeaders.Infrastructure;
 using Xunit;
 
@@ -58,9 +59,9 @@ public async Task ProcessAsync_Script_GeneratesExpectedOutput()
             await tagHelper.ProcessAsync(tagHelperContext, output);
 
             // Assert
-            Assert.Equal(tagName, output.TagName);
-            Assert.Empty(output.Attributes);
-            Assert.Equal(shortSnippet, output.Content.GetContent());
+            output.TagName.Should().Be(tagName);
+            output.Attributes.Should().BeEmpty();
+            output.Content.GetContent().Should().Be(shortSnippet);
         }
 
         [Fact]
@@ -90,9 +91,9 @@ public async Task ProcessAsync_Script_AddsHashToHttpContextForOneLineSnippets()
             await tagHelper.ProcessAsync(tagHelperContext, output);
 
             // Assert
-            var hash = Assert.Single(tagHelper.ViewContext.HttpContext.GetScriptCSPHashes());
             var expected = "'sha256-1yLcYHZUiV92moZ6snTrg6e0yBO8emEEpUSB2wlMFz8='";
-            Assert.Equal(expected, hash);
+            tagHelper.ViewContext.HttpContext.GetScriptCSPHashes().Should().ContainSingle()
+                .Which.Should().Be(expected);
         }
 
         [Fact]
@@ -122,9 +123,9 @@ public async Task ProcessAsync_Script_AddsHashToHttpContextForMultiLineSnippets(
             await tagHelper.ProcessAsync(tagHelperContext, output);
 
             // Assert
-            var hash = Assert.Single(tagHelper.ViewContext.HttpContext.GetScriptCSPHashes());
             var expected = "'sha256-Oro8tit8euyKzxqyJteBRTdQBlipvXGQWfS5epMHmUU='";
-            Assert.Equal(expected, hash);
+            tagHelper.ViewContext.HttpContext.GetScriptCSPHashes().Should().ContainSingle()
+                .Which.Should().Be(expected);
         }
 
         [Fact]
@@ -156,9 +157,9 @@ public async Task ProcessAsync_Style_GeneratesExpectedOutput()
             await tagHelper.ProcessAsync(tagHelperContext, output);
 
             // Assert
-            Assert.Equal(tagName, output.TagName);
-            Assert.Empty(output.Attributes);
-            Assert.Equal(styleSnippet, output.Content.GetContent());
+            output.TagName.Should().Be(tagName);
+            output.Attributes.Should().BeEmpty();
+            output.Content.GetContent().Should().Be(styleSnippet);
         }
 
         [Fact]
@@ -188,9 +189,9 @@ public async Task ProcessAsync_Style_AddsHashToHttpContextForOneLineSnippets()
             await tagHelper.ProcessAsync(tagHelperContext, output);
 
             // Assert
-            var hash = Assert.Single(tagHelper.ViewContext.HttpContext.GetStyleCSPHashes());
             var expected = "'sha256-Wz9o8J/ijdXtAzs95rmQ8OtBacYk6JfYTXQlM8yxIjg='";
-            Assert.Equal(expected, hash);
+            tagHelper.ViewContext.HttpContext.GetStyleCSPHashes().Should().ContainSingle()
+                .Which.Should().Be(expected);
         }
 
         private static ViewContext GetViewContext()
diff --git a/test/NetEscapades.AspNetCore.SecurityHeaders.TagHelpers.Test/NetEscapades.AspNetCore.SecurityHeaders.TagHelpers.Test.csproj b/test/NetEscapades.AspNetCore.SecurityHeaders.TagHelpers.Test/NetEscapades.AspNetCore.SecurityHeaders.TagHelpers.Test.csproj
@@ -6,6 +6,8 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="FluentAssertions" Version="7.2.0" />
+    <PackageReference Include="FluentAssertions.Analyzers" Version="0.34.1" PrivateAssets="all" IncludeAssets="analyzers" />
     <PackageReference Include="PublicApiGenerator" Version="11.1.0" />
     <PackageReference Include="Verify.Xunit" Version="18.4.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
diff --git a/test/NetEscapades.AspNetCore.SecurityHeaders.TagHelpers.Test/NonceTagHelperTests.cs b/test/NetEscapades.AspNetCore.SecurityHeaders.TagHelpers.Test/NonceTagHelperTests.cs
@@ -1,3 +1,8 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Threading.Tasks;
+using FluentAssertions;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Abstractions;
@@ -10,10 +15,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Moq;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Threading.Tasks;
 using Xunit;
 
 namespace NetEscapades.AspNetCore.SecurityHeaders.TagHelpers.Test;
@@ -49,11 +50,11 @@ public async Task ProcessAsync_GeneratesExpectedOutput()
         await nonceTagHelper.ProcessAsync(tagHelperContext, output);
 
         // Assert
-        Assert.Equal(tagName, output.TagName);
-        Assert.Single(output.Attributes);
-        var attribute = Assert.Single(output.Attributes, attr => attr.Name.Equals("nonce"));
-        Assert.Equal(nonceValue, attribute.Value);
-        Assert.Equal("Something Else", output.Content.GetContent());
+        output.TagName.Should().Be(tagName);
+        var attribute = output.Attributes.Should().ContainSingle().Subject;
+        attribute.Name.Should().Be("nonce");
+        attribute.Value.Should().Be(nonceValue);
+        output.Content.GetContent().Should().Be("Something Else");
     }
 
     [Fact]
@@ -85,9 +86,9 @@ public async Task ProcessAsync_WhenNoNonceDoesNotAdd()
         await nonceTagHelper.ProcessAsync(tagHelperContext, output);
 
         // Assert
-        Assert.Equal(tagName, output.TagName);
-        Assert.Empty(output.Attributes);
-        Assert.Equal("Something Else", output.Content.GetContent());
+        output.TagName.Should().Be(tagName);
+        output.Attributes.Should().BeEmpty();
+        output.Content.GetContent().Should().Be("Something Else");
     }
 
     private static ViewContext GetViewContext(string nonce)
diff --git a/test/NetEscapades.AspNetCore.SecurityHeaders.Test/CustomHeaderExtensionsTests.cs b/test/NetEscapades.AspNetCore.SecurityHeaders.Test/CustomHeaderExtensionsTests.cs
@@ -1,5 +1,6 @@
 ﻿using Microsoft.AspNetCore.Builder;
 using System;
+using FluentAssertions;
 using Xunit;
 
 namespace NetEscapades.AspNetCore.SecurityHeaders.Test;
@@ -12,8 +13,8 @@ public void AddCustomHeader_WhenNullHeader_IncludesHeaderInTheMessage()
         // https://github.com/andrewlock/NetEscapades.AspNetCore.SecurityHeaders/issues/35
         var collection = new HeaderPolicyCollection();
 
-        Assert.Throws<ArgumentNullException>(
-            "header", () => collection.AddCustomHeader(null!, "asdf"));
+        var add = () => collection.AddCustomHeader(null!, "asdf");
+        add.Should().Throw<ArgumentNullException>();
     }
 
     [Fact]
diff --git a/test/NetEscapades.AspNetCore.SecurityHeaders.Test/CustomHeadersResultTests.cs b/test/NetEscapades.AspNetCore.SecurityHeaders.Test/CustomHeadersResultTests.cs
@@ -1,4 +1,5 @@
-﻿using Xunit;
+﻿using FluentAssertions;
+using Xunit;
 
 namespace NetEscapades.AspNetCore.SecurityHeaders.Infrastructure;
 
@@ -10,7 +11,7 @@ public void Default_Constructor()
         // Arrange & Act
         var result = new CustomHeadersResult();
 
-        Assert.Empty(result.SetHeaders);
-        Assert.Empty(result.RemoveHeaders);
+        result.SetHeaders.Should().BeEmpty();
+        result.RemoveHeaders.Should().BeEmpty();
     }
 }
diff --git a/test/NetEscapades.AspNetCore.SecurityHeaders.Test/FeaturePolicyBuilderTests.cs b/test/NetEscapades.AspNetCore.SecurityHeaders.Test/FeaturePolicyBuilderTests.cs
@@ -66,7 +66,8 @@ public void Build_AddAccelerometer_WhenIncludesAllAndNone_ThrowsInvalidOperation
             .None()
             .All();
 
-        Assert.Throws<InvalidOperationException>(() => builder.Build());
+        var act = () => builder.Build();
+        act.Should().ThrowExactly<InvalidOperationException>();
     }
 
     [Fact]
diff --git a/test/NetEscapades.AspNetCore.SecurityHeaders.Test/HeaderAssertionHelpers.cs b/test/NetEscapades.AspNetCore.SecurityHeaders.Test/HeaderAssertionHelpers.cs
@@ -24,10 +24,8 @@ public static void AssertHttpRequestDefaultSecurityHeaders(this HttpResponseHead
         headers.Should().ContainKey("Cross-Origin-Resource-Policy")
             .WhoseValue.Should().ContainSingle("same-origin");
 
-        Assert.False(headers.Contains("Server"),
-            "Should not contain server header");
-        Assert.False(headers.Contains("Strict-Transport-Security"),
-            "Should not contain Strict-Transport-Security header over http");
+        headers.Contains("Server").Should().BeFalse("Should not contain server header");
+        headers.Contains("Strict-Transport-Security").Should().BeFalse("Should not contain Strict-Transport-Security header over http");
     }
 
     public static void AssertSecureRequestDefaultSecurityHeaders(this HttpResponseHeaders headers)
@@ -47,8 +45,7 @@ public static void AssertSecureRequestDefaultSecurityHeaders(this HttpResponseHe
         headers.Should().ContainKey("Cross-Origin-Resource-Policy")
             .WhoseValue.Should().ContainSingle("same-origin");
 
-        Assert.False(headers.Contains("Server"),
-            "Should not contain server header");
+        headers.Contains("Server").Should().BeFalse("Should not contain server header");
     }
     
     public static void AssertHttpRequestDefaultApiSecurityHeaders(this HttpResponseHeaders headers)
@@ -70,9 +67,7 @@ public static void AssertHttpRequestDefaultApiSecurityHeaders(this HttpResponseH
         headers.Should().ContainKey("Cross-Origin-Resource-Policy")
             .WhoseValue.Should().ContainSingle("same-site");
 
-        Assert.False(headers.Contains("Server"),
-            "Should not contain server header");
-        Assert.False(headers.Contains("Strict-Transport-Security"),
-            "Should not contain Strict-Transport-Security header over http");
+        headers.Contains("Server").Should().BeFalse("Should not contain server header");
+        headers.Contains("Strict-Transport-Security").Should().BeFalse("Should not contain Strict-Transport-Security header over http");
     }
 }
diff --git a/test/NetEscapades.AspNetCore.SecurityHeaders.Test/HttpsSecurityHeadersMiddlewareFunctionalTests.cs b/test/NetEscapades.AspNetCore.SecurityHeaders.Test/HttpsSecurityHeadersMiddlewareFunctionalTests.cs
@@ -35,9 +35,9 @@ public async Task AllMethods_AddSecurityHeaders_IncludingStrict(string method, s
         var response = await Client.SendAsync(request);
 
         // Assert
-        Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+        response.StatusCode.Should().Be(HttpStatusCode.OK);
         var content = await response.Content.ReadAsStringAsync();
-        Assert.Equal(path, content);
+        content.Should().Be(path);
         var responseHeaders = response.Headers;
 
         responseHeaders.AssertSecureRequestDefaultSecurityHeaders();
diff --git a/test/NetEscapades.AspNetCore.SecurityHeaders.Test/NetEscapades.AspNetCore.SecurityHeaders.Test.csproj b/test/NetEscapades.AspNetCore.SecurityHeaders.Test/NetEscapades.AspNetCore.SecurityHeaders.Test.csproj
@@ -15,7 +15,8 @@
   <ItemGroup>
     <PackageReference Include="PublicApiGenerator" Version="11.1.0" />
     <PackageReference Include="Verify.Xunit" Version="18.4.0" />
-    <PackageReference Include="FluentAssertions" Version="6.12.0" />
+    <PackageReference Include="FluentAssertions" Version="7.2.0" />
+    <PackageReference Include="FluentAssertions.Analyzers" Version="0.34.1" PrivateAssets="all" IncludeAssets="analyzers" />
     <PackageReference Include="xunit" Version="2.4.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
diff --git a/test/NetEscapades.AspNetCore.SecurityHeaders.Test/PermissionsPolicyBuilderTests.cs b/test/NetEscapades.AspNetCore.SecurityHeaders.Test/PermissionsPolicyBuilderTests.cs
@@ -93,7 +93,8 @@ public void PermissionsPolicy_Build_AddAccelerometer_WhenIncludesAllAndNone_Thro
             .None()
             .All();
 
-        Assert.Throws<InvalidOperationException>(() => builder.Build());
+        var act = () => builder.Build();
+        act.Should().ThrowExactly<InvalidOperationException>();
     }
 
     [Fact]
diff --git a/test/NetEscapades.AspNetCore.SecurityHeaders.Test/ReportingEndpointsHeaderBuilderTests.cs b/test/NetEscapades.AspNetCore.SecurityHeaders.Test/ReportingEndpointsHeaderBuilderTests.cs
@@ -23,7 +23,8 @@ public void Build_WhenNullName_Throws(string name)
     {
         var builder = new ReportingEndpointsHeaderBuilder();
 
-        Assert.Throws<ArgumentNullException>(() => builder.AddEndpoint(name, "http://localhost:80/"));
+        var act = () => builder.AddEndpoint(name, "http://localhost:80/");
+        act.Should().ThrowExactly<ArgumentNullException>();
     }
 
     [Theory]
@@ -33,7 +34,8 @@ public void Build_WhenNullUrl_Throws(string url)
     {
         var builder = new ReportingEndpointsHeaderBuilder();
 
-        Assert.Throws<ArgumentNullException>(() => builder.AddDefaultEndpoint(url));
+        var act = () => builder.AddDefaultEndpoint(url);
+        act.Should().ThrowExactly<ArgumentNullException>();
     }
 
     [Theory]
@@ -43,7 +45,8 @@ public void Build_WhenInvalidUrlUrl_Throws(string url)
     {
         var builder = new ReportingEndpointsHeaderBuilder();
 
-        Assert.Throws<ArgumentException>(() => builder.AddDefaultEndpoint(url));
+        var act = () => builder.AddDefaultEndpoint(url);
+        act.Should().ThrowExactly<ArgumentException>();
     }
 
     [Fact]
diff --git a/test/NetEscapades.AspNetCore.SecurityHeaders.Test/SecurityHeadersMiddlewareTests.cs b/test/NetEscapades.AspNetCore.SecurityHeaders.Test/SecurityHeadersMiddlewareTests.cs

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`		`-using Xunit;`
	`1`	`+using FluentAssertions;`
	`2`	`+using Xunit;`
`2`	`3`
`3`	`4`	`namespace NetEscapades.AspNetCore.SecurityHeaders.Infrastructure;`
`4`	`5`
`@@ -10,7 +11,7 @@ public void Default_Constructor()`
`10`	`11`	`// Arrange & Act`
`11`	`12`	`var result = new CustomHeadersResult();`
`12`	`13`
`13`		`- Assert.Empty(result.SetHeaders);`
`14`		`- Assert.Empty(result.RemoveHeaders);`
	`14`	`+ result.SetHeaders.Should().BeEmpty();`
	`15`	`+ result.RemoveHeaders.Should().BeEmpty();`
`15`	`16`	`}`
`16`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,8 @@ public void Build_AddAccelerometer_WhenIncludesAllAndNone_ThrowsInvalidOperation`
`66`	`66`	`.None()`
`67`	`67`	`.All();`
`68`	`68`
`69`		`- Assert.Throws<InvalidOperationException>(() => builder.Build());`
	`69`	`+ var act = () => builder.Build();`
	`70`	`+ act.Should().ThrowExactly<InvalidOperationException>();`
`70`	`71`	`}`
`71`	`72`
`72`	`73`	`[Fact]`