Skip to content

Commit 4fd8394

Browse files
MariamPervezMariamPervez
committed
t - Fikser tester med gcpStorageService mock
Co-authored-by: Daniel.skarpas@nav.no
1 parent ebdaaa6 commit 4fd8394

File tree

8 files changed

+20
-3
lines changed

8 files changed

+20
-3
lines changed

‎src/test/kotlin/no/nav/eessi/pensjon/integrationtest/buc/BucControllerIT.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import no.nav.eessi.pensjon.eux.klient.Rinasak
1111
import no.nav.eessi.pensjon.eux.model.SedType
1212
import no.nav.eessi.pensjon.eux.model.buc.Buc
1313
import no.nav.eessi.pensjon.eux.model.buc.DocumentsItem
14+
import no.nav.eessi.pensjon.gcp.GcpStorageService
1415
import no.nav.eessi.pensjon.integrationtest.IntegrasjonsTestConfig
1516
import no.nav.eessi.pensjon.pensjonsinformasjon.clients.PensjonsinformasjonClient
1617
import no.nav.eessi.pensjon.personoppslag.pdl.PersonService
@@ -49,6 +50,7 @@ import java.time.Month
4950
MockkBean(name = "kodeverkRestTemplate", classes = [RestTemplate::class]),
5051
MockkBean(name = "prefillOAuthTemplate", classes = [RestTemplate::class]),
5152
MockkBean(name = "euxSystemRestTemplate", classes = [RestTemplate::class]),
53+
MockkBean(name = "gcpStorageService", classes = [GcpStorageService::class]),
5254
MockkBean(name = "safRestOidcRestTemplate", classes = [RestTemplate::class]),
5355
MockkBean(name = "euxNavIdentRestTemplate", classes = [RestTemplate::class]),
5456
MockkBean(name = "safGraphQlOidcRestTemplate", classes = [RestTemplate::class]),

‎src/test/kotlin/no/nav/eessi/pensjon/integrationtest/buc/BucViewDetaljIntegrationTest.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import no.nav.eessi.pensjon.eux.model.buc.DocumentsItem
1313
import no.nav.eessi.pensjon.fagmodul.eux.BucAndSedView
1414
import no.nav.eessi.pensjon.fagmodul.eux.EuxInnhentingService.BucView
1515
import no.nav.eessi.pensjon.fagmodul.eux.EuxInnhentingService.BucViewKilde
16+
import no.nav.eessi.pensjon.gcp.GcpStorageService
1617
import no.nav.eessi.pensjon.integrationtest.IntegrasjonsTestConfig
1718
import no.nav.eessi.pensjon.pensjonsinformasjon.clients.PensjonsinformasjonClient
1819
import no.nav.eessi.pensjon.personoppslag.pdl.PersonService
@@ -52,6 +53,7 @@ import java.time.Month
5253
MockkBean(name = "prefillOAuthTemplate", classes = [RestTemplate::class]),
5354
MockkBean(name = "euxSystemRestTemplate", classes = [RestTemplate::class]),
5455
MockkBean(name = "safRestOidcRestTemplate", classes = [RestTemplate::class]),
56+
MockkBean(name = "gcpStorageService", classes = [GcpStorageService::class]),
5557
MockkBean(name = "euxNavIdentRestTemplate", classes = [RestTemplate::class]),
5658
MockkBean(name = "safGraphQlOidcRestTemplate", classes = [RestTemplate::class]),
5759
MockkBean(name = "pensjonsinformasjonClient", classes = [PensjonsinformasjonClient::class])

‎src/test/kotlin/no/nav/eessi/pensjon/integrationtest/pesys/PesysIntegrationSpringTest.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import com.ninjasquad.springmockk.MockkBean
44
import com.ninjasquad.springmockk.MockkBeans
55
import io.mockk.every
66
import no.nav.eessi.pensjon.UnsecuredWebMvcTestLauncher
7+
import no.nav.eessi.pensjon.gcp.GcpStorageService
78
import no.nav.eessi.pensjon.integrationtest.IntegrasjonsTestConfig
89
import no.nav.eessi.pensjon.kodeverk.KodeverkClient
910
import no.nav.eessi.pensjon.pensjonsinformasjon.clients.PensjonsinformasjonClient
@@ -35,6 +36,7 @@ import org.springframework.web.client.RestTemplate
3536
MockkBean(name = "kodeverkRestTemplate", classes = [RestTemplate::class]),
3637
MockkBean(name = "prefillOAuthTemplate", classes = [RestTemplate::class]),
3738
MockkBean(name = "euxSystemRestTemplate", classes = [RestTemplate::class]),
39+
MockkBean(name = "gcpStorageService", classes = [GcpStorageService::class]),
3840
MockkBean(name = "safRestOidcRestTemplate", classes = [RestTemplate::class]),
3941
MockkBean(name = "euxNavIdentRestTemplate", classes = [RestTemplate::class]),
4042
MockkBean(name = "safGraphQlOidcRestTemplate", classes = [RestTemplate::class]),

‎src/test/kotlin/no/nav/eessi/pensjon/integrationtest/sed/EuxServiceKallItegrationTest.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import com.ninjasquad.springmockk.MockkBean
44
import com.ninjasquad.springmockk.MockkBeans
55
import io.mockk.every
66
import no.nav.eessi.pensjon.UnsecuredWebMvcTestLauncher
7+
import no.nav.eessi.pensjon.gcp.GcpStorageService
78
import no.nav.eessi.pensjon.integrationtest.IntegrasjonsTestConfig
89
import no.nav.eessi.pensjon.pensjonsinformasjon.clients.PensjonsinformasjonClient
910
import no.nav.eessi.pensjon.personoppslag.pdl.PersonService
@@ -32,6 +33,7 @@ import org.springframework.web.client.RestTemplate
3233
MockkBean(name = "kodeverkRestTemplate", classes = [RestTemplate::class]),
3334
MockkBean(name = "prefillOAuthTemplate", classes = [RestTemplate::class]),
3435
MockkBean(name = "euxSystemRestTemplate", classes = [RestTemplate::class]),
36+
MockkBean(name = "gcpStorageService", classes = [GcpStorageService::class]),
3537
MockkBean(name = "euxNavIdentRestTemplate", classes = [RestTemplate::class]),
3638
MockkBean(name = "safRestOidcRestTemplate", classes = [RestTemplate::class]),
3739
MockkBean(name = "safGraphQlOidcRestTemplate", classes = [RestTemplate::class]),

‎src/test/kotlin/no/nav/eessi/pensjon/integrationtest/sed/OpprettPrefillSedIntegrationTest.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import no.nav.eessi.pensjon.eux.model.SedType
1010
import no.nav.eessi.pensjon.eux.model.SedType.P2000
1111
import no.nav.eessi.pensjon.eux.model.SedType.P6000
1212
import no.nav.eessi.pensjon.eux.model.sed.KravType
13+
import no.nav.eessi.pensjon.gcp.GcpStorageService
1314
import no.nav.eessi.pensjon.integrationtest.IntegrasjonsTestConfig
1415
import no.nav.eessi.pensjon.pensjonsinformasjon.clients.PensjonsinformasjonClient
1516
import no.nav.eessi.pensjon.personoppslag.pdl.PersonService
@@ -49,6 +50,7 @@ import org.springframework.web.client.RestTemplate
4950
MockkBean(name = "kodeverkRestTemplate", classes = [RestTemplate::class]),
5051
MockkBean(name = "prefillOAuthTemplate", classes = [RestTemplate::class]),
5152
MockkBean(name = "euxSystemRestTemplate", classes = [RestTemplate::class]),
53+
MockkBean(name = "gcpStorageService", classes = [GcpStorageService::class]),
5254
MockkBean(name = "safRestOidcRestTemplate", classes = [RestTemplate::class]),
5355
MockkBean(name = "euxNavIdentRestTemplate", classes = [RestTemplate::class]),
5456
MockkBean(name = "safGraphQlOidcRestTemplate", classes = [RestTemplate::class]),

‎src/test/kotlin/no/nav/eessi/pensjon/integrationtest/sed/UpdateSedOnBucIntegrationTest.kt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import com.ninjasquad.springmockk.MockkBeans
55
import io.mockk.every
66
import jakarta.servlet.ServletException
77
import no.nav.eessi.pensjon.UnsecuredWebMvcTestLauncher
8+
import no.nav.eessi.pensjon.gcp.GcpStorageService
89
import no.nav.eessi.pensjon.integrationtest.IntegrasjonsTestConfig
910
import no.nav.eessi.pensjon.kodeverk.KodeverkClient
1011
import org.hamcrest.Matchers
@@ -31,12 +32,13 @@ import java.nio.charset.Charset
3132
@EmbeddedKafka
3233
@MockkBeans(
3334
MockkBean(name = "pdlRestTemplate", classes = [RestTemplate::class]),
35+
MockkBean(name = "kodeverkRestTemplate", classes = [RestTemplate::class]),
3436
MockkBean(name = "prefillOAuthTemplate", classes = [RestTemplate::class]),
3537
MockkBean(name = "euxSystemRestTemplate", classes = [RestTemplate::class]),
36-
MockkBean(name = "safGraphQlOidcRestTemplate", classes = [RestTemplate::class]),
38+
MockkBean(name = "gcpStorageService", classes = [GcpStorageService::class]),
3739
MockkBean(name = "safRestOidcRestTemplate", classes = [RestTemplate::class]),
38-
MockkBean(name = "pensjoninformasjonRestTemplate", classes = [RestTemplate::class]),
39-
MockkBean(name = "kodeverkRestTemplate", classes = [RestTemplate::class])
40+
MockkBean(name = "safGraphQlOidcRestTemplate", classes = [RestTemplate::class]),
41+
MockkBean(name = "pensjoninformasjonRestTemplate", classes = [RestTemplate::class])
4042
)
4143
class UpdateSedOnBucIntegrationTest {
4244

‎src/test/kotlin/no/nav/eessi/pensjon/vedlegg/VedleggControllerSpringTest.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import io.mockk.justRun
77
import io.mockk.verify
88
import no.nav.eessi.pensjon.UnsecuredWebMvcTestLauncher
99
import no.nav.eessi.pensjon.eux.klient.EuxKlientAsSystemUser
10+
import no.nav.eessi.pensjon.gcp.GcpStorageService
1011
import no.nav.eessi.pensjon.pensjonsinformasjon.clients.PensjonsinformasjonClient
1112
import no.nav.eessi.pensjon.personoppslag.pdl.PersonService
1213
import no.nav.eessi.pensjon.vedlegg.client.Dokument
@@ -33,6 +34,7 @@ import org.springframework.web.client.RestTemplate
3334
MockkBean(name = "euxKlient", classes = [EuxKlientAsSystemUser::class]),
3435
MockkBean(name = "kodeverkRestTemplate", classes = [RestTemplate::class]),
3536
MockkBean(name = "prefillOAuthTemplate", classes = [RestTemplate::class]),
37+
MockkBean(name = "gcpStorageService", classes = [GcpStorageService::class]),
3638
MockkBean(name = "euxSystemRestTemplate", classes = [RestTemplate::class]),
3739
MockkBean(name = "safRestOidcRestTemplate", classes = [RestTemplate::class]),
3840
MockkBean(name = "euxNavIdentRestTemplate", classes = [RestTemplate::class]),

‎src/test/resources/application.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ PDL_URL: 'http://example.com:8090'
1414
AZURE_APP_WELL_KNOWN_URL: 'http://example.com:8090'
1515
KODEVERK_URL: 'http://example.com:8093'
1616

17+
GCP_STORAGE_API_URL: "http://some.strange.place"
18+
GCP_BUCKET_NAME: 'dummyBucket'
19+
1720
eessi-pensjon-active-profiles: ${spring.profiles.active}
1821

1922
eessi-pensjon-institusjon: 'NO:noinst002'

0 commit comments

Comments
 (0)