From 0db4c34f7ca06eef30f0afd970ebbca7d0d01fe1 Mon Sep 17 00:00:00 2001 From: Simon Kempendorf Date: Fri, 28 Jun 2024 11:36:14 +0200 Subject: [PATCH] Revert "Refactor tests" This reverts commit 8acca095bba03e0863007e26d56ede391b17b9d6. --- .../services/WalletApiServiceTests.kt | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/src/test/kotlin/software/tice/wallet/attestation/services/WalletApiServiceTests.kt b/src/test/kotlin/software/tice/wallet/attestation/services/WalletApiServiceTests.kt index aac5310..a38e0d2 100644 --- a/src/test/kotlin/software/tice/wallet/attestation/services/WalletApiServiceTests.kt +++ b/src/test/kotlin/software/tice/wallet/attestation/services/WalletApiServiceTests.kt @@ -3,13 +3,8 @@ package software.tice.wallet.attestation.services import io.jsonwebtoken.Jwts import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test -import org.junit.jupiter.api.extension.ExtendWith import org.mockito.* import org.mockito.Mockito.verify -import org.mockito.junit.jupiter.MockitoExtension -import org.springframework.boot.test.context.SpringBootTest -import org.springframework.boot.test.mock.mockito.MockBean -import org.springframework.test.context.ContextConfiguration import software.tice.wallet.attestation.repositories.UserEntity import software.tice.wallet.attestation.repositories.UserRepository import software.tice.wallet.attestation.requests.AttestationRequest @@ -17,14 +12,14 @@ import java.security.KeyPair import java.util.* import kotlin.test.assertEquals -@SpringBootTest -@ExtendWith(MockitoExtension::class) -@ContextConfiguration(classes = [UserRepository::class]) -class WalletApiServiceTests { - @MockBean +internal class WalletApiServiceTests { + + @Mock private lateinit var userRepository: UserRepository + private lateinit var privateKey: String + private lateinit var walletApiService: WalletApiService @Captor @@ -35,7 +30,8 @@ class WalletApiServiceTests { @BeforeEach fun setup() { - val privateKey = Base64.getEncoder().encodeToString(keyPair.private.encoded) + MockitoAnnotations.openMocks(this) + privateKey = Base64.getEncoder().encodeToString(keyPair.private.encoded) walletApiService = WalletApiService(privateKey, userRepository) }