Skip to content

Commit d673f27

Browse files
committed
Moved duplicate test seqset creation into function
1 parent 2c3e2aa commit d673f27

1 file changed

Lines changed: 10 additions & 13 deletions

File tree

backend/src/test/kotlin/org/loculus/backend/controller/seqsetcitations/CitationEndpointsTest.kt

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -193,19 +193,16 @@ class CitationEndpointsTest(
193193

194194
@Test
195195
fun `WHEN multiple crossref citation runs link the same citation source THEN all citations are recorded`() {
196-
val seqSetAResult = client.createSeqSet().andExpect(status().isOk).andReturn()
197-
val seqSetIdA = JsonPath.read<String>(seqSetAResult.response.contentAsString, "$.seqSetId")
198-
val seqSetVersionA =
199-
JsonPath.read<Int>(seqSetAResult.response.contentAsString, "$.seqSetVersion").toLong()
200-
client.createSeqSetDOI(seqSetId = seqSetIdA, seqSetVersion = seqSetVersionA).andExpect(status().isOk)
201-
val seqSetDOIA = "${MOCK_DOI_PREFIX}/$seqSetIdA.$seqSetVersionA"
202-
203-
val seqSetBResult = client.createSeqSet().andExpect(status().isOk).andReturn()
204-
val seqSetIdB = JsonPath.read<String>(seqSetBResult.response.contentAsString, "$.seqSetId")
205-
val seqSetVersionB =
206-
JsonPath.read<Int>(seqSetBResult.response.contentAsString, "$.seqSetVersion").toLong()
207-
client.createSeqSetDOI(seqSetId = seqSetIdB, seqSetVersion = seqSetVersionB).andExpect(status().isOk)
208-
val seqSetDOIB = "${MOCK_DOI_PREFIX}/$seqSetIdB.$seqSetVersionB"
196+
fun createSeqSetWithDOI(): Triple<String, Long, String> {
197+
val result = client.createSeqSet().andExpect(status().isOk).andReturn()
198+
val seqSetId = JsonPath.read<String>(result.response.contentAsString, "$.seqSetId")
199+
val seqSetVersion = JsonPath.read<Int>(result.response.contentAsString, "$.seqSetVersion").toLong()
200+
client.createSeqSetDOI(seqSetId, seqSetVersion).andExpect(status().isOk)
201+
return Triple(seqSetId, seqSetVersion, "${MOCK_DOI_PREFIX}/$seqSetId.$seqSetVersion")
202+
}
203+
204+
val (seqSetIdA, seqSetVersionA, seqSetDOIA) = createSeqSetWithDOI()
205+
val (seqSetIdB, seqSetVersionB, seqSetDOIB) = createSeqSetWithDOI()
209206

210207
every { crossRefService.isActive } returns true
211208

0 commit comments

Comments
 (0)