Migrate NUnit assertions to the constraint model in preparation of th…

…e NUnit 4 upgrade (#1547) * Autoformat of test projects for NUnit2001 * Autoformat of test projects for NUnit2004 * Autoformat of test projects for NUnit2045 * Autoformat of test projects for NUnit2046
Particular · Aug 23, 2024 · 86a5634 · 86a5634
1 parent 8ef9120
commit 86a5634
Show file tree

Hide file tree

Showing 10 changed files with 70 additions and 31 deletions.
diff --git a/src/AcceptanceTestsShared/When_using_synchronized_session_via_container.cs b/src/AcceptanceTestsShared/When_using_synchronized_session_via_container.cs
@@ -27,8 +27,11 @@ public async Task Should_inject_synchronized_session_into_handler()
             Assert.That(context.ConnectionInjectedToSecondHandler, Is.Not.Null);
             Assert.That(context.ConnectionInjectedToThirdHandler, Is.Not.Null);
         });
-        Assert.That(context.ConnectionInjectedToSecondHandler, Is.SameAs(context.ConnectionInjectedToFirstHandler));
-        Assert.That(context.ConnectionInjectedToThirdHandler, Is.Not.SameAs(context.ConnectionInjectedToFirstHandler));
+        Assert.Multiple(() =>
+        {
+            Assert.That(context.ConnectionInjectedToSecondHandler, Is.SameAs(context.ConnectionInjectedToFirstHandler));
+            Assert.That(context.ConnectionInjectedToThirdHandler, Is.Not.SameAs(context.ConnectionInjectedToFirstHandler));
+        });
     }
 
     public class Context : ScenarioContext

diff --git a/src/MsSqlMicrosoftDataClientAcceptanceTests/When_transitioning_correlation_property.cs b/src/MsSqlMicrosoftDataClientAcceptanceTests/When_transitioning_correlation_property.cs
@@ -32,12 +32,18 @@ public async Task Should_remove_old_property_after_phase_three()
             var phase3Schema = GetSchema(connection);
 
             Assert.That(phase1Schema, Has.Member("Correlation_OrderNumber"));
-            Assert.That(phase1Schema, Has.No.Member("Correlation_OrderId"));
+            Assert.Multiple(() =>
+            {
+                Assert.That(phase1Schema, Has.No.Member("Correlation_OrderId"));
 
-            Assert.That(phase2Schema, Has.Member("Correlation_OrderNumber"));
-            Assert.That(phase2Schema, Has.Member("Correlation_OrderId"));
+                Assert.That(phase2Schema, Has.Member("Correlation_OrderNumber"));
+            });
+            Assert.Multiple(() =>
+            {
+                Assert.That(phase2Schema, Has.Member("Correlation_OrderId"));
 
-            Assert.That(phase3Schema, Has.No.Member("Correlation_OrderNumber"));
+                Assert.That(phase3Schema, Has.No.Member("Correlation_OrderNumber"));
+            });
             Assert.That(phase3Schema, Has.Member("Correlation_OrderId"));
         }
     }

diff --git a/src/MsSqlSystemDataClientAcceptanceTests/When_transitioning_correlation_property.cs b/src/MsSqlSystemDataClientAcceptanceTests/When_transitioning_correlation_property.cs
@@ -32,12 +32,18 @@ public async Task Should_remove_old_property_after_phase_three()
             var phase3Schema = GetSchema(connection);
 
             Assert.That(phase1Schema, Has.Member("Correlation_OrderNumber"));
-            Assert.That(phase1Schema, Has.No.Member("Correlation_OrderId"));
+            Assert.Multiple(() =>
+            {
+                Assert.That(phase1Schema, Has.No.Member("Correlation_OrderId"));
 
-            Assert.That(phase2Schema, Has.Member("Correlation_OrderNumber"));
-            Assert.That(phase2Schema, Has.Member("Correlation_OrderId"));
+                Assert.That(phase2Schema, Has.Member("Correlation_OrderNumber"));
+            });
+            Assert.Multiple(() =>
+            {
+                Assert.That(phase2Schema, Has.Member("Correlation_OrderId"));
 
-            Assert.That(phase3Schema, Has.No.Member("Correlation_OrderNumber"));
+                Assert.That(phase3Schema, Has.No.Member("Correlation_OrderNumber"));
+            });
             Assert.That(phase3Schema, Has.Member("Correlation_OrderId"));
         }
     }

diff --git a/src/OracleAcceptanceTests/When_transitioning_correlation_property.cs b/src/OracleAcceptanceTests/When_transitioning_correlation_property.cs
@@ -54,12 +54,18 @@ public async Task Should_remove_old_property_after_phase_three()
         }
 
         Assert.That(phase1Schema, Has.Member("CORR_ORDERNUMBER"));
-        Assert.That(phase1Schema, Has.No.Member("CORR_ORDERID"));
+        Assert.Multiple(() =>
+        {
+            Assert.That(phase1Schema, Has.No.Member("CORR_ORDERID"));
 
-        Assert.That(phase2Schema, Has.Member("CORR_ORDERNUMBER"));
-        Assert.That(phase2Schema, Has.Member("CORR_ORDERID"));
+            Assert.That(phase2Schema, Has.Member("CORR_ORDERNUMBER"));
+        });
+        Assert.Multiple(() =>
+        {
+            Assert.That(phase2Schema, Has.Member("CORR_ORDERID"));
 
-        Assert.That(phase3Schema, Has.No.Member("CORR_ORDERNUMBER"));
+            Assert.That(phase3Schema, Has.No.Member("CORR_ORDERNUMBER"));
+        });
         Assert.That(phase3Schema, Has.Member("CORR_ORDERID"));
     }
 

diff --git a/src/PostgreSqlAcceptanceTests/When_transitioning_correlation_property.cs b/src/PostgreSqlAcceptanceTests/When_transitioning_correlation_property.cs
@@ -32,12 +32,18 @@ public async Task Should_remove_old_property_after_phase_three()
             var phase3Schema = GetSchema(connection);
 
             Assert.That(phase1Schema, Has.Member("Correlation_OrderNumber"));
-            Assert.That(phase1Schema, Has.No.Member("Correlation_OrderId"));
+            Assert.Multiple(() =>
+            {
+                Assert.That(phase1Schema, Has.No.Member("Correlation_OrderId"));
 
-            Assert.That(phase2Schema, Has.Member("Correlation_OrderNumber"));
-            Assert.That(phase2Schema, Has.Member("Correlation_OrderId"));
+                Assert.That(phase2Schema, Has.Member("Correlation_OrderNumber"));
+            });
+            Assert.Multiple(() =>
+            {
+                Assert.That(phase2Schema, Has.Member("Correlation_OrderId"));
 
-            Assert.That(phase3Schema, Has.No.Member("Correlation_OrderNumber"));
+                Assert.That(phase3Schema, Has.No.Member("Correlation_OrderNumber"));
+            });
             Assert.That(phase3Schema, Has.Member("Correlation_OrderId"));
         }
     }

diff --git a/src/SqlPersistence.Tests/Outbox/OutboxPersisterTests.cs b/src/SqlPersistence.Tests/Outbox/OutboxPersisterTests.cs
@@ -115,7 +115,7 @@ public void StoreDispatchAndGet()
         Assert.Multiple(() =>
         {
             Assert.That(result.Item1.TransportOperations, Has.Length.EqualTo(1));
-            Assert.That(result.Item2.TransportOperations.Length, Is.EqualTo(0));
+            Assert.That(result.Item2.TransportOperations, Is.Empty);
         });
     }
 

diff --git a/...ionalSession.MsSqlMicrosoftDataClient.AcceptanceTests/When_using_transactional_session.cs b/...ionalSession.MsSqlMicrosoftDataClient.AcceptanceTests/When_using_transactional_session.cs
@@ -163,8 +163,11 @@ public async Task Should_not_send_messages_if_session_is_not_committed(bool outb
                 .Done(c => c.CompleteMessageReceived)
                 .Run();
 
-            Assert.True(result.CompleteMessageReceived);
-            Assert.False(result.MessageReceived);
+            Assert.Multiple(() =>
+            {
+                Assert.That(result.CompleteMessageReceived, Is.True);
+                Assert.That(result.MessageReceived, Is.False);
+            });
         }
 
         [TestCase(true)]
@@ -194,7 +197,7 @@ public async Task Should_send_immediate_dispatch_messages_even_if_session_is_not
                 .Done(c => c.MessageReceived)
                 .Run();
 
-            Assert.True(result.MessageReceived);
+            Assert.That(result.MessageReceived, Is.True);
         }
 
         class Context : ScenarioContext, IInjectServiceProvider

diff --git a/...ftDataClient.AcceptanceTests/When_using_transactional_session_with_pessimistic_locking.cs b/...ftDataClient.AcceptanceTests/When_using_transactional_session_with_pessimistic_locking.cs
@@ -142,8 +142,11 @@ public async Task Should_not_send_messages_if_session_is_not_committed()
                 .Done(c => c.CompleteMessageReceived)
                 .Run();
 
-            Assert.True(result.CompleteMessageReceived);
-            Assert.False(result.MessageReceived);
+            Assert.Multiple(() =>
+            {
+                Assert.That(result.CompleteMessageReceived, Is.True);
+                Assert.That(result.MessageReceived, Is.False);
+            });
         }
 
         [Test]
@@ -167,7 +170,7 @@ public async Task Should_send_immediate_dispatch_messages_even_if_session_is_not
                 .Done(c => c.MessageReceived)
                 .Run();
 
-            Assert.True(result.MessageReceived);
+            Assert.That(result.MessageReceived, Is.True);
         }
 
         class Context : ScenarioContext, IInjectServiceProvider

diff --git a/...actionalSession.MsSqlSystemDataClient.AcceptanceTests/When_using_transactional_session.cs b/...actionalSession.MsSqlSystemDataClient.AcceptanceTests/When_using_transactional_session.cs
@@ -168,8 +168,11 @@ public async Task Should_not_send_messages_if_session_is_not_committed(bool outb
                 .Done(c => c.CompleteMessageReceived)
                 .Run();
 
-            Assert.True(result.CompleteMessageReceived);
-            Assert.False(result.MessageReceived);
+            Assert.Multiple(() =>
+            {
+                Assert.That(result.CompleteMessageReceived, Is.True);
+                Assert.That(result.MessageReceived, Is.False);
+            });
         }
 
         [TestCase(true)]
@@ -199,7 +202,7 @@ public async Task Should_send_immediate_dispatch_messages_even_if_session_is_not
                 .Done(c => c.MessageReceived)
                 .Run();
 
-            Assert.True(result.MessageReceived);
+            Assert.That(result.MessageReceived, Is.True);
         }
 
         class Context : ScenarioContext, IInjectServiceProvider

diff --git a/...emDataClient.AcceptanceTests/When_using_transactional_session_with_pessimistic_locking.cs b/...emDataClient.AcceptanceTests/When_using_transactional_session_with_pessimistic_locking.cs
@@ -148,8 +148,11 @@ public async Task Should_not_send_messages_if_session_is_not_committed()
                 .Done(c => c.CompleteMessageReceived)
                 .Run();
 
-            Assert.True(result.CompleteMessageReceived);
-            Assert.False(result.MessageReceived);
+            Assert.Multiple(() =>
+            {
+                Assert.That(result.CompleteMessageReceived, Is.True);
+                Assert.That(result.MessageReceived, Is.False);
+            });
         }
 
         [Test]
@@ -173,7 +176,7 @@ public async Task Should_send_immediate_dispatch_messages_even_if_session_is_not
                 .Done(c => c.MessageReceived)
                 .Run();
 
-            Assert.True(result.MessageReceived);
+            Assert.That(result.MessageReceived, Is.True);
         }
 
         class Context : ScenarioContext, IInjectServiceProvider