From 8e6b1ec7995d0601626510cdabaa30cd48db3722 Mon Sep 17 00:00:00 2001 From: Paul-Christian Volkmer Date: Mon, 6 May 2024 19:11:54 +0200 Subject: [PATCH] refactor: use whenever() instead of `when` in tests --- .../services/RequestProcessorTest.kt | 46 +++++++++---------- .../processor/services/RequestServiceTest.kt | 3 +- 2 files changed, 25 insertions(+), 24 deletions(-) diff --git a/src/test/kotlin/dev/dnpm/etl/processor/services/RequestProcessorTest.kt b/src/test/kotlin/dev/dnpm/etl/processor/services/RequestProcessorTest.kt index 959db6b..c6f39b8 100644 --- a/src/test/kotlin/dev/dnpm/etl/processor/services/RequestProcessorTest.kt +++ b/src/test/kotlin/dev/dnpm/etl/processor/services/RequestProcessorTest.kt @@ -96,15 +96,15 @@ class RequestProcessorTest { RequestStatus.SUCCESS, Instant.parse("2023-08-08T02:00:00Z") ) - }.`when`(requestService).lastMtbFileRequestForPatientPseudonym(anyString()) + }.whenever(requestService).lastMtbFileRequestForPatientPseudonym(anyString()) doAnswer { false - }.`when`(requestService).isLastRequestWithKnownStatusDeletion(anyString()) + }.whenever(requestService).isLastRequestWithKnownStatusDeletion(anyString()) doAnswer { it.arguments[0] as String - }.`when`(pseudonymizeService).patientPseudonym(any()) + }.whenever(pseudonymizeService).patientPseudonym(any()) doAnswer { it.arguments[0] @@ -155,15 +155,15 @@ class RequestProcessorTest { RequestStatus.SUCCESS, Instant.parse("2023-08-08T02:00:00Z") ) - }.`when`(requestService).lastMtbFileRequestForPatientPseudonym(anyString()) + }.whenever(requestService).lastMtbFileRequestForPatientPseudonym(anyString()) doAnswer { false - }.`when`(requestService).isLastRequestWithKnownStatusDeletion(anyString()) + }.whenever(requestService).isLastRequestWithKnownStatusDeletion(anyString()) doAnswer { it.arguments[0] as String - }.`when`(pseudonymizeService).patientPseudonym(any()) + }.whenever(pseudonymizeService).patientPseudonym(any()) doAnswer { it.arguments[0] @@ -214,19 +214,19 @@ class RequestProcessorTest { RequestStatus.SUCCESS, Instant.parse("2023-08-08T02:00:00Z") ) - }.`when`(requestService).lastMtbFileRequestForPatientPseudonym(anyString()) + }.whenever(requestService).lastMtbFileRequestForPatientPseudonym(anyString()) doAnswer { false - }.`when`(requestService).isLastRequestWithKnownStatusDeletion(anyString()) + }.whenever(requestService).isLastRequestWithKnownStatusDeletion(anyString()) doAnswer { MtbFileSender.Response(status = RequestStatus.SUCCESS) - }.`when`(sender).send(any()) + }.whenever(sender).send(any()) doAnswer { it.arguments[0] as String - }.`when`(pseudonymizeService).patientPseudonym(any()) + }.whenever(pseudonymizeService).patientPseudonym(any()) doAnswer { it.arguments[0] @@ -277,19 +277,19 @@ class RequestProcessorTest { RequestStatus.SUCCESS, Instant.parse("2023-08-08T02:00:00Z") ) - }.`when`(requestService).lastMtbFileRequestForPatientPseudonym(anyString()) + }.whenever(requestService).lastMtbFileRequestForPatientPseudonym(anyString()) doAnswer { false - }.`when`(requestService).isLastRequestWithKnownStatusDeletion(anyString()) + }.whenever(requestService).isLastRequestWithKnownStatusDeletion(anyString()) doAnswer { MtbFileSender.Response(status = RequestStatus.ERROR) - }.`when`(sender).send(any()) + }.whenever(sender).send(any()) doAnswer { it.arguments[0] as String - }.`when`(pseudonymizeService).patientPseudonym(any()) + }.whenever(pseudonymizeService).patientPseudonym(any()) doAnswer { it.arguments[0] @@ -331,11 +331,11 @@ class RequestProcessorTest { fun testShouldSendDeleteRequestAndSaveUnknownRequestStatusAtFirst() { doAnswer { "PSEUDONYM" - }.`when`(pseudonymizeService).patientPseudonym(anyString()) + }.whenever(pseudonymizeService).patientPseudonym(anyString()) doAnswer { MtbFileSender.Response(status = RequestStatus.UNKNOWN) - }.`when`(sender).send(any()) + }.whenever(sender).send(any()) this.requestProcessor.processDeletion("TEST_12345678901") @@ -349,11 +349,11 @@ class RequestProcessorTest { fun testShouldSendDeleteRequestAndSendSuccessEvent() { doAnswer { "PSEUDONYM" - }.`when`(pseudonymizeService).patientPseudonym(anyString()) + }.whenever(pseudonymizeService).patientPseudonym(anyString()) doAnswer { MtbFileSender.Response(status = RequestStatus.SUCCESS) - }.`when`(sender).send(any()) + }.whenever(sender).send(any()) this.requestProcessor.processDeletion("TEST_12345678901") @@ -367,11 +367,11 @@ class RequestProcessorTest { fun testShouldSendDeleteRequestAndSendErrorEvent() { doAnswer { "PSEUDONYM" - }.`when`(pseudonymizeService).patientPseudonym(anyString()) + }.whenever(pseudonymizeService).patientPseudonym(anyString()) doAnswer { MtbFileSender.Response(status = RequestStatus.ERROR) - }.`when`(sender).send(any()) + }.whenever(sender).send(any()) this.requestProcessor.processDeletion("TEST_12345678901") @@ -383,7 +383,7 @@ class RequestProcessorTest { @Test fun testShouldSendDeleteRequestWithPseudonymErrorAndSaveErrorRequestStatus() { - doThrow(RuntimeException()).`when`(pseudonymizeService).patientPseudonym(anyString()) + doThrow(RuntimeException()).whenever(pseudonymizeService).patientPseudonym(anyString()) this.requestProcessor.processDeletion("TEST_12345678901") @@ -399,7 +399,7 @@ class RequestProcessorTest { doAnswer { it.arguments[0] as String - }.`when`(pseudonymizeService).patientPseudonym(any()) + }.whenever(pseudonymizeService).patientPseudonym(any()) doAnswer { it.arguments[0] @@ -407,7 +407,7 @@ class RequestProcessorTest { doAnswer { MtbFileSender.Response(status = RequestStatus.SUCCESS) - }.`when`(sender).send(any()) + }.whenever(sender).send(any()) val mtbFile = MtbFile.builder() .withPatient( diff --git a/src/test/kotlin/dev/dnpm/etl/processor/services/RequestServiceTest.kt b/src/test/kotlin/dev/dnpm/etl/processor/services/RequestServiceTest.kt index 493fe37..07e3ec3 100644 --- a/src/test/kotlin/dev/dnpm/etl/processor/services/RequestServiceTest.kt +++ b/src/test/kotlin/dev/dnpm/etl/processor/services/RequestServiceTest.kt @@ -31,6 +31,7 @@ import org.junit.jupiter.api.extension.ExtendWith import org.mockito.Mock import org.mockito.Mockito.* import org.mockito.junit.jupiter.MockitoExtension +import org.mockito.kotlin.whenever import java.time.Instant import java.util.* @@ -185,7 +186,7 @@ class RequestServiceTest { doAnswer { val obj = it.arguments[0] as Request obj.copy(id = 1L) - }.`when`(requestRepository).save(anyRequest()) + }.whenever(requestRepository).save(anyRequest()) val request = Request( UUID.randomUUID().toString(),