PEK-823 fikse tester og fjerne deprecated @MockBean

navikt · Dec 5, 2024 · 466e34e · 466e34e
1 parent 499f9ee
commit 466e34e
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 32 deletions.
diff --git a/src/test/kotlin/no/nav/tjenestepensjon/simulering/rest/SimuleringAFPEndpointTest.kt b/src/test/kotlin/no/nav/tjenestepensjon/simulering/rest/SimuleringAFPEndpointTest.kt
@@ -22,7 +22,7 @@ import org.mockito.Mockito
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc
 import org.springframework.boot.test.context.SpringBootTest
-import org.springframework.boot.test.mock.mockito.MockBean
+import org.springframework.test.context.bean.override.mockito.MockitoBean
 import org.springframework.http.MediaType
 import org.springframework.security.test.context.support.WithMockUser
 import org.springframework.test.web.servlet.MockMvc
@@ -36,13 +36,13 @@ class SimuleringAFPEndpointTest {
     @Autowired
     private lateinit var mockMvc: MockMvc
 
-    @MockBean
+    @MockitoBean
     private lateinit var aadClient: AADClient
 
-    @MockBean
+    @MockitoBean
     private lateinit var fssGatewayAuthService: FssGatewayAuthService
 
-    @MockBean
+    @MockitoBean
     private lateinit var afpOffentligLivsvarigSimuleringService: AFPOffentligLivsvarigSimuleringService
 
     private var wireMockServer = WireMockServer().apply {

diff --git a/...in/no/nav/tjenestepensjon/simulering/rest/TjenestepensjonSimuleringV2025ControllerTest.kt b/...in/no/nav/tjenestepensjon/simulering/rest/TjenestepensjonSimuleringV2025ControllerTest.kt
@@ -18,7 +18,7 @@ import org.mockito.kotlin.any
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc
 import org.springframework.boot.test.context.SpringBootTest
-import org.springframework.boot.test.mock.mockito.MockBean
+import org.springframework.test.context.bean.override.mockito.MockitoBean
 import org.springframework.http.MediaType
 import org.springframework.security.test.context.support.WithMockUser
 import org.springframework.test.web.servlet.MockMvc
@@ -33,10 +33,10 @@ class TjenestepensjonSimuleringV2025ControllerTest {
     @Autowired
     private lateinit var mockMvc: MockMvc
 
-    @MockBean
+    @MockitoBean
     private lateinit var aadClient: AADClient
 
-    @MockBean
+    @MockitoBean
     private lateinit var service: TjenestepensjonV2025Service
 
     private var wireMockServer = WireMockServer().apply {

diff --git a/src/test/kotlin/no/nav/tjenestepensjon/simulering/service/TpClientTest.kt b/src/test/kotlin/no/nav/tjenestepensjon/simulering/service/TpClientTest.kt
@@ -19,22 +19,22 @@ import org.junit.jupiter.api.Assertions.assertEquals
 import org.mockito.Mockito
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.context.SpringBootTest
-import org.springframework.boot.test.mock.mockito.MockBean
+import org.springframework.test.context.bean.override.mockito.MockitoBean
 
 @SpringBootTest(classes = [TpClient::class, WebClientConfig::class, ObjectMapperConfig::class, TestConfig::class])
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 class TpClientTest {
 
-    @MockBean
+    @MockitoBean
     private lateinit var aadClient: AADClient
 
-    @MockBean
+    @MockitoBean
     private lateinit var fssGatewayAuthService: FssGatewayAuthService
 
     @Autowired
     private lateinit var tpClient: TpClient
 
-    @MockBean
+    @MockitoBean
     private lateinit var maskinportenTokenClient: MaskinportenTokenClient
 
     private var wireMockServer = WireMockServer().apply {

diff --git a/src/test/kotlin/no/nav/tjenestepensjon/simulering/v1/rest/SimuleringEndpointSecurityTest.kt b/src/test/kotlin/no/nav/tjenestepensjon/simulering/v1/rest/SimuleringEndpointSecurityTest.kt
@@ -20,7 +20,7 @@ import org.mockito.Mockito.`when`
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc
 import org.springframework.boot.test.context.SpringBootTest
-import org.springframework.boot.test.mock.mockito.MockBean
+import org.springframework.test.context.bean.override.mockito.MockitoBean
 import org.springframework.http.MediaType.APPLICATION_JSON
 import org.springframework.security.test.context.support.WithMockUser
 import org.springframework.test.context.ActiveProfiles
@@ -39,16 +39,16 @@ class SimuleringEndpointSecurityTest {
     @Autowired
     private lateinit var mockMvc: MockMvc
 
-    @MockBean
+    @MockitoBean
     private lateinit var aadClient: AADClient
 
-    @MockBean
+    @MockitoBean
     private lateinit var fssGatewayAuthService: FssGatewayAuthService
 
-    @MockBean
+    @MockitoBean
     private lateinit var tokenService: TokenService
 
-    @MockBean
+    @MockitoBean
     private lateinit var soapClient: SoapClient
 
     private var wireMockServer = WireMockServer().apply {

diff --git a/src/test/kotlin/no/nav/tjenestepensjon/simulering/v1/soap/SoapClientTest.kt b/src/test/kotlin/no/nav/tjenestepensjon/simulering/v1/soap/SoapClientTest.kt
@@ -6,6 +6,7 @@ import no.nav.tjenestepensjon.simulering.defaultTPOrdningIdDto
 import no.nav.tjenestepensjon.simulering.domain.TokenImpl
 import no.nav.tjenestepensjon.simulering.model.domain.TpLeverandor
 import no.nav.tjenestepensjon.simulering.model.domain.TpLeverandor.EndpointImpl.SOAP
+import no.nav.tjenestepensjon.simulering.sporingslogg.SporingsloggService
 import no.nav.tjenestepensjon.simulering.testHelper.anyNonNull
 import no.nav.tjenestepensjon.simulering.v1.consumer.TokenClientOld
 import no.nav.tjenestepensjon.simulering.v1.models.*
@@ -17,19 +18,22 @@ import org.junit.jupiter.api.Test
 import org.mockito.Mockito.`when`
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.context.SpringBootTest
-import org.springframework.boot.test.mock.mockito.MockBean
+import org.springframework.test.context.bean.override.mockito.MockitoBean
 import org.springframework.ws.client.core.WebServiceTemplate
 
 
 @SpringBootTest(classes = [TokenClientOld::class, WebServiceTemplate::class, SoapClient::class, SamlConfig::class, ObjectMapperConfig::class])
 internal class SoapClientTest {
 
-    @MockBean
+    @MockitoBean
     lateinit var template: WebServiceTemplate
 
-    @MockBean
+    @MockitoBean
     lateinit var tokenClientOld: TokenClientOld
 
+    @MockitoBean
+    lateinit var sporingsloggService: SporingsloggService
+
     @Autowired
     lateinit var client: SoapClient
 

diff --git a/src/test/kotlin/no/nav/tjenestepensjon/simulering/v2/rest/SimuleringEndpointSecurityTest.kt b/src/test/kotlin/no/nav/tjenestepensjon/simulering/v2/rest/SimuleringEndpointSecurityTest.kt
@@ -18,7 +18,7 @@ import org.mockito.Mockito.`when`
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc
 import org.springframework.boot.test.context.SpringBootTest
-import org.springframework.boot.test.mock.mockito.MockBean
+import org.springframework.test.context.bean.override.mockito.MockitoBean
 import org.springframework.http.MediaType.APPLICATION_JSON
 import org.springframework.security.test.context.support.WithMockUser
 import org.springframework.test.context.ActiveProfiles
@@ -34,13 +34,13 @@ class SimuleringEndpointSecurityTest {
     @Autowired
     private lateinit var mockMvc: MockMvc
 
-    @MockBean
+    @MockitoBean
     private lateinit var aadClient: AADClient
 
-    @MockBean
+    @MockitoBean
     private lateinit var soapClient: SoapClient
 
-    @MockBean
+    @MockitoBean
     private lateinit var restClient: RestClient
 
     private var wireMockServer = WireMockServer().apply {

diff --git a/...stepensjon/simulering/v2025/tjenestepensjon/v1/service/TjenestepensjonV2025ServiceTest.kt b/...stepensjon/simulering/v2025/tjenestepensjon/v1/service/TjenestepensjonV2025ServiceTest.kt
@@ -14,7 +14,7 @@ import org.junit.jupiter.api.Test
 import org.mockito.Mockito.`when`
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.context.SpringBootTest
-import org.springframework.boot.test.mock.mockito.MockBean
+import org.springframework.test.context.bean.override.mockito.MockitoBean
 import org.springframework.http.HttpStatus
 import org.springframework.web.reactive.function.client.WebClientResponseException
 import org.springframework.web.server.ResponseStatusException
@@ -26,13 +26,13 @@ import kotlin.test.fail
 @SpringBootTest
 class TjenestepensjonV2025ServiceTest {
 
-    @MockBean
+    @MockitoBean
     private lateinit var tp: TpClient
 
-    @MockBean
+    @MockitoBean
     private lateinit var spk: SPKTjenestepensjonService
 
-    @MockBean
+    @MockitoBean
     private lateinit var klp: KLPTjenestepensjonService
 
     @Autowired

diff --git a/...tepensjon/simulering/v2025/tjenestepensjon/v1/service/spk/SPKTjenestepensjonClientTest.kt b/...tepensjon/simulering/v2025/tjenestepensjon/v1/service/spk/SPKTjenestepensjonClientTest.kt
@@ -20,16 +20,16 @@ import org.junit.jupiter.api.TestInstance
 import org.mockito.Mockito
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.context.SpringBootTest
-import org.springframework.boot.test.mock.mockito.MockBean
+import org.springframework.test.context.bean.override.mockito.MockitoBean
 import java.time.LocalDate
 
 @SpringBootTest
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 class SPKTjenestepensjonClientTest{
 
-    @MockBean
+    @MockitoBean
     private lateinit var aadClient: AADClient
-    @MockBean
+    @MockitoBean
     private lateinit var maskinportenTokenClient: MaskinportenTokenClient
     @Autowired
     private lateinit var spkClient: SPKTjenestepensjonClient

diff --git a/...epensjon/simulering/v2025/tjenestepensjon/v1/service/spk/SPKTjenestepensjonServiceTest.kt b/...epensjon/simulering/v2025/tjenestepensjon/v1/service/spk/SPKTjenestepensjonServiceTest.kt
@@ -10,13 +10,13 @@ import org.junit.jupiter.api.Test
 import org.mockito.Mockito.`when`
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.context.SpringBootTest
-import org.springframework.boot.test.mock.mockito.MockBean
+import org.springframework.test.context.bean.override.mockito.MockitoBean
 import java.time.LocalDate
 
 @SpringBootTest
 class SPKTjenestepensjonServiceTest {
 
-    @MockBean
+    @MockitoBean
     private lateinit var client: SPKTjenestepensjonClient
 
     @Autowired