Merge pull request #174 from 0xced/speed-up-integration-tests

Speed up resetting the database in integration tests
artiomchi · Mar 2, 2025 · da144d4 · da144d4
2 parents 0f0b9c7 + 5d72107
commit da144d4
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 25 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -7,18 +7,18 @@ jobs:
     name: Build on Ubuntu (full)
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/setup-dotnet@v3
+    - uses: actions/setup-dotnet@v4
       with:
         dotnet-version: '8.0'
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Restore dependencies
       run: dotnet restore
     - name: Build
       run: dotnet build --no-restore
     - name: Test
       run: dotnet test --no-build --logger "trx;LogFileName=test-results.trx"
     - name: Test Report
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       if: success() || failure()
       with:
         name: test-results
@@ -28,10 +28,10 @@ jobs:
     name: Build on Windows
     runs-on: windows-latest
     steps:
-    - uses: actions/setup-dotnet@v3
+    - uses: actions/setup-dotnet@v4
       with:
         dotnet-version: '8.0'
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Enable Postgres
       run: sc config postgresql-x64-14 start= demand
     - name: Start Postgres
@@ -45,7 +45,7 @@ jobs:
         USE_LOCAL_SERVICE: 'true'
       run: dotnet test ./test/FlexLabs.EntityFrameworkCore.Upsert.IntegrationTests --no-build --logger "trx;LogFileName=test-results.trx"
     - name: Test Report
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       if: success() || failure()
       with:
         name: test-results-win

diff --git a/test/FlexLabs.EntityFrameworkCore.Upsert.IntegrationTests/DbTestsBase.cs b/test/FlexLabs.EntityFrameworkCore.Upsert.IntegrationTests/DbTestsBase.cs
@@ -92,24 +92,24 @@ protected void ResetDb()
         {
             using var dbContext = new TestDbContext(_fixture.DataContextOptions);
 
-            dbContext.RemoveRange(dbContext.Books);
-            dbContext.RemoveRange(dbContext.Countries);
-            dbContext.RemoveRange(dbContext.DashTable);
-            dbContext.RemoveRange(dbContext.GuidKeys);
-            dbContext.RemoveRange(dbContext.GuidKeysAutoGen);
-            dbContext.RemoveRange(dbContext.JObjectDatas);
-            dbContext.RemoveRange(dbContext.JsonDatas);
-            dbContext.RemoveRange(dbContext.KeyOnlies);
-            dbContext.RemoveRange(dbContext.NullableCompositeKeys);
-            dbContext.RemoveRange(dbContext.NullableRequireds);
-            dbContext.RemoveRange(dbContext.PageVisits);
-            dbContext.RemoveRange(dbContext.SchemaTable);
-            dbContext.RemoveRange(dbContext.Statuses);
-            dbContext.RemoveRange(dbContext.StringKeys);
-            dbContext.RemoveRange(dbContext.StringKeysAutoGen);
-            dbContext.RemoveRange(dbContext.TestEntities);
-            dbContext.RemoveRange(dbContext.GeneratedAlwaysAsIdentity);
-            dbContext.RemoveRange(dbContext.ComputedColumns);
+            Reset(dbContext, e => e.Books);
+            Reset(dbContext, e => e.Countries);
+            Reset(dbContext, e => e.DashTable);
+            Reset(dbContext, e => e.GuidKeys);
+            Reset(dbContext, e => e.GuidKeysAutoGen);
+            Reset(dbContext, e => e.JObjectDatas);
+            Reset(dbContext, e => e.JsonDatas);
+            Reset(dbContext, e => e.KeyOnlies);
+            Reset(dbContext, e => e.NullableCompositeKeys);
+            Reset(dbContext, e => e.NullableRequireds);
+            Reset(dbContext, e => e.PageVisits);
+            Reset(dbContext, e => e.SchemaTable);
+            Reset(dbContext, e => e.Statuses);
+            Reset(dbContext, e => e.StringKeys);
+            Reset(dbContext, e => e.StringKeysAutoGen);
+            Reset(dbContext, e => e.TestEntities);
+            Reset(dbContext, e => e.GeneratedAlwaysAsIdentity);
+            Reset(dbContext, e => e.ComputedColumns);
 
             dbContext.Add(_dbCountry);
             dbContext.Add(_dbVisitOld);
@@ -123,10 +123,23 @@ protected void ResetDb()
             dbContext.SaveChanges();
 
             GeneratedAlwaysAsIdentity_NextId = dbContext.GeneratedAlwaysAsIdentity.Max(e => e.ID) + 1;
-            dbContext.RemoveRange(dbContext.GeneratedAlwaysAsIdentity);
+            Reset(dbContext, e => e.GeneratedAlwaysAsIdentity);
             dbContext.SaveChanges();
         }
 
+        private void Reset<T>(TestDbContext dbContext, Func<TestDbContext, DbSet<T>> selector) where T : class
+        {
+            var dbSet = selector(dbContext);
+            if (_fixture.DbDriver == DbDriver.InMemory)
+            {
+                dbContext.RemoveRange(dbSet);
+            }
+            else
+            {
+                dbSet.ExecuteDelete();
+            }
+        }
+
         private void ResetDb<TEntity>(params TEntity[] seedValue)
         {
             ResetDb();