Densify test suite: drop optional INTO; consolidate setup batches

Author: RyanLamansky

SqlServerSimulator.Tests.EFCore/EFCoreCheckConstraint.cs

@@ -18,9 +18,7 @@ public class EFCoreCheckConstraint
     [TestMethod]
     public void SaveChanges_StockItemPositiveQuantity_RoundTrips()
     {
-        using var context = new TestDbContext(TestDbContext.CreateStockItemsSimulation());
-        _ = context.StockItems.Add(new StockItem { Sku = "BOLT-7", Quantity = 12 });
-        _ = context.SaveChanges();
+        using var context = new TestDbContext(TestDbContext.CreateStockItemsSimulation()).WithSaved(new StockItem { Sku = "BOLT-7", Quantity = 12 });
 
         var fetched = context.StockItems.AsNoTracking().Single();
         Assert.AreEqual("BOLT-7", fetched.Sku);

SqlServerSimulator.Tests.EFCore/EFCoreDateTime.cs

@@ -38,9 +38,7 @@ public async Task InsertAsync_DateTime_RoundTrips()
     [TestMethod]
     public void Insert_NullableDateTime_AcceptsNull()
     {
-        using var context = new TestDbContext(TestDbContext.CreateEventsSimulation());
-        _ = context.Events.Add(new Event { Id = 1, CreatedAt = new DateTime(2026, 5, 4) });
-        _ = context.SaveChanges();
+        using var context = new TestDbContext(TestDbContext.CreateEventsSimulation()).WithSaved(new Event { Id = 1, CreatedAt = new DateTime(2026, 5, 4) });
 
         Assert.IsNull(context.Events.Select(e => e.Updated).First());
     }
@@ -182,19 +180,15 @@ public void Insert_LegacyDateTime_RoundTripsAtTickGranularity()
     [TestMethod]
     public void Insert_LegacyDateTime_999msRollsToNextSecond()
     {
-        using var context = new TestDbContext(TestDbContext.CreateEventsSimulation());
-        _ = context.Events.Add(new Event { Id = 1, CreatedAt = new DateTime(2026, 5, 4), Started = new DateTime(2026, 5, 4, 13, 45, 30, 999) });
-        _ = context.SaveChanges();
+        using var context = new TestDbContext(TestDbContext.CreateEventsSimulation()).WithSaved(new Event { Id = 1, CreatedAt = new DateTime(2026, 5, 4), Started = new DateTime(2026, 5, 4, 13, 45, 30, 999) });
 
         Assert.AreEqual(new DateTime(2026, 5, 4, 13, 45, 31), context.Events.Select(e => e.Started).First());
     }
 
     [TestMethod]
     public void Insert_NullableLegacyDateTime_AcceptsNull()
     {
-        using var context = new TestDbContext(TestDbContext.CreateEventsSimulation());
-        _ = context.Events.Add(new Event { Id = 1, CreatedAt = new DateTime(2026, 5, 4) });
-        _ = context.SaveChanges();
+        using var context = new TestDbContext(TestDbContext.CreateEventsSimulation()).WithSaved(new Event { Id = 1, CreatedAt = new DateTime(2026, 5, 4) });
 
         Assert.IsNull(context.Events.Select(e => e.Started).First());
         Assert.IsNull(context.Events.Select(e => e.Ended).First());

SqlServerSimulator.Tests.EFCore/EFCoreDecimal.cs

@@ -39,9 +39,7 @@ public async Task InsertAsync_Decimal_RoundTrips()
     [TestMethod]
     public void Insert_NullableDecimal_AcceptsNull()
     {
-        using var context = new TestDbContext(TestDbContext.CreateProductsSimulation());
-        _ = context.Products.Add(new Product { Id = 1, Price = 9.99m });
-        _ = context.SaveChanges();
+        using var context = new TestDbContext(TestDbContext.CreateProductsSimulation()).WithSaved(new Product { Id = 1, Price = 9.99m });
 
         Assert.IsNull(context.Products.Select(p => p.Discount).First());
     }
@@ -90,9 +88,7 @@ public void OrderBy_DecimalAscending()
     [TestMethod]
     public void Cast_DecimalToDouble_ProjectsAsFloat()
     {
-        using var context = new TestDbContext(TestDbContext.CreateProductsSimulation());
-        _ = context.Products.Add(new Product { Id = 1, Price = 19.99m });
-        _ = context.SaveChanges();
+        using var context = new TestDbContext(TestDbContext.CreateProductsSimulation()).WithSaved(new Product { Id = 1, Price = 19.99m });
 
         var asDouble = context.Products.Select(p => (double)p.Price).Single();
         Assert.AreEqual(19.99, asDouble, 0.001);

SqlServerSimulator.Tests.EFCore/EFCoreIdentity.cs

@@ -52,10 +52,7 @@ public void SaveChanges_AcrossBatches_ReseedsThroughHighWaterMark()
     {
         // Each SaveChanges produces a fresh INSERT/MERGE. Identity continues
         // counting from the table's high-water mark across calls.
-        using var context = new TestDbContext(TestDbContext.CreateWidgetsSimulation());
-
-        _ = context.Widgets.Add(new Widget { Name = "first" });
-        _ = context.SaveChanges();
+        using var context = new TestDbContext(TestDbContext.CreateWidgetsSimulation()).WithSaved(new Widget { Name = "first" });
 
         var pair = new[] { new Widget { Name = "second" }, new Widget { Name = "third" } };
         context.Widgets.AddRange(pair);
@@ -97,7 +94,7 @@ public void SqlQueryRaw_ScopeIdentity_ReturnsLastInsertedValue()
         var simulation = TestDbContext.CreateWidgetsSimulation();
         _ = simulation
             .CreateOpenConnection()
-            .CreateCommand("insert into Widgets (Name) values ('First'),('Second')")
+            .CreateCommand("insert Widgets (Name) values ('First'),('Second')")
             .ExecuteNonQuery();
 
         using var context = new TestDbContext(simulation);

SqlServerSimulator.Tests.EFCore/EFCoreLike.cs

@@ -94,11 +94,9 @@ public void EFFunctionsLike_WithEscape()
         // The 3-arg EF.Functions.Like overload threads an ESCAPE clause through
         // to the simulator. Insert a row whose name contains a literal '%' and
         // verify the escaped pattern matches it without treating '%' as wild.
-        using var context = new TestDbContext(TestDbContext.CreatePeopleSimulation());
-        context.People.AddRange(
+        using var context = new TestDbContext(TestDbContext.CreatePeopleSimulation()).WithSaved(
             new Person { Id = 1, Name = "100% Pure" },
             new Person { Id = 2, Name = "Mostly Pure" });
-        _ = context.SaveChanges();
 
         var ids = context.People.Where(p => EF.Functions.Like(p.Name, "%!%%", "!")).Select(p => p.Id).ToArray();
         CollectionAssert.AreEqual(new[] { 1 }, ids);
@@ -108,12 +106,10 @@ public void EFFunctionsLike_WithEscape()
     public void StartsWith_OnVarcharColumn_AlsoWorks()
     {
         // Code is varchar(10) — exercises the CP1252 path rather than nvarchar.
-        using var context = new TestDbContext(TestDbContext.CreatePeopleSimulation());
-        context.People.AddRange(
+        using var context = new TestDbContext(TestDbContext.CreatePeopleSimulation()).WithSaved(
             new Person { Id = 1, Name = "x", Code = "ABC-1" },
             new Person { Id = 2, Name = "y", Code = "ABC-2" },
             new Person { Id = 3, Name = "z", Code = "XYZ-1" });
-        _ = context.SaveChanges();
 
         var ids = context.People.Where(p => p.Code!.StartsWith("ABC")).OrderBy(p => p.Id).Select(p => p.Id).ToArray();
         CollectionAssert.AreEqual(new[] { 1, 2 }, ids);

SqlServerSimulator.Tests.EFCore/EFCoreMaxTypes.cs

@@ -16,9 +16,7 @@ public class EFCoreMaxTypes
     public void Insert_NVarcharMax_DefaultStringMapping_RoundTrips()
     {
         // Body has no [Column] annotation; EF picks nvarchar(max) by default.
-        using var context = new TestDbContext(TestDbContext.CreateArticlesSimulation());
-        _ = context.Articles.Add(new Article { Id = 1, Body = "hello world" });
-        _ = context.SaveChanges();
+        using var context = new TestDbContext(TestDbContext.CreateArticlesSimulation()).WithSaved(new Article { Id = 1, Body = "hello world" });
 
         Assert.AreEqual("hello world", context.Articles.Select(a => a.Body).First());
     }
@@ -78,12 +76,10 @@ public async Task InsertAsync_NVarcharMax_RoundTrips()
     [TestMethod]
     public void Where_FiltersByNVarcharMaxEquality()
     {
-        using var context = new TestDbContext(TestDbContext.CreateArticlesSimulation());
-        context.Articles.AddRange(
+        using var context = new TestDbContext(TestDbContext.CreateArticlesSimulation()).WithSaved(
             new Article { Id = 1, Body = "first" },
             new Article { Id = 2, Body = "second" },
             new Article { Id = 3, Body = "third" });
-        _ = context.SaveChanges();
 
         var match = context.Articles.Where(a => a.Body == "second").Select(a => a.Id).Single();
         Assert.AreEqual(2, match);
@@ -92,9 +88,7 @@ public void Where_FiltersByNVarcharMaxEquality()
     [TestMethod]
     public void Insert_NullableVarcharMax_AcceptsNull()
     {
-        using var context = new TestDbContext(TestDbContext.CreateArticlesSimulation());
-        _ = context.Articles.Add(new Article { Id = 1, Body = "body" });
-        _ = context.SaveChanges();
+        using var context = new TestDbContext(TestDbContext.CreateArticlesSimulation()).WithSaved(new Article { Id = 1, Body = "body" });
 
         Assert.IsNull(context.Articles.Select(a => a.Summary).First());
     }

SqlServerSimulator.Tests.EFCore/EFCoreOrderingAndDistinct.cs

@@ -62,12 +62,10 @@ public void OrderBy_ThenBy_OrdersByPrimaryThenSecondary()
     [TestMethod]
     public void OrderBy_String_RespectsCollationCaseInsensitive()
     {
-        using var context = new TestDbContext(TestDbContext.CreatePeopleSimulation());
-        context.People.AddRange(
+        using var context = new TestDbContext(TestDbContext.CreatePeopleSimulation()).WithSaved(
             new Person { Id = 1, Name = "B" },
             new Person { Id = 2, Name = "a" },
             new Person { Id = 3, Name = "C" });
-        _ = context.SaveChanges();
 
         // Default collation case-insensitive: 'a' sorts with 'A', so order is a, B, C.
         var names = context.People.OrderBy(p => p.Name).Select(p => p.Name).ToArray();
@@ -133,13 +131,11 @@ public void Distinct_OnSingleColumn_RemovesDuplicates()
     [TestMethod]
     public void Distinct_OnMultiColumn_DedupesByTuple()
     {
-        using var context = new TestDbContext(TestDbContext.CreatePeopleSimulation());
-        context.People.AddRange(
+        using var context = new TestDbContext(TestDbContext.CreatePeopleSimulation()).WithSaved(
             new Person { Id = 1, Name = "Alice", Code = "A" },
             new Person { Id = 2, Name = "Alice", Code = "A" }, // duplicate (Name, Code)
             new Person { Id = 3, Name = "Alice", Code = "B" }, // different Code
             new Person { Id = 4, Name = "Bob", Code = "A" });
-        _ = context.SaveChanges();
 
         var pairs = context.People
             .Select(p => new { p.Name, p.Code })
@@ -165,12 +161,10 @@ public async Task OrderBy_FirstAsync_ReturnsLowestKey()
     [TestMethod]
     public void OrderBy_DateTime_ReturnsChronologicalOrder()
     {
-        using var context = new TestDbContext(TestDbContext.CreateEventsSimulation());
-        context.Events.AddRange(
+        using var context = new TestDbContext(TestDbContext.CreateEventsSimulation()).WithSaved(
             new Event { Id = 1, CreatedAt = new DateTime(2026, 5, 4) },
             new Event { Id = 2, CreatedAt = new DateTime(2024, 1, 15) },
             new Event { Id = 3, CreatedAt = new DateTime(2025, 7, 22) });
-        _ = context.SaveChanges();
 
         var times = context.Events
             .OrderByDescending(e => e.CreatedAt)

SqlServerSimulator.Tests.EFCore/EFCorePrimaryKey.cs

@@ -16,10 +16,7 @@ public class EFCorePrimaryKey
     [TestMethod]
     public void SaveChanges_FirstRow_RoundTripsThroughPrimaryKey()
     {
-        using var context = new TestDbContext(TestDbContext.CreateInventorySimulation());
-
-        _ = context.Inventory.Add(new Inventory { Sku = "WIDGET-A", Quantity = 7 });
-        _ = context.SaveChanges();
+        using var context = new TestDbContext(TestDbContext.CreateInventorySimulation()).WithSaved(new Inventory { Sku = "WIDGET-A", Quantity = 7 });
 
         var fetched = context.Inventory.AsNoTracking().Single();
         Assert.AreEqual("WIDGET-A", fetched.Sku);
@@ -29,10 +26,7 @@ public void SaveChanges_FirstRow_RoundTripsThroughPrimaryKey()
     [TestMethod]
     public void SaveChanges_DuplicateKey_RaisesDbUpdateException()
     {
-        using var context = new TestDbContext(TestDbContext.CreateInventorySimulation());
-
-        _ = context.Inventory.Add(new Inventory { Sku = "WIDGET-A", Quantity = 1 });
-        _ = context.SaveChanges();
+        using var context = new TestDbContext(TestDbContext.CreateInventorySimulation()).WithSaved(new Inventory { Sku = "WIDGET-A", Quantity = 1 });
 
         using var context2 = new TestDbContext(context.Simulation);
         _ = context2.Inventory.Add(new Inventory { Sku = "WIDGET-A", Quantity = 99 });
@@ -50,9 +44,7 @@ public void SaveChanges_BatchWithMidBatchPkViolation_RollsBackEntireBatch()
         // statement atomicity (Bundle 1) means a mid-batch PK collision rolls
         // back the entire INSERT — neither the valid rows before nor after
         // the collision land in the table.
-        using var context = new TestDbContext(TestDbContext.CreateInventorySimulation());
-        _ = context.Inventory.Add(new Inventory { Sku = "EXISTING", Quantity = 1 });
-        _ = context.SaveChanges();
+        using var context = new TestDbContext(TestDbContext.CreateInventorySimulation()).WithSaved(new Inventory { Sku = "EXISTING", Quantity = 1 });
 
         using var context2 = new TestDbContext(context.Simulation);
         _ = context2.Inventory.Add(new Inventory { Sku = "NEW-1", Quantity = 10 });