From aa039dc5d2221bf30c50d2bef7e33d87bb281aab Mon Sep 17 00:00:00 2001 From: Emmanuel Garette Date: Mon, 2 Dec 2024 20:24:01 +0100 Subject: [PATCH] fix: update tests --- src/rougail/output_json/__init__.py | 65 ++++++++++++------- tests/results/test/60_0family_dynamic.json | 12 ++-- .../results/test/60_0family_dynamic_1_1.json | 12 ++-- .../60_0family_dynamic_no_description.json | 12 ++-- .../60_0family_dynamic_variable_suffix.json | 12 ++-- ..._2family_dynamic_jinja_fill_sub_group.json | 14 ++-- ...family_dynamic_jinja_fill_sub_group_2.json | 14 ++-- .../test/60_2family_dynamic_outside_calc.json | 12 ++-- .../test/60_5family_dynamic_calc_suffix2.json | 12 ++-- .../60_5family_dynamic_calc_suffix_param.json | 12 ++-- .../60_5family_dynamic_calc_variable.json | 12 ++-- ...amily_dynamic_variable_outside_suffix.json | 12 ++-- .../test/60_6family_dynamic_leadership.json | 28 ++------ .../test_mandatory/60_0family_dynamic.json | 12 ++-- .../60_0family_dynamic_1_1.json | 12 ++-- .../60_0family_dynamic_no_description.json | 12 ++-- .../60_0family_dynamic_variable_suffix.json | 12 ++-- ..._2family_dynamic_jinja_fill_sub_group.json | 14 ++-- ...family_dynamic_jinja_fill_sub_group_2.json | 14 ++-- .../60_2family_dynamic_outside_calc.json | 12 ++-- .../60_5family_dynamic_calc_suffix2.json | 12 ++-- .../60_5family_dynamic_calc_suffix_param.json | 12 ++-- .../60_5family_dynamic_calc_variable.json | 12 ++-- ...amily_dynamic_variable_outside_suffix.json | 12 ++-- .../60_6family_dynamic_leadership.json | 28 ++------ .../test_namespace/60_0family_dynamic.json | 12 ++-- .../60_0family_dynamic_1_0.json | 12 ++-- .../60_0family_dynamic_1_0_type.json | 12 ++-- .../60_0family_dynamic_1_1.json | 12 ++-- .../60_0family_dynamic_jinja_number.json | 6 +- .../60_0family_dynamic_no_description.json | 12 ++-- .../60_0family_dynamic_variable_suffix.json | 12 ++-- ..._2family_dynamic_jinja_fill_sub_group.json | 14 ++-- ...family_dynamic_jinja_fill_sub_group_2.json | 14 ++-- .../60_2family_dynamic_outside_calc.json | 12 ++-- .../60_5family_dynamic_calc2.json | 12 ++-- .../60_5family_dynamic_calc_suffix.json | 12 ++-- .../60_5family_dynamic_calc_suffix2.json | 12 ++-- .../60_5family_dynamic_calc_suffix_param.json | 12 ++-- .../60_5family_dynamic_calc_variable.json | 12 ++-- .../60_5family_dynamic_unknown_suffix.json | 22 +------ .../60_5family_dynamic_variable_outside.json | 12 ++-- .../60_5family_dynamic_variable_outside2.json | 12 ++-- ...family_dynamic_variable_outside_jinja.json | 12 ++-- ...y_dynamic_variable_outside_sub_suffix.json | 34 +++------- ...amily_dynamic_variable_outside_suffix.json | 12 ++-- .../60_6family_dynamic_inside.json | 15 ++--- .../60_6family_dynamic_leadership.json | 28 ++------ .../60_6family_dynamic_sub_dynamic.json | 59 ++++------------- .../60_6family_dynamic_sub_dynamic_1_0.json | 59 ++++------------- .../60_6family_dynamic_sub_dynamic_empty.json | 28 +++----- .../test_namespace/60_9extra_dynamic.json | 12 +--- .../60_9extra_dynamic_extra.json | 12 +--- .../60_0family_dynamic.json | 12 ++-- .../60_0family_dynamic_1_0.json | 12 ++-- .../60_0family_dynamic_1_0_type.json | 12 ++-- .../60_0family_dynamic_1_1.json | 12 ++-- .../60_0family_dynamic_jinja_number.json | 6 +- .../60_0family_dynamic_no_description.json | 12 ++-- .../60_0family_dynamic_variable_suffix.json | 12 ++-- ..._2family_dynamic_jinja_fill_sub_group.json | 14 ++-- ...family_dynamic_jinja_fill_sub_group_2.json | 14 ++-- .../60_2family_dynamic_outside_calc.json | 12 ++-- .../60_5family_dynamic_calc2.json | 12 ++-- .../60_5family_dynamic_calc_suffix.json | 12 ++-- .../60_5family_dynamic_calc_suffix2.json | 12 ++-- .../60_5family_dynamic_calc_suffix_param.json | 12 ++-- .../60_5family_dynamic_calc_variable.json | 12 ++-- .../60_5family_dynamic_unknown_suffix.json | 22 +------ .../60_5family_dynamic_variable_outside.json | 12 ++-- .../60_5family_dynamic_variable_outside2.json | 12 ++-- ...family_dynamic_variable_outside_jinja.json | 12 ++-- ...y_dynamic_variable_outside_sub_suffix.json | 34 +++------- ...amily_dynamic_variable_outside_suffix.json | 12 ++-- .../60_6family_dynamic_inside.json | 15 ++--- .../60_6family_dynamic_leadership.json | 28 ++------ .../60_6family_dynamic_sub_dynamic.json | 59 ++++------------- .../60_6family_dynamic_sub_dynamic_1_0.json | 59 ++++------------- .../60_6family_dynamic_sub_dynamic_empty.json | 28 +++----- .../60_9extra_dynamic.json | 12 +--- .../60_9extra_dynamic_extra.json | 12 +--- .../01_8calculation_information_multi.json | 4 +- .../60_0family_dynamic.json | 12 ++-- .../60_0family_dynamic_1_0.json | 12 ++-- .../60_0family_dynamic_1_0_type.json | 12 ++-- .../60_0family_dynamic_1_1.json | 12 ++-- .../60_0family_dynamic_jinja_number.json | 6 +- .../60_0family_dynamic_no_description.json | 12 ++-- .../60_0family_dynamic_variable_suffix.json | 12 ++-- ..._2family_dynamic_jinja_fill_sub_group.json | 14 ++-- ...family_dynamic_jinja_fill_sub_group_2.json | 14 ++-- .../60_2family_dynamic_outside_calc.json | 12 ++-- .../60_5family_dynamic_calc2.json | 12 ++-- .../60_5family_dynamic_calc_suffix.json | 12 ++-- .../60_5family_dynamic_calc_suffix2.json | 12 ++-- .../60_5family_dynamic_calc_suffix_param.json | 12 ++-- .../60_5family_dynamic_calc_variable.json | 12 ++-- .../60_5family_dynamic_unknown_suffix.json | 22 +------ .../60_5family_dynamic_variable_outside.json | 12 ++-- .../60_5family_dynamic_variable_outside2.json | 12 ++-- ...family_dynamic_variable_outside_jinja.json | 12 ++-- ...y_dynamic_variable_outside_sub_suffix.json | 34 +++------- ...amily_dynamic_variable_outside_suffix.json | 12 ++-- .../60_6family_dynamic_inside.json | 15 ++--- .../60_6family_dynamic_leadership.json | 28 ++------ .../60_6family_dynamic_sub_dynamic.json | 59 ++++------------- .../60_6family_dynamic_sub_dynamic_1_0.json | 59 ++++------------- .../60_6family_dynamic_sub_dynamic_empty.json | 28 +++----- .../60_9extra_dynamic.json | 12 +--- .../60_9extra_dynamic_extra.json | 12 +--- .../01_8calculation_information_multi.json | 9 ++- .../01_8calculation_information_multi.json | 4 +- .../60_0family_dynamic.json | 12 ++-- .../60_0family_dynamic_1_1.json | 12 ++-- .../60_0family_dynamic_no_description.json | 12 ++-- .../60_0family_dynamic_variable_suffix.json | 12 ++-- ..._2family_dynamic_jinja_fill_sub_group.json | 14 ++-- ...family_dynamic_jinja_fill_sub_group_2.json | 14 ++-- .../60_2family_dynamic_outside_calc.json | 12 ++-- .../60_5family_dynamic_calc_suffix2.json | 12 ++-- .../60_5family_dynamic_calc_suffix_param.json | 12 ++-- .../60_5family_dynamic_calc_variable.json | 12 ++-- ...amily_dynamic_variable_outside_suffix.json | 12 ++-- .../60_6family_dynamic_leadership.json | 28 ++------ .../01_8calculation_information_multi.json | 5 +- tests/test_load.py | 12 ++-- 126 files changed, 587 insertions(+), 1489 deletions(-) diff --git a/src/rougail/output_json/__init__.py b/src/rougail/output_json/__init__.py index 69ac945..e361851 100644 --- a/src/rougail/output_json/__init__.py +++ b/src/rougail/output_json/__init__.py @@ -22,30 +22,63 @@ from json import dumps from tiramisu import undefined from tiramisu.error import PropertiesOptionError, ConfigError +from rougail.error import ExtentionError from .i18n import _ class RougailOutputJson: + output_name = 'json' + def __init__( self, config: "Config", + *, rougailconfig: "RougailConfig" = None, user_data_errors: Optional[list] = None, user_data_warnings: Optional[list] = None, ) -> None: if rougailconfig is None: from rougail import RougailConfig - rougailconfig = RougailConfig + rougailconfig["step.output"] = self.output_name + if rougailconfig["step.output"] != self.output_name: + raise ExtentionError(_('the "step.output" is not set to "{0}"').format(self.output_name)) self.rougailconfig = rougailconfig self.config = config - self.errors = [] - self.warnings = [] + if user_data_errors: + self.errors = user_data_errors + else: + self.errors = [] + if user_data_warnings: + self.warnings = user_data_warnings + else: + self.warnings = [] self.read_write = self.rougailconfig["json.read_write"] self.is_mandatory = self.rougailconfig["json.mandatory"] self.dico = {} + def run(self) -> None: + self.exporter() + return dumps(self.dico, ensure_ascii=False, indent=2) + '\n' + + def print(self) -> str: + print(self.run()) + + def exporter(self) -> None: + self.config.property.read_write() + self.mandatory() + self.manage_warnings() + self.config.property.read_only() + if self.manage_errors(): + return + if self.read_write: + self.config.property.read_write() + self.parse_family( + self.config, + self.dico, + ) + def mandatory(self): if not self.is_mandatory: return @@ -79,29 +112,15 @@ class RougailOutputJson: ) self.errors.append(f" - {option.description()}") - def exporter(self) -> None: - self.config.property.read_write() - self.mandatory() - if self.errors: - self.dico = {"_errors": self.errors} - return + def manage_warnings(self) -> None: if self.warnings: self.dico["_warnings"] = self.warnings - if self.read_write: - self.config.property.read_write() - else: - self.config.property.read_only() - self.parse_family( - self.config, - self.dico, - ) - def run(self) -> None: - self.exporter() - return dumps(self.dico, ensure_ascii=False, indent=2) + '\n' - - def print(self) -> str: - print(self.run()) + def manage_errors(self) -> bool: + if not self.errors: + return False + self.dico = {"_errors": self.errors} + return True def parse_family( self, diff --git a/tests/results/test/60_0family_dynamic.json b/tests/results/test/60_0family_dynamic.json index a988670..3564f4f 100644 --- a/tests/results/test/60_0family_dynamic.json +++ b/tests/results/test/60_0family_dynamic.json @@ -1,16 +1,12 @@ { "var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "dynstring1": { + "dynval1": { "var": "string1" }, - "dynstring2": { - "var": "string1" - }, - "dynstring3": { + "dynval2": { "var": "string1" } } diff --git a/tests/results/test/60_0family_dynamic_1_1.json b/tests/results/test/60_0family_dynamic_1_1.json index ecefd28..e00e3f5 100644 --- a/tests/results/test/60_0family_dynamic_1_1.json +++ b/tests/results/test/60_0family_dynamic_1_1.json @@ -1,16 +1,12 @@ { "var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "dynstring1": { + "dynval1": { "vardyn": "string1" }, - "dynstring2": { - "vardyn": "string1" - }, - "dynstring3": { + "dynval2": { "vardyn": "string1" } } diff --git a/tests/results/test/60_0family_dynamic_no_description.json b/tests/results/test/60_0family_dynamic_no_description.json index a988670..3564f4f 100644 --- a/tests/results/test/60_0family_dynamic_no_description.json +++ b/tests/results/test/60_0family_dynamic_no_description.json @@ -1,16 +1,12 @@ { "var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "dynstring1": { + "dynval1": { "var": "string1" }, - "dynstring2": { - "var": "string1" - }, - "dynstring3": { + "dynval2": { "var": "string1" } } diff --git a/tests/results/test/60_0family_dynamic_variable_suffix.json b/tests/results/test/60_0family_dynamic_variable_suffix.json index a988670..3564f4f 100644 --- a/tests/results/test/60_0family_dynamic_variable_suffix.json +++ b/tests/results/test/60_0family_dynamic_variable_suffix.json @@ -1,16 +1,12 @@ { "var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "dynstring1": { + "dynval1": { "var": "string1" }, - "dynstring2": { - "var": "string1" - }, - "dynstring3": { + "dynval2": { "var": "string1" } } diff --git a/tests/results/test/60_2family_dynamic_jinja_fill_sub_group.json b/tests/results/test/60_2family_dynamic_jinja_fill_sub_group.json index d20690b..d084599 100644 --- a/tests/results/test/60_2family_dynamic_jinja_fill_sub_group.json +++ b/tests/results/test/60_2family_dynamic_jinja_fill_sub_group.json @@ -1,20 +1,14 @@ { "var1": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "dynstring1": { + "dynval1": { "family": { "var": "string1" } }, - "dynstring2": { - "family": { - "var": "string1" - } - }, - "dynstring3": { + "dynval2": { "family": { "var": "string1" } diff --git a/tests/results/test/60_2family_dynamic_jinja_fill_sub_group_2.json b/tests/results/test/60_2family_dynamic_jinja_fill_sub_group_2.json index e69a189..b8e4843 100644 --- a/tests/results/test/60_2family_dynamic_jinja_fill_sub_group_2.json +++ b/tests/results/test/60_2family_dynamic_jinja_fill_sub_group_2.json @@ -1,20 +1,14 @@ { "var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "dynstring1": { + "dynval1": { "family": { "var": "string1" } }, - "dynstring2": { - "family": { - "var": "string1" - } - }, - "dynstring3": { + "dynval2": { "family": { "var": "string1" } diff --git a/tests/results/test/60_2family_dynamic_outside_calc.json b/tests/results/test/60_2family_dynamic_outside_calc.json index eca0885..2d536f3 100644 --- a/tests/results/test/60_2family_dynamic_outside_calc.json +++ b/tests/results/test/60_2family_dynamic_outside_calc.json @@ -1,16 +1,12 @@ { "var1": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "dynstring1": { + "dynval1": { "var": "string1" }, - "dynstring2": { - "var": "string1" - }, - "dynstring3": { + "dynval2": { "var": "string1" }, "newvar": "string1" diff --git a/tests/results/test/60_5family_dynamic_calc_suffix2.json b/tests/results/test/60_5family_dynamic_calc_suffix2.json index a988670..3564f4f 100644 --- a/tests/results/test/60_5family_dynamic_calc_suffix2.json +++ b/tests/results/test/60_5family_dynamic_calc_suffix2.json @@ -1,16 +1,12 @@ { "var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "dynstring1": { + "dynval1": { "var": "string1" }, - "dynstring2": { - "var": "string1" - }, - "dynstring3": { + "dynval2": { "var": "string1" } } diff --git a/tests/results/test/60_5family_dynamic_calc_suffix_param.json b/tests/results/test/60_5family_dynamic_calc_suffix_param.json index a988670..3564f4f 100644 --- a/tests/results/test/60_5family_dynamic_calc_suffix_param.json +++ b/tests/results/test/60_5family_dynamic_calc_suffix_param.json @@ -1,16 +1,12 @@ { "var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "dynstring1": { + "dynval1": { "var": "string1" }, - "dynstring2": { - "var": "string1" - }, - "dynstring3": { + "dynval2": { "var": "string1" } } diff --git a/tests/results/test/60_5family_dynamic_calc_variable.json b/tests/results/test/60_5family_dynamic_calc_variable.json index eba79c1..0f8a696 100644 --- a/tests/results/test/60_5family_dynamic_calc_variable.json +++ b/tests/results/test/60_5family_dynamic_calc_variable.json @@ -1,16 +1,12 @@ { "var1": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "dynstring1": { + "dynval1": { "var": "string1" }, - "dynstring2": { - "var": "string1" - }, - "dynstring3": { + "dynval2": { "var": "string1" }, "var2": "string1" diff --git a/tests/results/test/60_5family_dynamic_variable_outside_suffix.json b/tests/results/test/60_5family_dynamic_variable_outside_suffix.json index dfd8f66..5d8a89c 100644 --- a/tests/results/test/60_5family_dynamic_variable_outside_suffix.json +++ b/tests/results/test/60_5family_dynamic_variable_outside_suffix.json @@ -1,16 +1,12 @@ { "var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "dyn_string1": { + "dyn_val1": { "var": "string1" }, - "dyn_string2": { - "var": "string1" - }, - "dyn_string3": { + "dyn_val2": { "var": "string1" }, "var2": "string1" diff --git a/tests/results/test/60_6family_dynamic_leadership.json b/tests/results/test/60_6family_dynamic_leadership.json index 7cad30f..0f69837 100644 --- a/tests/results/test/60_6family_dynamic_leadership.json +++ b/tests/results/test/60_6family_dynamic_leadership.json @@ -1,10 +1,9 @@ { "var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "dynstring1": { + "dynval1": { "leadership": [ { "leader": "string1", @@ -23,26 +22,7 @@ } ] }, - "dynstring2": { - "leadership": [ - { - "leader": "string1", - "follower1": "string1", - "follower2": "string1" - }, - { - "leader": "string2", - "follower1": "string2", - "follower2": "string2" - }, - { - "leader": "string3", - "follower1": "string3", - "follower2": "string3" - } - ] - }, - "dynstring3": { + "dynval2": { "leadership": [ { "leader": "string1", diff --git a/tests/results/test_mandatory/60_0family_dynamic.json b/tests/results/test_mandatory/60_0family_dynamic.json index a988670..3564f4f 100644 --- a/tests/results/test_mandatory/60_0family_dynamic.json +++ b/tests/results/test_mandatory/60_0family_dynamic.json @@ -1,16 +1,12 @@ { "var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "dynstring1": { + "dynval1": { "var": "string1" }, - "dynstring2": { - "var": "string1" - }, - "dynstring3": { + "dynval2": { "var": "string1" } } diff --git a/tests/results/test_mandatory/60_0family_dynamic_1_1.json b/tests/results/test_mandatory/60_0family_dynamic_1_1.json index ecefd28..e00e3f5 100644 --- a/tests/results/test_mandatory/60_0family_dynamic_1_1.json +++ b/tests/results/test_mandatory/60_0family_dynamic_1_1.json @@ -1,16 +1,12 @@ { "var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "dynstring1": { + "dynval1": { "vardyn": "string1" }, - "dynstring2": { - "vardyn": "string1" - }, - "dynstring3": { + "dynval2": { "vardyn": "string1" } } diff --git a/tests/results/test_mandatory/60_0family_dynamic_no_description.json b/tests/results/test_mandatory/60_0family_dynamic_no_description.json index a988670..3564f4f 100644 --- a/tests/results/test_mandatory/60_0family_dynamic_no_description.json +++ b/tests/results/test_mandatory/60_0family_dynamic_no_description.json @@ -1,16 +1,12 @@ { "var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "dynstring1": { + "dynval1": { "var": "string1" }, - "dynstring2": { - "var": "string1" - }, - "dynstring3": { + "dynval2": { "var": "string1" } } diff --git a/tests/results/test_mandatory/60_0family_dynamic_variable_suffix.json b/tests/results/test_mandatory/60_0family_dynamic_variable_suffix.json index a988670..3564f4f 100644 --- a/tests/results/test_mandatory/60_0family_dynamic_variable_suffix.json +++ b/tests/results/test_mandatory/60_0family_dynamic_variable_suffix.json @@ -1,16 +1,12 @@ { "var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "dynstring1": { + "dynval1": { "var": "string1" }, - "dynstring2": { - "var": "string1" - }, - "dynstring3": { + "dynval2": { "var": "string1" } } diff --git a/tests/results/test_mandatory/60_2family_dynamic_jinja_fill_sub_group.json b/tests/results/test_mandatory/60_2family_dynamic_jinja_fill_sub_group.json index d20690b..d084599 100644 --- a/tests/results/test_mandatory/60_2family_dynamic_jinja_fill_sub_group.json +++ b/tests/results/test_mandatory/60_2family_dynamic_jinja_fill_sub_group.json @@ -1,20 +1,14 @@ { "var1": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "dynstring1": { + "dynval1": { "family": { "var": "string1" } }, - "dynstring2": { - "family": { - "var": "string1" - } - }, - "dynstring3": { + "dynval2": { "family": { "var": "string1" } diff --git a/tests/results/test_mandatory/60_2family_dynamic_jinja_fill_sub_group_2.json b/tests/results/test_mandatory/60_2family_dynamic_jinja_fill_sub_group_2.json index e69a189..b8e4843 100644 --- a/tests/results/test_mandatory/60_2family_dynamic_jinja_fill_sub_group_2.json +++ b/tests/results/test_mandatory/60_2family_dynamic_jinja_fill_sub_group_2.json @@ -1,20 +1,14 @@ { "var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "dynstring1": { + "dynval1": { "family": { "var": "string1" } }, - "dynstring2": { - "family": { - "var": "string1" - } - }, - "dynstring3": { + "dynval2": { "family": { "var": "string1" } diff --git a/tests/results/test_mandatory/60_2family_dynamic_outside_calc.json b/tests/results/test_mandatory/60_2family_dynamic_outside_calc.json index eca0885..2d536f3 100644 --- a/tests/results/test_mandatory/60_2family_dynamic_outside_calc.json +++ b/tests/results/test_mandatory/60_2family_dynamic_outside_calc.json @@ -1,16 +1,12 @@ { "var1": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "dynstring1": { + "dynval1": { "var": "string1" }, - "dynstring2": { - "var": "string1" - }, - "dynstring3": { + "dynval2": { "var": "string1" }, "newvar": "string1" diff --git a/tests/results/test_mandatory/60_5family_dynamic_calc_suffix2.json b/tests/results/test_mandatory/60_5family_dynamic_calc_suffix2.json index a988670..3564f4f 100644 --- a/tests/results/test_mandatory/60_5family_dynamic_calc_suffix2.json +++ b/tests/results/test_mandatory/60_5family_dynamic_calc_suffix2.json @@ -1,16 +1,12 @@ { "var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "dynstring1": { + "dynval1": { "var": "string1" }, - "dynstring2": { - "var": "string1" - }, - "dynstring3": { + "dynval2": { "var": "string1" } } diff --git a/tests/results/test_mandatory/60_5family_dynamic_calc_suffix_param.json b/tests/results/test_mandatory/60_5family_dynamic_calc_suffix_param.json index a988670..3564f4f 100644 --- a/tests/results/test_mandatory/60_5family_dynamic_calc_suffix_param.json +++ b/tests/results/test_mandatory/60_5family_dynamic_calc_suffix_param.json @@ -1,16 +1,12 @@ { "var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "dynstring1": { + "dynval1": { "var": "string1" }, - "dynstring2": { - "var": "string1" - }, - "dynstring3": { + "dynval2": { "var": "string1" } } diff --git a/tests/results/test_mandatory/60_5family_dynamic_calc_variable.json b/tests/results/test_mandatory/60_5family_dynamic_calc_variable.json index eba79c1..0f8a696 100644 --- a/tests/results/test_mandatory/60_5family_dynamic_calc_variable.json +++ b/tests/results/test_mandatory/60_5family_dynamic_calc_variable.json @@ -1,16 +1,12 @@ { "var1": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "dynstring1": { + "dynval1": { "var": "string1" }, - "dynstring2": { - "var": "string1" - }, - "dynstring3": { + "dynval2": { "var": "string1" }, "var2": "string1" diff --git a/tests/results/test_mandatory/60_5family_dynamic_variable_outside_suffix.json b/tests/results/test_mandatory/60_5family_dynamic_variable_outside_suffix.json index dfd8f66..5d8a89c 100644 --- a/tests/results/test_mandatory/60_5family_dynamic_variable_outside_suffix.json +++ b/tests/results/test_mandatory/60_5family_dynamic_variable_outside_suffix.json @@ -1,16 +1,12 @@ { "var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "dyn_string1": { + "dyn_val1": { "var": "string1" }, - "dyn_string2": { - "var": "string1" - }, - "dyn_string3": { + "dyn_val2": { "var": "string1" }, "var2": "string1" diff --git a/tests/results/test_mandatory/60_6family_dynamic_leadership.json b/tests/results/test_mandatory/60_6family_dynamic_leadership.json index 7cad30f..0f69837 100644 --- a/tests/results/test_mandatory/60_6family_dynamic_leadership.json +++ b/tests/results/test_mandatory/60_6family_dynamic_leadership.json @@ -1,10 +1,9 @@ { "var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "dynstring1": { + "dynval1": { "leadership": [ { "leader": "string1", @@ -23,26 +22,7 @@ } ] }, - "dynstring2": { - "leadership": [ - { - "leader": "string1", - "follower1": "string1", - "follower2": "string1" - }, - { - "leader": "string2", - "follower1": "string2", - "follower2": "string2" - }, - { - "leader": "string3", - "follower1": "string3", - "follower2": "string3" - } - ] - }, - "dynstring3": { + "dynval2": { "leadership": [ { "leader": "string1", diff --git a/tests/results/test_namespace/60_0family_dynamic.json b/tests/results/test_namespace/60_0family_dynamic.json index 56e63f7..ce2610b 100644 --- a/tests/results/test_namespace/60_0family_dynamic.json +++ b/tests/results/test_namespace/60_0family_dynamic.json @@ -1,17 +1,13 @@ { "rougail": { "var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "dynstring1": { + "dynval1": { "var": "string1" }, - "dynstring2": { - "var": "string1" - }, - "dynstring3": { + "dynval2": { "var": "string1" } } diff --git a/tests/results/test_namespace/60_0family_dynamic_1_0.json b/tests/results/test_namespace/60_0family_dynamic_1_0.json index 11e351d..f3613dc 100644 --- a/tests/results/test_namespace/60_0family_dynamic_1_0.json +++ b/tests/results/test_namespace/60_0family_dynamic_1_0.json @@ -1,17 +1,13 @@ { "rougail": { "var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "dynstring1": { + "dynval1": { "vardyn": "string1" }, - "dynstring2": { - "vardyn": "string1" - }, - "dynstring3": { + "dynval2": { "vardyn": "string1" } } diff --git a/tests/results/test_namespace/60_0family_dynamic_1_0_type.json b/tests/results/test_namespace/60_0family_dynamic_1_0_type.json index 11e351d..f3613dc 100644 --- a/tests/results/test_namespace/60_0family_dynamic_1_0_type.json +++ b/tests/results/test_namespace/60_0family_dynamic_1_0_type.json @@ -1,17 +1,13 @@ { "rougail": { "var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "dynstring1": { + "dynval1": { "vardyn": "string1" }, - "dynstring2": { - "vardyn": "string1" - }, - "dynstring3": { + "dynval2": { "vardyn": "string1" } } diff --git a/tests/results/test_namespace/60_0family_dynamic_1_1.json b/tests/results/test_namespace/60_0family_dynamic_1_1.json index 11e351d..f3613dc 100644 --- a/tests/results/test_namespace/60_0family_dynamic_1_1.json +++ b/tests/results/test_namespace/60_0family_dynamic_1_1.json @@ -1,17 +1,13 @@ { "rougail": { "var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "dynstring1": { + "dynval1": { "vardyn": "string1" }, - "dynstring2": { - "vardyn": "string1" - }, - "dynstring3": { + "dynval2": { "vardyn": "string1" } } diff --git a/tests/results/test_namespace/60_0family_dynamic_jinja_number.json b/tests/results/test_namespace/60_0family_dynamic_jinja_number.json index 5df1a91..d992251 100644 --- a/tests/results/test_namespace/60_0family_dynamic_jinja_number.json +++ b/tests/results/test_namespace/60_0family_dynamic_jinja_number.json @@ -2,8 +2,7 @@ "rougail": { "var": [ 1, - 2, - 3 + 2 ], "dyn1": { "var": "string1" @@ -11,9 +10,6 @@ "dyn2": { "var": "string1" }, - "dyn3": { - "var": "string1" - }, "var2": "string1" } } diff --git a/tests/results/test_namespace/60_0family_dynamic_no_description.json b/tests/results/test_namespace/60_0family_dynamic_no_description.json index 56e63f7..ce2610b 100644 --- a/tests/results/test_namespace/60_0family_dynamic_no_description.json +++ b/tests/results/test_namespace/60_0family_dynamic_no_description.json @@ -1,17 +1,13 @@ { "rougail": { "var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "dynstring1": { + "dynval1": { "var": "string1" }, - "dynstring2": { - "var": "string1" - }, - "dynstring3": { + "dynval2": { "var": "string1" } } diff --git a/tests/results/test_namespace/60_0family_dynamic_variable_suffix.json b/tests/results/test_namespace/60_0family_dynamic_variable_suffix.json index 56e63f7..ce2610b 100644 --- a/tests/results/test_namespace/60_0family_dynamic_variable_suffix.json +++ b/tests/results/test_namespace/60_0family_dynamic_variable_suffix.json @@ -1,17 +1,13 @@ { "rougail": { "var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "dynstring1": { + "dynval1": { "var": "string1" }, - "dynstring2": { - "var": "string1" - }, - "dynstring3": { + "dynval2": { "var": "string1" } } diff --git a/tests/results/test_namespace/60_2family_dynamic_jinja_fill_sub_group.json b/tests/results/test_namespace/60_2family_dynamic_jinja_fill_sub_group.json index 4ca6f3c..2a66dbb 100644 --- a/tests/results/test_namespace/60_2family_dynamic_jinja_fill_sub_group.json +++ b/tests/results/test_namespace/60_2family_dynamic_jinja_fill_sub_group.json @@ -1,21 +1,15 @@ { "rougail": { "var1": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "dynstring1": { + "dynval1": { "family": { "var": "string1" } }, - "dynstring2": { - "family": { - "var": "string1" - } - }, - "dynstring3": { + "dynval2": { "family": { "var": "string1" } diff --git a/tests/results/test_namespace/60_2family_dynamic_jinja_fill_sub_group_2.json b/tests/results/test_namespace/60_2family_dynamic_jinja_fill_sub_group_2.json index a4889cb..1be3b0a 100644 --- a/tests/results/test_namespace/60_2family_dynamic_jinja_fill_sub_group_2.json +++ b/tests/results/test_namespace/60_2family_dynamic_jinja_fill_sub_group_2.json @@ -1,21 +1,15 @@ { "rougail": { "var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "dynstring1": { + "dynval1": { "family": { "var": "string1" } }, - "dynstring2": { - "family": { - "var": "string1" - } - }, - "dynstring3": { + "dynval2": { "family": { "var": "string1" } diff --git a/tests/results/test_namespace/60_2family_dynamic_outside_calc.json b/tests/results/test_namespace/60_2family_dynamic_outside_calc.json index 58eb2cb..38aa9a9 100644 --- a/tests/results/test_namespace/60_2family_dynamic_outside_calc.json +++ b/tests/results/test_namespace/60_2family_dynamic_outside_calc.json @@ -1,17 +1,13 @@ { "rougail": { "var1": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "dynstring1": { + "dynval1": { "var": "string1" }, - "dynstring2": { - "var": "string1" - }, - "dynstring3": { + "dynval2": { "var": "string1" }, "newvar": "string1" diff --git a/tests/results/test_namespace/60_5family_dynamic_calc2.json b/tests/results/test_namespace/60_5family_dynamic_calc2.json index 668831b..2d4e2ad 100644 --- a/tests/results/test_namespace/60_5family_dynamic_calc2.json +++ b/tests/results/test_namespace/60_5family_dynamic_calc2.json @@ -1,18 +1,14 @@ { "rougail": { "var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], "var2": "string1", - "dynstring1": { + "dynval1": { "vardyn": "string1" }, - "dynstring2": { - "vardyn": "string1" - }, - "dynstring3": { + "dynval2": { "vardyn": "string1" } } diff --git a/tests/results/test_namespace/60_5family_dynamic_calc_suffix.json b/tests/results/test_namespace/60_5family_dynamic_calc_suffix.json index f63787d..92c86d8 100644 --- a/tests/results/test_namespace/60_5family_dynamic_calc_suffix.json +++ b/tests/results/test_namespace/60_5family_dynamic_calc_suffix.json @@ -1,17 +1,13 @@ { "rougail": { "var1": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "dynstring1": { + "dynval1": { "var": "string1" }, - "dynstring2": { - "var": "string1" - }, - "dynstring3": { + "dynval2": { "var": "string1" }, "var2": "string1" diff --git a/tests/results/test_namespace/60_5family_dynamic_calc_suffix2.json b/tests/results/test_namespace/60_5family_dynamic_calc_suffix2.json index 56e63f7..ce2610b 100644 --- a/tests/results/test_namespace/60_5family_dynamic_calc_suffix2.json +++ b/tests/results/test_namespace/60_5family_dynamic_calc_suffix2.json @@ -1,17 +1,13 @@ { "rougail": { "var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "dynstring1": { + "dynval1": { "var": "string1" }, - "dynstring2": { - "var": "string1" - }, - "dynstring3": { + "dynval2": { "var": "string1" } } diff --git a/tests/results/test_namespace/60_5family_dynamic_calc_suffix_param.json b/tests/results/test_namespace/60_5family_dynamic_calc_suffix_param.json index 56e63f7..ce2610b 100644 --- a/tests/results/test_namespace/60_5family_dynamic_calc_suffix_param.json +++ b/tests/results/test_namespace/60_5family_dynamic_calc_suffix_param.json @@ -1,17 +1,13 @@ { "rougail": { "var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "dynstring1": { + "dynval1": { "var": "string1" }, - "dynstring2": { - "var": "string1" - }, - "dynstring3": { + "dynval2": { "var": "string1" } } diff --git a/tests/results/test_namespace/60_5family_dynamic_calc_variable.json b/tests/results/test_namespace/60_5family_dynamic_calc_variable.json index f63787d..92c86d8 100644 --- a/tests/results/test_namespace/60_5family_dynamic_calc_variable.json +++ b/tests/results/test_namespace/60_5family_dynamic_calc_variable.json @@ -1,17 +1,13 @@ { "rougail": { "var1": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "dynstring1": { + "dynval1": { "var": "string1" }, - "dynstring2": { - "var": "string1" - }, - "dynstring3": { + "dynval2": { "var": "string1" }, "var2": "string1" diff --git a/tests/results/test_namespace/60_5family_dynamic_unknown_suffix.json b/tests/results/test_namespace/60_5family_dynamic_unknown_suffix.json index e345de4..c8671e7 100644 --- a/tests/results/test_namespace/60_5family_dynamic_unknown_suffix.json +++ b/tests/results/test_namespace/60_5family_dynamic_unknown_suffix.json @@ -2,33 +2,17 @@ "rougail": { "var": [ "val1", - "val2", - "val3", - "val4" + "val2" ], "val1_dyn": { "var1": "string1", "var2": "string1", - "var3": "string1", - "var4": "string1" + "var3": "string1" }, "val2_dyn": { "var1": "string1", "var2": "string1", - "var3": "string1", - "var4": "string1" - }, - "val3_dyn": { - "var1": "string1", - "var2": "string1", - "var3": "string1", - "var4": "string1" - }, - "val4_dyn": { - "var1": "string1", - "var2": "string1", - "var3": "string1", - "var4": "string1" + "var3": "string1" } } } diff --git a/tests/results/test_namespace/60_5family_dynamic_variable_outside.json b/tests/results/test_namespace/60_5family_dynamic_variable_outside.json index 914ad45..75b04e8 100644 --- a/tests/results/test_namespace/60_5family_dynamic_variable_outside.json +++ b/tests/results/test_namespace/60_5family_dynamic_variable_outside.json @@ -1,17 +1,13 @@ { "rougail": { "var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "my_dyn_family_string1": { + "my_dyn_family_val1": { "var": "string1" }, - "my_dyn_family_string2": { - "var": "string1" - }, - "my_dyn_family_string3": { + "my_dyn_family_val2": { "var": "string1" }, "var2": [ diff --git a/tests/results/test_namespace/60_5family_dynamic_variable_outside2.json b/tests/results/test_namespace/60_5family_dynamic_variable_outside2.json index ca7b4d7..00a19bf 100644 --- a/tests/results/test_namespace/60_5family_dynamic_variable_outside2.json +++ b/tests/results/test_namespace/60_5family_dynamic_variable_outside2.json @@ -6,17 +6,13 @@ "string3" ], "var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "my_dyn_family_string1": { + "my_dyn_family_val1": { "var": "string1" }, - "my_dyn_family_string2": { - "var": "string1" - }, - "my_dyn_family_string3": { + "my_dyn_family_val2": { "var": "string1" } } diff --git a/tests/results/test_namespace/60_5family_dynamic_variable_outside_jinja.json b/tests/results/test_namespace/60_5family_dynamic_variable_outside_jinja.json index 914ad45..75b04e8 100644 --- a/tests/results/test_namespace/60_5family_dynamic_variable_outside_jinja.json +++ b/tests/results/test_namespace/60_5family_dynamic_variable_outside_jinja.json @@ -1,17 +1,13 @@ { "rougail": { "var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "my_dyn_family_string1": { + "my_dyn_family_val1": { "var": "string1" }, - "my_dyn_family_string2": { - "var": "string1" - }, - "my_dyn_family_string3": { + "my_dyn_family_val2": { "var": "string1" }, "var2": [ diff --git a/tests/results/test_namespace/60_5family_dynamic_variable_outside_sub_suffix.json b/tests/results/test_namespace/60_5family_dynamic_variable_outside_sub_suffix.json index c11f6cb..0716c7d 100644 --- a/tests/results/test_namespace/60_5family_dynamic_variable_outside_sub_suffix.json +++ b/tests/results/test_namespace/60_5family_dynamic_variable_outside_sub_suffix.json @@ -1,40 +1,22 @@ { "rougail": { "var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "my_dyn_family_string1": { - "subdyn_string1": { + "my_dyn_family_val1": { + "subdyn_val1": { "var": "string1" }, - "subdyn_string2": { - "var": "string1" - }, - "subdyn_string3": { + "subdyn_val2": { "var": "string1" } }, - "my_dyn_family_string2": { - "subdyn_string1": { + "my_dyn_family_val2": { + "subdyn_val1": { "var": "string1" }, - "subdyn_string2": { - "var": "string1" - }, - "subdyn_string3": { - "var": "string1" - } - }, - "my_dyn_family_string3": { - "subdyn_string1": { - "var": "string1" - }, - "subdyn_string2": { - "var": "string1" - }, - "subdyn_string3": { + "subdyn_val2": { "var": "string1" } }, diff --git a/tests/results/test_namespace/60_5family_dynamic_variable_outside_suffix.json b/tests/results/test_namespace/60_5family_dynamic_variable_outside_suffix.json index 5ea2aad..2aee889 100644 --- a/tests/results/test_namespace/60_5family_dynamic_variable_outside_suffix.json +++ b/tests/results/test_namespace/60_5family_dynamic_variable_outside_suffix.json @@ -1,17 +1,13 @@ { "rougail": { "var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "dyn_string1": { + "dyn_val1": { "var": "string1" }, - "dyn_string2": { - "var": "string1" - }, - "dyn_string3": { + "dyn_val2": { "var": "string1" }, "var2": "string1" diff --git a/tests/results/test_namespace/60_6family_dynamic_inside.json b/tests/results/test_namespace/60_6family_dynamic_inside.json index 366c04d..8bec218 100644 --- a/tests/results/test_namespace/60_6family_dynamic_inside.json +++ b/tests/results/test_namespace/60_6family_dynamic_inside.json @@ -1,23 +1,16 @@ { "rougail": { "var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "string1_dyn": { + "val1_dyn": { "var1": "string1", "var2": "string1", "var3": "string1", "var4": "string1" }, - "string2_dyn": { - "var1": "string1", - "var2": "string1", - "var3": "string1", - "var4": "string1" - }, - "string3_dyn": { + "val2_dyn": { "var1": "string1", "var2": "string1", "var3": "string1", diff --git a/tests/results/test_namespace/60_6family_dynamic_leadership.json b/tests/results/test_namespace/60_6family_dynamic_leadership.json index ccb3737..8d96b71 100644 --- a/tests/results/test_namespace/60_6family_dynamic_leadership.json +++ b/tests/results/test_namespace/60_6family_dynamic_leadership.json @@ -1,11 +1,10 @@ { "rougail": { "var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "dynstring1": { + "dynval1": { "leadership": [ { "leader": "string1", @@ -24,26 +23,7 @@ } ] }, - "dynstring2": { - "leadership": [ - { - "leader": "string1", - "follower1": "string1", - "follower2": "string1" - }, - { - "leader": "string2", - "follower1": "string2", - "follower2": "string2" - }, - { - "leader": "string3", - "follower1": "string3", - "follower2": "string3" - } - ] - }, - "dynstring3": { + "dynval2": { "leadership": [ { "leader": "string1", diff --git a/tests/results/test_namespace/60_6family_dynamic_sub_dynamic.json b/tests/results/test_namespace/60_6family_dynamic_sub_dynamic.json index 7858d6d..3060613 100644 --- a/tests/results/test_namespace/60_6family_dynamic_sub_dynamic.json +++ b/tests/results/test_namespace/60_6family_dynamic_sub_dynamic.json @@ -1,71 +1,36 @@ { "rougail": { "var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "dynstring1": { + "dynval1": { "var": [ - "string1", - "string2", - "string3" + "tval1", + "tval2" ], - "dyn_string1": { + "dyn_tval1": { "var": "string1", "var_identifier": "string1", "var_identifiers": "string1" }, - "dyn_string2": { - "var": "string1", - "var_identifier": "string1", - "var_identifiers": "string1" - }, - "dyn_string3": { + "dyn_tval2": { "var": "string1", "var_identifier": "string1", "var_identifiers": "string1" } }, - "dynstring2": { + "dynval2": { "var": [ - "string1", - "string2", - "string3" + "tval1", + "tval2" ], - "dyn_string1": { + "dyn_tval1": { "var": "string1", "var_identifier": "string1", "var_identifiers": "string1" }, - "dyn_string2": { - "var": "string1", - "var_identifier": "string1", - "var_identifiers": "string1" - }, - "dyn_string3": { - "var": "string1", - "var_identifier": "string1", - "var_identifiers": "string1" - } - }, - "dynstring3": { - "var": [ - "string1", - "string2", - "string3" - ], - "dyn_string1": { - "var": "string1", - "var_identifier": "string1", - "var_identifiers": "string1" - }, - "dyn_string2": { - "var": "string1", - "var_identifier": "string1", - "var_identifiers": "string1" - }, - "dyn_string3": { + "dyn_tval2": { "var": "string1", "var_identifier": "string1", "var_identifiers": "string1" diff --git a/tests/results/test_namespace/60_6family_dynamic_sub_dynamic_1_0.json b/tests/results/test_namespace/60_6family_dynamic_sub_dynamic_1_0.json index 7858d6d..3060613 100644 --- a/tests/results/test_namespace/60_6family_dynamic_sub_dynamic_1_0.json +++ b/tests/results/test_namespace/60_6family_dynamic_sub_dynamic_1_0.json @@ -1,71 +1,36 @@ { "rougail": { "var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "dynstring1": { + "dynval1": { "var": [ - "string1", - "string2", - "string3" + "tval1", + "tval2" ], - "dyn_string1": { + "dyn_tval1": { "var": "string1", "var_identifier": "string1", "var_identifiers": "string1" }, - "dyn_string2": { - "var": "string1", - "var_identifier": "string1", - "var_identifiers": "string1" - }, - "dyn_string3": { + "dyn_tval2": { "var": "string1", "var_identifier": "string1", "var_identifiers": "string1" } }, - "dynstring2": { + "dynval2": { "var": [ - "string1", - "string2", - "string3" + "tval1", + "tval2" ], - "dyn_string1": { + "dyn_tval1": { "var": "string1", "var_identifier": "string1", "var_identifiers": "string1" }, - "dyn_string2": { - "var": "string1", - "var_identifier": "string1", - "var_identifiers": "string1" - }, - "dyn_string3": { - "var": "string1", - "var_identifier": "string1", - "var_identifiers": "string1" - } - }, - "dynstring3": { - "var": [ - "string1", - "string2", - "string3" - ], - "dyn_string1": { - "var": "string1", - "var_identifier": "string1", - "var_identifiers": "string1" - }, - "dyn_string2": { - "var": "string1", - "var_identifier": "string1", - "var_identifiers": "string1" - }, - "dyn_string3": { + "dyn_tval2": { "var": "string1", "var_identifier": "string1", "var_identifiers": "string1" diff --git a/tests/results/test_namespace/60_6family_dynamic_sub_dynamic_empty.json b/tests/results/test_namespace/60_6family_dynamic_sub_dynamic_empty.json index e2040a5..3060613 100644 --- a/tests/results/test_namespace/60_6family_dynamic_sub_dynamic_empty.json +++ b/tests/results/test_namespace/60_6family_dynamic_sub_dynamic_empty.json @@ -6,21 +6,15 @@ ], "dynval1": { "var": [ - "string1", - "string2", - "string3" + "tval1", + "tval2" ], - "dyn_string1": { + "dyn_tval1": { "var": "string1", "var_identifier": "string1", "var_identifiers": "string1" }, - "dyn_string2": { - "var": "string1", - "var_identifier": "string1", - "var_identifiers": "string1" - }, - "dyn_string3": { + "dyn_tval2": { "var": "string1", "var_identifier": "string1", "var_identifiers": "string1" @@ -28,21 +22,15 @@ }, "dynval2": { "var": [ - "string1", - "string2", - "string3" + "tval1", + "tval2" ], - "dyn_string1": { + "dyn_tval1": { "var": "string1", "var_identifier": "string1", "var_identifiers": "string1" }, - "dyn_string2": { - "var": "string1", - "var_identifier": "string1", - "var_identifiers": "string1" - }, - "dyn_string3": { + "dyn_tval2": { "var": "string1", "var_identifier": "string1", "var_identifiers": "string1" diff --git a/tests/results/test_namespace/60_9extra_dynamic.json b/tests/results/test_namespace/60_9extra_dynamic.json index 25a2188..ba01f78 100644 --- a/tests/results/test_namespace/60_9extra_dynamic.json +++ b/tests/results/test_namespace/60_9extra_dynamic.json @@ -1,19 +1,11 @@ { "rougail": { "var": [ - "string1", - "string2", - "string3" + "a" ] }, "extra": { - "dyn_string1": { - "var": "string1" - }, - "dyn_string2": { - "var": "string1" - }, - "dyn_string3": { + "dyn_a": { "var": "string1" } } diff --git a/tests/results/test_namespace/60_9extra_dynamic_extra.json b/tests/results/test_namespace/60_9extra_dynamic_extra.json index a5bff83..af68cf5 100644 --- a/tests/results/test_namespace/60_9extra_dynamic_extra.json +++ b/tests/results/test_namespace/60_9extra_dynamic_extra.json @@ -10,17 +10,9 @@ }, "extra": { "var": [ - "string1", - "string2", - "string3" + "a" ], - "dyn_string1": { - "var": "string1" - }, - "dyn_string2": { - "var": "string1" - }, - "dyn_string3": { + "dyn_a": { "var": "string1" } } diff --git a/tests/results/test_namespace_mandatory/60_0family_dynamic.json b/tests/results/test_namespace_mandatory/60_0family_dynamic.json index 56e63f7..ce2610b 100644 --- a/tests/results/test_namespace_mandatory/60_0family_dynamic.json +++ b/tests/results/test_namespace_mandatory/60_0family_dynamic.json @@ -1,17 +1,13 @@ { "rougail": { "var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "dynstring1": { + "dynval1": { "var": "string1" }, - "dynstring2": { - "var": "string1" - }, - "dynstring3": { + "dynval2": { "var": "string1" } } diff --git a/tests/results/test_namespace_mandatory/60_0family_dynamic_1_0.json b/tests/results/test_namespace_mandatory/60_0family_dynamic_1_0.json index 11e351d..f3613dc 100644 --- a/tests/results/test_namespace_mandatory/60_0family_dynamic_1_0.json +++ b/tests/results/test_namespace_mandatory/60_0family_dynamic_1_0.json @@ -1,17 +1,13 @@ { "rougail": { "var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "dynstring1": { + "dynval1": { "vardyn": "string1" }, - "dynstring2": { - "vardyn": "string1" - }, - "dynstring3": { + "dynval2": { "vardyn": "string1" } } diff --git a/tests/results/test_namespace_mandatory/60_0family_dynamic_1_0_type.json b/tests/results/test_namespace_mandatory/60_0family_dynamic_1_0_type.json index 11e351d..f3613dc 100644 --- a/tests/results/test_namespace_mandatory/60_0family_dynamic_1_0_type.json +++ b/tests/results/test_namespace_mandatory/60_0family_dynamic_1_0_type.json @@ -1,17 +1,13 @@ { "rougail": { "var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "dynstring1": { + "dynval1": { "vardyn": "string1" }, - "dynstring2": { - "vardyn": "string1" - }, - "dynstring3": { + "dynval2": { "vardyn": "string1" } } diff --git a/tests/results/test_namespace_mandatory/60_0family_dynamic_1_1.json b/tests/results/test_namespace_mandatory/60_0family_dynamic_1_1.json index 11e351d..f3613dc 100644 --- a/tests/results/test_namespace_mandatory/60_0family_dynamic_1_1.json +++ b/tests/results/test_namespace_mandatory/60_0family_dynamic_1_1.json @@ -1,17 +1,13 @@ { "rougail": { "var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "dynstring1": { + "dynval1": { "vardyn": "string1" }, - "dynstring2": { - "vardyn": "string1" - }, - "dynstring3": { + "dynval2": { "vardyn": "string1" } } diff --git a/tests/results/test_namespace_mandatory/60_0family_dynamic_jinja_number.json b/tests/results/test_namespace_mandatory/60_0family_dynamic_jinja_number.json index 5df1a91..d992251 100644 --- a/tests/results/test_namespace_mandatory/60_0family_dynamic_jinja_number.json +++ b/tests/results/test_namespace_mandatory/60_0family_dynamic_jinja_number.json @@ -2,8 +2,7 @@ "rougail": { "var": [ 1, - 2, - 3 + 2 ], "dyn1": { "var": "string1" @@ -11,9 +10,6 @@ "dyn2": { "var": "string1" }, - "dyn3": { - "var": "string1" - }, "var2": "string1" } } diff --git a/tests/results/test_namespace_mandatory/60_0family_dynamic_no_description.json b/tests/results/test_namespace_mandatory/60_0family_dynamic_no_description.json index 56e63f7..ce2610b 100644 --- a/tests/results/test_namespace_mandatory/60_0family_dynamic_no_description.json +++ b/tests/results/test_namespace_mandatory/60_0family_dynamic_no_description.json @@ -1,17 +1,13 @@ { "rougail": { "var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "dynstring1": { + "dynval1": { "var": "string1" }, - "dynstring2": { - "var": "string1" - }, - "dynstring3": { + "dynval2": { "var": "string1" } } diff --git a/tests/results/test_namespace_mandatory/60_0family_dynamic_variable_suffix.json b/tests/results/test_namespace_mandatory/60_0family_dynamic_variable_suffix.json index 56e63f7..ce2610b 100644 --- a/tests/results/test_namespace_mandatory/60_0family_dynamic_variable_suffix.json +++ b/tests/results/test_namespace_mandatory/60_0family_dynamic_variable_suffix.json @@ -1,17 +1,13 @@ { "rougail": { "var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "dynstring1": { + "dynval1": { "var": "string1" }, - "dynstring2": { - "var": "string1" - }, - "dynstring3": { + "dynval2": { "var": "string1" } } diff --git a/tests/results/test_namespace_mandatory/60_2family_dynamic_jinja_fill_sub_group.json b/tests/results/test_namespace_mandatory/60_2family_dynamic_jinja_fill_sub_group.json index 4ca6f3c..2a66dbb 100644 --- a/tests/results/test_namespace_mandatory/60_2family_dynamic_jinja_fill_sub_group.json +++ b/tests/results/test_namespace_mandatory/60_2family_dynamic_jinja_fill_sub_group.json @@ -1,21 +1,15 @@ { "rougail": { "var1": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "dynstring1": { + "dynval1": { "family": { "var": "string1" } }, - "dynstring2": { - "family": { - "var": "string1" - } - }, - "dynstring3": { + "dynval2": { "family": { "var": "string1" } diff --git a/tests/results/test_namespace_mandatory/60_2family_dynamic_jinja_fill_sub_group_2.json b/tests/results/test_namespace_mandatory/60_2family_dynamic_jinja_fill_sub_group_2.json index a4889cb..1be3b0a 100644 --- a/tests/results/test_namespace_mandatory/60_2family_dynamic_jinja_fill_sub_group_2.json +++ b/tests/results/test_namespace_mandatory/60_2family_dynamic_jinja_fill_sub_group_2.json @@ -1,21 +1,15 @@ { "rougail": { "var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "dynstring1": { + "dynval1": { "family": { "var": "string1" } }, - "dynstring2": { - "family": { - "var": "string1" - } - }, - "dynstring3": { + "dynval2": { "family": { "var": "string1" } diff --git a/tests/results/test_namespace_mandatory/60_2family_dynamic_outside_calc.json b/tests/results/test_namespace_mandatory/60_2family_dynamic_outside_calc.json index 58eb2cb..38aa9a9 100644 --- a/tests/results/test_namespace_mandatory/60_2family_dynamic_outside_calc.json +++ b/tests/results/test_namespace_mandatory/60_2family_dynamic_outside_calc.json @@ -1,17 +1,13 @@ { "rougail": { "var1": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "dynstring1": { + "dynval1": { "var": "string1" }, - "dynstring2": { - "var": "string1" - }, - "dynstring3": { + "dynval2": { "var": "string1" }, "newvar": "string1" diff --git a/tests/results/test_namespace_mandatory/60_5family_dynamic_calc2.json b/tests/results/test_namespace_mandatory/60_5family_dynamic_calc2.json index 668831b..2d4e2ad 100644 --- a/tests/results/test_namespace_mandatory/60_5family_dynamic_calc2.json +++ b/tests/results/test_namespace_mandatory/60_5family_dynamic_calc2.json @@ -1,18 +1,14 @@ { "rougail": { "var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], "var2": "string1", - "dynstring1": { + "dynval1": { "vardyn": "string1" }, - "dynstring2": { - "vardyn": "string1" - }, - "dynstring3": { + "dynval2": { "vardyn": "string1" } } diff --git a/tests/results/test_namespace_mandatory/60_5family_dynamic_calc_suffix.json b/tests/results/test_namespace_mandatory/60_5family_dynamic_calc_suffix.json index f63787d..92c86d8 100644 --- a/tests/results/test_namespace_mandatory/60_5family_dynamic_calc_suffix.json +++ b/tests/results/test_namespace_mandatory/60_5family_dynamic_calc_suffix.json @@ -1,17 +1,13 @@ { "rougail": { "var1": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "dynstring1": { + "dynval1": { "var": "string1" }, - "dynstring2": { - "var": "string1" - }, - "dynstring3": { + "dynval2": { "var": "string1" }, "var2": "string1" diff --git a/tests/results/test_namespace_mandatory/60_5family_dynamic_calc_suffix2.json b/tests/results/test_namespace_mandatory/60_5family_dynamic_calc_suffix2.json index 56e63f7..ce2610b 100644 --- a/tests/results/test_namespace_mandatory/60_5family_dynamic_calc_suffix2.json +++ b/tests/results/test_namespace_mandatory/60_5family_dynamic_calc_suffix2.json @@ -1,17 +1,13 @@ { "rougail": { "var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "dynstring1": { + "dynval1": { "var": "string1" }, - "dynstring2": { - "var": "string1" - }, - "dynstring3": { + "dynval2": { "var": "string1" } } diff --git a/tests/results/test_namespace_mandatory/60_5family_dynamic_calc_suffix_param.json b/tests/results/test_namespace_mandatory/60_5family_dynamic_calc_suffix_param.json index 56e63f7..ce2610b 100644 --- a/tests/results/test_namespace_mandatory/60_5family_dynamic_calc_suffix_param.json +++ b/tests/results/test_namespace_mandatory/60_5family_dynamic_calc_suffix_param.json @@ -1,17 +1,13 @@ { "rougail": { "var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "dynstring1": { + "dynval1": { "var": "string1" }, - "dynstring2": { - "var": "string1" - }, - "dynstring3": { + "dynval2": { "var": "string1" } } diff --git a/tests/results/test_namespace_mandatory/60_5family_dynamic_calc_variable.json b/tests/results/test_namespace_mandatory/60_5family_dynamic_calc_variable.json index f63787d..92c86d8 100644 --- a/tests/results/test_namespace_mandatory/60_5family_dynamic_calc_variable.json +++ b/tests/results/test_namespace_mandatory/60_5family_dynamic_calc_variable.json @@ -1,17 +1,13 @@ { "rougail": { "var1": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "dynstring1": { + "dynval1": { "var": "string1" }, - "dynstring2": { - "var": "string1" - }, - "dynstring3": { + "dynval2": { "var": "string1" }, "var2": "string1" diff --git a/tests/results/test_namespace_mandatory/60_5family_dynamic_unknown_suffix.json b/tests/results/test_namespace_mandatory/60_5family_dynamic_unknown_suffix.json index e345de4..c8671e7 100644 --- a/tests/results/test_namespace_mandatory/60_5family_dynamic_unknown_suffix.json +++ b/tests/results/test_namespace_mandatory/60_5family_dynamic_unknown_suffix.json @@ -2,33 +2,17 @@ "rougail": { "var": [ "val1", - "val2", - "val3", - "val4" + "val2" ], "val1_dyn": { "var1": "string1", "var2": "string1", - "var3": "string1", - "var4": "string1" + "var3": "string1" }, "val2_dyn": { "var1": "string1", "var2": "string1", - "var3": "string1", - "var4": "string1" - }, - "val3_dyn": { - "var1": "string1", - "var2": "string1", - "var3": "string1", - "var4": "string1" - }, - "val4_dyn": { - "var1": "string1", - "var2": "string1", - "var3": "string1", - "var4": "string1" + "var3": "string1" } } } diff --git a/tests/results/test_namespace_mandatory/60_5family_dynamic_variable_outside.json b/tests/results/test_namespace_mandatory/60_5family_dynamic_variable_outside.json index 914ad45..75b04e8 100644 --- a/tests/results/test_namespace_mandatory/60_5family_dynamic_variable_outside.json +++ b/tests/results/test_namespace_mandatory/60_5family_dynamic_variable_outside.json @@ -1,17 +1,13 @@ { "rougail": { "var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "my_dyn_family_string1": { + "my_dyn_family_val1": { "var": "string1" }, - "my_dyn_family_string2": { - "var": "string1" - }, - "my_dyn_family_string3": { + "my_dyn_family_val2": { "var": "string1" }, "var2": [ diff --git a/tests/results/test_namespace_mandatory/60_5family_dynamic_variable_outside2.json b/tests/results/test_namespace_mandatory/60_5family_dynamic_variable_outside2.json index ca7b4d7..00a19bf 100644 --- a/tests/results/test_namespace_mandatory/60_5family_dynamic_variable_outside2.json +++ b/tests/results/test_namespace_mandatory/60_5family_dynamic_variable_outside2.json @@ -6,17 +6,13 @@ "string3" ], "var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "my_dyn_family_string1": { + "my_dyn_family_val1": { "var": "string1" }, - "my_dyn_family_string2": { - "var": "string1" - }, - "my_dyn_family_string3": { + "my_dyn_family_val2": { "var": "string1" } } diff --git a/tests/results/test_namespace_mandatory/60_5family_dynamic_variable_outside_jinja.json b/tests/results/test_namespace_mandatory/60_5family_dynamic_variable_outside_jinja.json index 914ad45..75b04e8 100644 --- a/tests/results/test_namespace_mandatory/60_5family_dynamic_variable_outside_jinja.json +++ b/tests/results/test_namespace_mandatory/60_5family_dynamic_variable_outside_jinja.json @@ -1,17 +1,13 @@ { "rougail": { "var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "my_dyn_family_string1": { + "my_dyn_family_val1": { "var": "string1" }, - "my_dyn_family_string2": { - "var": "string1" - }, - "my_dyn_family_string3": { + "my_dyn_family_val2": { "var": "string1" }, "var2": [ diff --git a/tests/results/test_namespace_mandatory/60_5family_dynamic_variable_outside_sub_suffix.json b/tests/results/test_namespace_mandatory/60_5family_dynamic_variable_outside_sub_suffix.json index c11f6cb..0716c7d 100644 --- a/tests/results/test_namespace_mandatory/60_5family_dynamic_variable_outside_sub_suffix.json +++ b/tests/results/test_namespace_mandatory/60_5family_dynamic_variable_outside_sub_suffix.json @@ -1,40 +1,22 @@ { "rougail": { "var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "my_dyn_family_string1": { - "subdyn_string1": { + "my_dyn_family_val1": { + "subdyn_val1": { "var": "string1" }, - "subdyn_string2": { - "var": "string1" - }, - "subdyn_string3": { + "subdyn_val2": { "var": "string1" } }, - "my_dyn_family_string2": { - "subdyn_string1": { + "my_dyn_family_val2": { + "subdyn_val1": { "var": "string1" }, - "subdyn_string2": { - "var": "string1" - }, - "subdyn_string3": { - "var": "string1" - } - }, - "my_dyn_family_string3": { - "subdyn_string1": { - "var": "string1" - }, - "subdyn_string2": { - "var": "string1" - }, - "subdyn_string3": { + "subdyn_val2": { "var": "string1" } }, diff --git a/tests/results/test_namespace_mandatory/60_5family_dynamic_variable_outside_suffix.json b/tests/results/test_namespace_mandatory/60_5family_dynamic_variable_outside_suffix.json index 5ea2aad..2aee889 100644 --- a/tests/results/test_namespace_mandatory/60_5family_dynamic_variable_outside_suffix.json +++ b/tests/results/test_namespace_mandatory/60_5family_dynamic_variable_outside_suffix.json @@ -1,17 +1,13 @@ { "rougail": { "var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "dyn_string1": { + "dyn_val1": { "var": "string1" }, - "dyn_string2": { - "var": "string1" - }, - "dyn_string3": { + "dyn_val2": { "var": "string1" }, "var2": "string1" diff --git a/tests/results/test_namespace_mandatory/60_6family_dynamic_inside.json b/tests/results/test_namespace_mandatory/60_6family_dynamic_inside.json index 366c04d..8bec218 100644 --- a/tests/results/test_namespace_mandatory/60_6family_dynamic_inside.json +++ b/tests/results/test_namespace_mandatory/60_6family_dynamic_inside.json @@ -1,23 +1,16 @@ { "rougail": { "var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "string1_dyn": { + "val1_dyn": { "var1": "string1", "var2": "string1", "var3": "string1", "var4": "string1" }, - "string2_dyn": { - "var1": "string1", - "var2": "string1", - "var3": "string1", - "var4": "string1" - }, - "string3_dyn": { + "val2_dyn": { "var1": "string1", "var2": "string1", "var3": "string1", diff --git a/tests/results/test_namespace_mandatory/60_6family_dynamic_leadership.json b/tests/results/test_namespace_mandatory/60_6family_dynamic_leadership.json index ccb3737..8d96b71 100644 --- a/tests/results/test_namespace_mandatory/60_6family_dynamic_leadership.json +++ b/tests/results/test_namespace_mandatory/60_6family_dynamic_leadership.json @@ -1,11 +1,10 @@ { "rougail": { "var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "dynstring1": { + "dynval1": { "leadership": [ { "leader": "string1", @@ -24,26 +23,7 @@ } ] }, - "dynstring2": { - "leadership": [ - { - "leader": "string1", - "follower1": "string1", - "follower2": "string1" - }, - { - "leader": "string2", - "follower1": "string2", - "follower2": "string2" - }, - { - "leader": "string3", - "follower1": "string3", - "follower2": "string3" - } - ] - }, - "dynstring3": { + "dynval2": { "leadership": [ { "leader": "string1", diff --git a/tests/results/test_namespace_mandatory/60_6family_dynamic_sub_dynamic.json b/tests/results/test_namespace_mandatory/60_6family_dynamic_sub_dynamic.json index 7858d6d..3060613 100644 --- a/tests/results/test_namespace_mandatory/60_6family_dynamic_sub_dynamic.json +++ b/tests/results/test_namespace_mandatory/60_6family_dynamic_sub_dynamic.json @@ -1,71 +1,36 @@ { "rougail": { "var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "dynstring1": { + "dynval1": { "var": [ - "string1", - "string2", - "string3" + "tval1", + "tval2" ], - "dyn_string1": { + "dyn_tval1": { "var": "string1", "var_identifier": "string1", "var_identifiers": "string1" }, - "dyn_string2": { - "var": "string1", - "var_identifier": "string1", - "var_identifiers": "string1" - }, - "dyn_string3": { + "dyn_tval2": { "var": "string1", "var_identifier": "string1", "var_identifiers": "string1" } }, - "dynstring2": { + "dynval2": { "var": [ - "string1", - "string2", - "string3" + "tval1", + "tval2" ], - "dyn_string1": { + "dyn_tval1": { "var": "string1", "var_identifier": "string1", "var_identifiers": "string1" }, - "dyn_string2": { - "var": "string1", - "var_identifier": "string1", - "var_identifiers": "string1" - }, - "dyn_string3": { - "var": "string1", - "var_identifier": "string1", - "var_identifiers": "string1" - } - }, - "dynstring3": { - "var": [ - "string1", - "string2", - "string3" - ], - "dyn_string1": { - "var": "string1", - "var_identifier": "string1", - "var_identifiers": "string1" - }, - "dyn_string2": { - "var": "string1", - "var_identifier": "string1", - "var_identifiers": "string1" - }, - "dyn_string3": { + "dyn_tval2": { "var": "string1", "var_identifier": "string1", "var_identifiers": "string1" diff --git a/tests/results/test_namespace_mandatory/60_6family_dynamic_sub_dynamic_1_0.json b/tests/results/test_namespace_mandatory/60_6family_dynamic_sub_dynamic_1_0.json index 7858d6d..3060613 100644 --- a/tests/results/test_namespace_mandatory/60_6family_dynamic_sub_dynamic_1_0.json +++ b/tests/results/test_namespace_mandatory/60_6family_dynamic_sub_dynamic_1_0.json @@ -1,71 +1,36 @@ { "rougail": { "var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "dynstring1": { + "dynval1": { "var": [ - "string1", - "string2", - "string3" + "tval1", + "tval2" ], - "dyn_string1": { + "dyn_tval1": { "var": "string1", "var_identifier": "string1", "var_identifiers": "string1" }, - "dyn_string2": { - "var": "string1", - "var_identifier": "string1", - "var_identifiers": "string1" - }, - "dyn_string3": { + "dyn_tval2": { "var": "string1", "var_identifier": "string1", "var_identifiers": "string1" } }, - "dynstring2": { + "dynval2": { "var": [ - "string1", - "string2", - "string3" + "tval1", + "tval2" ], - "dyn_string1": { + "dyn_tval1": { "var": "string1", "var_identifier": "string1", "var_identifiers": "string1" }, - "dyn_string2": { - "var": "string1", - "var_identifier": "string1", - "var_identifiers": "string1" - }, - "dyn_string3": { - "var": "string1", - "var_identifier": "string1", - "var_identifiers": "string1" - } - }, - "dynstring3": { - "var": [ - "string1", - "string2", - "string3" - ], - "dyn_string1": { - "var": "string1", - "var_identifier": "string1", - "var_identifiers": "string1" - }, - "dyn_string2": { - "var": "string1", - "var_identifier": "string1", - "var_identifiers": "string1" - }, - "dyn_string3": { + "dyn_tval2": { "var": "string1", "var_identifier": "string1", "var_identifiers": "string1" diff --git a/tests/results/test_namespace_mandatory/60_6family_dynamic_sub_dynamic_empty.json b/tests/results/test_namespace_mandatory/60_6family_dynamic_sub_dynamic_empty.json index e2040a5..3060613 100644 --- a/tests/results/test_namespace_mandatory/60_6family_dynamic_sub_dynamic_empty.json +++ b/tests/results/test_namespace_mandatory/60_6family_dynamic_sub_dynamic_empty.json @@ -6,21 +6,15 @@ ], "dynval1": { "var": [ - "string1", - "string2", - "string3" + "tval1", + "tval2" ], - "dyn_string1": { + "dyn_tval1": { "var": "string1", "var_identifier": "string1", "var_identifiers": "string1" }, - "dyn_string2": { - "var": "string1", - "var_identifier": "string1", - "var_identifiers": "string1" - }, - "dyn_string3": { + "dyn_tval2": { "var": "string1", "var_identifier": "string1", "var_identifiers": "string1" @@ -28,21 +22,15 @@ }, "dynval2": { "var": [ - "string1", - "string2", - "string3" + "tval1", + "tval2" ], - "dyn_string1": { + "dyn_tval1": { "var": "string1", "var_identifier": "string1", "var_identifiers": "string1" }, - "dyn_string2": { - "var": "string1", - "var_identifier": "string1", - "var_identifiers": "string1" - }, - "dyn_string3": { + "dyn_tval2": { "var": "string1", "var_identifier": "string1", "var_identifiers": "string1" diff --git a/tests/results/test_namespace_mandatory/60_9extra_dynamic.json b/tests/results/test_namespace_mandatory/60_9extra_dynamic.json index 25a2188..ba01f78 100644 --- a/tests/results/test_namespace_mandatory/60_9extra_dynamic.json +++ b/tests/results/test_namespace_mandatory/60_9extra_dynamic.json @@ -1,19 +1,11 @@ { "rougail": { "var": [ - "string1", - "string2", - "string3" + "a" ] }, "extra": { - "dyn_string1": { - "var": "string1" - }, - "dyn_string2": { - "var": "string1" - }, - "dyn_string3": { + "dyn_a": { "var": "string1" } } diff --git a/tests/results/test_namespace_mandatory/60_9extra_dynamic_extra.json b/tests/results/test_namespace_mandatory/60_9extra_dynamic_extra.json index a5bff83..af68cf5 100644 --- a/tests/results/test_namespace_mandatory/60_9extra_dynamic_extra.json +++ b/tests/results/test_namespace_mandatory/60_9extra_dynamic_extra.json @@ -10,17 +10,9 @@ }, "extra": { "var": [ - "string1", - "string2", - "string3" + "a" ], - "dyn_string1": { - "var": "string1" - }, - "dyn_string2": { - "var": "string1" - }, - "dyn_string3": { + "dyn_a": { "var": "string1" } } diff --git a/tests/results/test_namespace_read_write/01_8calculation_information_multi.json b/tests/results/test_namespace_read_write/01_8calculation_information_multi.json index 68ee785..2942cca 100644 --- a/tests/results/test_namespace_read_write/01_8calculation_information_multi.json +++ b/tests/results/test_namespace_read_write/01_8calculation_information_multi.json @@ -1,7 +1,5 @@ { "rougail": { - "variable": [ - "[]" - ] + "variable": [] } } diff --git a/tests/results/test_namespace_read_write_mandatory/60_0family_dynamic.json b/tests/results/test_namespace_read_write_mandatory/60_0family_dynamic.json index 56e63f7..ce2610b 100644 --- a/tests/results/test_namespace_read_write_mandatory/60_0family_dynamic.json +++ b/tests/results/test_namespace_read_write_mandatory/60_0family_dynamic.json @@ -1,17 +1,13 @@ { "rougail": { "var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "dynstring1": { + "dynval1": { "var": "string1" }, - "dynstring2": { - "var": "string1" - }, - "dynstring3": { + "dynval2": { "var": "string1" } } diff --git a/tests/results/test_namespace_read_write_mandatory/60_0family_dynamic_1_0.json b/tests/results/test_namespace_read_write_mandatory/60_0family_dynamic_1_0.json index 11e351d..f3613dc 100644 --- a/tests/results/test_namespace_read_write_mandatory/60_0family_dynamic_1_0.json +++ b/tests/results/test_namespace_read_write_mandatory/60_0family_dynamic_1_0.json @@ -1,17 +1,13 @@ { "rougail": { "var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "dynstring1": { + "dynval1": { "vardyn": "string1" }, - "dynstring2": { - "vardyn": "string1" - }, - "dynstring3": { + "dynval2": { "vardyn": "string1" } } diff --git a/tests/results/test_namespace_read_write_mandatory/60_0family_dynamic_1_0_type.json b/tests/results/test_namespace_read_write_mandatory/60_0family_dynamic_1_0_type.json index 11e351d..f3613dc 100644 --- a/tests/results/test_namespace_read_write_mandatory/60_0family_dynamic_1_0_type.json +++ b/tests/results/test_namespace_read_write_mandatory/60_0family_dynamic_1_0_type.json @@ -1,17 +1,13 @@ { "rougail": { "var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "dynstring1": { + "dynval1": { "vardyn": "string1" }, - "dynstring2": { - "vardyn": "string1" - }, - "dynstring3": { + "dynval2": { "vardyn": "string1" } } diff --git a/tests/results/test_namespace_read_write_mandatory/60_0family_dynamic_1_1.json b/tests/results/test_namespace_read_write_mandatory/60_0family_dynamic_1_1.json index 11e351d..f3613dc 100644 --- a/tests/results/test_namespace_read_write_mandatory/60_0family_dynamic_1_1.json +++ b/tests/results/test_namespace_read_write_mandatory/60_0family_dynamic_1_1.json @@ -1,17 +1,13 @@ { "rougail": { "var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "dynstring1": { + "dynval1": { "vardyn": "string1" }, - "dynstring2": { - "vardyn": "string1" - }, - "dynstring3": { + "dynval2": { "vardyn": "string1" } } diff --git a/tests/results/test_namespace_read_write_mandatory/60_0family_dynamic_jinja_number.json b/tests/results/test_namespace_read_write_mandatory/60_0family_dynamic_jinja_number.json index 5df1a91..d992251 100644 --- a/tests/results/test_namespace_read_write_mandatory/60_0family_dynamic_jinja_number.json +++ b/tests/results/test_namespace_read_write_mandatory/60_0family_dynamic_jinja_number.json @@ -2,8 +2,7 @@ "rougail": { "var": [ 1, - 2, - 3 + 2 ], "dyn1": { "var": "string1" @@ -11,9 +10,6 @@ "dyn2": { "var": "string1" }, - "dyn3": { - "var": "string1" - }, "var2": "string1" } } diff --git a/tests/results/test_namespace_read_write_mandatory/60_0family_dynamic_no_description.json b/tests/results/test_namespace_read_write_mandatory/60_0family_dynamic_no_description.json index 56e63f7..ce2610b 100644 --- a/tests/results/test_namespace_read_write_mandatory/60_0family_dynamic_no_description.json +++ b/tests/results/test_namespace_read_write_mandatory/60_0family_dynamic_no_description.json @@ -1,17 +1,13 @@ { "rougail": { "var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "dynstring1": { + "dynval1": { "var": "string1" }, - "dynstring2": { - "var": "string1" - }, - "dynstring3": { + "dynval2": { "var": "string1" } } diff --git a/tests/results/test_namespace_read_write_mandatory/60_0family_dynamic_variable_suffix.json b/tests/results/test_namespace_read_write_mandatory/60_0family_dynamic_variable_suffix.json index 56e63f7..ce2610b 100644 --- a/tests/results/test_namespace_read_write_mandatory/60_0family_dynamic_variable_suffix.json +++ b/tests/results/test_namespace_read_write_mandatory/60_0family_dynamic_variable_suffix.json @@ -1,17 +1,13 @@ { "rougail": { "var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "dynstring1": { + "dynval1": { "var": "string1" }, - "dynstring2": { - "var": "string1" - }, - "dynstring3": { + "dynval2": { "var": "string1" } } diff --git a/tests/results/test_namespace_read_write_mandatory/60_2family_dynamic_jinja_fill_sub_group.json b/tests/results/test_namespace_read_write_mandatory/60_2family_dynamic_jinja_fill_sub_group.json index 4ca6f3c..2a66dbb 100644 --- a/tests/results/test_namespace_read_write_mandatory/60_2family_dynamic_jinja_fill_sub_group.json +++ b/tests/results/test_namespace_read_write_mandatory/60_2family_dynamic_jinja_fill_sub_group.json @@ -1,21 +1,15 @@ { "rougail": { "var1": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "dynstring1": { + "dynval1": { "family": { "var": "string1" } }, - "dynstring2": { - "family": { - "var": "string1" - } - }, - "dynstring3": { + "dynval2": { "family": { "var": "string1" } diff --git a/tests/results/test_namespace_read_write_mandatory/60_2family_dynamic_jinja_fill_sub_group_2.json b/tests/results/test_namespace_read_write_mandatory/60_2family_dynamic_jinja_fill_sub_group_2.json index a4889cb..1be3b0a 100644 --- a/tests/results/test_namespace_read_write_mandatory/60_2family_dynamic_jinja_fill_sub_group_2.json +++ b/tests/results/test_namespace_read_write_mandatory/60_2family_dynamic_jinja_fill_sub_group_2.json @@ -1,21 +1,15 @@ { "rougail": { "var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "dynstring1": { + "dynval1": { "family": { "var": "string1" } }, - "dynstring2": { - "family": { - "var": "string1" - } - }, - "dynstring3": { + "dynval2": { "family": { "var": "string1" } diff --git a/tests/results/test_namespace_read_write_mandatory/60_2family_dynamic_outside_calc.json b/tests/results/test_namespace_read_write_mandatory/60_2family_dynamic_outside_calc.json index 58eb2cb..38aa9a9 100644 --- a/tests/results/test_namespace_read_write_mandatory/60_2family_dynamic_outside_calc.json +++ b/tests/results/test_namespace_read_write_mandatory/60_2family_dynamic_outside_calc.json @@ -1,17 +1,13 @@ { "rougail": { "var1": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "dynstring1": { + "dynval1": { "var": "string1" }, - "dynstring2": { - "var": "string1" - }, - "dynstring3": { + "dynval2": { "var": "string1" }, "newvar": "string1" diff --git a/tests/results/test_namespace_read_write_mandatory/60_5family_dynamic_calc2.json b/tests/results/test_namespace_read_write_mandatory/60_5family_dynamic_calc2.json index 668831b..2d4e2ad 100644 --- a/tests/results/test_namespace_read_write_mandatory/60_5family_dynamic_calc2.json +++ b/tests/results/test_namespace_read_write_mandatory/60_5family_dynamic_calc2.json @@ -1,18 +1,14 @@ { "rougail": { "var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], "var2": "string1", - "dynstring1": { + "dynval1": { "vardyn": "string1" }, - "dynstring2": { - "vardyn": "string1" - }, - "dynstring3": { + "dynval2": { "vardyn": "string1" } } diff --git a/tests/results/test_namespace_read_write_mandatory/60_5family_dynamic_calc_suffix.json b/tests/results/test_namespace_read_write_mandatory/60_5family_dynamic_calc_suffix.json index f63787d..92c86d8 100644 --- a/tests/results/test_namespace_read_write_mandatory/60_5family_dynamic_calc_suffix.json +++ b/tests/results/test_namespace_read_write_mandatory/60_5family_dynamic_calc_suffix.json @@ -1,17 +1,13 @@ { "rougail": { "var1": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "dynstring1": { + "dynval1": { "var": "string1" }, - "dynstring2": { - "var": "string1" - }, - "dynstring3": { + "dynval2": { "var": "string1" }, "var2": "string1" diff --git a/tests/results/test_namespace_read_write_mandatory/60_5family_dynamic_calc_suffix2.json b/tests/results/test_namespace_read_write_mandatory/60_5family_dynamic_calc_suffix2.json index 56e63f7..ce2610b 100644 --- a/tests/results/test_namespace_read_write_mandatory/60_5family_dynamic_calc_suffix2.json +++ b/tests/results/test_namespace_read_write_mandatory/60_5family_dynamic_calc_suffix2.json @@ -1,17 +1,13 @@ { "rougail": { "var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "dynstring1": { + "dynval1": { "var": "string1" }, - "dynstring2": { - "var": "string1" - }, - "dynstring3": { + "dynval2": { "var": "string1" } } diff --git a/tests/results/test_namespace_read_write_mandatory/60_5family_dynamic_calc_suffix_param.json b/tests/results/test_namespace_read_write_mandatory/60_5family_dynamic_calc_suffix_param.json index 56e63f7..ce2610b 100644 --- a/tests/results/test_namespace_read_write_mandatory/60_5family_dynamic_calc_suffix_param.json +++ b/tests/results/test_namespace_read_write_mandatory/60_5family_dynamic_calc_suffix_param.json @@ -1,17 +1,13 @@ { "rougail": { "var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "dynstring1": { + "dynval1": { "var": "string1" }, - "dynstring2": { - "var": "string1" - }, - "dynstring3": { + "dynval2": { "var": "string1" } } diff --git a/tests/results/test_namespace_read_write_mandatory/60_5family_dynamic_calc_variable.json b/tests/results/test_namespace_read_write_mandatory/60_5family_dynamic_calc_variable.json index f63787d..92c86d8 100644 --- a/tests/results/test_namespace_read_write_mandatory/60_5family_dynamic_calc_variable.json +++ b/tests/results/test_namespace_read_write_mandatory/60_5family_dynamic_calc_variable.json @@ -1,17 +1,13 @@ { "rougail": { "var1": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "dynstring1": { + "dynval1": { "var": "string1" }, - "dynstring2": { - "var": "string1" - }, - "dynstring3": { + "dynval2": { "var": "string1" }, "var2": "string1" diff --git a/tests/results/test_namespace_read_write_mandatory/60_5family_dynamic_unknown_suffix.json b/tests/results/test_namespace_read_write_mandatory/60_5family_dynamic_unknown_suffix.json index e345de4..c8671e7 100644 --- a/tests/results/test_namespace_read_write_mandatory/60_5family_dynamic_unknown_suffix.json +++ b/tests/results/test_namespace_read_write_mandatory/60_5family_dynamic_unknown_suffix.json @@ -2,33 +2,17 @@ "rougail": { "var": [ "val1", - "val2", - "val3", - "val4" + "val2" ], "val1_dyn": { "var1": "string1", "var2": "string1", - "var3": "string1", - "var4": "string1" + "var3": "string1" }, "val2_dyn": { "var1": "string1", "var2": "string1", - "var3": "string1", - "var4": "string1" - }, - "val3_dyn": { - "var1": "string1", - "var2": "string1", - "var3": "string1", - "var4": "string1" - }, - "val4_dyn": { - "var1": "string1", - "var2": "string1", - "var3": "string1", - "var4": "string1" + "var3": "string1" } } } diff --git a/tests/results/test_namespace_read_write_mandatory/60_5family_dynamic_variable_outside.json b/tests/results/test_namespace_read_write_mandatory/60_5family_dynamic_variable_outside.json index 914ad45..75b04e8 100644 --- a/tests/results/test_namespace_read_write_mandatory/60_5family_dynamic_variable_outside.json +++ b/tests/results/test_namespace_read_write_mandatory/60_5family_dynamic_variable_outside.json @@ -1,17 +1,13 @@ { "rougail": { "var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "my_dyn_family_string1": { + "my_dyn_family_val1": { "var": "string1" }, - "my_dyn_family_string2": { - "var": "string1" - }, - "my_dyn_family_string3": { + "my_dyn_family_val2": { "var": "string1" }, "var2": [ diff --git a/tests/results/test_namespace_read_write_mandatory/60_5family_dynamic_variable_outside2.json b/tests/results/test_namespace_read_write_mandatory/60_5family_dynamic_variable_outside2.json index ca7b4d7..00a19bf 100644 --- a/tests/results/test_namespace_read_write_mandatory/60_5family_dynamic_variable_outside2.json +++ b/tests/results/test_namespace_read_write_mandatory/60_5family_dynamic_variable_outside2.json @@ -6,17 +6,13 @@ "string3" ], "var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "my_dyn_family_string1": { + "my_dyn_family_val1": { "var": "string1" }, - "my_dyn_family_string2": { - "var": "string1" - }, - "my_dyn_family_string3": { + "my_dyn_family_val2": { "var": "string1" } } diff --git a/tests/results/test_namespace_read_write_mandatory/60_5family_dynamic_variable_outside_jinja.json b/tests/results/test_namespace_read_write_mandatory/60_5family_dynamic_variable_outside_jinja.json index 914ad45..75b04e8 100644 --- a/tests/results/test_namespace_read_write_mandatory/60_5family_dynamic_variable_outside_jinja.json +++ b/tests/results/test_namespace_read_write_mandatory/60_5family_dynamic_variable_outside_jinja.json @@ -1,17 +1,13 @@ { "rougail": { "var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "my_dyn_family_string1": { + "my_dyn_family_val1": { "var": "string1" }, - "my_dyn_family_string2": { - "var": "string1" - }, - "my_dyn_family_string3": { + "my_dyn_family_val2": { "var": "string1" }, "var2": [ diff --git a/tests/results/test_namespace_read_write_mandatory/60_5family_dynamic_variable_outside_sub_suffix.json b/tests/results/test_namespace_read_write_mandatory/60_5family_dynamic_variable_outside_sub_suffix.json index c11f6cb..0716c7d 100644 --- a/tests/results/test_namespace_read_write_mandatory/60_5family_dynamic_variable_outside_sub_suffix.json +++ b/tests/results/test_namespace_read_write_mandatory/60_5family_dynamic_variable_outside_sub_suffix.json @@ -1,40 +1,22 @@ { "rougail": { "var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "my_dyn_family_string1": { - "subdyn_string1": { + "my_dyn_family_val1": { + "subdyn_val1": { "var": "string1" }, - "subdyn_string2": { - "var": "string1" - }, - "subdyn_string3": { + "subdyn_val2": { "var": "string1" } }, - "my_dyn_family_string2": { - "subdyn_string1": { + "my_dyn_family_val2": { + "subdyn_val1": { "var": "string1" }, - "subdyn_string2": { - "var": "string1" - }, - "subdyn_string3": { - "var": "string1" - } - }, - "my_dyn_family_string3": { - "subdyn_string1": { - "var": "string1" - }, - "subdyn_string2": { - "var": "string1" - }, - "subdyn_string3": { + "subdyn_val2": { "var": "string1" } }, diff --git a/tests/results/test_namespace_read_write_mandatory/60_5family_dynamic_variable_outside_suffix.json b/tests/results/test_namespace_read_write_mandatory/60_5family_dynamic_variable_outside_suffix.json index 5ea2aad..2aee889 100644 --- a/tests/results/test_namespace_read_write_mandatory/60_5family_dynamic_variable_outside_suffix.json +++ b/tests/results/test_namespace_read_write_mandatory/60_5family_dynamic_variable_outside_suffix.json @@ -1,17 +1,13 @@ { "rougail": { "var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "dyn_string1": { + "dyn_val1": { "var": "string1" }, - "dyn_string2": { - "var": "string1" - }, - "dyn_string3": { + "dyn_val2": { "var": "string1" }, "var2": "string1" diff --git a/tests/results/test_namespace_read_write_mandatory/60_6family_dynamic_inside.json b/tests/results/test_namespace_read_write_mandatory/60_6family_dynamic_inside.json index 366c04d..8bec218 100644 --- a/tests/results/test_namespace_read_write_mandatory/60_6family_dynamic_inside.json +++ b/tests/results/test_namespace_read_write_mandatory/60_6family_dynamic_inside.json @@ -1,23 +1,16 @@ { "rougail": { "var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "string1_dyn": { + "val1_dyn": { "var1": "string1", "var2": "string1", "var3": "string1", "var4": "string1" }, - "string2_dyn": { - "var1": "string1", - "var2": "string1", - "var3": "string1", - "var4": "string1" - }, - "string3_dyn": { + "val2_dyn": { "var1": "string1", "var2": "string1", "var3": "string1", diff --git a/tests/results/test_namespace_read_write_mandatory/60_6family_dynamic_leadership.json b/tests/results/test_namespace_read_write_mandatory/60_6family_dynamic_leadership.json index ccb3737..8d96b71 100644 --- a/tests/results/test_namespace_read_write_mandatory/60_6family_dynamic_leadership.json +++ b/tests/results/test_namespace_read_write_mandatory/60_6family_dynamic_leadership.json @@ -1,11 +1,10 @@ { "rougail": { "var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "dynstring1": { + "dynval1": { "leadership": [ { "leader": "string1", @@ -24,26 +23,7 @@ } ] }, - "dynstring2": { - "leadership": [ - { - "leader": "string1", - "follower1": "string1", - "follower2": "string1" - }, - { - "leader": "string2", - "follower1": "string2", - "follower2": "string2" - }, - { - "leader": "string3", - "follower1": "string3", - "follower2": "string3" - } - ] - }, - "dynstring3": { + "dynval2": { "leadership": [ { "leader": "string1", diff --git a/tests/results/test_namespace_read_write_mandatory/60_6family_dynamic_sub_dynamic.json b/tests/results/test_namespace_read_write_mandatory/60_6family_dynamic_sub_dynamic.json index 7858d6d..3060613 100644 --- a/tests/results/test_namespace_read_write_mandatory/60_6family_dynamic_sub_dynamic.json +++ b/tests/results/test_namespace_read_write_mandatory/60_6family_dynamic_sub_dynamic.json @@ -1,71 +1,36 @@ { "rougail": { "var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "dynstring1": { + "dynval1": { "var": [ - "string1", - "string2", - "string3" + "tval1", + "tval2" ], - "dyn_string1": { + "dyn_tval1": { "var": "string1", "var_identifier": "string1", "var_identifiers": "string1" }, - "dyn_string2": { - "var": "string1", - "var_identifier": "string1", - "var_identifiers": "string1" - }, - "dyn_string3": { + "dyn_tval2": { "var": "string1", "var_identifier": "string1", "var_identifiers": "string1" } }, - "dynstring2": { + "dynval2": { "var": [ - "string1", - "string2", - "string3" + "tval1", + "tval2" ], - "dyn_string1": { + "dyn_tval1": { "var": "string1", "var_identifier": "string1", "var_identifiers": "string1" }, - "dyn_string2": { - "var": "string1", - "var_identifier": "string1", - "var_identifiers": "string1" - }, - "dyn_string3": { - "var": "string1", - "var_identifier": "string1", - "var_identifiers": "string1" - } - }, - "dynstring3": { - "var": [ - "string1", - "string2", - "string3" - ], - "dyn_string1": { - "var": "string1", - "var_identifier": "string1", - "var_identifiers": "string1" - }, - "dyn_string2": { - "var": "string1", - "var_identifier": "string1", - "var_identifiers": "string1" - }, - "dyn_string3": { + "dyn_tval2": { "var": "string1", "var_identifier": "string1", "var_identifiers": "string1" diff --git a/tests/results/test_namespace_read_write_mandatory/60_6family_dynamic_sub_dynamic_1_0.json b/tests/results/test_namespace_read_write_mandatory/60_6family_dynamic_sub_dynamic_1_0.json index 7858d6d..3060613 100644 --- a/tests/results/test_namespace_read_write_mandatory/60_6family_dynamic_sub_dynamic_1_0.json +++ b/tests/results/test_namespace_read_write_mandatory/60_6family_dynamic_sub_dynamic_1_0.json @@ -1,71 +1,36 @@ { "rougail": { "var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "dynstring1": { + "dynval1": { "var": [ - "string1", - "string2", - "string3" + "tval1", + "tval2" ], - "dyn_string1": { + "dyn_tval1": { "var": "string1", "var_identifier": "string1", "var_identifiers": "string1" }, - "dyn_string2": { - "var": "string1", - "var_identifier": "string1", - "var_identifiers": "string1" - }, - "dyn_string3": { + "dyn_tval2": { "var": "string1", "var_identifier": "string1", "var_identifiers": "string1" } }, - "dynstring2": { + "dynval2": { "var": [ - "string1", - "string2", - "string3" + "tval1", + "tval2" ], - "dyn_string1": { + "dyn_tval1": { "var": "string1", "var_identifier": "string1", "var_identifiers": "string1" }, - "dyn_string2": { - "var": "string1", - "var_identifier": "string1", - "var_identifiers": "string1" - }, - "dyn_string3": { - "var": "string1", - "var_identifier": "string1", - "var_identifiers": "string1" - } - }, - "dynstring3": { - "var": [ - "string1", - "string2", - "string3" - ], - "dyn_string1": { - "var": "string1", - "var_identifier": "string1", - "var_identifiers": "string1" - }, - "dyn_string2": { - "var": "string1", - "var_identifier": "string1", - "var_identifiers": "string1" - }, - "dyn_string3": { + "dyn_tval2": { "var": "string1", "var_identifier": "string1", "var_identifiers": "string1" diff --git a/tests/results/test_namespace_read_write_mandatory/60_6family_dynamic_sub_dynamic_empty.json b/tests/results/test_namespace_read_write_mandatory/60_6family_dynamic_sub_dynamic_empty.json index e2040a5..3060613 100644 --- a/tests/results/test_namespace_read_write_mandatory/60_6family_dynamic_sub_dynamic_empty.json +++ b/tests/results/test_namespace_read_write_mandatory/60_6family_dynamic_sub_dynamic_empty.json @@ -6,21 +6,15 @@ ], "dynval1": { "var": [ - "string1", - "string2", - "string3" + "tval1", + "tval2" ], - "dyn_string1": { + "dyn_tval1": { "var": "string1", "var_identifier": "string1", "var_identifiers": "string1" }, - "dyn_string2": { - "var": "string1", - "var_identifier": "string1", - "var_identifiers": "string1" - }, - "dyn_string3": { + "dyn_tval2": { "var": "string1", "var_identifier": "string1", "var_identifiers": "string1" @@ -28,21 +22,15 @@ }, "dynval2": { "var": [ - "string1", - "string2", - "string3" + "tval1", + "tval2" ], - "dyn_string1": { + "dyn_tval1": { "var": "string1", "var_identifier": "string1", "var_identifiers": "string1" }, - "dyn_string2": { - "var": "string1", - "var_identifier": "string1", - "var_identifiers": "string1" - }, - "dyn_string3": { + "dyn_tval2": { "var": "string1", "var_identifier": "string1", "var_identifiers": "string1" diff --git a/tests/results/test_namespace_read_write_mandatory/60_9extra_dynamic.json b/tests/results/test_namespace_read_write_mandatory/60_9extra_dynamic.json index 25a2188..ba01f78 100644 --- a/tests/results/test_namespace_read_write_mandatory/60_9extra_dynamic.json +++ b/tests/results/test_namespace_read_write_mandatory/60_9extra_dynamic.json @@ -1,19 +1,11 @@ { "rougail": { "var": [ - "string1", - "string2", - "string3" + "a" ] }, "extra": { - "dyn_string1": { - "var": "string1" - }, - "dyn_string2": { - "var": "string1" - }, - "dyn_string3": { + "dyn_a": { "var": "string1" } } diff --git a/tests/results/test_namespace_read_write_mandatory/60_9extra_dynamic_extra.json b/tests/results/test_namespace_read_write_mandatory/60_9extra_dynamic_extra.json index a5bff83..af68cf5 100644 --- a/tests/results/test_namespace_read_write_mandatory/60_9extra_dynamic_extra.json +++ b/tests/results/test_namespace_read_write_mandatory/60_9extra_dynamic_extra.json @@ -10,17 +10,9 @@ }, "extra": { "var": [ - "string1", - "string2", - "string3" + "a" ], - "dyn_string1": { - "var": "string1" - }, - "dyn_string2": { - "var": "string1" - }, - "dyn_string3": { + "dyn_a": { "var": "string1" } } diff --git a/tests/results/test_namespace_read_write_mandatory_errors/01_8calculation_information_multi.json b/tests/results/test_namespace_read_write_mandatory_errors/01_8calculation_information_multi.json index 68ee785..3f6c63f 100644 --- a/tests/results/test_namespace_read_write_mandatory_errors/01_8calculation_information_multi.json +++ b/tests/results/test_namespace_read_write_mandatory_errors/01_8calculation_information_multi.json @@ -1,7 +1,6 @@ { - "rougail": { - "variable": [ - "[]" - ] - } + "_errors": [ + "The following variables are mandatory but have no value:", + " - rougail.variable (a variable)" + ] } diff --git a/tests/results/test_read_write/01_8calculation_information_multi.json b/tests/results/test_read_write/01_8calculation_information_multi.json index 53b9375..8fc7add 100644 --- a/tests/results/test_read_write/01_8calculation_information_multi.json +++ b/tests/results/test_read_write/01_8calculation_information_multi.json @@ -1,5 +1,3 @@ { - "variable": [ - "[]" - ] + "variable": [] } diff --git a/tests/results/test_read_write_mandatory/60_0family_dynamic.json b/tests/results/test_read_write_mandatory/60_0family_dynamic.json index a988670..3564f4f 100644 --- a/tests/results/test_read_write_mandatory/60_0family_dynamic.json +++ b/tests/results/test_read_write_mandatory/60_0family_dynamic.json @@ -1,16 +1,12 @@ { "var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "dynstring1": { + "dynval1": { "var": "string1" }, - "dynstring2": { - "var": "string1" - }, - "dynstring3": { + "dynval2": { "var": "string1" } } diff --git a/tests/results/test_read_write_mandatory/60_0family_dynamic_1_1.json b/tests/results/test_read_write_mandatory/60_0family_dynamic_1_1.json index ecefd28..e00e3f5 100644 --- a/tests/results/test_read_write_mandatory/60_0family_dynamic_1_1.json +++ b/tests/results/test_read_write_mandatory/60_0family_dynamic_1_1.json @@ -1,16 +1,12 @@ { "var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "dynstring1": { + "dynval1": { "vardyn": "string1" }, - "dynstring2": { - "vardyn": "string1" - }, - "dynstring3": { + "dynval2": { "vardyn": "string1" } } diff --git a/tests/results/test_read_write_mandatory/60_0family_dynamic_no_description.json b/tests/results/test_read_write_mandatory/60_0family_dynamic_no_description.json index a988670..3564f4f 100644 --- a/tests/results/test_read_write_mandatory/60_0family_dynamic_no_description.json +++ b/tests/results/test_read_write_mandatory/60_0family_dynamic_no_description.json @@ -1,16 +1,12 @@ { "var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "dynstring1": { + "dynval1": { "var": "string1" }, - "dynstring2": { - "var": "string1" - }, - "dynstring3": { + "dynval2": { "var": "string1" } } diff --git a/tests/results/test_read_write_mandatory/60_0family_dynamic_variable_suffix.json b/tests/results/test_read_write_mandatory/60_0family_dynamic_variable_suffix.json index a988670..3564f4f 100644 --- a/tests/results/test_read_write_mandatory/60_0family_dynamic_variable_suffix.json +++ b/tests/results/test_read_write_mandatory/60_0family_dynamic_variable_suffix.json @@ -1,16 +1,12 @@ { "var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "dynstring1": { + "dynval1": { "var": "string1" }, - "dynstring2": { - "var": "string1" - }, - "dynstring3": { + "dynval2": { "var": "string1" } } diff --git a/tests/results/test_read_write_mandatory/60_2family_dynamic_jinja_fill_sub_group.json b/tests/results/test_read_write_mandatory/60_2family_dynamic_jinja_fill_sub_group.json index d20690b..d084599 100644 --- a/tests/results/test_read_write_mandatory/60_2family_dynamic_jinja_fill_sub_group.json +++ b/tests/results/test_read_write_mandatory/60_2family_dynamic_jinja_fill_sub_group.json @@ -1,20 +1,14 @@ { "var1": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "dynstring1": { + "dynval1": { "family": { "var": "string1" } }, - "dynstring2": { - "family": { - "var": "string1" - } - }, - "dynstring3": { + "dynval2": { "family": { "var": "string1" } diff --git a/tests/results/test_read_write_mandatory/60_2family_dynamic_jinja_fill_sub_group_2.json b/tests/results/test_read_write_mandatory/60_2family_dynamic_jinja_fill_sub_group_2.json index e69a189..b8e4843 100644 --- a/tests/results/test_read_write_mandatory/60_2family_dynamic_jinja_fill_sub_group_2.json +++ b/tests/results/test_read_write_mandatory/60_2family_dynamic_jinja_fill_sub_group_2.json @@ -1,20 +1,14 @@ { "var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "dynstring1": { + "dynval1": { "family": { "var": "string1" } }, - "dynstring2": { - "family": { - "var": "string1" - } - }, - "dynstring3": { + "dynval2": { "family": { "var": "string1" } diff --git a/tests/results/test_read_write_mandatory/60_2family_dynamic_outside_calc.json b/tests/results/test_read_write_mandatory/60_2family_dynamic_outside_calc.json index eca0885..2d536f3 100644 --- a/tests/results/test_read_write_mandatory/60_2family_dynamic_outside_calc.json +++ b/tests/results/test_read_write_mandatory/60_2family_dynamic_outside_calc.json @@ -1,16 +1,12 @@ { "var1": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "dynstring1": { + "dynval1": { "var": "string1" }, - "dynstring2": { - "var": "string1" - }, - "dynstring3": { + "dynval2": { "var": "string1" }, "newvar": "string1" diff --git a/tests/results/test_read_write_mandatory/60_5family_dynamic_calc_suffix2.json b/tests/results/test_read_write_mandatory/60_5family_dynamic_calc_suffix2.json index a988670..3564f4f 100644 --- a/tests/results/test_read_write_mandatory/60_5family_dynamic_calc_suffix2.json +++ b/tests/results/test_read_write_mandatory/60_5family_dynamic_calc_suffix2.json @@ -1,16 +1,12 @@ { "var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "dynstring1": { + "dynval1": { "var": "string1" }, - "dynstring2": { - "var": "string1" - }, - "dynstring3": { + "dynval2": { "var": "string1" } } diff --git a/tests/results/test_read_write_mandatory/60_5family_dynamic_calc_suffix_param.json b/tests/results/test_read_write_mandatory/60_5family_dynamic_calc_suffix_param.json index a988670..3564f4f 100644 --- a/tests/results/test_read_write_mandatory/60_5family_dynamic_calc_suffix_param.json +++ b/tests/results/test_read_write_mandatory/60_5family_dynamic_calc_suffix_param.json @@ -1,16 +1,12 @@ { "var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "dynstring1": { + "dynval1": { "var": "string1" }, - "dynstring2": { - "var": "string1" - }, - "dynstring3": { + "dynval2": { "var": "string1" } } diff --git a/tests/results/test_read_write_mandatory/60_5family_dynamic_calc_variable.json b/tests/results/test_read_write_mandatory/60_5family_dynamic_calc_variable.json index eba79c1..0f8a696 100644 --- a/tests/results/test_read_write_mandatory/60_5family_dynamic_calc_variable.json +++ b/tests/results/test_read_write_mandatory/60_5family_dynamic_calc_variable.json @@ -1,16 +1,12 @@ { "var1": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "dynstring1": { + "dynval1": { "var": "string1" }, - "dynstring2": { - "var": "string1" - }, - "dynstring3": { + "dynval2": { "var": "string1" }, "var2": "string1" diff --git a/tests/results/test_read_write_mandatory/60_5family_dynamic_variable_outside_suffix.json b/tests/results/test_read_write_mandatory/60_5family_dynamic_variable_outside_suffix.json index dfd8f66..5d8a89c 100644 --- a/tests/results/test_read_write_mandatory/60_5family_dynamic_variable_outside_suffix.json +++ b/tests/results/test_read_write_mandatory/60_5family_dynamic_variable_outside_suffix.json @@ -1,16 +1,12 @@ { "var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "dyn_string1": { + "dyn_val1": { "var": "string1" }, - "dyn_string2": { - "var": "string1" - }, - "dyn_string3": { + "dyn_val2": { "var": "string1" }, "var2": "string1" diff --git a/tests/results/test_read_write_mandatory/60_6family_dynamic_leadership.json b/tests/results/test_read_write_mandatory/60_6family_dynamic_leadership.json index 7cad30f..0f69837 100644 --- a/tests/results/test_read_write_mandatory/60_6family_dynamic_leadership.json +++ b/tests/results/test_read_write_mandatory/60_6family_dynamic_leadership.json @@ -1,10 +1,9 @@ { "var": [ - "string1", - "string2", - "string3" + "val1", + "val2" ], - "dynstring1": { + "dynval1": { "leadership": [ { "leader": "string1", @@ -23,26 +22,7 @@ } ] }, - "dynstring2": { - "leadership": [ - { - "leader": "string1", - "follower1": "string1", - "follower2": "string1" - }, - { - "leader": "string2", - "follower1": "string2", - "follower2": "string2" - }, - { - "leader": "string3", - "follower1": "string3", - "follower2": "string3" - } - ] - }, - "dynstring3": { + "dynval2": { "leadership": [ { "leader": "string1", diff --git a/tests/results/test_read_write_mandatory_errors/01_8calculation_information_multi.json b/tests/results/test_read_write_mandatory_errors/01_8calculation_information_multi.json index 53b9375..f51dcb9 100644 --- a/tests/results/test_read_write_mandatory_errors/01_8calculation_information_multi.json +++ b/tests/results/test_read_write_mandatory_errors/01_8calculation_information_multi.json @@ -1,5 +1,6 @@ { - "variable": [ - "[]" + "_errors": [ + "The following variables are mandatory but have no value:", + " - variable (a variable)" ] } diff --git a/tests/test_load.py b/tests/test_load.py index 6441adf..c4df791 100644 --- a/tests/test_load.py +++ b/tests/test_load.py @@ -10,13 +10,13 @@ EXT = 'json' excludes = [] -#excludes = set([ +#excludes = [ # '60_5family_dynamic_unknown_suffix', # '60_5family_dynamic_variable_outside_sub_suffix', -#]) +#] test_ok = get_structures_list(excludes) -# test_ok = ['60_0family_dynamic_variable_suffix'] +#test_ok = [Path('../rougail-tests/structures/00_0version_underscore')] def idfn(fixture_value): @@ -42,18 +42,22 @@ def _test_dictionaries(test_dir, namespace, ext, *, read_write=True, mandatory=F dir_name += '_namespace' elif (test_dir / 'force_namespace').is_file(): return + ################################## if read_write: dir_name += '_read_write' if mandatory: dir_name += '_mandatory' if not do_calc: dir_name += '_errors' + ################################## rougail = Rougail(rougailconfig) config = rougail.run() + ################################## if do_calc and (mandatory or not read_write): get_values_for_config(config) + ################################## generated_output = RougailOutput(config, rougailconfig=rougailconfig).run() - output_file = Path(__file__).parent / 'results' / dir_name / (test_dir.name + "." + EXT) + output_file = Path(__file__).parent / 'results' / dir_name / (test_dir.name + "." + ext) if not output_file.is_file(): if not output_file.parent.is_dir(): output_file.parent.mkdir()