Update borehole copy tests

swisstopo · Dec 12, 2024 · 2b769f0 · 2b769f0
1 parent 03855ef
commit 2b769f0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/tests/api/Controllers/BoreholeControllerTest.cs b/tests/api/Controllers/BoreholeControllerTest.cs
@@ -51,21 +51,16 @@ public static async Task ClassCleanup()
         if (testBoreholeWithIdentifiers != null)
         {
             cleanupContext.BoreholeCodelists.RemoveRange(testBoreholeWithIdentifiers.BoreholeCodelists);
-            await cleanupContext.SaveChangesAsync();
         }
 
         // This is necessary because the some tests work with multiple contexts and actually write to the database.
         var boreholesToDelete = cleanupContext.Boreholes.Where(b => b.Id > MaxBoreholeSeedId);
         cleanupContext.Boreholes.RemoveRange(boreholesToDelete);
+        await cleanupContext.SaveChangesAsync();
 
         await cleanupContext.DisposeAsync();
     }
 
-    private async Task<List<Codelist>> GetCodelists(BdmsContext context, List<int> codelistIds)
-    {
-        return await context.Codelists.Where(c => codelistIds.Contains(c.Id)).ToListAsync().ConfigureAwait(false);
-    }
-
     [TestMethod]
     public async Task GetAllAsyncWithFilterIds()
     {
@@ -359,7 +354,7 @@ public async Task CopyBoreholeWithHydrotests()
         using var verifyContext = ContextFactory.CreateContext();
         var readController = GetTestController(verifyContext);
 
-        var response = await readController.GetByIdAsync(boreholeId).ConfigureAwait(false);
+        var response = await readController.GetByIdAsync((int)copiedBoreholeId).ConfigureAwait(false);
         OkObjectResult okResult = (OkObjectResult)response.Result!;
         Borehole copiedBorehole = (Borehole)okResult.Value!;
         Assert.IsNotNull(copiedBorehole);

diff --git a/tests/api/Helpers.cs b/tests/api/Helpers.cs
@@ -181,4 +181,12 @@ internal static IQueryable<Layer> GetLayersWithIncludes(IQueryable<Layer> query)
             .Include(l => l.LayerOrganicComponentCodes)
             .Include(l => l.OrganicComponentCodelists);
     }
+
+    /// <summary>
+    /// Get the codelists for the provided codelist ids.
+    /// </summary>
+    internal static async Task<List<Codelist>> GetCodelists(BdmsContext context, List<int> codelistIds)
+    {
+        return await context.Codelists.Where(c => codelistIds.Contains(c.Id)).ToListAsync().ConfigureAwait(false);
+    }
 }