Migrate NUnit assertions to the constraint model in preparation of the NUnit 4 upgrade

src/TestHelper/TestHelper.csproj

@@ -6,6 +6,7 @@
 
   <ItemGroup>
     <PackageReference Include="NUnit" Version="3.14.0" />
+    <PackageReference Include="NUnit.Analyzers" Version="4.3.0" />
   </ItemGroup>
 
   <!-- Workaround to prevent VS test discovery error -->

src/TimeoutMigrationTool.ASQ.IntegrationTests/ASQTargetTests.cs

@@ -44,9 +44,12 @@ public async Task AbleToMigrate_fails_if_Timeout_table_Does_not_exist()
             // Act
             var ableToMigrate = await timeoutTarget.AbleToMigrate(new EndpointInfo { EndpointName = endpointName });
 
-            // Assert
-            Assert.IsFalse(ableToMigrate.CanMigrate);
-            Assert.AreEqual("Target delayed delivery table TimeoutTableThatDoesNotExist does not exist.", ableToMigrate.Problems[0]);
+            Assert.Multiple(() =>
+            {
+                // Assert
+                Assert.That(ableToMigrate.CanMigrate, Is.False);
+                Assert.That(ableToMigrate.Problems[0], Is.EqualTo("Target delayed delivery table TimeoutTableThatDoesNotExist does not exist."));
+            });
         }
 
         [Test]
@@ -63,9 +66,12 @@ public async Task AbleToMigrate_fails_with_incorrect_connection_string()
             // Act
             var ableToMigrate = await timeoutTarget.AbleToMigrate(new EndpointInfo { EndpointName = endpointName });
 
-            // Assert
-            Assert.IsFalse(ableToMigrate.CanMigrate);
-            Assert.That(ableToMigrate.Problems[0], Does.StartWith("Unable to connect to the storage instance on account 'fakename'. Verify the connection string. Exception message '"));
+            Assert.Multiple(() =>
+            {
+                // Assert
+                Assert.That(ableToMigrate.CanMigrate, Is.False);
+                Assert.That(ableToMigrate.Problems[0], Does.StartWith("Unable to connect to the storage instance on account 'fakename'. Verify the connection string. Exception message '"));
+            });
         }
 
         [Test]
@@ -80,7 +86,7 @@ public async Task AbleToMigrate_passes_if_Timeout_table_exists()
             var ableToMigrate = await timeoutTarget.AbleToMigrate(new EndpointInfo { EndpointName = endpointName });
 
             // Assert
-            Assert.IsTrue(ableToMigrate.CanMigrate);
+            Assert.That(ableToMigrate.CanMigrate, Is.True);
         }
 
         [Test]
@@ -94,7 +100,7 @@ public async Task Prepare_creates_the_staging_queue()
             await using var migrator = await timeoutTarget.PrepareTargetEndpointBatchMigrator(endpointName);
 
             // Assert
-            Assert.IsTrue(await DoesTableExist(nameProvider.GetStagingTableName(endpointName)).ConfigureAwait(true));
+            Assert.That(await DoesTableExist(nameProvider.GetStagingTableName(endpointName)).ConfigureAwait(true), Is.True);
         }
 
         [Test]
@@ -136,8 +142,11 @@ public async Task StageBatch_inserts_timeouts_into_the_staging_queue()
             // Assert
             var recordsInTable = await ReadTimeoutsFromTable(nameProvider.GetStagingTableName(endpointName));
 
-            Assert.AreEqual(2, recordsInTable.Count);
-            Assert.AreEqual(2, numberStaged);
+            Assert.Multiple(() =>
+            {
+                Assert.That(recordsInTable, Has.Count.EqualTo(2));
+                Assert.That(numberStaged, Is.EqualTo(2));
+            });
         }
 
         [Test]
@@ -183,8 +192,11 @@ await migrator.StageBatch(new List<TimeoutData>
             // Assert
             var recordsInTimeoutTable = await ReadTimeoutsFromTable(nameProvider.GetDelayedDeliveryTableName(endpointName));
 
-            Assert.AreEqual(2, recordsInTimeoutTable.Count);
-            Assert.AreEqual(2, numberCompleted);
+            Assert.Multiple(() =>
+            {
+                Assert.That(recordsInTimeoutTable, Has.Count.EqualTo(2));
+                Assert.That(numberCompleted, Is.EqualTo(2));
+            });
         }
 
         [Test]
@@ -230,7 +242,7 @@ await migrator.StageBatch(new List<TimeoutData>
             // Assert
             var recordsInStagingTable = await ReadTimeoutsFromTable(nameProvider.GetStagingTableName(endpointName));
 
-            Assert.AreEqual(0, recordsInStagingTable.Count);
+            Assert.That(recordsInStagingTable.Count, Is.EqualTo(0));
         }
 
         [Test]
@@ -250,7 +262,7 @@ public async Task Abort_Removes_Staging_Table()
             // Assert
             var stagingTableExists = await DoesTableExist(nameProvider.GetStagingTableName(endpointName));
 
-            Assert.IsFalse(stagingTableExists);
+            Assert.That(stagingTableExists, Is.False);
         }
 
         [Test]
@@ -343,7 +355,7 @@ await migrator.StageBatch(new List<TimeoutData>
             // Assert
             var stagingTableExists = await DoesTableExist(nameProvider.GetStagingTableName(endpointName));
 
-            Assert.IsFalse(stagingTableExists);
+            Assert.That(stagingTableExists, Is.False);
         }
 
         [Test]
@@ -379,8 +391,7 @@ public async Task Staging_with_large_entities_batches_respecting_size_limitation
             var stageResult = await result.StageBatch(timeouts, 1);
 
             // Assert
-            Assert.IsNotNull(stageResult);
-            Assert.AreEqual(timeouts.Count, stageResult);
+            Assert.That(stageResult, Is.EqualTo(timeouts.Count));
         }
 
         [Test]
@@ -424,8 +435,7 @@ public async Task Completing_with_large_entities_batches_respecting_size_limitat
             var completeResult = await result.CompleteBatch(1);
 
             // Assert
-            Assert.IsNotNull(completeResult);
-            Assert.AreEqual(timeouts.Count, completeResult);
+            Assert.That(completeResult, Is.EqualTo(timeouts.Count));
         }
 
         async Task DeleteTable(string tableName)

src/TimeoutMigrationTool.ASQ.IntegrationTests/DelayedDeliveryTableNameProviderTests.cs

@@ -16,7 +16,7 @@ public void When_Migrating_Endpoint_With_No_DelayedDeliveryTableOverride_Delayed
             var delayedDeliveryTableName = delayedDeliveryTableNameGenerator.GetDelayedDeliveryTableName("EndpointName");
 
             // Assert
-            Assert.IsTrue(delayedDeliveryTableName.StartsWith("delays"));
+            Assert.That(delayedDeliveryTableName, Does.StartWith("delays"));
         }
 
         [Test]
@@ -29,7 +29,7 @@ public void When_Migrating_Endpoint_With_DelayedDeliveryTableOverride_DelayedDel
             var delayedDeliveryTableName = delayedDeliveryTableNameGenerator.GetDelayedDeliveryTableName("EndpointName");
 
             // Assert
-            Assert.AreEqual("overriden delayed delivery table name", delayedDeliveryTableName);
+            Assert.That(delayedDeliveryTableName, Is.EqualTo("overriden delayed delivery table name"));
         }
     }
 }

src/TimeoutMigrationTool.ASQ.IntegrationTests/TimeoutMigrationTool.ASQ.IntegrationTests.csproj

@@ -12,6 +12,8 @@
   <ItemGroup>
     <PackageReference Include="GitHubActionsTestLogger" Version="2.3.3" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+    <PackageReference Include="NUnit" Version="3.14.0" />
+    <PackageReference Include="NUnit.Analyzers" Version="4.3.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
   </ItemGroup>
 

src/TimeoutMigrationTool.Asp.AcceptanceTests/AspToAsqMqEndToEnd.cs

@@ -85,7 +85,7 @@ await Scenario.Define<SourceContext>()
                 .Done(c => c.GotTheDelayedMessage)
                 .Run(TimeSpan.FromSeconds(30));
 
-            Assert.True(context.GotTheDelayedMessage);
+            Assert.That(context.GotTheDelayedMessage, Is.True);
         }
 
         public class SourceContext : ScenarioContext

src/TimeoutMigrationTool.Asp.AcceptanceTests/AspToRabbitMqEndToEnd.cs

@@ -68,7 +68,7 @@ await Scenario.Define<SourceContext>()
                 .Done(c => c.GotTheDelayedMessage)
                 .Run(TimeSpan.FromSeconds(30));
 
-            Assert.True(context.GotTheDelayedMessage);
+            Assert.That(context.GotTheDelayedMessage, Is.True);
         }
 
         string rabbitUrl;

src/TimeoutMigrationTool.Asp.AcceptanceTests/AspToSqlTEndToEnd.cs

@@ -88,7 +88,7 @@ await Scenario.Define<SourceContext>()
                 .Done(c => c.GotTheDelayedMessage)
                 .Run(TimeSpan.FromSeconds(30));
 
-            Assert.True(context.GotTheDelayedMessage);
+            Assert.That(context.GotTheDelayedMessage, Is.True);
         }
 
         public class SourceContext : ScenarioContext

src/TimeoutMigrationTool.Asp.AcceptanceTests/TimeoutMigrationTool.Asp.AcceptanceTests.csproj

@@ -12,6 +12,8 @@
   <ItemGroup>
     <PackageReference Include="GitHubActionsTestLogger" Version="2.3.3" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+    <PackageReference Include="NUnit" Version="3.14.0" />
+    <PackageReference Include="NUnit.Analyzers" Version="4.3.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
   </ItemGroup>