diff --git a/src/rougail/user_data_environment/data.py b/src/rougail/user_data_environment/data.py index c3368de..1de8bad 100644 --- a/src/rougail/user_data_environment/data.py +++ b/src/rougail/user_data_environment/data.py @@ -21,8 +21,10 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA import os from rougail.object_model import CONVERT_OPTION from rougail.config import RougailConfig +from rougail.error import ExtentionError from tiramisu.error import ValueOptionError + class RougailUserDataEnvironment: def __init__(self, config: 'Config', @@ -40,7 +42,7 @@ class RougailUserDataEnvironment: user_data = rougailconfig['step.user_data'] self.rougailconfig = rougailconfig if 'environment' not in user_data: - raise Exception('environment is not set in step.user_data') + raise ExtentionError('environment is not set in step.user_data') self.errors = [] self.warnings = [] diff --git a/tests/results/00_4load_subfolder/file/all.env b/tests/results/00_4load_subfolder/file/all.env index 5922bb8..d2b4df4 100644 --- a/tests/results/00_4load_subfolder/file/all.env +++ b/tests/results/00_4load_subfolder/file/all.env @@ -1 +1,2 @@ ROUGAIL.VAR1="string1" +ROUGAIL.VAR2="string1" diff --git a/tests/results/00_4load_subfolder/file/all_exclude.env b/tests/results/00_4load_subfolder/file/all_exclude.env index 5922bb8..d2b4df4 100644 --- a/tests/results/00_4load_subfolder/file/all_exclude.env +++ b/tests/results/00_4load_subfolder/file/all_exclude.env @@ -1 +1,2 @@ ROUGAIL.VAR1="string1" +ROUGAIL.VAR2="string1" diff --git a/tests/results/00_4load_subfolder/file/mandatories.env b/tests/results/00_4load_subfolder/file/mandatories.env index 5922bb8..d2b4df4 100644 --- a/tests/results/00_4load_subfolder/file/mandatories.env +++ b/tests/results/00_4load_subfolder/file/mandatories.env @@ -1 +1,2 @@ ROUGAIL.VAR1="string1" +ROUGAIL.VAR2="string1" diff --git a/tests/results/00_4load_subfolder/makedict/all.json b/tests/results/00_4load_subfolder/makedict/all.json index c921a2d..3471f52 100644 --- a/tests/results/00_4load_subfolder/makedict/all.json +++ b/tests/results/00_4load_subfolder/makedict/all.json @@ -1,3 +1,4 @@ { - "rougail.var1": "string1" + "rougail.var1": "string1", + "rougail.var2": "string1" } diff --git a/tests/results/00_4load_subfolder/makedict/mandatories.json b/tests/results/00_4load_subfolder/makedict/mandatories.json index c921a2d..3471f52 100644 --- a/tests/results/00_4load_subfolder/makedict/mandatories.json +++ b/tests/results/00_4load_subfolder/makedict/mandatories.json @@ -1,3 +1,4 @@ { - "rougail.var1": "string1" + "rougail.var1": "string1", + "rougail.var2": "string1" } diff --git a/tests/results/00_6choice/errors/all.json b/tests/results/00_6choice/errors/all.json index 006a884..217db0a 100644 --- a/tests/results/00_6choice/errors/all.json +++ b/tests/results/00_6choice/errors/all.json @@ -1,6 +1,4 @@ { - "errors": [ - "\"1\" is an invalid choice for \"rougail.var6 (the sixth variable)\", only \"1\", \"2\" and \"3\" are allowed" - ], + "errors": [], "warnings": [] } \ No newline at end of file diff --git a/tests/results/00_6choice_calculation/errors/all.json b/tests/results/00_6choice_calculation/errors/all.json new file mode 100644 index 0000000..217db0a --- /dev/null +++ b/tests/results/00_6choice_calculation/errors/all.json @@ -0,0 +1,4 @@ +{ + "errors": [], + "warnings": [] +} \ No newline at end of file diff --git a/tests/results/00_6choice_calculation/errors/mandatories.json b/tests/results/00_6choice_calculation/errors/mandatories.json new file mode 100644 index 0000000..217db0a --- /dev/null +++ b/tests/results/00_6choice_calculation/errors/mandatories.json @@ -0,0 +1,4 @@ +{ + "errors": [], + "warnings": [] +} \ No newline at end of file diff --git a/tests/results/00_6choice_calculation/file/all.env b/tests/results/00_6choice_calculation/file/all.env new file mode 100644 index 0000000..15c7fd4 --- /dev/null +++ b/tests/results/00_6choice_calculation/file/all.env @@ -0,0 +1 @@ +ROUGAIL.VAR="0" diff --git a/tests/results/00_6choice_calculation/file/all_exclude.env b/tests/results/00_6choice_calculation/file/all_exclude.env new file mode 100644 index 0000000..15c7fd4 --- /dev/null +++ b/tests/results/00_6choice_calculation/file/all_exclude.env @@ -0,0 +1 @@ +ROUGAIL.VAR="0" diff --git a/tests/results/00_6choice_calculation/file/mandatories.env b/tests/results/00_6choice_calculation/file/mandatories.env new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/tests/results/00_6choice_calculation/file/mandatories.env @@ -0,0 +1 @@ + diff --git a/tests/results/00_6choice_calculation/makedict/all.json b/tests/results/00_6choice_calculation/makedict/all.json new file mode 100644 index 0000000..c068f20 --- /dev/null +++ b/tests/results/00_6choice_calculation/makedict/all.json @@ -0,0 +1,3 @@ +{ + "rougail.var": 0 +} diff --git a/tests/results/00_6choice_calculation/makedict/mandatories.json b/tests/results/00_6choice_calculation/makedict/mandatories.json new file mode 100644 index 0000000..e03ee5a --- /dev/null +++ b/tests/results/00_6choice_calculation/makedict/mandatories.json @@ -0,0 +1,3 @@ +{ + "rougail.var": 9 +} diff --git a/tests/results/00_9default_integer/errors/all.json b/tests/results/00_9default_integer/errors/all.json new file mode 100644 index 0000000..217db0a --- /dev/null +++ b/tests/results/00_9default_integer/errors/all.json @@ -0,0 +1,4 @@ +{ + "errors": [], + "warnings": [] +} \ No newline at end of file diff --git a/tests/results/00_9default_integer/errors/mandatories.json b/tests/results/00_9default_integer/errors/mandatories.json new file mode 100644 index 0000000..217db0a --- /dev/null +++ b/tests/results/00_9default_integer/errors/mandatories.json @@ -0,0 +1,4 @@ +{ + "errors": [], + "warnings": [] +} \ No newline at end of file diff --git a/tests/results/00_9default_integer/file/all.env b/tests/results/00_9default_integer/file/all.env new file mode 100644 index 0000000..15c7fd4 --- /dev/null +++ b/tests/results/00_9default_integer/file/all.env @@ -0,0 +1 @@ +ROUGAIL.VAR="0" diff --git a/tests/results/00_9default_integer/file/all_exclude.env b/tests/results/00_9default_integer/file/all_exclude.env new file mode 100644 index 0000000..15c7fd4 --- /dev/null +++ b/tests/results/00_9default_integer/file/all_exclude.env @@ -0,0 +1 @@ +ROUGAIL.VAR="0" diff --git a/tests/results/00_9default_integer/file/mandatories.env b/tests/results/00_9default_integer/file/mandatories.env new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/tests/results/00_9default_integer/file/mandatories.env @@ -0,0 +1 @@ + diff --git a/tests/results/00_9default_integer/makedict/all.json b/tests/results/00_9default_integer/makedict/all.json new file mode 100644 index 0000000..c068f20 --- /dev/null +++ b/tests/results/00_9default_integer/makedict/all.json @@ -0,0 +1,3 @@ +{ + "rougail.var": 0 +} diff --git a/tests/results/00_9default_integer/makedict/mandatories.json b/tests/results/00_9default_integer/makedict/mandatories.json new file mode 100644 index 0000000..e03ee5a --- /dev/null +++ b/tests/results/00_9default_integer/makedict/mandatories.json @@ -0,0 +1,3 @@ +{ + "rougail.var": 9 +} diff --git a/tests/results/00_9extra/file/all.env b/tests/results/00_9extra/file/all.env index 6a36f07..144b0fe 100644 --- a/tests/results/00_9extra/file/all.env +++ b/tests/results/00_9extra/file/all.env @@ -1 +1,2 @@ ROUGAIL.VARIABLE="string1" +EXTRA.VARIABLE="string1" diff --git a/tests/results/00_9extra/file/all_exclude.env b/tests/results/00_9extra/file/all_exclude.env index 6a36f07..144b0fe 100644 --- a/tests/results/00_9extra/file/all_exclude.env +++ b/tests/results/00_9extra/file/all_exclude.env @@ -1 +1,2 @@ ROUGAIL.VARIABLE="string1" +EXTRA.VARIABLE="string1" diff --git a/tests/results/00_9extra/makedict/all.json b/tests/results/00_9extra/makedict/all.json index 66da3f1..ef50fd1 100644 --- a/tests/results/00_9extra/makedict/all.json +++ b/tests/results/00_9extra/makedict/all.json @@ -1,3 +1,4 @@ { - "rougail.variable": "string1" + "rougail.variable": "string1", + "extra.variable": "string1" } diff --git a/tests/results/00_9extra/makedict/mandatories.json b/tests/results/00_9extra/makedict/mandatories.json index 2130289..8c254a2 100644 --- a/tests/results/00_9extra/makedict/mandatories.json +++ b/tests/results/00_9extra/makedict/mandatories.json @@ -1,3 +1,4 @@ { - "rougail.variable": "rougail" + "rougail.variable": "rougail", + "extra.variable": "no" } diff --git a/tests/results/00_9extra_calculation/file/all.env b/tests/results/00_9extra_calculation/file/all.env index 6a36f07..3592edd 100644 --- a/tests/results/00_9extra_calculation/file/all.env +++ b/tests/results/00_9extra_calculation/file/all.env @@ -1 +1,4 @@ ROUGAIL.VARIABLE="string1" +EXTRA.VARIABLE1="string1" +EXTRA.VARIABLE2="string1" +EXTRA.VARIABLE3="string1" diff --git a/tests/results/00_9extra_calculation/file/all_exclude.env b/tests/results/00_9extra_calculation/file/all_exclude.env index 6a36f07..3592edd 100644 --- a/tests/results/00_9extra_calculation/file/all_exclude.env +++ b/tests/results/00_9extra_calculation/file/all_exclude.env @@ -1 +1,4 @@ ROUGAIL.VARIABLE="string1" +EXTRA.VARIABLE1="string1" +EXTRA.VARIABLE2="string1" +EXTRA.VARIABLE3="string1" diff --git a/tests/results/00_9extra_calculation/makedict/all.json b/tests/results/00_9extra_calculation/makedict/all.json index 66da3f1..c458aac 100644 --- a/tests/results/00_9extra_calculation/makedict/all.json +++ b/tests/results/00_9extra_calculation/makedict/all.json @@ -1,3 +1,6 @@ { - "rougail.variable": "string1" + "rougail.variable": "string1", + "extra.variable1": "string1", + "extra.variable2": "string1", + "extra.variable3": "string1" } diff --git a/tests/results/00_9extra_calculation/makedict/mandatories.json b/tests/results/00_9extra_calculation/makedict/mandatories.json index e11004c..0536388 100644 --- a/tests/results/00_9extra_calculation/makedict/mandatories.json +++ b/tests/results/00_9extra_calculation/makedict/mandatories.json @@ -1,3 +1,6 @@ { - "rougail.variable": "value" + "rougail.variable": "value", + "extra.variable1": "value", + "extra.variable2": "value", + "extra.variable3": "value" } diff --git a/tests/results/01_8calculation_information_multi/file/mandatories.env b/tests/results/01_8calculation_information_multi/file/mandatories.env index 8b13789..aa319c8 100644 --- a/tests/results/01_8calculation_information_multi/file/mandatories.env +++ b/tests/results/01_8calculation_information_multi/file/mandatories.env @@ -1 +1 @@ - +ROUGAIL.VARIABLE="string1,string2,string3" diff --git a/tests/results/01_8calculation_information_multi/makedict/mandatories.json b/tests/results/01_8calculation_information_multi/makedict/mandatories.json index b8ff177..5f820e2 100644 --- a/tests/results/01_8calculation_information_multi/makedict/mandatories.json +++ b/tests/results/01_8calculation_information_multi/makedict/mandatories.json @@ -1,5 +1,7 @@ { "rougail.variable": [ - "[]" + "string1", + "string2", + "string3" ] } diff --git a/tests/results/60_0family_dynamic/errors/mandatories.json b/tests/results/60_0family_dynamic/errors/mandatories.json index 748dd1d..217db0a 100644 --- a/tests/results/60_0family_dynamic/errors/mandatories.json +++ b/tests/results/60_0family_dynamic/errors/mandatories.json @@ -1,8 +1,4 @@ { - "errors": [ - "unknown option \"dynstring1\" in optiondescription \"rougail\"", - "unknown option \"dynstring2\" in optiondescription \"rougail\"", - "unknown option \"dynstring3\" in optiondescription \"rougail\"" - ], + "errors": [], "warnings": [] } \ No newline at end of file diff --git a/tests/results/60_0family_dynamic/file/all.env b/tests/results/60_0family_dynamic/file/all.env index 695b6ad..2bd697a 100644 --- a/tests/results/60_0family_dynamic/file/all.env +++ b/tests/results/60_0family_dynamic/file/all.env @@ -1,4 +1,3 @@ -ROUGAIL.VAR="string1,string2,string3" -ROUGAIL.DYNSTRING1.VAR="string1" -ROUGAIL.DYNSTRING2.VAR="string1" -ROUGAIL.DYNSTRING3.VAR="string1" +ROUGAIL.VAR="val1,val2" +ROUGAIL.DYNVAL1.VAR="string1" +ROUGAIL.DYNVAL2.VAR="string1" diff --git a/tests/results/60_0family_dynamic/file/all_exclude.env b/tests/results/60_0family_dynamic/file/all_exclude.env index 35c6349..cf6d584 100644 --- a/tests/results/60_0family_dynamic/file/all_exclude.env +++ b/tests/results/60_0family_dynamic/file/all_exclude.env @@ -1,3 +1,2 @@ -ROUGAIL.DYNSTRING1.VAR="string1" -ROUGAIL.DYNSTRING2.VAR="string1" -ROUGAIL.DYNSTRING3.VAR="string1" +ROUGAIL.DYNVAL1.VAR="string1" +ROUGAIL.DYNVAL2.VAR="string1" diff --git a/tests/results/60_0family_dynamic/makedict/all.json b/tests/results/60_0family_dynamic/makedict/all.json index 9172af2..ee96b68 100644 --- a/tests/results/60_0family_dynamic/makedict/all.json +++ b/tests/results/60_0family_dynamic/makedict/all.json @@ -1,10 +1,8 @@ { "rougail.var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "rougail.dynstring1.var": "string1", - "rougail.dynstring2.var": "string1", - "rougail.dynstring3.var": "string1" + "rougail.dynval1.var": "string1", + "rougail.dynval2.var": "string1" } diff --git a/tests/results/60_0family_dynamic_1_0/errors/mandatories.json b/tests/results/60_0family_dynamic_1_0/errors/mandatories.json index 748dd1d..217db0a 100644 --- a/tests/results/60_0family_dynamic_1_0/errors/mandatories.json +++ b/tests/results/60_0family_dynamic_1_0/errors/mandatories.json @@ -1,8 +1,4 @@ { - "errors": [ - "unknown option \"dynstring1\" in optiondescription \"rougail\"", - "unknown option \"dynstring2\" in optiondescription \"rougail\"", - "unknown option \"dynstring3\" in optiondescription \"rougail\"" - ], + "errors": [], "warnings": [] } \ No newline at end of file diff --git a/tests/results/60_0family_dynamic_1_0/file/all.env b/tests/results/60_0family_dynamic_1_0/file/all.env index fa48a28..7182972 100644 --- a/tests/results/60_0family_dynamic_1_0/file/all.env +++ b/tests/results/60_0family_dynamic_1_0/file/all.env @@ -1,4 +1,3 @@ -ROUGAIL.VAR="string1,string2,string3" -ROUGAIL.DYNSTRING1.VARDYN="string1" -ROUGAIL.DYNSTRING2.VARDYN="string1" -ROUGAIL.DYNSTRING3.VARDYN="string1" +ROUGAIL.VAR="val1,val2" +ROUGAIL.DYNVAL1.VARDYN="string1" +ROUGAIL.DYNVAL2.VARDYN="string1" diff --git a/tests/results/60_0family_dynamic_1_0/file/all_exclude.env b/tests/results/60_0family_dynamic_1_0/file/all_exclude.env index fe507f2..95ebc10 100644 --- a/tests/results/60_0family_dynamic_1_0/file/all_exclude.env +++ b/tests/results/60_0family_dynamic_1_0/file/all_exclude.env @@ -1,3 +1,2 @@ -ROUGAIL.DYNSTRING1.VARDYN="string1" -ROUGAIL.DYNSTRING2.VARDYN="string1" -ROUGAIL.DYNSTRING3.VARDYN="string1" +ROUGAIL.DYNVAL1.VARDYN="string1" +ROUGAIL.DYNVAL2.VARDYN="string1" diff --git a/tests/results/60_0family_dynamic_1_0/makedict/all.json b/tests/results/60_0family_dynamic_1_0/makedict/all.json index 2dd9255..23404d1 100644 --- a/tests/results/60_0family_dynamic_1_0/makedict/all.json +++ b/tests/results/60_0family_dynamic_1_0/makedict/all.json @@ -1,10 +1,8 @@ { "rougail.var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "rougail.dynstring1.vardyn": "string1", - "rougail.dynstring2.vardyn": "string1", - "rougail.dynstring3.vardyn": "string1" + "rougail.dynval1.vardyn": "string1", + "rougail.dynval2.vardyn": "string1" } diff --git a/tests/results/60_0family_dynamic_1_0_type/errors/mandatories.json b/tests/results/60_0family_dynamic_1_0_type/errors/mandatories.json index 748dd1d..217db0a 100644 --- a/tests/results/60_0family_dynamic_1_0_type/errors/mandatories.json +++ b/tests/results/60_0family_dynamic_1_0_type/errors/mandatories.json @@ -1,8 +1,4 @@ { - "errors": [ - "unknown option \"dynstring1\" in optiondescription \"rougail\"", - "unknown option \"dynstring2\" in optiondescription \"rougail\"", - "unknown option \"dynstring3\" in optiondescription \"rougail\"" - ], + "errors": [], "warnings": [] } \ No newline at end of file diff --git a/tests/results/60_0family_dynamic_1_0_type/file/all.env b/tests/results/60_0family_dynamic_1_0_type/file/all.env index fa48a28..7182972 100644 --- a/tests/results/60_0family_dynamic_1_0_type/file/all.env +++ b/tests/results/60_0family_dynamic_1_0_type/file/all.env @@ -1,4 +1,3 @@ -ROUGAIL.VAR="string1,string2,string3" -ROUGAIL.DYNSTRING1.VARDYN="string1" -ROUGAIL.DYNSTRING2.VARDYN="string1" -ROUGAIL.DYNSTRING3.VARDYN="string1" +ROUGAIL.VAR="val1,val2" +ROUGAIL.DYNVAL1.VARDYN="string1" +ROUGAIL.DYNVAL2.VARDYN="string1" diff --git a/tests/results/60_0family_dynamic_1_0_type/file/all_exclude.env b/tests/results/60_0family_dynamic_1_0_type/file/all_exclude.env index fe507f2..95ebc10 100644 --- a/tests/results/60_0family_dynamic_1_0_type/file/all_exclude.env +++ b/tests/results/60_0family_dynamic_1_0_type/file/all_exclude.env @@ -1,3 +1,2 @@ -ROUGAIL.DYNSTRING1.VARDYN="string1" -ROUGAIL.DYNSTRING2.VARDYN="string1" -ROUGAIL.DYNSTRING3.VARDYN="string1" +ROUGAIL.DYNVAL1.VARDYN="string1" +ROUGAIL.DYNVAL2.VARDYN="string1" diff --git a/tests/results/60_0family_dynamic_1_0_type/makedict/all.json b/tests/results/60_0family_dynamic_1_0_type/makedict/all.json index 2dd9255..23404d1 100644 --- a/tests/results/60_0family_dynamic_1_0_type/makedict/all.json +++ b/tests/results/60_0family_dynamic_1_0_type/makedict/all.json @@ -1,10 +1,8 @@ { "rougail.var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "rougail.dynstring1.vardyn": "string1", - "rougail.dynstring2.vardyn": "string1", - "rougail.dynstring3.vardyn": "string1" + "rougail.dynval1.vardyn": "string1", + "rougail.dynval2.vardyn": "string1" } diff --git a/tests/results/60_0family_dynamic_1_1/errors/mandatories.json b/tests/results/60_0family_dynamic_1_1/errors/mandatories.json index 748dd1d..217db0a 100644 --- a/tests/results/60_0family_dynamic_1_1/errors/mandatories.json +++ b/tests/results/60_0family_dynamic_1_1/errors/mandatories.json @@ -1,8 +1,4 @@ { - "errors": [ - "unknown option \"dynstring1\" in optiondescription \"rougail\"", - "unknown option \"dynstring2\" in optiondescription \"rougail\"", - "unknown option \"dynstring3\" in optiondescription \"rougail\"" - ], + "errors": [], "warnings": [] } \ No newline at end of file diff --git a/tests/results/60_0family_dynamic_1_1/file/all.env b/tests/results/60_0family_dynamic_1_1/file/all.env index fa48a28..7182972 100644 --- a/tests/results/60_0family_dynamic_1_1/file/all.env +++ b/tests/results/60_0family_dynamic_1_1/file/all.env @@ -1,4 +1,3 @@ -ROUGAIL.VAR="string1,string2,string3" -ROUGAIL.DYNSTRING1.VARDYN="string1" -ROUGAIL.DYNSTRING2.VARDYN="string1" -ROUGAIL.DYNSTRING3.VARDYN="string1" +ROUGAIL.VAR="val1,val2" +ROUGAIL.DYNVAL1.VARDYN="string1" +ROUGAIL.DYNVAL2.VARDYN="string1" diff --git a/tests/results/60_0family_dynamic_1_1/file/all_exclude.env b/tests/results/60_0family_dynamic_1_1/file/all_exclude.env index fe507f2..95ebc10 100644 --- a/tests/results/60_0family_dynamic_1_1/file/all_exclude.env +++ b/tests/results/60_0family_dynamic_1_1/file/all_exclude.env @@ -1,3 +1,2 @@ -ROUGAIL.DYNSTRING1.VARDYN="string1" -ROUGAIL.DYNSTRING2.VARDYN="string1" -ROUGAIL.DYNSTRING3.VARDYN="string1" +ROUGAIL.DYNVAL1.VARDYN="string1" +ROUGAIL.DYNVAL2.VARDYN="string1" diff --git a/tests/results/60_0family_dynamic_1_1/makedict/all.json b/tests/results/60_0family_dynamic_1_1/makedict/all.json index 2dd9255..23404d1 100644 --- a/tests/results/60_0family_dynamic_1_1/makedict/all.json +++ b/tests/results/60_0family_dynamic_1_1/makedict/all.json @@ -1,10 +1,8 @@ { "rougail.var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "rougail.dynstring1.vardyn": "string1", - "rougail.dynstring2.vardyn": "string1", - "rougail.dynstring3.vardyn": "string1" + "rougail.dynval1.vardyn": "string1", + "rougail.dynval2.vardyn": "string1" } diff --git a/tests/results/60_0family_dynamic_jinja_number/errors/mandatories.json b/tests/results/60_0family_dynamic_jinja_number/errors/mandatories.json index 0925976..217db0a 100644 --- a/tests/results/60_0family_dynamic_jinja_number/errors/mandatories.json +++ b/tests/results/60_0family_dynamic_jinja_number/errors/mandatories.json @@ -1,6 +1,4 @@ { - "errors": [ - "unknown option \"dyn3\" in optiondescription \"rougail\"" - ], + "errors": [], "warnings": [] } \ No newline at end of file diff --git a/tests/results/60_0family_dynamic_jinja_number/file/all.env b/tests/results/60_0family_dynamic_jinja_number/file/all.env index fd08e07..4da2751 100644 --- a/tests/results/60_0family_dynamic_jinja_number/file/all.env +++ b/tests/results/60_0family_dynamic_jinja_number/file/all.env @@ -1,5 +1,4 @@ -ROUGAIL.VAR="1,2,3" +ROUGAIL.VAR="1,2" ROUGAIL.DYN1.VAR="string1" ROUGAIL.DYN2.VAR="string1" -ROUGAIL.DYN3.VAR="string1" ROUGAIL.VAR2="string1" diff --git a/tests/results/60_0family_dynamic_jinja_number/file/all_exclude.env b/tests/results/60_0family_dynamic_jinja_number/file/all_exclude.env index 39533a7..ca1c29b 100644 --- a/tests/results/60_0family_dynamic_jinja_number/file/all_exclude.env +++ b/tests/results/60_0family_dynamic_jinja_number/file/all_exclude.env @@ -1,4 +1,3 @@ ROUGAIL.DYN1.VAR="string1" ROUGAIL.DYN2.VAR="string1" -ROUGAIL.DYN3.VAR="string1" ROUGAIL.VAR2="string1" diff --git a/tests/results/60_0family_dynamic_jinja_number/makedict/all.json b/tests/results/60_0family_dynamic_jinja_number/makedict/all.json index e4b3223..d429469 100644 --- a/tests/results/60_0family_dynamic_jinja_number/makedict/all.json +++ b/tests/results/60_0family_dynamic_jinja_number/makedict/all.json @@ -1,11 +1,9 @@ { "rougail.var": [ 1, - 2, - 3 + 2 ], "rougail.dyn1.var": "string1", "rougail.dyn2.var": "string1", - "rougail.dyn3.var": "string1", "rougail.var2": "string1" } diff --git a/tests/results/60_0family_dynamic_jinja_number_empty/errors/all.json b/tests/results/60_0family_dynamic_jinja_number_empty/errors/all.json index 0925976..217db0a 100644 --- a/tests/results/60_0family_dynamic_jinja_number_empty/errors/all.json +++ b/tests/results/60_0family_dynamic_jinja_number_empty/errors/all.json @@ -1,6 +1,4 @@ { - "errors": [ - "unknown option \"dyn3\" in optiondescription \"rougail\"" - ], + "errors": [], "warnings": [] } \ No newline at end of file diff --git a/tests/results/60_0family_dynamic_no_description/errors/all.json b/tests/results/60_0family_dynamic_no_description/errors/all.json index a6654e8..217db0a 100644 --- a/tests/results/60_0family_dynamic_no_description/errors/all.json +++ b/tests/results/60_0family_dynamic_no_description/errors/all.json @@ -1,8 +1,4 @@ { - "errors": [ - "unknown option \"dyn1\" in optiondescription \"rougail\"", - "unknown option \"dyn2\" in optiondescription \"rougail\"", - "unknown option \"var2\" in optiondescription \"rougail\"" - ], + "errors": [], "warnings": [] } \ No newline at end of file diff --git a/tests/results/60_0family_dynamic_no_description/errors/mandatories.json b/tests/results/60_0family_dynamic_no_description/errors/mandatories.json index 748dd1d..217db0a 100644 --- a/tests/results/60_0family_dynamic_no_description/errors/mandatories.json +++ b/tests/results/60_0family_dynamic_no_description/errors/mandatories.json @@ -1,8 +1,4 @@ { - "errors": [ - "unknown option \"dynstring1\" in optiondescription \"rougail\"", - "unknown option \"dynstring2\" in optiondescription \"rougail\"", - "unknown option \"dynstring3\" in optiondescription \"rougail\"" - ], + "errors": [], "warnings": [] } \ No newline at end of file diff --git a/tests/results/60_0family_dynamic_no_description/file/all.env b/tests/results/60_0family_dynamic_no_description/file/all.env index 695b6ad..2bd697a 100644 --- a/tests/results/60_0family_dynamic_no_description/file/all.env +++ b/tests/results/60_0family_dynamic_no_description/file/all.env @@ -1,4 +1,3 @@ -ROUGAIL.VAR="string1,string2,string3" -ROUGAIL.DYNSTRING1.VAR="string1" -ROUGAIL.DYNSTRING2.VAR="string1" -ROUGAIL.DYNSTRING3.VAR="string1" +ROUGAIL.VAR="val1,val2" +ROUGAIL.DYNVAL1.VAR="string1" +ROUGAIL.DYNVAL2.VAR="string1" diff --git a/tests/results/60_0family_dynamic_no_description/file/all_exclude.env b/tests/results/60_0family_dynamic_no_description/file/all_exclude.env index 35c6349..cf6d584 100644 --- a/tests/results/60_0family_dynamic_no_description/file/all_exclude.env +++ b/tests/results/60_0family_dynamic_no_description/file/all_exclude.env @@ -1,3 +1,2 @@ -ROUGAIL.DYNSTRING1.VAR="string1" -ROUGAIL.DYNSTRING2.VAR="string1" -ROUGAIL.DYNSTRING3.VAR="string1" +ROUGAIL.DYNVAL1.VAR="string1" +ROUGAIL.DYNVAL2.VAR="string1" diff --git a/tests/results/60_0family_dynamic_no_description/makedict/all.json b/tests/results/60_0family_dynamic_no_description/makedict/all.json index 9172af2..ee96b68 100644 --- a/tests/results/60_0family_dynamic_no_description/makedict/all.json +++ b/tests/results/60_0family_dynamic_no_description/makedict/all.json @@ -1,10 +1,8 @@ { "rougail.var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "rougail.dynstring1.var": "string1", - "rougail.dynstring2.var": "string1", - "rougail.dynstring3.var": "string1" + "rougail.dynval1.var": "string1", + "rougail.dynval2.var": "string1" } diff --git a/tests/results/60_0family_dynamic_variable_suffix/errors/mandatories.json b/tests/results/60_0family_dynamic_variable_suffix/errors/mandatories.json index 748dd1d..217db0a 100644 --- a/tests/results/60_0family_dynamic_variable_suffix/errors/mandatories.json +++ b/tests/results/60_0family_dynamic_variable_suffix/errors/mandatories.json @@ -1,8 +1,4 @@ { - "errors": [ - "unknown option \"dynstring1\" in optiondescription \"rougail\"", - "unknown option \"dynstring2\" in optiondescription \"rougail\"", - "unknown option \"dynstring3\" in optiondescription \"rougail\"" - ], + "errors": [], "warnings": [] } \ No newline at end of file diff --git a/tests/results/60_0family_dynamic_variable_suffix/file/all.env b/tests/results/60_0family_dynamic_variable_suffix/file/all.env index 695b6ad..2bd697a 100644 --- a/tests/results/60_0family_dynamic_variable_suffix/file/all.env +++ b/tests/results/60_0family_dynamic_variable_suffix/file/all.env @@ -1,4 +1,3 @@ -ROUGAIL.VAR="string1,string2,string3" -ROUGAIL.DYNSTRING1.VAR="string1" -ROUGAIL.DYNSTRING2.VAR="string1" -ROUGAIL.DYNSTRING3.VAR="string1" +ROUGAIL.VAR="val1,val2" +ROUGAIL.DYNVAL1.VAR="string1" +ROUGAIL.DYNVAL2.VAR="string1" diff --git a/tests/results/60_0family_dynamic_variable_suffix/file/all_exclude.env b/tests/results/60_0family_dynamic_variable_suffix/file/all_exclude.env index 35c6349..cf6d584 100644 --- a/tests/results/60_0family_dynamic_variable_suffix/file/all_exclude.env +++ b/tests/results/60_0family_dynamic_variable_suffix/file/all_exclude.env @@ -1,3 +1,2 @@ -ROUGAIL.DYNSTRING1.VAR="string1" -ROUGAIL.DYNSTRING2.VAR="string1" -ROUGAIL.DYNSTRING3.VAR="string1" +ROUGAIL.DYNVAL1.VAR="string1" +ROUGAIL.DYNVAL2.VAR="string1" diff --git a/tests/results/60_0family_dynamic_variable_suffix/makedict/all.json b/tests/results/60_0family_dynamic_variable_suffix/makedict/all.json index 9172af2..ee96b68 100644 --- a/tests/results/60_0family_dynamic_variable_suffix/makedict/all.json +++ b/tests/results/60_0family_dynamic_variable_suffix/makedict/all.json @@ -1,10 +1,8 @@ { "rougail.var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "rougail.dynstring1.var": "string1", - "rougail.dynstring2.var": "string1", - "rougail.dynstring3.var": "string1" + "rougail.dynval1.var": "string1", + "rougail.dynval2.var": "string1" } diff --git a/tests/results/60_2family_dynamic_jinja_fill_sub_group/errors/mandatories.json b/tests/results/60_2family_dynamic_jinja_fill_sub_group/errors/mandatories.json index 748dd1d..217db0a 100644 --- a/tests/results/60_2family_dynamic_jinja_fill_sub_group/errors/mandatories.json +++ b/tests/results/60_2family_dynamic_jinja_fill_sub_group/errors/mandatories.json @@ -1,8 +1,4 @@ { - "errors": [ - "unknown option \"dynstring1\" in optiondescription \"rougail\"", - "unknown option \"dynstring2\" in optiondescription \"rougail\"", - "unknown option \"dynstring3\" in optiondescription \"rougail\"" - ], + "errors": [], "warnings": [] } \ No newline at end of file diff --git a/tests/results/60_2family_dynamic_jinja_fill_sub_group/file/all.env b/tests/results/60_2family_dynamic_jinja_fill_sub_group/file/all.env index 965a3cd..386de8a 100644 --- a/tests/results/60_2family_dynamic_jinja_fill_sub_group/file/all.env +++ b/tests/results/60_2family_dynamic_jinja_fill_sub_group/file/all.env @@ -1,5 +1,4 @@ -ROUGAIL.VAR1="string1,string2,string3" -ROUGAIL.DYNSTRING1.FAMILY.VAR="string1" -ROUGAIL.DYNSTRING2.FAMILY.VAR="string1" -ROUGAIL.DYNSTRING3.FAMILY.VAR="string1" +ROUGAIL.VAR1="val1,val2" +ROUGAIL.DYNVAL1.FAMILY.VAR="string1" +ROUGAIL.DYNVAL2.FAMILY.VAR="string1" ROUGAIL.VAR2="string1" diff --git a/tests/results/60_2family_dynamic_jinja_fill_sub_group/file/all_exclude.env b/tests/results/60_2family_dynamic_jinja_fill_sub_group/file/all_exclude.env index 9f017bf..657ac30 100644 --- a/tests/results/60_2family_dynamic_jinja_fill_sub_group/file/all_exclude.env +++ b/tests/results/60_2family_dynamic_jinja_fill_sub_group/file/all_exclude.env @@ -1,4 +1,3 @@ -ROUGAIL.DYNSTRING1.FAMILY.VAR="string1" -ROUGAIL.DYNSTRING2.FAMILY.VAR="string1" -ROUGAIL.DYNSTRING3.FAMILY.VAR="string1" +ROUGAIL.DYNVAL1.FAMILY.VAR="string1" +ROUGAIL.DYNVAL2.FAMILY.VAR="string1" ROUGAIL.VAR2="string1" diff --git a/tests/results/60_2family_dynamic_jinja_fill_sub_group/makedict/all.json b/tests/results/60_2family_dynamic_jinja_fill_sub_group/makedict/all.json index 5c224b0..2fc5ea2 100644 --- a/tests/results/60_2family_dynamic_jinja_fill_sub_group/makedict/all.json +++ b/tests/results/60_2family_dynamic_jinja_fill_sub_group/makedict/all.json @@ -1,11 +1,9 @@ { "rougail.var1": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "rougail.dynstring1.family.var": "string1", - "rougail.dynstring2.family.var": "string1", - "rougail.dynstring3.family.var": "string1", + "rougail.dynval1.family.var": "string1", + "rougail.dynval2.family.var": "string1", "rougail.var2": "string1" } diff --git a/tests/results/60_2family_dynamic_jinja_fill_sub_group_2/errors/mandatories.json b/tests/results/60_2family_dynamic_jinja_fill_sub_group_2/errors/mandatories.json index 748dd1d..217db0a 100644 --- a/tests/results/60_2family_dynamic_jinja_fill_sub_group_2/errors/mandatories.json +++ b/tests/results/60_2family_dynamic_jinja_fill_sub_group_2/errors/mandatories.json @@ -1,8 +1,4 @@ { - "errors": [ - "unknown option \"dynstring1\" in optiondescription \"rougail\"", - "unknown option \"dynstring2\" in optiondescription \"rougail\"", - "unknown option \"dynstring3\" in optiondescription \"rougail\"" - ], + "errors": [], "warnings": [] } \ No newline at end of file diff --git a/tests/results/60_2family_dynamic_jinja_fill_sub_group_2/file/all.env b/tests/results/60_2family_dynamic_jinja_fill_sub_group_2/file/all.env index 678354e..26ba721 100644 --- a/tests/results/60_2family_dynamic_jinja_fill_sub_group_2/file/all.env +++ b/tests/results/60_2family_dynamic_jinja_fill_sub_group_2/file/all.env @@ -1,5 +1,4 @@ -ROUGAIL.VAR="string1,string2,string3" -ROUGAIL.DYNSTRING1.FAMILY.VAR="string1" -ROUGAIL.DYNSTRING2.FAMILY.VAR="string1" -ROUGAIL.DYNSTRING3.FAMILY.VAR="string1" +ROUGAIL.VAR="val1,val2" +ROUGAIL.DYNVAL1.FAMILY.VAR="string1" +ROUGAIL.DYNVAL2.FAMILY.VAR="string1" ROUGAIL.VAR2="string1" diff --git a/tests/results/60_2family_dynamic_jinja_fill_sub_group_2/file/all_exclude.env b/tests/results/60_2family_dynamic_jinja_fill_sub_group_2/file/all_exclude.env index 9f017bf..657ac30 100644 --- a/tests/results/60_2family_dynamic_jinja_fill_sub_group_2/file/all_exclude.env +++ b/tests/results/60_2family_dynamic_jinja_fill_sub_group_2/file/all_exclude.env @@ -1,4 +1,3 @@ -ROUGAIL.DYNSTRING1.FAMILY.VAR="string1" -ROUGAIL.DYNSTRING2.FAMILY.VAR="string1" -ROUGAIL.DYNSTRING3.FAMILY.VAR="string1" +ROUGAIL.DYNVAL1.FAMILY.VAR="string1" +ROUGAIL.DYNVAL2.FAMILY.VAR="string1" ROUGAIL.VAR2="string1" diff --git a/tests/results/60_2family_dynamic_jinja_fill_sub_group_2/makedict/all.json b/tests/results/60_2family_dynamic_jinja_fill_sub_group_2/makedict/all.json index ccfd732..5ef811d 100644 --- a/tests/results/60_2family_dynamic_jinja_fill_sub_group_2/makedict/all.json +++ b/tests/results/60_2family_dynamic_jinja_fill_sub_group_2/makedict/all.json @@ -1,11 +1,9 @@ { "rougail.var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "rougail.dynstring1.family.var": "string1", - "rougail.dynstring2.family.var": "string1", - "rougail.dynstring3.family.var": "string1", + "rougail.dynval1.family.var": "string1", + "rougail.dynval2.family.var": "string1", "rougail.var2": "string1" } diff --git a/tests/results/60_2family_dynamic_jinja_fill_sub_group_2_empty/errors/all.json b/tests/results/60_2family_dynamic_jinja_fill_sub_group_2_empty/errors/all.json index 748dd1d..217db0a 100644 --- a/tests/results/60_2family_dynamic_jinja_fill_sub_group_2_empty/errors/all.json +++ b/tests/results/60_2family_dynamic_jinja_fill_sub_group_2_empty/errors/all.json @@ -1,8 +1,4 @@ { - "errors": [ - "unknown option \"dynstring1\" in optiondescription \"rougail\"", - "unknown option \"dynstring2\" in optiondescription \"rougail\"", - "unknown option \"dynstring3\" in optiondescription \"rougail\"" - ], + "errors": [], "warnings": [] } \ No newline at end of file diff --git a/tests/results/60_2family_dynamic_outside_calc/errors/mandatories.json b/tests/results/60_2family_dynamic_outside_calc/errors/mandatories.json index 748dd1d..217db0a 100644 --- a/tests/results/60_2family_dynamic_outside_calc/errors/mandatories.json +++ b/tests/results/60_2family_dynamic_outside_calc/errors/mandatories.json @@ -1,8 +1,4 @@ { - "errors": [ - "unknown option \"dynstring1\" in optiondescription \"rougail\"", - "unknown option \"dynstring2\" in optiondescription \"rougail\"", - "unknown option \"dynstring3\" in optiondescription \"rougail\"" - ], + "errors": [], "warnings": [] } \ No newline at end of file diff --git a/tests/results/60_2family_dynamic_outside_calc/file/all.env b/tests/results/60_2family_dynamic_outside_calc/file/all.env index 9d58fae..9b1ad6a 100644 --- a/tests/results/60_2family_dynamic_outside_calc/file/all.env +++ b/tests/results/60_2family_dynamic_outside_calc/file/all.env @@ -1,5 +1,4 @@ -ROUGAIL.VAR1="string1,string2,string3" -ROUGAIL.DYNSTRING1.VAR="string1" -ROUGAIL.DYNSTRING2.VAR="string1" -ROUGAIL.DYNSTRING3.VAR="string1" +ROUGAIL.VAR1="val1,val2" +ROUGAIL.DYNVAL1.VAR="string1" +ROUGAIL.DYNVAL2.VAR="string1" ROUGAIL.NEWVAR="string1" diff --git a/tests/results/60_2family_dynamic_outside_calc/file/all_exclude.env b/tests/results/60_2family_dynamic_outside_calc/file/all_exclude.env index 52128c0..d750e8a 100644 --- a/tests/results/60_2family_dynamic_outside_calc/file/all_exclude.env +++ b/tests/results/60_2family_dynamic_outside_calc/file/all_exclude.env @@ -1,4 +1,3 @@ -ROUGAIL.DYNSTRING1.VAR="string1" -ROUGAIL.DYNSTRING2.VAR="string1" -ROUGAIL.DYNSTRING3.VAR="string1" +ROUGAIL.DYNVAL1.VAR="string1" +ROUGAIL.DYNVAL2.VAR="string1" ROUGAIL.NEWVAR="string1" diff --git a/tests/results/60_2family_dynamic_outside_calc/makedict/all.json b/tests/results/60_2family_dynamic_outside_calc/makedict/all.json index 44f792a..797789f 100644 --- a/tests/results/60_2family_dynamic_outside_calc/makedict/all.json +++ b/tests/results/60_2family_dynamic_outside_calc/makedict/all.json @@ -1,11 +1,9 @@ { "rougail.var1": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "rougail.dynstring1.var": "string1", - "rougail.dynstring2.var": "string1", - "rougail.dynstring3.var": "string1", + "rougail.dynval1.var": "string1", + "rougail.dynval2.var": "string1", "rougail.newvar": "string1" } diff --git a/tests/results/60_2family_dynamic_outside_calc_empty/errors/all.json b/tests/results/60_2family_dynamic_outside_calc_empty/errors/all.json index 748dd1d..217db0a 100644 --- a/tests/results/60_2family_dynamic_outside_calc_empty/errors/all.json +++ b/tests/results/60_2family_dynamic_outside_calc_empty/errors/all.json @@ -1,8 +1,4 @@ { - "errors": [ - "unknown option \"dynstring1\" in optiondescription \"rougail\"", - "unknown option \"dynstring2\" in optiondescription \"rougail\"", - "unknown option \"dynstring3\" in optiondescription \"rougail\"" - ], + "errors": [], "warnings": [] } \ No newline at end of file diff --git a/tests/results/60_5family_dynamic_calc2/errors/all.json b/tests/results/60_5family_dynamic_calc2/errors/all.json index 4e4b877..217db0a 100644 --- a/tests/results/60_5family_dynamic_calc2/errors/all.json +++ b/tests/results/60_5family_dynamic_calc2/errors/all.json @@ -1,8 +1,4 @@ { - "errors": [ - "unknown option \"dynval1\" in optiondescription \"rougail\"", - "unknown option \"dynval2\" in optiondescription \"rougail\"", - "unknown option \"newvar\" in optiondescription \"rougail\"" - ], + "errors": [], "warnings": [] } \ No newline at end of file diff --git a/tests/results/60_5family_dynamic_calc2/errors/mandatories.json b/tests/results/60_5family_dynamic_calc2/errors/mandatories.json index 748dd1d..217db0a 100644 --- a/tests/results/60_5family_dynamic_calc2/errors/mandatories.json +++ b/tests/results/60_5family_dynamic_calc2/errors/mandatories.json @@ -1,8 +1,4 @@ { - "errors": [ - "unknown option \"dynstring1\" in optiondescription \"rougail\"", - "unknown option \"dynstring2\" in optiondescription \"rougail\"", - "unknown option \"dynstring3\" in optiondescription \"rougail\"" - ], + "errors": [], "warnings": [] } \ No newline at end of file diff --git a/tests/results/60_5family_dynamic_calc2/file/all.env b/tests/results/60_5family_dynamic_calc2/file/all.env index 6181944..aa2f91a 100644 --- a/tests/results/60_5family_dynamic_calc2/file/all.env +++ b/tests/results/60_5family_dynamic_calc2/file/all.env @@ -1,5 +1,4 @@ -ROUGAIL.VAR="string1,string2,string3" +ROUGAIL.VAR="val1,val2" ROUGAIL.VAR2="string1" -ROUGAIL.DYNSTRING1.VARDYN="string1" -ROUGAIL.DYNSTRING2.VARDYN="string1" -ROUGAIL.DYNSTRING3.VARDYN="string1" +ROUGAIL.DYNVAL1.VARDYN="string1" +ROUGAIL.DYNVAL2.VARDYN="string1" diff --git a/tests/results/60_5family_dynamic_calc2/file/all_exclude.env b/tests/results/60_5family_dynamic_calc2/file/all_exclude.env index 023e6d4..0d2365d 100644 --- a/tests/results/60_5family_dynamic_calc2/file/all_exclude.env +++ b/tests/results/60_5family_dynamic_calc2/file/all_exclude.env @@ -1,4 +1,3 @@ ROUGAIL.VAR2="string1" -ROUGAIL.DYNSTRING1.VARDYN="string1" -ROUGAIL.DYNSTRING2.VARDYN="string1" -ROUGAIL.DYNSTRING3.VARDYN="string1" +ROUGAIL.DYNVAL1.VARDYN="string1" +ROUGAIL.DYNVAL2.VARDYN="string1" diff --git a/tests/results/60_5family_dynamic_calc2/makedict/all.json b/tests/results/60_5family_dynamic_calc2/makedict/all.json index bd8a346..b49f492 100644 --- a/tests/results/60_5family_dynamic_calc2/makedict/all.json +++ b/tests/results/60_5family_dynamic_calc2/makedict/all.json @@ -1,11 +1,9 @@ { "rougail.var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], "rougail.var2": "string1", - "rougail.dynstring1.vardyn": "string1", - "rougail.dynstring2.vardyn": "string1", - "rougail.dynstring3.vardyn": "string1" + "rougail.dynval1.vardyn": "string1", + "rougail.dynval2.vardyn": "string1" } diff --git a/tests/results/60_5family_dynamic_calc_suffix/errors/mandatories.json b/tests/results/60_5family_dynamic_calc_suffix/errors/mandatories.json index 748dd1d..217db0a 100644 --- a/tests/results/60_5family_dynamic_calc_suffix/errors/mandatories.json +++ b/tests/results/60_5family_dynamic_calc_suffix/errors/mandatories.json @@ -1,8 +1,4 @@ { - "errors": [ - "unknown option \"dynstring1\" in optiondescription \"rougail\"", - "unknown option \"dynstring2\" in optiondescription \"rougail\"", - "unknown option \"dynstring3\" in optiondescription \"rougail\"" - ], + "errors": [], "warnings": [] } \ No newline at end of file diff --git a/tests/results/60_5family_dynamic_calc_suffix/file/all.env b/tests/results/60_5family_dynamic_calc_suffix/file/all.env index d6ad12f..eecf873 100644 --- a/tests/results/60_5family_dynamic_calc_suffix/file/all.env +++ b/tests/results/60_5family_dynamic_calc_suffix/file/all.env @@ -1,5 +1,4 @@ -ROUGAIL.VAR1="string1,string2,string3" -ROUGAIL.DYNSTRING1.VAR="string1" -ROUGAIL.DYNSTRING2.VAR="string1" -ROUGAIL.DYNSTRING3.VAR="string1" +ROUGAIL.VAR1="val1,val2" +ROUGAIL.DYNVAL1.VAR="string1" +ROUGAIL.DYNVAL2.VAR="string1" ROUGAIL.VAR2="string1" diff --git a/tests/results/60_5family_dynamic_calc_suffix/file/all_exclude.env b/tests/results/60_5family_dynamic_calc_suffix/file/all_exclude.env index ce92d58..17958a1 100644 --- a/tests/results/60_5family_dynamic_calc_suffix/file/all_exclude.env +++ b/tests/results/60_5family_dynamic_calc_suffix/file/all_exclude.env @@ -1,4 +1,3 @@ -ROUGAIL.DYNSTRING1.VAR="string1" -ROUGAIL.DYNSTRING2.VAR="string1" -ROUGAIL.DYNSTRING3.VAR="string1" +ROUGAIL.DYNVAL1.VAR="string1" +ROUGAIL.DYNVAL2.VAR="string1" ROUGAIL.VAR2="string1" diff --git a/tests/results/60_5family_dynamic_calc_suffix/makedict/all.json b/tests/results/60_5family_dynamic_calc_suffix/makedict/all.json index dd2113b..9c0312b 100644 --- a/tests/results/60_5family_dynamic_calc_suffix/makedict/all.json +++ b/tests/results/60_5family_dynamic_calc_suffix/makedict/all.json @@ -1,11 +1,9 @@ { "rougail.var1": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "rougail.dynstring1.var": "string1", - "rougail.dynstring2.var": "string1", - "rougail.dynstring3.var": "string1", + "rougail.dynval1.var": "string1", + "rougail.dynval2.var": "string1", "rougail.var2": "string1" } diff --git a/tests/results/60_5family_dynamic_calc_suffix2/errors/mandatories.json b/tests/results/60_5family_dynamic_calc_suffix2/errors/mandatories.json index 748dd1d..217db0a 100644 --- a/tests/results/60_5family_dynamic_calc_suffix2/errors/mandatories.json +++ b/tests/results/60_5family_dynamic_calc_suffix2/errors/mandatories.json @@ -1,8 +1,4 @@ { - "errors": [ - "unknown option \"dynstring1\" in optiondescription \"rougail\"", - "unknown option \"dynstring2\" in optiondescription \"rougail\"", - "unknown option \"dynstring3\" in optiondescription \"rougail\"" - ], + "errors": [], "warnings": [] } \ No newline at end of file diff --git a/tests/results/60_5family_dynamic_calc_suffix2/file/all.env b/tests/results/60_5family_dynamic_calc_suffix2/file/all.env index 695b6ad..2bd697a 100644 --- a/tests/results/60_5family_dynamic_calc_suffix2/file/all.env +++ b/tests/results/60_5family_dynamic_calc_suffix2/file/all.env @@ -1,4 +1,3 @@ -ROUGAIL.VAR="string1,string2,string3" -ROUGAIL.DYNSTRING1.VAR="string1" -ROUGAIL.DYNSTRING2.VAR="string1" -ROUGAIL.DYNSTRING3.VAR="string1" +ROUGAIL.VAR="val1,val2" +ROUGAIL.DYNVAL1.VAR="string1" +ROUGAIL.DYNVAL2.VAR="string1" diff --git a/tests/results/60_5family_dynamic_calc_suffix2/file/all_exclude.env b/tests/results/60_5family_dynamic_calc_suffix2/file/all_exclude.env index 35c6349..cf6d584 100644 --- a/tests/results/60_5family_dynamic_calc_suffix2/file/all_exclude.env +++ b/tests/results/60_5family_dynamic_calc_suffix2/file/all_exclude.env @@ -1,3 +1,2 @@ -ROUGAIL.DYNSTRING1.VAR="string1" -ROUGAIL.DYNSTRING2.VAR="string1" -ROUGAIL.DYNSTRING3.VAR="string1" +ROUGAIL.DYNVAL1.VAR="string1" +ROUGAIL.DYNVAL2.VAR="string1" diff --git a/tests/results/60_5family_dynamic_calc_suffix2/makedict/all.json b/tests/results/60_5family_dynamic_calc_suffix2/makedict/all.json index 9172af2..ee96b68 100644 --- a/tests/results/60_5family_dynamic_calc_suffix2/makedict/all.json +++ b/tests/results/60_5family_dynamic_calc_suffix2/makedict/all.json @@ -1,10 +1,8 @@ { "rougail.var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "rougail.dynstring1.var": "string1", - "rougail.dynstring2.var": "string1", - "rougail.dynstring3.var": "string1" + "rougail.dynval1.var": "string1", + "rougail.dynval2.var": "string1" } diff --git a/tests/results/60_5family_dynamic_calc_suffix_param/errors/mandatories.json b/tests/results/60_5family_dynamic_calc_suffix_param/errors/mandatories.json index 748dd1d..217db0a 100644 --- a/tests/results/60_5family_dynamic_calc_suffix_param/errors/mandatories.json +++ b/tests/results/60_5family_dynamic_calc_suffix_param/errors/mandatories.json @@ -1,8 +1,4 @@ { - "errors": [ - "unknown option \"dynstring1\" in optiondescription \"rougail\"", - "unknown option \"dynstring2\" in optiondescription \"rougail\"", - "unknown option \"dynstring3\" in optiondescription \"rougail\"" - ], + "errors": [], "warnings": [] } \ No newline at end of file diff --git a/tests/results/60_5family_dynamic_calc_suffix_param/file/all.env b/tests/results/60_5family_dynamic_calc_suffix_param/file/all.env index 695b6ad..2bd697a 100644 --- a/tests/results/60_5family_dynamic_calc_suffix_param/file/all.env +++ b/tests/results/60_5family_dynamic_calc_suffix_param/file/all.env @@ -1,4 +1,3 @@ -ROUGAIL.VAR="string1,string2,string3" -ROUGAIL.DYNSTRING1.VAR="string1" -ROUGAIL.DYNSTRING2.VAR="string1" -ROUGAIL.DYNSTRING3.VAR="string1" +ROUGAIL.VAR="val1,val2" +ROUGAIL.DYNVAL1.VAR="string1" +ROUGAIL.DYNVAL2.VAR="string1" diff --git a/tests/results/60_5family_dynamic_calc_suffix_param/file/all_exclude.env b/tests/results/60_5family_dynamic_calc_suffix_param/file/all_exclude.env index 35c6349..cf6d584 100644 --- a/tests/results/60_5family_dynamic_calc_suffix_param/file/all_exclude.env +++ b/tests/results/60_5family_dynamic_calc_suffix_param/file/all_exclude.env @@ -1,3 +1,2 @@ -ROUGAIL.DYNSTRING1.VAR="string1" -ROUGAIL.DYNSTRING2.VAR="string1" -ROUGAIL.DYNSTRING3.VAR="string1" +ROUGAIL.DYNVAL1.VAR="string1" +ROUGAIL.DYNVAL2.VAR="string1" diff --git a/tests/results/60_5family_dynamic_calc_suffix_param/makedict/all.json b/tests/results/60_5family_dynamic_calc_suffix_param/makedict/all.json index 9172af2..ee96b68 100644 --- a/tests/results/60_5family_dynamic_calc_suffix_param/makedict/all.json +++ b/tests/results/60_5family_dynamic_calc_suffix_param/makedict/all.json @@ -1,10 +1,8 @@ { "rougail.var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "rougail.dynstring1.var": "string1", - "rougail.dynstring2.var": "string1", - "rougail.dynstring3.var": "string1" + "rougail.dynval1.var": "string1", + "rougail.dynval2.var": "string1" } diff --git a/tests/results/60_5family_dynamic_calc_variable/errors/mandatories.json b/tests/results/60_5family_dynamic_calc_variable/errors/mandatories.json index 748dd1d..217db0a 100644 --- a/tests/results/60_5family_dynamic_calc_variable/errors/mandatories.json +++ b/tests/results/60_5family_dynamic_calc_variable/errors/mandatories.json @@ -1,8 +1,4 @@ { - "errors": [ - "unknown option \"dynstring1\" in optiondescription \"rougail\"", - "unknown option \"dynstring2\" in optiondescription \"rougail\"", - "unknown option \"dynstring3\" in optiondescription \"rougail\"" - ], + "errors": [], "warnings": [] } \ No newline at end of file diff --git a/tests/results/60_5family_dynamic_calc_variable/file/all.env b/tests/results/60_5family_dynamic_calc_variable/file/all.env index d6ad12f..eecf873 100644 --- a/tests/results/60_5family_dynamic_calc_variable/file/all.env +++ b/tests/results/60_5family_dynamic_calc_variable/file/all.env @@ -1,5 +1,4 @@ -ROUGAIL.VAR1="string1,string2,string3" -ROUGAIL.DYNSTRING1.VAR="string1" -ROUGAIL.DYNSTRING2.VAR="string1" -ROUGAIL.DYNSTRING3.VAR="string1" +ROUGAIL.VAR1="val1,val2" +ROUGAIL.DYNVAL1.VAR="string1" +ROUGAIL.DYNVAL2.VAR="string1" ROUGAIL.VAR2="string1" diff --git a/tests/results/60_5family_dynamic_calc_variable/file/all_exclude.env b/tests/results/60_5family_dynamic_calc_variable/file/all_exclude.env index ce92d58..17958a1 100644 --- a/tests/results/60_5family_dynamic_calc_variable/file/all_exclude.env +++ b/tests/results/60_5family_dynamic_calc_variable/file/all_exclude.env @@ -1,4 +1,3 @@ -ROUGAIL.DYNSTRING1.VAR="string1" -ROUGAIL.DYNSTRING2.VAR="string1" -ROUGAIL.DYNSTRING3.VAR="string1" +ROUGAIL.DYNVAL1.VAR="string1" +ROUGAIL.DYNVAL2.VAR="string1" ROUGAIL.VAR2="string1" diff --git a/tests/results/60_5family_dynamic_calc_variable/makedict/all.json b/tests/results/60_5family_dynamic_calc_variable/makedict/all.json index dd2113b..9c0312b 100644 --- a/tests/results/60_5family_dynamic_calc_variable/makedict/all.json +++ b/tests/results/60_5family_dynamic_calc_variable/makedict/all.json @@ -1,11 +1,9 @@ { "rougail.var1": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "rougail.dynstring1.var": "string1", - "rougail.dynstring2.var": "string1", - "rougail.dynstring3.var": "string1", + "rougail.dynval1.var": "string1", + "rougail.dynval2.var": "string1", "rougail.var2": "string1" } diff --git a/tests/results/60_5family_dynamic_unknown_suffix/errors/all.json b/tests/results/60_5family_dynamic_unknown_suffix/errors/all.json index 217db0a..91c95f0 100644 --- a/tests/results/60_5family_dynamic_unknown_suffix/errors/all.json +++ b/tests/results/60_5family_dynamic_unknown_suffix/errors/all.json @@ -1,4 +1,7 @@ { - "errors": [], + "errors": [ + "cannot access to option \"rougail.val1_dyn.var4\" (a variable 4) because has property \"disabled\" (val4 is not a valid value)", + "cannot access to option \"rougail.val2_dyn.var4\" (a variable 4) because has property \"disabled\" (val4 is not a valid value)" + ], "warnings": [] } \ No newline at end of file diff --git a/tests/results/60_5family_dynamic_unknown_suffix/errors/mandatories.json b/tests/results/60_5family_dynamic_unknown_suffix/errors/mandatories.json index 3baf461..217db0a 100644 --- a/tests/results/60_5family_dynamic_unknown_suffix/errors/mandatories.json +++ b/tests/results/60_5family_dynamic_unknown_suffix/errors/mandatories.json @@ -1,15 +1,4 @@ { - "errors": [ - "cannot access to option \"rougail.val1_dyn.var4\" (a variable 4) because has property \"disabled\" (val4 is not a valid value)", - "cannot access to option \"rougail.val2_dyn.var4\" (a variable 4) because has property \"disabled\" (val4 is not a valid value)", - "unknown option \"val3_dyn\" in optiondescription \"rougail\"", - "unknown option \"val3_dyn\" in optiondescription \"rougail\"", - "unknown option \"val3_dyn\" in optiondescription \"rougail\"", - "unknown option \"val3_dyn\" in optiondescription \"rougail\"", - "unknown option \"val4_dyn\" in optiondescription \"rougail\"", - "unknown option \"val4_dyn\" in optiondescription \"rougail\"", - "unknown option \"val4_dyn\" in optiondescription \"rougail\"", - "unknown option \"val4_dyn\" in optiondescription \"rougail\"" - ], + "errors": [], "warnings": [] } \ No newline at end of file diff --git a/tests/results/60_5family_dynamic_unknown_suffix/file/all.env b/tests/results/60_5family_dynamic_unknown_suffix/file/all.env index 88cc28c..a7dc0b1 100644 --- a/tests/results/60_5family_dynamic_unknown_suffix/file/all.env +++ b/tests/results/60_5family_dynamic_unknown_suffix/file/all.env @@ -1,4 +1,4 @@ -ROUGAIL.VAR="val1,val2,val3,val4" +ROUGAIL.VAR="val1,val2" ROUGAIL.VAL1_DYN.VAR1="string1" ROUGAIL.VAL1_DYN.VAR2="string1" ROUGAIL.VAL1_DYN.VAR3="string1" @@ -7,11 +7,3 @@ ROUGAIL.VAL2_DYN.VAR1="string1" ROUGAIL.VAL2_DYN.VAR2="string1" ROUGAIL.VAL2_DYN.VAR3="string1" ROUGAIL.VAL2_DYN.VAR4="string1" -ROUGAIL.VAL3_DYN.VAR1="string1" -ROUGAIL.VAL3_DYN.VAR2="string1" -ROUGAIL.VAL3_DYN.VAR3="string1" -ROUGAIL.VAL3_DYN.VAR4="string1" -ROUGAIL.VAL4_DYN.VAR1="string1" -ROUGAIL.VAL4_DYN.VAR2="string1" -ROUGAIL.VAL4_DYN.VAR3="string1" -ROUGAIL.VAL4_DYN.VAR4="string1" diff --git a/tests/results/60_5family_dynamic_unknown_suffix/file/all_exclude.env b/tests/results/60_5family_dynamic_unknown_suffix/file/all_exclude.env index 86a8573..46a22f5 100644 --- a/tests/results/60_5family_dynamic_unknown_suffix/file/all_exclude.env +++ b/tests/results/60_5family_dynamic_unknown_suffix/file/all_exclude.env @@ -6,11 +6,3 @@ ROUGAIL.VAL2_DYN.VAR1="string1" ROUGAIL.VAL2_DYN.VAR2="string1" ROUGAIL.VAL2_DYN.VAR3="string1" ROUGAIL.VAL2_DYN.VAR4="string1" -ROUGAIL.VAL3_DYN.VAR1="string1" -ROUGAIL.VAL3_DYN.VAR2="string1" -ROUGAIL.VAL3_DYN.VAR3="string1" -ROUGAIL.VAL3_DYN.VAR4="string1" -ROUGAIL.VAL4_DYN.VAR1="string1" -ROUGAIL.VAL4_DYN.VAR2="string1" -ROUGAIL.VAL4_DYN.VAR3="string1" -ROUGAIL.VAL4_DYN.VAR4="string1" diff --git a/tests/results/60_5family_dynamic_unknown_suffix/makedict/all.json b/tests/results/60_5family_dynamic_unknown_suffix/makedict/all.json index 73d23d4..efe7876 100644 --- a/tests/results/60_5family_dynamic_unknown_suffix/makedict/all.json +++ b/tests/results/60_5family_dynamic_unknown_suffix/makedict/all.json @@ -1,24 +1,12 @@ { "rougail.var": [ "val1", - "val2", - "val3", - "val4" + "val2" ], "rougail.val1_dyn.var1": "string1", "rougail.val1_dyn.var2": "string1", "rougail.val1_dyn.var3": "string1", - "rougail.val1_dyn.var4": "string1", "rougail.val2_dyn.var1": "string1", "rougail.val2_dyn.var2": "string1", - "rougail.val2_dyn.var3": "string1", - "rougail.val2_dyn.var4": "string1", - "rougail.val3_dyn.var1": "string1", - "rougail.val3_dyn.var2": "string1", - "rougail.val3_dyn.var3": "string1", - "rougail.val3_dyn.var4": "string1", - "rougail.val4_dyn.var1": "string1", - "rougail.val4_dyn.var2": "string1", - "rougail.val4_dyn.var3": "string1", - "rougail.val4_dyn.var4": "string1" + "rougail.val2_dyn.var3": "string1" } diff --git a/tests/results/60_5family_dynamic_variable_outside/errors/mandatories.json b/tests/results/60_5family_dynamic_variable_outside/errors/mandatories.json index 67af2b7..217db0a 100644 --- a/tests/results/60_5family_dynamic_variable_outside/errors/mandatories.json +++ b/tests/results/60_5family_dynamic_variable_outside/errors/mandatories.json @@ -1,8 +1,4 @@ { - "errors": [ - "unknown option \"my_dyn_family_string1\" in optiondescription \"rougail\"", - "unknown option \"my_dyn_family_string2\" in optiondescription \"rougail\"", - "unknown option \"my_dyn_family_string3\" in optiondescription \"rougail\"" - ], + "errors": [], "warnings": [] } \ No newline at end of file diff --git a/tests/results/60_5family_dynamic_variable_outside/file/all.env b/tests/results/60_5family_dynamic_variable_outside/file/all.env index 14a3545..dbc5b48 100644 --- a/tests/results/60_5family_dynamic_variable_outside/file/all.env +++ b/tests/results/60_5family_dynamic_variable_outside/file/all.env @@ -1,5 +1,4 @@ -ROUGAIL.VAR="string1,string2,string3" -ROUGAIL.MY_DYN_FAMILY_STRING1.VAR="string1" -ROUGAIL.MY_DYN_FAMILY_STRING2.VAR="string1" -ROUGAIL.MY_DYN_FAMILY_STRING3.VAR="string1" +ROUGAIL.VAR="val1,val2" +ROUGAIL.MY_DYN_FAMILY_VAL1.VAR="string1" +ROUGAIL.MY_DYN_FAMILY_VAL2.VAR="string1" ROUGAIL.VAR2="string1,string2,string3" diff --git a/tests/results/60_5family_dynamic_variable_outside/file/all_exclude.env b/tests/results/60_5family_dynamic_variable_outside/file/all_exclude.env index 153ea81..e71b7f5 100644 --- a/tests/results/60_5family_dynamic_variable_outside/file/all_exclude.env +++ b/tests/results/60_5family_dynamic_variable_outside/file/all_exclude.env @@ -1,4 +1,3 @@ -ROUGAIL.MY_DYN_FAMILY_STRING1.VAR="string1" -ROUGAIL.MY_DYN_FAMILY_STRING2.VAR="string1" -ROUGAIL.MY_DYN_FAMILY_STRING3.VAR="string1" +ROUGAIL.MY_DYN_FAMILY_VAL1.VAR="string1" +ROUGAIL.MY_DYN_FAMILY_VAL2.VAR="string1" ROUGAIL.VAR2="string1,string2,string3" diff --git a/tests/results/60_5family_dynamic_variable_outside/makedict/all.json b/tests/results/60_5family_dynamic_variable_outside/makedict/all.json index 8485e7b..4aecf75 100644 --- a/tests/results/60_5family_dynamic_variable_outside/makedict/all.json +++ b/tests/results/60_5family_dynamic_variable_outside/makedict/all.json @@ -1,12 +1,10 @@ { "rougail.var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "rougail.my_dyn_family_string1.var": "string1", - "rougail.my_dyn_family_string2.var": "string1", - "rougail.my_dyn_family_string3.var": "string1", + "rougail.my_dyn_family_val1.var": "string1", + "rougail.my_dyn_family_val2.var": "string1", "rougail.var2": [ "string1", "string2", diff --git a/tests/results/60_5family_dynamic_variable_outside2/errors/mandatories.json b/tests/results/60_5family_dynamic_variable_outside2/errors/mandatories.json index 67af2b7..217db0a 100644 --- a/tests/results/60_5family_dynamic_variable_outside2/errors/mandatories.json +++ b/tests/results/60_5family_dynamic_variable_outside2/errors/mandatories.json @@ -1,8 +1,4 @@ { - "errors": [ - "unknown option \"my_dyn_family_string1\" in optiondescription \"rougail\"", - "unknown option \"my_dyn_family_string2\" in optiondescription \"rougail\"", - "unknown option \"my_dyn_family_string3\" in optiondescription \"rougail\"" - ], + "errors": [], "warnings": [] } \ No newline at end of file diff --git a/tests/results/60_5family_dynamic_variable_outside2/file/all.env b/tests/results/60_5family_dynamic_variable_outside2/file/all.env index b829bb4..821376b 100644 --- a/tests/results/60_5family_dynamic_variable_outside2/file/all.env +++ b/tests/results/60_5family_dynamic_variable_outside2/file/all.env @@ -1,5 +1,4 @@ ROUGAIL.VAR2="string1,string2,string3" -ROUGAIL.VAR="string1,string2,string3" -ROUGAIL.MY_DYN_FAMILY_STRING1.VAR="string1" -ROUGAIL.MY_DYN_FAMILY_STRING2.VAR="string1" -ROUGAIL.MY_DYN_FAMILY_STRING3.VAR="string1" +ROUGAIL.VAR="val1,val2" +ROUGAIL.MY_DYN_FAMILY_VAL1.VAR="string1" +ROUGAIL.MY_DYN_FAMILY_VAL2.VAR="string1" diff --git a/tests/results/60_5family_dynamic_variable_outside2/file/all_exclude.env b/tests/results/60_5family_dynamic_variable_outside2/file/all_exclude.env index 48b461b..d619c35 100644 --- a/tests/results/60_5family_dynamic_variable_outside2/file/all_exclude.env +++ b/tests/results/60_5family_dynamic_variable_outside2/file/all_exclude.env @@ -1,4 +1,3 @@ ROUGAIL.VAR2="string1,string2,string3" -ROUGAIL.MY_DYN_FAMILY_STRING1.VAR="string1" -ROUGAIL.MY_DYN_FAMILY_STRING2.VAR="string1" -ROUGAIL.MY_DYN_FAMILY_STRING3.VAR="string1" +ROUGAIL.MY_DYN_FAMILY_VAL1.VAR="string1" +ROUGAIL.MY_DYN_FAMILY_VAL2.VAR="string1" diff --git a/tests/results/60_5family_dynamic_variable_outside2/makedict/all.json b/tests/results/60_5family_dynamic_variable_outside2/makedict/all.json index aaffcb3..828bc63 100644 --- a/tests/results/60_5family_dynamic_variable_outside2/makedict/all.json +++ b/tests/results/60_5family_dynamic_variable_outside2/makedict/all.json @@ -5,11 +5,9 @@ "string3" ], "rougail.var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "rougail.my_dyn_family_string1.var": "string1", - "rougail.my_dyn_family_string2.var": "string1", - "rougail.my_dyn_family_string3.var": "string1" + "rougail.my_dyn_family_val1.var": "string1", + "rougail.my_dyn_family_val2.var": "string1" } diff --git a/tests/results/60_5family_dynamic_variable_outside2_empty/errors/all.json b/tests/results/60_5family_dynamic_variable_outside2_empty/errors/all.json index 67af2b7..217db0a 100644 --- a/tests/results/60_5family_dynamic_variable_outside2_empty/errors/all.json +++ b/tests/results/60_5family_dynamic_variable_outside2_empty/errors/all.json @@ -1,8 +1,4 @@ { - "errors": [ - "unknown option \"my_dyn_family_string1\" in optiondescription \"rougail\"", - "unknown option \"my_dyn_family_string2\" in optiondescription \"rougail\"", - "unknown option \"my_dyn_family_string3\" in optiondescription \"rougail\"" - ], + "errors": [], "warnings": [] } \ No newline at end of file diff --git a/tests/results/60_5family_dynamic_variable_outside_jinja/errors/mandatories.json b/tests/results/60_5family_dynamic_variable_outside_jinja/errors/mandatories.json index 67af2b7..217db0a 100644 --- a/tests/results/60_5family_dynamic_variable_outside_jinja/errors/mandatories.json +++ b/tests/results/60_5family_dynamic_variable_outside_jinja/errors/mandatories.json @@ -1,8 +1,4 @@ { - "errors": [ - "unknown option \"my_dyn_family_string1\" in optiondescription \"rougail\"", - "unknown option \"my_dyn_family_string2\" in optiondescription \"rougail\"", - "unknown option \"my_dyn_family_string3\" in optiondescription \"rougail\"" - ], + "errors": [], "warnings": [] } \ No newline at end of file diff --git a/tests/results/60_5family_dynamic_variable_outside_jinja/file/all.env b/tests/results/60_5family_dynamic_variable_outside_jinja/file/all.env index 14a3545..dbc5b48 100644 --- a/tests/results/60_5family_dynamic_variable_outside_jinja/file/all.env +++ b/tests/results/60_5family_dynamic_variable_outside_jinja/file/all.env @@ -1,5 +1,4 @@ -ROUGAIL.VAR="string1,string2,string3" -ROUGAIL.MY_DYN_FAMILY_STRING1.VAR="string1" -ROUGAIL.MY_DYN_FAMILY_STRING2.VAR="string1" -ROUGAIL.MY_DYN_FAMILY_STRING3.VAR="string1" +ROUGAIL.VAR="val1,val2" +ROUGAIL.MY_DYN_FAMILY_VAL1.VAR="string1" +ROUGAIL.MY_DYN_FAMILY_VAL2.VAR="string1" ROUGAIL.VAR2="string1,string2,string3" diff --git a/tests/results/60_5family_dynamic_variable_outside_jinja/file/all_exclude.env b/tests/results/60_5family_dynamic_variable_outside_jinja/file/all_exclude.env index 153ea81..e71b7f5 100644 --- a/tests/results/60_5family_dynamic_variable_outside_jinja/file/all_exclude.env +++ b/tests/results/60_5family_dynamic_variable_outside_jinja/file/all_exclude.env @@ -1,4 +1,3 @@ -ROUGAIL.MY_DYN_FAMILY_STRING1.VAR="string1" -ROUGAIL.MY_DYN_FAMILY_STRING2.VAR="string1" -ROUGAIL.MY_DYN_FAMILY_STRING3.VAR="string1" +ROUGAIL.MY_DYN_FAMILY_VAL1.VAR="string1" +ROUGAIL.MY_DYN_FAMILY_VAL2.VAR="string1" ROUGAIL.VAR2="string1,string2,string3" diff --git a/tests/results/60_5family_dynamic_variable_outside_jinja/makedict/all.json b/tests/results/60_5family_dynamic_variable_outside_jinja/makedict/all.json index 8485e7b..4aecf75 100644 --- a/tests/results/60_5family_dynamic_variable_outside_jinja/makedict/all.json +++ b/tests/results/60_5family_dynamic_variable_outside_jinja/makedict/all.json @@ -1,12 +1,10 @@ { "rougail.var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "rougail.my_dyn_family_string1.var": "string1", - "rougail.my_dyn_family_string2.var": "string1", - "rougail.my_dyn_family_string3.var": "string1", + "rougail.my_dyn_family_val1.var": "string1", + "rougail.my_dyn_family_val2.var": "string1", "rougail.var2": [ "string1", "string2", diff --git a/tests/results/60_5family_dynamic_variable_outside_jinja_empty/errors/all.json b/tests/results/60_5family_dynamic_variable_outside_jinja_empty/errors/all.json index 67af2b7..217db0a 100644 --- a/tests/results/60_5family_dynamic_variable_outside_jinja_empty/errors/all.json +++ b/tests/results/60_5family_dynamic_variable_outside_jinja_empty/errors/all.json @@ -1,8 +1,4 @@ { - "errors": [ - "unknown option \"my_dyn_family_string1\" in optiondescription \"rougail\"", - "unknown option \"my_dyn_family_string2\" in optiondescription \"rougail\"", - "unknown option \"my_dyn_family_string3\" in optiondescription \"rougail\"" - ], + "errors": [], "warnings": [] } \ No newline at end of file diff --git a/tests/results/60_5family_dynamic_variable_outside_sub_suffix/errors/all.json b/tests/results/60_5family_dynamic_variable_outside_sub_suffix/errors/all.json index 5e3fa36..217db0a 100644 --- a/tests/results/60_5family_dynamic_variable_outside_sub_suffix/errors/all.json +++ b/tests/results/60_5family_dynamic_variable_outside_sub_suffix/errors/all.json @@ -1,7 +1,4 @@ { - "errors": [ - "unknown option \"my_dyn_family_val1\" in optiondescription \"rougail\"", - "unknown option \"my_dyn_family_val2\" in optiondescription \"rougail\"" - ], + "errors": [], "warnings": [] } \ No newline at end of file diff --git a/tests/results/60_5family_dynamic_variable_outside_sub_suffix/errors/mandatories.json b/tests/results/60_5family_dynamic_variable_outside_sub_suffix/errors/mandatories.json index 00a091e..217db0a 100644 --- a/tests/results/60_5family_dynamic_variable_outside_sub_suffix/errors/mandatories.json +++ b/tests/results/60_5family_dynamic_variable_outside_sub_suffix/errors/mandatories.json @@ -1,14 +1,4 @@ { - "errors": [ - "unknown option \"my_dyn_family_string1\" in optiondescription \"rougail\"", - "unknown option \"my_dyn_family_string1\" in optiondescription \"rougail\"", - "unknown option \"my_dyn_family_string1\" in optiondescription \"rougail\"", - "unknown option \"my_dyn_family_string2\" in optiondescription \"rougail\"", - "unknown option \"my_dyn_family_string2\" in optiondescription \"rougail\"", - "unknown option \"my_dyn_family_string2\" in optiondescription \"rougail\"", - "unknown option \"my_dyn_family_string3\" in optiondescription \"rougail\"", - "unknown option \"my_dyn_family_string3\" in optiondescription \"rougail\"", - "unknown option \"my_dyn_family_string3\" in optiondescription \"rougail\"" - ], + "errors": [], "warnings": [] } \ No newline at end of file diff --git a/tests/results/60_5family_dynamic_variable_outside_sub_suffix/file/all.env b/tests/results/60_5family_dynamic_variable_outside_sub_suffix/file/all.env index a2ec0d6..ad7fd05 100644 --- a/tests/results/60_5family_dynamic_variable_outside_sub_suffix/file/all.env +++ b/tests/results/60_5family_dynamic_variable_outside_sub_suffix/file/all.env @@ -1,11 +1,6 @@ -ROUGAIL.VAR="string1,string2,string3" -ROUGAIL.MY_DYN_FAMILY_STRING1.SUBDYN_STRING1.VAR="string1" -ROUGAIL.MY_DYN_FAMILY_STRING1.SUBDYN_STRING2.VAR="string1" -ROUGAIL.MY_DYN_FAMILY_STRING1.SUBDYN_STRING3.VAR="string1" -ROUGAIL.MY_DYN_FAMILY_STRING2.SUBDYN_STRING1.VAR="string1" -ROUGAIL.MY_DYN_FAMILY_STRING2.SUBDYN_STRING2.VAR="string1" -ROUGAIL.MY_DYN_FAMILY_STRING2.SUBDYN_STRING3.VAR="string1" -ROUGAIL.MY_DYN_FAMILY_STRING3.SUBDYN_STRING1.VAR="string1" -ROUGAIL.MY_DYN_FAMILY_STRING3.SUBDYN_STRING2.VAR="string1" -ROUGAIL.MY_DYN_FAMILY_STRING3.SUBDYN_STRING3.VAR="string1" +ROUGAIL.VAR="val1,val2" +ROUGAIL.MY_DYN_FAMILY_VAL1.SUBDYN_VAL1.VAR="string1" +ROUGAIL.MY_DYN_FAMILY_VAL1.SUBDYN_VAL2.VAR="string1" +ROUGAIL.MY_DYN_FAMILY_VAL2.SUBDYN_VAL1.VAR="string1" +ROUGAIL.MY_DYN_FAMILY_VAL2.SUBDYN_VAL2.VAR="string1" ROUGAIL.VAR2="string1,string2,string3" diff --git a/tests/results/60_5family_dynamic_variable_outside_sub_suffix/file/all_exclude.env b/tests/results/60_5family_dynamic_variable_outside_sub_suffix/file/all_exclude.env index f5ab831..8ea6d41 100644 --- a/tests/results/60_5family_dynamic_variable_outside_sub_suffix/file/all_exclude.env +++ b/tests/results/60_5family_dynamic_variable_outside_sub_suffix/file/all_exclude.env @@ -1,10 +1,5 @@ -ROUGAIL.MY_DYN_FAMILY_STRING1.SUBDYN_STRING1.VAR="string1" -ROUGAIL.MY_DYN_FAMILY_STRING1.SUBDYN_STRING2.VAR="string1" -ROUGAIL.MY_DYN_FAMILY_STRING1.SUBDYN_STRING3.VAR="string1" -ROUGAIL.MY_DYN_FAMILY_STRING2.SUBDYN_STRING1.VAR="string1" -ROUGAIL.MY_DYN_FAMILY_STRING2.SUBDYN_STRING2.VAR="string1" -ROUGAIL.MY_DYN_FAMILY_STRING2.SUBDYN_STRING3.VAR="string1" -ROUGAIL.MY_DYN_FAMILY_STRING3.SUBDYN_STRING1.VAR="string1" -ROUGAIL.MY_DYN_FAMILY_STRING3.SUBDYN_STRING2.VAR="string1" -ROUGAIL.MY_DYN_FAMILY_STRING3.SUBDYN_STRING3.VAR="string1" +ROUGAIL.MY_DYN_FAMILY_VAL1.SUBDYN_VAL1.VAR="string1" +ROUGAIL.MY_DYN_FAMILY_VAL1.SUBDYN_VAL2.VAR="string1" +ROUGAIL.MY_DYN_FAMILY_VAL2.SUBDYN_VAL1.VAR="string1" +ROUGAIL.MY_DYN_FAMILY_VAL2.SUBDYN_VAL2.VAR="string1" ROUGAIL.VAR2="string1,string2,string3" diff --git a/tests/results/60_5family_dynamic_variable_outside_sub_suffix/makedict/all.json b/tests/results/60_5family_dynamic_variable_outside_sub_suffix/makedict/all.json index d6332b0..316604c 100644 --- a/tests/results/60_5family_dynamic_variable_outside_sub_suffix/makedict/all.json +++ b/tests/results/60_5family_dynamic_variable_outside_sub_suffix/makedict/all.json @@ -1,18 +1,12 @@ { "rougail.var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "rougail.my_dyn_family_string1.subdyn_string1.var": "string1", - "rougail.my_dyn_family_string1.subdyn_string2.var": "string1", - "rougail.my_dyn_family_string1.subdyn_string3.var": "string1", - "rougail.my_dyn_family_string2.subdyn_string1.var": "string1", - "rougail.my_dyn_family_string2.subdyn_string2.var": "string1", - "rougail.my_dyn_family_string2.subdyn_string3.var": "string1", - "rougail.my_dyn_family_string3.subdyn_string1.var": "string1", - "rougail.my_dyn_family_string3.subdyn_string2.var": "string1", - "rougail.my_dyn_family_string3.subdyn_string3.var": "string1", + "rougail.my_dyn_family_val1.subdyn_val1.var": "string1", + "rougail.my_dyn_family_val1.subdyn_val2.var": "string1", + "rougail.my_dyn_family_val2.subdyn_val1.var": "string1", + "rougail.my_dyn_family_val2.subdyn_val2.var": "string1", "rougail.var2": [ "string1", "string2", diff --git a/tests/results/60_5family_dynamic_variable_outside_sub_suffix_empty/errors/all.json b/tests/results/60_5family_dynamic_variable_outside_sub_suffix_empty/errors/all.json index 00a091e..217db0a 100644 --- a/tests/results/60_5family_dynamic_variable_outside_sub_suffix_empty/errors/all.json +++ b/tests/results/60_5family_dynamic_variable_outside_sub_suffix_empty/errors/all.json @@ -1,14 +1,4 @@ { - "errors": [ - "unknown option \"my_dyn_family_string1\" in optiondescription \"rougail\"", - "unknown option \"my_dyn_family_string1\" in optiondescription \"rougail\"", - "unknown option \"my_dyn_family_string1\" in optiondescription \"rougail\"", - "unknown option \"my_dyn_family_string2\" in optiondescription \"rougail\"", - "unknown option \"my_dyn_family_string2\" in optiondescription \"rougail\"", - "unknown option \"my_dyn_family_string2\" in optiondescription \"rougail\"", - "unknown option \"my_dyn_family_string3\" in optiondescription \"rougail\"", - "unknown option \"my_dyn_family_string3\" in optiondescription \"rougail\"", - "unknown option \"my_dyn_family_string3\" in optiondescription \"rougail\"" - ], + "errors": [], "warnings": [] } \ No newline at end of file diff --git a/tests/results/60_5family_dynamic_variable_outside_suffix/errors/all.json b/tests/results/60_5family_dynamic_variable_outside_suffix/errors/all.json index 6315c24..217db0a 100644 --- a/tests/results/60_5family_dynamic_variable_outside_suffix/errors/all.json +++ b/tests/results/60_5family_dynamic_variable_outside_suffix/errors/all.json @@ -1,9 +1,4 @@ { - "errors": [ - "unknown option \"my_dyn_family_val1\" in optiondescription \"rougail\"", - "unknown option \"my_dyn_family_val1\" in optiondescription \"rougail\"", - "unknown option \"my_dyn_family_val2\" in optiondescription \"rougail\"", - "unknown option \"my_dyn_family_val2\" in optiondescription \"rougail\"" - ], + "errors": [], "warnings": [] } \ No newline at end of file diff --git a/tests/results/60_5family_dynamic_variable_outside_suffix/errors/mandatories.json b/tests/results/60_5family_dynamic_variable_outside_suffix/errors/mandatories.json index 6315c24..217db0a 100644 --- a/tests/results/60_5family_dynamic_variable_outside_suffix/errors/mandatories.json +++ b/tests/results/60_5family_dynamic_variable_outside_suffix/errors/mandatories.json @@ -1,9 +1,4 @@ { - "errors": [ - "unknown option \"my_dyn_family_val1\" in optiondescription \"rougail\"", - "unknown option \"my_dyn_family_val1\" in optiondescription \"rougail\"", - "unknown option \"my_dyn_family_val2\" in optiondescription \"rougail\"", - "unknown option \"my_dyn_family_val2\" in optiondescription \"rougail\"" - ], + "errors": [], "warnings": [] } \ No newline at end of file diff --git a/tests/results/60_5family_dynamic_variable_outside_suffix/file/all.env b/tests/results/60_5family_dynamic_variable_outside_suffix/file/all.env index dadcc49..72a1683 100644 --- a/tests/results/60_5family_dynamic_variable_outside_suffix/file/all.env +++ b/tests/results/60_5family_dynamic_variable_outside_suffix/file/all.env @@ -1,5 +1,4 @@ -ROUGAIL.VAR="string1,string2,string3" -ROUGAIL.DYN_STRING1.VAR="string1" -ROUGAIL.DYN_STRING2.VAR="string1" -ROUGAIL.DYN_STRING3.VAR="string1" +ROUGAIL.VAR="val1,val2" +ROUGAIL.DYN_VAL1.VAR="string1" +ROUGAIL.DYN_VAL2.VAR="string1" ROUGAIL.VAR2="string1" diff --git a/tests/results/60_5family_dynamic_variable_outside_suffix/file/all_exclude.env b/tests/results/60_5family_dynamic_variable_outside_suffix/file/all_exclude.env index a57d08c..9fa1365 100644 --- a/tests/results/60_5family_dynamic_variable_outside_suffix/file/all_exclude.env +++ b/tests/results/60_5family_dynamic_variable_outside_suffix/file/all_exclude.env @@ -1,4 +1,3 @@ -ROUGAIL.DYN_STRING1.VAR="string1" -ROUGAIL.DYN_STRING2.VAR="string1" -ROUGAIL.DYN_STRING3.VAR="string1" +ROUGAIL.DYN_VAL1.VAR="string1" +ROUGAIL.DYN_VAL2.VAR="string1" ROUGAIL.VAR2="string1" diff --git a/tests/results/60_5family_dynamic_variable_outside_suffix/makedict/all.json b/tests/results/60_5family_dynamic_variable_outside_suffix/makedict/all.json index 3c1ac5c..d7e0644 100644 --- a/tests/results/60_5family_dynamic_variable_outside_suffix/makedict/all.json +++ b/tests/results/60_5family_dynamic_variable_outside_suffix/makedict/all.json @@ -1,11 +1,9 @@ { "rougail.var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "rougail.dyn_string1.var": "string1", - "rougail.dyn_string2.var": "string1", - "rougail.dyn_string3.var": "string1", + "rougail.dyn_val1.var": "string1", + "rougail.dyn_val2.var": "string1", "rougail.var2": "string1" } diff --git a/tests/results/60_5family_dynamic_variable_outside_suffix_empty/errors/all.json b/tests/results/60_5family_dynamic_variable_outside_suffix_empty/errors/all.json index e91f117..217db0a 100644 --- a/tests/results/60_5family_dynamic_variable_outside_suffix_empty/errors/all.json +++ b/tests/results/60_5family_dynamic_variable_outside_suffix_empty/errors/all.json @@ -1,11 +1,4 @@ { - "errors": [ - "unknown option \"my_dyn_family_val1\" in optiondescription \"rougail\"", - "unknown option \"my_dyn_family_val1\" in optiondescription \"rougail\"", - "unknown option \"my_dyn_family_val2\" in optiondescription \"rougail\"", - "unknown option \"my_dyn_family_val2\" in optiondescription \"rougail\"", - "unknown option \"dyn_val1\" in optiondescription \"rougail\"", - "unknown option \"dyn_val2\" in optiondescription \"rougail\"" - ], + "errors": [], "warnings": [] } \ No newline at end of file diff --git a/tests/results/60_5family_dynamic_variable_outside_suffix_empty/errors/mandatories.json b/tests/results/60_5family_dynamic_variable_outside_suffix_empty/errors/mandatories.json index e91f117..217db0a 100644 --- a/tests/results/60_5family_dynamic_variable_outside_suffix_empty/errors/mandatories.json +++ b/tests/results/60_5family_dynamic_variable_outside_suffix_empty/errors/mandatories.json @@ -1,11 +1,4 @@ { - "errors": [ - "unknown option \"my_dyn_family_val1\" in optiondescription \"rougail\"", - "unknown option \"my_dyn_family_val1\" in optiondescription \"rougail\"", - "unknown option \"my_dyn_family_val2\" in optiondescription \"rougail\"", - "unknown option \"my_dyn_family_val2\" in optiondescription \"rougail\"", - "unknown option \"dyn_val1\" in optiondescription \"rougail\"", - "unknown option \"dyn_val2\" in optiondescription \"rougail\"" - ], + "errors": [], "warnings": [] } \ No newline at end of file diff --git a/tests/results/60_6family_dynamic_inside/errors/all.json b/tests/results/60_6family_dynamic_inside/errors/all.json index fc62ed1..217db0a 100644 --- a/tests/results/60_6family_dynamic_inside/errors/all.json +++ b/tests/results/60_6family_dynamic_inside/errors/all.json @@ -1,15 +1,4 @@ { - "errors": [ - "unknown option \"my_dyn_family_val1\" in optiondescription \"rougail\"", - "unknown option \"my_dyn_family_val1\" in optiondescription \"rougail\"", - "unknown option \"my_dyn_family_val2\" in optiondescription \"rougail\"", - "unknown option \"my_dyn_family_val2\" in optiondescription \"rougail\"", - "unknown option \"var2\" in optiondescription \"rougail\"", - "unknown option \"dyn_string1\" in optiondescription \"rougail\"", - "unknown option \"dyn_string2\" in optiondescription \"rougail\"", - "unknown option \"dyn_string3\" in optiondescription \"rougail\"", - "unknown option \"dyn_val1\" in optiondescription \"rougail\"", - "unknown option \"dyn_val2\" in optiondescription \"rougail\"" - ], + "errors": [], "warnings": [] } \ No newline at end of file diff --git a/tests/results/60_6family_dynamic_inside/errors/mandatories.json b/tests/results/60_6family_dynamic_inside/errors/mandatories.json index 3862f0b..217db0a 100644 --- a/tests/results/60_6family_dynamic_inside/errors/mandatories.json +++ b/tests/results/60_6family_dynamic_inside/errors/mandatories.json @@ -1,17 +1,4 @@ { - "errors": [ - "unknown option \"string1_dyn\" in optiondescription \"rougail\"", - "unknown option \"string1_dyn\" in optiondescription \"rougail\"", - "unknown option \"string1_dyn\" in optiondescription \"rougail\"", - "unknown option \"string1_dyn\" in optiondescription \"rougail\"", - "unknown option \"string2_dyn\" in optiondescription \"rougail\"", - "unknown option \"string2_dyn\" in optiondescription \"rougail\"", - "unknown option \"string2_dyn\" in optiondescription \"rougail\"", - "unknown option \"string2_dyn\" in optiondescription \"rougail\"", - "unknown option \"string3_dyn\" in optiondescription \"rougail\"", - "unknown option \"string3_dyn\" in optiondescription \"rougail\"", - "unknown option \"string3_dyn\" in optiondescription \"rougail\"", - "unknown option \"string3_dyn\" in optiondescription \"rougail\"" - ], + "errors": [], "warnings": [] } \ No newline at end of file diff --git a/tests/results/60_6family_dynamic_inside/file/all.env b/tests/results/60_6family_dynamic_inside/file/all.env index 9d25cd5..a7dc0b1 100644 --- a/tests/results/60_6family_dynamic_inside/file/all.env +++ b/tests/results/60_6family_dynamic_inside/file/all.env @@ -1,13 +1,9 @@ -ROUGAIL.VAR="string1,string2,string3" -ROUGAIL.STRING1_DYN.VAR1="string1" -ROUGAIL.STRING1_DYN.VAR2="string1" -ROUGAIL.STRING1_DYN.VAR3="string1" -ROUGAIL.STRING1_DYN.VAR4="string1" -ROUGAIL.STRING2_DYN.VAR1="string1" -ROUGAIL.STRING2_DYN.VAR2="string1" -ROUGAIL.STRING2_DYN.VAR3="string1" -ROUGAIL.STRING2_DYN.VAR4="string1" -ROUGAIL.STRING3_DYN.VAR1="string1" -ROUGAIL.STRING3_DYN.VAR2="string1" -ROUGAIL.STRING3_DYN.VAR3="string1" -ROUGAIL.STRING3_DYN.VAR4="string1" +ROUGAIL.VAR="val1,val2" +ROUGAIL.VAL1_DYN.VAR1="string1" +ROUGAIL.VAL1_DYN.VAR2="string1" +ROUGAIL.VAL1_DYN.VAR3="string1" +ROUGAIL.VAL1_DYN.VAR4="string1" +ROUGAIL.VAL2_DYN.VAR1="string1" +ROUGAIL.VAL2_DYN.VAR2="string1" +ROUGAIL.VAL2_DYN.VAR3="string1" +ROUGAIL.VAL2_DYN.VAR4="string1" diff --git a/tests/results/60_6family_dynamic_inside/file/all_exclude.env b/tests/results/60_6family_dynamic_inside/file/all_exclude.env index 539825c..46a22f5 100644 --- a/tests/results/60_6family_dynamic_inside/file/all_exclude.env +++ b/tests/results/60_6family_dynamic_inside/file/all_exclude.env @@ -1,12 +1,8 @@ -ROUGAIL.STRING1_DYN.VAR1="string1" -ROUGAIL.STRING1_DYN.VAR2="string1" -ROUGAIL.STRING1_DYN.VAR3="string1" -ROUGAIL.STRING1_DYN.VAR4="string1" -ROUGAIL.STRING2_DYN.VAR1="string1" -ROUGAIL.STRING2_DYN.VAR2="string1" -ROUGAIL.STRING2_DYN.VAR3="string1" -ROUGAIL.STRING2_DYN.VAR4="string1" -ROUGAIL.STRING3_DYN.VAR1="string1" -ROUGAIL.STRING3_DYN.VAR2="string1" -ROUGAIL.STRING3_DYN.VAR3="string1" -ROUGAIL.STRING3_DYN.VAR4="string1" +ROUGAIL.VAL1_DYN.VAR1="string1" +ROUGAIL.VAL1_DYN.VAR2="string1" +ROUGAIL.VAL1_DYN.VAR3="string1" +ROUGAIL.VAL1_DYN.VAR4="string1" +ROUGAIL.VAL2_DYN.VAR1="string1" +ROUGAIL.VAL2_DYN.VAR2="string1" +ROUGAIL.VAL2_DYN.VAR3="string1" +ROUGAIL.VAL2_DYN.VAR4="string1" diff --git a/tests/results/60_6family_dynamic_inside/makedict/all.json b/tests/results/60_6family_dynamic_inside/makedict/all.json index 8c4b7af..7225362 100644 --- a/tests/results/60_6family_dynamic_inside/makedict/all.json +++ b/tests/results/60_6family_dynamic_inside/makedict/all.json @@ -1,19 +1,14 @@ { "rougail.var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "rougail.string1_dyn.var1": "string1", - "rougail.string1_dyn.var2": "string1", - "rougail.string1_dyn.var3": "string1", - "rougail.string1_dyn.var4": "string1", - "rougail.string2_dyn.var1": "string1", - "rougail.string2_dyn.var2": "string1", - "rougail.string2_dyn.var3": "string1", - "rougail.string2_dyn.var4": "string1", - "rougail.string3_dyn.var1": "string1", - "rougail.string3_dyn.var2": "string1", - "rougail.string3_dyn.var3": "string1", - "rougail.string3_dyn.var4": "string1" + "rougail.val1_dyn.var1": "string1", + "rougail.val1_dyn.var2": "string1", + "rougail.val1_dyn.var3": "string1", + "rougail.val1_dyn.var4": "string1", + "rougail.val2_dyn.var1": "string1", + "rougail.val2_dyn.var2": "string1", + "rougail.val2_dyn.var3": "string1", + "rougail.val2_dyn.var4": "string1" } diff --git a/tests/results/60_6family_dynamic_leadership/errors/mandatories.json b/tests/results/60_6family_dynamic_leadership/errors/mandatories.json index 1a07f0f..217db0a 100644 --- a/tests/results/60_6family_dynamic_leadership/errors/mandatories.json +++ b/tests/results/60_6family_dynamic_leadership/errors/mandatories.json @@ -1,14 +1,4 @@ { - "errors": [ - "unknown option \"dynstring1\" in optiondescription \"rougail\"", - "unknown option \"dynstring1\" in optiondescription \"rougail\"", - "unknown option \"dynstring1\" in optiondescription \"rougail\"", - "unknown option \"dynstring2\" in optiondescription \"rougail\"", - "unknown option \"dynstring2\" in optiondescription \"rougail\"", - "unknown option \"dynstring2\" in optiondescription \"rougail\"", - "unknown option \"dynstring3\" in optiondescription \"rougail\"", - "unknown option \"dynstring3\" in optiondescription \"rougail\"", - "unknown option \"dynstring3\" in optiondescription \"rougail\"" - ], + "errors": [], "warnings": [] } \ No newline at end of file diff --git a/tests/results/60_6family_dynamic_leadership/file/all.env b/tests/results/60_6family_dynamic_leadership/file/all.env index 282ddaa..33edac2 100644 --- a/tests/results/60_6family_dynamic_leadership/file/all.env +++ b/tests/results/60_6family_dynamic_leadership/file/all.env @@ -1,10 +1,7 @@ -ROUGAIL.VAR="string1,string2,string3" -ROUGAIL.DYNSTRING1.LEADERSHIP.LEADER="string1,string2,string3" -ROUGAIL.DYNSTRING1.LEADERSHIP.FOLLOWER1="string1,string2,string3" -ROUGAIL.DYNSTRING1.LEADERSHIP.FOLLOWER2="string1,string2,string3" -ROUGAIL.DYNSTRING2.LEADERSHIP.LEADER="string1,string2,string3" -ROUGAIL.DYNSTRING2.LEADERSHIP.FOLLOWER1="string1,string2,string3" -ROUGAIL.DYNSTRING2.LEADERSHIP.FOLLOWER2="string1,string2,string3" -ROUGAIL.DYNSTRING3.LEADERSHIP.LEADER="string1,string2,string3" -ROUGAIL.DYNSTRING3.LEADERSHIP.FOLLOWER1="string1,string2,string3" -ROUGAIL.DYNSTRING3.LEADERSHIP.FOLLOWER2="string1,string2,string3" +ROUGAIL.VAR="val1,val2" +ROUGAIL.DYNVAL1.LEADERSHIP.LEADER="string1,string2,string3" +ROUGAIL.DYNVAL1.LEADERSHIP.FOLLOWER1="string1,string2,string3" +ROUGAIL.DYNVAL1.LEADERSHIP.FOLLOWER2="string1,string2,string3" +ROUGAIL.DYNVAL2.LEADERSHIP.LEADER="string1,string2,string3" +ROUGAIL.DYNVAL2.LEADERSHIP.FOLLOWER1="string1,string2,string3" +ROUGAIL.DYNVAL2.LEADERSHIP.FOLLOWER2="string1,string2,string3" diff --git a/tests/results/60_6family_dynamic_leadership/file/all_exclude.env b/tests/results/60_6family_dynamic_leadership/file/all_exclude.env index d765bf5..d634e17 100644 --- a/tests/results/60_6family_dynamic_leadership/file/all_exclude.env +++ b/tests/results/60_6family_dynamic_leadership/file/all_exclude.env @@ -1,9 +1,6 @@ -ROUGAIL.DYNSTRING1.LEADERSHIP.LEADER="string1,string2,string3" -ROUGAIL.DYNSTRING1.LEADERSHIP.FOLLOWER1="string1,string2,string3" -ROUGAIL.DYNSTRING1.LEADERSHIP.FOLLOWER2="string1,string2,string3" -ROUGAIL.DYNSTRING2.LEADERSHIP.LEADER="string1,string2,string3" -ROUGAIL.DYNSTRING2.LEADERSHIP.FOLLOWER1="string1,string2,string3" -ROUGAIL.DYNSTRING2.LEADERSHIP.FOLLOWER2="string1,string2,string3" -ROUGAIL.DYNSTRING3.LEADERSHIP.LEADER="string1,string2,string3" -ROUGAIL.DYNSTRING3.LEADERSHIP.FOLLOWER1="string1,string2,string3" -ROUGAIL.DYNSTRING3.LEADERSHIP.FOLLOWER2="string1,string2,string3" +ROUGAIL.DYNVAL1.LEADERSHIP.LEADER="string1,string2,string3" +ROUGAIL.DYNVAL1.LEADERSHIP.FOLLOWER1="string1,string2,string3" +ROUGAIL.DYNVAL1.LEADERSHIP.FOLLOWER2="string1,string2,string3" +ROUGAIL.DYNVAL2.LEADERSHIP.LEADER="string1,string2,string3" +ROUGAIL.DYNVAL2.LEADERSHIP.FOLLOWER1="string1,string2,string3" +ROUGAIL.DYNVAL2.LEADERSHIP.FOLLOWER2="string1,string2,string3" diff --git a/tests/results/60_6family_dynamic_leadership/makedict/all.json b/tests/results/60_6family_dynamic_leadership/makedict/all.json index 07720ec..3f9f804 100644 --- a/tests/results/60_6family_dynamic_leadership/makedict/all.json +++ b/tests/results/60_6family_dynamic_leadership/makedict/all.json @@ -1,58 +1,40 @@ { "rougail.var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "rougail.dynstring1.leadership.leader": [ + "rougail.dynval1.leadership.leader": [ { - "rougail.dynstring1.leadership.leader": "string1", - "rougail.dynstring1.leadership.follower1": "string1", - "rougail.dynstring1.leadership.follower2": "string1" + "rougail.dynval1.leadership.leader": "string1", + "rougail.dynval1.leadership.follower1": "string1", + "rougail.dynval1.leadership.follower2": "string1" }, { - "rougail.dynstring1.leadership.leader": "string2", - "rougail.dynstring1.leadership.follower1": "string2", - "rougail.dynstring1.leadership.follower2": "string2" + "rougail.dynval1.leadership.leader": "string2", + "rougail.dynval1.leadership.follower1": "string2", + "rougail.dynval1.leadership.follower2": "string2" }, { - "rougail.dynstring1.leadership.leader": "string3", - "rougail.dynstring1.leadership.follower1": "string3", - "rougail.dynstring1.leadership.follower2": "string3" + "rougail.dynval1.leadership.leader": "string3", + "rougail.dynval1.leadership.follower1": "string3", + "rougail.dynval1.leadership.follower2": "string3" } ], - "rougail.dynstring2.leadership.leader": [ + "rougail.dynval2.leadership.leader": [ { - "rougail.dynstring2.leadership.leader": "string1", - "rougail.dynstring2.leadership.follower1": "string1", - "rougail.dynstring2.leadership.follower2": "string1" + "rougail.dynval2.leadership.leader": "string1", + "rougail.dynval2.leadership.follower1": "string1", + "rougail.dynval2.leadership.follower2": "string1" }, { - "rougail.dynstring2.leadership.leader": "string2", - "rougail.dynstring2.leadership.follower1": "string2", - "rougail.dynstring2.leadership.follower2": "string2" + "rougail.dynval2.leadership.leader": "string2", + "rougail.dynval2.leadership.follower1": "string2", + "rougail.dynval2.leadership.follower2": "string2" }, { - "rougail.dynstring2.leadership.leader": "string3", - "rougail.dynstring2.leadership.follower1": "string3", - "rougail.dynstring2.leadership.follower2": "string3" - } - ], - "rougail.dynstring3.leadership.leader": [ - { - "rougail.dynstring3.leadership.leader": "string1", - "rougail.dynstring3.leadership.follower1": "string1", - "rougail.dynstring3.leadership.follower2": "string1" - }, - { - "rougail.dynstring3.leadership.leader": "string2", - "rougail.dynstring3.leadership.follower1": "string2", - "rougail.dynstring3.leadership.follower2": "string2" - }, - { - "rougail.dynstring3.leadership.leader": "string3", - "rougail.dynstring3.leadership.follower1": "string3", - "rougail.dynstring3.leadership.follower2": "string3" + "rougail.dynval2.leadership.leader": "string3", + "rougail.dynval2.leadership.follower1": "string3", + "rougail.dynval2.leadership.follower2": "string3" } ] } diff --git a/tests/results/60_6family_dynamic_sub_dynamic/errors/mandatories.json b/tests/results/60_6family_dynamic_sub_dynamic/errors/mandatories.json index 2916760..217db0a 100644 --- a/tests/results/60_6family_dynamic_sub_dynamic/errors/mandatories.json +++ b/tests/results/60_6family_dynamic_sub_dynamic/errors/mandatories.json @@ -1,32 +1,4 @@ { - "errors": [ - "unknown option \"dynstring1\" in optiondescription \"rougail\"", - "unknown option \"dynstring1\" in optiondescription \"rougail\"", - "unknown option \"dynstring1\" in optiondescription \"rougail\"", - "unknown option \"dynstring1\" in optiondescription \"rougail\"", - "unknown option \"dynstring1\" in optiondescription \"rougail\"", - "unknown option \"dynstring1\" in optiondescription \"rougail\"", - "unknown option \"dynstring1\" in optiondescription \"rougail\"", - "unknown option \"dynstring1\" in optiondescription \"rougail\"", - "unknown option \"dynstring1\" in optiondescription \"rougail\"", - "unknown option \"dynstring2\" in optiondescription \"rougail\"", - "unknown option \"dynstring2\" in optiondescription \"rougail\"", - "unknown option \"dynstring2\" in optiondescription \"rougail\"", - "unknown option \"dynstring2\" in optiondescription \"rougail\"", - "unknown option \"dynstring2\" in optiondescription \"rougail\"", - "unknown option \"dynstring2\" in optiondescription \"rougail\"", - "unknown option \"dynstring2\" in optiondescription \"rougail\"", - "unknown option \"dynstring2\" in optiondescription \"rougail\"", - "unknown option \"dynstring2\" in optiondescription \"rougail\"", - "unknown option \"dynstring3\" in optiondescription \"rougail\"", - "unknown option \"dynstring3\" in optiondescription \"rougail\"", - "unknown option \"dynstring3\" in optiondescription \"rougail\"", - "unknown option \"dynstring3\" in optiondescription \"rougail\"", - "unknown option \"dynstring3\" in optiondescription \"rougail\"", - "unknown option \"dynstring3\" in optiondescription \"rougail\"", - "unknown option \"dynstring3\" in optiondescription \"rougail\"", - "unknown option \"dynstring3\" in optiondescription \"rougail\"", - "unknown option \"dynstring3\" in optiondescription \"rougail\"" - ], + "errors": [], "warnings": [] } \ No newline at end of file diff --git a/tests/results/60_6family_dynamic_sub_dynamic/file/all.env b/tests/results/60_6family_dynamic_sub_dynamic/file/all.env index 11cbdb8..17b89ce 100644 --- a/tests/results/60_6family_dynamic_sub_dynamic/file/all.env +++ b/tests/results/60_6family_dynamic_sub_dynamic/file/all.env @@ -1,31 +1,15 @@ -ROUGAIL.VAR="string1,string2,string3" -ROUGAIL.DYNSTRING1.VAR="string1,string2,string3" -ROUGAIL.DYNSTRING1.DYN_STRING1.VAR="string1" -ROUGAIL.DYNSTRING1.DYN_STRING1.VAR_IDENTIFIER="string1" -ROUGAIL.DYNSTRING1.DYN_STRING1.VAR_IDENTIFIERS="string1" -ROUGAIL.DYNSTRING1.DYN_STRING2.VAR="string1" -ROUGAIL.DYNSTRING1.DYN_STRING2.VAR_IDENTIFIER="string1" -ROUGAIL.DYNSTRING1.DYN_STRING2.VAR_IDENTIFIERS="string1" -ROUGAIL.DYNSTRING1.DYN_STRING3.VAR="string1" -ROUGAIL.DYNSTRING1.DYN_STRING3.VAR_IDENTIFIER="string1" -ROUGAIL.DYNSTRING1.DYN_STRING3.VAR_IDENTIFIERS="string1" -ROUGAIL.DYNSTRING2.VAR="string1,string2,string3" -ROUGAIL.DYNSTRING2.DYN_STRING1.VAR="string1" -ROUGAIL.DYNSTRING2.DYN_STRING1.VAR_IDENTIFIER="string1" -ROUGAIL.DYNSTRING2.DYN_STRING1.VAR_IDENTIFIERS="string1" -ROUGAIL.DYNSTRING2.DYN_STRING2.VAR="string1" -ROUGAIL.DYNSTRING2.DYN_STRING2.VAR_IDENTIFIER="string1" -ROUGAIL.DYNSTRING2.DYN_STRING2.VAR_IDENTIFIERS="string1" -ROUGAIL.DYNSTRING2.DYN_STRING3.VAR="string1" -ROUGAIL.DYNSTRING2.DYN_STRING3.VAR_IDENTIFIER="string1" -ROUGAIL.DYNSTRING2.DYN_STRING3.VAR_IDENTIFIERS="string1" -ROUGAIL.DYNSTRING3.VAR="string1,string2,string3" -ROUGAIL.DYNSTRING3.DYN_STRING1.VAR="string1" -ROUGAIL.DYNSTRING3.DYN_STRING1.VAR_IDENTIFIER="string1" -ROUGAIL.DYNSTRING3.DYN_STRING1.VAR_IDENTIFIERS="string1" -ROUGAIL.DYNSTRING3.DYN_STRING2.VAR="string1" -ROUGAIL.DYNSTRING3.DYN_STRING2.VAR_IDENTIFIER="string1" -ROUGAIL.DYNSTRING3.DYN_STRING2.VAR_IDENTIFIERS="string1" -ROUGAIL.DYNSTRING3.DYN_STRING3.VAR="string1" -ROUGAIL.DYNSTRING3.DYN_STRING3.VAR_IDENTIFIER="string1" -ROUGAIL.DYNSTRING3.DYN_STRING3.VAR_IDENTIFIERS="string1" +ROUGAIL.VAR="val1,val2" +ROUGAIL.DYNVAL1.VAR="tval1,tval2" +ROUGAIL.DYNVAL1.DYN_TVAL1.VAR="string1" +ROUGAIL.DYNVAL1.DYN_TVAL1.VAR_IDENTIFIER="string1" +ROUGAIL.DYNVAL1.DYN_TVAL1.VAR_IDENTIFIERS="string1" +ROUGAIL.DYNVAL1.DYN_TVAL2.VAR="string1" +ROUGAIL.DYNVAL1.DYN_TVAL2.VAR_IDENTIFIER="string1" +ROUGAIL.DYNVAL1.DYN_TVAL2.VAR_IDENTIFIERS="string1" +ROUGAIL.DYNVAL2.VAR="tval1,tval2" +ROUGAIL.DYNVAL2.DYN_TVAL1.VAR="string1" +ROUGAIL.DYNVAL2.DYN_TVAL1.VAR_IDENTIFIER="string1" +ROUGAIL.DYNVAL2.DYN_TVAL1.VAR_IDENTIFIERS="string1" +ROUGAIL.DYNVAL2.DYN_TVAL2.VAR="string1" +ROUGAIL.DYNVAL2.DYN_TVAL2.VAR_IDENTIFIER="string1" +ROUGAIL.DYNVAL2.DYN_TVAL2.VAR_IDENTIFIERS="string1" diff --git a/tests/results/60_6family_dynamic_sub_dynamic/file/all_exclude.env b/tests/results/60_6family_dynamic_sub_dynamic/file/all_exclude.env index d8ecf3b..03c59c4 100644 --- a/tests/results/60_6family_dynamic_sub_dynamic/file/all_exclude.env +++ b/tests/results/60_6family_dynamic_sub_dynamic/file/all_exclude.env @@ -1,27 +1,12 @@ -ROUGAIL.DYNSTRING1.DYN_STRING1.VAR="string1" -ROUGAIL.DYNSTRING1.DYN_STRING1.VAR_IDENTIFIER="string1" -ROUGAIL.DYNSTRING1.DYN_STRING1.VAR_IDENTIFIERS="string1" -ROUGAIL.DYNSTRING1.DYN_STRING2.VAR="string1" -ROUGAIL.DYNSTRING1.DYN_STRING2.VAR_IDENTIFIER="string1" -ROUGAIL.DYNSTRING1.DYN_STRING2.VAR_IDENTIFIERS="string1" -ROUGAIL.DYNSTRING1.DYN_STRING3.VAR="string1" -ROUGAIL.DYNSTRING1.DYN_STRING3.VAR_IDENTIFIER="string1" -ROUGAIL.DYNSTRING1.DYN_STRING3.VAR_IDENTIFIERS="string1" -ROUGAIL.DYNSTRING2.DYN_STRING1.VAR="string1" -ROUGAIL.DYNSTRING2.DYN_STRING1.VAR_IDENTIFIER="string1" -ROUGAIL.DYNSTRING2.DYN_STRING1.VAR_IDENTIFIERS="string1" -ROUGAIL.DYNSTRING2.DYN_STRING2.VAR="string1" -ROUGAIL.DYNSTRING2.DYN_STRING2.VAR_IDENTIFIER="string1" -ROUGAIL.DYNSTRING2.DYN_STRING2.VAR_IDENTIFIERS="string1" -ROUGAIL.DYNSTRING2.DYN_STRING3.VAR="string1" -ROUGAIL.DYNSTRING2.DYN_STRING3.VAR_IDENTIFIER="string1" -ROUGAIL.DYNSTRING2.DYN_STRING3.VAR_IDENTIFIERS="string1" -ROUGAIL.DYNSTRING3.DYN_STRING1.VAR="string1" -ROUGAIL.DYNSTRING3.DYN_STRING1.VAR_IDENTIFIER="string1" -ROUGAIL.DYNSTRING3.DYN_STRING1.VAR_IDENTIFIERS="string1" -ROUGAIL.DYNSTRING3.DYN_STRING2.VAR="string1" -ROUGAIL.DYNSTRING3.DYN_STRING2.VAR_IDENTIFIER="string1" -ROUGAIL.DYNSTRING3.DYN_STRING2.VAR_IDENTIFIERS="string1" -ROUGAIL.DYNSTRING3.DYN_STRING3.VAR="string1" -ROUGAIL.DYNSTRING3.DYN_STRING3.VAR_IDENTIFIER="string1" -ROUGAIL.DYNSTRING3.DYN_STRING3.VAR_IDENTIFIERS="string1" +ROUGAIL.DYNVAL1.DYN_TVAL1.VAR="string1" +ROUGAIL.DYNVAL1.DYN_TVAL1.VAR_IDENTIFIER="string1" +ROUGAIL.DYNVAL1.DYN_TVAL1.VAR_IDENTIFIERS="string1" +ROUGAIL.DYNVAL1.DYN_TVAL2.VAR="string1" +ROUGAIL.DYNVAL1.DYN_TVAL2.VAR_IDENTIFIER="string1" +ROUGAIL.DYNVAL1.DYN_TVAL2.VAR_IDENTIFIERS="string1" +ROUGAIL.DYNVAL2.DYN_TVAL1.VAR="string1" +ROUGAIL.DYNVAL2.DYN_TVAL1.VAR_IDENTIFIER="string1" +ROUGAIL.DYNVAL2.DYN_TVAL1.VAR_IDENTIFIERS="string1" +ROUGAIL.DYNVAL2.DYN_TVAL2.VAR="string1" +ROUGAIL.DYNVAL2.DYN_TVAL2.VAR_IDENTIFIER="string1" +ROUGAIL.DYNVAL2.DYN_TVAL2.VAR_IDENTIFIERS="string1" diff --git a/tests/results/60_6family_dynamic_sub_dynamic/makedict/all.json b/tests/results/60_6family_dynamic_sub_dynamic/makedict/all.json index f50d14d..2bdb167 100644 --- a/tests/results/60_6family_dynamic_sub_dynamic/makedict/all.json +++ b/tests/results/60_6family_dynamic_sub_dynamic/makedict/all.json @@ -1,49 +1,26 @@ { "rougail.var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "rougail.dynstring1.var": [ - "string1", - "string2", - "string3" + "rougail.dynval1.var": [ + "tval1", + "tval2" ], - "rougail.dynstring1.dyn_string1.var": "string1", - "rougail.dynstring1.dyn_string1.var_identifier": "string1", - "rougail.dynstring1.dyn_string1.var_identifiers": "string1", - "rougail.dynstring1.dyn_string2.var": "string1", - "rougail.dynstring1.dyn_string2.var_identifier": "string1", - "rougail.dynstring1.dyn_string2.var_identifiers": "string1", - "rougail.dynstring1.dyn_string3.var": "string1", - "rougail.dynstring1.dyn_string3.var_identifier": "string1", - "rougail.dynstring1.dyn_string3.var_identifiers": "string1", - "rougail.dynstring2.var": [ - "string1", - "string2", - "string3" + "rougail.dynval1.dyn_tval1.var": "string1", + "rougail.dynval1.dyn_tval1.var_identifier": "string1", + "rougail.dynval1.dyn_tval1.var_identifiers": "string1", + "rougail.dynval1.dyn_tval2.var": "string1", + "rougail.dynval1.dyn_tval2.var_identifier": "string1", + "rougail.dynval1.dyn_tval2.var_identifiers": "string1", + "rougail.dynval2.var": [ + "tval1", + "tval2" ], - "rougail.dynstring2.dyn_string1.var": "string1", - "rougail.dynstring2.dyn_string1.var_identifier": "string1", - "rougail.dynstring2.dyn_string1.var_identifiers": "string1", - "rougail.dynstring2.dyn_string2.var": "string1", - "rougail.dynstring2.dyn_string2.var_identifier": "string1", - "rougail.dynstring2.dyn_string2.var_identifiers": "string1", - "rougail.dynstring2.dyn_string3.var": "string1", - "rougail.dynstring2.dyn_string3.var_identifier": "string1", - "rougail.dynstring2.dyn_string3.var_identifiers": "string1", - "rougail.dynstring3.var": [ - "string1", - "string2", - "string3" - ], - "rougail.dynstring3.dyn_string1.var": "string1", - "rougail.dynstring3.dyn_string1.var_identifier": "string1", - "rougail.dynstring3.dyn_string1.var_identifiers": "string1", - "rougail.dynstring3.dyn_string2.var": "string1", - "rougail.dynstring3.dyn_string2.var_identifier": "string1", - "rougail.dynstring3.dyn_string2.var_identifiers": "string1", - "rougail.dynstring3.dyn_string3.var": "string1", - "rougail.dynstring3.dyn_string3.var_identifier": "string1", - "rougail.dynstring3.dyn_string3.var_identifiers": "string1" + "rougail.dynval2.dyn_tval1.var": "string1", + "rougail.dynval2.dyn_tval1.var_identifier": "string1", + "rougail.dynval2.dyn_tval1.var_identifiers": "string1", + "rougail.dynval2.dyn_tval2.var": "string1", + "rougail.dynval2.dyn_tval2.var_identifier": "string1", + "rougail.dynval2.dyn_tval2.var_identifiers": "string1" } diff --git a/tests/results/60_6family_dynamic_sub_dynamic_1_0/errors/mandatories.json b/tests/results/60_6family_dynamic_sub_dynamic_1_0/errors/mandatories.json index 2916760..217db0a 100644 --- a/tests/results/60_6family_dynamic_sub_dynamic_1_0/errors/mandatories.json +++ b/tests/results/60_6family_dynamic_sub_dynamic_1_0/errors/mandatories.json @@ -1,32 +1,4 @@ { - "errors": [ - "unknown option \"dynstring1\" in optiondescription \"rougail\"", - "unknown option \"dynstring1\" in optiondescription \"rougail\"", - "unknown option \"dynstring1\" in optiondescription \"rougail\"", - "unknown option \"dynstring1\" in optiondescription \"rougail\"", - "unknown option \"dynstring1\" in optiondescription \"rougail\"", - "unknown option \"dynstring1\" in optiondescription \"rougail\"", - "unknown option \"dynstring1\" in optiondescription \"rougail\"", - "unknown option \"dynstring1\" in optiondescription \"rougail\"", - "unknown option \"dynstring1\" in optiondescription \"rougail\"", - "unknown option \"dynstring2\" in optiondescription \"rougail\"", - "unknown option \"dynstring2\" in optiondescription \"rougail\"", - "unknown option \"dynstring2\" in optiondescription \"rougail\"", - "unknown option \"dynstring2\" in optiondescription \"rougail\"", - "unknown option \"dynstring2\" in optiondescription \"rougail\"", - "unknown option \"dynstring2\" in optiondescription \"rougail\"", - "unknown option \"dynstring2\" in optiondescription \"rougail\"", - "unknown option \"dynstring2\" in optiondescription \"rougail\"", - "unknown option \"dynstring2\" in optiondescription \"rougail\"", - "unknown option \"dynstring3\" in optiondescription \"rougail\"", - "unknown option \"dynstring3\" in optiondescription \"rougail\"", - "unknown option \"dynstring3\" in optiondescription \"rougail\"", - "unknown option \"dynstring3\" in optiondescription \"rougail\"", - "unknown option \"dynstring3\" in optiondescription \"rougail\"", - "unknown option \"dynstring3\" in optiondescription \"rougail\"", - "unknown option \"dynstring3\" in optiondescription \"rougail\"", - "unknown option \"dynstring3\" in optiondescription \"rougail\"", - "unknown option \"dynstring3\" in optiondescription \"rougail\"" - ], + "errors": [], "warnings": [] } \ No newline at end of file diff --git a/tests/results/60_6family_dynamic_sub_dynamic_1_0/file/all.env b/tests/results/60_6family_dynamic_sub_dynamic_1_0/file/all.env index 11cbdb8..17b89ce 100644 --- a/tests/results/60_6family_dynamic_sub_dynamic_1_0/file/all.env +++ b/tests/results/60_6family_dynamic_sub_dynamic_1_0/file/all.env @@ -1,31 +1,15 @@ -ROUGAIL.VAR="string1,string2,string3" -ROUGAIL.DYNSTRING1.VAR="string1,string2,string3" -ROUGAIL.DYNSTRING1.DYN_STRING1.VAR="string1" -ROUGAIL.DYNSTRING1.DYN_STRING1.VAR_IDENTIFIER="string1" -ROUGAIL.DYNSTRING1.DYN_STRING1.VAR_IDENTIFIERS="string1" -ROUGAIL.DYNSTRING1.DYN_STRING2.VAR="string1" -ROUGAIL.DYNSTRING1.DYN_STRING2.VAR_IDENTIFIER="string1" -ROUGAIL.DYNSTRING1.DYN_STRING2.VAR_IDENTIFIERS="string1" -ROUGAIL.DYNSTRING1.DYN_STRING3.VAR="string1" -ROUGAIL.DYNSTRING1.DYN_STRING3.VAR_IDENTIFIER="string1" -ROUGAIL.DYNSTRING1.DYN_STRING3.VAR_IDENTIFIERS="string1" -ROUGAIL.DYNSTRING2.VAR="string1,string2,string3" -ROUGAIL.DYNSTRING2.DYN_STRING1.VAR="string1" -ROUGAIL.DYNSTRING2.DYN_STRING1.VAR_IDENTIFIER="string1" -ROUGAIL.DYNSTRING2.DYN_STRING1.VAR_IDENTIFIERS="string1" -ROUGAIL.DYNSTRING2.DYN_STRING2.VAR="string1" -ROUGAIL.DYNSTRING2.DYN_STRING2.VAR_IDENTIFIER="string1" -ROUGAIL.DYNSTRING2.DYN_STRING2.VAR_IDENTIFIERS="string1" -ROUGAIL.DYNSTRING2.DYN_STRING3.VAR="string1" -ROUGAIL.DYNSTRING2.DYN_STRING3.VAR_IDENTIFIER="string1" -ROUGAIL.DYNSTRING2.DYN_STRING3.VAR_IDENTIFIERS="string1" -ROUGAIL.DYNSTRING3.VAR="string1,string2,string3" -ROUGAIL.DYNSTRING3.DYN_STRING1.VAR="string1" -ROUGAIL.DYNSTRING3.DYN_STRING1.VAR_IDENTIFIER="string1" -ROUGAIL.DYNSTRING3.DYN_STRING1.VAR_IDENTIFIERS="string1" -ROUGAIL.DYNSTRING3.DYN_STRING2.VAR="string1" -ROUGAIL.DYNSTRING3.DYN_STRING2.VAR_IDENTIFIER="string1" -ROUGAIL.DYNSTRING3.DYN_STRING2.VAR_IDENTIFIERS="string1" -ROUGAIL.DYNSTRING3.DYN_STRING3.VAR="string1" -ROUGAIL.DYNSTRING3.DYN_STRING3.VAR_IDENTIFIER="string1" -ROUGAIL.DYNSTRING3.DYN_STRING3.VAR_IDENTIFIERS="string1" +ROUGAIL.VAR="val1,val2" +ROUGAIL.DYNVAL1.VAR="tval1,tval2" +ROUGAIL.DYNVAL1.DYN_TVAL1.VAR="string1" +ROUGAIL.DYNVAL1.DYN_TVAL1.VAR_IDENTIFIER="string1" +ROUGAIL.DYNVAL1.DYN_TVAL1.VAR_IDENTIFIERS="string1" +ROUGAIL.DYNVAL1.DYN_TVAL2.VAR="string1" +ROUGAIL.DYNVAL1.DYN_TVAL2.VAR_IDENTIFIER="string1" +ROUGAIL.DYNVAL1.DYN_TVAL2.VAR_IDENTIFIERS="string1" +ROUGAIL.DYNVAL2.VAR="tval1,tval2" +ROUGAIL.DYNVAL2.DYN_TVAL1.VAR="string1" +ROUGAIL.DYNVAL2.DYN_TVAL1.VAR_IDENTIFIER="string1" +ROUGAIL.DYNVAL2.DYN_TVAL1.VAR_IDENTIFIERS="string1" +ROUGAIL.DYNVAL2.DYN_TVAL2.VAR="string1" +ROUGAIL.DYNVAL2.DYN_TVAL2.VAR_IDENTIFIER="string1" +ROUGAIL.DYNVAL2.DYN_TVAL2.VAR_IDENTIFIERS="string1" diff --git a/tests/results/60_6family_dynamic_sub_dynamic_1_0/file/all_exclude.env b/tests/results/60_6family_dynamic_sub_dynamic_1_0/file/all_exclude.env index d8ecf3b..03c59c4 100644 --- a/tests/results/60_6family_dynamic_sub_dynamic_1_0/file/all_exclude.env +++ b/tests/results/60_6family_dynamic_sub_dynamic_1_0/file/all_exclude.env @@ -1,27 +1,12 @@ -ROUGAIL.DYNSTRING1.DYN_STRING1.VAR="string1" -ROUGAIL.DYNSTRING1.DYN_STRING1.VAR_IDENTIFIER="string1" -ROUGAIL.DYNSTRING1.DYN_STRING1.VAR_IDENTIFIERS="string1" -ROUGAIL.DYNSTRING1.DYN_STRING2.VAR="string1" -ROUGAIL.DYNSTRING1.DYN_STRING2.VAR_IDENTIFIER="string1" -ROUGAIL.DYNSTRING1.DYN_STRING2.VAR_IDENTIFIERS="string1" -ROUGAIL.DYNSTRING1.DYN_STRING3.VAR="string1" -ROUGAIL.DYNSTRING1.DYN_STRING3.VAR_IDENTIFIER="string1" -ROUGAIL.DYNSTRING1.DYN_STRING3.VAR_IDENTIFIERS="string1" -ROUGAIL.DYNSTRING2.DYN_STRING1.VAR="string1" -ROUGAIL.DYNSTRING2.DYN_STRING1.VAR_IDENTIFIER="string1" -ROUGAIL.DYNSTRING2.DYN_STRING1.VAR_IDENTIFIERS="string1" -ROUGAIL.DYNSTRING2.DYN_STRING2.VAR="string1" -ROUGAIL.DYNSTRING2.DYN_STRING2.VAR_IDENTIFIER="string1" -ROUGAIL.DYNSTRING2.DYN_STRING2.VAR_IDENTIFIERS="string1" -ROUGAIL.DYNSTRING2.DYN_STRING3.VAR="string1" -ROUGAIL.DYNSTRING2.DYN_STRING3.VAR_IDENTIFIER="string1" -ROUGAIL.DYNSTRING2.DYN_STRING3.VAR_IDENTIFIERS="string1" -ROUGAIL.DYNSTRING3.DYN_STRING1.VAR="string1" -ROUGAIL.DYNSTRING3.DYN_STRING1.VAR_IDENTIFIER="string1" -ROUGAIL.DYNSTRING3.DYN_STRING1.VAR_IDENTIFIERS="string1" -ROUGAIL.DYNSTRING3.DYN_STRING2.VAR="string1" -ROUGAIL.DYNSTRING3.DYN_STRING2.VAR_IDENTIFIER="string1" -ROUGAIL.DYNSTRING3.DYN_STRING2.VAR_IDENTIFIERS="string1" -ROUGAIL.DYNSTRING3.DYN_STRING3.VAR="string1" -ROUGAIL.DYNSTRING3.DYN_STRING3.VAR_IDENTIFIER="string1" -ROUGAIL.DYNSTRING3.DYN_STRING3.VAR_IDENTIFIERS="string1" +ROUGAIL.DYNVAL1.DYN_TVAL1.VAR="string1" +ROUGAIL.DYNVAL1.DYN_TVAL1.VAR_IDENTIFIER="string1" +ROUGAIL.DYNVAL1.DYN_TVAL1.VAR_IDENTIFIERS="string1" +ROUGAIL.DYNVAL1.DYN_TVAL2.VAR="string1" +ROUGAIL.DYNVAL1.DYN_TVAL2.VAR_IDENTIFIER="string1" +ROUGAIL.DYNVAL1.DYN_TVAL2.VAR_IDENTIFIERS="string1" +ROUGAIL.DYNVAL2.DYN_TVAL1.VAR="string1" +ROUGAIL.DYNVAL2.DYN_TVAL1.VAR_IDENTIFIER="string1" +ROUGAIL.DYNVAL2.DYN_TVAL1.VAR_IDENTIFIERS="string1" +ROUGAIL.DYNVAL2.DYN_TVAL2.VAR="string1" +ROUGAIL.DYNVAL2.DYN_TVAL2.VAR_IDENTIFIER="string1" +ROUGAIL.DYNVAL2.DYN_TVAL2.VAR_IDENTIFIERS="string1" diff --git a/tests/results/60_6family_dynamic_sub_dynamic_1_0/makedict/all.json b/tests/results/60_6family_dynamic_sub_dynamic_1_0/makedict/all.json index f50d14d..2bdb167 100644 --- a/tests/results/60_6family_dynamic_sub_dynamic_1_0/makedict/all.json +++ b/tests/results/60_6family_dynamic_sub_dynamic_1_0/makedict/all.json @@ -1,49 +1,26 @@ { "rougail.var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "rougail.dynstring1.var": [ - "string1", - "string2", - "string3" + "rougail.dynval1.var": [ + "tval1", + "tval2" ], - "rougail.dynstring1.dyn_string1.var": "string1", - "rougail.dynstring1.dyn_string1.var_identifier": "string1", - "rougail.dynstring1.dyn_string1.var_identifiers": "string1", - "rougail.dynstring1.dyn_string2.var": "string1", - "rougail.dynstring1.dyn_string2.var_identifier": "string1", - "rougail.dynstring1.dyn_string2.var_identifiers": "string1", - "rougail.dynstring1.dyn_string3.var": "string1", - "rougail.dynstring1.dyn_string3.var_identifier": "string1", - "rougail.dynstring1.dyn_string3.var_identifiers": "string1", - "rougail.dynstring2.var": [ - "string1", - "string2", - "string3" + "rougail.dynval1.dyn_tval1.var": "string1", + "rougail.dynval1.dyn_tval1.var_identifier": "string1", + "rougail.dynval1.dyn_tval1.var_identifiers": "string1", + "rougail.dynval1.dyn_tval2.var": "string1", + "rougail.dynval1.dyn_tval2.var_identifier": "string1", + "rougail.dynval1.dyn_tval2.var_identifiers": "string1", + "rougail.dynval2.var": [ + "tval1", + "tval2" ], - "rougail.dynstring2.dyn_string1.var": "string1", - "rougail.dynstring2.dyn_string1.var_identifier": "string1", - "rougail.dynstring2.dyn_string1.var_identifiers": "string1", - "rougail.dynstring2.dyn_string2.var": "string1", - "rougail.dynstring2.dyn_string2.var_identifier": "string1", - "rougail.dynstring2.dyn_string2.var_identifiers": "string1", - "rougail.dynstring2.dyn_string3.var": "string1", - "rougail.dynstring2.dyn_string3.var_identifier": "string1", - "rougail.dynstring2.dyn_string3.var_identifiers": "string1", - "rougail.dynstring3.var": [ - "string1", - "string2", - "string3" - ], - "rougail.dynstring3.dyn_string1.var": "string1", - "rougail.dynstring3.dyn_string1.var_identifier": "string1", - "rougail.dynstring3.dyn_string1.var_identifiers": "string1", - "rougail.dynstring3.dyn_string2.var": "string1", - "rougail.dynstring3.dyn_string2.var_identifier": "string1", - "rougail.dynstring3.dyn_string2.var_identifiers": "string1", - "rougail.dynstring3.dyn_string3.var": "string1", - "rougail.dynstring3.dyn_string3.var_identifier": "string1", - "rougail.dynstring3.dyn_string3.var_identifiers": "string1" + "rougail.dynval2.dyn_tval1.var": "string1", + "rougail.dynval2.dyn_tval1.var_identifier": "string1", + "rougail.dynval2.dyn_tval1.var_identifiers": "string1", + "rougail.dynval2.dyn_tval2.var": "string1", + "rougail.dynval2.dyn_tval2.var_identifier": "string1", + "rougail.dynval2.dyn_tval2.var_identifiers": "string1" } diff --git a/tests/results/60_6family_dynamic_sub_dynamic_empty/errors/mandatories.json b/tests/results/60_6family_dynamic_sub_dynamic_empty/errors/mandatories.json new file mode 100644 index 0000000..217db0a --- /dev/null +++ b/tests/results/60_6family_dynamic_sub_dynamic_empty/errors/mandatories.json @@ -0,0 +1,4 @@ +{ + "errors": [], + "warnings": [] +} \ No newline at end of file diff --git a/tests/results/60_6family_dynamic_sub_dynamic_empty/file/all.env b/tests/results/60_6family_dynamic_sub_dynamic_empty/file/all.env index 126983e..17b89ce 100644 --- a/tests/results/60_6family_dynamic_sub_dynamic_empty/file/all.env +++ b/tests/results/60_6family_dynamic_sub_dynamic_empty/file/all.env @@ -1,21 +1,15 @@ ROUGAIL.VAR="val1,val2" -ROUGAIL.DYNVAL1.VAR="string1,string2,string3" -ROUGAIL.DYNVAL1.DYN_STRING1.VAR="string1" -ROUGAIL.DYNVAL1.DYN_STRING1.VAR_IDENTIFIER="string1" -ROUGAIL.DYNVAL1.DYN_STRING1.VAR_IDENTIFIERS="string1" -ROUGAIL.DYNVAL1.DYN_STRING2.VAR="string1" -ROUGAIL.DYNVAL1.DYN_STRING2.VAR_IDENTIFIER="string1" -ROUGAIL.DYNVAL1.DYN_STRING2.VAR_IDENTIFIERS="string1" -ROUGAIL.DYNVAL1.DYN_STRING3.VAR="string1" -ROUGAIL.DYNVAL1.DYN_STRING3.VAR_IDENTIFIER="string1" -ROUGAIL.DYNVAL1.DYN_STRING3.VAR_IDENTIFIERS="string1" -ROUGAIL.DYNVAL2.VAR="string1,string2,string3" -ROUGAIL.DYNVAL2.DYN_STRING1.VAR="string1" -ROUGAIL.DYNVAL2.DYN_STRING1.VAR_IDENTIFIER="string1" -ROUGAIL.DYNVAL2.DYN_STRING1.VAR_IDENTIFIERS="string1" -ROUGAIL.DYNVAL2.DYN_STRING2.VAR="string1" -ROUGAIL.DYNVAL2.DYN_STRING2.VAR_IDENTIFIER="string1" -ROUGAIL.DYNVAL2.DYN_STRING2.VAR_IDENTIFIERS="string1" -ROUGAIL.DYNVAL2.DYN_STRING3.VAR="string1" -ROUGAIL.DYNVAL2.DYN_STRING3.VAR_IDENTIFIER="string1" -ROUGAIL.DYNVAL2.DYN_STRING3.VAR_IDENTIFIERS="string1" +ROUGAIL.DYNVAL1.VAR="tval1,tval2" +ROUGAIL.DYNVAL1.DYN_TVAL1.VAR="string1" +ROUGAIL.DYNVAL1.DYN_TVAL1.VAR_IDENTIFIER="string1" +ROUGAIL.DYNVAL1.DYN_TVAL1.VAR_IDENTIFIERS="string1" +ROUGAIL.DYNVAL1.DYN_TVAL2.VAR="string1" +ROUGAIL.DYNVAL1.DYN_TVAL2.VAR_IDENTIFIER="string1" +ROUGAIL.DYNVAL1.DYN_TVAL2.VAR_IDENTIFIERS="string1" +ROUGAIL.DYNVAL2.VAR="tval1,tval2" +ROUGAIL.DYNVAL2.DYN_TVAL1.VAR="string1" +ROUGAIL.DYNVAL2.DYN_TVAL1.VAR_IDENTIFIER="string1" +ROUGAIL.DYNVAL2.DYN_TVAL1.VAR_IDENTIFIERS="string1" +ROUGAIL.DYNVAL2.DYN_TVAL2.VAR="string1" +ROUGAIL.DYNVAL2.DYN_TVAL2.VAR_IDENTIFIER="string1" +ROUGAIL.DYNVAL2.DYN_TVAL2.VAR_IDENTIFIERS="string1" diff --git a/tests/results/60_6family_dynamic_sub_dynamic_empty/file/all_exclude.env b/tests/results/60_6family_dynamic_sub_dynamic_empty/file/all_exclude.env index 458137a..03c59c4 100644 --- a/tests/results/60_6family_dynamic_sub_dynamic_empty/file/all_exclude.env +++ b/tests/results/60_6family_dynamic_sub_dynamic_empty/file/all_exclude.env @@ -1,18 +1,12 @@ -ROUGAIL.DYNVAL1.DYN_STRING1.VAR="string1" -ROUGAIL.DYNVAL1.DYN_STRING1.VAR_IDENTIFIER="string1" -ROUGAIL.DYNVAL1.DYN_STRING1.VAR_IDENTIFIERS="string1" -ROUGAIL.DYNVAL1.DYN_STRING2.VAR="string1" -ROUGAIL.DYNVAL1.DYN_STRING2.VAR_IDENTIFIER="string1" -ROUGAIL.DYNVAL1.DYN_STRING2.VAR_IDENTIFIERS="string1" -ROUGAIL.DYNVAL1.DYN_STRING3.VAR="string1" -ROUGAIL.DYNVAL1.DYN_STRING3.VAR_IDENTIFIER="string1" -ROUGAIL.DYNVAL1.DYN_STRING3.VAR_IDENTIFIERS="string1" -ROUGAIL.DYNVAL2.DYN_STRING1.VAR="string1" -ROUGAIL.DYNVAL2.DYN_STRING1.VAR_IDENTIFIER="string1" -ROUGAIL.DYNVAL2.DYN_STRING1.VAR_IDENTIFIERS="string1" -ROUGAIL.DYNVAL2.DYN_STRING2.VAR="string1" -ROUGAIL.DYNVAL2.DYN_STRING2.VAR_IDENTIFIER="string1" -ROUGAIL.DYNVAL2.DYN_STRING2.VAR_IDENTIFIERS="string1" -ROUGAIL.DYNVAL2.DYN_STRING3.VAR="string1" -ROUGAIL.DYNVAL2.DYN_STRING3.VAR_IDENTIFIER="string1" -ROUGAIL.DYNVAL2.DYN_STRING3.VAR_IDENTIFIERS="string1" +ROUGAIL.DYNVAL1.DYN_TVAL1.VAR="string1" +ROUGAIL.DYNVAL1.DYN_TVAL1.VAR_IDENTIFIER="string1" +ROUGAIL.DYNVAL1.DYN_TVAL1.VAR_IDENTIFIERS="string1" +ROUGAIL.DYNVAL1.DYN_TVAL2.VAR="string1" +ROUGAIL.DYNVAL1.DYN_TVAL2.VAR_IDENTIFIER="string1" +ROUGAIL.DYNVAL1.DYN_TVAL2.VAR_IDENTIFIERS="string1" +ROUGAIL.DYNVAL2.DYN_TVAL1.VAR="string1" +ROUGAIL.DYNVAL2.DYN_TVAL1.VAR_IDENTIFIER="string1" +ROUGAIL.DYNVAL2.DYN_TVAL1.VAR_IDENTIFIERS="string1" +ROUGAIL.DYNVAL2.DYN_TVAL2.VAR="string1" +ROUGAIL.DYNVAL2.DYN_TVAL2.VAR_IDENTIFIER="string1" +ROUGAIL.DYNVAL2.DYN_TVAL2.VAR_IDENTIFIERS="string1" diff --git a/tests/results/60_6family_dynamic_sub_dynamic_empty/makedict/all.json b/tests/results/60_6family_dynamic_sub_dynamic_empty/makedict/all.json index ac826ec..2bdb167 100644 --- a/tests/results/60_6family_dynamic_sub_dynamic_empty/makedict/all.json +++ b/tests/results/60_6family_dynamic_sub_dynamic_empty/makedict/all.json @@ -4,31 +4,23 @@ "val2" ], "rougail.dynval1.var": [ - "string1", - "string2", - "string3" + "tval1", + "tval2" ], - "rougail.dynval1.dyn_string1.var": "string1", - "rougail.dynval1.dyn_string1.var_identifier": "string1", - "rougail.dynval1.dyn_string1.var_identifiers": "string1", - "rougail.dynval1.dyn_string2.var": "string1", - "rougail.dynval1.dyn_string2.var_identifier": "string1", - "rougail.dynval1.dyn_string2.var_identifiers": "string1", - "rougail.dynval1.dyn_string3.var": "string1", - "rougail.dynval1.dyn_string3.var_identifier": "string1", - "rougail.dynval1.dyn_string3.var_identifiers": "string1", + "rougail.dynval1.dyn_tval1.var": "string1", + "rougail.dynval1.dyn_tval1.var_identifier": "string1", + "rougail.dynval1.dyn_tval1.var_identifiers": "string1", + "rougail.dynval1.dyn_tval2.var": "string1", + "rougail.dynval1.dyn_tval2.var_identifier": "string1", + "rougail.dynval1.dyn_tval2.var_identifiers": "string1", "rougail.dynval2.var": [ - "string1", - "string2", - "string3" + "tval1", + "tval2" ], - "rougail.dynval2.dyn_string1.var": "string1", - "rougail.dynval2.dyn_string1.var_identifier": "string1", - "rougail.dynval2.dyn_string1.var_identifiers": "string1", - "rougail.dynval2.dyn_string2.var": "string1", - "rougail.dynval2.dyn_string2.var_identifier": "string1", - "rougail.dynval2.dyn_string2.var_identifiers": "string1", - "rougail.dynval2.dyn_string3.var": "string1", - "rougail.dynval2.dyn_string3.var_identifier": "string1", - "rougail.dynval2.dyn_string3.var_identifiers": "string1" + "rougail.dynval2.dyn_tval1.var": "string1", + "rougail.dynval2.dyn_tval1.var_identifier": "string1", + "rougail.dynval2.dyn_tval1.var_identifiers": "string1", + "rougail.dynval2.dyn_tval2.var": "string1", + "rougail.dynval2.dyn_tval2.var_identifier": "string1", + "rougail.dynval2.dyn_tval2.var_identifiers": "string1" } diff --git a/tests/results/60_9extra_dynamic/errors/all.json b/tests/results/60_9extra_dynamic/errors/all.json index 9d97a6e..217db0a 100644 --- a/tests/results/60_9extra_dynamic/errors/all.json +++ b/tests/results/60_9extra_dynamic/errors/all.json @@ -1,23 +1,4 @@ { - "errors": [ - "unknown option \"dynval1\" in optiondescription \"rougail\"", - "unknown option \"dynval1\" in optiondescription \"rougail\"", - "unknown option \"dynval1\" in optiondescription \"rougail\"", - "unknown option \"dynval1\" in optiondescription \"rougail\"", - "unknown option \"dynval1\" in optiondescription \"rougail\"", - "unknown option \"dynval1\" in optiondescription \"rougail\"", - "unknown option \"dynval1\" in optiondescription \"rougail\"", - "unknown option \"dynval1\" in optiondescription \"rougail\"", - "unknown option \"dynval1\" in optiondescription \"rougail\"", - "unknown option \"dynval2\" in optiondescription \"rougail\"", - "unknown option \"dynval2\" in optiondescription \"rougail\"", - "unknown option \"dynval2\" in optiondescription \"rougail\"", - "unknown option \"dynval2\" in optiondescription \"rougail\"", - "unknown option \"dynval2\" in optiondescription \"rougail\"", - "unknown option \"dynval2\" in optiondescription \"rougail\"", - "unknown option \"dynval2\" in optiondescription \"rougail\"", - "unknown option \"dynval2\" in optiondescription \"rougail\"", - "unknown option \"dynval2\" in optiondescription \"rougail\"" - ], + "errors": [], "warnings": [] } \ No newline at end of file diff --git a/tests/results/60_9extra_dynamic/file/all.env b/tests/results/60_9extra_dynamic/file/all.env index ce2a647..4f15e0b 100644 --- a/tests/results/60_9extra_dynamic/file/all.env +++ b/tests/results/60_9extra_dynamic/file/all.env @@ -1 +1,2 @@ -ROUGAIL.VAR="string1,string2,string3" +ROUGAIL.VAR="a" +EXTRA.DYN_A.VAR="string1" diff --git a/tests/results/60_9extra_dynamic/file/all_exclude.env b/tests/results/60_9extra_dynamic/file/all_exclude.env index ce2a647..130e7af 100644 --- a/tests/results/60_9extra_dynamic/file/all_exclude.env +++ b/tests/results/60_9extra_dynamic/file/all_exclude.env @@ -1 +1 @@ -ROUGAIL.VAR="string1,string2,string3" +EXTRA.DYN_A.VAR="string1" diff --git a/tests/results/60_9extra_dynamic/file/mandatories.env b/tests/results/60_9extra_dynamic/file/mandatories.env index 8b13789..130e7af 100644 --- a/tests/results/60_9extra_dynamic/file/mandatories.env +++ b/tests/results/60_9extra_dynamic/file/mandatories.env @@ -1 +1 @@ - +EXTRA.DYN_A.VAR="string1" diff --git a/tests/results/60_9extra_dynamic/makedict/all.json b/tests/results/60_9extra_dynamic/makedict/all.json index d21e300..9197894 100644 --- a/tests/results/60_9extra_dynamic/makedict/all.json +++ b/tests/results/60_9extra_dynamic/makedict/all.json @@ -1,7 +1,6 @@ { "rougail.var": [ - "string1", - "string2", - "string3" - ] + "a" + ], + "extra.dyn_a.var": "string1" } diff --git a/tests/results/60_9extra_dynamic/makedict/mandatories.json b/tests/results/60_9extra_dynamic/makedict/mandatories.json index 43f24fa..9197894 100644 --- a/tests/results/60_9extra_dynamic/makedict/mandatories.json +++ b/tests/results/60_9extra_dynamic/makedict/mandatories.json @@ -1,5 +1,6 @@ { "rougail.var": [ "a" - ] + ], + "extra.dyn_a.var": "string1" } diff --git a/tests/results/60_9extra_dynamic_extra/errors/all.json b/tests/results/60_9extra_dynamic_extra/errors/all.json index 8aa143e..217db0a 100644 --- a/tests/results/60_9extra_dynamic_extra/errors/all.json +++ b/tests/results/60_9extra_dynamic_extra/errors/all.json @@ -1,6 +1,4 @@ { - "errors": [ - "unknown option \"var\" in optiondescription \"rougail\"" - ], + "errors": [], "warnings": [] } \ No newline at end of file diff --git a/tests/results/60_9extra_dynamic_extra/file/all.env b/tests/results/60_9extra_dynamic_extra/file/all.env index 56a78cd..ddabe60 100644 --- a/tests/results/60_9extra_dynamic_extra/file/all.env +++ b/tests/results/60_9extra_dynamic_extra/file/all.env @@ -1 +1,3 @@ ROUGAIL.GENERAL.VARNAME="string1,string2,string3" +EXTRA.VAR="a" +EXTRA.DYN_A.VAR="string1" diff --git a/tests/results/60_9extra_dynamic_extra/file/all_exclude.env b/tests/results/60_9extra_dynamic_extra/file/all_exclude.env index 56a78cd..381f26e 100644 --- a/tests/results/60_9extra_dynamic_extra/file/all_exclude.env +++ b/tests/results/60_9extra_dynamic_extra/file/all_exclude.env @@ -1 +1,2 @@ ROUGAIL.GENERAL.VARNAME="string1,string2,string3" +EXTRA.DYN_A.VAR="string1" diff --git a/tests/results/60_9extra_dynamic_extra/file/mandatories.env b/tests/results/60_9extra_dynamic_extra/file/mandatories.env index 8b13789..130e7af 100644 --- a/tests/results/60_9extra_dynamic_extra/file/mandatories.env +++ b/tests/results/60_9extra_dynamic_extra/file/mandatories.env @@ -1 +1 @@ - +EXTRA.DYN_A.VAR="string1" diff --git a/tests/results/60_9extra_dynamic_extra/makedict/all.json b/tests/results/60_9extra_dynamic_extra/makedict/all.json index 04919bf..c115da4 100644 --- a/tests/results/60_9extra_dynamic_extra/makedict/all.json +++ b/tests/results/60_9extra_dynamic_extra/makedict/all.json @@ -3,5 +3,9 @@ "string1", "string2", "string3" - ] + ], + "extra.var": [ + "a" + ], + "extra.dyn_a.var": "string1" } diff --git a/tests/results/60_9extra_dynamic_extra/makedict/mandatories.json b/tests/results/60_9extra_dynamic_extra/makedict/mandatories.json index 19e0115..816f70e 100644 --- a/tests/results/60_9extra_dynamic_extra/makedict/mandatories.json +++ b/tests/results/60_9extra_dynamic_extra/makedict/mandatories.json @@ -1,5 +1,9 @@ { "rougail.general.varname": [ "a" - ] + ], + "extra.var": [ + "a" + ], + "extra.dyn_a.var": "string1" } diff --git a/tests/results/60_9family_dynamic_calc_both/errors/all.json b/tests/results/60_9family_dynamic_calc_both/errors/all.json index 51c333f..217db0a 100644 --- a/tests/results/60_9family_dynamic_calc_both/errors/all.json +++ b/tests/results/60_9family_dynamic_calc_both/errors/all.json @@ -1,6 +1,4 @@ { - "errors": [ - "unknown option \"general\" in optiondescription \"rougail\"" - ], + "errors": [], "warnings": [] } \ No newline at end of file diff --git a/tests/results/60_9family_dynamic_calc_both/errors/mandatories.json b/tests/results/60_9family_dynamic_calc_both/errors/mandatories.json index c5d187c..217db0a 100644 --- a/tests/results/60_9family_dynamic_calc_both/errors/mandatories.json +++ b/tests/results/60_9family_dynamic_calc_both/errors/mandatories.json @@ -1,6 +1,4 @@ { - "errors": [ - "unknown option \"dynval2\" in optiondescription \"rougail\"" - ], + "errors": [], "warnings": [] } \ No newline at end of file diff --git a/tests/results/68_0family_leadership_mode/errors/all.json b/tests/results/68_0family_leadership_mode/errors/all.json index 6a5e971..217db0a 100644 --- a/tests/results/68_0family_leadership_mode/errors/all.json +++ b/tests/results/68_0family_leadership_mode/errors/all.json @@ -1,9 +1,4 @@ { - "errors": [ - "unknown option \"var\" in optiondescription \"rougail\"", - "unknown option \"dynval1\" in optiondescription \"rougail\"", - "unknown option \"dynstring1\" in optiondescription \"rougail\"", - "unknown option \"dynval2\" in optiondescription \"rougail\"" - ], + "errors": [], "warnings": [] } \ No newline at end of file diff --git a/tests/test_load.py b/tests/test_load.py index e1f7c79..80bba14 100644 --- a/tests/test_load.py +++ b/tests/test_load.py @@ -1,145 +1,101 @@ -from .custom import CustomOption - import os +from pytest import fixture # , raises from pathlib import Path -from pytest import fixture -from json import load, dump +from rougail import Rougail +######################### from dotenv import load_dotenv +from rougail.user_data_environment import RougailUserDataEnvironment as RougailUserData +from json import load, dump +######################### + +from rougail_tests.utils import get_structures_list, get_rougail_config, get_values_for_config, config_to_dict -from rougail import RougailConfig, Rougail -from rougail.user_data_environment import RougailUserDataEnvironment EXT = "env" -dico_dirs = Path('../rougail/tests/dictionaries') - -# path configuration +######################### #let's save the original environment save = os.environ.copy() - -test_ok = set() -excludes = {'00_6choice_calculation', - '00_9default_integer', - '40_0leadership_follower_default_submulti', - '40_0leadership_follower_default_submulti_calculation', - '40_6leadership_follower_multi', - } -test_ok -= excludes - -for test in dico_dirs.iterdir(): - if (test / 'tiramisu').is_dir() and test.name not in excludes: - test_ok.add(test.name) -# test_ok = ['60_0family_dynamic'] +######################### -test_ok = list(test_ok) -test_ok.sort() +excludes = [] +excludes = [ + '40_0leadership_follower_default_submulti', # submulti is not allowed + '40_0leadership_follower_default_submulti_calculation', # submulti is not allowed + '40_6leadership_follower_multi', # submulti is not allowed + ] + +test_ok = get_structures_list(excludes) +# test_ok = [Path('../rougail-tests/structures/60_9extra_dynamic')] -@fixture(scope="module", params=test_ok) +def idfn(fixture_value): + return fixture_value.name + + +@fixture(scope="module", params=test_ok, ids=idfn) def test_dir(request): return request.param -def test_dictionaries_all(test_dir): - "tests the output" - _test_dictionaries(test_dir, 'all') - - -def test_dictionaries_all_exclude(test_dir): - "tests the output" - _test_dictionaries(test_dir, 'all', True) - - -def test_dictionaries_mandatories(test_dir): - "tests the output" - _test_dictionaries(test_dir, 'mandatories') - - -def _get_rougailconfig(test_dir): - "rougail config settings" - rougailconfig = RougailConfig.copy() +def _test_dictionaries(test_dir, namespace, ext, *, level, need_exclude=False): + rougailconfig = get_rougail_config(test_dir, namespace) + if not rougailconfig: + return + ################################## rougailconfig['step.user_data'] = ['environment'] - rougailconfig['main_namespace'] = 'rougail' - dirs = [str(test_dir / 'dictionaries' / 'rougail')] - rougailconfig['custom_types']['custom'] = CustomOption - rougailconfig['main_dictionaries'] = dirs - rougailconfig['functions_files'] = ['../rougail/tests/eosfunc/test.py'] - return rougailconfig - - -def _test_dictionaries(test_dir, level, need_exclude=False): - rougailconfig = _get_rougailconfig(dico_dirs / test_dir) - # populate tests if not already exists - dest_dir = Path('tests') / 'results' / test_dir - populate(dest_dir, rougailconfig, level, need_exclude) - # loads the config in the tiramisu's meaning + ################################## + dir_name = 'test' + if namespace: + dir_name += '_namespace' + elif (test_dir / 'force_namespace').is_file(): + return rougail = Rougail(rougailconfig) config = rougail.run() - # loading the file + ################################## + root_path = Path('tests') / 'results' / test_dir.name + makedict = root_path / 'makedict' / f'{level}.json' + filename = root_path / 'file' if need_exclude: - filename = dest_dir / 'file' / f'{level}_exclude.{EXT}' + filename = filename / f'{level}_exclude.{EXT}' else: - filename = dest_dir / 'file' / f'{level}.{EXT}' + filename = filename / f'{level}.{EXT}' + populate(filename, makedict, rougailconfig, level, need_exclude) load_dotenv(str(filename)) + ################################## # loads variables in the tiramisu config - user_data = RougailUserDataEnvironment(config, - rougailconfig=rougailconfig, - ).run() - errors = rougail.user_datas(user_data) + generated_user_data = RougailUserData(config, rougailconfig=rougailconfig).run() + errors = rougail.user_datas(generated_user_data) #expected output - with open(Path('tests') / 'results' / test_dir / 'makedict' / f'{level}.json') as json_file: + with open(Path('tests') / 'results' / test_dir.name / 'makedict' / f'{level}.json') as json_file: expected = load(json_file) # here is the effective test - errors_file = Path('tests') / 'results' / test_dir / 'errors' / f'{level}.json' + errors_file = Path('tests') / 'results' / test_dir.name / 'errors' / f'{level}.json' if not errors_file.is_file(): errors_file.parent.mkdir(parents=True, exist_ok=True) with open(errors_file, 'a') as json_file: dump(errors, json_file, indent=4) with open(errors_file) as json_file: expected_errors = load(json_file) + # expected_errors = { + # 'errors': [], + # 'warnings': [], + # } assert expected_errors == errors # config.property.read_only() - config_dict = dict(option_value(config.value.get())) + config_dict = dict(config_to_dict(config.value.get())) assert expected == config_dict #teardown: set the original environement again os.environ = save.copy() -def populate(dest_dir, rougailconfig, level, need_exclude): - if need_exclude: - filename = dest_dir / 'file' / f'{level}_exclude.{EXT}' - excludes = [] - else: - filename = dest_dir / 'file' / f'{level}.{EXT}' - excludes = None - makedict_file = dest_dir / 'makedict' / f'{level}.json' - if not filename.is_file() or not makedict_file.is_file(): - if need_exclude: - excludes = [] - else: - excludes = None - config = Rougail(rougailconfig).run() - config.property.read_only() - root_config = config.unrestraint - if level == 'all': - only = False - else: - only = True - values = {} - get_variables(root_config, values, only, excludes) - if need_exclude: - for exclude in excludes: - _values = values - *s_exclude, name = exclude.split('.') - for _name in s_exclude: - if _name not in _values: - break - _values = _values[_name] - else: - if name in _values: - del _values[name] +def populate(filename, makedict_file, rougailconfig, level, need_exclude): + if filename.is_file() and makedict_file.is_file(): + return + config = Rougail(rougailconfig).run() + values = get_values_for_config(config, not need_exclude, level) if not filename.is_file(): filename.parent.mkdir(parents=True, exist_ok=True) with filename.open('w') as fh: @@ -147,7 +103,7 @@ def populate(dest_dir, rougailconfig, level, need_exclude): if not makedict_file.is_file(): makedict_file.parent.mkdir(parents=True, exist_ok=True) config.property.read_only() - config_dict = dict(option_value(config.value.get())) + config_dict = dict(config_to_dict(config.value.get())) with makedict_file.open('w') as fh: dump(config_dict, fh, indent=4) fh.write('\n') @@ -171,10 +127,14 @@ def values_to_env(values): if k not in keys: keys.append(k) for k in keys: - yield (sub_root_path + '.' + k).upper() + '="' + ','.join([convert_str(ls.get(k, "")) for ls in value])+ '"' + for val in value: + sub_val = val.get(k, "") + if isinstance(sub_val, list): + raise Exception("submulti is not allowed for environment user_datas") + yield (sub_root_path + '.' + k).upper() + '="' + ','.join([convert_str(val.get(k, "")) for val in value])+ '"' else: yield sub_root_path.upper() + '="' + ','.join([convert_str(val) for val in value]) + '"' - elif value == 'None': + elif value is None or value == 'None': yield sub_root_path.upper() + '=""' else: yield sub_root_path.upper() + '="' + str(value) + '"' @@ -184,125 +144,21 @@ def values_to_env(values): def convert_str(val): if isinstance(val, bool): return {True: 'true', False: 'false'}.get(val) + if val is None: + return "" return str(val) -def get_value(variable, index): - if 'force_store_value' in variable.property.get(): - return variable.value.get() - tests = variable.information.get('test', None) - if tests: - tests = list(tests) - else: - if variable.type() == 'integer': - tests = [1, 2, 3] - elif variable.type() == 'float': - tests = [1.1, 2.2, 3.3] - elif variable.type() == 'port': - tests = ['80', '443'] - elif variable.type() == 'boolean': - tests = [True] - elif variable.type() == 'domain name': - tests = ['domain1.lan', 'domain2.lan'] - elif variable.type() == 'choice': - tests = variable.value.list() - elif variable.type() == 'network address': - if variable.extra('_cidr'): - tests = ['192.168.1.0/24', '10.0.0.0/24'] - else: - tests = ['192.168.1.0', '10.0.0.0'] - elif variable.type() == 'netmask address': - tests = ['255.255.255.0', '255.255.0.0'] - elif variable.type() == 'IP': - if variable.extra('_cidr'): - tests = ['192.168.1.6/32', '10.0.10.0/24'] - else: - tests = ['192.168.1.6', '10.0.10.10'] - else: - tests = ['string1', 'string2', 'string3'] - if not variable.ismulti(): - tests = tests[0] - elif index is not None and variable.isfollower() and variable.issubmulti() is False: - tests = tests[index] - variable.value.set(tests) - if tests == None: - tests = "" - if index is not None and variable.isleader(): - tests = tests[index] - return tests +def test_dictionaries_all(test_dir): + "tests the output" + _test_dictionaries(test_dir, True, EXT, level='all') -def get_variables(config, values, only, excludes, *, index=None, leader_is_mandatory=False): - for idx, key in enumerate(config): - if key.isoptiondescription(): - if key.isleadership(): - value = [] - leader = key.leader() - if only and not leader.value.mandatory(): - leader_value = leader.value.get() - leader_is_mandatory = False - else: - leader_value = get_value(leader, None) - leader_is_mandatory = True - for idx_, val in enumerate(leader_value): - value.append({}) - get_variables(key, value[-1], only, excludes, index=idx_, leader_is_mandatory=leader_is_mandatory) - if value: - values[key.name()] = value - else: - value = {} - get_variables(key, value, only, excludes) - if value: - values[key.name()] = value - if key.isdynamic(only_self=True): - identifier = key.identifiers(only_self=True, uncalculated=True) - exclude = key.information.get('dynamic_variable', - None, - ) - if exclude: - identifiers = key.identifiers()[:-1] - if identifiers: - identifiers.reverse() - for identifier in identifiers: - exclude = exclude.replace('{{ identifier }}', str(identifier), 1) - if excludes is not None: - excludes.append(exclude) - else: - if only: - if key.isleader(): - mandatory = leader_is_mandatory - else: - try: - mandatory = key.value.mandatory() - except: - mandatory = False - if not only or mandatory: - if key.index() is not None and index is not None and index != key.index(): - continue - value = get_value(key, index) - values[key.name()] = value +def test_dictionaries_all_exclude(test_dir): + "tests the output" + _test_dictionaries(test_dir, True, EXT, level='all', need_exclude=True) -def option_value(parent, key_is_option=False): - for option, value in parent.items(): - if option.isoptiondescription(): - if not key_is_option and option.isleadership(): - ret = [] - for idx, datas in enumerate(option_value(value, key_is_option=True)): - sub_option, sub_value = datas - if not idx: - sub_option = sub_option.path() - key = sub_option - for val in sub_value: - ret.append({sub_option: val}) - else: - index = sub_option.index() - sub_option = sub_option.path() - ret[index][sub_option] = sub_value - yield key, ret - else: - yield from option_value(value, key_is_option) - elif key_is_option: - yield option, value - else: - yield option.path(), value +def test_dictionaries_mandatories(test_dir): + "tests the output" + _test_dictionaries(test_dir, True, EXT, level='mandatories')