Removed mocked beans no longer needed because of autoconfiguration.

navikt · Jan 14, 2025 · f24ad20 · f24ad20
1 parent a7bbbba
commit f24ad20
Show file tree

Hide file tree

Showing 28 changed files with 17 additions and 180 deletions.
diff --git a/...ng-service/src/test/java/no/nav/testnav/altinn3tilgangservice/ApplicationContextTest.java b/...ng-service/src/test/java/no/nav/testnav/altinn3tilgangservice/ApplicationContextTest.java
@@ -1,10 +1,7 @@
 package no.nav.testnav.altinn3tilgangservice;
 
-import com.google.cloud.secretmanager.v1.SecretManagerServiceClient;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.bean.override.mockito.MockitoBean;
-import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder;
 import org.springframework.test.context.ActiveProfiles;
 
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
@@ -13,14 +10,6 @@
 @ActiveProfiles("test")
 class ApplicationContextTest {
 
-    @MockitoBean
-    @SuppressWarnings("unused")
-    public ReactiveJwtDecoder jwtDecoder;
-
-    @MockitoBean
-    @SuppressWarnings("unused")
-    public SecretManagerServiceClient secretManagerClient;
-
     @Test
     void load_app_context() {
         assertThat(true).isTrue();

diff --git a/...service/src/test/java/no/nav/registre/testnav/ameldingservice/ApplicationContextTest.java b/...service/src/test/java/no/nav/registre/testnav/ameldingservice/ApplicationContextTest.java
@@ -2,19 +2,17 @@
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.bean.override.mockito.MockitoBean;
-import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder;
 import org.springframework.test.context.ActiveProfiles;
 
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+
 @SpringBootTest
 @ActiveProfiles("test")
 class ApplicationContextTest {
 
-    @MockitoBean
-    public ReactiveJwtDecoder reactiveJwtDecoder;
-
     @Test
-    @SuppressWarnings("java:S2699")
     void load_app_context() {
+        assertThat(true).isTrue();
     }
+
 }
diff --git a/...g-service/src/test/java/no/nav/testnav/endringsmeldingservice/ApplicationContextTest.java b/...g-service/src/test/java/no/nav/testnav/endringsmeldingservice/ApplicationContextTest.java
@@ -2,19 +2,17 @@
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.bean.override.mockito.MockitoBean;
-import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder;
 import org.springframework.test.context.ActiveProfiles;
 
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+
 @SpringBootTest
 @ActiveProfiles("test")
 class ApplicationContextTest {
 
-    @MockitoBean
-    public ReactiveJwtDecoder jwtDecoder;
-
     @Test
-    @SuppressWarnings("java:S2699")
     void load_app_context() {
+        assertThat(true).isTrue();
     }
+
 }
diff --git a/...tnav/levendearbeidsforholdansettelse/LevendeArbeidsforholdAnsettelseApplicationTests.java b/...tnav/levendearbeidsforholdansettelse/LevendeArbeidsforholdAnsettelseApplicationTests.java
@@ -1,11 +1,7 @@
 package no.nav.testnav.levendearbeidsforholdansettelse;
 
 import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.bean.override.mockito.MockitoBean;
-import org.springframework.data.r2dbc.core.R2dbcEntityTemplate;
-import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder;
 import org.springframework.test.context.ActiveProfiles;
 
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
@@ -14,17 +10,9 @@
 @ActiveProfiles("test")
 class LevendeArbeidsforholdAnsettelseApplicationTests {
 
-    @MockitoBean
-    @SuppressWarnings("unused")
-    public ReactiveJwtDecoder jwtDecoder;
-
-    @Autowired
-    private R2dbcEntityTemplate template;
-
     @Test
     void load_app_context() {
-        assertThat(template)
-                .isNotNull();
+        assertThat(true).isTrue();
     }
 
 }
diff --git a/...a-service/src/test/java/no/nav/testnav/personfastedataservice/ApplicationContextTest.java b/...a-service/src/test/java/no/nav/testnav/personfastedataservice/ApplicationContextTest.java
@@ -2,19 +2,17 @@
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.bean.override.mockito.MockitoBean;
-import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder;
 import org.springframework.test.context.ActiveProfiles;
 
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+
 @SpringBootTest
 @ActiveProfiles("test")
 class ApplicationContextTest {
 
-    @MockitoBean
-    public ReactiveJwtDecoder jwtDecoder;
-
     @Test
-    @SuppressWarnings("java:S2699")
     void load_app_context() {
+        assertThat(true).isTrue();
     }
+
 }
diff --git a/...-service/src/test/java/no/nav/testnav/apps/tenorsearchservice/ApplicationContextTest.java b/...-service/src/test/java/no/nav/testnav/apps/tenorsearchservice/ApplicationContextTest.java
@@ -2,19 +2,17 @@
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.bean.override.mockito.MockitoBean;
-import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder;
 import org.springframework.test.context.ActiveProfiles;
 
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+
 @SpringBootTest
 @ActiveProfiles("test")
 class ApplicationContextTest {
 
-    @MockitoBean
-    public ReactiveJwtDecoder jwtDecoder;
-
     @Test
-    @SuppressWarnings("java:S2699")
     void load_app_context() {
+        assertThat(true).isTrue();
     }
+
 }
diff --git a/proxies/aareg-proxy/src/test/java/no/nav/testnav/proxies/aareg/ApplicationContextTest.java b/proxies/aareg-proxy/src/test/java/no/nav/testnav/proxies/aareg/ApplicationContextTest.java
@@ -2,8 +2,6 @@
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.bean.override.mockito.MockitoBean;
-import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder;
 import org.springframework.test.context.ActiveProfiles;
 
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
@@ -12,10 +10,6 @@
 @ActiveProfiles("test")
 class ApplicationContextTest {
 
-    @MockitoBean
-    @SuppressWarnings("unused")
-    private ReactiveJwtDecoder jwtDecoder;
-
     @Test
     void contextLoads() {
         assertThat(true).isTrue();

diff --git a/...y/src/test/java/no/nav/testnav/proxies/aaregsyntservicesproxy/ApplicationContextTest.java b/...y/src/test/java/no/nav/testnav/proxies/aaregsyntservicesproxy/ApplicationContextTest.java
@@ -2,8 +2,6 @@
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.bean.override.mockito.MockitoBean;
-import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder;
 import org.springframework.test.context.ActiveProfiles;
 
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
@@ -12,10 +10,6 @@
 @ActiveProfiles("test")
 class ApplicationContextTest {
 
-    @MockitoBean
-    @SuppressWarnings("unused")
-    private ReactiveJwtDecoder reactiveJwtDecoder;
-
     @Test
     void load_app_context() {
         assertThat(true).isTrue();

diff --git a/...xy/src/test/java/no/nav/testnav/proxies/arbeidsplassencvproxy/ApplicationContextTest.java b/...xy/src/test/java/no/nav/testnav/proxies/arbeidsplassencvproxy/ApplicationContextTest.java
@@ -2,8 +2,6 @@
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.bean.override.mockito.MockitoBean;
-import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder;
 import org.springframework.test.context.ActiveProfiles;
 
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
@@ -12,10 +10,6 @@
 @ActiveProfiles("test")
 class ApplicationContextTest {
 
-    @MockitoBean
-    @SuppressWarnings("unused")
-    private ReactiveJwtDecoder reactiveJwtDecoder;
-
     @Test
     void load_app_context() {
         assertThat(true).isTrue();

diff --git a/...xy/src/test/java/no/nav/testnav/proxies/arenaforvalterenproxy/ApplicationContextTest.java b/...xy/src/test/java/no/nav/testnav/proxies/arenaforvalterenproxy/ApplicationContextTest.java
@@ -2,8 +2,6 @@
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.bean.override.mockito.MockitoBean;
-import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder;
 import org.springframework.test.context.ActiveProfiles;
 
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
@@ -12,10 +10,6 @@
 @ActiveProfiles("test")
 class ApplicationContextTest {
 
-    @MockitoBean
-    @SuppressWarnings("unused")
-    private ReactiveJwtDecoder reactiveJwtDecoder;
-
     @Test
     void load_app_context() {
         assertThat(true).isTrue();

diff --git a/...deo-proxy/src/test/java/no/nav/testnav/proxies/batchadeoproxy/ApplicationContextTest.java b/...deo-proxy/src/test/java/no/nav/testnav/proxies/batchadeoproxy/ApplicationContextTest.java
@@ -2,8 +2,6 @@
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.bean.override.mockito.MockitoBean;
-import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder;
 import org.springframework.test.context.ActiveProfiles;
 
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
@@ -12,10 +10,6 @@
 @ActiveProfiles("test")
 class ApplicationContextTest {
 
-    @MockitoBean
-    @SuppressWarnings("unused")
-    private ReactiveJwtDecoder reactiveJwtDecoder;
-
     @Test
     void load_app_context() {
         assertThat(true).isTrue();

diff --git a/...tub-proxy/src/test/java/no/nav/testnav/proxies/brregstubproxy/ApplicationContextTest.java b/...tub-proxy/src/test/java/no/nav/testnav/proxies/brregstubproxy/ApplicationContextTest.java
@@ -2,8 +2,6 @@
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.bean.override.mockito.MockitoBean;
-import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder;
 import org.springframework.test.context.ActiveProfiles;
 
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
@@ -12,10 +10,6 @@
 @ActiveProfiles("test")
 class ApplicationContextTest {
 
-    @MockitoBean
-    @SuppressWarnings("unused")
-    private ReactiveJwtDecoder reactiveJwtDecoder;
-
     @Test
     void load_app_context() {
         assertThat(true).isTrue();

diff --git a/...rkiv-proxy/src/test/java/no/nav/testnav/proxies/dokarkivproxy/ApplicationContextTest.java b/...rkiv-proxy/src/test/java/no/nav/testnav/proxies/dokarkivproxy/ApplicationContextTest.java
@@ -2,8 +2,6 @@
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.bean.override.mockito.MockitoBean;
-import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder;
 import org.springframework.test.context.ActiveProfiles;
 
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
@@ -12,10 +10,6 @@
 @ActiveProfiles("test")
 class ApplicationContextTest {
 
-    @MockitoBean
-    @SuppressWarnings("unused")
-    public ReactiveJwtDecoder reactiveJwtDecoder;
-
     @Test
     void load_app_context() {
         assertThat(true).isTrue();

diff --git a/...ies/ereg-proxy/src/test/java/no/nav/testnav/proxies/eregproxy/ApplicationContextTest.java b/...ies/ereg-proxy/src/test/java/no/nav/testnav/proxies/eregproxy/ApplicationContextTest.java
@@ -2,8 +2,6 @@
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.bean.override.mockito.MockitoBean;
-import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder;
 import org.springframework.test.context.ActiveProfiles;
 
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
@@ -12,10 +10,6 @@
 @ActiveProfiles("test")
 class ApplicationContextTest {
 
-    @MockitoBean
-    @SuppressWarnings("unused")
-    private ReactiveJwtDecoder reactiveJwtDecoder;
-
     @Test
     void load_app_context() {
         assertThat(true).isTrue();

diff --git a/...makt-proxy/src/test/java/no/nav/testnav/proxies/fullmaktproxy/ApplicationContextTest.java b/...makt-proxy/src/test/java/no/nav/testnav/proxies/fullmaktproxy/ApplicationContextTest.java
@@ -2,8 +2,6 @@
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.bean.override.mockito.MockitoBean;
-import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder;
 import org.springframework.test.context.ActiveProfiles;
 
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
@@ -12,10 +10,6 @@
 @ActiveProfiles("test")
 class ApplicationContextTest {
 
-    @MockitoBean
-    @SuppressWarnings("unused")
-    private ReactiveJwtDecoder reactiveJwtDecoder;
-
     @Test
     void load_app_context() {
         assertThat(true).isTrue();

diff --git a/...stark-proxy/src/test/java/no/nav/testnav/proxies/histarkproxy/ApplicationContextTest.java b/...stark-proxy/src/test/java/no/nav/testnav/proxies/histarkproxy/ApplicationContextTest.java
@@ -2,8 +2,6 @@
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.bean.override.mockito.MockitoBean;
-import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder;
 import org.springframework.test.context.ActiveProfiles;
 
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
@@ -12,10 +10,6 @@
 @ActiveProfiles("test")
 class ApplicationContextTest {
 
-    @MockitoBean
-    @SuppressWarnings("unused")
-    private ReactiveJwtDecoder reactiveJwtDecoder;
-
     @Test
     void load_app_context() {
         assertThat(true).isTrue();

diff --git a/...b-proxy/src/test/java/no/nav/testnav/proxies/inntektstubproxy/ApplicationContextTest.java b/...b-proxy/src/test/java/no/nav/testnav/proxies/inntektstubproxy/ApplicationContextTest.java
@@ -2,8 +2,6 @@
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.bean.override.mockito.MockitoBean;
-import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder;
 import org.springframework.test.context.ActiveProfiles;
 
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
@@ -12,10 +10,6 @@
 @ActiveProfiles("test")
 class ApplicationContextTest {
 
-    @MockitoBean
-    @SuppressWarnings("unused")
-    private ReactiveJwtDecoder reactiveJwtDecoder;
-
     @Test
     void load_app_context() {
         assertThat(true).isTrue();

diff --git a/...ies/inst-proxy/src/test/java/no/nav/testnav/proxies/instproxy/ApplicationContextTest.java b/...ies/inst-proxy/src/test/java/no/nav/testnav/proxies/instproxy/ApplicationContextTest.java
@@ -2,8 +2,6 @@
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.bean.override.mockito.MockitoBean;
-import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder;
 import org.springframework.test.context.ActiveProfiles;
 
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
@@ -12,10 +10,6 @@
 @ActiveProfiles("test")
 class ApplicationContextTest {
 
-    @MockitoBean
-    @SuppressWarnings("unused")
-    private ReactiveJwtDecoder reactiveJwtDecoder;
-
     @Test
     void load_app_context() {
         assertThat(true).isTrue();