From d95c4e48f19fd462f5933d8544d9e199fb8372d6 Mon Sep 17 00:00:00 2001 From: Laurent Caouissin Date: Fri, 24 Jul 2020 16:06:20 +0200 Subject: [PATCH 1/2] Change bindingsDependency to bindingDependencies (boolean -> array) --- src/main/resources/xsd/LunaticModel.xsd | 2 +- src/main/resources/xsd/LunaticModelFlat.xsd | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/xsd/LunaticModel.xsd b/src/main/resources/xsd/LunaticModel.xsd index 07adcc07..ca3a7a9f 100644 --- a/src/main/resources/xsd/LunaticModel.xsd +++ b/src/main/resources/xsd/LunaticModel.xsd @@ -74,7 +74,7 @@ - + diff --git a/src/main/resources/xsd/LunaticModelFlat.xsd b/src/main/resources/xsd/LunaticModelFlat.xsd index 1b693620..7384fe5f 100644 --- a/src/main/resources/xsd/LunaticModelFlat.xsd +++ b/src/main/resources/xsd/LunaticModelFlat.xsd @@ -66,7 +66,7 @@ - + From 09b01579b0c8242f62738f137bff3ad62cbe8d3a Mon Sep 17 00:00:00 2001 From: Laurent Caouissin Date: Fri, 24 Jul 2020 16:32:50 +0200 Subject: [PATCH 2/2] Update test files --- pom.xml | 2 +- src/test/resources/dummy/form.xml | 1920 ++++---- src/test/resources/dummy/form_flat.xml | 1920 ++++---- src/test/resources/examples/simpsons.json | 4047 ++++++++-------- .../resources/examples/xmlf-2-jsonf/out.json | 4047 ++++++++-------- .../resources/examples/xmlh-2-jsonf/out.json | 4047 ++++++++-------- .../resources/examples/xmlh-2-jsonh/out.json | 4067 ++++++++--------- .../resources/examples/xmlh-2-xmlf/out.xml | 1920 ++++---- 8 files changed, 10889 insertions(+), 11081 deletions(-) diff --git a/pom.xml b/pom.xml index d201d210..eb319643 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ fr.insee.lunatic lunatic-model jar - 2.0.0-rc2 + 2.0.0-rc3 Lunatic Model Classes and converters for the Lunatic model http://www.insee.fr diff --git a/src/test/resources/dummy/form.xml b/src/test/resources/dummy/form.xml index 7c8d9115..88ece94f 100644 --- a/src/test/resources/dummy/form.xml +++ b/src/test/resources/dummy/form.xml @@ -12,7 +12,6 @@ "normal" - false "normal" - false "normal" - false - false if ((not(cast(READY,integer) <> 1) )) then "normal" else "hidden" - true if ((not(cast(READY,integer) <> 1) )) then "normal" else "hidden" - true if ((not(cast(READY,integer) <> 1) )) then "normal" else "hidden" - true "For your information, the date of the last broadcast was on " || cast(cast(LAST_BROADCAST,string),string) || " " if ((not(cast(READY,integer) <> 1) )) then "normal" else "hidden" - true + LAST_BROADCAST YYYY-MM-DD @@ -91,7 +84,6 @@ decimals="1"> if ((not(cast(READY,integer) <> 1) )) then "normal" else "hidden" - true @@ -104,7 +96,6 @@ if ((not(cast(READY,integer) <> 1) )) then "normal" else "hidden" - true "One possible answer" if ((not(cast(READY,integer) <> 1) )) then "normal" else "hidden" - true 00001 @@ -142,7 +132,6 @@ if ((not(cast(READY,integer) <> 1) )) then "normal" else "hidden" - true 1 @@ -167,7 +156,6 @@ mandatory="false"> if ((not(cast(READY,integer) <> 1) )) then "normal" else "hidden" - true 1 @@ -226,7 +214,6 @@ if ((not(cast(READY,integer) <> 1) )) then "normal" else "hidden" - true @@ -237,7 +224,6 @@ if ((not(cast(READY,integer) <> 1) )) then "normal" else "hidden" - true @@ -267,7 +253,6 @@ if ((not(cast(READY,integer) <> 1) )) then "normal" else "hidden" - true 1 @@ -344,7 +329,6 @@ mandatory="false"> if ((not(cast(READY,integer) <> 1) )) then "normal" else "hidden" - true 1 @@ -421,7 +405,6 @@ mandatory="false"> if ((not(cast(READY,integer) <> 1) )) then "normal" else "hidden" - true 1 @@ -572,11 +555,9 @@ if ((not(cast(READY,integer) <> 1) )) then "normal" else "hidden" - true if ((not(cast(READY,integer) <> 1) )) then "normal" else "hidden" - true if ((not(cast(READY,integer) <> 1) )) then "normal" else "hidden" - true if ((not(cast(READY,integer) <> 1) )) then "normal" else "hidden" - true 00001 @@ -143,7 +133,6 @@ if ((not(cast(READY,integer) <> 1) )) then "normal" else "hidden" - true 1 @@ -168,7 +157,6 @@ mandatory="false"> if ((not(cast(READY,integer) <> 1) )) then "normal" else "hidden" - true 1 @@ -226,7 +214,6 @@ if ((not(cast(READY,integer) <> 1) )) then "normal" else "hidden" - true "Several possible answers" if ((not(cast(READY,integer) <> 1) )) then "normal" else "hidden" - true @@ -268,7 +254,6 @@ if ((not(cast(READY,integer) <> 1) )) then "normal" else "hidden" - true 1 @@ -345,7 +330,6 @@ mandatory="false"> if ((not(cast(READY,integer) <> 1) )) then "normal" else "hidden" - true 1 @@ -422,7 +406,6 @@ mandatory="false"> if ((not(cast(READY,integer) <> 1) )) then "normal" else "hidden" - true 1 @@ -572,12 +555,10 @@ if ((not(cast(READY,integer) <> 1) )) then "normal" else "hidden" - true if ((not(cast(READY,integer) <> 1) )) then "normal" else "hidden" - true if ((not(cast(READY,integer) <> 1) )) then "normal" else "hidden" - true @@ -104,7 +96,6 @@ if ((not(cast(READY,integer) <> 1) )) then "normal" else "hidden" - true "One possible answer" if ((not(cast(READY,integer) <> 1) )) then "normal" else "hidden" - true 00001 @@ -143,7 +133,6 @@ if ((not(cast(READY,integer) <> 1) )) then "normal" else "hidden" - true 1 @@ -168,7 +157,6 @@ mandatory="false"> if ((not(cast(READY,integer) <> 1) )) then "normal" else "hidden" - true 1 @@ -226,7 +214,6 @@ if ((not(cast(READY,integer) <> 1) )) then "normal" else "hidden" - true "Several possible answers" if ((not(cast(READY,integer) <> 1) )) then "normal" else "hidden" - true @@ -268,7 +254,6 @@ if ((not(cast(READY,integer) <> 1) )) then "normal" else "hidden" - true 1 @@ -345,7 +330,6 @@ mandatory="false"> if ((not(cast(READY,integer) <> 1) )) then "normal" else "hidden" - true 1 @@ -422,7 +406,6 @@ mandatory="false"> if ((not(cast(READY,integer) <> 1) )) then "normal" else "hidden" - true 1 @@ -572,12 +555,10 @@ if ((not(cast(READY,integer) <> 1) )) then "normal" else "hidden" - true if ((not(cast(READY,integer) <> 1) )) then "normal" else "hidden" - true if ((not(cast(READY,integer) <> 1) )) then "normal" else "hidden" - true