Migrate to AwesomeAssertions and update config

gaepdit · Feb 26, 2025 · c59b84a · c59b84a
1 parent e9a0d10
commit c59b84a
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 56 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -4,6 +4,8 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageVersion Include="AutoMapper" Version="13.0.1" />
+    <PackageVersion Include="AwesomeAssertions" Version="8.0.1" />
+    <PackageVersion Include="AwesomeAssertions.Analyzers" Version="0.34.2" />
     <PackageVersion Include="ClosedXML" Version="0.104.2" />
     <PackageVersion Include="CsvHelper" Version="33.0.1" />
     <PackageVersion Include="Dapper" Version="2.1.35" />
@@ -32,7 +34,6 @@
     <PackageVersion Include="Swashbuckle.AspNetCore" Version="7.2.0" />
     <PackageVersion Include="coverlet.collector" Version="6.0.4" />
     <PackageVersion Include="EfCore.TestSupport" Version="9.0.0" />
-    <PackageVersion Include="FluentAssertions" Version="[7.0.0,8.0)" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
     <PackageVersion Include="NSubstitute" Version="5.3.0" />
     <PackageVersion Include="NSubstitute.Analyzers.CSharp" Version="1.0.17" />

diff --git a/tests/AppServicesTests/AppServicesTestsSetup.cs b/tests/AppServicesTests/AppServicesTestsSetup.cs
@@ -1,9 +1,6 @@
 using AutoMapper;
-using FluentAssertions.Equivalency;
-using FluentAssertions.Extensions;
-using Microsoft.AspNetCore.Identity;
 using Cts.AppServices.AutoMapper;
-using Cts.Domain.Identity;
+using FluentAssertions.Extensions;
 
 namespace AppServicesTests;
 
@@ -19,30 +16,15 @@ public void OneTimeSetUp()
         Mapper = new MapperConfiguration(configuration => configuration.AddProfile(new AutoMapperProfile()))
             .CreateMapper();
 
-        AssertionOptions.AssertEquivalencyUsing(options => options
+        AssertionConfiguration.Current.Equivalency.Modify(options => options
             // Setting this option globally since our DTOs generally exclude properties, e.g., audit properties.
             // See: https://fluentassertions.com/objectgraphs/#matching-members
             .ExcludingMissingMembers()
 
             // DateTimeOffset comparison is often off by a few microseconds.
-            .Using<DateTimeOffset>(ctx => ctx.Subject.Should().BeCloseTo(ctx.Expectation, 10.Milliseconds()))
+            .Using<DateTimeOffset>(
+                context => context.Subject.Should().BeCloseTo(context.Expectation, 10.Milliseconds()))
             .WhenTypeIs<DateTimeOffset>()
-
-            // Exclude some concurrency properties automatically added by ASP.NET Identity.
-            // See: https://stackoverflow.com/a/57406982/212978
-            .Using(new IdentityUserSelectionRule())
         );
     }
-
-    private class IdentityUserSelectionRule : IMemberSelectionRule
-    {
-        public IEnumerable<IMember> SelectMembers(INode currentNode, IEnumerable<IMember> selectedMembers,
-            MemberSelectionContext context) =>
-            selectedMembers.Where(e =>
-                !(e.DeclaringType.Name.StartsWith(nameof(IdentityUser)) &&
-                  e.Name is nameof(ApplicationUser.SecurityStamp) or nameof(ApplicationUser.ConcurrencyStamp)));
-
-        public bool IncludesMembers => false;
-        public override string ToString() => "Exclude SecurityStamp and ConcurrencyStamp from IdentityUser";
-    }
 }
diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props
@@ -19,7 +19,11 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="FluentAssertions"/>
+        <PackageReference Include="AwesomeAssertions" />
+        <PackageReference Include="AwesomeAssertions.Analyzers">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
         <PackageReference Include="Microsoft.NET.Test.Sdk"/>
         <PackageReference Include="NSubstitute"/>
         <PackageReference Include="NSubstitute.Analyzers.CSharp">

diff --git a/tests/EfRepositoryTests/EfRepositoryTestsSetup.cs b/tests/EfRepositoryTests/EfRepositoryTestsSetup.cs
@@ -9,9 +9,10 @@ public class EfRepositoryTestsSetup
     [OneTimeSetUp]
     public void RunBeforeAllTests()
     {
-        AssertionOptions.AssertEquivalencyUsing(opts => opts
+        AssertionConfiguration.Current.Equivalency.Modify(options => options
             // DateTimeOffset comparison is often off by a few microseconds.
-            .Using<DateTimeOffset>(ctx => ctx.Subject.Should().BeCloseTo(ctx.Expectation, 10.Milliseconds()))
+            .Using<DateTimeOffset>(
+                context => context.Subject.Should().BeCloseTo(context.Expectation, 10.Milliseconds()))
             .WhenTypeIs<DateTimeOffset>()
         );
     }

diff --git a/tests/LocalRepositoryTests/LocalRepositoryTestsSetup.cs b/tests/LocalRepositoryTests/LocalRepositoryTestsSetup.cs