Test fix statisk-data-forvalter

#deploy-test-bruker-service
#deploy-test-pdl-forvalter
#deploy-test-frontend

apps/testnorge-statisk-data-forvalter/src/test/java/no/nav/registre/sdforvalter/provider/rs/OrkestreringControllerAaregIntegrationTest.java

@@ -2,7 +2,6 @@
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import no.nav.registre.sdforvalter.JwtDecoderConfig;
 import no.nav.registre.sdforvalter.consumer.rs.aareg.request.RsAaregSyntetiseringsRequest;
 import no.nav.registre.sdforvalter.consumer.rs.kodeverk.response.KodeverkResponse;
 import no.nav.registre.sdforvalter.database.model.AaregModel;
@@ -19,8 +18,8 @@
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.cloud.contract.wiremock.AutoConfigureWireMock;
-import org.springframework.context.annotation.Import;
 import org.springframework.http.MediaType;
+import org.springframework.security.oauth2.jwt.JwtDecoder;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
@@ -46,7 +45,6 @@
 @ActiveProfiles("test")
 @AutoConfigureMockMvc
 @AutoConfigureWireMock(port = 0)
-@Import(JwtDecoderConfig.class)
 class OrkestreringControllerAaregIntegrationTest {
 
     private static final String FNR = "01010101010";
@@ -61,6 +59,8 @@ class OrkestreringControllerAaregIntegrationTest {
     private MockMvc mvc;
     @MockitoBean
     private TokenExchange tokenExchange;
+    @MockitoBean
+    private JwtDecoder jwtDecoder;
     @Autowired
     private AaregRepository aaregRepository;
     @Autowired

apps/testnorge-statisk-data-forvalter/src/test/java/no/nav/registre/sdforvalter/provider/rs/OrkestreringControllerKrrIntegrationTest.java

@@ -1,7 +1,6 @@
 package no.nav.registre.sdforvalter.provider.rs;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import no.nav.registre.sdforvalter.JwtDecoderConfig;
 import no.nav.registre.sdforvalter.consumer.rs.krr.request.KrrRequest;
 import no.nav.registre.sdforvalter.database.model.KrrModel;
 import no.nav.registre.sdforvalter.database.repository.KrrRepository;
@@ -14,11 +13,12 @@
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.cloud.contract.wiremock.AutoConfigureWireMock;
-import org.springframework.context.annotation.Import;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
+import org.springframework.security.oauth2.jwt.JwtDecoder;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.web.servlet.MockMvc;
 
@@ -35,7 +35,6 @@
 @ActiveProfiles("test")
 @AutoConfigureWireMock(port = 0)
 @AutoConfigureMockMvc(addFilters = false)
-@Import(JwtDecoderConfig.class)
 @DirtiesContext
 class OrkestreringControllerKrrIntegrationTest {
 
@@ -48,6 +47,9 @@ class OrkestreringControllerKrrIntegrationTest {
     @Autowired
     private KrrRepository repository;
 
+    @MockitoBean
+    private JwtDecoder jwtDecoder;
+
     @AfterEach
     public void cleanUp() {
         reset();