Update pom.xml (#56)

* Update pom.xml * Update SurveyControllerTest.java * Update MoogControllerTest.java
InseeFr · Mar 26, 2024 · 37c1cea · 37c1cea
1 parent 1a04b1a
commit 37c1cea
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 23 deletions.
diff --git a/pom.xml b/pom.xml
@@ -9,7 +9,7 @@
 	</parent>
 	<groupId>fr.insee.survey</groupId>
 	<artifactId>platine-management</artifactId>
-	<version>1.0.29</version>
+	<version>1.0.30</version>
 	<name>platine-management</name>
 	<description>REST API for communication between DB and Platine-Management UI and Platine-My-Surveys UI</description>
 	<properties>
@@ -69,6 +69,7 @@
 		<dependency>
 			<groupId>org.postgresql</groupId>
 			<artifactId>postgresql</artifactId>
+			<version>42.3.9</version>
 		</dependency>
 		<!-- SECURITY -->
 		<dependency>

diff --git a/...va/fr/insee/survey/datacollectionmanagement/metadata/controller/SurveyControllerTest.java b/...va/fr/insee/survey/datacollectionmanagement/metadata/controller/SurveyControllerTest.java
@@ -1,20 +1,11 @@
 package fr.insee.survey.datacollectionmanagement.metadata.controller;
 
-import static org.junit.Assert.assertTrue;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put;
-import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-
-import java.util.Optional;
-
+import fr.insee.survey.datacollectionmanagement.constants.Constants;
+import fr.insee.survey.datacollectionmanagement.metadata.domain.Survey;
+import fr.insee.survey.datacollectionmanagement.metadata.repository.SurveyRepository;
+import fr.insee.survey.datacollectionmanagement.metadata.service.SurveyService;
 import org.json.JSONException;
 import org.json.JSONObject;
-import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
@@ -26,10 +17,15 @@
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.web.servlet.MockMvc;
 
-import fr.insee.survey.datacollectionmanagement.constants.Constants;
-import fr.insee.survey.datacollectionmanagement.metadata.domain.Survey;
-import fr.insee.survey.datacollectionmanagement.metadata.repository.SurveyRepository;
-import fr.insee.survey.datacollectionmanagement.metadata.service.SurveyService;
+import java.util.Optional;
+
+import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
+import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 @AutoConfigureMockMvc
 @SpringBootTest
@@ -48,7 +44,7 @@ public class SurveyControllerTest {
     @DirtiesContext(methodMode = MethodMode.BEFORE_METHOD)
     @Test
     public void getSurveyOk() throws Exception {
-        String identifier = "SOURCE12022";
+        String identifier = "SOURCE12023";
         Optional<Survey> survey = surveyService.findById(identifier);
         assertTrue(survey.isPresent());
         String json = createJson(survey.get(), "SOURCE1");

diff --git a/...st/java/fr/insee/survey/datacollectionmanagement/query/controller/MoogControllerTest.java b/...st/java/fr/insee/survey/datacollectionmanagement/query/controller/MoogControllerTest.java
@@ -1,14 +1,12 @@
 package fr.insee.survey.datacollectionmanagement.query.controller;
 
 import fr.insee.survey.datacollectionmanagement.constants.Constants;
-import fr.insee.survey.datacollectionmanagement.query.service.CheckHabilitationService;
 import fr.insee.survey.datacollectionmanagement.query.service.MoogService;
-import fr.insee.survey.datacollectionmanagement.questioning.domain.SurveyUnit;
 import org.junit.jupiter.api.Test;
 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.mock.mockito.MockBean;
+import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.web.servlet.MockMvc;
 
@@ -19,6 +17,7 @@
 
 @AutoConfigureMockMvc
 @SpringBootTest
+@DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_EACH_TEST_METHOD)
 @ActiveProfiles("test")
 public class MoogControllerTest {
 
@@ -30,7 +29,7 @@ public class MoogControllerTest {
 
     @Test
     public void getMoogReadOnlyUrl() throws Exception {
-        String idCampaign= "SOURCE12023T01";
+        String idCampaign= "SOURCE12024T01";
         String surveyUnitId= "100000000";
         this.mockMvc.perform(get(Constants.MOOG_API_READONLY_URL, idCampaign,surveyUnitId)).andDo(print()).andExpect(status().isOk())
                 .andExpect(content().string("http://localhost:8081/readonly/questionnaire/m0/unite-enquetee/100000000"));