Convert remaining FluentAssertions use to Shouldly.

Author: sharpjs

DependencyQueue.Tests/CollectionViewTests.cs

@@ -14,10 +14,12 @@ public void Count_Get()
     {
         using var h = new TestHarness(this);
 
-        h.View.Count.Should().Be(h.Collection.Count);
+        h.View.Count.ShouldBe(h.Collection.Count);
 
         h.Dispose();
 
-        h.View.Invoking(v => v.Count).Should().Throw<ObjectDisposedException>();
+        Should.Throw<ObjectDisposedException>(
+            () => h.View.Count
+        );
     }
 }

DependencyQueue.Tests/DependencyQueue.Tests.csproj

@@ -29,6 +29,7 @@
 
   <ItemGroup>
     <Using Include="DependencyQueue.TestGlobals" Static="true" />
+    <Using Remove="FluentAssertions" />
   </ItemGroup>
 
 </Project>

DependencyQueue.Tests/DependencyQueueCycleErrorTests.cs

@@ -12,17 +12,17 @@ public class DependencyQueueCycleErrorTests
     [Test]
     public void Create_NullRequiringItem()
     {
-        Invoking(() => Error.Cycle(null!, new Topic("b")))
-            .Should().Throw<ArgumentNullException>()
-            .Where(e => e.ParamName == "requiringItem");
+        Should.Throw<ArgumentNullException>(
+            () => Error.Cycle(null!, new Topic("b"))
+        ).ParamName.ShouldBe("requiringItem");
     }
 
     [Test]
     public void Create_NullRequiredTopic()
     {
-        Invoking(() => Error.Cycle(new Item("a"), null!))
-            .Should().Throw<ArgumentNullException>()
-            .Where(e => e.ParamName == "requiredTopic");
+        Should.Throw<ArgumentNullException>(
+            () => Error.Cycle(new Item("a"), null!)
+        ).ParamName.ShouldBe("requiredTopic");
     }
 
     [Test]
@@ -32,7 +32,7 @@ public void Type_Get()
         var topic = new Topic("b");
         var error = Error.Cycle(item, topic);
 
-        error.Type.Should().Be(ErrorType.Cycle);
+        error.Type.ShouldBe(ErrorType.Cycle);
     }
 
     [Test]
@@ -42,7 +42,7 @@ public void RequiringItem_Get()
         var topic = new Topic("b");
         var error = Error.Cycle(item, topic);
 
-        error.RequiringItem.Should().BeSameAs(item);
+        error.RequiringItem.ShouldBeSameAs(item);
     }
 
     [Test]
@@ -52,7 +52,7 @@ public void RequiredTopic_Get()
         var topic = new Topic("b");
         var error = Error.Cycle(item, topic);
 
-        error.RequiredTopic.Should().BeSameAs(topic);
+        error.RequiredTopic.ShouldBeSameAs(topic);
     }
 
     [Test]
@@ -63,7 +63,7 @@ public void ToStringMethod()
         var topic = new Topic("b");
         var error = Error.Cycle(item, topic);
 
-        error.ToString().Should().Be(
+        error.ToString().ShouldBe(
             "The item 'a' cannot require topic 'b' because " +
             "an item providing that topic already requires item 'a'. " +
             "The dependency graph does not permit cycles."

DependencyQueue.Tests/DependencyQueueItemQueueViewTests.cs

@@ -18,27 +18,31 @@ public void Peek()
     {
         using var h = new TestHarness(this);
 
-        h.View.Peek().Apply(Unwrap).Should().Be(ItemA);
+        h.View.Peek().Apply(Unwrap).ShouldBe(ItemA);
 
         h.Dispose();
 
-        h.View.Invoking(v => v.Peek()).Should().Throw<ObjectDisposedException>();
+        Should.Throw<ObjectDisposedException>(
+            () => h.View.Peek()
+        );
     }
 
     [Test]
     public void TryPeek()
     {
         using var h = new TestHarness(this);
 
-        h.View.TryPeek(out var item).Should().BeTrue();
-        item.Apply(Unwrap)          .Should().Be(ItemA);
+        h.View.TryPeek(out var item).ShouldBeTrue();
+        item.Apply(Unwrap)          .ShouldBe(ItemA);
 
         h.Collection.Clear(); // violating thread safety for testing only
-        h.View.TryPeek(out _).Should().BeFalse();
+        h.View.TryPeek(out _).ShouldBeFalse();
 
         h.Dispose();
 
-        h.View.Invoking(v => v.Peek()).Should().Throw<ObjectDisposedException>();
+        Should.Throw<ObjectDisposedException>(
+            () => h.View.TryPeek(out _)
+        );
     }
 
     private protected override Inner ItemA { get; } = new Item("a");