fix: tests and throw genesis exception

Author: alexisszmundy

src/main/java/fr/insee/genesis/domain/service/editedprevious/EditedPreviousResponseJsonService.java

@@ -96,7 +96,7 @@ private static void checkSourceStateLength(String sourceState) throws GenesisExc
         }
     }
 
-    private static void goToEditedPreviousToken(boolean isTokenFound, JsonParser jsonParser) throws IOException {
+    private static void goToEditedPreviousToken(boolean isTokenFound, JsonParser jsonParser) throws IOException, GenesisException {
         while (!isTokenFound){
             jsonParser.nextToken();
             if(jsonParser.currentToken() == null){

src/test/java/fr/insee/genesis/controller/rest/responses/EditedExternalResponseControllerTest.java

@@ -14,6 +14,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
+import org.springframework.http.ResponseEntity;
 import org.springframework.util.FileSystemUtils;
 
 import java.io.IOException;
@@ -189,9 +190,8 @@ void readJson_error_400(String fileName){
         );
 
         //WHEN + THEN
-        GenesisException genesisException = Assertions.catchThrowableOfType(GenesisException.class, ()->
-                editedExternalResponseController.readJson(QUESTIONNAIRE_ID, Mode.WEB, fileName));
-        Assertions.assertThat(genesisException.getStatus()).isEqualTo(400);
+        ResponseEntity<Object> response = editedExternalResponseController.readJson(QUESTIONNAIRE_ID, Mode.WEB, fileName);
+        Assertions.assertThat(response.getStatusCode().value()).isEqualTo(400);
     }
 
     //UTILS

src/test/java/fr/insee/genesis/controller/rest/responses/EditedPreviousResponseControllerTest.java

@@ -14,6 +14,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
+import org.springframework.http.ResponseEntity;
 import org.springframework.util.FileSystemUtils;
 
 import java.io.IOException;
@@ -56,7 +57,7 @@ void readJson_sourceState(String sourceState){
         testOKCase(sourceState);
     }
 
-    private void testOKCase(String sourceState) throws GenesisException, IOException {
+    private void testOKCase(String sourceState) throws IOException {
         //GIVEN
         Files.createDirectories(SOURCE_PATH);
         Files.copy(
@@ -217,9 +218,19 @@ void readJson_override_interrogation_id(){
     @ValueSource(strings = {"ceci est une origine beaucoup trop longue"})
     @SneakyThrows
     void readJson_sourceState_too_long(String sourceState){
-        GenesisException genesisException = Assertions.catchThrowableOfType(GenesisException.class, ()->
-            testOKCase(sourceState));
-        Assertions.assertThat(genesisException.getStatus()).isEqualTo(400);
+        //GIVEN
+        String fileName = "ok.json";
+        Files.createDirectories(SOURCE_PATH);
+        Files.copy(
+                Path.of(TestConstants.TEST_RESOURCES_DIRECTORY).resolve("edited_previous").resolve(fileName),
+                SOURCE_PATH.resolve(fileName),
+                StandardCopyOption.REPLACE_EXISTING
+        );
+
+        //WHEN + THEN
+        ResponseEntity<Object> response = editedPreviousResponseController.readJson(QUESTIONNAIRE_ID, Mode.WEB, sourceState,
+                fileName);
+        Assertions.assertThat(response.getStatusCode().value()).isEqualTo(400);
     }
 
     @Test
@@ -235,9 +246,8 @@ void readJson_invalid_syntax(){
         );
 
         //WHEN + THEN
-        GenesisException genesisException = Assertions.catchThrowableOfType(GenesisException.class, ()->
-                editedPreviousResponseController.readJson(QUESTIONNAIRE_ID, Mode.WEB, null, syntaxErrorFileName));
-        Assertions.assertThat(genesisException.getStatus()).isEqualTo(400);
+        ResponseEntity<Object> response = editedPreviousResponseController.readJson(QUESTIONNAIRE_ID, Mode.WEB, null, syntaxErrorFileName);
+        Assertions.assertThat(response.getStatusCode().value()).isEqualTo(400);
     }
     @Test
     @SneakyThrows
@@ -252,9 +262,8 @@ void readJson_not_a_json(){
         );
 
         //WHEN + THEN
-        GenesisException genesisException = Assertions.catchThrowableOfType(GenesisException.class, ()->
-                editedPreviousResponseController.readJson(QUESTIONNAIRE_ID, Mode.WEB, null, syntaxErrorFileName));
-        Assertions.assertThat(genesisException.getStatus()).isEqualTo(400);
+        ResponseEntity<Object> response = editedPreviousResponseController.readJson(QUESTIONNAIRE_ID, Mode.WEB, null, syntaxErrorFileName);
+        Assertions.assertThat(response.getStatusCode().value()).isEqualTo(400);
     }
 
     @Test
@@ -270,9 +279,8 @@ void readJson_no_interrogation_id(){
         );
 
         //WHEN + THEN
-        GenesisException genesisException = Assertions.catchThrowableOfType(GenesisException.class, ()->
-                editedPreviousResponseController.readJson(QUESTIONNAIRE_ID, Mode.WEB, null, fileName));
-        Assertions.assertThat(genesisException.getStatus()).isEqualTo(400);
+        ResponseEntity<Object> response = editedPreviousResponseController.readJson(QUESTIONNAIRE_ID, Mode.WEB, null, fileName);
+        Assertions.assertThat(response.getStatusCode().value()).isEqualTo(400);
     }
     @Test
     @SneakyThrows
@@ -287,9 +295,8 @@ void readJson_only_one_interrogation_id(){
         );
 
         //WHEN + THEN
-        GenesisException genesisException = Assertions.catchThrowableOfType(GenesisException.class, ()->
-                editedPreviousResponseController.readJson(QUESTIONNAIRE_ID, Mode.WEB, null, fileName));
-        Assertions.assertThat(genesisException.getStatus()).isEqualTo(400);
+        ResponseEntity<Object> response = editedPreviousResponseController.readJson(QUESTIONNAIRE_ID, Mode.WEB, null, fileName);
+        Assertions.assertThat(response.getStatusCode().value()).isEqualTo(400);
     }
 
     @Test
@@ -305,9 +312,8 @@ void readJson_double_interrogation_id(){
         );
 
         //WHEN + THEN
-        GenesisException genesisException = Assertions.catchThrowableOfType(GenesisException.class, ()->
-                editedPreviousResponseController.readJson(QUESTIONNAIRE_ID, Mode.WEB, null, fileName));
-        Assertions.assertThat(genesisException.getStatus()).isEqualTo(400);
+        ResponseEntity<Object> response = editedPreviousResponseController.readJson(QUESTIONNAIRE_ID, Mode.WEB, null, fileName);
+        Assertions.assertThat(response.getStatusCode().value()).isEqualTo(400);
     }
 
     //UTILS