- Mer test endringer

#deploy-test-dolly-backend
navikt · Jan 10, 2025 · f8bcac3 · f8bcac3
1 parent 6cba3f8
commit f8bcac3
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 42 deletions.
diff --git a/apps/dolly-backend/src/test/java/no/nav/dolly/DisableAutomaticFlywayMigrationOnStartup.java b/apps/dolly-backend/src/test/java/no/nav/dolly/DisableAutomaticFlywayMigrationOnStartup.java
diff --git a/apps/dolly-backend/src/test/java/no/nav/dolly/provider/api/AbstractControllerTest.java b/apps/dolly-backend/src/test/java/no/nav/dolly/provider/api/AbstractControllerTest.java
@@ -8,7 +8,6 @@
 import no.nav.dolly.repository.BrukerRepository;
 import no.nav.dolly.repository.IdentRepository;
 import no.nav.dolly.repository.TestgruppeRepository;
-import org.flywaydb.core.Flyway;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -20,7 +19,6 @@
 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.testcontainers.junit.jupiter.Testcontainers;
 
 import java.time.LocalDate;
 import java.util.Optional;
@@ -33,7 +31,6 @@
 @SpringBootTest(webEnvironment = RANDOM_PORT)
 @ExtendWith(SpringExtension.class)
 @ActiveProfiles("test")
-@Testcontainers(disabledWithoutDocker = true)
 @AutoConfigureMockMvc(addFilters = false)
 @AutoConfigureWireMock(port = 0)
 public abstract class AbstractControllerTest {
@@ -44,8 +41,6 @@ public abstract class AbstractControllerTest {
     private TestgruppeRepository testgruppeRepository;
     @Autowired
     private IdentRepository identRepository;
-    @Autowired
-    private Flyway flyway;
 
     @MockitoBean
     @SuppressWarnings("unused")

diff --git a/apps/dolly-backend/src/test/java/no/nav/dolly/provider/api/MalBestillingControllerTest.java b/apps/dolly-backend/src/test/java/no/nav/dolly/provider/api/MalBestillingControllerTest.java
@@ -18,7 +18,6 @@
 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.web.client.TestRestTemplate;
 import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.bean.override.mockito.MockitoBean;
@@ -76,9 +75,6 @@ class MalBestillingControllerTest {
     @Autowired
     private MockMvc mockMvc;
 
-    @Autowired
-    private TestRestTemplate restTemplate;
-
     @Autowired
     private BestillingMalRepository bestillingMalRepository;
 

diff --git a/apps/dolly-backend/src/test/java/no/nav/dolly/provider/api/TestgruppeControllerPostTest.java b/apps/dolly-backend/src/test/java/no/nav/dolly/provider/api/TestgruppeControllerPostTest.java
@@ -185,8 +185,8 @@ void createBestilling()
                                                 .build())
                                 .build())
                 .build();
-        mockMvc
-                .perform(
+
+        mockMvc.perform(
                         post("/api/v1/gruppe/{gruppeId}/bestilling", testgruppe.getId())
                                 .contentType(APPLICATION_JSON)
                                 .content(objectMapper.writeValueAsString(bestilling)))

diff --git a/...olly-backend/src/test/java/no/nav/dolly/service/OrganisasjonMalBestillingServiceTest.java b/...olly-backend/src/test/java/no/nav/dolly/service/OrganisasjonMalBestillingServiceTest.java
@@ -9,7 +9,6 @@
 import no.nav.dolly.repository.OrganisasjonBestillingMalRepository;
 import no.nav.dolly.repository.OrganisasjonBestillingRepository;
 import no.nav.testnav.libs.servletsecurity.exchange.AzureAdTokenService;
-import org.flywaydb.core.Flyway;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
@@ -25,8 +24,6 @@
 import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.web.servlet.MockMvc;
-import org.springframework.transaction.annotation.Transactional;
-import org.testcontainers.junit.jupiter.Testcontainers;
 
 import java.time.LocalDateTime;
 
@@ -45,7 +42,6 @@
 )
 @ExtendWith(SpringExtension.class)
 @ActiveProfiles("test")
-@Testcontainers(disabledWithoutDocker = true)
 @AutoConfigureMockMvc(addFilters = false)
 @AutoConfigureWireMock(port = 0)
 class OrganisasjonMalBestillingServiceTest {
@@ -86,13 +82,9 @@ class OrganisasjonMalBestillingServiceTest {
     private OrganisasjonBestillingRepository organisasjonBestillingRepository;
     @Autowired
     private BrukerRepository brukerRepository;
-    @Autowired
-    private Flyway flyway;
 
     @BeforeEach
-    @Transactional
     public void beforeEach() {
-        flyway.migrate();
         saveDummyBruker(DUMMY_EN);
         saveDummyBruker(DUMMY_TO);
         MockedJwtAuthenticationTokenUtils.setJwtAuthenticationToken();

diff --git a/apps/dolly-backend/src/test/resources/application-test.yml b/apps/dolly-backend/src/test/resources/application-test.yml
@@ -93,9 +93,6 @@ management:
         include: none
 
 spring:
-  jpa:
-    hibernate:
-      ddl-auto: create
   cloud:
     gcp:
       secretmanager: