test: add a set of non regression tests

InseeFr · Oct 24, 2023 · 1e19003 · 1e19003
1 parent d5236b0
commit 1e19003
Show file tree

Hide file tree

Showing 21 changed files with 73,713 additions and 4 deletions.
diff --git a/eno-ws/src/main/java/fr/insee/eno/ws/service/DDIToLunaticService.java b/eno-ws/src/main/java/fr/insee/eno/ws/service/DDIToLunaticService.java
@@ -21,9 +21,9 @@ public class DDIToLunaticService {
     @Value("${version.lunatic.model}")
     String lunaticModelVersion;
 
-    public Mono<String> transformToJson(InputStream ddiInputStream, EnoParameters parameterInputStream, LunaticPostProcessing lunaticPostProcessings) {
+    public Mono<String> transformToJson(InputStream ddiInputStream, EnoParameters enoParameters, LunaticPostProcessing lunaticPostProcessings) {
         try {
-            Questionnaire lunaticQuestionnaire = DDIToLunatic.transform(ddiInputStream, parameterInputStream);
+            Questionnaire lunaticQuestionnaire = DDIToLunatic.transform(ddiInputStream, enoParameters);
             lunaticQuestionnaire.setEnoCoreVersion(enoVersion);
             lunaticQuestionnaire.setLunaticModelVersion(lunaticModelVersion);
             lunaticPostProcessings.apply(lunaticQuestionnaire);
@@ -33,9 +33,12 @@ public Mono<String> transformToJson(InputStream ddiInputStream, EnoParameters pa
         }
     }
 
-    public Mono<String> transformToJson(InputStream ddiInputStream, EnoParameters parameterInputStream) {
+    public Mono<String> transformToJson(InputStream ddiInputStream, EnoParameters enoParameters) {
         try {
-            return Mono.just(DDIToLunatic.transformToJson(ddiInputStream, parameterInputStream));
+            Questionnaire lunaticQuestionnaire = DDIToLunatic.transform(ddiInputStream, enoParameters);
+            lunaticQuestionnaire.setEnoCoreVersion(enoVersion);
+            lunaticQuestionnaire.setLunaticModelVersion(lunaticModelVersion);
+            return Mono.just(LunaticSerializer.serializeToJson(lunaticQuestionnaire));
         } catch (Exception e) {
             return Mono.error(e);
         }

diff --git a/eno-ws/src/test/java/fr/insee/eno/ws/service/DDIToLunaticServiceTest.java b/eno-ws/src/test/java/fr/insee/eno/ws/service/DDIToLunaticServiceTest.java
@@ -0,0 +1,96 @@
+package fr.insee.eno.ws.service;
+
+import fr.insee.eno.core.parameter.EnoParameters;
+import fr.insee.eno.core.parameter.Format;
+import fr.insee.eno.treatments.LunaticPostProcessing;
+import fr.insee.eno.treatments.LunaticRegroupementProcessing;
+import fr.insee.eno.treatments.LunaticSuggesterProcessing;
+import fr.insee.eno.treatments.SpecificTreatmentsDeserializer;
+import fr.insee.eno.treatments.dto.SpecificTreatments;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+class DDIToLunaticServiceTest {
+
+    @ParameterizedTest
+    @ValueSource(strings = {
+            "lna9ksqx", // loops with "except"
+            "lmyjrqbb", // loops without "except"
+            "ll27mb7f", // dynamic labels
+            "ll28it6e", // dynamic labels without loops
+            //"lk6x162e", // filters (!!! non-passing for now)
+            "kzfezgxb", // numeric controls
+            "l9o7l439", // all components
+            //"ldodefpq", // pairwise links (!!! non-passing for now)
+            "ljps8p2l", // dynamic tables
+            "lb3ei722", // occurrence filtering
+            "l7j0wwqx", // linked loops
+            //"simpsonsvtl", // Simpsons questionnaire (!!! non-passing for now)
+            "kx0a2hn8", // loops
+            "kzguw1v7", // non-numeric controls
+            "kanye31s_1", // declarations
+    })
+    void nonRegression_DefaultCAWI(String questionnaireId) {
+        //
+        DDIToLunaticService ddiToLunaticService = new DDIToLunaticService();
+        String result = ddiToLunaticService.transformToJson(
+                        this.getClass().getClassLoader().getResourceAsStream("non-regression/ddi-"+questionnaireId+".xml"),
+                        EnoParameters.of(EnoParameters.Context.DEFAULT, EnoParameters.ModeParameter.CAWI, Format.LUNATIC))
+                .block();
+        //
+        assertNotNull(result);
+    }
+
+    @Test
+    @Disabled("to be fixed")
+    void nonRegression_suggesterProcessing() {
+        //
+        SpecificTreatmentsDeserializer deserializer = new SpecificTreatmentsDeserializer();
+        SpecificTreatments postProcessingInput = deserializer.deserialize(
+                this.getClass().getClassLoader().getResourceAsStream(
+                        "non-regression/suggester-processing/suggester-input.json"));
+        LunaticPostProcessing lunaticPostProcessing = new LunaticPostProcessing();
+        lunaticPostProcessing.addPostProcessing(new LunaticSuggesterProcessing(postProcessingInput.suggesters()));
+
+        //
+        DDIToLunaticService ddiToLunaticService = new DDIToLunaticService();
+        String result = ddiToLunaticService.transformToJson(
+                        this.getClass().getClassLoader().getResourceAsStream("non-regression/suggester-processing/ddi-l7j0wwqx.xml"),
+                        EnoParameters.of(EnoParameters.Context.DEFAULT, EnoParameters.ModeParameter.CAWI, Format.LUNATIC),
+                        lunaticPostProcessing)
+                .block();
+
+        //
+        assertNotNull(result);
+    }
+
+    @ParameterizedTest
+    @ValueSource(strings = {
+            "group-input.json",
+            "group-input-outside-loop.json"
+    })
+    void nonRegression_groupProcessing(String groupProcessingFileName) {
+        //
+        SpecificTreatmentsDeserializer deserializer = new SpecificTreatmentsDeserializer();
+        SpecificTreatments postProcessingInput = deserializer.deserialize(
+                this.getClass().getClassLoader().getResourceAsStream(
+                        "non-regression/group-processing/" + groupProcessingFileName));
+        LunaticPostProcessing lunaticPostProcessing = new LunaticPostProcessing();
+        lunaticPostProcessing.addPostProcessing(new LunaticRegroupementProcessing(postProcessingInput.regroupements()));
+
+        //
+        DDIToLunaticService ddiToLunaticService = new DDIToLunaticService();
+        String result = ddiToLunaticService.transformToJson(
+                        this.getClass().getClassLoader().getResourceAsStream("non-regression/group-processing/ddi-lhpz68wp.xml"),
+                        EnoParameters.of(EnoParameters.Context.DEFAULT, EnoParameters.ModeParameter.CAWI, Format.LUNATIC))
+                .block();
+
+        //
+        assertNotNull(result);
+    }
+
+}