Merge branch 'main' into upgrade

InseeFr · Dec 20, 2023 · bf4f843 · bf4f843
2 parents 326d4cb + 1a04b1a
commit bf4f843
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/...a/fr/insee/survey/datacollectionmanagement/contacts/controller/AddressControllerTest.java b/...a/fr/insee/survey/datacollectionmanagement/contacts/controller/AddressControllerTest.java
@@ -13,6 +13,7 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
+import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.web.servlet.MockMvc;
@@ -27,8 +28,8 @@
 @AutoConfigureMockMvc
 @SpringBootTest
 @ActiveProfiles("test")
-@ContextConfiguration
-class AddressControllerTest {
+@DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_EACH_TEST_METHOD)
+public class AddressControllerTest {
 
     @Autowired
     private MockMvc mockMvc;

diff --git a/...a/fr/insee/survey/datacollectionmanagement/contacts/controller/ContactControllerTest.java b/...a/fr/insee/survey/datacollectionmanagement/contacts/controller/ContactControllerTest.java
@@ -18,6 +18,7 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
+import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.web.servlet.MockMvc;
 
@@ -33,7 +34,8 @@
 @AutoConfigureMockMvc
 @SpringBootTest
 @ActiveProfiles("test")
-class ContactControllerTest {
+@DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_EACH_TEST_METHOD)
+public class ContactControllerTest {
 
     @Autowired
     private MockMvc mockMvc;

diff --git a/...insee/survey/datacollectionmanagement/contacts/controller/ContactEventControllerTest.java b/...insee/survey/datacollectionmanagement/contacts/controller/ContactEventControllerTest.java
@@ -9,6 +9,7 @@
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.http.HttpStatus;
+import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.web.servlet.MockMvc;
 
@@ -20,7 +21,8 @@
 @AutoConfigureMockMvc
 @SpringBootTest
 @ActiveProfiles("test")
-class ContactEventControllerTest {
+@DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_EACH_TEST_METHOD)
+public class ContactEventControllerTest {
 
     @Autowired
     private MockMvc mockMvc;