I did it

loculus-project · Oct 1, 2024 · 4b84631 · 4b84631
1 parent b09cdab
commit 4b84631
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 14 deletions.
diff --git a/.../src/test/kotlin/org/loculus/backend/controller/submission/DeleteSequencesEndpointTest.kt b/.../src/test/kotlin/org/loculus/backend/controller/submission/DeleteSequencesEndpointTest.kt
@@ -20,6 +20,7 @@ import org.loculus.backend.controller.DEFAULT_ORGANISM
 import org.loculus.backend.controller.DEFAULT_USER_NAME
 import org.loculus.backend.controller.EndpointTest
 import org.loculus.backend.controller.OTHER_ORGANISM
+import org.loculus.backend.controller.accessionsInAnyOrder
 import org.loculus.backend.controller.assertStatusIs
 import org.loculus.backend.controller.expectUnauthorizedResponse
 import org.loculus.backend.controller.generateJwtFor
@@ -304,8 +305,7 @@ class DeleteSequencesEndpointTest(
         )
             .andExpect(status().isOk)
             .andExpect(content().contentType(MediaType.APPLICATION_JSON_VALUE))
-            .andExpect(jsonPath("\$.length()").value(accessionVersions.size))
-            .andExpect(jsonPath("\$[0].accession").value(accessionVersions.first().accession))
+            .andExpect(accessionsInAnyOrder(accessionVersions))
             .andExpect(jsonPath("\$[0].version").value(accessionVersions.first().version))
     }
 

diff --git a/.../test/kotlin/org/loculus/backend/controller/submission/GetOriginalMetadataEndpointTest.kt b/.../test/kotlin/org/loculus/backend/controller/submission/GetOriginalMetadataEndpointTest.kt
@@ -8,6 +8,7 @@ import kotlinx.datetime.LocalDateTime
 import org.hamcrest.CoreMatchers.`is`
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.hasSize
+import org.hamcrest.Matchers.`in`
 import org.hamcrest.Matchers.not
 import org.junit.jupiter.api.Test
 import org.loculus.backend.api.AccessionVersionOriginalMetadata
@@ -74,12 +75,9 @@ class GetOriginalMetadataEndpointTest(
     @Test
     fun `GIVEN no specified fields THEN returns all fields`() {
         convenienceClient.prepareDefaultSequenceEntriesToApprovedForRelease()
-        val response = submissionControllerClient.getOriginalMetadata()
-
-        val responseBody = response.expectNdjsonAndGetContent<AccessionVersionOriginalMetadata>()
-        val entry = responseBody[0]
-
-        assertThat(entry.originalMetadata, `is`(defaultOriginalData.metadata))
+        val originalMetadataItems = submissionControllerClient.getOriginalMetadata()
+            .expectNdjsonAndGetContent<AccessionVersionOriginalMetadata>().map { it.originalMetadata }
+        assertThat(defaultOriginalData.metadata, `is`(`in`(originalMetadataItems)))
     }
 
     @Test

diff --git a/.../test/kotlin/org/loculus/backend/controller/submission/SubmitProcessedDataEndpointTest.kt b/.../test/kotlin/org/loculus/backend/controller/submission/SubmitProcessedDataEndpointTest.kt
@@ -256,16 +256,16 @@ class SubmitProcessedDataEndpointTest(
 
     @Test
     fun `GIVEN I submitted invalid data and errors THEN the sequence entry is in status has errors`() {
-        val accessions = convenienceClient.submitDefaultFiles().submissionIdMappings.map { it.accession }
-        convenienceClient.extractUnprocessedData(1)
+        convenienceClient.submitDefaultFiles()
+        val accession = convenienceClient.extractUnprocessedData(1).first().accession
         submissionControllerClient.submitProcessedData(
-            PreparedProcessedData.withWrongDateFormat(accessions.first()).copy(
-                accession = accessions.first(),
-                errors = PreparedProcessedData.withErrors(accessions.first()).errors,
+            PreparedProcessedData.withWrongDateFormat(accession).copy(
+                accession = accession,
+                errors = PreparedProcessedData.withErrors(accession).errors,
             ),
         ).andExpect(status().isNoContent)
 
-        convenienceClient.getSequenceEntry(accession = accessions.first(), version = 1)
+        convenienceClient.getSequenceEntry(accession = accession, version = 1)
             .assertStatusIs(Status.HAS_ERRORS)
     }