Skip to content

RC: 1.15.3 #187

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nsenave merged 2 commits into from
Mar 13, 2026
Merged

RC: 1.15.3 #187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4aaa9d2
chore(deps): update all minor dependencies (#183)
renovate[bot] Mar 13, 2026
d308577
fix: choice type default value (#186)
nsenave Mar 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<groupId>fr.insee.pogues</groupId>
<artifactId>pogues-model</artifactId>
<version>1.15.2</version>
<version>1.15.3</version>
<packaging>jar</packaging>

<name>Pogues Model</name>
Expand Down Expand Up @@ -56,14 +56,14 @@
<eclipse.version>2.6.0</eclipse.version>
<commons-io.version>2.21.0</commons-io.version>
<slf4j.version>2.0.17</slf4j.version>
<junit.version>5.14.2</junit.version>
<junit.version>5.14.3</junit.version>
<jsonassert.version>1.5.3</jsonassert.version>
<xmlunit.version>2.11.0</xmlunit.version>
<log4j-slf4j2.version>2.25.3</log4j-slf4j2.version>
<!-- Build plugin versions -->
<surefire.plugin.version>3.5.4</surefire.plugin.version>
<surefire.plugin.version>3.5.5</surefire.plugin.version>
<jaxb2.plugin.version>2.5.0</jaxb2.plugin.version>
<resources.plugin.version>3.4.0</resources.plugin.version>
<resources.plugin.version>3.5.0</resources.plugin.version>
<build-helper.plugin.version>1.12</build-helper.plugin.version>
</properties>

Expand Down
7 changes: 3 additions & 4 deletions src/main/resources/xsd/Questionnaire.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -666,12 +666,11 @@
to a single response.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="choiceType" type="ChoiceTypeEnum" default="CODE_LIST">
<xs:attribute name="choiceType" type="ChoiceTypeEnum">
<xs:annotation>
<xs:documentation>
choiceType specifies whether the response options are defined by a static
code list (CODE_LIST) or dynamically generated from a collected variable
(VARIABLE). The default value is CODE_LIST.
'choiceType' is a property for choice responses. It specifies whether the response options are defined by a
static code list (CODE_LIST) or dynamically generated from a collected variable (VARIABLE).
</xs:documentation>
</xs:annotation>
</xs:attribute>
Expand Down
33 changes: 33 additions & 0 deletions src/test/java/fr/insee/pogues/model/SuggesterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
package fr.insee.pogues.model;

import fr.insee.pogues.conversion.JSONDeserializer;
import org.junit.jupiter.api.Test;

import javax.xml.bind.JAXBException;

import static org.junit.jupiter.api.Assertions.assertEquals;

class SuggesterTest {

@Test
void deserializeSuggesterChoiceType() throws JAXBException {
String json = """
{
"Child": [
{
"type": "QuestionType",
"Response": [
{
"choiceType": "SUGGESTER"
}
]
}
]
}
""";
Questionnaire questionnaire = new JSONDeserializer().deserializeString(json);
QuestionType question = (QuestionType) questionnaire.getChild().getFirst();
assertEquals(ChoiceTypeEnum.SUGGESTER, question.getResponse().getFirst().getChoiceType());
}

}
158 changes: 158 additions & 0 deletions src/test/java/fr/insee/pogues/model/UniqueChoiceVariableOptionsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,158 @@
package fr.insee.pogues.model;

import fr.insee.pogues.conversion.JSONDeserializer;
import fr.insee.pogues.conversion.JSONSerializer;
import org.json.JSONException;
import org.junit.jupiter.api.Test;
import org.skyscreamer.jsonassert.JSONAssert;
import org.skyscreamer.jsonassert.JSONCompareMode;

import javax.xml.bind.JAXBException;
import java.io.UnsupportedEncodingException;

import static org.junit.jupiter.api.Assertions.*;

class UniqueChoiceVariableOptionsTest {

@Test
void serializeUcqVariable_withFilter() throws JAXBException, UnsupportedEncodingException, JSONException {
// Given
QuestionType question = new QuestionType();
question.setQuestionType(QuestionTypeEnum.SINGLE_CHOICE);
question.setOptionFilter("nvl($AGE$, 0) > 18");

ResponseType response = new ResponseType();
response.setVariableReference("id-loop-variable");
response.setChoiceType(ChoiceTypeEnum.VARIABLE);

question.getResponse().add(response);

Questionnaire questionnaire = new Questionnaire();
questionnaire.getChild().add(question);

// When
String json = new JSONSerializer(true).serialize(questionnaire);

// Then
String expectedJson = """
{
"Child": [
{
"type": "QuestionType",
"questionType": "SINGLE_CHOICE",
"OptionFilter": "nvl($AGE$, 0) > 18",
"Response": [
{
"VariableReference": "id-loop-variable",
"choiceType": "VARIABLE"
}
]
}
]
}
""";
JSONAssert.assertEquals(expectedJson, json, JSONCompareMode.STRICT);
}

private final JSONDeserializer jsonDeserializer = new JSONDeserializer();

@Test
void testChoiceTypeVariableResponses() throws JAXBException {
String json = """
{
"Child": [
{
"type": "QuestionType",
"Response": [
{
"choiceType": "VARIABLE"
}
]
}
]
}
""";
JSONDeserializer deserializer = new JSONDeserializer();
Questionnaire questionnaire = deserializer.deserializeString(json);
assertEquals(ChoiceTypeEnum.VARIABLE, ((QuestionType) questionnaire.getChild().getFirst()).getResponse().getFirst().getChoiceType());
}

@Test
void deserializeUcqVariable() throws JAXBException {
String json = """
{
"Child": [
{
"type": "QuestionType",
"questionType": "SINGLE_CHOICE",
"Response": {
"choiceType": "VARIABLE",
"VariableReference": "id-loop-variable"
}
}
]
}
""";

JSONDeserializer deserializer = new JSONDeserializer();
Questionnaire questionnaire = deserializer.deserializeString(json);

QuestionType question = (QuestionType) questionnaire.getChild().getFirst();
assertEquals(QuestionTypeEnum.SINGLE_CHOICE, question.getQuestionType());
assertEquals(ChoiceTypeEnum.VARIABLE, question.getResponse().getFirst().getChoiceType());
assertNull(question.getOptionFilter());
assertNotNull(question.getResponse());
assertFalse(question.getResponse().isEmpty()) ;
assertEquals("id-loop-variable", question.getResponse().getFirst().getVariableReference());
}

@Test
void deserializeUcqVariable_withFilter() throws JAXBException {
String json = """
{
"Child": [
{
"type": "QuestionType",
"questionType": "SINGLE_CHOICE",
"OptionFilter": "nvl($AGE$, 0) > 18",
"Response": {
"choiceType": "VARIABLE",
"VariableReference": "id-loop-variable"
}
}
]
}
""";

JSONDeserializer deserializer = new JSONDeserializer();
Questionnaire questionnaire = deserializer.deserializeString(json);

QuestionType question = (QuestionType) questionnaire.getChild().getFirst();
assertEquals(QuestionTypeEnum.SINGLE_CHOICE, question.getQuestionType());
assertEquals(ChoiceTypeEnum.VARIABLE, question.getResponse().getFirst().getChoiceType());
assertEquals("nvl($AGE$, 0) > 18", question.getOptionFilter());
assertNotNull(question.getResponse());
assertFalse(question.getResponse().isEmpty()) ;
assertEquals("id-loop-variable", question.getResponse().getFirst().getVariableReference());
}

/** The response object is the same for choice responses and other types of responses (text, numeric, date etc.).
* So the 'choiceType' property must be null is absent. */
@Test
void responseWithoutChoiceType() throws JAXBException {
String json = """
{
"Child": [
{
"type": "QuestionType",
"Response": {}
}
]
}
""";
Questionnaire questionnaire = jsonDeserializer.deserializeString(json);
QuestionType question = (QuestionType) questionnaire.getChild().getFirst();
assertNull(question.getResponse().getFirst().getChoiceType());
}

}
135 changes: 0 additions & 135 deletions src/test/java/fr/insee/pogues/test/JSONDeserializerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,141 +410,6 @@ void testPairwiseSourceVariableReferences() throws JAXBException {
assertEquals("var-age-id", pairwiseQuestion.getSourceVariableReferences().getAge());
}

@Test
void testChoiceTypeVariableResponses() throws JAXBException {
String json = """
{
"Child": [
{
"type": "QuestionType",
"Response": [
{
"choiceType": "VARIABLE"
}
]
}
]
}
""";
JSONDeserializer deserializer = new JSONDeserializer();
Questionnaire questionnaire = deserializer.deserializeString(json);
assertEquals(ChoiceTypeEnum.VARIABLE, ((QuestionType) questionnaire.getChild().getFirst()).getResponse().getFirst().getChoiceType());
}

@Test
void testChoiceTypeSuggester() throws JAXBException {
String json = """
{
"Child": [
{
"type": "QuestionType",
"Response": [
{
"choiceType": "SUGGESTER"
}
]
}
]
}
""";

JSONDeserializer deserializer = new JSONDeserializer();
Questionnaire questionnaire = deserializer.deserializeString(json);
assertEquals(ChoiceTypeEnum.SUGGESTER, ((QuestionType) questionnaire.getChild().getFirst()).getResponse().getFirst().getChoiceType());
}

@Test
void testChoiceTypeDefaultValue() throws JAXBException {
String json = """
{
"Child": [
{
"type": "QuestionType",
"Response": [{}]
}
]
}
""";
JSONDeserializer deserializer = new JSONDeserializer();
Questionnaire questionnaire = deserializer.deserializeString(json);
assertEquals(ChoiceTypeEnum.CODE_LIST, ((QuestionType) questionnaire.getChild().getFirst()).getResponse().getFirst().getChoiceType());
}

@Test
void testOptionFilter() throws JAXBException {
String json = """
{
"Child": [
{
"type": "QuestionType",
"OptionFilter": "nvl($AGE$, 0) > 18"
}
]
}
""";
JSONDeserializer deserializer = new JSONDeserializer();
Questionnaire questionnaire = deserializer.deserializeString(json);
assertEquals("nvl($AGE$, 0) > 18", ((QuestionType) questionnaire.getChild().getFirst()).getOptionFilter());
}

@Test
void testVariableReferenceInResponse() throws JAXBException {
String json = """
{
"Child": [
{
"type": "QuestionType",
"Response": {
"VariableReference": "id-loop-variable"
}
}
]
}
""";
JSONDeserializer deserializer = new JSONDeserializer();
Questionnaire questionnaire = deserializer.deserializeString(json);
assertEquals(
"id-loop-variable",
((QuestionType) questionnaire.getChild().getFirst())
.getResponse().getFirst().getVariableReference());
}

@Test
void testVariableResponsesFullConfiguration() throws JAXBException {
String json = """
{
"Child": [
{
"type": "QuestionType",
"questionType": "SINGLE_CHOICE",
"OptionFilter": "nvl($AGE$, 0) > 18",
"Response": {
"choiceType": "VARIABLE",
"VariableReference": "id-loop-variable"
}
}
]
}
""";

JSONDeserializer deserializer = new JSONDeserializer();
Questionnaire questionnaire = deserializer.deserializeString(json);

QuestionType question =
(QuestionType) questionnaire.getChild().getFirst();


assertEquals(QuestionTypeEnum.SINGLE_CHOICE, question.getQuestionType());
assertEquals(ChoiceTypeEnum.VARIABLE, question.getResponse().getFirst().getChoiceType());
assertEquals("nvl($AGE$, 0) > 18", question.getOptionFilter());
assertNotNull(question.getResponse());
assertFalse(question.getResponse().isEmpty());
assertEquals(
"id-loop-variable",
question.getResponse().getFirst().getVariableReference()
);
}

@Test
void testDeserializeVariableReferenceInExternalVariable() throws JAXBException {

Expand Down
Loading