Remove FluentAssertions (#1571)

thomhurst · Jan 15, 2025 · cc07749 · cc07749
1 parent 74a70a5
commit cc07749
Show file tree

Hide file tree

Showing 86 changed files with 513 additions and 519 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -11,7 +11,6 @@
     <PackageVersion Include="coverlet.collector" Version="6.0.3" />
     <PackageVersion Include="CliWrap" Version="3.7.0" />
     <PackageVersion Include="EnumerableAsyncProcessor" Version="2.0.6" />
-    <PackageVersion Include="FluentAssertions" Version="7.0.0" />
     <PackageVersion Include="FluentValidation.DependencyInjectionExtensions" Version="11.11.0" />
     <PackageVersion Include="Humanizer" Version="2.14.1" />
     <PackageVersion Include="MessagePack" Version="3.1.1" />
@@ -47,6 +46,7 @@
     <PackageVersion Include="NUnit3TestAdapter" Version="4.6.0" />
     <PackageVersion Include="Polly" Version="8.5.1" />
     <PackageVersion Include="Polyfill" Version="7.12.0" />
+    <PackageVersion Include="Shouldly" Version="4.2.1" />
     <PackageVersion Include="Sourcy.DotNet" Version="0.0.66" />
     <PackageVersion Include="Sourcy.Git" Version="0.0.66" />
     <PackageVersion Include="StreamJsonRpc" Version="2.20.20" />

diff --git a/TUnit.Engine.Tests/AbstractClassTests.cs b/TUnit.Engine.Tests/AbstractClassTests.cs
@@ -1,4 +1,4 @@
-using FluentAssertions;
+using Shouldly;
 
 namespace TUnit.Engine.Tests;
 
@@ -10,11 +10,11 @@ public async Task Test()
         await RunTestsWithFilter(
             "/*/*/AbstractBaseClass/*",
             [
-                result => result.ResultSummary.Outcome.Should().Be("Completed"),
-                result => result.ResultSummary.Counters.Total.Should().Be(0),
-                result => result.ResultSummary.Counters.Passed.Should().Be(0),
-                result => result.ResultSummary.Counters.Failed.Should().Be(0),
-                result => result.ResultSummary.Counters.NotExecuted.Should().Be(0)
+                result => result.ResultSummary.Outcome.ShouldBe("Completed"),
+                result => result.ResultSummary.Counters.Total.ShouldBe(0),
+                result => result.ResultSummary.Counters.Passed.ShouldBe(0),
+                result => result.ResultSummary.Counters.Failed.ShouldBe(0),
+                result => result.ResultSummary.Counters.NotExecuted.ShouldBe(0)
             ]);
     }
 }
diff --git a/TUnit.Engine.Tests/AfterTestAttributeTests.cs b/TUnit.Engine.Tests/AfterTestAttributeTests.cs
@@ -1,4 +1,4 @@
-using FluentAssertions;
+using Shouldly;
 using TUnit.Engine.Tests.Extensions;
 
 namespace TUnit.Engine.Tests;
@@ -11,11 +11,11 @@ public async Task Test()
         await RunTestsWithFilter(
             "/*/*/AfterTestAttributeTests/*",
             [
-                result => result.ResultSummary.Outcome.Should().Be("Completed"),
-                result => result.ResultSummary.Counters.Total.Should().Be(1),
-                result => result.ResultSummary.Counters.Passed.Should().Be(1),
-                result => result.ResultSummary.Counters.Failed.Should().Be(0),
-                result => result.ResultSummary.Counters.NotExecuted.Should().Be(0),
+                result => result.ResultSummary.Outcome.ShouldBe("Completed"),
+                result => result.ResultSummary.Counters.Total.ShouldBe(1),
+                result => result.ResultSummary.Counters.Passed.ShouldBe(1),
+                result => result.ResultSummary.Counters.Failed.ShouldBe(0),
+                result => result.ResultSummary.Counters.NotExecuted.ShouldBe(0),
                 _ => FindFile(x => x.Name.EndsWith("AfterTestAttributeTests.txt")).AssertExists()
             ]);
     }

diff --git a/TUnit.Engine.Tests/AsyncLocalTest.cs b/TUnit.Engine.Tests/AsyncLocalTest.cs
@@ -1,4 +1,4 @@
-using FluentAssertions;
+using Shouldly;
 
 namespace TUnit.Engine.Tests;
 
@@ -10,11 +10,11 @@ public async Task Test()
         await RunTestsWithFilter(
             "/*/*/AsyncLocalTest/*",
             [
-                result => result.ResultSummary.Outcome.Should().Be("Completed"),
-                result => result.ResultSummary.Counters.Total.Should().Be(1),
-                result => result.ResultSummary.Counters.Passed.Should().Be(1),
-                result => result.ResultSummary.Counters.Failed.Should().Be(0),
-                result => result.ResultSummary.Counters.NotExecuted.Should().Be(0)
+                result => result.ResultSummary.Outcome.ShouldBe("Completed"),
+                result => result.ResultSummary.Counters.Total.ShouldBe(1),
+                result => result.ResultSummary.Counters.Passed.ShouldBe(1),
+                result => result.ResultSummary.Counters.Failed.ShouldBe(0),
+                result => result.ResultSummary.Counters.NotExecuted.ShouldBe(0)
             ]);
     }
 }
diff --git a/TUnit.Engine.Tests/BasicTestsHooksFromLibrary.cs b/TUnit.Engine.Tests/BasicTestsHooksFromLibrary.cs
@@ -1,4 +1,4 @@
-using FluentAssertions;
+using Shouldly;
 
 namespace TUnit.Engine.Tests;
 
@@ -10,11 +10,11 @@ public async Task Test()
         await RunTestsWithFilter(
             "/*/*/BasicTestsHooksFromLibrary/*",
             [
-                result => result.ResultSummary.Outcome.Should().Be("Completed"),
-                result => result.ResultSummary.Counters.Total.Should().Be(1),
-                result => result.ResultSummary.Counters.Passed.Should().Be(1),
-                result => result.ResultSummary.Counters.Failed.Should().Be(0),
-                result => result.ResultSummary.Counters.NotExecuted.Should().Be(0)
+                result => result.ResultSummary.Outcome.ShouldBe("Completed"),
+                result => result.ResultSummary.Counters.Total.ShouldBe(1),
+                result => result.ResultSummary.Counters.Passed.ShouldBe(1),
+                result => result.ResultSummary.Counters.Failed.ShouldBe(0),
+                result => result.ResultSummary.Counters.NotExecuted.ShouldBe(0)
             ]);
     }
 }
diff --git a/TUnit.Engine.Tests/Bugs/Bug1187.cs b/TUnit.Engine.Tests/Bugs/Bug1187.cs
@@ -1,4 +1,4 @@
-using FluentAssertions;
+using Shouldly;
 
 namespace TUnit.Engine.Tests.Bugs;
 
@@ -10,11 +10,11 @@ public async Task Test()
         await RunTestsWithFilter(
             "/*/TUnit.TestProject.Bugs._1187/*/*",
             [
-                result => result.ResultSummary.Outcome.Should().Be("Completed"),
-                result => result.ResultSummary.Counters.Total.Should().Be(24),
-                result => result.ResultSummary.Counters.Passed.Should().Be(24),
-                result => result.ResultSummary.Counters.Failed.Should().Be(0),
-                result => result.ResultSummary.Counters.NotExecuted.Should().Be(0)
+                result => result.ResultSummary.Outcome.ShouldBe("Completed"),
+                result => result.ResultSummary.Counters.Total.ShouldBe(24),
+                result => result.ResultSummary.Counters.Passed.ShouldBe(24),
+                result => result.ResultSummary.Counters.Failed.ShouldBe(0),
+                result => result.ResultSummary.Counters.NotExecuted.ShouldBe(0)
             ]);
     }
 }
diff --git a/TUnit.Engine.Tests/Bugs/Bug1410.cs b/TUnit.Engine.Tests/Bugs/Bug1410.cs
@@ -1,4 +1,4 @@
-using FluentAssertions;
+using Shouldly;
 
 namespace TUnit.Engine.Tests.Bugs;
 
@@ -10,11 +10,11 @@ public async Task Test()
         await RunTestsWithFilter(
             "/*/TUnit.TestProject.Bugs._1410/*/ReproTest2",
             [
-                result => result.ResultSummary.Outcome.Should().Be("Completed"),
-                result => result.ResultSummary.Counters.Total.Should().Be(2),
-                result => result.ResultSummary.Counters.Passed.Should().Be(2),
-                result => result.ResultSummary.Counters.Failed.Should().Be(0),
-                result => result.ResultSummary.Counters.NotExecuted.Should().Be(0)
+                result => result.ResultSummary.Outcome.ShouldBe("Completed"),
+                result => result.ResultSummary.Counters.Total.ShouldBe(2),
+                result => result.ResultSummary.Counters.Passed.ShouldBe(2),
+                result => result.ResultSummary.Counters.Failed.ShouldBe(0),
+                result => result.ResultSummary.Counters.NotExecuted.ShouldBe(0)
             ]);
     }
 }
diff --git a/TUnit.Engine.Tests/CategoryTests.cs b/TUnit.Engine.Tests/CategoryTests.cs
@@ -1,4 +1,4 @@
-using FluentAssertions;
+using Shouldly;
 
 namespace TUnit.Engine.Tests;
 
@@ -10,31 +10,31 @@ public async Task Test()
         await RunTestsWithFilter(
             "/*/*/CategoryTests/*[Category=A]",
             [
-                result => result.ResultSummary.Outcome.Should().Be("Completed"),
-                result => result.ResultSummary.Counters.Total.Should().Be(2),
-                result => result.ResultSummary.Counters.Passed.Should().Be(2),
-                result => result.ResultSummary.Counters.Failed.Should().Be(0),
-                result => result.ResultSummary.Counters.NotExecuted.Should().Be(0)
+                result => result.ResultSummary.Outcome.ShouldBe("Completed"),
+                result => result.ResultSummary.Counters.Total.ShouldBe(2),
+                result => result.ResultSummary.Counters.Passed.ShouldBe(2),
+                result => result.ResultSummary.Counters.Failed.ShouldBe(0),
+                result => result.ResultSummary.Counters.NotExecuted.ShouldBe(0)
             ]);
 
         await RunTestsWithFilter(
             "/*/*/CategoryTests/*[Category=B]",
             [
-                result => result.ResultSummary.Outcome.Should().Be("Completed"),
-                result => result.ResultSummary.Counters.Total.Should().Be(2),
-                result => result.ResultSummary.Counters.Passed.Should().Be(2),
-                result => result.ResultSummary.Counters.Failed.Should().Be(0),
-                result => result.ResultSummary.Counters.NotExecuted.Should().Be(0)
+                result => result.ResultSummary.Outcome.ShouldBe("Completed"),
+                result => result.ResultSummary.Counters.Total.ShouldBe(2),
+                result => result.ResultSummary.Counters.Passed.ShouldBe(2),
+                result => result.ResultSummary.Counters.Failed.ShouldBe(0),
+                result => result.ResultSummary.Counters.NotExecuted.ShouldBe(0)
             ]);
 
         await RunTestsWithFilter(
             "/*/*/CategoryTests/*[(Category=A)&(Category=B)]",
             [
-                result => result.ResultSummary.Outcome.Should().Be("Completed"),
-                result => result.ResultSummary.Counters.Total.Should().Be(1),
-                result => result.ResultSummary.Counters.Passed.Should().Be(1),
-                result => result.ResultSummary.Counters.Failed.Should().Be(0),
-                result => result.ResultSummary.Counters.NotExecuted.Should().Be(0)
+                result => result.ResultSummary.Outcome.ShouldBe("Completed"),
+                result => result.ResultSummary.Counters.Total.ShouldBe(1),
+                result => result.ResultSummary.Counters.Passed.ShouldBe(1),
+                result => result.ResultSummary.Counters.Failed.ShouldBe(0),
+                result => result.ResultSummary.Counters.NotExecuted.ShouldBe(0)
             ]);
     }
 }
diff --git a/TUnit.Engine.Tests/ClassConstructorWithEnumerableTests.cs b/TUnit.Engine.Tests/ClassConstructorWithEnumerableTests.cs
@@ -1,4 +1,4 @@
-using FluentAssertions;
+using Shouldly;
 
 namespace TUnit.Engine.Tests;
 
@@ -10,11 +10,11 @@ public async Task Test()
         await RunTestsWithFilter(
             "/*/*/ClassConstructorWithEnumerableTest/*",
             [
-                result => result.ResultSummary.Outcome.Should().Be("Completed"),
-                result => result.ResultSummary.Counters.Total.Should().Be(4),
-                result => result.ResultSummary.Counters.Passed.Should().Be(4),
-                result => result.ResultSummary.Counters.Failed.Should().Be(0),
-                result => result.ResultSummary.Counters.NotExecuted.Should().Be(0)
+                result => result.ResultSummary.Outcome.ShouldBe("Completed"),
+                result => result.ResultSummary.Counters.Total.ShouldBe(4),
+                result => result.ResultSummary.Counters.Passed.ShouldBe(4),
+                result => result.ResultSummary.Counters.Failed.ShouldBe(0),
+                result => result.ResultSummary.Counters.NotExecuted.ShouldBe(0)
             ]);
     }
 }
diff --git a/TUnit.Engine.Tests/ClassDataSourceDrivenTests.cs b/TUnit.Engine.Tests/ClassDataSourceDrivenTests.cs
@@ -1,4 +1,4 @@
-using FluentAssertions;
+using Shouldly;
 
 namespace TUnit.Engine.Tests;
 
@@ -10,11 +10,11 @@ public async Task Test()
         await RunTestsWithFilter(
             "/*/*/ClassDataSourceDrivenTests/*",
             [
-                result => result.ResultSummary.Outcome.Should().Be("Completed"),
-                result => result.ResultSummary.Counters.Total.Should().Be(7),
-                result => result.ResultSummary.Counters.Passed.Should().Be(7),
-                result => result.ResultSummary.Counters.Failed.Should().Be(0),
-                result => result.ResultSummary.Counters.NotExecuted.Should().Be(0)
+                result => result.ResultSummary.Outcome.ShouldBe("Completed"),
+                result => result.ResultSummary.Counters.Total.ShouldBe(7),
+                result => result.ResultSummary.Counters.Passed.ShouldBe(7),
+                result => result.ResultSummary.Counters.Failed.ShouldBe(0),
+                result => result.ResultSummary.Counters.NotExecuted.ShouldBe(0)
             ]);
     }
 }
diff --git a/TUnit.Engine.Tests/ClassHooksExecutionCountTests.cs b/TUnit.Engine.Tests/ClassHooksExecutionCountTests.cs
@@ -1,4 +1,4 @@
-using FluentAssertions;
+using Shouldly;
 
 namespace TUnit.Engine.Tests;
 
@@ -10,11 +10,11 @@ public async Task Test()
         await RunTestsWithFilter(
             "/*/*/ClassHooksExecutionCountTests/*",
             [
-                result => result.ResultSummary.Outcome.Should().Be("Completed"),
-                result => result.ResultSummary.Counters.Total.Should().Be(5),
-                result => result.ResultSummary.Counters.Passed.Should().Be(5),
-                result => result.ResultSummary.Counters.Failed.Should().Be(0),
-                result => result.ResultSummary.Counters.NotExecuted.Should().Be(0),
+                result => result.ResultSummary.Outcome.ShouldBe("Completed"),
+                result => result.ResultSummary.Counters.Total.ShouldBe(5),
+                result => result.ResultSummary.Counters.Passed.ShouldBe(5),
+                result => result.ResultSummary.Counters.Failed.ShouldBe(0),
+                result => result.ResultSummary.Counters.NotExecuted.ShouldBe(0),
             ]);
     }
 }
diff --git a/TUnit.Engine.Tests/ConcreteBasedOnAbstractClassTests.cs b/TUnit.Engine.Tests/ConcreteBasedOnAbstractClassTests.cs
@@ -1,4 +1,4 @@
-using FluentAssertions;
+using Shouldly;
 
 namespace TUnit.Engine.Tests;
 
@@ -10,11 +10,11 @@ public async Task Test()
         await RunTestsWithFilter(
             "/*/*/(ConcreteClass1|ConcreteClass2)/*",
             [
-                result => result.ResultSummary.Outcome.Should().Be("Failed"),
-                result => result.ResultSummary.Counters.Total.Should().Be(3),
-                result => result.ResultSummary.Counters.Passed.Should().Be(2),
-                result => result.ResultSummary.Counters.Failed.Should().Be(1),
-                result => result.ResultSummary.Counters.NotExecuted.Should().Be(0)
+                result => result.ResultSummary.Outcome.ShouldBe("Failed"),
+                result => result.ResultSummary.Counters.Total.ShouldBe(3),
+                result => result.ResultSummary.Counters.Passed.ShouldBe(2),
+                result => result.ResultSummary.Counters.Failed.ShouldBe(1),
+                result => result.ResultSummary.Counters.NotExecuted.ShouldBe(0)
             ]);
     }
 }
diff --git a/TUnit.Engine.Tests/ConflictingDependsOnTests.cs b/TUnit.Engine.Tests/ConflictingDependsOnTests.cs
@@ -1,4 +1,4 @@
-using FluentAssertions;
+using Shouldly;
 
 namespace TUnit.Engine.Tests;
 
@@ -10,13 +10,13 @@ public async Task Test()
         await RunTestsWithFilter(
             "/*/*/ConflictingDependsOnTests/*",
             [
-                result => result.ResultSummary.Outcome.Should().Be("Failed"),
-                result => result.ResultSummary.Counters.Total.Should().Be(2),
-                result => result.ResultSummary.Counters.Passed.Should().Be(0),
-                result => result.ResultSummary.Counters.Failed.Should().Be(2),
-                result => result.ResultSummary.Counters.NotExecuted.Should().Be(0),
-                result => result.Results.First(x => x.TestName == "Test1").Output?.ErrorInfo?.Message.Should().Contain("DependsOn Conflict: Test1 > Test2 > Test1"),
-                result => result.Results.First(x => x.TestName == "Test2").Output?.ErrorInfo?.Message.Should().Contain("DependsOn Conflict: Test2 > Test1 > Test2"),
+                result => result.ResultSummary.Outcome.ShouldBe("Failed"),
+                result => result.ResultSummary.Counters.Total.ShouldBe(2),
+                result => result.ResultSummary.Counters.Passed.ShouldBe(0),
+                result => result.ResultSummary.Counters.Failed.ShouldBe(2),
+                result => result.ResultSummary.Counters.NotExecuted.ShouldBe(0),
+                result => result.Results.First(x => x.TestName == "Test1").Output?.ErrorInfo?.Message.ShouldContain("DependsOn Conflict: Test1 > Test2 > Test1"),
+                result => result.Results.First(x => x.TestName == "Test2").Output?.ErrorInfo?.Message.ShouldContain("DependsOn Conflict: Test2 > Test1 > Test2"),
 
             ]);
     }

diff --git a/TUnit.Engine.Tests/ConflictingDependsOnTests2.cs b/TUnit.Engine.Tests/ConflictingDependsOnTests2.cs
@@ -1,4 +1,4 @@
-using FluentAssertions;
+using Shouldly;
 
 namespace TUnit.Engine.Tests;
 
@@ -10,14 +10,14 @@ public async Task Test()
         await RunTestsWithFilter(
             "/*/*/ConflictingDependsOnTests2/*",
             [
-                result => result.ResultSummary.Outcome.Should().Be("Failed"),
-                result => result.ResultSummary.Counters.Total.Should().Be(3),
-                result => result.ResultSummary.Counters.Passed.Should().Be(0),
-                result => result.ResultSummary.Counters.Failed.Should().Be(3),
-                result => result.ResultSummary.Counters.NotExecuted.Should().Be(0),
-                result => result.Results.First(x => x.TestName == "Test1").Output?.ErrorInfo?.Message.Should().Contain("DependsOn Conflict: Test1 > Test3 > Test2 > Test1"),
-                result => result.Results.First(x => x.TestName == "Test2").Output?.ErrorInfo?.Message.Should().Contain("DependsOn Conflict: Test2 > Test1 > Test3 > Test2"),
-                result => result.Results.First(x => x.TestName == "Test3").Output?.ErrorInfo?.Message.Should().Contain("DependsOn Conflict: Test3 > Test2 > Test1 > Test3"),
+                result => result.ResultSummary.Outcome.ShouldBe("Failed"),
+                result => result.ResultSummary.Counters.Total.ShouldBe(3),
+                result => result.ResultSummary.Counters.Passed.ShouldBe(0),
+                result => result.ResultSummary.Counters.Failed.ShouldBe(3),
+                result => result.ResultSummary.Counters.NotExecuted.ShouldBe(0),
+                result => result.Results.First(x => x.TestName == "Test1").Output?.ErrorInfo?.Message.ShouldContain("DependsOn Conflict: Test1 > Test3 > Test2 > Test1"),
+                result => result.Results.First(x => x.TestName == "Test2").Output?.ErrorInfo?.Message.ShouldContain("DependsOn Conflict: Test2 > Test1 > Test3 > Test2"),
+                result => result.Results.First(x => x.TestName == "Test3").Output?.ErrorInfo?.Message.ShouldContain("DependsOn Conflict: Test3 > Test2 > Test1 > Test3"),
             ]);
     }
 }