Updated test dependencies

koenbeuk · koenbeuk · commit ffbd5b29915b · 2024-02-11T17:36:24.000Z
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -8,11 +8,10 @@
     <PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.0" />
     <PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.0" />
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.0.0" />
-
-	<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
-	<PackageVersion Include="ScenarioTests.XUnit" Version="1.0.0" />
-	<PackageVersion Include="xunit" Version="2.4.1" />
-	<PackageVersion Include="xunit.runner.visualstudio" Version="2.4.3" />
-	<PackageVersion Include="coverlet.collector" Version="1.3.0" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageVersion Include="ScenarioTests.XUnit" Version="1.0.1" />
+    <PackageVersion Include="xunit" Version="2.6.6" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="2.5.6" />
+    <PackageVersion Include="coverlet.collector" Version="6.0.0" />
   </ItemGroup>
 </Project>
diff --git a/test/EntityFrameworkCore.Triggered.Tests/EFCore5DbContextTests.cs b/test/EntityFrameworkCore.Triggered.Tests/EFCore5DbContextTests.cs
@@ -131,7 +131,7 @@ public void SaveChanges_CascadingCall_ReturnsActiveTriggerSession()
 
             subject.SaveChanges();
 
-            Assert.Equal(1, subject.TriggerStub.BeforeSaveInvocations.Count);
+            Assert.Single(subject.TriggerStub.BeforeSaveInvocations);
         }
 
         [Fact]
@@ -163,7 +163,7 @@ public async Task SaveChangesAsync_CascadingCall_ReturnsActiveTriggerSession()
 
             await subject.SaveChangesAsync();
 
-            Assert.Equal(1, subject.TriggerStub.BeforeSaveInvocations.Count);
+            Assert.Single(subject.TriggerStub.BeforeSaveInvocations);
         }
 
         [Fact]
diff --git a/test/EntityFrameworkCore.Triggered.Tests/Infrastructure/ServiceCollectionExtensionsTests.cs b/test/EntityFrameworkCore.Triggered.Tests/Infrastructure/ServiceCollectionExtensionsTests.cs
@@ -93,7 +93,7 @@ public void AddTriggeredDbContext_ReusesScopedServiceProvider()
 
             var triggerStub = scope.ServiceProvider.GetRequiredService<IBeforeSaveTrigger<TestModel>>() as TriggerStub<TestModel>;
             Assert.NotNull(triggerStub);
-            Assert.Equal(1, triggerStub.BeforeSaveInvocations.Count);
+            Assert.Single(triggerStub.BeforeSaveInvocations);
         }
 
 
@@ -119,7 +119,7 @@ public void AddTriggeredDbContextPool_ReusesScopedServiceProvider()
 
             var triggerStub = scope.ServiceProvider.GetRequiredService<IBeforeSaveTrigger<TestModel>>() as TriggerStub<TestModel>;
             Assert.NotNull(triggerStub);
-            Assert.Equal(1, triggerStub.BeforeSaveInvocations.Count);
+            Assert.Single(triggerStub.BeforeSaveInvocations);
         }
 
         [Fact]
diff --git a/test/EntityFrameworkCore.Triggered.Tests/TriggerServiceApplicationDependenciesTests.cs b/test/EntityFrameworkCore.Triggered.Tests/TriggerServiceApplicationDependenciesTests.cs
@@ -43,7 +43,7 @@ void SimulateRequest()
                 using var serviceScope = applicationServiceProvider.CreateScope();
                 var dbContext = serviceScope.ServiceProvider.GetRequiredService<TestDbContext>();
                 var triggerStub = serviceScope.ServiceProvider.GetRequiredService<IBeforeSaveTrigger<TestModel>>() as TriggerStub<TestModel>;
-                Assert.Equal(0, triggerStub.BeforeSaveInvocations.Count);
+                Assert.Empty(triggerStub.BeforeSaveInvocations);
 
                 dbContext.Add(new TestModel { });
                 dbContext.SaveChanges();
@@ -75,7 +75,7 @@ public void ScopedTriggers_NoScopedApplicationServiceProvider_ForPooledDbContext
 
             var triggerStub = serviceScope.ServiceProvider.GetRequiredService<IBeforeSaveTrigger<TestModel>>() as TriggerStub<TestModel>;
 
-            Assert.Equal(0, triggerStub.BeforeSaveInvocations.Count);
+            Assert.Empty(triggerStub.BeforeSaveInvocations);
 
         }
 
@@ -106,7 +106,7 @@ public void ScopedTriggers_WithScopedApplicationServiceProvider_ForDbContext()
 
             var triggerStub = scopedServiceProvider.GetRequiredService<IBeforeSaveTrigger<TestModel>>() as TriggerStub<TestModel>;
 
-            Assert.Equal(1, triggerStub.BeforeSaveInvocations.Count);
+            Assert.Single(triggerStub.BeforeSaveInvocations);
         }
 
 
@@ -137,7 +137,7 @@ public void ScopedTriggers_WithScopedApplicationServiceProvider_ForPooledDbConte
 
             var triggerStub = scopedServiceProvider.GetRequiredService<IBeforeSaveTrigger<TestModel>>() as TriggerStub<TestModel>;
 
-            Assert.Equal(1, triggerStub.BeforeSaveInvocations.Count);
+            Assert.Single(triggerStub.BeforeSaveInvocations);
         }
 
         [Fact]
@@ -169,7 +169,7 @@ void SimulateRequest()
 
                 var triggerStub = scopedServiceProvider.GetRequiredService<IBeforeSaveTrigger<TestModel>>() as TriggerStub<TestModel>;
 
-                Assert.Equal(1, triggerStub.BeforeSaveInvocations.Count);
+                Assert.Single(triggerStub.BeforeSaveInvocations);
             }
 
             SimulateRequest();
diff --git a/test/EntityFrameworkCore.Triggered.Tests/TriggerSessionTests.cs b/test/EntityFrameworkCore.Triggered.Tests/TriggerSessionTests.cs
@@ -112,7 +112,7 @@ public void RaiseBeforeSaveTriggers_RaisesOnceOnSimpleAddition()
 
             subject.RaiseBeforeSaveTriggers();
 
-            Assert.Equal(1, context.TriggerStub.BeforeSaveInvocations.Count);
+            Assert.Single(context.TriggerStub.BeforeSaveInvocations);
         }
 
         [Fact]
@@ -128,7 +128,7 @@ public async Task RaiseBeforeSaveAsyncTriggers_RaisesOnceOnSimpleAddition()
 
             await subject.RaiseBeforeSaveAsyncTriggers();
 
-            Assert.Equal(1, context.TriggerStub.BeforeSaveAsyncInvocations.Count);
+            Assert.Single(context.TriggerStub.BeforeSaveAsyncInvocations);
         }
 
         [Fact]
@@ -173,7 +173,7 @@ public void RaiseAfterSaveTriggers_RaisesOnceOnSimpleAddition()
             subject.DiscoverChanges();
             subject.RaiseAfterSaveTriggers();
 
-            Assert.Equal(1, context.TriggerStub.AfterSaveInvocations.Count);
+            Assert.Single(context.TriggerStub.AfterSaveInvocations);
         }
 
         [Fact]
@@ -190,7 +190,7 @@ public async Task RaiseAfterSaveAsyncTriggers_RaisesOnceOnSimpleAddition()
             subject.DiscoverChanges();
             await subject.RaiseAfterSaveAsyncTriggers();
 
-            Assert.Equal(1, context.TriggerStub.AfterSaveAsyncInvocations.Count);
+            Assert.Single(context.TriggerStub.AfterSaveAsyncInvocations);
         }
 
         [Fact]
@@ -383,7 +383,7 @@ public void RaiseAfterSaveFailedTriggers_OnException_RaisesSubsequentTriggers()
             subject.DiscoverChanges();
             subject.RaiseAfterSaveFailedTriggers(new Exception());
 
-            Assert.Equal(1, context.TriggerStub.AfterSaveFailedInvocations.Count);
+            Assert.Single(context.TriggerStub.AfterSaveFailedInvocations);
         }
 
 
@@ -401,7 +401,7 @@ public async Task RaiseAfterSaveFailedAsyncTriggers_OnException_RaisesSubsequent
             subject.DiscoverChanges();
             await subject.RaiseAfterSaveFailedAsyncTriggers(new Exception());
 
-            Assert.Equal(1, context.TriggerStub.AfterSaveFailedAsyncInvocations.Count);
+            Assert.Single(context.TriggerStub.AfterSaveFailedAsyncInvocations);
         }
 
         [Fact]
@@ -445,9 +445,9 @@ public void RaiseBeforeSaveTriggers_OnExceptionAndRecall_SkipsPreviousTriggers()
                 subject.RaiseBeforeSaveTriggers();
             }
 
-            Assert.Equal(1, firstTrigger.BeforeSaveInvocations.Count);
-            Assert.Equal(1, secondTrigger.BeforeSaveInvocations.Count);
-            Assert.Equal(1, lastTrigger.BeforeSaveInvocations.Count);
+            Assert.Single(firstTrigger.BeforeSaveInvocations);
+            Assert.Single(secondTrigger.BeforeSaveInvocations);
+            Assert.Single(lastTrigger.BeforeSaveInvocations);
         }
 
         [Fact]
@@ -517,7 +517,7 @@ public void RaiseTriggers_DisabledConfiguration_Noop()
             subject.RaiseBeforeSaveTriggers();
 
             // assert
-            Assert.Equal(0, context.TriggerStub.BeforeSaveInvocations.Count);
+            Assert.Empty(context.TriggerStub.BeforeSaveInvocations);
         }
     }
 }
diff --git a/test/EntityFrameworkCore.Triggered.Transactions.Tests/TriggeredDbContextTests.cs b/test/EntityFrameworkCore.Triggered.Transactions.Tests/TriggeredDbContextTests.cs
@@ -53,7 +53,7 @@ public void RaiseBeforeCommitTriggers_DiscoveredChangesFromTriggeredDbContext_Ca
 
             subject.RaiseBeforeCommitTriggers();
 
-            Assert.Equal(1, dbContext.TriggerStub.BeforeCommitInvocations.Count);
+            Assert.Single(dbContext.TriggerStub.BeforeCommitInvocations);
         }
 
 
@@ -72,7 +72,7 @@ public void RaiseAfterCommitTriggers_DiscoveredChangesFromTriggeredDbContext_Cal
 
             subject.RaiseAfterCommitTriggers();
 
-            Assert.Equal(1, dbContext.TriggerStub.AfterCommitInvocations.Count);
+            Assert.Single(dbContext.TriggerStub.AfterCommitInvocations);
         }
     }
 }
diff --git a/test/EntityFrameworkCore.Triggered.Transactions.Tests/TriggeredSessionExtensionsTests.cs b/test/EntityFrameworkCore.Triggered.Transactions.Tests/TriggeredSessionExtensionsTests.cs
@@ -80,7 +80,7 @@ public void RaiseBeforeCommitTriggers_RaisesOnceOnSimpleAddition()
             session.DiscoverChanges();
             session.RaiseBeforeCommitTriggers();
 
-            Assert.Equal(1, context.TriggerStub.BeforeCommitInvocations.Count);
+            Assert.Single(context.TriggerStub.BeforeCommitInvocations);
         }
 
         [Fact]
@@ -97,7 +97,7 @@ public async Task RaiseBeforeCommitAsyncTriggers_RaisesOnceOnSimpleAddition()
             session.DiscoverChanges();
             await session.RaiseBeforeCommitAsyncTriggers();
 
-            Assert.Equal(1, context.TriggerStub.BeforeCommitAsyncInvocations.Count);
+            Assert.Single(context.TriggerStub.BeforeCommitAsyncInvocations);
         }
 
         [Fact]
@@ -138,7 +138,7 @@ public void RaiseAfterCommitTriggers_RaisesOnceOnSimpleAddition()
             session.DiscoverChanges();
             session.RaiseAfterCommitTriggers();
 
-            Assert.Equal(1, context.TriggerStub.AfterCommitInvocations.Count);
+            Assert.Single(context.TriggerStub.AfterCommitInvocations);
         }
 
         [Fact]
@@ -155,7 +155,7 @@ public async Task RaiseAfterCommitAsyncTriggers_RaisesOnceOnSimpleAddition()
             session.DiscoverChanges();
             await session.RaiseAfterCommitAsyncTriggers();
 
-            Assert.Equal(1, context.TriggerStub.AfterCommitAsyncInvocations.Count);
+            Assert.Single(context.TriggerStub.AfterCommitAsyncInvocations);
         }
 
         [Fact]
@@ -196,7 +196,7 @@ public void RaiseBeforeRollbackTriggers_RaisesOnceOnSimpleAddition()
             session.DiscoverChanges();
             session.RaiseBeforeRollbackTriggers();
 
-            Assert.Equal(1, context.TriggerStub.BeforeRollbackInvocations.Count);
+            Assert.Single(context.TriggerStub.BeforeRollbackInvocations);
         }
 
         [Fact]
@@ -213,7 +213,7 @@ public async Task RaiseBeforeRollbackAsyncTriggers_RaisesOnceOnSimpleAddition()
             session.DiscoverChanges();
             await session.RaiseBeforeRollbackAsyncTriggers();
 
-            Assert.Equal(1, context.TriggerStub.BeforeRollbackAsyncInvocations.Count);
+            Assert.Single(context.TriggerStub.BeforeRollbackAsyncInvocations);
         }
 
         [Fact]
@@ -254,7 +254,7 @@ public void RaiseAfterRollbackTriggers_RaisesOnceOnSimpleAddition()
             session.DiscoverChanges();
             session.RaiseAfterRollbackTriggers();
 
-            Assert.Equal(1, context.TriggerStub.AfterRollbackInvocations.Count);
+            Assert.Single(context.TriggerStub.AfterRollbackInvocations);
         }
 
         [Fact]
@@ -271,7 +271,7 @@ public async Task RaiseAfterRollbackAsyncTriggers_RaisesOnceOnSimpleAddition()
             session.DiscoverChanges();
             await session.RaiseAfterRollbackAsyncTriggers();
 
-            Assert.Equal(1, context.TriggerStub.AfterRollbackAsyncInvocations.Count);
+            Assert.Single(context.TriggerStub.AfterRollbackAsyncInvocations);
         }
 
         [Fact]

Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ public void SaveChanges_CascadingCall_ReturnsActiveTriggerSession()`
`131`	`131`
`132`	`132`	`subject.SaveChanges();`
`133`	`133`
`134`		`- Assert.Equal(1, subject.TriggerStub.BeforeSaveInvocations.Count);`
	`134`	`+ Assert.Single(subject.TriggerStub.BeforeSaveInvocations);`
`135`	`135`	`}`
`136`	`136`
`137`	`137`	`[Fact]`
`@@ -163,7 +163,7 @@ public async Task SaveChangesAsync_CascadingCall_ReturnsActiveTriggerSession()`
`163`	`163`
`164`	`164`	`await subject.SaveChangesAsync();`
`165`	`165`
`166`		`- Assert.Equal(1, subject.TriggerStub.BeforeSaveInvocations.Count);`
	`166`	`+ Assert.Single(subject.TriggerStub.BeforeSaveInvocations);`
`167`	`167`	`}`
`168`	`168`
`169`	`169`	`[Fact]`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ public void AddTriggeredDbContext_ReusesScopedServiceProvider()`
`93`	`93`
`94`	`94`	`var triggerStub = scope.ServiceProvider.GetRequiredService<IBeforeSaveTrigger<TestModel>>() as TriggerStub<TestModel>;`
`95`	`95`	`Assert.NotNull(triggerStub);`
`96`		`- Assert.Equal(1, triggerStub.BeforeSaveInvocations.Count);`
	`96`	`+ Assert.Single(triggerStub.BeforeSaveInvocations);`
`97`	`97`	`}`
`98`	`98`
`99`	`99`
`@@ -119,7 +119,7 @@ public void AddTriggeredDbContextPool_ReusesScopedServiceProvider()`
`119`	`119`
`120`	`120`	`var triggerStub = scope.ServiceProvider.GetRequiredService<IBeforeSaveTrigger<TestModel>>() as TriggerStub<TestModel>;`
`121`	`121`	`Assert.NotNull(triggerStub);`
`122`		`- Assert.Equal(1, triggerStub.BeforeSaveInvocations.Count);`
	`122`	`+ Assert.Single(triggerStub.BeforeSaveInvocations);`
`123`	`123`	`}`
`124`	`124`
`125`	`125`	`[Fact]`
Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ public void RaiseBeforeSaveTriggers_RaisesOnceOnSimpleAddition()`
`112`	`112`
`113`	`113`	`subject.RaiseBeforeSaveTriggers();`
`114`	`114`
`115`		`- Assert.Equal(1, context.TriggerStub.BeforeSaveInvocations.Count);`
	`115`	`+ Assert.Single(context.TriggerStub.BeforeSaveInvocations);`
`116`	`116`	`}`
`117`	`117`
`118`	`118`	`[Fact]`
`@@ -128,7 +128,7 @@ public async Task RaiseBeforeSaveAsyncTriggers_RaisesOnceOnSimpleAddition()`
`128`	`128`
`129`	`129`	`await subject.RaiseBeforeSaveAsyncTriggers();`
`130`	`130`
`131`		`- Assert.Equal(1, context.TriggerStub.BeforeSaveAsyncInvocations.Count);`
	`131`	`+ Assert.Single(context.TriggerStub.BeforeSaveAsyncInvocations);`
`132`	`132`	`}`
`133`	`133`
`134`	`134`	`[Fact]`
`@@ -173,7 +173,7 @@ public void RaiseAfterSaveTriggers_RaisesOnceOnSimpleAddition()`
`173`	`173`	`subject.DiscoverChanges();`
`174`	`174`	`subject.RaiseAfterSaveTriggers();`
`175`	`175`
`176`		`- Assert.Equal(1, context.TriggerStub.AfterSaveInvocations.Count);`
	`176`	`+ Assert.Single(context.TriggerStub.AfterSaveInvocations);`
`177`	`177`	`}`
`178`	`178`
`179`	`179`	`[Fact]`
`@@ -190,7 +190,7 @@ public async Task RaiseAfterSaveAsyncTriggers_RaisesOnceOnSimpleAddition()`
`190`	`190`	`subject.DiscoverChanges();`
`191`	`191`	`await subject.RaiseAfterSaveAsyncTriggers();`
`192`	`192`
`193`		`- Assert.Equal(1, context.TriggerStub.AfterSaveAsyncInvocations.Count);`
	`193`	`+ Assert.Single(context.TriggerStub.AfterSaveAsyncInvocations);`
`194`	`194`	`}`
`195`	`195`
`196`	`196`	`[Fact]`
`@@ -383,7 +383,7 @@ public void RaiseAfterSaveFailedTriggers_OnException_RaisesSubsequentTriggers()`
`383`	`383`	`subject.DiscoverChanges();`
`384`	`384`	`subject.RaiseAfterSaveFailedTriggers(new Exception());`
`385`	`385`
`386`		`- Assert.Equal(1, context.TriggerStub.AfterSaveFailedInvocations.Count);`
	`386`	`+ Assert.Single(context.TriggerStub.AfterSaveFailedInvocations);`
`387`	`387`	`}`
`388`	`388`
`389`	`389`
`@@ -401,7 +401,7 @@ public async Task RaiseAfterSaveFailedAsyncTriggers_OnException_RaisesSubsequent`
`401`	`401`	`subject.DiscoverChanges();`
`402`	`402`	`await subject.RaiseAfterSaveFailedAsyncTriggers(new Exception());`
`403`	`403`
`404`		`- Assert.Equal(1, context.TriggerStub.AfterSaveFailedAsyncInvocations.Count);`
	`404`	`+ Assert.Single(context.TriggerStub.AfterSaveFailedAsyncInvocations);`
`405`	`405`	`}`
`406`	`406`
`407`	`407`	`[Fact]`
`@@ -445,9 +445,9 @@ public void RaiseBeforeSaveTriggers_OnExceptionAndRecall_SkipsPreviousTriggers()`
`445`	`445`	`subject.RaiseBeforeSaveTriggers();`
`446`	`446`	`}`
`447`	`447`
`448`		`- Assert.Equal(1, firstTrigger.BeforeSaveInvocations.Count);`
`449`		`- Assert.Equal(1, secondTrigger.BeforeSaveInvocations.Count);`
`450`		`- Assert.Equal(1, lastTrigger.BeforeSaveInvocations.Count);`
	`448`	`+ Assert.Single(firstTrigger.BeforeSaveInvocations);`
	`449`	`+ Assert.Single(secondTrigger.BeforeSaveInvocations);`
	`450`	`+ Assert.Single(lastTrigger.BeforeSaveInvocations);`
`451`	`451`	`}`
`452`	`452`
`453`	`453`	`[Fact]`
`@@ -517,7 +517,7 @@ public void RaiseTriggers_DisabledConfiguration_Noop()`
`517`	`517`	`subject.RaiseBeforeSaveTriggers();`
`518`	`518`
`519`	`519`	`// assert`
`520`		`- Assert.Equal(0, context.TriggerStub.BeforeSaveInvocations.Count);`
	`520`	`+ Assert.Empty(context.TriggerStub.BeforeSaveInvocations);`
`521`	`521`	`}`
`522`	`522`	`}`
`523`	`523`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public void RaiseBeforeCommitTriggers_DiscoveredChangesFromTriggeredDbContext_Ca`
`53`	`53`
`54`	`54`	`subject.RaiseBeforeCommitTriggers();`
`55`	`55`
`56`		`- Assert.Equal(1, dbContext.TriggerStub.BeforeCommitInvocations.Count);`
	`56`	`+ Assert.Single(dbContext.TriggerStub.BeforeCommitInvocations);`
`57`	`57`	`}`
`58`	`58`
`59`	`59`
`@@ -72,7 +72,7 @@ public void RaiseAfterCommitTriggers_DiscoveredChangesFromTriggeredDbContext_Cal`
`72`	`72`
`73`	`73`	`subject.RaiseAfterCommitTriggers();`
`74`	`74`
`75`		`- Assert.Equal(1, dbContext.TriggerStub.AfterCommitInvocations.Count);`
	`75`	`+ Assert.Single(dbContext.TriggerStub.AfterCommitInvocations);`
`76`	`76`	`}`
`77`	`77`	`}`
`78`	`78`	`}`