Code Cleanup

RpgRoller.Tests/Services/ServiceRolemasterRollTests.cs

@@ -20,22 +20,19 @@ public sealed class ServiceRolemasterRollTests
         Assert.Equal(65, roll.Result);
         Assert.Equal("7+10+48=65", roll.Breakdown);
         Assert.Equal("7 + 10 | rolemaster", Assert.Single(logPage.Entries).SummaryText);
-        Assert.Collection(
-            roll.Dice,
-            die =>
-            {
-                Assert.Equal(7, die.Roll);
-                Assert.Equal(1, die.Sequence);
-                Assert.Equal(RollDieKinds.RolemasterStandard, die.Kind);
-                Assert.Equal(7, die.SignedContribution);
-            },
-            die =>
-            {
-                Assert.Equal(10, die.Roll);
-                Assert.Equal(2, die.Sequence);
-                Assert.Equal(RollDieKinds.RolemasterStandard, die.Kind);
-                Assert.Equal(10, die.SignedContribution);
-            });
+        Assert.Collection(roll.Dice, die =>
+        {
+            Assert.Equal(7, die.Roll);
+            Assert.Equal(1, die.Sequence);
+            Assert.Equal(RollDieKinds.RolemasterStandard, die.Kind);
+            Assert.Equal(7, die.SignedContribution);
+        }, die =>
+        {
+            Assert.Equal(10, die.Roll);
+            Assert.Equal(2, die.Sequence);
+            Assert.Equal(RollDieKinds.RolemasterStandard, die.Kind);
+            Assert.Equal(10, die.SignedContribution);
+        });
     }
 
     [Fact]
@@ -86,32 +83,28 @@ public sealed class ServiceRolemasterRollTests
         Assert.Equal("97 + 96 + 45 | open-ended high", Assert.Single(logPage.Entries).SummaryText);
         Assert.Null(Assert.Single(logPage.Entries).EventBadges);
         Assert.Equal(roll.Breakdown, detail.Breakdown);
-        Assert.Collection(
-            detail.Dice,
-            die =>
-            {
-                Assert.Equal(97, die.Roll);
-                Assert.Equal(1, die.Sequence);
-                Assert.Equal(RollDieKinds.RolemasterOpenEndedInitial, die.Kind);
-                Assert.Equal(97, die.SignedContribution);
-                Assert.False(die.Added);
-            },
-            die =>
-            {
-                Assert.Equal(96, die.Roll);
-                Assert.Equal(2, die.Sequence);
-                Assert.Equal(RollDieKinds.RolemasterOpenEndedHigh, die.Kind);
-                Assert.Equal(96, die.SignedContribution);
-                Assert.True(die.Added);
-            },
-            die =>
-            {
-                Assert.Equal(45, die.Roll);
-                Assert.Equal(3, die.Sequence);
-                Assert.Equal(RollDieKinds.RolemasterOpenEndedHigh, die.Kind);
-                Assert.Equal(45, die.SignedContribution);
-                Assert.True(die.Added);
-            });
+        Assert.Collection(detail.Dice, die =>
+        {
+            Assert.Equal(97, die.Roll);
+            Assert.Equal(1, die.Sequence);
+            Assert.Equal(RollDieKinds.RolemasterOpenEndedInitial, die.Kind);
+            Assert.Equal(97, die.SignedContribution);
+            Assert.False(die.Added);
+        }, die =>
+        {
+            Assert.Equal(96, die.Roll);
+            Assert.Equal(2, die.Sequence);
+            Assert.Equal(RollDieKinds.RolemasterOpenEndedHigh, die.Kind);
+            Assert.Equal(96, die.SignedContribution);
+            Assert.True(die.Added);
+        }, die =>
+        {
+            Assert.Equal(45, die.Roll);
+            Assert.Equal(3, die.Sequence);
+            Assert.Equal(RollDieKinds.RolemasterOpenEndedHigh, die.Kind);
+            Assert.Equal(45, die.SignedContribution);
+            Assert.True(die.Added);
+        });
     }
 
     [Fact]
@@ -134,40 +127,32 @@ public sealed class ServiceRolemasterRollTests
         var logEntry = Assert.Single(logPage.Entries);
         Assert.Equal("(05) -97 -100 -12 | open-ended low", logEntry.SummaryText);
         var lowEventBadges = Assert.IsType<string[]>(logEntry.EventBadges);
-        Assert.Collection(
-            lowEventBadges,
-            badge => Assert.Equal("rf", badge),
-            badge => Assert.Equal("r100", badge));
-        Assert.Collection(
-            roll.Dice,
-            die =>
-            {
-                Assert.Equal(5, die.Roll);
-                Assert.Equal(1, die.Sequence);
-                Assert.Equal(RollDieKinds.RolemasterOpenEndedInitial, die.Kind);
-                Assert.Null(die.SignedContribution);
-            },
-            die =>
-            {
-                Assert.Equal(97, die.Roll);
-                Assert.Equal(2, die.Sequence);
-                Assert.Equal(RollDieKinds.RolemasterOpenEndedLowSubtract, die.Kind);
-                Assert.Equal(-97, die.SignedContribution);
-            },
-            die =>
-            {
-                Assert.Equal(100, die.Roll);
-                Assert.Equal(3, die.Sequence);
-                Assert.Equal(RollDieKinds.RolemasterOpenEndedLowSubtract, die.Kind);
-                Assert.Equal(-100, die.SignedContribution);
-            },
-            die =>
-            {
-                Assert.Equal(12, die.Roll);
-                Assert.Equal(4, die.Sequence);
-                Assert.Equal(RollDieKinds.RolemasterOpenEndedLowSubtract, die.Kind);
-                Assert.Equal(-12, die.SignedContribution);
-            });
+        Assert.Collection(lowEventBadges, badge => Assert.Equal("rf", badge), badge => Assert.Equal("r100", badge));
+        Assert.Collection(roll.Dice, die =>
+        {
+            Assert.Equal(5, die.Roll);
+            Assert.Equal(1, die.Sequence);
+            Assert.Equal(RollDieKinds.RolemasterOpenEndedInitial, die.Kind);
+            Assert.Null(die.SignedContribution);
+        }, die =>
+        {
+            Assert.Equal(97, die.Roll);
+            Assert.Equal(2, die.Sequence);
+            Assert.Equal(RollDieKinds.RolemasterOpenEndedLowSubtract, die.Kind);
+            Assert.Equal(-97, die.SignedContribution);
+        }, die =>
+        {
+            Assert.Equal(100, die.Roll);
+            Assert.Equal(3, die.Sequence);
+            Assert.Equal(RollDieKinds.RolemasterOpenEndedLowSubtract, die.Kind);
+            Assert.Equal(-100, die.SignedContribution);
+        }, die =>
+        {
+            Assert.Equal(12, die.Roll);
+            Assert.Equal(4, die.Sequence);
+            Assert.Equal(RollDieKinds.RolemasterOpenEndedLowSubtract, die.Kind);
+            Assert.Equal(-12, die.SignedContribution);
+        });
     }
 
     [Fact]
@@ -189,4 +174,4 @@ public sealed class ServiceRolemasterRollTests
         Assert.Equal("r66", badge);
         Assert.Equal("66 | rolemaster", logEntry.SummaryText);
     }
-}
+}