diff --git a/FIXME b/FIXME index 78cb4e75..ed3147bf 100644 --- a/FIXME +++ b/FIXME @@ -1 +1,4 @@ -value avec quote +default avec quote +values avec quote + +supprimer kwargs dans "Params((ParamSelfOption()), kwargs={})" diff --git a/src/rougail/annotator/family.py b/src/rougail/annotator/family.py index d9e45009..c0f8ea6e 100644 --- a/src/rougail/annotator/family.py +++ b/src/rougail/annotator/family.py @@ -188,8 +188,9 @@ class FamilyAnnotator: for family in families.family.values(): if 'dynamic' not in vars(family): continue - family.dynamic = self.objectspace.paths.get_variable(family.dynamic) - if not family.dynamic.multi: + family.suffixes = self.objectspace.paths.get_variable(family.dynamic) + del family.dynamic + if not family.suffixes.multi: xmlfiles = self.objectspace.display_xmlfiles(family.xmlfiles) msg = _(f'dynamic family "{family.name}" must be linked ' f'to multi variable in {xmlfiles}') diff --git a/src/rougail/tiramisureflector.py b/src/rougail/tiramisureflector.py index f093475c..33c3cd01 100644 --- a/src/rougail/tiramisureflector.py +++ b/src/rougail/tiramisureflector.py @@ -7,9 +7,6 @@ from .objspace import RootRougailObject FUNC_TO_DICT = [] -ATTRIBUTES_ORDER = ('name', 'doc', 'default', 'values', 'multi', 'default_multi', 'properties', - 'validators', 'min_number', 'max_number', - ) class Root(): # pylint: disable=R0903 @@ -107,32 +104,15 @@ class TiramisuReflector: not isinstance(child, RootRougailObject): continue if isinstance(child, self.objectspace.variable): - function = self.populate_variable + self.set_name(child) + family.add(Variable(child, + self.text, + self.objectspace, + )) else: - function = self.populate_family - function(family, - child, - ) - - def populate_variable(self, - family, - elt, - ): - """Populate variable - """ - if family.is_leadership: - is_leader = elt.name == family.elt.variable[0].name - is_follower = not is_leader - else: - is_leader = False - is_follower = False - self.set_name(elt) - family.add(Variable(elt, - self.text, - self.objectspace, - is_follower, - is_leader, - )) + self.populate_family(family, + child, + ) def set_name(self, elt, @@ -157,9 +137,59 @@ class Common: ): self.elt = elt self.option_name = None - self.attrib = {} self.text = text self.elt.reflector_object = self + self.object_type = None + + def get(self): + """Get tiramisu's object + """ + if self.option_name is None: + self.option_name = self.elt.reflector_name + self.populate_attrib() + self.populate_informations() + return self.option_name + + def populate_attrib(self): + """Populate attributes + """ + keys = {} + keys['name'] = self.convert_str(self.elt.name) + if hasattr(self.elt, 'doc'): + keys['doc'] = self.convert_str(self.elt.doc) + self._populate_attrib(keys) + if hasattr(self.elt, 'properties'): + keys['properties'] = self.properties_to_string(self.elt.properties) + ret_list = [] + for key, value in keys.items(): + ret_list.append(f'{key}={value}') + attrib = ', '.join(ret_list) + self.text.append(f'{self.option_name} = {self.object_type}({attrib})') + + def _populate_attrib(self, + keys: dict, + ) -> None: + raise NotImplementedError() + + @staticmethod + def convert_str(value): + """convert string + """ + return "'" + value.replace("'", "\\\'") + "'" + + def properties_to_string(self, + value: list, + ) -> None: + """Change properties to string + """ + properties = [] + calc_properties = [] + for property_ in value: + if not isinstance(property_, str): + calc_properties.append(self.populate_properties(property_)) + else: + properties.append(f"'{property_}'") + return 'frozenset({' + ', '.join(sorted(properties) + calc_properties) + '})' @staticmethod def populate_properties(child) -> str: @@ -174,46 +204,6 @@ class Common: kwargs += ", 'reverse_condition': ParamValue(True)" return 'Calculation(calc_value, Params(' + action + ', kwargs={' + kwargs + '}))' - def properties_to_string(self): - """Change properties to string - """ - properties = [] - calc_properties = [] - for property_ in self.attrib['properties']: - if not isinstance(property_, str): - calc_properties.append(self.populate_properties(property_)) - else: - properties.append(f"'{property_}'") - return 'frozenset({' + ', '.join(sorted(properties) + calc_properties) + '})' - - def get_attrib(self): - """Get attributes - """ - ret_list = [] - for key, value in self.attrib.items(): - if value is None: - continue - if key == 'properties': - value = self.properties_to_string() - elif key == 'validators': - value = '[' + ', '.join([self.calculation_value(val, ['ParamSelfOption()']) \ - for val in value]) + ']' - elif key == 'values': - if value[0].type == 'calculation': - value = value[0].name.reflector_object.get() - value = f"Calculation(func.calc_value, Params((ParamOption({value}))))" - else: - value = str(tuple([val.name for val in value])) - elif key in ['multi', 'suffixes']: - if not value: - continue - elif isinstance(value, str) and key != 'opt' and not value.startswith('['): - value = "'" + value.replace("'", "\\\'") + "'" - elif isinstance(value, self.objectspace.value): - value = self.calculation_value(value, []) - ret_list.append(f'{key}={value}') - return ', '.join(ret_list) - def populate_informations(self): """Populate Tiramisu's informations """ @@ -226,13 +216,6 @@ class Common: value = '"' + value.replace('"', '\"') + '"' self.text.append(f'{self.option_name}.impl_set_information("{key}", {value})') - def populate_attrib(self): - """Populate attributes - """ - for attr in ATTRIBUTES_ORDER: - if hasattr(self.elt, attr): - self.attrib[attr] = getattr(self.elt, attr) - class Variable(Common): """Manage variable @@ -241,29 +224,42 @@ class Variable(Common): elt, text, objectspace, - is_follower, - is_leader, ): super().__init__(elt, text) self.objectspace = objectspace - self.is_leader = is_leader - self.is_follower = is_follower convert_option = CONVERT_OPTION[elt.type] self.object_type = convert_option['opttype'] - self.attrib.update(convert_option.get('initkwargs', {})) - def get(self): - """Get tiramisu's object - """ - if self.option_name is None: - self.populate_attrib() - if self.object_type == 'SymLinkOption': - self.attrib['opt'] = self.elt.opt.reflector_object.get() - attrib = self.get_attrib() - self.option_name = self.elt.reflector_name - self.text.append(f'{self.option_name} = {self.object_type}({attrib})') - self.populate_informations() - return self.option_name + def _populate_attrib(self, + keys: dict, + ): + if hasattr(self.elt, 'opt'): + keys['opt'] = self.elt.opt.reflector_object.get() + if hasattr(self.elt, 'values'): + values = self.elt.values + if values[0].type == 'calculation': + values = values[0].name.reflector_object.get() + keys['values'] = f"Calculation(func.calc_value, Params((ParamOption({values}))))" + else: + keys['values'] = str(tuple([val.name for val in values])) + if hasattr(self.elt, 'multi') and self.elt.multi: + keys['multi'] = self.elt.multi + for key in ['default', 'default_multi']: + if hasattr(self.elt, key) and getattr(self.elt, key) is not None: + value = getattr(self.elt, key) + if isinstance(value, str): + value = self.convert_str(value) + elif isinstance(value, self.objectspace.value): + value = self.calculation_value(value, []) + keys[key] = value + if hasattr(self.elt, 'validators'): + keys['validators'] = '[' + ', '.join([self.calculation_value(val, + ['ParamSelfOption()']) for val in self.elt.validators]) + ']' + for key in ['min_number', 'max_number']: + if hasattr(self.elt, key): + keys[key] = getattr(self.elt, key) + for key, value in CONVERT_OPTION[self.elt.type].get('initkwargs', {}).items(): + keys[key] = value def calculation_value(self, child, @@ -334,6 +330,12 @@ class Family(Common): ): super().__init__(elt, text) self.is_leadership = is_leadership + if hasattr(self.elt, 'suffixes'): + self.object_type = 'ConvertDynOptionDescription' + elif self.is_leadership: + self.object_type = 'Leadership' + else: + self.object_type = 'OptionDescription' self.children = [] def add(self, child): @@ -341,32 +343,10 @@ class Family(Common): """ self.children.append(child) - def get(self): - """Get tiramisu's object - """ - if not self.option_name: - self.populate_attrib() - self.populate_dynamic() - self.option_name = self.elt.reflector_name - object_name = self.get_object_name() - attrib = self.get_attrib() + \ - ', children=[' + ', '.join([child.get() for child in self.children]) + ']' - self.text.append(f'{self.option_name} = {object_name}({attrib})') - self.populate_informations() - return self.option_name - - def populate_dynamic(self): - """populate dynamic family - """ - if hasattr(self.elt, 'dynamic'): - dyn = self.elt.dynamic.reflector_object.get() - self.attrib['suffixes'] = f"Calculation(func.calc_value, Params((ParamOption({dyn}))))" - - def get_object_name(self): - """Get family object's name - """ - if 'suffixes' in self.attrib: - return 'ConvertDynOptionDescription' - if self.is_leadership: - return 'Leadership' - return 'OptionDescription' + def _populate_attrib(self, + keys: list, + ) -> None: + if hasattr(self.elt, 'suffixes'): + dyn = self.elt.suffixes.reflector_object.get() + keys['suffixes'] = f"Calculation(func.calc_value, Params((ParamOption({dyn}))))" + keys['children'] = '[' + ', '.join([child.get() for child in self.children]) + ']' diff --git a/tests/dictionaries/00empty/tiramisu/base.py b/tests/dictionaries/00empty/tiramisu/base.py index d8001d59..2e3fd957 100644 --- a/tests/dictionaries/00empty/tiramisu/base.py +++ b/tests/dictionaries/00empty/tiramisu/base.py @@ -14,5 +14,5 @@ except: from rougail.tiramisu import ConvertDynOptionDescription option_2 = OptionDescription(name='tata', doc='tata', children=[]) option_2.impl_set_information("manage", True) -option_1 = OptionDescription(name='services', doc='services', properties=frozenset({'hidden'}), children=[option_2]) +option_1 = OptionDescription(name='services', doc='services', children=[option_2], properties=frozenset({'hidden'})) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/00load_autofreeze/tiramisu/base.py b/tests/dictionaries/00load_autofreeze/tiramisu/base.py index 5880b71e..83eaf987 100644 --- a/tests/dictionaries/00load_autofreeze/tiramisu/base.py +++ b/tests/dictionaries/00load_autofreeze/tiramisu/base.py @@ -14,6 +14,6 @@ except: from rougail.tiramisu import ConvertDynOptionDescription option_4 = StrOption(name='module_instancie', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'auto_freeze', 'basic', 'force_store_value', 'mandatory', Calculation(calc_value, Params(ParamValue('auto_frozen'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)}))})) -option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'basic'}), children=[option_3, option_4]) +option_2 = OptionDescription(name='general', doc='général', children=[option_3, option_4], properties=frozenset({'basic'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/00load_autofreezeexpert/tiramisu/base.py b/tests/dictionaries/00load_autofreezeexpert/tiramisu/base.py index 992e84bd..3fc436f0 100644 --- a/tests/dictionaries/00load_autofreezeexpert/tiramisu/base.py +++ b/tests/dictionaries/00load_autofreezeexpert/tiramisu/base.py @@ -14,6 +14,6 @@ except: from rougail.tiramisu import ConvertDynOptionDescription option_4 = StrOption(name='module_instancie', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'auto_freeze', 'expert', 'force_store_value', 'mandatory', Calculation(calc_value, Params(ParamValue('auto_frozen'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)}))})) -option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3, option_4]) +option_2 = OptionDescription(name='general', doc='général', children=[option_3, option_4], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/00load_autosave/tiramisu/base.py b/tests/dictionaries/00load_autosave/tiramisu/base.py index 41d6156f..d9715444 100644 --- a/tests/dictionaries/00load_autosave/tiramisu/base.py +++ b/tests/dictionaries/00load_autosave/tiramisu/base.py @@ -13,6 +13,6 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'basic', 'force_store_value', 'mandatory'})) -option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'basic'}), children=[option_3]) +option_2 = OptionDescription(name='general', doc='général', children=[option_3], properties=frozenset({'basic'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/00load_autosaveexpert/tiramisu/base.py b/tests/dictionaries/00load_autosaveexpert/tiramisu/base.py index 470d5bd4..9a537ebf 100644 --- a/tests/dictionaries/00load_autosaveexpert/tiramisu/base.py +++ b/tests/dictionaries/00load_autosaveexpert/tiramisu/base.py @@ -13,6 +13,6 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'expert', 'force_store_value', 'mandatory'})) -option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'expert'}), children=[option_3]) +option_2 = OptionDescription(name='general', doc='général', children=[option_3], properties=frozenset({'expert'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/00load_comment/tiramisu/base.py b/tests/dictionaries/00load_comment/tiramisu/base.py index 070826aa..3cc9d152 100644 --- a/tests/dictionaries/00load_comment/tiramisu/base.py +++ b/tests/dictionaries/00load_comment/tiramisu/base.py @@ -13,6 +13,6 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3]) +option_2 = OptionDescription(name='general', doc='général', children=[option_3], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/00load_notype/tiramisu/base.py b/tests/dictionaries/00load_notype/tiramisu/base.py index e15e21bc..bd44cd41 100644 --- a/tests/dictionaries/00load_notype/tiramisu/base.py +++ b/tests/dictionaries/00load_notype/tiramisu/base.py @@ -14,6 +14,6 @@ except: from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) option_4 = StrOption(name='without_type', doc='without_type', default='non', properties=frozenset({'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3, option_4]) +option_2 = OptionDescription(name='general', doc='général', children=[option_3, option_4], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/00load_save/tiramisu/base.py b/tests/dictionaries/00load_save/tiramisu/base.py index 070826aa..3cc9d152 100644 --- a/tests/dictionaries/00load_save/tiramisu/base.py +++ b/tests/dictionaries/00load_save/tiramisu/base.py @@ -13,6 +13,6 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3]) +option_2 = OptionDescription(name='general', doc='général', children=[option_3], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/00load_subfolder/tiramisu/base.py b/tests/dictionaries/00load_subfolder/tiramisu/base.py index 05bcd8c5..f3801345 100644 --- a/tests/dictionaries/00load_subfolder/tiramisu/base.py +++ b/tests/dictionaries/00load_subfolder/tiramisu/base.py @@ -14,6 +14,6 @@ except: from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) option_4 = StrOption(name='mode_conteneur_actif1', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3, option_4]) +option_2 = OptionDescription(name='general', doc='général', children=[option_3, option_4], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/01auto_autofreeze/tiramisu/base.py b/tests/dictionaries/01auto_autofreeze/tiramisu/base.py index 8c339654..e26c65b8 100644 --- a/tests/dictionaries/01auto_autofreeze/tiramisu/base.py +++ b/tests/dictionaries/01auto_autofreeze/tiramisu/base.py @@ -14,6 +14,6 @@ except: from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='module_instancie', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_4 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.calc_val, Params((ParamValue("oui")), kwargs={})), properties=frozenset({'auto_freeze', 'basic', 'force_store_value', 'frozen', 'hidden', Calculation(calc_value, Params(ParamValue('auto_frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)}))})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'basic'}), children=[option_3, option_4]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4], properties=frozenset({'basic'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/01auto_base/tiramisu/base.py b/tests/dictionaries/01auto_base/tiramisu/base.py index 7ec3d4b6..9af5838c 100644 --- a/tests/dictionaries/01auto_base/tiramisu/base.py +++ b/tests/dictionaries/01auto_base/tiramisu/base.py @@ -14,6 +14,6 @@ except: from rougail.tiramisu import ConvertDynOptionDescription option_4 = StrOption(name='mode_conteneur_actif1', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.calc_val, Params((ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={})), properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/01auto_withoutparam/tiramisu/base.py b/tests/dictionaries/01auto_withoutparam/tiramisu/base.py index 864b8644..99c01e52 100644 --- a/tests/dictionaries/01auto_withoutparam/tiramisu/base.py +++ b/tests/dictionaries/01auto_withoutparam/tiramisu/base.py @@ -14,6 +14,6 @@ except: from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.calc_val, Params((), kwargs={})), properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'})) option_4 = StrOption(name='mode_conteneur_actif1', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/01base_file_include/tiramisu/base.py b/tests/dictionaries/01base_file_include/tiramisu/base.py index bcccf75c..c8b929df 100644 --- a/tests/dictionaries/01base_file_include/tiramisu/base.py +++ b/tests/dictionaries/01base_file_include/tiramisu/base.py @@ -13,7 +13,7 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='Description', default='non', properties=frozenset({'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_8 = StrOption(name='group', doc='group', default='root') option_9 = StrOption(name='mode', doc='mode', default='0644') @@ -26,5 +26,5 @@ option_7 = OptionDescription(name='file', doc='file', children=[option_8, option option_6 = OptionDescription(name='files', doc='files', children=[option_7]) option_5 = OptionDescription(name='test', doc='test', children=[option_6]) option_5.impl_set_information("manage", True) -option_4 = OptionDescription(name='services', doc='services', properties=frozenset({'hidden'}), children=[option_5]) +option_4 = OptionDescription(name='services', doc='services', children=[option_5], properties=frozenset({'hidden'})) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_4]) diff --git a/tests/dictionaries/01base_file_patch/tiramisu/base.py b/tests/dictionaries/01base_file_patch/tiramisu/base.py index bcccf75c..c8b929df 100644 --- a/tests/dictionaries/01base_file_patch/tiramisu/base.py +++ b/tests/dictionaries/01base_file_patch/tiramisu/base.py @@ -13,7 +13,7 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='Description', default='non', properties=frozenset({'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_8 = StrOption(name='group', doc='group', default='root') option_9 = StrOption(name='mode', doc='mode', default='0644') @@ -26,5 +26,5 @@ option_7 = OptionDescription(name='file', doc='file', children=[option_8, option option_6 = OptionDescription(name='files', doc='files', children=[option_7]) option_5 = OptionDescription(name='test', doc='test', children=[option_6]) option_5.impl_set_information("manage", True) -option_4 = OptionDescription(name='services', doc='services', properties=frozenset({'hidden'}), children=[option_5]) +option_4 = OptionDescription(name='services', doc='services', children=[option_5], properties=frozenset({'hidden'})) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_4]) diff --git a/tests/dictionaries/01base_file_utfchar/tiramisu/base.py b/tests/dictionaries/01base_file_utfchar/tiramisu/base.py index ee9b3ca1..bf250087 100644 --- a/tests/dictionaries/01base_file_utfchar/tiramisu/base.py +++ b/tests/dictionaries/01base_file_utfchar/tiramisu/base.py @@ -13,7 +13,7 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='Description', default='non', properties=frozenset({'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_8 = StrOption(name='group', doc='group', default='root') option_9 = StrOption(name='mode', doc='mode', default='0644') @@ -26,5 +26,5 @@ option_7 = OptionDescription(name='systemd_makefs@dev_disk_by\\x2dpartlabel', do option_6 = OptionDescription(name='files', doc='files', children=[option_7]) option_5 = OptionDescription(name='test', doc='test', children=[option_6]) option_5.impl_set_information("manage", True) -option_4 = OptionDescription(name='services', doc='services', properties=frozenset({'hidden'}), children=[option_5]) +option_4 = OptionDescription(name='services', doc='services', children=[option_5], properties=frozenset({'hidden'})) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_4]) diff --git a/tests/dictionaries/01base_float/tiramisu/base.py b/tests/dictionaries/01base_float/tiramisu/base.py index de0e047e..d7ce0c24 100644 --- a/tests/dictionaries/01base_float/tiramisu/base.py +++ b/tests/dictionaries/01base_float/tiramisu/base.py @@ -13,7 +13,7 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = FloatOption(name='float', doc='Description', default=0.527, properties=frozenset({'mandatory', 'normal'})) -option_4 = FloatOption(name='float_multi', doc='Description', default=[0.527], multi=True, default_multi=0.527, properties=frozenset({'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4]) +option_4 = FloatOption(name='float_multi', doc='Description', multi=True, default=[0.527], default_multi=0.527, properties=frozenset({'mandatory', 'normal'})) +option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/01base_multi/tiramisu/base.py b/tests/dictionaries/01base_multi/tiramisu/base.py index 9b3a339f..82a62bc1 100644 --- a/tests/dictionaries/01base_multi/tiramisu/base.py +++ b/tests/dictionaries/01base_multi/tiramisu/base.py @@ -12,7 +12,7 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='Redefine description', default=['non'], multi=True, default_multi='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) +option_3 = StrOption(name='mode_conteneur_actif', doc='Redefine description', multi=True, default=['non'], default_multi='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) +option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/01base_var_name_same_family/tiramisu/base.py b/tests/dictionaries/01base_var_name_same_family/tiramisu/base.py index aeee9aea..65f5869d 100644 --- a/tests/dictionaries/01base_var_name_same_family/tiramisu/base.py +++ b/tests/dictionaries/01base_var_name_same_family/tiramisu/base.py @@ -13,6 +13,6 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='general', doc='description', default='non', properties=frozenset({'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/01family_description/tiramisu/base.py b/tests/dictionaries/01family_description/tiramisu/base.py index f0bde94f..a5614b57 100644 --- a/tests/dictionaries/01family_description/tiramisu/base.py +++ b/tests/dictionaries/01family_description/tiramisu/base.py @@ -13,6 +13,6 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='mode_conteneur_actif', default='non', properties=frozenset({'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='Other description', properties=frozenset({'normal'}), children=[option_3]) +option_2 = OptionDescription(name='general', doc='Other description', children=[option_3], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/01fill_autofreeze/tiramisu/base.py b/tests/dictionaries/01fill_autofreeze/tiramisu/base.py index 32631837..cea8070a 100644 --- a/tests/dictionaries/01fill_autofreeze/tiramisu/base.py +++ b/tests/dictionaries/01fill_autofreeze/tiramisu/base.py @@ -15,6 +15,6 @@ from rougail.tiramisu import ConvertDynOptionDescription option_4 = StrOption(name='mode_conteneur_actif1', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_5 = StrOption(name='module_instancie', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.calc_val, Params((ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={})), properties=frozenset({'auto_freeze', 'basic', 'force_store_value', Calculation(calc_value, Params(ParamValue('auto_frozen'), kwargs={'condition': ParamOption(option_5, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)}))})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'basic'}), children=[option_3, option_4, option_5]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4, option_5], properties=frozenset({'basic'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/01fill_autosave/tiramisu/base.py b/tests/dictionaries/01fill_autosave/tiramisu/base.py index f7e37982..e92e05c6 100644 --- a/tests/dictionaries/01fill_autosave/tiramisu/base.py +++ b/tests/dictionaries/01fill_autosave/tiramisu/base.py @@ -14,6 +14,6 @@ except: from rougail.tiramisu import ConvertDynOptionDescription option_4 = StrOption(name='mode_conteneur_actif1', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.calc_val, Params((ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={})), properties=frozenset({'basic', 'force_store_value'})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'basic'}), children=[option_3, option_4]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4], properties=frozenset({'basic'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/01fill_base/tiramisu/base.py b/tests/dictionaries/01fill_base/tiramisu/base.py index 15f65fe6..62c41db4 100644 --- a/tests/dictionaries/01fill_base/tiramisu/base.py +++ b/tests/dictionaries/01fill_base/tiramisu/base.py @@ -14,6 +14,6 @@ except: from rougail.tiramisu import ConvertDynOptionDescription option_4 = StrOption(name='mode_conteneur_actif1', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.calc_val, Params((ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={})), properties=frozenset({'normal'})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/01fill_baseaccent/tiramisu/base.py b/tests/dictionaries/01fill_baseaccent/tiramisu/base.py index fded476b..1600e21e 100644 --- a/tests/dictionaries/01fill_baseaccent/tiramisu/base.py +++ b/tests/dictionaries/01fill_baseaccent/tiramisu/base.py @@ -14,6 +14,6 @@ except: from rougail.tiramisu import ConvertDynOptionDescription option_4 = StrOption(name='mode_conteneur_actif1', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.calc_val, Params((ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={})), properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'})) -option_2 = OptionDescription(name='general', doc='Général', properties=frozenset({'normal'}), children=[option_3, option_4]) +option_2 = OptionDescription(name='general', doc='Général', children=[option_3, option_4], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/01fill_mandatory/tiramisu/base.py b/tests/dictionaries/01fill_mandatory/tiramisu/base.py index 7f969748..59323487 100644 --- a/tests/dictionaries/01fill_mandatory/tiramisu/base.py +++ b/tests/dictionaries/01fill_mandatory/tiramisu/base.py @@ -14,6 +14,6 @@ except: from rougail.tiramisu import ConvertDynOptionDescription option_4 = StrOption(name='mode_conteneur_actif1', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.calc_val, Params((ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={})), properties=frozenset({'expert', 'mandatory'})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/01fill_number/tiramisu/base.py b/tests/dictionaries/01fill_number/tiramisu/base.py index 6cbc847c..18c6716d 100644 --- a/tests/dictionaries/01fill_number/tiramisu/base.py +++ b/tests/dictionaries/01fill_number/tiramisu/base.py @@ -14,6 +14,6 @@ except: from rougail.tiramisu import ConvertDynOptionDescription option_3 = IntOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.calc_val, Params((ParamValue(3)), kwargs={})), properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'})) option_4 = StrOption(name='mode_conteneur_actif1', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/01fill_only_optional/tiramisu/base.py b/tests/dictionaries/01fill_only_optional/tiramisu/base.py index 864b8644..99c01e52 100644 --- a/tests/dictionaries/01fill_only_optional/tiramisu/base.py +++ b/tests/dictionaries/01fill_only_optional/tiramisu/base.py @@ -14,6 +14,6 @@ except: from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.calc_val, Params((), kwargs={})), properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'})) option_4 = StrOption(name='mode_conteneur_actif1', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/01fill_optional/tiramisu/base.py b/tests/dictionaries/01fill_optional/tiramisu/base.py index 7ec3d4b6..9af5838c 100644 --- a/tests/dictionaries/01fill_optional/tiramisu/base.py +++ b/tests/dictionaries/01fill_optional/tiramisu/base.py @@ -14,6 +14,6 @@ except: from rougail.tiramisu import ConvertDynOptionDescription option_4 = StrOption(name='mode_conteneur_actif1', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.calc_val, Params((ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={})), properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/01hidden_if_in_autofreeze/tiramisu/base.py b/tests/dictionaries/01hidden_if_in_autofreeze/tiramisu/base.py index 1b4e48eb..6f6017b3 100644 --- a/tests/dictionaries/01hidden_if_in_autofreeze/tiramisu/base.py +++ b/tests/dictionaries/01hidden_if_in_autofreeze/tiramisu/base.py @@ -14,6 +14,6 @@ except: from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='module_instancie', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_4 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.calc_val, Params((ParamValue("oui")), kwargs={})), properties=frozenset({'auto_freeze', 'basic', 'force_store_value', Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('auto_frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)}))})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'basic'}), children=[option_3, option_4]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4], properties=frozenset({'basic'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/01test/tiramisu/base.py b/tests/dictionaries/01test/tiramisu/base.py index 268318df..7fa56576 100644 --- a/tests/dictionaries/01test/tiramisu/base.py +++ b/tests/dictionaries/01test/tiramisu/base.py @@ -14,6 +14,6 @@ except: from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='mode_conteneur_actif', default='non', properties=frozenset({'mandatory', 'normal'})) option_3.impl_set_information("test", ('test',)) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/01test_multi/tiramisu/base.py b/tests/dictionaries/01test_multi/tiramisu/base.py index 7a8c30fc..14acc0b1 100644 --- a/tests/dictionaries/01test_multi/tiramisu/base.py +++ b/tests/dictionaries/01test_multi/tiramisu/base.py @@ -14,6 +14,6 @@ except: from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='mode_conteneur_actif', default='non', properties=frozenset({'mandatory', 'normal'})) option_3.impl_set_information("test", ('test1', 'test2')) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/01test_multi_none/tiramisu/base.py b/tests/dictionaries/01test_multi_none/tiramisu/base.py index 46dd92c1..6db69927 100644 --- a/tests/dictionaries/01test_multi_none/tiramisu/base.py +++ b/tests/dictionaries/01test_multi_none/tiramisu/base.py @@ -14,6 +14,6 @@ except: from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='mode_conteneur_actif', default='non', properties=frozenset({'mandatory', 'normal'})) option_3.impl_set_information("test", (None, 'test1', 'test2')) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/01test_redefine/tiramisu/base.py b/tests/dictionaries/01test_redefine/tiramisu/base.py index 64295083..8dc8f29b 100644 --- a/tests/dictionaries/01test_redefine/tiramisu/base.py +++ b/tests/dictionaries/01test_redefine/tiramisu/base.py @@ -14,6 +14,6 @@ except: from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='mode_conteneur_actif', default='non', properties=frozenset({'mandatory', 'normal'})) option_3.impl_set_information("test", ('test1',)) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/01test_redefine_remove/tiramisu/base.py b/tests/dictionaries/01test_redefine_remove/tiramisu/base.py index 7673b0be..00ba55bc 100644 --- a/tests/dictionaries/01test_redefine_remove/tiramisu/base.py +++ b/tests/dictionaries/01test_redefine_remove/tiramisu/base.py @@ -13,6 +13,6 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='mode_conteneur_actif', default='non', properties=frozenset({'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/02autosave_hidden_frozenifin/tiramisu/base.py b/tests/dictionaries/02autosave_hidden_frozenifin/tiramisu/base.py index a12b7c49..a1570bc8 100644 --- a/tests/dictionaries/02autosave_hidden_frozenifin/tiramisu/base.py +++ b/tests/dictionaries/02autosave_hidden_frozenifin/tiramisu/base.py @@ -14,6 +14,6 @@ except: from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) option_4 = StrOption(name='autosavevar', doc='autosave variable', default=Calculation(func.calc_val, Params((ParamValue("oui")), kwargs={})), properties=frozenset({'basic', 'force_store_value', Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) -option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'basic'}), children=[option_3, option_4]) +option_2 = OptionDescription(name='general', doc='général', children=[option_3, option_4], properties=frozenset({'basic'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10autosave_hidden/tiramisu/base.py b/tests/dictionaries/10autosave_hidden/tiramisu/base.py index ebedad0a..aae07bf4 100644 --- a/tests/dictionaries/10autosave_hidden/tiramisu/base.py +++ b/tests/dictionaries/10autosave_hidden/tiramisu/base.py @@ -14,6 +14,6 @@ except: from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) option_4 = StrOption(name='autosavevar', doc='autosave variable', default=Calculation(func.calc_val, Params((ParamValue("oui")), kwargs={})), properties=frozenset({'basic', 'force_store_value', 'frozen', 'hidden'})) -option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'basic'}), children=[option_3, option_4]) +option_2 = OptionDescription(name='general', doc='général', children=[option_3, option_4], properties=frozenset({'basic'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10check_base/tiramisu/base.py b/tests/dictionaries/10check_base/tiramisu/base.py index 9e6c9b03..ea61b0ce 100644 --- a/tests/dictionaries/10check_base/tiramisu/base.py +++ b/tests/dictionaries/10check_base/tiramisu/base.py @@ -13,7 +13,7 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='b', properties=frozenset({'mandatory', 'normal'})) -option_4 = IntOption(name='int', doc='No change', properties=frozenset({'normal'}), min_number=0, max_number=100) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4]) +option_4 = IntOption(name='int', doc='No change', min_number=0, max_number=100, properties=frozenset({'normal'})) +option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10check_no_param/tiramisu/base.py b/tests/dictionaries/10check_no_param/tiramisu/base.py index ed58ecc1..68369d14 100644 --- a/tests/dictionaries/10check_no_param/tiramisu/base.py +++ b/tests/dictionaries/10check_no_param/tiramisu/base.py @@ -13,7 +13,7 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='b', properties=frozenset({'mandatory', 'normal'})) -option_4 = IntOption(name='int', doc='No change', properties=frozenset({'normal'}), validators=[Calculation(func.valid_lower, Params((ParamSelfOption()), kwargs={}), warnings_only=False)]) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4]) +option_4 = IntOption(name='int', doc='No change', validators=[Calculation(func.valid_lower, Params((ParamSelfOption()), kwargs={}), warnings_only=False)], properties=frozenset({'normal'})) +option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10check_option/tiramisu/base.py b/tests/dictionaries/10check_option/tiramisu/base.py index c3df4770..b02917d4 100644 --- a/tests/dictionaries/10check_option/tiramisu/base.py +++ b/tests/dictionaries/10check_option/tiramisu/base.py @@ -14,7 +14,7 @@ except: from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='b', properties=frozenset({'mandatory', 'normal'})) option_4 = IntOption(name='int2', doc='No change', default=100, properties=frozenset({'mandatory', 'normal'})) -option_5 = IntOption(name='int', doc='No change', properties=frozenset({'normal'}), validators=[Calculation(func.valid_lower, Params((ParamSelfOption()), kwargs={'mini': ParamValue("0"), 'maxi': ParamOption(option_4, notraisepropertyerror=False, todict=False)}), warnings_only=False)]) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4, option_5]) +option_5 = IntOption(name='int', doc='No change', validators=[Calculation(func.valid_lower, Params((ParamSelfOption()), kwargs={'mini': ParamValue("0"), 'maxi': ParamOption(option_4, notraisepropertyerror=False, todict=False)}), warnings_only=False)], properties=frozenset({'normal'})) +option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4, option_5], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10check_optional/tiramisu/base.py b/tests/dictionaries/10check_optional/tiramisu/base.py index 4ccca146..61c0f7cd 100644 --- a/tests/dictionaries/10check_optional/tiramisu/base.py +++ b/tests/dictionaries/10check_optional/tiramisu/base.py @@ -14,7 +14,7 @@ except: from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='b', properties=frozenset({'mandatory', 'normal'})) option_5 = IntOption(name='int2', doc='No change', properties=frozenset({'normal'})) -option_4 = IntOption(name='int', doc='No change', properties=frozenset({'normal'}), validators=[Calculation(func.valid_differ, Params((ParamSelfOption(), ParamOption(option_5, notraisepropertyerror=False, todict=False)), kwargs={}), warnings_only=False)]) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4, option_5]) +option_4 = IntOption(name='int', doc='No change', validators=[Calculation(func.valid_differ, Params((ParamSelfOption(), ParamOption(option_5, notraisepropertyerror=False, todict=False)), kwargs={}), warnings_only=False)], properties=frozenset({'normal'})) +option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4, option_5], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10check_valid_differ/tiramisu/base.py b/tests/dictionaries/10check_valid_differ/tiramisu/base.py index 8f73b6e7..aba999aa 100644 --- a/tests/dictionaries/10check_valid_differ/tiramisu/base.py +++ b/tests/dictionaries/10check_valid_differ/tiramisu/base.py @@ -13,7 +13,7 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_4 = StrOption(name='mode_conteneur_actif1', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='oui', properties=frozenset({'mandatory', 'normal'}), validators=[Calculation(func.valid_differ, Params((ParamSelfOption(), ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={}), warnings_only=False)]) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4]) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='oui', validators=[Calculation(func.valid_differ, Params((ParamSelfOption(), ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={}), warnings_only=False)], properties=frozenset({'mandatory', 'normal'})) +option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10check_valid_differ_add/tiramisu/base.py b/tests/dictionaries/10check_valid_differ_add/tiramisu/base.py index 4c058cda..cc15984d 100644 --- a/tests/dictionaries/10check_valid_differ_add/tiramisu/base.py +++ b/tests/dictionaries/10check_valid_differ_add/tiramisu/base.py @@ -15,7 +15,7 @@ from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='oui', properties=frozenset({'mandatory', 'normal'})) option_4 = StrOption(name='mode_conteneur_actif1', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_5 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) -option_6 = StrOption(name='mode_conteneur_actif3', doc='No change', default='oui', properties=frozenset({'mandatory', 'normal'}), validators=[Calculation(func.valid_differ, Params((ParamSelfOption(), ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={}), warnings_only=False), Calculation(func.valid_differ, Params((ParamSelfOption(), ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={}), warnings_only=False), Calculation(func.valid_differ, Params((ParamSelfOption(), ParamOption(option_5, notraisepropertyerror=False, todict=False)), kwargs={}), warnings_only=False)]) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4, option_5, option_6]) +option_6 = StrOption(name='mode_conteneur_actif3', doc='No change', default='oui', validators=[Calculation(func.valid_differ, Params((ParamSelfOption(), ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={}), warnings_only=False), Calculation(func.valid_differ, Params((ParamSelfOption(), ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={}), warnings_only=False), Calculation(func.valid_differ, Params((ParamSelfOption(), ParamOption(option_5, notraisepropertyerror=False, todict=False)), kwargs={}), warnings_only=False)], properties=frozenset({'mandatory', 'normal'})) +option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4, option_5, option_6], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10check_valid_differ_removecheck/tiramisu/base.py b/tests/dictionaries/10check_valid_differ_removecheck/tiramisu/base.py index 0e8af096..5d834f65 100644 --- a/tests/dictionaries/10check_valid_differ_removecheck/tiramisu/base.py +++ b/tests/dictionaries/10check_valid_differ_removecheck/tiramisu/base.py @@ -15,7 +15,7 @@ from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='oui', properties=frozenset({'mandatory', 'normal'})) option_4 = StrOption(name='mode_conteneur_actif1', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_5 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) -option_6 = StrOption(name='mode_conteneur_actif3', doc='No change', default='oui', properties=frozenset({'mandatory', 'normal'}), validators=[Calculation(func.valid_differ, Params((ParamSelfOption(), ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={}), warnings_only=False), Calculation(func.valid_differ, Params((ParamSelfOption(), ParamOption(option_5, notraisepropertyerror=False, todict=False)), kwargs={}), warnings_only=False)]) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4, option_5, option_6]) +option_6 = StrOption(name='mode_conteneur_actif3', doc='No change', default='oui', validators=[Calculation(func.valid_differ, Params((ParamSelfOption(), ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={}), warnings_only=False), Calculation(func.valid_differ, Params((ParamSelfOption(), ParamOption(option_5, notraisepropertyerror=False, todict=False)), kwargs={}), warnings_only=False)], properties=frozenset({'mandatory', 'normal'})) +option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4, option_5, option_6], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10check_valid_in_network/tiramisu/base.py b/tests/dictionaries/10check_valid_in_network/tiramisu/base.py index 3729e043..21959056 100644 --- a/tests/dictionaries/10check_valid_in_network/tiramisu/base.py +++ b/tests/dictionaries/10check_valid_in_network/tiramisu/base.py @@ -13,9 +13,9 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='oui', properties=frozenset({'mandatory', 'normal'})) -option_4 = IPOption(private_only=True, warnings_only=True, name='adresse_ip_eth0', doc='Adresse IP de la carte', properties=frozenset({'basic', 'mandatory'})) +option_4 = IPOption(name='adresse_ip_eth0', doc='Adresse IP de la carte', private_only=True, warnings_only=True, properties=frozenset({'basic', 'mandatory'})) option_5 = NetmaskOption(name='adresse_netmask_eth0', doc='Masque de sous réseau de la carte', properties=frozenset({'basic', 'mandatory'})) -option_6 = IPOption(private_only=True, warnings_only=True, name='adresse_ip', doc='IP', properties=frozenset({'basic', 'mandatory'}), validators=[Calculation(func.valid_in_network, Params((ParamSelfOption(), ParamOption(option_4, notraisepropertyerror=False, todict=False), ParamOption(option_5, notraisepropertyerror=False, todict=False)), kwargs={}), warnings_only=True)]) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'basic'}), children=[option_3, option_4, option_5, option_6]) +option_6 = IPOption(name='adresse_ip', doc='IP', validators=[Calculation(func.valid_in_network, Params((ParamSelfOption(), ParamOption(option_4, notraisepropertyerror=False, todict=False), ParamOption(option_5, notraisepropertyerror=False, todict=False)), kwargs={}), warnings_only=True)], private_only=True, warnings_only=True, properties=frozenset({'basic', 'mandatory'})) +option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4, option_5, option_6], properties=frozenset({'basic'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10check_valid_in_network_cidr/tiramisu/base.py b/tests/dictionaries/10check_valid_in_network_cidr/tiramisu/base.py index 0f51a221..51dd9dde 100644 --- a/tests/dictionaries/10check_valid_in_network_cidr/tiramisu/base.py +++ b/tests/dictionaries/10check_valid_in_network_cidr/tiramisu/base.py @@ -13,8 +13,8 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='oui', properties=frozenset({'mandatory', 'normal'})) -option_4 = IPOption(cidr=True, name='adresse_ip_eth0', doc='Adresse IP de la carte', properties=frozenset({'basic', 'mandatory'})) -option_5 = IPOption(private_only=True, warnings_only=True, name='adresse_ip', doc='IP', properties=frozenset({'basic', 'mandatory'}), validators=[Calculation(func.valid_in_network, Params((ParamSelfOption(), ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={}), warnings_only=True)]) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'basic'}), children=[option_3, option_4, option_5]) +option_4 = IPOption(name='adresse_ip_eth0', doc='Adresse IP de la carte', cidr=True, properties=frozenset({'basic', 'mandatory'})) +option_5 = IPOption(name='adresse_ip', doc='IP', validators=[Calculation(func.valid_in_network, Params((ParamSelfOption(), ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={}), warnings_only=True)], private_only=True, warnings_only=True, properties=frozenset({'basic', 'mandatory'})) +option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4, option_5], properties=frozenset({'basic'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10check_valid_ipnetmask/tiramisu/base.py b/tests/dictionaries/10check_valid_ipnetmask/tiramisu/base.py index b5c6c848..4ad41a09 100644 --- a/tests/dictionaries/10check_valid_ipnetmask/tiramisu/base.py +++ b/tests/dictionaries/10check_valid_ipnetmask/tiramisu/base.py @@ -13,8 +13,8 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='oui', properties=frozenset({'mandatory', 'normal'})) -option_4 = IPOption(private_only=True, warnings_only=True, name='adresse_ip_eth0', doc='Adresse IP de la carte', properties=frozenset({'basic', 'mandatory'})) -option_5 = NetmaskOption(name='adresse_netmask_eth0', doc='Masque de sous réseau de la carte', properties=frozenset({'basic', 'mandatory'}), validators=[Calculation(func.valid_ipnetmask, Params((ParamSelfOption(), ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={}), warnings_only=True)]) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'basic'}), children=[option_3, option_4, option_5]) +option_4 = IPOption(name='adresse_ip_eth0', doc='Adresse IP de la carte', private_only=True, warnings_only=True, properties=frozenset({'basic', 'mandatory'})) +option_5 = NetmaskOption(name='adresse_netmask_eth0', doc='Masque de sous réseau de la carte', validators=[Calculation(func.valid_ipnetmask, Params((ParamSelfOption(), ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={}), warnings_only=True)], properties=frozenset({'basic', 'mandatory'})) +option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4, option_5], properties=frozenset({'basic'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10fill_information/tiramisu/base.py b/tests/dictionaries/10fill_information/tiramisu/base.py index 217b7400..6b818a8f 100644 --- a/tests/dictionaries/10fill_information/tiramisu/base.py +++ b/tests/dictionaries/10fill_information/tiramisu/base.py @@ -13,6 +13,6 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.calc_val, Params((ParamInformation("test_information", None)), kwargs={})), properties=frozenset({'normal'})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10leadership_append/tiramisu/base.py b/tests/dictionaries/10leadership_append/tiramisu/base.py index dec1fd78..6072b211 100644 --- a/tests/dictionaries/10leadership_append/tiramisu/base.py +++ b/tests/dictionaries/10leadership_append/tiramisu/base.py @@ -13,12 +13,12 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'normal'})) option_6 = StrOption(name='leader', doc='leader', multi=True) -option_7 = StrOption(name='follower1', doc='follower1', default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), multi=True, properties=frozenset({'normal'})) -option_8 = StrOption(name='follower2', doc='follower2', default=Calculation(func.calc_val, Params((ParamOption(option_7, notraisepropertyerror=False, todict=False)), kwargs={})), multi=True, properties=frozenset({'normal'})) +option_7 = StrOption(name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({'normal'})) +option_8 = StrOption(name='follower2', doc='follower2', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_7, notraisepropertyerror=False, todict=False)), kwargs={})), properties=frozenset({'normal'})) option_9 = StrOption(name='follower3', doc='follower3', multi=True, properties=frozenset({'normal'})) -option_5 = Leadership(name='leader', doc='leader', properties=frozenset({'normal'}), children=[option_6, option_7, option_8, option_9]) -option_4 = OptionDescription(name='general1', doc='general1', properties=frozenset({'normal'}), children=[option_5]) +option_5 = Leadership(name='leader', doc='leader', children=[option_6, option_7, option_8, option_9], properties=frozenset({'normal'})) +option_4 = OptionDescription(name='general1', doc='general1', children=[option_5], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2, option_4]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10leadership_append_hidden/tiramisu/base.py b/tests/dictionaries/10leadership_append_hidden/tiramisu/base.py index 64f6825f..3518c414 100644 --- a/tests/dictionaries/10leadership_append_hidden/tiramisu/base.py +++ b/tests/dictionaries/10leadership_append_hidden/tiramisu/base.py @@ -13,12 +13,12 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'normal'})) option_6 = StrOption(name='leader', doc='leader', multi=True, properties=frozenset({'force_default_on_freeze', 'frozen'})) -option_7 = StrOption(name='follower1', doc='follower1', default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), multi=True, properties=frozenset({'force_default_on_freeze', 'frozen', 'normal'})) -option_8 = StrOption(name='follower2', doc='follower2', default=Calculation(func.calc_val, Params((ParamOption(option_7, notraisepropertyerror=False, todict=False)), kwargs={})), multi=True, properties=frozenset({'force_default_on_freeze', 'frozen', 'normal'})) +option_7 = StrOption(name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({'force_default_on_freeze', 'frozen', 'normal'})) +option_8 = StrOption(name='follower2', doc='follower2', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_7, notraisepropertyerror=False, todict=False)), kwargs={})), properties=frozenset({'force_default_on_freeze', 'frozen', 'normal'})) option_9 = StrOption(name='follower3', doc='follower3', multi=True, properties=frozenset({'force_default_on_freeze', 'frozen', 'normal'})) -option_5 = Leadership(name='leader', doc='leader', properties=frozenset({'hidden', 'normal'}), children=[option_6, option_7, option_8, option_9]) -option_4 = OptionDescription(name='general1', doc='general1', properties=frozenset({'normal'}), children=[option_5]) +option_5 = Leadership(name='leader', doc='leader', children=[option_6, option_7, option_8, option_9], properties=frozenset({'hidden', 'normal'})) +option_4 = OptionDescription(name='general1', doc='general1', children=[option_5], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2, option_4]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10leadership_append_name/tiramisu/base.py b/tests/dictionaries/10leadership_append_name/tiramisu/base.py index 7ec12eba..a70905fa 100644 --- a/tests/dictionaries/10leadership_append_name/tiramisu/base.py +++ b/tests/dictionaries/10leadership_append_name/tiramisu/base.py @@ -13,12 +13,12 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'normal'})) option_6 = StrOption(name='leader', doc='leader', multi=True) -option_7 = StrOption(name='follower1', doc='follower1', default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), multi=True, properties=frozenset({'normal'})) -option_8 = StrOption(name='follower2', doc='follower2', default=Calculation(func.calc_val, Params((ParamOption(option_7, notraisepropertyerror=False, todict=False)), kwargs={})), multi=True, properties=frozenset({'normal'})) +option_7 = StrOption(name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({'normal'})) +option_8 = StrOption(name='follower2', doc='follower2', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_7, notraisepropertyerror=False, todict=False)), kwargs={})), properties=frozenset({'normal'})) option_9 = StrOption(name='follower3', doc='follower3', multi=True, properties=frozenset({'normal'})) -option_5 = Leadership(name='leadership', doc='leadership', properties=frozenset({'normal'}), children=[option_6, option_7, option_8, option_9]) -option_4 = OptionDescription(name='general1', doc='general1', properties=frozenset({'normal'}), children=[option_5]) +option_5 = Leadership(name='leadership', doc='leadership', children=[option_6, option_7, option_8, option_9], properties=frozenset({'normal'})) +option_4 = OptionDescription(name='general1', doc='general1', children=[option_5], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2, option_4]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10leadership_auto/tiramisu/base.py b/tests/dictionaries/10leadership_auto/tiramisu/base.py index 39855631..79c63bd0 100644 --- a/tests/dictionaries/10leadership_auto/tiramisu/base.py +++ b/tests/dictionaries/10leadership_auto/tiramisu/base.py @@ -14,10 +14,10 @@ except: from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_5 = StrOption(name='leader', doc='leader', multi=True) -option_6 = StrOption(name='follower1', doc='follower1', default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), multi=True, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'})) -option_7 = StrOption(name='follower2', doc='follower2', default=Calculation(func.calc_val, Params((ParamOption(option_6, notraisepropertyerror=False, todict=False)), kwargs={})), multi=True, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'})) -option_8 = StrOption(name='follower3', doc='follower3', default=Calculation(func.calc_val, Params((ParamOption(option_5, notraisepropertyerror=False, todict=False)), kwargs={})), multi=True, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'})) -option_4 = Leadership(name='leader', doc='leader', properties=frozenset({'normal'}), children=[option_5, option_6, option_7, option_8]) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4]) +option_6 = StrOption(name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'})) +option_7 = StrOption(name='follower2', doc='follower2', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_6, notraisepropertyerror=False, todict=False)), kwargs={})), properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'})) +option_8 = StrOption(name='follower3', doc='follower3', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_5, notraisepropertyerror=False, todict=False)), kwargs={})), properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'})) +option_4 = Leadership(name='leader', doc='leader', children=[option_5, option_6, option_7, option_8], properties=frozenset({'normal'})) +option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10leadership_autoleader/tiramisu/base.py b/tests/dictionaries/10leadership_autoleader/tiramisu/base.py index 34630001..ff8d06d1 100644 --- a/tests/dictionaries/10leadership_autoleader/tiramisu/base.py +++ b/tests/dictionaries/10leadership_autoleader/tiramisu/base.py @@ -14,9 +14,9 @@ except: from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_5 = StrOption(name='leader', doc='leader', multi=True) -option_6 = StrOption(name='follower1', doc='follower1', default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), multi=True, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'})) -option_7 = StrOption(name='follower2', doc='follower2', default=Calculation(func.calc_val, Params((ParamOption(option_5, notraisepropertyerror=False, todict=False)), kwargs={})), multi=True, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'})) -option_4 = Leadership(name='leader', doc='leader', properties=frozenset({'normal'}), children=[option_5, option_6, option_7]) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4]) +option_6 = StrOption(name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'})) +option_7 = StrOption(name='follower2', doc='follower2', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_5, notraisepropertyerror=False, todict=False)), kwargs={})), properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'})) +option_4 = Leadership(name='leader', doc='leader', children=[option_5, option_6, option_7], properties=frozenset({'normal'})) +option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10leadership_autoleader_expert/tiramisu/base.py b/tests/dictionaries/10leadership_autoleader_expert/tiramisu/base.py index cf75899e..1abe63dd 100644 --- a/tests/dictionaries/10leadership_autoleader_expert/tiramisu/base.py +++ b/tests/dictionaries/10leadership_autoleader_expert/tiramisu/base.py @@ -13,11 +13,11 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'expert', 'mandatory'})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'expert'}), children=[option_3]) -option_6 = StrOption(name='leader', doc='leader', default=Calculation(func.calc_list, Params((), kwargs={'valeur': ParamValue("valfill")})), multi=True) +option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'expert'})) +option_6 = StrOption(name='leader', doc='leader', multi=True, default=Calculation(func.calc_list, Params((), kwargs={'valeur': ParamValue("valfill")}))) option_7 = StrOption(name='follower1', doc='follower1', multi=True, properties=frozenset({'expert'})) option_8 = StrOption(name='follower2', doc='follower2', multi=True, properties=frozenset({'expert'})) -option_5 = Leadership(name='leader', doc='leader', properties=frozenset({'expert'}), children=[option_6, option_7, option_8]) -option_4 = OptionDescription(name='leadermode', doc='leadermode', properties=frozenset({'expert'}), children=[option_5]) +option_5 = Leadership(name='leader', doc='leader', children=[option_6, option_7, option_8], properties=frozenset({'expert'})) +option_4 = OptionDescription(name='leadermode', doc='leadermode', children=[option_5], properties=frozenset({'expert'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2, option_4]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10leadership_autosaveexpert/tiramisu/base.py b/tests/dictionaries/10leadership_autosaveexpert/tiramisu/base.py index f920c2ca..dd6d671d 100644 --- a/tests/dictionaries/10leadership_autosaveexpert/tiramisu/base.py +++ b/tests/dictionaries/10leadership_autosaveexpert/tiramisu/base.py @@ -14,9 +14,9 @@ except: from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_5 = StrOption(name='leader', doc='leader', multi=True) -option_6 = StrOption(name='follower1', doc='follower1', default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), multi=True, properties=frozenset({'normal'})) -option_7 = StrOption(name='follower2', doc='follower2', default=Calculation(func.calc_val, Params((ParamOption(option_6, notraisepropertyerror=False, todict=False)), kwargs={})), multi=True, properties=frozenset({'expert'})) -option_4 = Leadership(name='leader', doc='leader', properties=frozenset({'normal'}), children=[option_5, option_6, option_7]) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4]) +option_6 = StrOption(name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({'normal'})) +option_7 = StrOption(name='follower2', doc='follower2', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_6, notraisepropertyerror=False, todict=False)), kwargs={})), properties=frozenset({'expert'})) +option_4 = Leadership(name='leader', doc='leader', children=[option_5, option_6, option_7], properties=frozenset({'normal'})) +option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10leadership_familyaccent/tiramisu/base.py b/tests/dictionaries/10leadership_familyaccent/tiramisu/base.py index e7a5aa5e..af7b213b 100644 --- a/tests/dictionaries/10leadership_familyaccent/tiramisu/base.py +++ b/tests/dictionaries/10leadership_familyaccent/tiramisu/base.py @@ -14,9 +14,9 @@ except: from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_5 = StrOption(name='leader', doc='leader', multi=True) -option_6 = StrOption(name='follower1', doc='follower1', default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), multi=True, properties=frozenset({'normal'})) -option_7 = StrOption(name='follower2', doc='follower2', default=Calculation(func.calc_val, Params((ParamOption(option_6, notraisepropertyerror=False, todict=False)), kwargs={})), multi=True, properties=frozenset({'normal'})) -option_4 = Leadership(name='leader', doc='leader', properties=frozenset({'normal'}), children=[option_5, option_6, option_7]) -option_2 = OptionDescription(name='general', doc='Général', properties=frozenset({'normal'}), children=[option_3, option_4]) +option_6 = StrOption(name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({'normal'})) +option_7 = StrOption(name='follower2', doc='follower2', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_6, notraisepropertyerror=False, todict=False)), kwargs={})), properties=frozenset({'normal'})) +option_4 = Leadership(name='leader', doc='leader', children=[option_5, option_6, option_7], properties=frozenset({'normal'})) +option_2 = OptionDescription(name='general', doc='Général', children=[option_3, option_4], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10leadership_leader_hidden/tiramisu/base.py b/tests/dictionaries/10leadership_leader_hidden/tiramisu/base.py index 0c1588fd..4e174c98 100644 --- a/tests/dictionaries/10leadership_leader_hidden/tiramisu/base.py +++ b/tests/dictionaries/10leadership_leader_hidden/tiramisu/base.py @@ -13,11 +13,11 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'expert', 'mandatory'})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'expert'}), children=[option_3]) -option_6 = StrOption(name='leader', doc='leader', default=Calculation(func.calc_list, Params((), kwargs={'valeur': ParamValue("valfill")})), multi=True, properties=frozenset({'force_default_on_freeze', 'frozen'})) +option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'expert'})) +option_6 = StrOption(name='leader', doc='leader', multi=True, default=Calculation(func.calc_list, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({'force_default_on_freeze', 'frozen'})) option_7 = StrOption(name='follower1', doc='follower1', multi=True, properties=frozenset({'force_default_on_freeze', 'frozen', 'normal'})) option_8 = StrOption(name='follower2', doc='follower2', multi=True, properties=frozenset({'force_default_on_freeze', 'frozen', 'normal'})) -option_5 = Leadership(name='leader', doc='leader', properties=frozenset({'hidden', 'normal'}), children=[option_6, option_7, option_8]) -option_4 = OptionDescription(name='leadermode', doc='leadermode', properties=frozenset({'normal'}), children=[option_5]) +option_5 = Leadership(name='leader', doc='leader', children=[option_6, option_7, option_8], properties=frozenset({'hidden', 'normal'})) +option_4 = OptionDescription(name='leadermode', doc='leadermode', children=[option_5], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2, option_4]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10leadership_leader_hidden_if_in/tiramisu/base.py b/tests/dictionaries/10leadership_leader_hidden_if_in/tiramisu/base.py index d4e74a12..8854c947 100644 --- a/tests/dictionaries/10leadership_leader_hidden_if_in/tiramisu/base.py +++ b/tests/dictionaries/10leadership_leader_hidden_if_in/tiramisu/base.py @@ -13,11 +13,11 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'expert', 'mandatory'})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'expert'}), children=[option_3]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'expert'})) option_6 = StrOption(name='leader', doc='leader', multi=True, properties=frozenset({Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('non')})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('non')}))})) option_7 = StrOption(name='follower1', doc='follower1', multi=True, properties=frozenset({'normal', Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('non')})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('non')}))})) option_8 = StrOption(name='follower2', doc='follower2', multi=True, properties=frozenset({'normal', Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('non')})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('non')}))})) -option_5 = Leadership(name='leader', doc='leader', properties=frozenset({'normal', Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('non')}))}), children=[option_6, option_7, option_8]) -option_4 = OptionDescription(name='leadermode', doc='leadermode', properties=frozenset({'normal'}), children=[option_5]) +option_5 = Leadership(name='leader', doc='leader', children=[option_6, option_7, option_8], properties=frozenset({'normal', Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('non')}))})) +option_4 = OptionDescription(name='leadermode', doc='leadermode', children=[option_5], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2, option_4]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10leadership_leader_hidden_if_in_name/tiramisu/base.py b/tests/dictionaries/10leadership_leader_hidden_if_in_name/tiramisu/base.py index 2a428093..dd9b9c9e 100644 --- a/tests/dictionaries/10leadership_leader_hidden_if_in_name/tiramisu/base.py +++ b/tests/dictionaries/10leadership_leader_hidden_if_in_name/tiramisu/base.py @@ -13,11 +13,11 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'expert', 'mandatory'})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'expert'}), children=[option_3]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'expert'})) option_6 = StrOption(name='leader', doc='leader', multi=True, properties=frozenset({Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('non')})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('non')}))})) option_7 = StrOption(name='follower1', doc='follower1', multi=True, properties=frozenset({'normal', Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('non')})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('non')}))})) option_8 = StrOption(name='follower2', doc='follower2', multi=True, properties=frozenset({'normal', Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('non')})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('non')}))})) -option_5 = Leadership(name='other', doc='other', properties=frozenset({'normal', Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('non')}))}), children=[option_6, option_7, option_8]) -option_4 = OptionDescription(name='leadermode', doc='leadermode', properties=frozenset({'normal'}), children=[option_5]) +option_5 = Leadership(name='other', doc='other', children=[option_6, option_7, option_8], properties=frozenset({'normal', Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('non')}))})) +option_4 = OptionDescription(name='leadermode', doc='leadermode', children=[option_5], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2, option_4]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10leadership_leadermandatory/tiramisu/base.py b/tests/dictionaries/10leadership_leadermandatory/tiramisu/base.py index 3c46ff94..54590fcf 100644 --- a/tests/dictionaries/10leadership_leadermandatory/tiramisu/base.py +++ b/tests/dictionaries/10leadership_leadermandatory/tiramisu/base.py @@ -14,9 +14,9 @@ except: from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_5 = StrOption(name='leader', doc='leader', multi=True, properties=frozenset({'mandatory'})) -option_6 = StrOption(name='follower1', doc='follower1', default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), multi=True, properties=frozenset({'normal'})) -option_7 = StrOption(name='follower2', doc='follower2', default=Calculation(func.calc_val, Params((ParamOption(option_6, notraisepropertyerror=False, todict=False)), kwargs={})), multi=True, properties=frozenset({'normal'})) -option_4 = Leadership(name='leader', doc='leader', properties=frozenset({'basic'}), children=[option_5, option_6, option_7]) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'basic'}), children=[option_3, option_4]) +option_6 = StrOption(name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({'normal'})) +option_7 = StrOption(name='follower2', doc='follower2', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_6, notraisepropertyerror=False, todict=False)), kwargs={})), properties=frozenset({'normal'})) +option_4 = Leadership(name='leader', doc='leader', children=[option_5, option_6, option_7], properties=frozenset({'basic'})) +option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4], properties=frozenset({'basic'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10leadership_mandatory/tiramisu/base.py b/tests/dictionaries/10leadership_mandatory/tiramisu/base.py index a15a99ac..03141a1b 100644 --- a/tests/dictionaries/10leadership_mandatory/tiramisu/base.py +++ b/tests/dictionaries/10leadership_mandatory/tiramisu/base.py @@ -14,9 +14,9 @@ except: from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_5 = StrOption(name='leader', doc='leader', multi=True) -option_6 = StrOption(name='follower1', doc='follower1', default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), multi=True, properties=frozenset({'mandatory', 'normal'})) -option_7 = StrOption(name='follower2', doc='follower2', default=Calculation(func.calc_val, Params((ParamOption(option_6, notraisepropertyerror=False, todict=False)), kwargs={})), multi=True, properties=frozenset({'normal'})) -option_4 = Leadership(name='leader', doc='leader', properties=frozenset({'normal'}), children=[option_5, option_6, option_7]) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4]) +option_6 = StrOption(name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({'mandatory', 'normal'})) +option_7 = StrOption(name='follower2', doc='follower2', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_6, notraisepropertyerror=False, todict=False)), kwargs={})), properties=frozenset({'normal'})) +option_4 = Leadership(name='leader', doc='leader', children=[option_5, option_6, option_7], properties=frozenset({'normal'})) +option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10leadership_mandatoryfollower/tiramisu/base.py b/tests/dictionaries/10leadership_mandatoryfollower/tiramisu/base.py index f543d098..bab2517d 100644 --- a/tests/dictionaries/10leadership_mandatoryfollower/tiramisu/base.py +++ b/tests/dictionaries/10leadership_mandatoryfollower/tiramisu/base.py @@ -15,7 +15,7 @@ from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='oui', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) option_5 = NetmaskOption(name='nut_monitor_netmask', doc='Masque de l\'IP du réseau de l\'esclave', multi=True) option_6 = NetworkOption(name='nut_monitor_host', doc='Adresse IP du réseau de l\'esclave', multi=True, properties=frozenset({'mandatory', 'normal'})) -option_4 = Leadership(name='nut_monitor_netmask', doc='Masque de l\'IP du réseau de l\'esclave', properties=frozenset({'normal'}), children=[option_5, option_6]) -option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3, option_4]) +option_4 = Leadership(name='nut_monitor_netmask', doc='Masque de l\'IP du réseau de l\'esclave', children=[option_5, option_6], properties=frozenset({'normal'})) +option_2 = OptionDescription(name='general', doc='général', children=[option_3, option_4], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10leadership_multi/tiramisu/base.py b/tests/dictionaries/10leadership_multi/tiramisu/base.py index f8bff23d..127c79a4 100644 --- a/tests/dictionaries/10leadership_multi/tiramisu/base.py +++ b/tests/dictionaries/10leadership_multi/tiramisu/base.py @@ -13,15 +13,15 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'normal'})) option_6 = StrOption(name='leader', doc='leader', multi=True) -option_7 = StrOption(name='follower1', doc='follower1', default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), multi=True, properties=frozenset({'normal'})) -option_8 = StrOption(name='follower2', doc='follower2', default=Calculation(func.calc_val, Params((ParamOption(option_7, notraisepropertyerror=False, todict=False)), kwargs={})), multi=True, properties=frozenset({'normal'})) -option_5 = Leadership(name='leader', doc='leader', properties=frozenset({'normal'}), children=[option_6, option_7, option_8]) +option_7 = StrOption(name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({'normal'})) +option_8 = StrOption(name='follower2', doc='follower2', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_7, notraisepropertyerror=False, todict=False)), kwargs={})), properties=frozenset({'normal'})) +option_5 = Leadership(name='leader', doc='leader', children=[option_6, option_7, option_8], properties=frozenset({'normal'})) option_10 = StrOption(name='leader1', doc='leader', multi=True) option_11 = StrOption(name='follower11', doc='follower1', multi=True, properties=frozenset({'normal'})) option_12 = StrOption(name='follower21', doc='follower2', multi=True, properties=frozenset({'normal'})) -option_9 = Leadership(name='leader1', doc='leader', properties=frozenset({'normal'}), children=[option_10, option_11, option_12]) -option_4 = OptionDescription(name='general1', doc='general1', properties=frozenset({'normal'}), children=[option_5, option_9]) +option_9 = Leadership(name='leader1', doc='leader', children=[option_10, option_11, option_12], properties=frozenset({'normal'})) +option_4 = OptionDescription(name='general1', doc='general1', children=[option_5, option_9], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2, option_4]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10load_disabled_if_in/tiramisu/base.py b/tests/dictionaries/10load_disabled_if_in/tiramisu/base.py index 031fac44..0103859d 100644 --- a/tests/dictionaries/10load_disabled_if_in/tiramisu/base.py +++ b/tests/dictionaries/10load_disabled_if_in/tiramisu/base.py @@ -15,6 +15,6 @@ from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='condition', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_4 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) option_5 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4, option_5]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4, option_5], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10load_disabled_if_in_none/tiramisu/base.py b/tests/dictionaries/10load_disabled_if_in_none/tiramisu/base.py index 098edef1..32064fdc 100644 --- a/tests/dictionaries/10load_disabled_if_in_none/tiramisu/base.py +++ b/tests/dictionaries/10load_disabled_if_in_none/tiramisu/base.py @@ -15,6 +15,6 @@ from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='condition', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_4 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('None')}))})) option_5 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('None')}))})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4, option_5]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4, option_5], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10load_disabled_if_inaccent_family/tiramisu/base.py b/tests/dictionaries/10load_disabled_if_inaccent_family/tiramisu/base.py index ad2d7cad..fcfa2d7b 100644 --- a/tests/dictionaries/10load_disabled_if_inaccent_family/tiramisu/base.py +++ b/tests/dictionaries/10load_disabled_if_inaccent_family/tiramisu/base.py @@ -15,8 +15,8 @@ from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='condition', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_4 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) option_5 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) -option_2 = OptionDescription(name='general', doc='Général', properties=frozenset({'normal'}), children=[option_3, option_4, option_5]) +option_2 = OptionDescription(name='general', doc='Général', children=[option_3, option_4, option_5], properties=frozenset({'normal'})) option_7 = StrOption(name='mode_conteneur_actif3', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) -option_6 = OptionDescription(name='general2', doc='Général2', properties=frozenset({'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))}), children=[option_7]) +option_6 = OptionDescription(name='general2', doc='Général2', children=[option_7], properties=frozenset({'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2, option_6]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10load_disabled_if_not_in_fallback/tiramisu/base.py b/tests/dictionaries/10load_disabled_if_not_in_fallback/tiramisu/base.py index fdf850db..3e2cf435 100644 --- a/tests/dictionaries/10load_disabled_if_not_in_fallback/tiramisu/base.py +++ b/tests/dictionaries/10load_disabled_if_not_in_fallback/tiramisu/base.py @@ -15,6 +15,6 @@ from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='condition', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_4 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)}))})) option_5 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)}))})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4, option_5]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4, option_5], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10load_disabled_if_not_in_fallback_force/tiramisu/base.py b/tests/dictionaries/10load_disabled_if_not_in_fallback_force/tiramisu/base.py index fdf850db..3e2cf435 100644 --- a/tests/dictionaries/10load_disabled_if_not_in_fallback_force/tiramisu/base.py +++ b/tests/dictionaries/10load_disabled_if_not_in_fallback_force/tiramisu/base.py @@ -15,6 +15,6 @@ from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='condition', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_4 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)}))})) option_5 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)}))})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4, option_5]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4, option_5], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10load_disabledifin_fallback/tiramisu/base.py b/tests/dictionaries/10load_disabledifin_fallback/tiramisu/base.py index 635adabd..c3bb876a 100644 --- a/tests/dictionaries/10load_disabledifin_fallback/tiramisu/base.py +++ b/tests/dictionaries/10load_disabledifin_fallback/tiramisu/base.py @@ -15,6 +15,6 @@ from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='condition', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_4 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'disabled', 'mandatory', 'normal'})) option_5 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4, option_5]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4, option_5], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10load_disabledifin_fallback_force/tiramisu/base.py b/tests/dictionaries/10load_disabledifin_fallback_force/tiramisu/base.py index 19d560c9..eb65115e 100644 --- a/tests/dictionaries/10load_disabledifin_fallback_force/tiramisu/base.py +++ b/tests/dictionaries/10load_disabledifin_fallback_force/tiramisu/base.py @@ -15,6 +15,6 @@ from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='condition', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_4 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) option_5 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4, option_5]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4, option_5], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10load_disabledifin_whithouttype/tiramisu/base.py b/tests/dictionaries/10load_disabledifin_whithouttype/tiramisu/base.py index 19d560c9..eb65115e 100644 --- a/tests/dictionaries/10load_disabledifin_whithouttype/tiramisu/base.py +++ b/tests/dictionaries/10load_disabledifin_whithouttype/tiramisu/base.py @@ -15,6 +15,6 @@ from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='condition', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_4 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) option_5 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4, option_5]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4, option_5], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10load_emptyvalue/tiramisu/base.py b/tests/dictionaries/10load_emptyvalue/tiramisu/base.py index b8f6bcfb..ac3cf2c0 100644 --- a/tests/dictionaries/10load_emptyvalue/tiramisu/base.py +++ b/tests/dictionaries/10load_emptyvalue/tiramisu/base.py @@ -14,6 +14,6 @@ except: from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', properties=frozenset({'normal'})) option_4 = StrOption(name='mode_conteneur_actif2', doc='No change', properties=frozenset({'normal'})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10load_frozenifin/tiramisu/base.py b/tests/dictionaries/10load_frozenifin/tiramisu/base.py index 35b15e51..9d77fd43 100644 --- a/tests/dictionaries/10load_frozenifin/tiramisu/base.py +++ b/tests/dictionaries/10load_frozenifin/tiramisu/base.py @@ -15,6 +15,6 @@ from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='condition', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_4 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) option_5 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4, option_5]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4, option_5], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10load_frozenifin_auto/tiramisu/base.py b/tests/dictionaries/10load_frozenifin_auto/tiramisu/base.py index 094e5d80..a1235929 100644 --- a/tests/dictionaries/10load_frozenifin_auto/tiramisu/base.py +++ b/tests/dictionaries/10load_frozenifin_auto/tiramisu/base.py @@ -15,6 +15,6 @@ from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='condition', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_4 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.calc_val, Params((ParamValue("non")), kwargs={})), properties=frozenset({'normal', Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) option_5 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4, option_5]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4, option_5], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10load_frozenifin_multiparam/tiramisu/base.py b/tests/dictionaries/10load_frozenifin_multiparam/tiramisu/base.py index 24274cfe..ae7c4b49 100644 --- a/tests/dictionaries/10load_frozenifin_multiparam/tiramisu/base.py +++ b/tests/dictionaries/10load_frozenifin_multiparam/tiramisu/base.py @@ -12,9 +12,9 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = ChoiceOption(name='condition', doc='No change', default='tous', values=('tous', 'authentifié', 'aucun'), properties=frozenset({'mandatory', 'normal'})) +option_3 = ChoiceOption(name='condition', doc='No change', values=('tous', 'authentifié', 'aucun'), default='tous', properties=frozenset({'mandatory', 'normal'})) option_4 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('tous')})), Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('tous')})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('tous')})), Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('authentifié')})), Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('authentifié')})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('authentifié')}))})) option_5 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('tous')})), Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('tous')})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('tous')})), Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('authentifié')})), Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('authentifié')})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('authentifié')}))})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4, option_5]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4, option_5], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10load_frozenifin_noexist/tiramisu/base.py b/tests/dictionaries/10load_frozenifin_noexist/tiramisu/base.py index 69752e2d..c797a7f4 100644 --- a/tests/dictionaries/10load_frozenifin_noexist/tiramisu/base.py +++ b/tests/dictionaries/10load_frozenifin_noexist/tiramisu/base.py @@ -12,9 +12,9 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = ChoiceOption(name='condition', doc='No change', default='tous', values=('tous', 'authentifié', 'aucun'), properties=frozenset({'mandatory', 'normal'})) +option_3 = ChoiceOption(name='condition', doc='No change', values=('tous', 'authentifié', 'aucun'), default='tous', properties=frozenset({'mandatory', 'normal'})) option_4 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) option_5 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4, option_5]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4, option_5], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10load_frozenifnotin/tiramisu/base.py b/tests/dictionaries/10load_frozenifnotin/tiramisu/base.py index 93ad543a..29ff1a4e 100644 --- a/tests/dictionaries/10load_frozenifnotin/tiramisu/base.py +++ b/tests/dictionaries/10load_frozenifnotin/tiramisu/base.py @@ -15,6 +15,6 @@ from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='condition', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_4 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)})), Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)}))})) option_5 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)})), Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)}))})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4, option_5]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4, option_5], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10load_frozenifnotin_noexist/tiramisu/base.py b/tests/dictionaries/10load_frozenifnotin_noexist/tiramisu/base.py index 69752e2d..c797a7f4 100644 --- a/tests/dictionaries/10load_frozenifnotin_noexist/tiramisu/base.py +++ b/tests/dictionaries/10load_frozenifnotin_noexist/tiramisu/base.py @@ -12,9 +12,9 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = ChoiceOption(name='condition', doc='No change', default='tous', values=('tous', 'authentifié', 'aucun'), properties=frozenset({'mandatory', 'normal'})) +option_3 = ChoiceOption(name='condition', doc='No change', values=('tous', 'authentifié', 'aucun'), default='tous', properties=frozenset({'mandatory', 'normal'})) option_4 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) option_5 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4, option_5]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4, option_5], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10load_hidden_if_family/tiramisu/base.py b/tests/dictionaries/10load_hidden_if_family/tiramisu/base.py index eb7b35a8..4547d1e6 100644 --- a/tests/dictionaries/10load_hidden_if_family/tiramisu/base.py +++ b/tests/dictionaries/10load_hidden_if_family/tiramisu/base.py @@ -15,8 +15,8 @@ from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='condition', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_4 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) option_5 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) -option_2 = OptionDescription(name='general', doc='Général', properties=frozenset({'normal'}), children=[option_3, option_4, option_5]) +option_2 = OptionDescription(name='general', doc='Général', children=[option_3, option_4, option_5], properties=frozenset({'normal'})) option_7 = StrOption(name='mode_conteneur_actif3', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) -option_6 = OptionDescription(name='general2', doc='Général2', properties=frozenset({'normal', Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))}), children=[option_7]) +option_6 = OptionDescription(name='general2', doc='Général2', children=[option_7], properties=frozenset({'normal', Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2, option_6]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10load_leadership/tiramisu/base.py b/tests/dictionaries/10load_leadership/tiramisu/base.py index 9394d073..5eaa8ce3 100644 --- a/tests/dictionaries/10load_leadership/tiramisu/base.py +++ b/tests/dictionaries/10load_leadership/tiramisu/base.py @@ -13,11 +13,11 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'normal'})) option_6 = StrOption(name='leader', doc='leader', multi=True) -option_7 = StrOption(name='follower1', doc='follower1', default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), multi=True, properties=frozenset({'normal'})) -option_8 = StrOption(name='follower2', doc='follower2', default=Calculation(func.calc_val, Params((ParamOption(option_7, notraisepropertyerror=False, todict=False)), kwargs={})), multi=True, properties=frozenset({'normal'})) -option_5 = Leadership(name='leader', doc='leader', properties=frozenset({'normal'}), children=[option_6, option_7, option_8]) -option_4 = OptionDescription(name='general1', doc='general1', properties=frozenset({'normal'}), children=[option_5]) +option_7 = StrOption(name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({'normal'})) +option_8 = StrOption(name='follower2', doc='follower2', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_7, notraisepropertyerror=False, todict=False)), kwargs={})), properties=frozenset({'normal'})) +option_5 = Leadership(name='leader', doc='leader', children=[option_6, option_7, option_8], properties=frozenset({'normal'})) +option_4 = OptionDescription(name='general1', doc='general1', children=[option_5], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2, option_4]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10load_leadership_default_multi/tiramisu/base.py b/tests/dictionaries/10load_leadership_default_multi/tiramisu/base.py index 829cb444..e9d70c55 100644 --- a/tests/dictionaries/10load_leadership_default_multi/tiramisu/base.py +++ b/tests/dictionaries/10load_leadership_default_multi/tiramisu/base.py @@ -12,11 +12,11 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='leader', default=['non'], multi=True, default_multi='non', properties=frozenset({'mandatory', 'normal'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='leader', multi=True, default=['non'], default_multi='non', properties=frozenset({'mandatory', 'normal'})) option_5 = StrOption(name='leader', doc='leader', multi=True) option_6 = StrOption(name='follower1', doc='follower1', multi=True, default_multi='value', properties=frozenset({'mandatory', 'normal'})) option_7 = StrOption(name='follower2', doc='follower2', multi=True, properties=frozenset({'normal'})) -option_4 = Leadership(name='leader', doc='leader', properties=frozenset({'normal'}), children=[option_5, option_6, option_7]) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4]) +option_4 = Leadership(name='leader', doc='leader', children=[option_5, option_6, option_7], properties=frozenset({'normal'})) +option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10load_leadership_default_submulti/tiramisu/base.py b/tests/dictionaries/10load_leadership_default_submulti/tiramisu/base.py index 7b0145b9..5c718c0c 100644 --- a/tests/dictionaries/10load_leadership_default_submulti/tiramisu/base.py +++ b/tests/dictionaries/10load_leadership_default_submulti/tiramisu/base.py @@ -12,11 +12,11 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='leader', default=['non'], multi=True, default_multi='non', properties=frozenset({'mandatory', 'normal'})) -option_5 = StrOption(name='leader', doc='leader', default=['leader'], multi=True, properties=frozenset({'mandatory'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='leader', multi=True, default=['non'], default_multi='non', properties=frozenset({'mandatory', 'normal'})) +option_5 = StrOption(name='leader', doc='leader', multi=True, default=['leader'], properties=frozenset({'mandatory'})) option_6 = StrOption(name='follower1', doc='follower1', multi=submulti, default_multi=['value'], properties=frozenset({'mandatory', 'normal'})) option_7 = StrOption(name='follower2', doc='follower2', multi=submulti, default_multi=['value1', 'value2'], properties=frozenset({'mandatory', 'normal'})) -option_4 = Leadership(name='leader', doc='leader', properties=frozenset({'normal'}), children=[option_5, option_6, option_7]) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4]) +option_4 = Leadership(name='leader', doc='leader', children=[option_5, option_6, option_7], properties=frozenset({'normal'})) +option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10load_leadership_defaultmulti_leader/tiramisu/base.py b/tests/dictionaries/10load_leadership_defaultmulti_leader/tiramisu/base.py index c505b5ff..27df2176 100644 --- a/tests/dictionaries/10load_leadership_defaultmulti_leader/tiramisu/base.py +++ b/tests/dictionaries/10load_leadership_defaultmulti_leader/tiramisu/base.py @@ -12,11 +12,11 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='leader', default=['non'], multi=True, default_multi='non', properties=frozenset({'mandatory', 'normal'})) -option_5 = StrOption(name='leader', doc='leader', default=['value'], multi=True, properties=frozenset({'mandatory'})) +option_3 = StrOption(name='mode_conteneur_actif', doc='leader', multi=True, default=['non'], default_multi='non', properties=frozenset({'mandatory', 'normal'})) +option_5 = StrOption(name='leader', doc='leader', multi=True, default=['value'], properties=frozenset({'mandatory'})) option_6 = StrOption(name='follower1', doc='follower1', multi=True, properties=frozenset({'normal'})) option_7 = StrOption(name='follower2', doc='follower2', multi=True, properties=frozenset({'normal'})) -option_4 = Leadership(name='leader', doc='leader', properties=frozenset({'normal'}), children=[option_5, option_6, option_7]) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4]) +option_4 = Leadership(name='leader', doc='leader', children=[option_5, option_6, option_7], properties=frozenset({'normal'})) +option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10load_leadership_description/tiramisu/base.py b/tests/dictionaries/10load_leadership_description/tiramisu/base.py index a21204bc..274a77a0 100644 --- a/tests/dictionaries/10load_leadership_description/tiramisu/base.py +++ b/tests/dictionaries/10load_leadership_description/tiramisu/base.py @@ -13,11 +13,11 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'normal'})) option_6 = StrOption(name='leader', doc='leader', multi=True) -option_7 = StrOption(name='follower1', doc='follower1', default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), multi=True, properties=frozenset({'normal'})) -option_8 = StrOption(name='follower2', doc='follower2', default=Calculation(func.calc_val, Params((ParamOption(option_7, notraisepropertyerror=False, todict=False)), kwargs={})), multi=True, properties=frozenset({'normal'})) -option_5 = Leadership(name='leader', doc='other description', properties=frozenset({'normal'}), children=[option_6, option_7, option_8]) -option_4 = OptionDescription(name='general1', doc='general1', properties=frozenset({'normal'}), children=[option_5]) +option_7 = StrOption(name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({'normal'})) +option_8 = StrOption(name='follower2', doc='follower2', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_7, notraisepropertyerror=False, todict=False)), kwargs={})), properties=frozenset({'normal'})) +option_5 = Leadership(name='leader', doc='other description', children=[option_6, option_7, option_8], properties=frozenset({'normal'})) +option_4 = OptionDescription(name='general1', doc='general1', children=[option_5], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2, option_4]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10load_leadership_name/tiramisu/base.py b/tests/dictionaries/10load_leadership_name/tiramisu/base.py index b5c7bacd..9a5c2481 100644 --- a/tests/dictionaries/10load_leadership_name/tiramisu/base.py +++ b/tests/dictionaries/10load_leadership_name/tiramisu/base.py @@ -13,11 +13,11 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'normal'})) option_6 = StrOption(name='leader', doc='leader', multi=True) -option_7 = StrOption(name='follower1', doc='follower1', default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), multi=True, properties=frozenset({'normal'})) -option_8 = StrOption(name='follower2', doc='follower2', default=Calculation(func.calc_val, Params((ParamOption(option_7, notraisepropertyerror=False, todict=False)), kwargs={})), multi=True, properties=frozenset({'normal'})) -option_5 = Leadership(name='other_name', doc='other_name', properties=frozenset({'normal'}), children=[option_6, option_7, option_8]) -option_4 = OptionDescription(name='general1', doc='general1', properties=frozenset({'normal'}), children=[option_5]) +option_7 = StrOption(name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({'normal'})) +option_8 = StrOption(name='follower2', doc='follower2', multi=True, default=Calculation(func.calc_val, Params((ParamOption(option_7, notraisepropertyerror=False, todict=False)), kwargs={})), properties=frozenset({'normal'})) +option_5 = Leadership(name='other_name', doc='other_name', children=[option_6, option_7, option_8], properties=frozenset({'normal'})) +option_4 = OptionDescription(name='general1', doc='general1', children=[option_5], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2, option_4]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10load_leadership_normalize_family/tiramisu/base.py b/tests/dictionaries/10load_leadership_normalize_family/tiramisu/base.py index a1582fb0..ad9feba1 100644 --- a/tests/dictionaries/10load_leadership_normalize_family/tiramisu/base.py +++ b/tests/dictionaries/10load_leadership_normalize_family/tiramisu/base.py @@ -13,11 +13,11 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'normal'})) option_6 = StrOption(name='leader', doc='leader', multi=True, properties=frozenset({'mandatory'})) option_7 = StrOption(name='follower1', doc='follower1', multi=True, properties=frozenset({'normal'})) option_8 = StrOption(name='follower2', doc='follower2', multi=True, properties=frozenset({'normal'})) -option_5 = Leadership(name='leader', doc='leader', properties=frozenset({'basic'}), children=[option_6, option_7, option_8]) -option_4 = OptionDescription(name='general_1', doc='general-1', properties=frozenset({'basic'}), children=[option_5]) +option_5 = Leadership(name='leader', doc='leader', children=[option_6, option_7, option_8], properties=frozenset({'basic'})) +option_4 = OptionDescription(name='general_1', doc='general-1', children=[option_5], properties=frozenset({'basic'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2, option_4]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10load_leadership_submulti/tiramisu/base.py b/tests/dictionaries/10load_leadership_submulti/tiramisu/base.py index bb3d866c..79643a7e 100644 --- a/tests/dictionaries/10load_leadership_submulti/tiramisu/base.py +++ b/tests/dictionaries/10load_leadership_submulti/tiramisu/base.py @@ -13,11 +13,11 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'normal'})) option_6 = StrOption(name='leader', doc='leader', multi=True) -option_7 = StrOption(name='follower1', doc='follower1', default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), multi=True, properties=frozenset({'normal'})) -option_8 = StrOption(name='follower2', doc='follower2', default=Calculation(func.calc_val, Params((ParamOption(option_7, notraisepropertyerror=False, todict=False)), kwargs={})), multi=submulti, properties=frozenset({'normal'})) -option_5 = Leadership(name='leader', doc='leader', properties=frozenset({'normal'}), children=[option_6, option_7, option_8]) -option_4 = OptionDescription(name='general1', doc='general1', properties=frozenset({'normal'}), children=[option_5]) +option_7 = StrOption(name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({'normal'})) +option_8 = StrOption(name='follower2', doc='follower2', multi=submulti, default=Calculation(func.calc_val, Params((ParamOption(option_7, notraisepropertyerror=False, todict=False)), kwargs={})), properties=frozenset({'normal'})) +option_5 = Leadership(name='leader', doc='leader', children=[option_6, option_7, option_8], properties=frozenset({'normal'})) +option_4 = OptionDescription(name='general1', doc='general1', children=[option_5], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2, option_4]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10load_mandatoryifin/tiramisu/base.py b/tests/dictionaries/10load_mandatoryifin/tiramisu/base.py index 55cbc83b..f54f2183 100644 --- a/tests/dictionaries/10load_mandatoryifin/tiramisu/base.py +++ b/tests/dictionaries/10load_mandatoryifin/tiramisu/base.py @@ -15,6 +15,6 @@ from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='condition', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_4 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('mandatory'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) option_5 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('mandatory'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4, option_5]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4, option_5], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10load_mandatoryifnotin_noexist/tiramisu/base.py b/tests/dictionaries/10load_mandatoryifnotin_noexist/tiramisu/base.py index 69752e2d..c797a7f4 100644 --- a/tests/dictionaries/10load_mandatoryifnotin_noexist/tiramisu/base.py +++ b/tests/dictionaries/10load_mandatoryifnotin_noexist/tiramisu/base.py @@ -12,9 +12,9 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = ChoiceOption(name='condition', doc='No change', default='tous', values=('tous', 'authentifié', 'aucun'), properties=frozenset({'mandatory', 'normal'})) +option_3 = ChoiceOption(name='condition', doc='No change', values=('tous', 'authentifié', 'aucun'), default='tous', properties=frozenset({'mandatory', 'normal'})) option_4 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) option_5 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4, option_5]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4, option_5], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10load_multivalue/tiramisu/base.py b/tests/dictionaries/10load_multivalue/tiramisu/base.py index 7f8b91fe..8af42271 100644 --- a/tests/dictionaries/10load_multivalue/tiramisu/base.py +++ b/tests/dictionaries/10load_multivalue/tiramisu/base.py @@ -12,7 +12,7 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default=['non', 'oui'], multi=True, default_multi='oui', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) +option_3 = StrOption(name='mode_conteneur_actif', doc='No change', multi=True, default=['non', 'oui'], default_multi='oui', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) +option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10valid_enum_accent/tiramisu/base.py b/tests/dictionaries/10valid_enum_accent/tiramisu/base.py index 10a7d75f..0e276caf 100644 --- a/tests/dictionaries/10valid_enum_accent/tiramisu/base.py +++ b/tests/dictionaries/10valid_enum_accent/tiramisu/base.py @@ -13,9 +13,9 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'expert', 'mandatory'})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'expert'}), children=[option_3]) -option_5 = ChoiceOption(name='enumvar', doc='multi', default='c', values=('a', 'b', 'c', 'é'), properties=frozenset({'expert', 'mandatory'})) +option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'expert'})) +option_5 = ChoiceOption(name='enumvar', doc='multi', values=('a', 'b', 'c', 'é'), default='c', properties=frozenset({'expert', 'mandatory'})) option_5.impl_set_information("help", "bla bla bla") -option_4 = OptionDescription(name='enumfam', doc='enumfam', properties=frozenset({'expert'}), children=[option_5]) +option_4 = OptionDescription(name='enumfam', doc='enumfam', children=[option_5], properties=frozenset({'expert'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2, option_4]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10valid_enum_base/tiramisu/base.py b/tests/dictionaries/10valid_enum_base/tiramisu/base.py index 37a7e960..090e2cc0 100644 --- a/tests/dictionaries/10valid_enum_base/tiramisu/base.py +++ b/tests/dictionaries/10valid_enum_base/tiramisu/base.py @@ -13,9 +13,9 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'expert', 'mandatory'})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'expert'}), children=[option_3]) -option_5 = ChoiceOption(name='enumvar', doc='multi', default='c', values=('a', 'b', 'c'), properties=frozenset({'expert', 'mandatory'})) +option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'expert'})) +option_5 = ChoiceOption(name='enumvar', doc='multi', values=('a', 'b', 'c'), default='c', properties=frozenset({'expert', 'mandatory'})) option_5.impl_set_information("help", "bla bla bla") -option_4 = OptionDescription(name='enumfam', doc='enumfam', properties=frozenset({'expert'}), children=[option_5]) +option_4 = OptionDescription(name='enumfam', doc='enumfam', children=[option_5], properties=frozenset({'expert'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2, option_4]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10valid_enum_base_redefine/tiramisu/base.py b/tests/dictionaries/10valid_enum_base_redefine/tiramisu/base.py index d38ebf73..518d1810 100644 --- a/tests/dictionaries/10valid_enum_base_redefine/tiramisu/base.py +++ b/tests/dictionaries/10valid_enum_base_redefine/tiramisu/base.py @@ -13,10 +13,10 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'expert', 'mandatory'})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'expert'}), children=[option_3]) -option_5 = ChoiceOption(name='enumvar2', doc='multi', default='c', values=('a', 'b', 'c'), properties=frozenset({'expert', 'mandatory'})) -option_6 = ChoiceOption(name='enumvar', doc='multi', default='c', values=('a', 'c'), properties=frozenset({'expert', 'mandatory'})) +option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'expert'})) +option_5 = ChoiceOption(name='enumvar2', doc='multi', values=('a', 'b', 'c'), default='c', properties=frozenset({'expert', 'mandatory'})) +option_6 = ChoiceOption(name='enumvar', doc='multi', values=('a', 'c'), default='c', properties=frozenset({'expert', 'mandatory'})) option_6.impl_set_information("help", "bla bla bla") -option_4 = OptionDescription(name='enumfam', doc='enumfam', properties=frozenset({'expert'}), children=[option_5, option_6]) +option_4 = OptionDescription(name='enumfam', doc='enumfam', children=[option_5, option_6], properties=frozenset({'expert'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2, option_4]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10valid_enum_leader/tiramisu/base.py b/tests/dictionaries/10valid_enum_leader/tiramisu/base.py index daac638d..90903b21 100644 --- a/tests/dictionaries/10valid_enum_leader/tiramisu/base.py +++ b/tests/dictionaries/10valid_enum_leader/tiramisu/base.py @@ -16,7 +16,7 @@ option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non' option_5 = StrOption(name='leader', doc='leader', multi=True) option_6 = ChoiceOption(name='follower1', doc='follower1', values=('a', 'b', 'c'), multi=True, default_multi='a', properties=frozenset({'mandatory', 'normal'})) option_7 = StrOption(name='follower2', doc='follower2', multi=True, properties=frozenset({'normal'})) -option_4 = Leadership(name='leader', doc='leader', properties=frozenset({'normal'}), children=[option_5, option_6, option_7]) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4]) +option_4 = Leadership(name='leader', doc='leader', children=[option_5, option_6, option_7], properties=frozenset({'normal'})) +option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10valid_enum_mandatory/tiramisu/base.py b/tests/dictionaries/10valid_enum_mandatory/tiramisu/base.py index 1761948b..53771847 100644 --- a/tests/dictionaries/10valid_enum_mandatory/tiramisu/base.py +++ b/tests/dictionaries/10valid_enum_mandatory/tiramisu/base.py @@ -13,8 +13,8 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'expert', 'mandatory'})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'expert'}), children=[option_3]) -option_5 = ChoiceOption(name='enumvar', doc='multi', default='a', values=('a', 'b', 'c'), properties=frozenset({'expert', 'mandatory'})) -option_4 = OptionDescription(name='enumfam', doc='enumfam', properties=frozenset({'expert'}), children=[option_5]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'expert'})) +option_5 = ChoiceOption(name='enumvar', doc='multi', values=('a', 'b', 'c'), default='a', properties=frozenset({'expert', 'mandatory'})) +option_4 = OptionDescription(name='enumfam', doc='enumfam', children=[option_5], properties=frozenset({'expert'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2, option_4]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10valid_enum_multi/tiramisu/base.py b/tests/dictionaries/10valid_enum_multi/tiramisu/base.py index 23f4081d..75b3943e 100644 --- a/tests/dictionaries/10valid_enum_multi/tiramisu/base.py +++ b/tests/dictionaries/10valid_enum_multi/tiramisu/base.py @@ -13,7 +13,7 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) -option_4 = ChoiceOption(name='multi', doc='multi', default=['a'], values=('a', 'b', 'c'), multi=True, default_multi='a', properties=frozenset({'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4]) +option_4 = ChoiceOption(name='multi', doc='multi', values=('a', 'b', 'c'), multi=True, default=['a'], default_multi='a', properties=frozenset({'mandatory', 'normal'})) +option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10valid_enum_none/tiramisu/base.py b/tests/dictionaries/10valid_enum_none/tiramisu/base.py index 4886b2f1..d0b9c3ae 100644 --- a/tests/dictionaries/10valid_enum_none/tiramisu/base.py +++ b/tests/dictionaries/10valid_enum_none/tiramisu/base.py @@ -13,9 +13,9 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'expert', 'mandatory'})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'expert'}), children=[option_3]) -option_5 = ChoiceOption(name='enumvar', doc='multi', default='b', values=('a', 'b', None), properties=frozenset({'expert', 'mandatory'})) +option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'expert'})) +option_5 = ChoiceOption(name='enumvar', doc='multi', values=('a', 'b', None), default='b', properties=frozenset({'expert', 'mandatory'})) option_5.impl_set_information("help", "bla bla bla") -option_4 = OptionDescription(name='enumfam', doc='enumfam', properties=frozenset({'expert'}), children=[option_5]) +option_4 = OptionDescription(name='enumfam', doc='enumfam', children=[option_5], properties=frozenset({'expert'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2, option_4]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10valid_enum_number/tiramisu/base.py b/tests/dictionaries/10valid_enum_number/tiramisu/base.py index a891c333..22fd6ea8 100644 --- a/tests/dictionaries/10valid_enum_number/tiramisu/base.py +++ b/tests/dictionaries/10valid_enum_number/tiramisu/base.py @@ -13,9 +13,9 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'expert', 'mandatory'})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'expert'}), children=[option_3]) -option_5 = ChoiceOption(name='enumvar', doc='enumvar', default=1, values=(1, 2, 3), properties=frozenset({'expert', 'mandatory'})) +option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'expert'})) +option_5 = ChoiceOption(name='enumvar', doc='enumvar', values=(1, 2, 3), default=1, properties=frozenset({'expert', 'mandatory'})) option_5.impl_set_information("help", "bla bla bla") -option_4 = OptionDescription(name='enumfam', doc='enumfam', properties=frozenset({'expert'}), children=[option_5]) +option_4 = OptionDescription(name='enumfam', doc='enumfam', children=[option_5], properties=frozenset({'expert'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2, option_4]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10valid_enum_numberdefault/tiramisu/base.py b/tests/dictionaries/10valid_enum_numberdefault/tiramisu/base.py index 6e87793f..11809d69 100644 --- a/tests/dictionaries/10valid_enum_numberdefault/tiramisu/base.py +++ b/tests/dictionaries/10valid_enum_numberdefault/tiramisu/base.py @@ -13,9 +13,9 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'expert', 'mandatory'})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'expert'}), children=[option_3]) -option_5 = ChoiceOption(name='enumvar', doc='enumvar', default=3, values=(1, 2, 3), properties=frozenset({'expert', 'mandatory'})) +option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'expert'})) +option_5 = ChoiceOption(name='enumvar', doc='enumvar', values=(1, 2, 3), default=3, properties=frozenset({'expert', 'mandatory'})) option_5.impl_set_information("help", "bla bla bla") -option_4 = OptionDescription(name='enumfam', doc='enumfam', properties=frozenset({'expert'}), children=[option_5]) +option_4 = OptionDescription(name='enumfam', doc='enumfam', children=[option_5], properties=frozenset({'expert'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2, option_4]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10valid_enum_param_empty/tiramisu/base.py b/tests/dictionaries/10valid_enum_param_empty/tiramisu/base.py index c64c9aef..84c325ef 100644 --- a/tests/dictionaries/10valid_enum_param_empty/tiramisu/base.py +++ b/tests/dictionaries/10valid_enum_param_empty/tiramisu/base.py @@ -13,9 +13,9 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'expert', 'mandatory'})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'expert'}), children=[option_3]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'expert'})) option_5 = ChoiceOption(name='enumvar', doc='multi', values=(None,), properties=frozenset({'expert', 'mandatory'})) option_5.impl_set_information("help", "bla bla bla") -option_4 = OptionDescription(name='enumfam', doc='enumfam', properties=frozenset({'expert'}), children=[option_5]) +option_4 = OptionDescription(name='enumfam', doc='enumfam', children=[option_5], properties=frozenset({'expert'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2, option_4]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10valid_enum_param_empty2/tiramisu/base.py b/tests/dictionaries/10valid_enum_param_empty2/tiramisu/base.py index c64c9aef..84c325ef 100644 --- a/tests/dictionaries/10valid_enum_param_empty2/tiramisu/base.py +++ b/tests/dictionaries/10valid_enum_param_empty2/tiramisu/base.py @@ -13,9 +13,9 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'expert', 'mandatory'})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'expert'}), children=[option_3]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'expert'})) option_5 = ChoiceOption(name='enumvar', doc='multi', values=(None,), properties=frozenset({'expert', 'mandatory'})) option_5.impl_set_information("help", "bla bla bla") -option_4 = OptionDescription(name='enumfam', doc='enumfam', properties=frozenset({'expert'}), children=[option_5]) +option_4 = OptionDescription(name='enumfam', doc='enumfam', children=[option_5], properties=frozenset({'expert'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2, option_4]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10valid_enum_value/tiramisu/base.py b/tests/dictionaries/10valid_enum_value/tiramisu/base.py index c5ffb47c..daaeb9b1 100644 --- a/tests/dictionaries/10valid_enum_value/tiramisu/base.py +++ b/tests/dictionaries/10valid_enum_value/tiramisu/base.py @@ -12,7 +12,7 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = ChoiceOption(name='mode_conteneur_actif', doc='No change', default='b', values=('a', 'b', 'c'), properties=frozenset({'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) +option_3 = ChoiceOption(name='mode_conteneur_actif', doc='No change', values=('a', 'b', 'c'), default='b', properties=frozenset({'mandatory', 'normal'})) +option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/11disabled_if_in_filelist/tiramisu/base.py b/tests/dictionaries/11disabled_if_in_filelist/tiramisu/base.py index 6ba51b78..5388fbec 100644 --- a/tests/dictionaries/11disabled_if_in_filelist/tiramisu/base.py +++ b/tests/dictionaries/11disabled_if_in_filelist/tiramisu/base.py @@ -15,7 +15,7 @@ from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='condition', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_4 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) option_5 = BoolOption(name='mode_conteneur_actif2', doc='No change', default=True, properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4, option_5]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4, option_5], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_10 = StrOption(name='group', doc='group', default='root') option_11 = StrOption(name='mode', doc='mode', default='0644') @@ -28,5 +28,5 @@ option_9 = OptionDescription(name='file', doc='file', children=[option_10, optio option_8 = OptionDescription(name='files', doc='files', children=[option_9]) option_7 = OptionDescription(name='test', doc='test', children=[option_8]) option_7.impl_set_information("manage", True) -option_6 = OptionDescription(name='services', doc='services', properties=frozenset({'hidden'}), children=[option_7]) +option_6 = OptionDescription(name='services', doc='services', children=[option_7], properties=frozenset({'hidden'})) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_6]) diff --git a/tests/dictionaries/11disabled_if_in_filelist_disabled/tiramisu/base.py b/tests/dictionaries/11disabled_if_in_filelist_disabled/tiramisu/base.py index 4a1b1e1d..0dc05afa 100644 --- a/tests/dictionaries/11disabled_if_in_filelist_disabled/tiramisu/base.py +++ b/tests/dictionaries/11disabled_if_in_filelist_disabled/tiramisu/base.py @@ -15,7 +15,7 @@ from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='condition', doc='No change', default='oui', properties=frozenset({'mandatory', 'normal'})) option_4 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) option_5 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4, option_5]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4, option_5], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_10 = StrOption(name='group', doc='group', default='root') option_11 = StrOption(name='mode', doc='mode', default='0644') @@ -28,5 +28,5 @@ option_9 = OptionDescription(name='file', doc='file', children=[option_10, optio option_8 = OptionDescription(name='files', doc='files', children=[option_9]) option_7 = OptionDescription(name='test', doc='test', children=[option_8]) option_7.impl_set_information("manage", True) -option_6 = OptionDescription(name='services', doc='services', properties=frozenset({'hidden'}), children=[option_7]) +option_6 = OptionDescription(name='services', doc='services', children=[option_7], properties=frozenset({'hidden'})) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_6]) diff --git a/tests/dictionaries/11disabled_if_in_filelist_multi/tiramisu/base.py b/tests/dictionaries/11disabled_if_in_filelist_multi/tiramisu/base.py index 1f4b8d76..5b1144ee 100644 --- a/tests/dictionaries/11disabled_if_in_filelist_multi/tiramisu/base.py +++ b/tests/dictionaries/11disabled_if_in_filelist_multi/tiramisu/base.py @@ -15,7 +15,7 @@ from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='condition', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_4 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) option_5 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4, option_5]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4, option_5], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_10 = StrOption(name='group', doc='group', default='root') option_11 = StrOption(name='mode', doc='mode', default='0644') @@ -36,5 +36,5 @@ option_17 = OptionDescription(name='file2', doc='file2', children=[option_18, op option_8 = OptionDescription(name='files', doc='files', children=[option_9, option_17]) option_7 = OptionDescription(name='test', doc='test', children=[option_8]) option_7.impl_set_information("manage", True) -option_6 = OptionDescription(name='services', doc='services', properties=frozenset({'hidden'}), children=[option_7]) +option_6 = OptionDescription(name='services', doc='services', children=[option_7], properties=frozenset({'hidden'})) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_6]) diff --git a/tests/dictionaries/11disabledifin_filelist_notexist/tiramisu/base.py b/tests/dictionaries/11disabledifin_filelist_notexist/tiramisu/base.py index c7ee2557..2adfb26b 100644 --- a/tests/dictionaries/11disabledifin_filelist_notexist/tiramisu/base.py +++ b/tests/dictionaries/11disabledifin_filelist_notexist/tiramisu/base.py @@ -15,7 +15,7 @@ from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='condition', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_4 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) option_5 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4, option_5]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4, option_5], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_10 = StrOption(name='group', doc='group', default='root') option_11 = StrOption(name='mode', doc='mode', default='0644') @@ -28,5 +28,5 @@ option_9 = OptionDescription(name='file', doc='file', children=[option_10, optio option_8 = OptionDescription(name='files', doc='files', children=[option_9]) option_7 = OptionDescription(name='test', doc='test', children=[option_8]) option_7.impl_set_information("manage", True) -option_6 = OptionDescription(name='services', doc='services', properties=frozenset({'hidden'}), children=[option_7]) +option_6 = OptionDescription(name='services', doc='services', children=[option_7], properties=frozenset({'hidden'})) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_6]) diff --git a/tests/dictionaries/11disabledifnotin_filelist_notexist/tiramisu/base.py b/tests/dictionaries/11disabledifnotin_filelist_notexist/tiramisu/base.py index c7ee2557..2adfb26b 100644 --- a/tests/dictionaries/11disabledifnotin_filelist_notexist/tiramisu/base.py +++ b/tests/dictionaries/11disabledifnotin_filelist_notexist/tiramisu/base.py @@ -15,7 +15,7 @@ from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='condition', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_4 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) option_5 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4, option_5]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4, option_5], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_10 = StrOption(name='group', doc='group', default='root') option_11 = StrOption(name='mode', doc='mode', default='0644') @@ -28,5 +28,5 @@ option_9 = OptionDescription(name='file', doc='file', children=[option_10, optio option_8 = OptionDescription(name='files', doc='files', children=[option_9]) option_7 = OptionDescription(name='test', doc='test', children=[option_8]) option_7.impl_set_information("manage", True) -option_6 = OptionDescription(name='services', doc='services', properties=frozenset({'hidden'}), children=[option_7]) +option_6 = OptionDescription(name='services', doc='services', children=[option_7], properties=frozenset({'hidden'})) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_6]) diff --git a/tests/dictionaries/11disabledifnotin_filelist_notexist_multi/tiramisu/base.py b/tests/dictionaries/11disabledifnotin_filelist_notexist_multi/tiramisu/base.py index f73e9cc5..52af0921 100644 --- a/tests/dictionaries/11disabledifnotin_filelist_notexist_multi/tiramisu/base.py +++ b/tests/dictionaries/11disabledifnotin_filelist_notexist_multi/tiramisu/base.py @@ -15,7 +15,7 @@ from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='condition', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_4 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) option_5 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4, option_5]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4, option_5], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_10 = StrOption(name='group', doc='group', default='root') option_11 = StrOption(name='mode', doc='mode', default='0644') @@ -28,5 +28,5 @@ option_9 = OptionDescription(name='file', doc='file', children=[option_10, optio option_8 = OptionDescription(name='files', doc='files', children=[option_9]) option_7 = OptionDescription(name='test', doc='test', children=[option_8]) option_7.impl_set_information("manage", True) -option_6 = OptionDescription(name='services', doc='services', properties=frozenset({'hidden'}), children=[option_7]) +option_6 = OptionDescription(name='services', doc='services', children=[option_7], properties=frozenset({'hidden'})) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_6]) diff --git a/tests/dictionaries/11disabledifnotin_filelist_notexist_validenum/tiramisu/base.py b/tests/dictionaries/11disabledifnotin_filelist_notexist_validenum/tiramisu/base.py index 3da7ddd6..31073be8 100644 --- a/tests/dictionaries/11disabledifnotin_filelist_notexist_validenum/tiramisu/base.py +++ b/tests/dictionaries/11disabledifnotin_filelist_notexist_validenum/tiramisu/base.py @@ -12,10 +12,10 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = ChoiceOption(name='condition', doc='No change', default='non', values=('non', 'statique'), properties=frozenset({'mandatory', 'normal'})) +option_3 = ChoiceOption(name='condition', doc='No change', values=('non', 'statique'), default='non', properties=frozenset({'mandatory', 'normal'})) option_4 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) option_5 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4, option_5]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4, option_5], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_10 = StrOption(name='group', doc='group', default='root') option_11 = StrOption(name='mode', doc='mode', default='0644') @@ -28,5 +28,5 @@ option_9 = OptionDescription(name='file', doc='file', children=[option_10, optio option_8 = OptionDescription(name='files', doc='files', children=[option_9]) option_7 = OptionDescription(name='test', doc='test', children=[option_8]) option_7.impl_set_information("manage", True) -option_6 = OptionDescription(name='services', doc='services', properties=frozenset({'hidden'}), children=[option_7]) +option_6 = OptionDescription(name='services', doc='services', children=[option_7], properties=frozenset({'hidden'})) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_6]) diff --git a/tests/dictionaries/11multi_disabled_if_in_filelist/tiramisu/base.py b/tests/dictionaries/11multi_disabled_if_in_filelist/tiramisu/base.py index 5907c394..1d9b46f4 100644 --- a/tests/dictionaries/11multi_disabled_if_in_filelist/tiramisu/base.py +++ b/tests/dictionaries/11multi_disabled_if_in_filelist/tiramisu/base.py @@ -14,7 +14,7 @@ except: from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) option_4 = StrOption(name='condition', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_9 = StrOption(name='group', doc='group', default='root') option_10 = StrOption(name='mode', doc='mode', default='0644') @@ -27,5 +27,5 @@ option_8 = OptionDescription(name='file1', doc='file1', children=[option_9, opti option_7 = OptionDescription(name='files', doc='files', children=[option_8]) option_6 = OptionDescription(name='test', doc='test', children=[option_7]) option_6.impl_set_information("manage", True) -option_5 = OptionDescription(name='services', doc='services', properties=frozenset({'hidden'}), children=[option_6]) +option_5 = OptionDescription(name='services', doc='services', children=[option_6], properties=frozenset({'hidden'})) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_5]) diff --git a/tests/dictionaries/11valid_enum_variable/tiramisu/base.py b/tests/dictionaries/11valid_enum_variable/tiramisu/base.py index be856cae..b12de08d 100644 --- a/tests/dictionaries/11valid_enum_variable/tiramisu/base.py +++ b/tests/dictionaries/11valid_enum_variable/tiramisu/base.py @@ -12,8 +12,8 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_4 = StrOption(name='var', doc='New variable', default=['a', 'b', 'c'], multi=True, default_multi='c', properties=frozenset({'mandatory', 'normal'})) -option_3 = ChoiceOption(name='mode_conteneur_actif', doc='No change', default='a', values=Calculation(func.calc_value, Params((ParamOption(option_4)))), properties=frozenset({'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4]) +option_4 = StrOption(name='var', doc='New variable', multi=True, default=['a', 'b', 'c'], default_multi='c', properties=frozenset({'mandatory', 'normal'})) +option_3 = ChoiceOption(name='mode_conteneur_actif', doc='No change', values=Calculation(func.calc_value, Params((ParamOption(option_4)))), default='a', properties=frozenset({'mandatory', 'normal'})) +option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/20family_append/tiramisu/base.py b/tests/dictionaries/20family_append/tiramisu/base.py index 27c45223..2eaa8480 100644 --- a/tests/dictionaries/20family_append/tiramisu/base.py +++ b/tests/dictionaries/20family_append/tiramisu/base.py @@ -14,6 +14,6 @@ except: from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) option_4 = StrOption(name='mode_conteneur_actif1', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/20family_appendaccent/tiramisu/base.py b/tests/dictionaries/20family_appendaccent/tiramisu/base.py index b3bd4a26..6da0c47a 100644 --- a/tests/dictionaries/20family_appendaccent/tiramisu/base.py +++ b/tests/dictionaries/20family_appendaccent/tiramisu/base.py @@ -16,7 +16,7 @@ option_7 = StrOption(name='mode_conteneur_actif3', doc='No change', default='non option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_7, todict=True), 'expected': ParamValue('non')}))})) option_4 = StrOption(name='mode_conteneur_actif1', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) option_5 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='Général', properties=frozenset({'normal'}), children=[option_3, option_4, option_5]) -option_6 = OptionDescription(name='other', doc='Other', properties=frozenset({'normal'}), children=[option_7]) +option_2 = OptionDescription(name='general', doc='Général', children=[option_3, option_4, option_5], properties=frozenset({'normal'})) +option_6 = OptionDescription(name='other', doc='Other', children=[option_7], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2, option_6]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/20family_dynamic/tiramisu/base.py b/tests/dictionaries/20family_dynamic/tiramisu/base.py index 976124f3..a896036c 100644 --- a/tests/dictionaries/20family_dynamic/tiramisu/base.py +++ b/tests/dictionaries/20family_dynamic/tiramisu/base.py @@ -12,9 +12,9 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='varname', doc='No change', default=['val1', 'val2'], multi=True, default_multi='val2', properties=frozenset({'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) +option_3 = StrOption(name='varname', doc='No change', multi=True, default=['val1', 'val2'], default_multi='val2', properties=frozenset({'mandatory', 'normal'})) +option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'normal'})) option_5 = StrOption(name='vardyn', doc='No change', properties=frozenset({'normal'})) -option_4 = ConvertDynOptionDescription(name='dyn', doc='dyn', properties=frozenset({'normal'}), suffixes=Calculation(func.calc_value, Params((ParamOption(option_3)))), children=[option_5]) +option_4 = ConvertDynOptionDescription(name='dyn', doc='dyn', suffixes=Calculation(func.calc_value, Params((ParamOption(option_3)))), children=[option_5], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2, option_4]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/20family_dynamic_calc/tiramisu/base.py b/tests/dictionaries/20family_dynamic_calc/tiramisu/base.py index ec2b06ac..be8adcc2 100644 --- a/tests/dictionaries/20family_dynamic_calc/tiramisu/base.py +++ b/tests/dictionaries/20family_dynamic_calc/tiramisu/base.py @@ -12,11 +12,11 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='varname', doc='No change', default=['val1', 'val2'], multi=True, default_multi='val2', properties=frozenset({'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) +option_3 = StrOption(name='varname', doc='No change', multi=True, default=['val1', 'val2'], default_multi='val2', properties=frozenset({'mandatory', 'normal'})) +option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'normal'})) option_5 = StrOption(name='vardyn', doc='No change', default='val', properties=frozenset({'mandatory', 'normal'})) -option_4 = ConvertDynOptionDescription(name='dyn', doc='dyn', properties=frozenset({'normal'}), suffixes=Calculation(func.calc_value, Params((ParamOption(option_3)))), children=[option_5]) +option_4 = ConvertDynOptionDescription(name='dyn', doc='dyn', suffixes=Calculation(func.calc_value, Params((ParamOption(option_3)))), children=[option_5], properties=frozenset({'normal'})) option_7 = StrOption(name='newvar', doc='No change', default=Calculation(func.calc_val, Params((ParamDynOption(option_5, 'val1', option_4, notraisepropertyerror=False, todict=False)), kwargs={})), properties=frozenset({'normal'})) -option_6 = OptionDescription(name='new', doc='new', properties=frozenset({'normal'}), children=[option_7]) +option_6 = OptionDescription(name='new', doc='new', children=[option_7], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2, option_4, option_6]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/20family_dynamic_calc2/tiramisu/base.py b/tests/dictionaries/20family_dynamic_calc2/tiramisu/base.py index 3749f7bb..06569116 100644 --- a/tests/dictionaries/20family_dynamic_calc2/tiramisu/base.py +++ b/tests/dictionaries/20family_dynamic_calc2/tiramisu/base.py @@ -12,11 +12,11 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='varname', doc='No change', default=['val1', 'val2'], multi=True, default_multi='val2', properties=frozenset({'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) +option_3 = StrOption(name='varname', doc='No change', multi=True, default=['val1', 'val2'], default_multi='val2', properties=frozenset({'mandatory', 'normal'})) +option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'normal'})) option_7 = StrOption(name='newvar', doc='No change', properties=frozenset({'normal'})) option_5 = StrOption(name='vardyn', doc='No change', default='val', properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_7, todict=True), 'expected': ParamValue('non')})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_7, todict=True), 'expected': ParamValue('non')}))})) -option_4 = ConvertDynOptionDescription(name='dyn', doc='dyn', properties=frozenset({'normal', Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_7, todict=True), 'expected': ParamValue('non')}))}), suffixes=Calculation(func.calc_value, Params((ParamOption(option_3)))), children=[option_5]) -option_6 = OptionDescription(name='new', doc='new', properties=frozenset({'normal'}), children=[option_7]) +option_4 = ConvertDynOptionDescription(name='dyn', doc='dyn', suffixes=Calculation(func.calc_value, Params((ParamOption(option_3)))), children=[option_5], properties=frozenset({'normal', Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_7, todict=True), 'expected': ParamValue('non')}))})) +option_6 = OptionDescription(name='new', doc='new', children=[option_7], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2, option_4, option_6]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/20family_dynamic_calc_suffix/tiramisu/base.py b/tests/dictionaries/20family_dynamic_calc_suffix/tiramisu/base.py index 56288d81..2ca6b65f 100644 --- a/tests/dictionaries/20family_dynamic_calc_suffix/tiramisu/base.py +++ b/tests/dictionaries/20family_dynamic_calc_suffix/tiramisu/base.py @@ -12,11 +12,11 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='varname', doc='No change', default=['val1', 'val2'], multi=True, default_multi='val2', properties=frozenset({'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) +option_3 = StrOption(name='varname', doc='No change', multi=True, default=['val1', 'val2'], default_multi='val2', properties=frozenset({'mandatory', 'normal'})) +option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'normal'})) option_5 = StrOption(name='vardyn', doc='No change', default=Calculation(func.calc_val, Params((ParamSuffix()), kwargs={})), properties=frozenset({'normal'})) -option_4 = ConvertDynOptionDescription(name='dyn', doc='dyn', properties=frozenset({'normal'}), suffixes=Calculation(func.calc_value, Params((ParamOption(option_3)))), children=[option_5]) +option_4 = ConvertDynOptionDescription(name='dyn', doc='dyn', suffixes=Calculation(func.calc_value, Params((ParamOption(option_3)))), children=[option_5], properties=frozenset({'normal'})) option_7 = StrOption(name='newvar', doc='No change', properties=frozenset({'normal'})) -option_6 = OptionDescription(name='new', doc='new', properties=frozenset({'normal'}), children=[option_7]) +option_6 = OptionDescription(name='new', doc='new', children=[option_7], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2, option_4, option_6]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/20family_dynamic_description/tiramisu/base.py b/tests/dictionaries/20family_dynamic_description/tiramisu/base.py index 8c7451cd..e61de01e 100644 --- a/tests/dictionaries/20family_dynamic_description/tiramisu/base.py +++ b/tests/dictionaries/20family_dynamic_description/tiramisu/base.py @@ -12,9 +12,9 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='varname', doc='No change', default=['val1', 'val2'], multi=True, default_multi='val2', properties=frozenset({'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) +option_3 = StrOption(name='varname', doc='No change', multi=True, default=['val1', 'val2'], default_multi='val2', properties=frozenset({'mandatory', 'normal'})) +option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'normal'})) option_5 = StrOption(name='vardyn', doc='No change', properties=frozenset({'normal'})) -option_4 = ConvertDynOptionDescription(name='dyn', doc='Dyn ', properties=frozenset({'normal'}), suffixes=Calculation(func.calc_value, Params((ParamOption(option_3)))), children=[option_5]) +option_4 = ConvertDynOptionDescription(name='dyn', doc='Dyn ', suffixes=Calculation(func.calc_value, Params((ParamOption(option_3)))), children=[option_5], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2, option_4]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/20family_dynamic_number/tiramisu/base.py b/tests/dictionaries/20family_dynamic_number/tiramisu/base.py index 664e4a6a..e1235bfd 100644 --- a/tests/dictionaries/20family_dynamic_number/tiramisu/base.py +++ b/tests/dictionaries/20family_dynamic_number/tiramisu/base.py @@ -12,11 +12,11 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = IntOption(name='varname', doc='No change', default=[1, 2], multi=True, default_multi=2, properties=frozenset({'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) +option_3 = IntOption(name='varname', doc='No change', multi=True, default=[1, 2], default_multi=2, properties=frozenset({'mandatory', 'normal'})) +option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'normal'})) option_5 = StrOption(name='vardyn', doc='No change', default='val', properties=frozenset({'mandatory', 'normal'})) -option_4 = ConvertDynOptionDescription(name='dyn', doc='dyn', properties=frozenset({'normal'}), suffixes=Calculation(func.calc_value, Params((ParamOption(option_3)))), children=[option_5]) +option_4 = ConvertDynOptionDescription(name='dyn', doc='dyn', suffixes=Calculation(func.calc_value, Params((ParamOption(option_3)))), children=[option_5], properties=frozenset({'normal'})) option_7 = StrOption(name='newvar', doc='No change', default=Calculation(func.calc_val, Params((ParamDynOption(option_5, '1', option_4, notraisepropertyerror=False, todict=False)), kwargs={})), properties=frozenset({'normal'})) -option_6 = OptionDescription(name='new', doc='new', properties=frozenset({'normal'}), children=[option_7]) +option_6 = OptionDescription(name='new', doc='new', children=[option_7], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2, option_4, option_6]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/20family_empty/tiramisu/base.py b/tests/dictionaries/20family_empty/tiramisu/base.py index 3a1a81a2..b887fd1f 100644 --- a/tests/dictionaries/20family_empty/tiramisu/base.py +++ b/tests/dictionaries/20family_empty/tiramisu/base.py @@ -13,6 +13,6 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'basic', 'mandatory'})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'basic'}), children=[option_3]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'basic'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/20family_hidden/tiramisu/base.py b/tests/dictionaries/20family_hidden/tiramisu/base.py index 9fad1795..af1ed311 100644 --- a/tests/dictionaries/20family_hidden/tiramisu/base.py +++ b/tests/dictionaries/20family_hidden/tiramisu/base.py @@ -13,6 +13,6 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'hidden', 'normal'}), children=[option_3]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'hidden', 'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/20family_mode/tiramisu/base.py b/tests/dictionaries/20family_mode/tiramisu/base.py index 3a1a81a2..b887fd1f 100644 --- a/tests/dictionaries/20family_mode/tiramisu/base.py +++ b/tests/dictionaries/20family_mode/tiramisu/base.py @@ -13,6 +13,6 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'basic', 'mandatory'})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'basic'}), children=[option_3]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'basic'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/20family_modeleadership/tiramisu/base.py b/tests/dictionaries/20family_modeleadership/tiramisu/base.py index 43713726..7ac59166 100644 --- a/tests/dictionaries/20family_modeleadership/tiramisu/base.py +++ b/tests/dictionaries/20family_modeleadership/tiramisu/base.py @@ -16,7 +16,7 @@ option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non' option_5 = StrOption(name='leader', doc='leader', multi=True) option_6 = StrOption(name='follower1', doc='follower1', multi=True, properties=frozenset({'normal'})) option_7 = StrOption(name='follower2', doc='follower2', multi=True, properties=frozenset({'normal'})) -option_4 = Leadership(name='leader', doc='leader', properties=frozenset({'normal'}), children=[option_5, option_6, option_7]) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4]) +option_4 = Leadership(name='leader', doc='leader', children=[option_5, option_6, option_7], properties=frozenset({'normal'})) +option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/20notemplating/tiramisu/base.py b/tests/dictionaries/20notemplating/tiramisu/base.py index 9fab0682..33577d5e 100644 --- a/tests/dictionaries/20notemplating/tiramisu/base.py +++ b/tests/dictionaries/20notemplating/tiramisu/base.py @@ -13,7 +13,7 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_8 = StrOption(name='group', doc='group', default='root') option_9 = StrOption(name='mode', doc='mode', default='0644') @@ -26,5 +26,5 @@ option_7 = OptionDescription(name='file', doc='file', children=[option_8, option option_6 = OptionDescription(name='files', doc='files', children=[option_7]) option_5 = OptionDescription(name='test', doc='test', children=[option_6]) option_5.impl_set_information("manage", True) -option_4 = OptionDescription(name='services', doc='services', properties=frozenset({'hidden'}), children=[option_5]) +option_4 = OptionDescription(name='services', doc='services', children=[option_5], properties=frozenset({'hidden'})) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_4]) diff --git a/tests/dictionaries/20override/tiramisu/base.py b/tests/dictionaries/20override/tiramisu/base.py index a7accbf1..8bcfe5f4 100644 --- a/tests/dictionaries/20override/tiramisu/base.py +++ b/tests/dictionaries/20override/tiramisu/base.py @@ -13,7 +13,7 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_8 = StrOption(name='group', doc='group', default='root') option_9 = StrOption(name='mode', doc='mode', default='0644') @@ -26,5 +26,5 @@ option_7 = OptionDescription(name='test_service', doc='test.service', children=[ option_6 = OptionDescription(name='overrides', doc='overrides', children=[option_7]) option_5 = OptionDescription(name='test', doc='test', children=[option_6]) option_5.impl_set_information("manage", True) -option_4 = OptionDescription(name='services', doc='services', properties=frozenset({'hidden'}), children=[option_5]) +option_4 = OptionDescription(name='services', doc='services', children=[option_5], properties=frozenset({'hidden'})) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_4]) diff --git a/tests/dictionaries/21family_empty/tiramisu/base.py b/tests/dictionaries/21family_empty/tiramisu/base.py index b318ad1e..83022ac8 100644 --- a/tests/dictionaries/21family_empty/tiramisu/base.py +++ b/tests/dictionaries/21family_empty/tiramisu/base.py @@ -13,6 +13,6 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/30mandatory_withoutvalue/tiramisu/base.py b/tests/dictionaries/30mandatory_withoutvalue/tiramisu/base.py index 712d52e8..71b6cba6 100644 --- a/tests/dictionaries/30mandatory_withoutvalue/tiramisu/base.py +++ b/tests/dictionaries/30mandatory_withoutvalue/tiramisu/base.py @@ -13,6 +13,6 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', properties=frozenset({'basic', 'mandatory'})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'basic'}), children=[option_3]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'basic'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/30mandatory_withoutvaluecalc/tiramisu/base.py b/tests/dictionaries/30mandatory_withoutvaluecalc/tiramisu/base.py index c81a54eb..3aaa5f18 100644 --- a/tests/dictionaries/30mandatory_withoutvaluecalc/tiramisu/base.py +++ b/tests/dictionaries/30mandatory_withoutvaluecalc/tiramisu/base.py @@ -13,6 +13,6 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.calc_val, Params((ParamValue("value")), kwargs={})), properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/30mandatory_withvalue/tiramisu/base.py b/tests/dictionaries/30mandatory_withvalue/tiramisu/base.py index 3706bdd4..a6fecd36 100644 --- a/tests/dictionaries/30mandatory_withvalue/tiramisu/base.py +++ b/tests/dictionaries/30mandatory_withvalue/tiramisu/base.py @@ -13,6 +13,6 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='value', properties=frozenset({'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/30mandatory_withvaluecalc/tiramisu/base.py b/tests/dictionaries/30mandatory_withvaluecalc/tiramisu/base.py index 22c60e34..134f75af 100644 --- a/tests/dictionaries/30mandatory_withvaluecalc/tiramisu/base.py +++ b/tests/dictionaries/30mandatory_withvaluecalc/tiramisu/base.py @@ -13,6 +13,6 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.calc_val, Params((ParamValue("value")), kwargs={})), properties=frozenset({'normal'})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/40condition_base/tiramisu/base.py b/tests/dictionaries/40condition_base/tiramisu/base.py index 6c2ceae7..89464d1f 100644 --- a/tests/dictionaries/40condition_base/tiramisu/base.py +++ b/tests/dictionaries/40condition_base/tiramisu/base.py @@ -16,6 +16,6 @@ option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non' option_4 = StrOption(name='condition', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_5 = StrOption(name='mode_conteneur_actif1', doc='No change', default='non', properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue('oui')}))})) option_6 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue('oui')}))})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4, option_5, option_6]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4, option_5, option_6], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/40condition_base_add/tiramisu/base.py b/tests/dictionaries/40condition_base_add/tiramisu/base.py index 6c2ceae7..89464d1f 100644 --- a/tests/dictionaries/40condition_base_add/tiramisu/base.py +++ b/tests/dictionaries/40condition_base_add/tiramisu/base.py @@ -16,6 +16,6 @@ option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non' option_4 = StrOption(name='condition', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_5 = StrOption(name='mode_conteneur_actif1', doc='No change', default='non', properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue('oui')}))})) option_6 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue('oui')}))})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4, option_5, option_6]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4, option_5, option_6], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/40condition_fallback/tiramisu/base.py b/tests/dictionaries/40condition_fallback/tiramisu/base.py index eccf2157..205e8d98 100644 --- a/tests/dictionaries/40condition_fallback/tiramisu/base.py +++ b/tests/dictionaries/40condition_fallback/tiramisu/base.py @@ -15,8 +15,8 @@ from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_4 = StrOption(name='mode_conteneur_actif1', doc='No change', default='non', properties=frozenset({'disabled', 'mandatory', 'normal'})) option_5 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', properties=frozenset({'disabled', 'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4, option_5]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4, option_5], properties=frozenset({'normal'})) option_7 = StrOption(name='mode_conteneur_actif3', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) -option_6 = OptionDescription(name='disabled_family', doc='disabled_family', properties=frozenset({'disabled', 'normal'}), children=[option_7]) +option_6 = OptionDescription(name='disabled_family', doc='disabled_family', children=[option_7], properties=frozenset({'disabled', 'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2, option_6]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/40condition_optional/tiramisu/base.py b/tests/dictionaries/40condition_optional/tiramisu/base.py index b0115760..b4403fba 100644 --- a/tests/dictionaries/40condition_optional/tiramisu/base.py +++ b/tests/dictionaries/40condition_optional/tiramisu/base.py @@ -15,6 +15,6 @@ from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_4 = StrOption(name='condition', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_5 = StrOption(name='mode_conteneur_actif1', doc='No change', default='non', properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue('oui')}))})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4, option_5]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4, option_5], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/40condition_optional_empty/tiramisu/base.py b/tests/dictionaries/40condition_optional_empty/tiramisu/base.py index 784e30cf..45e0d581 100644 --- a/tests/dictionaries/40condition_optional_empty/tiramisu/base.py +++ b/tests/dictionaries/40condition_optional_empty/tiramisu/base.py @@ -15,6 +15,6 @@ from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_4 = StrOption(name='condition', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_5 = StrOption(name='mode_conteneur_actif1', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4, option_5]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4, option_5], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/40empty_param/tiramisu/base.py b/tests/dictionaries/40empty_param/tiramisu/base.py index 867edd5c..f3c31e6e 100644 --- a/tests/dictionaries/40empty_param/tiramisu/base.py +++ b/tests/dictionaries/40empty_param/tiramisu/base.py @@ -12,8 +12,8 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = PortOption(allow_private=True, name='toto1', doc='Port d\'écoute du proxy', default=Calculation(func.calc_multi_condition, Params((ParamValue("None")), kwargs={})), properties=frozenset({'expert'})) -option_4 = PortOption(allow_private=True, name='toto2', doc='Port d\'écoute du proxy NTLM', default='3127', properties=frozenset({'expert', 'mandatory'})) -option_2 = OptionDescription(name='proxy_authentifie', doc='proxy authentifié', properties=frozenset({'expert'}), children=[option_3, option_4]) +option_3 = PortOption(name='toto1', doc='Port d\'écoute du proxy', default=Calculation(func.calc_multi_condition, Params((ParamValue("None")), kwargs={})), allow_private=True, properties=frozenset({'expert'})) +option_4 = PortOption(name='toto2', doc='Port d\'écoute du proxy NTLM', default='3127', allow_private=True, properties=frozenset({'expert', 'mandatory'})) +option_2 = OptionDescription(name='proxy_authentifie', doc='proxy authentifié', children=[option_3, option_4], properties=frozenset({'expert'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/40empty_param2/tiramisu/base.py b/tests/dictionaries/40empty_param2/tiramisu/base.py index b62c7a9d..279d1ff2 100644 --- a/tests/dictionaries/40empty_param2/tiramisu/base.py +++ b/tests/dictionaries/40empty_param2/tiramisu/base.py @@ -12,8 +12,8 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = PortOption(allow_private=True, name='toto1', doc='Port d\'écoute du proxy', default=Calculation(func.calc_multi_condition, Params((), kwargs={'value': ParamValue("None")})), properties=frozenset({'expert'})) -option_4 = PortOption(allow_private=True, name='toto2', doc='Port d\'écoute du proxy NTLM', default='3127', properties=frozenset({'expert', 'mandatory'})) -option_2 = OptionDescription(name='proxy_authentifie', doc='proxy authentifié', properties=frozenset({'expert'}), children=[option_3, option_4]) +option_3 = PortOption(name='toto1', doc='Port d\'écoute du proxy', default=Calculation(func.calc_multi_condition, Params((), kwargs={'value': ParamValue("None")})), allow_private=True, properties=frozenset({'expert'})) +option_4 = PortOption(name='toto2', doc='Port d\'écoute du proxy NTLM', default='3127', allow_private=True, properties=frozenset({'expert', 'mandatory'})) +option_2 = OptionDescription(name='proxy_authentifie', doc='proxy authentifié', children=[option_3, option_4], properties=frozenset({'expert'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/40hidden_if_in_group_fallback/tiramisu/base.py b/tests/dictionaries/40hidden_if_in_group_fallback/tiramisu/base.py index 5736efc6..e074c9b5 100644 --- a/tests/dictionaries/40hidden_if_in_group_fallback/tiramisu/base.py +++ b/tests/dictionaries/40hidden_if_in_group_fallback/tiramisu/base.py @@ -13,9 +13,9 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) -option_5 = StrOption(name='mode_conteneur_actif1', doc='No change', default=['non'], multi=True, properties=frozenset({'force_default_on_freeze', 'frozen', 'mandatory'})) +option_5 = StrOption(name='mode_conteneur_actif1', doc='No change', multi=True, default=['non'], properties=frozenset({'force_default_on_freeze', 'frozen', 'mandatory'})) option_6 = StrOption(name='mode_conteneur_actif2', doc='No change', multi=True, default_multi='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'mandatory', 'normal'})) -option_4 = Leadership(name='mode_conteneur_actif1', doc='No change', properties=frozenset({'hidden', 'normal'}), children=[option_5, option_6]) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4]) +option_4 = Leadership(name='mode_conteneur_actif1', doc='No change', children=[option_5, option_6], properties=frozenset({'hidden', 'normal'})) +option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/40ifin_leadership/tiramisu/base.py b/tests/dictionaries/40ifin_leadership/tiramisu/base.py index b4d92927..f1931296 100644 --- a/tests/dictionaries/40ifin_leadership/tiramisu/base.py +++ b/tests/dictionaries/40ifin_leadership/tiramisu/base.py @@ -17,7 +17,7 @@ option_4 = StrOption(name='condition', doc='condition', default='oui', propertie option_6 = StrOption(name='leader', doc='leader', multi=True) option_7 = StrOption(name='follower1', doc='follower1', multi=True, properties=frozenset({'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue('oui')}))})) option_8 = StrOption(name='follower2', doc='follower2', multi=True, properties=frozenset({'normal'})) -option_5 = Leadership(name='leader', doc='leader', properties=frozenset({'normal'}), children=[option_6, option_7, option_8]) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4, option_5]) +option_5 = Leadership(name='leader', doc='leader', children=[option_6, option_7, option_8], properties=frozenset({'normal'})) +option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4, option_5], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/40ifin_leadershipauto/tiramisu/base.py b/tests/dictionaries/40ifin_leadershipauto/tiramisu/base.py index 4b4b95bd..66d6c1d6 100644 --- a/tests/dictionaries/40ifin_leadershipauto/tiramisu/base.py +++ b/tests/dictionaries/40ifin_leadershipauto/tiramisu/base.py @@ -14,11 +14,11 @@ except: from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_4 = StrOption(name='condition', doc='condition', default='oui', properties=frozenset({'mandatory', 'normal'})) -option_6 = StrOption(name='leader', doc='leader', default=['a'], multi=True, properties=frozenset({'mandatory'})) -option_7 = StrOption(name='follower1', doc='follower1', default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), multi=True, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue('oui')}))})) +option_6 = StrOption(name='leader', doc='leader', multi=True, default=['a'], properties=frozenset({'mandatory'})) +option_7 = StrOption(name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue('oui')}))})) option_8 = StrOption(name='follower2', doc='follower2', multi=True, properties=frozenset({'normal'})) -option_5 = Leadership(name='leader', doc='leader', properties=frozenset({'normal'}), children=[option_6, option_7, option_8]) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4, option_5]) +option_5 = Leadership(name='leader', doc='leader', children=[option_6, option_7, option_8], properties=frozenset({'normal'})) +option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4, option_5], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_13 = StrOption(name='group', doc='group', default='root') option_14 = StrOption(name='mode', doc='mode', default='0644') @@ -31,5 +31,5 @@ option_12 = OptionDescription(name='mailname', doc='mailname', children=[option_ option_11 = OptionDescription(name='files', doc='files', children=[option_12]) option_10 = OptionDescription(name='test', doc='test', children=[option_11]) option_10.impl_set_information("manage", True) -option_9 = OptionDescription(name='services', doc='services', properties=frozenset({'hidden'}), children=[option_10]) +option_9 = OptionDescription(name='services', doc='services', children=[option_10], properties=frozenset({'hidden'})) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_9]) diff --git a/tests/dictionaries/40ifin_leadershipauto_follower/tiramisu/base.py b/tests/dictionaries/40ifin_leadershipauto_follower/tiramisu/base.py index 9499e450..4a689b12 100644 --- a/tests/dictionaries/40ifin_leadershipauto_follower/tiramisu/base.py +++ b/tests/dictionaries/40ifin_leadershipauto_follower/tiramisu/base.py @@ -14,11 +14,11 @@ except: from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_4 = StrOption(name='condition', doc='condition', default='oui', properties=frozenset({'mandatory', 'normal'})) -option_6 = StrOption(name='leader', doc='leader', default=['a', 'b'], multi=True, properties=frozenset({'mandatory'})) -option_7 = StrOption(name='follower1', doc='follower1', default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), multi=True, properties=frozenset({'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, todict=True), 'expected': ParamValue('a')}))})) +option_6 = StrOption(name='leader', doc='leader', multi=True, default=['a', 'b'], properties=frozenset({'mandatory'})) +option_7 = StrOption(name='follower1', doc='follower1', multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, todict=True), 'expected': ParamValue('a')}))})) option_8 = StrOption(name='follower2', doc='follower2', multi=True, properties=frozenset({'normal'})) -option_5 = Leadership(name='leader', doc='leader', properties=frozenset({'normal'}), children=[option_6, option_7, option_8]) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4, option_5]) +option_5 = Leadership(name='leader', doc='leader', children=[option_6, option_7, option_8], properties=frozenset({'normal'})) +option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4, option_5], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_13 = StrOption(name='group', doc='group', default='root') option_14 = StrOption(name='mode', doc='mode', default='0644') @@ -31,5 +31,5 @@ option_12 = OptionDescription(name='mailname', doc='mailname', children=[option_ option_11 = OptionDescription(name='files', doc='files', children=[option_12]) option_10 = OptionDescription(name='test', doc='test', children=[option_11]) option_10.impl_set_information("manage", True) -option_9 = OptionDescription(name='services', doc='services', properties=frozenset({'hidden'}), children=[option_10]) +option_9 = OptionDescription(name='services', doc='services', children=[option_10], properties=frozenset({'hidden'})) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_9]) diff --git a/tests/dictionaries/40ifin_multi/tiramisu/base.py b/tests/dictionaries/40ifin_multi/tiramisu/base.py index dc0dbc8f..935968b8 100644 --- a/tests/dictionaries/40ifin_multi/tiramisu/base.py +++ b/tests/dictionaries/40ifin_multi/tiramisu/base.py @@ -13,9 +13,9 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'normal'})) option_5 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) option_6 = StrOption(name='mode_conteneur_actif3', doc='No change', default='non', properties=frozenset({'mandatory', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_5, todict=True), 'expected': ParamValue('oui')}))})) -option_4 = OptionDescription(name='general2', doc='general2', properties=frozenset({'hidden', 'normal'}), children=[option_5, option_6]) +option_4 = OptionDescription(name='general2', doc='general2', children=[option_5, option_6], properties=frozenset({'hidden', 'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2, option_4]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/40ifin_validenum/tiramisu/base.py b/tests/dictionaries/40ifin_validenum/tiramisu/base.py index c947b42d..b730ee7a 100644 --- a/tests/dictionaries/40ifin_validenum/tiramisu/base.py +++ b/tests/dictionaries/40ifin_validenum/tiramisu/base.py @@ -13,9 +13,9 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'normal'})) option_5 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', properties=frozenset({'disabled', 'mandatory', 'normal'})) -option_6 = ChoiceOption(name='mode_conteneur_actif3', doc='No change', default='a', values=('a', 'b', 'c'), properties=frozenset({'mandatory', 'normal'})) -option_4 = OptionDescription(name='general2', doc='general2', properties=frozenset({'hidden', 'normal'}), children=[option_5, option_6]) +option_6 = ChoiceOption(name='mode_conteneur_actif3', doc='No change', values=('a', 'b', 'c'), default='a', properties=frozenset({'mandatory', 'normal'})) +option_4 = OptionDescription(name='general2', doc='general2', children=[option_5, option_6], properties=frozenset({'hidden', 'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2, option_4]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/50exists_exists/tiramisu/base.py b/tests/dictionaries/50exists_exists/tiramisu/base.py index 75c7c394..e50f5593 100644 --- a/tests/dictionaries/50exists_exists/tiramisu/base.py +++ b/tests/dictionaries/50exists_exists/tiramisu/base.py @@ -13,6 +13,6 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='Description', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/50redefine_description/tiramisu/base.py b/tests/dictionaries/50redefine_description/tiramisu/base.py index 1e0dabee..804f92d5 100644 --- a/tests/dictionaries/50redefine_description/tiramisu/base.py +++ b/tests/dictionaries/50redefine_description/tiramisu/base.py @@ -13,6 +13,6 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='Redefined', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/51exists_nonexists/tiramisu/base.py b/tests/dictionaries/51exists_nonexists/tiramisu/base.py index cb18d7fb..dc9f7e41 100644 --- a/tests/dictionaries/51exists_nonexists/tiramisu/base.py +++ b/tests/dictionaries/51exists_nonexists/tiramisu/base.py @@ -15,6 +15,6 @@ from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='Description', default='non', properties=frozenset({'mandatory', 'normal'})) option_4 = StrOption(name='mode_conteneur_actif1', doc='Description', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) option_5 = StrOption(name='mode_conteneur_actif2', doc='New description', default='oui', properties=frozenset({'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4, option_5]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4, option_5], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/51exists_redefine/tiramisu/base.py b/tests/dictionaries/51exists_redefine/tiramisu/base.py index 01ecab93..3ff792d1 100644 --- a/tests/dictionaries/51exists_redefine/tiramisu/base.py +++ b/tests/dictionaries/51exists_redefine/tiramisu/base.py @@ -13,6 +13,6 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='Description', default='oui', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/51redefine_auto/tiramisu/base.py b/tests/dictionaries/51redefine_auto/tiramisu/base.py index d3d026c2..ff831571 100644 --- a/tests/dictionaries/51redefine_auto/tiramisu/base.py +++ b/tests/dictionaries/51redefine_auto/tiramisu/base.py @@ -13,6 +13,6 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.concat, Params((), kwargs={'valeur': ParamValue("non")})), properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/51redefine_autofill/tiramisu/base.py b/tests/dictionaries/51redefine_autofill/tiramisu/base.py index c0ca7b11..9a9b2536 100644 --- a/tests/dictionaries/51redefine_autofill/tiramisu/base.py +++ b/tests/dictionaries/51redefine_autofill/tiramisu/base.py @@ -13,6 +13,6 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.concat, Params((), kwargs={'valeur': ParamValue("non")})), properties=frozenset({'normal'})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/51redefine_family/tiramisu/base.py b/tests/dictionaries/51redefine_family/tiramisu/base.py index 59ccfc21..c2b3ddb3 100644 --- a/tests/dictionaries/51redefine_family/tiramisu/base.py +++ b/tests/dictionaries/51redefine_family/tiramisu/base.py @@ -13,8 +13,8 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'normal'})) option_5 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) -option_4 = OptionDescription(name='general2', doc='general2', properties=frozenset({'hidden', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))}), children=[option_5]) +option_4 = OptionDescription(name='general2', doc='general2', children=[option_5], properties=frozenset({'hidden', 'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2, option_4]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/51redefine_fill/tiramisu/base.py b/tests/dictionaries/51redefine_fill/tiramisu/base.py index d3d026c2..ff831571 100644 --- a/tests/dictionaries/51redefine_fill/tiramisu/base.py +++ b/tests/dictionaries/51redefine_fill/tiramisu/base.py @@ -13,6 +13,6 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.concat, Params((), kwargs={'valeur': ParamValue("non")})), properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/51redefine_fillauto/tiramisu/base.py b/tests/dictionaries/51redefine_fillauto/tiramisu/base.py index d3d026c2..ff831571 100644 --- a/tests/dictionaries/51redefine_fillauto/tiramisu/base.py +++ b/tests/dictionaries/51redefine_fillauto/tiramisu/base.py @@ -13,6 +13,6 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default=Calculation(func.concat, Params((), kwargs={'valeur': ParamValue("non")})), properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/51redefine_help/tiramisu/base.py b/tests/dictionaries/51redefine_help/tiramisu/base.py index 8ed65e6a..bf3af98b 100644 --- a/tests/dictionaries/51redefine_help/tiramisu/base.py +++ b/tests/dictionaries/51redefine_help/tiramisu/base.py @@ -14,7 +14,7 @@ except: from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='redefine help', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) option_3.impl_set_information("help", "redefine help ok") -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'normal'})) option_2.impl_set_information("help", "redefine help family ok") option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/51redefine_hidden/tiramisu/base.py b/tests/dictionaries/51redefine_hidden/tiramisu/base.py index 55598873..b1abe7ed 100644 --- a/tests/dictionaries/51redefine_hidden/tiramisu/base.py +++ b/tests/dictionaries/51redefine_hidden/tiramisu/base.py @@ -13,6 +13,6 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='Redefine hidden', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/51redefine_remove_check/tiramisu/base.py b/tests/dictionaries/51redefine_remove_check/tiramisu/base.py index 14337f50..6eaaac93 100644 --- a/tests/dictionaries/51redefine_remove_check/tiramisu/base.py +++ b/tests/dictionaries/51redefine_remove_check/tiramisu/base.py @@ -13,6 +13,6 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/51redefine_remove_condition/tiramisu/base.py b/tests/dictionaries/51redefine_remove_condition/tiramisu/base.py index 301109bd..32f01dab 100644 --- a/tests/dictionaries/51redefine_remove_condition/tiramisu/base.py +++ b/tests/dictionaries/51redefine_remove_condition/tiramisu/base.py @@ -16,6 +16,6 @@ option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non' option_4 = StrOption(name='condition', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_5 = StrOption(name='mode_conteneur_actif1', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) option_6 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4, option_5, option_6]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4, option_5, option_6], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/51redefine_removecondition_nonautofreeze/tiramisu/base.py b/tests/dictionaries/51redefine_removecondition_nonautofreeze/tiramisu/base.py index 950bce8b..8740d550 100644 --- a/tests/dictionaries/51redefine_removecondition_nonautofreeze/tiramisu/base.py +++ b/tests/dictionaries/51redefine_removecondition_nonautofreeze/tiramisu/base.py @@ -17,6 +17,6 @@ option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non' option_4 = StrOption(name='condition', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) option_5 = StrOption(name='mode_conteneur_actif1', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) option_6 = StrOption(name='mode_conteneur_actif2', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'basic'}), children=[option_3, option_4, option_5, option_6, option_7]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4, option_5, option_6, option_7], properties=frozenset({'basic'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/51redefine_validenum/tiramisu/base.py b/tests/dictionaries/51redefine_validenum/tiramisu/base.py index 45b0399a..a226864c 100644 --- a/tests/dictionaries/51redefine_validenum/tiramisu/base.py +++ b/tests/dictionaries/51redefine_validenum/tiramisu/base.py @@ -12,7 +12,7 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = ChoiceOption(name='mode_conteneur_actif', doc='Redefine description', default='a', values=('a', 'b'), properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) +option_3 = ChoiceOption(name='mode_conteneur_actif', doc='Redefine description', values=('a', 'b'), default='a', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) +option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/51redefine_value/tiramisu/base.py b/tests/dictionaries/51redefine_value/tiramisu/base.py index 5771c871..4eb55d1a 100644 --- a/tests/dictionaries/51redefine_value/tiramisu/base.py +++ b/tests/dictionaries/51redefine_value/tiramisu/base.py @@ -14,6 +14,6 @@ except: from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='Redefine value', default='non', properties=frozenset({'mandatory', 'normal'})) option_4 = StrOption(name='mode_conteneur_actif1', doc='Redefine value', default='oui', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/51remove_fill/tiramisu/base.py b/tests/dictionaries/51remove_fill/tiramisu/base.py index e9010eb3..4f738513 100644 --- a/tests/dictionaries/51remove_fill/tiramisu/base.py +++ b/tests/dictionaries/51remove_fill/tiramisu/base.py @@ -14,6 +14,6 @@ except: from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='oui', properties=frozenset({'mandatory', 'normal'})) option_4 = StrOption(name='mode_conteneur_actif1', doc='No change', default='non', properties=frozenset({'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3, option_4], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/52exists_redefine/tiramisu/base.py b/tests/dictionaries/52exists_redefine/tiramisu/base.py index a6e5ea1a..3e8596ff 100644 --- a/tests/dictionaries/52exists_redefine/tiramisu/base.py +++ b/tests/dictionaries/52exists_redefine/tiramisu/base.py @@ -13,6 +13,6 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='New description', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3]) +option_2 = OptionDescription(name='general', doc='general', children=[option_3], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/60action_external/tiramisu/base.py b/tests/dictionaries/60action_external/tiramisu/base.py index 6c518a23..60a0edf7 100644 --- a/tests/dictionaries/60action_external/tiramisu/base.py +++ b/tests/dictionaries/60action_external/tiramisu/base.py @@ -13,10 +13,10 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3]) +option_2 = OptionDescription(name='general', doc='général', children=[option_3], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_6 = IntOption(name='delay', doc='délai en minutes avant lancement', default=0, properties=frozenset({'mandatory', 'normal'})) -option_7 = URLOption(allow_ip=True, allow_without_dot=True, name='calc_url', doc='domain', default=Calculation(func.calc_val, Params((ParamValue("http://localhost/")), kwargs={})), properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'})) -option_5 = OptionDescription(name='test', doc='test', properties=frozenset({'normal'}), children=[option_6, option_7]) +option_7 = URLOption(name='calc_url', doc='domain', default=Calculation(func.calc_val, Params((ParamValue("http://localhost/")), kwargs={})), allow_ip=True, allow_without_dot=True, properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'})) +option_5 = OptionDescription(name='test', doc='test', children=[option_6, option_7], properties=frozenset({'normal'})) option_4 = OptionDescription(name='extra', doc='extra', children=[option_5]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_4]) diff --git a/tests/dictionaries/60extra_externalspacecondition/tiramisu/base.py b/tests/dictionaries/60extra_externalspacecondition/tiramisu/base.py index dd4b10ba..02eb1c3f 100644 --- a/tests/dictionaries/60extra_externalspacecondition/tiramisu/base.py +++ b/tests/dictionaries/60extra_externalspacecondition/tiramisu/base.py @@ -15,14 +15,14 @@ from rougail.tiramisu import ConvertDynOptionDescription option_5 = StrOption(name='module_instancie', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'auto_freeze', 'basic', 'force_store_value', 'mandatory', Calculation(calc_value, Params(ParamValue('auto_frozen'), kwargs={'condition': ParamOption(option_5, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)}))})) option_4 = StrOption(name='activer_ejabberd', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'basic'}), children=[option_3, option_4, option_5]) +option_2 = OptionDescription(name='general', doc='général', children=[option_3, option_4, option_5], properties=frozenset({'basic'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_8 = StrOption(name='description', doc='description', default='Exportation de la base de ejabberd', properties=frozenset({'mandatory', 'normal'})) -option_9 = ChoiceOption(name='day', doc='day', default='none', values=('none', 'daily', 'weekly', 'monthly'), properties=frozenset({'mandatory', 'normal'})) -option_10 = ChoiceOption(name='mode', doc='mode', default='pre', values=('pre', 'post'), properties=frozenset({'mandatory', 'normal'})) -option_7 = OptionDescription(name='ejabberd', doc='ejabberd', properties=frozenset({'normal'}), children=[option_8, option_9, option_10]) +option_9 = ChoiceOption(name='day', doc='day', values=('none', 'daily', 'weekly', 'monthly'), default='none', properties=frozenset({'mandatory', 'normal'})) +option_10 = ChoiceOption(name='mode', doc='mode', values=('pre', 'post'), default='pre', properties=frozenset({'mandatory', 'normal'})) +option_7 = OptionDescription(name='ejabberd', doc='ejabberd', children=[option_8, option_9, option_10], properties=frozenset({'normal'})) option_6 = OptionDescription(name='extra', doc='extra', children=[option_7]) option_13 = StrOption(name='description', doc='description', default='test', properties=frozenset({'mandatory', 'normal'})) -option_12 = OptionDescription(name='external', doc='external', properties=frozenset({'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_8, todict=True), 'expected': ParamValue('non')}))}), children=[option_13]) +option_12 = OptionDescription(name='external', doc='external', children=[option_13], properties=frozenset({'normal', Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_8, todict=True), 'expected': ParamValue('non')}))})) option_11 = OptionDescription(name='extra1', doc='extra1', children=[option_12]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_6, option_11]) diff --git a/tests/dictionaries/60extra_group/tiramisu/base.py b/tests/dictionaries/60extra_group/tiramisu/base.py index a8db4873..d3689b91 100644 --- a/tests/dictionaries/60extra_group/tiramisu/base.py +++ b/tests/dictionaries/60extra_group/tiramisu/base.py @@ -14,12 +14,12 @@ except: from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) option_4 = StrOption(name='activer_ejabberd', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3, option_4]) +option_2 = OptionDescription(name='general', doc='général', children=[option_3, option_4], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) -option_8 = StrOption(name='description', doc='description', default=['test'], multi=True, properties=frozenset({'mandatory'})) +option_8 = StrOption(name='description', doc='description', multi=True, default=['test'], properties=frozenset({'mandatory'})) option_9 = StrOption(name='mode', doc='mode', multi=True, default_multi='pre', properties=frozenset({'mandatory', 'normal'})) -option_7 = Leadership(name='description', doc='description', properties=frozenset({'normal'}), children=[option_8, option_9]) -option_6 = OptionDescription(name='ejabberd', doc='ejabberd', properties=frozenset({'normal'}), children=[option_7]) +option_7 = Leadership(name='description', doc='description', children=[option_8, option_9], properties=frozenset({'normal'})) +option_6 = OptionDescription(name='ejabberd', doc='ejabberd', children=[option_7], properties=frozenset({'normal'})) option_5 = OptionDescription(name='extra', doc='extra', children=[option_6]) option_14 = StrOption(name='group', doc='group', default='root') option_15 = StrOption(name='mode', doc='mode', default='0644') @@ -32,5 +32,5 @@ option_13 = OptionDescription(name='mailname', doc='mailname', children=[option_ option_12 = OptionDescription(name='files', doc='files', children=[option_13]) option_11 = OptionDescription(name='test', doc='test', children=[option_12]) option_11.impl_set_information("manage", True) -option_10 = OptionDescription(name='services', doc='services', properties=frozenset({'hidden'}), children=[option_11]) +option_10 = OptionDescription(name='services', doc='services', children=[option_11], properties=frozenset({'hidden'})) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_5, option_10]) diff --git a/tests/dictionaries/60extra_help/tiramisu/base.py b/tests/dictionaries/60extra_help/tiramisu/base.py index c768abb5..3de4292c 100644 --- a/tests/dictionaries/60extra_help/tiramisu/base.py +++ b/tests/dictionaries/60extra_help/tiramisu/base.py @@ -14,13 +14,13 @@ except: from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) option_4 = StrOption(name='activer_ejabberd', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3, option_4]) +option_2 = OptionDescription(name='general', doc='général', children=[option_3, option_4], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_7 = StrOption(name='description', doc='description', default='Exportation de la base de ejabberd', properties=frozenset({'mandatory', 'normal'})) -option_8 = ChoiceOption(name='day', doc='day', default=Calculation(func.calc_multi_condition, Params((ParamValue("non")), kwargs={'condition_1': ParamOption(option_4, notraisepropertyerror=True, todict=False), 'match': ParamValue("none"), 'mismatch': ParamValue("daily")})), values=('none', 'daily', 'weekly', 'monthly'), properties=frozenset({'mandatory', 'normal'})) +option_8 = ChoiceOption(name='day', doc='day', values=('none', 'daily', 'weekly', 'monthly'), default=Calculation(func.calc_multi_condition, Params((ParamValue("non")), kwargs={'condition_1': ParamOption(option_4, notraisepropertyerror=True, todict=False), 'match': ParamValue("none"), 'mismatch': ParamValue("daily")})), properties=frozenset({'mandatory', 'normal'})) option_8.impl_set_information("help", "Test help") -option_9 = ChoiceOption(name='mode', doc='mode', default='pre', values=('pre', 'post'), properties=frozenset({'mandatory', 'normal'})) -option_6 = OptionDescription(name='ejabberd', doc='ejabberd', properties=frozenset({'normal'}), children=[option_7, option_8, option_9]) +option_9 = ChoiceOption(name='mode', doc='mode', values=('pre', 'post'), default='pre', properties=frozenset({'mandatory', 'normal'})) +option_6 = OptionDescription(name='ejabberd', doc='ejabberd', children=[option_7, option_8, option_9], properties=frozenset({'normal'})) option_5 = OptionDescription(name='extra', doc='extra', children=[option_6]) option_14 = StrOption(name='group', doc='group', default='root') option_15 = StrOption(name='mode', doc='mode', default='0644') @@ -33,5 +33,5 @@ option_13 = OptionDescription(name='mailname', doc='mailname', children=[option_ option_12 = OptionDescription(name='files', doc='files', children=[option_13]) option_11 = OptionDescription(name='test', doc='test', children=[option_12]) option_11.impl_set_information("manage", True) -option_10 = OptionDescription(name='services', doc='services', properties=frozenset({'hidden'}), children=[option_11]) +option_10 = OptionDescription(name='services', doc='services', children=[option_11], properties=frozenset({'hidden'})) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_5, option_10]) diff --git a/tests/dictionaries/60extra_load/tiramisu/base.py b/tests/dictionaries/60extra_load/tiramisu/base.py index da65cd87..82066d82 100644 --- a/tests/dictionaries/60extra_load/tiramisu/base.py +++ b/tests/dictionaries/60extra_load/tiramisu/base.py @@ -14,11 +14,11 @@ except: from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) option_4 = StrOption(name='activer_ejabberd', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3, option_4]) +option_2 = OptionDescription(name='general', doc='général', children=[option_3, option_4], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_7 = StrOption(name='description', doc='description', default='Exportation de la base de ejabberd', properties=frozenset({'mandatory', 'normal'})) -option_8 = ChoiceOption(name='day', doc='day', default=Calculation(func.calc_multi_condition, Params((ParamValue("non")), kwargs={'condition_1': ParamOption(option_4, notraisepropertyerror=True, todict=False), 'match': ParamValue("none"), 'mismatch': ParamValue("daily")})), values=('none', 'daily', 'weekly', 'monthly'), properties=frozenset({'mandatory', 'normal'})) -option_9 = ChoiceOption(name='mode', doc='mode', default='pre', values=('pre', 'post'), properties=frozenset({'mandatory', 'normal'})) -option_6 = OptionDescription(name='ejabberd', doc='ejabberd', properties=frozenset({'normal'}), children=[option_7, option_8, option_9]) +option_8 = ChoiceOption(name='day', doc='day', values=('none', 'daily', 'weekly', 'monthly'), default=Calculation(func.calc_multi_condition, Params((ParamValue("non")), kwargs={'condition_1': ParamOption(option_4, notraisepropertyerror=True, todict=False), 'match': ParamValue("none"), 'mismatch': ParamValue("daily")})), properties=frozenset({'mandatory', 'normal'})) +option_9 = ChoiceOption(name='mode', doc='mode', values=('pre', 'post'), default='pre', properties=frozenset({'mandatory', 'normal'})) +option_6 = OptionDescription(name='ejabberd', doc='ejabberd', children=[option_7, option_8, option_9], properties=frozenset({'normal'})) option_5 = OptionDescription(name='extra', doc='extra', children=[option_6]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_5]) diff --git a/tests/dictionaries/60extra_mandatory/tiramisu/base.py b/tests/dictionaries/60extra_mandatory/tiramisu/base.py index b1febc7b..45e33352 100644 --- a/tests/dictionaries/60extra_mandatory/tiramisu/base.py +++ b/tests/dictionaries/60extra_mandatory/tiramisu/base.py @@ -14,12 +14,12 @@ except: from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) option_4 = StrOption(name='activer_ejabberd', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3, option_4]) +option_2 = OptionDescription(name='general', doc='général', children=[option_3, option_4], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_7 = StrOption(name='description', doc='description', default='Exportation de la base de ejabberd', properties=frozenset({'mandatory', 'normal'})) -option_8 = ChoiceOption(name='day', doc='day', default=Calculation(func.calc_multi_condition, Params((ParamValue("non")), kwargs={'condition_1': ParamOption(option_4, notraisepropertyerror=True, todict=False), 'match': ParamValue("none"), 'mismatch': ParamValue("daily")})), values=('none', 'daily', 'weekly', 'monthly'), properties=frozenset({'mandatory', 'normal'})) -option_9 = ChoiceOption(name='mode', doc='mode', default='pre', values=('pre', 'post'), properties=frozenset({'mandatory', 'normal'})) +option_8 = ChoiceOption(name='day', doc='day', values=('none', 'daily', 'weekly', 'monthly'), default=Calculation(func.calc_multi_condition, Params((ParamValue("non")), kwargs={'condition_1': ParamOption(option_4, notraisepropertyerror=True, todict=False), 'match': ParamValue("none"), 'mismatch': ParamValue("daily")})), properties=frozenset({'mandatory', 'normal'})) +option_9 = ChoiceOption(name='mode', doc='mode', values=('pre', 'post'), default='pre', properties=frozenset({'mandatory', 'normal'})) option_10 = StrOption(name='var1', doc='var1', properties=frozenset({'basic', 'mandatory'})) -option_6 = OptionDescription(name='ejabberd', doc='ejabberd', properties=frozenset({'basic'}), children=[option_7, option_8, option_9, option_10]) +option_6 = OptionDescription(name='ejabberd', doc='ejabberd', children=[option_7, option_8, option_9, option_10], properties=frozenset({'basic'})) option_5 = OptionDescription(name='extra', doc='extra', children=[option_6]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_5]) diff --git a/tests/dictionaries/60extra_name_family/tiramisu/base.py b/tests/dictionaries/60extra_name_family/tiramisu/base.py index fde1855d..ad668fd0 100644 --- a/tests/dictionaries/60extra_name_family/tiramisu/base.py +++ b/tests/dictionaries/60extra_name_family/tiramisu/base.py @@ -14,11 +14,11 @@ except: from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) option_4 = StrOption(name='activer_ejabberd', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) -option_2 = OptionDescription(name='extra', doc='extra', properties=frozenset({'normal'}), children=[option_3, option_4]) +option_2 = OptionDescription(name='extra', doc='extra', children=[option_3, option_4], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_7 = StrOption(name='description', doc='description', default='Exportation de la base de ejabberd', properties=frozenset({'mandatory', 'normal'})) -option_8 = ChoiceOption(name='day', doc='day', default=Calculation(func.calc_multi_condition, Params((ParamValue("non")), kwargs={'condition_1': ParamOption(option_4, notraisepropertyerror=True, todict=False), 'match': ParamValue("none"), 'mismatch': ParamValue("daily")})), values=('none', 'daily', 'weekly', 'monthly'), properties=frozenset({'mandatory', 'normal'})) -option_9 = ChoiceOption(name='mode', doc='mode', default='pre', values=('pre', 'post'), properties=frozenset({'mandatory', 'normal'})) -option_6 = OptionDescription(name='ejabberd', doc='ejabberd', properties=frozenset({'normal'}), children=[option_7, option_8, option_9]) +option_8 = ChoiceOption(name='day', doc='day', values=('none', 'daily', 'weekly', 'monthly'), default=Calculation(func.calc_multi_condition, Params((ParamValue("non")), kwargs={'condition_1': ParamOption(option_4, notraisepropertyerror=True, todict=False), 'match': ParamValue("none"), 'mismatch': ParamValue("daily")})), properties=frozenset({'mandatory', 'normal'})) +option_9 = ChoiceOption(name='mode', doc='mode', values=('pre', 'post'), default='pre', properties=frozenset({'mandatory', 'normal'})) +option_6 = OptionDescription(name='ejabberd', doc='ejabberd', children=[option_7, option_8, option_9], properties=frozenset({'normal'})) option_5 = OptionDescription(name='extra', doc='extra', children=[option_6]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_5]) diff --git a/tests/dictionaries/60extra_no_condition/tiramisu/base.py b/tests/dictionaries/60extra_no_condition/tiramisu/base.py index b164aefc..20abe240 100644 --- a/tests/dictionaries/60extra_no_condition/tiramisu/base.py +++ b/tests/dictionaries/60extra_no_condition/tiramisu/base.py @@ -15,11 +15,11 @@ from rougail.tiramisu import ConvertDynOptionDescription option_5 = StrOption(name='module_instancie', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'auto_freeze', 'basic', 'force_store_value', 'mandatory', Calculation(calc_value, Params(ParamValue('auto_frozen'), kwargs={'condition': ParamOption(option_5, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)}))})) option_4 = StrOption(name='activer_ejabberd', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'basic'}), children=[option_3, option_4, option_5]) +option_2 = OptionDescription(name='general', doc='général', children=[option_3, option_4, option_5], properties=frozenset({'basic'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_8 = StrOption(name='description', doc='description', default='Exportation de la base de ejabberd', properties=frozenset({'mandatory', 'normal'})) -option_9 = ChoiceOption(name='day', doc='day', default='none', values=('none', 'daily', 'weekly', 'monthly'), properties=frozenset({'mandatory', 'normal'})) -option_10 = ChoiceOption(name='mode', doc='mode', default='pre', values=('pre', 'post'), properties=frozenset({'mandatory', 'normal'})) -option_7 = OptionDescription(name='ejabberd', doc='ejabberd', properties=frozenset({'normal'}), children=[option_8, option_9, option_10]) +option_9 = ChoiceOption(name='day', doc='day', values=('none', 'daily', 'weekly', 'monthly'), default='none', properties=frozenset({'mandatory', 'normal'})) +option_10 = ChoiceOption(name='mode', doc='mode', values=('pre', 'post'), default='pre', properties=frozenset({'mandatory', 'normal'})) +option_7 = OptionDescription(name='ejabberd', doc='ejabberd', children=[option_8, option_9, option_10], properties=frozenset({'normal'})) option_6 = OptionDescription(name='extra', doc='extra', children=[option_7]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_6]) diff --git a/tests/dictionaries/60extra_redefine/tiramisu/base.py b/tests/dictionaries/60extra_redefine/tiramisu/base.py index eed03b24..4783a5fd 100644 --- a/tests/dictionaries/60extra_redefine/tiramisu/base.py +++ b/tests/dictionaries/60extra_redefine/tiramisu/base.py @@ -14,11 +14,11 @@ except: from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) option_4 = StrOption(name='activer_ejabberd', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3, option_4]) +option_2 = OptionDescription(name='general', doc='général', children=[option_3, option_4], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_7 = StrOption(name='description', doc='description', default='Exportation de la base de ejabberd', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) -option_8 = ChoiceOption(name='day', doc='day', default=Calculation(func.calc_multi_condition, Params((ParamValue("non")), kwargs={'condition_1': ParamOption(option_4, notraisepropertyerror=True, todict=False), 'match': ParamValue("none"), 'mismatch': ParamValue("daily")})), values=('none', 'daily', 'weekly', 'monthly'), properties=frozenset({'mandatory', 'normal'})) -option_9 = ChoiceOption(name='mode', doc='mode', default='pre', values=('pre', 'post'), properties=frozenset({'mandatory', 'normal'})) -option_6 = OptionDescription(name='ejabberd', doc='ejabberd', properties=frozenset({'normal'}), children=[option_7, option_8, option_9]) +option_8 = ChoiceOption(name='day', doc='day', values=('none', 'daily', 'weekly', 'monthly'), default=Calculation(func.calc_multi_condition, Params((ParamValue("non")), kwargs={'condition_1': ParamOption(option_4, notraisepropertyerror=True, todict=False), 'match': ParamValue("none"), 'mismatch': ParamValue("daily")})), properties=frozenset({'mandatory', 'normal'})) +option_9 = ChoiceOption(name='mode', doc='mode', values=('pre', 'post'), default='pre', properties=frozenset({'mandatory', 'normal'})) +option_6 = OptionDescription(name='ejabberd', doc='ejabberd', children=[option_7, option_8, option_9], properties=frozenset({'normal'})) option_5 = OptionDescription(name='extra', doc='extra', children=[option_6]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_5]) diff --git a/tests/dictionaries/60familyaction/tiramisu/base.py b/tests/dictionaries/60familyaction/tiramisu/base.py index 7515aff9..93285a4a 100644 --- a/tests/dictionaries/60familyaction/tiramisu/base.py +++ b/tests/dictionaries/60familyaction/tiramisu/base.py @@ -13,9 +13,9 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3]) +option_2 = OptionDescription(name='general', doc='général', children=[option_3], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_6 = IntOption(name='delay', doc='délai en minutes avant lancement', default=0, properties=frozenset({'mandatory', 'normal'})) -option_5 = OptionDescription(name='test', doc='test', properties=frozenset({'normal'}), children=[option_6]) +option_5 = OptionDescription(name='test', doc='test', children=[option_6], properties=frozenset({'normal'})) option_4 = OptionDescription(name='extra', doc='extra', children=[option_5]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_4]) diff --git a/tests/dictionaries/60familyaction_accent/tiramisu/base.py b/tests/dictionaries/60familyaction_accent/tiramisu/base.py index 7515aff9..93285a4a 100644 --- a/tests/dictionaries/60familyaction_accent/tiramisu/base.py +++ b/tests/dictionaries/60familyaction_accent/tiramisu/base.py @@ -13,9 +13,9 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3]) +option_2 = OptionDescription(name='general', doc='général', children=[option_3], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_6 = IntOption(name='delay', doc='délai en minutes avant lancement', default=0, properties=frozenset({'mandatory', 'normal'})) -option_5 = OptionDescription(name='test', doc='test', properties=frozenset({'normal'}), children=[option_6]) +option_5 = OptionDescription(name='test', doc='test', children=[option_6], properties=frozenset({'normal'})) option_4 = OptionDescription(name='extra', doc='extra', children=[option_5]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_4]) diff --git a/tests/dictionaries/60familyaction_mandatory/tiramisu/base.py b/tests/dictionaries/60familyaction_mandatory/tiramisu/base.py index a11709f7..5c777ecf 100644 --- a/tests/dictionaries/60familyaction_mandatory/tiramisu/base.py +++ b/tests/dictionaries/60familyaction_mandatory/tiramisu/base.py @@ -13,10 +13,10 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3]) +option_2 = OptionDescription(name='general', doc='général', children=[option_3], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_6 = IntOption(name='delay', doc='délai en minutes avant lancement', default=0, properties=frozenset({'mandatory', 'normal'})) option_7 = IntOption(name='day', doc='day avant lancement', properties=frozenset({'basic', 'mandatory'})) -option_5 = OptionDescription(name='test', doc='test', properties=frozenset({'basic'}), children=[option_6, option_7]) +option_5 = OptionDescription(name='test', doc='test', children=[option_6, option_7], properties=frozenset({'basic'})) option_4 = OptionDescription(name='extra', doc='extra', children=[option_5]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_4]) diff --git a/tests/dictionaries/61extra_dyn/tiramisu/base.py b/tests/dictionaries/61extra_dyn/tiramisu/base.py index e1c78cf4..796a9a77 100644 --- a/tests/dictionaries/61extra_dyn/tiramisu/base.py +++ b/tests/dictionaries/61extra_dyn/tiramisu/base.py @@ -12,10 +12,10 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='varname', doc='No change', default=['a'], multi=True, default_multi='a', properties=frozenset({'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3]) +option_3 = StrOption(name='varname', doc='No change', multi=True, default=['a'], default_multi='a', properties=frozenset({'mandatory', 'normal'})) +option_2 = OptionDescription(name='general', doc='général', children=[option_3], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_6 = StrOption(name='mode', doc='mode', properties=frozenset({'normal'})) -option_5 = ConvertDynOptionDescription(name='ejabberd', doc='ejabberd', properties=frozenset({'normal'}), suffixes=Calculation(func.calc_value, Params((ParamOption(option_3)))), children=[option_6]) +option_5 = ConvertDynOptionDescription(name='ejabberd', doc='ejabberd', suffixes=Calculation(func.calc_value, Params((ParamOption(option_3)))), children=[option_6], properties=frozenset({'normal'})) option_4 = OptionDescription(name='extra', doc='extra', children=[option_5]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_4]) diff --git a/tests/dictionaries/61extra_dyn_extra/tiramisu/base.py b/tests/dictionaries/61extra_dyn_extra/tiramisu/base.py index 24b02f90..b49f9b65 100644 --- a/tests/dictionaries/61extra_dyn_extra/tiramisu/base.py +++ b/tests/dictionaries/61extra_dyn_extra/tiramisu/base.py @@ -12,12 +12,12 @@ try: except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription -option_3 = StrOption(name='varname', doc='No change', default=['a'], multi=True, default_multi='a', properties=frozenset({'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3]) +option_3 = StrOption(name='varname', doc='No change', multi=True, default=['a'], default_multi='a', properties=frozenset({'mandatory', 'normal'})) +option_2 = OptionDescription(name='general', doc='général', children=[option_3], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) -option_6 = StrOption(name='varname', doc='No change', default=['a'], multi=True, default_multi='a', properties=frozenset({'mandatory', 'normal'})) -option_5 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_6]) +option_6 = StrOption(name='varname', doc='No change', multi=True, default=['a'], default_multi='a', properties=frozenset({'mandatory', 'normal'})) +option_5 = OptionDescription(name='general', doc='général', children=[option_6], properties=frozenset({'normal'})) option_8 = StrOption(name='mode', doc='mode', properties=frozenset({'normal'})) -option_7 = ConvertDynOptionDescription(name='ejabberd', doc='ejabberd', properties=frozenset({'normal'}), suffixes=Calculation(func.calc_value, Params((ParamOption(option_6)))), children=[option_8]) +option_7 = ConvertDynOptionDescription(name='ejabberd', doc='ejabberd', suffixes=Calculation(func.calc_value, Params((ParamOption(option_6)))), children=[option_8], properties=frozenset({'normal'})) option_4 = OptionDescription(name='extra', doc='extra', children=[option_5, option_7]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_4]) diff --git a/tests/dictionaries/70container_files/tiramisu/base.py b/tests/dictionaries/70container_files/tiramisu/base.py index 2a2a25b9..2da9e578 100644 --- a/tests/dictionaries/70container_files/tiramisu/base.py +++ b/tests/dictionaries/70container_files/tiramisu/base.py @@ -13,7 +13,7 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='oui', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3]) +option_2 = OptionDescription(name='general', doc='général', children=[option_3], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_8 = StrOption(name='group', doc='group', default='root') option_9 = StrOption(name='mode', doc='mode', default='0644') @@ -34,5 +34,5 @@ option_15 = OptionDescription(name='rougail_conf', doc='rougail.conf', children= option_6 = OptionDescription(name='files', doc='files', children=[option_7, option_15]) option_5 = OptionDescription(name='test', doc='test', children=[option_6]) option_5.impl_set_information("manage", True) -option_4 = OptionDescription(name='services', doc='services', properties=frozenset({'hidden'}), children=[option_5]) +option_4 = OptionDescription(name='services', doc='services', children=[option_5], properties=frozenset({'hidden'})) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_4]) diff --git a/tests/dictionaries/70container_files_symlink_multi/tiramisu/base.py b/tests/dictionaries/70container_files_symlink_multi/tiramisu/base.py index 53b1f8ba..ad7e5732 100644 --- a/tests/dictionaries/70container_files_symlink_multi/tiramisu/base.py +++ b/tests/dictionaries/70container_files_symlink_multi/tiramisu/base.py @@ -13,8 +13,8 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='oui', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) -option_4 = StrOption(name='file_name', doc='file_name', default=['/etc/mailname', '/etc/mailname2'], multi=True, default_multi='/etc/mailname2', properties=frozenset({'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3, option_4]) +option_4 = StrOption(name='file_name', doc='file_name', multi=True, default=['/etc/mailname', '/etc/mailname2'], default_multi='/etc/mailname2', properties=frozenset({'mandatory', 'normal'})) +option_2 = OptionDescription(name='general', doc='général', children=[option_3, option_4], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_9 = StrOption(name='group', doc='group', default='root') option_10 = StrOption(name='mode', doc='mode', default='0644') @@ -27,5 +27,5 @@ option_8 = OptionDescription(name='mailname', doc='mailname', children=[option_9 option_7 = OptionDescription(name='files', doc='files', children=[option_8]) option_6 = OptionDescription(name='test', doc='test', children=[option_7]) option_6.impl_set_information("manage", True) -option_5 = OptionDescription(name='services', doc='services', properties=frozenset({'hidden'}), children=[option_6]) +option_5 = OptionDescription(name='services', doc='services', children=[option_6], properties=frozenset({'hidden'})) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_5]) diff --git a/tests/dictionaries/70container_files_symlink_multi_variable/tiramisu/base.py b/tests/dictionaries/70container_files_symlink_multi_variable/tiramisu/base.py index e44239fd..48389ca5 100644 --- a/tests/dictionaries/70container_files_symlink_multi_variable/tiramisu/base.py +++ b/tests/dictionaries/70container_files_symlink_multi_variable/tiramisu/base.py @@ -13,9 +13,9 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='oui', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) -option_4 = StrOption(name='file_name', doc='file_name', default=['/etc/mailname', '/etc/mailname2'], multi=True, default_multi='/etc/mailname2', properties=frozenset({'mandatory', 'normal'})) -option_5 = StrOption(name='var', doc='var', default=['mailname', 'mailname2'], multi=True, default_multi='mailname2', properties=frozenset({'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3, option_4, option_5]) +option_4 = StrOption(name='file_name', doc='file_name', multi=True, default=['/etc/mailname', '/etc/mailname2'], default_multi='/etc/mailname2', properties=frozenset({'mandatory', 'normal'})) +option_5 = StrOption(name='var', doc='var', multi=True, default=['mailname', 'mailname2'], default_multi='mailname2', properties=frozenset({'mandatory', 'normal'})) +option_2 = OptionDescription(name='general', doc='général', children=[option_3, option_4, option_5], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_10 = StrOption(name='group', doc='group', default='root') option_11 = StrOption(name='mode', doc='mode', default='0644') @@ -29,5 +29,5 @@ option_9 = OptionDescription(name='mailname', doc='mailname', children=[option_1 option_8 = OptionDescription(name='files', doc='files', children=[option_9]) option_7 = OptionDescription(name='test', doc='test', children=[option_8]) option_7.impl_set_information("manage", True) -option_6 = OptionDescription(name='services', doc='services', properties=frozenset({'hidden'}), children=[option_7]) +option_6 = OptionDescription(name='services', doc='services', children=[option_7], properties=frozenset({'hidden'})) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_6]) diff --git a/tests/dictionaries/70container_files_symlink_variable/tiramisu/base.py b/tests/dictionaries/70container_files_symlink_variable/tiramisu/base.py index d3741dcd..59e93d28 100644 --- a/tests/dictionaries/70container_files_symlink_variable/tiramisu/base.py +++ b/tests/dictionaries/70container_files_symlink_variable/tiramisu/base.py @@ -15,7 +15,7 @@ from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='oui', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) option_4 = StrOption(name='file_name', doc='file_name', default='/etc/mailname', properties=frozenset({'mandatory', 'normal'})) option_5 = StrOption(name='var', doc='var', default='mailname', properties=frozenset({'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3, option_4, option_5]) +option_2 = OptionDescription(name='general', doc='général', children=[option_3, option_4, option_5], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_10 = StrOption(name='group', doc='group', default='root') option_11 = StrOption(name='mode', doc='mode', default='0644') @@ -29,5 +29,5 @@ option_9 = OptionDescription(name='mailname', doc='mailname', children=[option_1 option_8 = OptionDescription(name='files', doc='files', children=[option_9]) option_7 = OptionDescription(name='test', doc='test', children=[option_8]) option_7.impl_set_information("manage", True) -option_6 = OptionDescription(name='services', doc='services', properties=frozenset({'hidden'}), children=[option_7]) +option_6 = OptionDescription(name='services', doc='services', children=[option_7], properties=frozenset({'hidden'})) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_6]) diff --git a/tests/dictionaries/70container_files_twice/tiramisu/base.py b/tests/dictionaries/70container_files_twice/tiramisu/base.py index 374afb84..f8ce4414 100644 --- a/tests/dictionaries/70container_files_twice/tiramisu/base.py +++ b/tests/dictionaries/70container_files_twice/tiramisu/base.py @@ -13,7 +13,7 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='oui', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3]) +option_2 = OptionDescription(name='general', doc='général', children=[option_3], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_8 = StrOption(name='group', doc='group', default='root') option_9 = StrOption(name='mode', doc='mode', default='0644') @@ -42,5 +42,5 @@ option_23 = OptionDescription(name='rougail_conf', doc='rougail.conf', children= option_6 = OptionDescription(name='files', doc='files', children=[option_7, option_15, option_23]) option_5 = OptionDescription(name='test', doc='test', children=[option_6]) option_5.impl_set_information("manage", True) -option_4 = OptionDescription(name='services', doc='services', properties=frozenset({'hidden'}), children=[option_5]) +option_4 = OptionDescription(name='services', doc='services', children=[option_5], properties=frozenset({'hidden'})) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_4]) diff --git a/tests/dictionaries/70container_filesmulti/tiramisu/base.py b/tests/dictionaries/70container_filesmulti/tiramisu/base.py index 0f9cfa0d..30afa6aa 100644 --- a/tests/dictionaries/70container_filesmulti/tiramisu/base.py +++ b/tests/dictionaries/70container_filesmulti/tiramisu/base.py @@ -13,7 +13,7 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='oui', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3]) +option_2 = OptionDescription(name='general', doc='général', children=[option_3], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_8 = StrOption(name='group', doc='group', default='root') option_9 = StrOption(name='mode', doc='mode', default='0644') @@ -34,5 +34,5 @@ option_15 = OptionDescription(name='mailname2', doc='mailname2', children=[optio option_6 = OptionDescription(name='files', doc='files', children=[option_7, option_15]) option_5 = OptionDescription(name='test', doc='test', children=[option_6]) option_5.impl_set_information("manage", True) -option_4 = OptionDescription(name='services', doc='services', properties=frozenset({'hidden'}), children=[option_5]) +option_4 = OptionDescription(name='services', doc='services', children=[option_5], properties=frozenset({'hidden'})) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_4]) diff --git a/tests/dictionaries/70container_filesredefine/tiramisu/base.py b/tests/dictionaries/70container_filesredefine/tiramisu/base.py index a09960ea..e31a2df0 100644 --- a/tests/dictionaries/70container_filesredefine/tiramisu/base.py +++ b/tests/dictionaries/70container_filesredefine/tiramisu/base.py @@ -13,7 +13,7 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='oui', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3]) +option_2 = OptionDescription(name='general', doc='général', children=[option_3], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_8 = StrOption(name='group', doc='group', default='root') option_9 = StrOption(name='mode', doc='mode', default='0644') @@ -26,5 +26,5 @@ option_7 = OptionDescription(name='mailname_new', doc='mailname.new', children=[ option_6 = OptionDescription(name='files', doc='files', children=[option_7]) option_5 = OptionDescription(name='test', doc='test', children=[option_6]) option_5.impl_set_information("manage", True) -option_4 = OptionDescription(name='services', doc='services', properties=frozenset({'hidden'}), children=[option_5]) +option_4 = OptionDescription(name='services', doc='services', children=[option_5], properties=frozenset({'hidden'})) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_4]) diff --git a/tests/dictionaries/70container_new/tiramisu/base.py b/tests/dictionaries/70container_new/tiramisu/base.py index 3bbada2f..4d646159 100644 --- a/tests/dictionaries/70container_new/tiramisu/base.py +++ b/tests/dictionaries/70container_new/tiramisu/base.py @@ -13,9 +13,9 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='oui', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3]) +option_2 = OptionDescription(name='general', doc='général', children=[option_3], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_5 = OptionDescription(name='test', doc='test', children=[]) option_5.impl_set_information("manage", True) -option_4 = OptionDescription(name='services', doc='services', properties=frozenset({'hidden'}), children=[option_5]) +option_4 = OptionDescription(name='services', doc='services', children=[option_5], properties=frozenset({'hidden'})) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_4]) diff --git a/tests/dictionaries/70container_newnocont/tiramisu/base.py b/tests/dictionaries/70container_newnocont/tiramisu/base.py index 3c8a7a14..955d072d 100644 --- a/tests/dictionaries/70container_newnocont/tiramisu/base.py +++ b/tests/dictionaries/70container_newnocont/tiramisu/base.py @@ -13,9 +13,9 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='non', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3]) +option_2 = OptionDescription(name='general', doc='général', children=[option_3], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_5 = OptionDescription(name='test', doc='test', children=[]) option_5.impl_set_information("manage", True) -option_4 = OptionDescription(name='services', doc='services', properties=frozenset({'hidden'}), children=[option_5]) +option_4 = OptionDescription(name='services', doc='services', children=[option_5], properties=frozenset({'hidden'})) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_4]) diff --git a/tests/dictionaries/70container_newwithip/tiramisu/base.py b/tests/dictionaries/70container_newwithip/tiramisu/base.py index d563f55d..b8d0073d 100644 --- a/tests/dictionaries/70container_newwithip/tiramisu/base.py +++ b/tests/dictionaries/70container_newwithip/tiramisu/base.py @@ -13,10 +13,10 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='oui', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) -option_4 = IPOption(allow_reserved=True, name='adresse_ip_test', doc='No change', properties=frozenset({'normal'})) -option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3, option_4]) +option_4 = IPOption(name='adresse_ip_test', doc='No change', allow_reserved=True, properties=frozenset({'normal'})) +option_2 = OptionDescription(name='general', doc='général', children=[option_3, option_4], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_6 = OptionDescription(name='test', doc='test', children=[]) option_6.impl_set_information("manage", True) -option_5 = OptionDescription(name='services', doc='services', properties=frozenset({'hidden'}), children=[option_6]) +option_5 = OptionDescription(name='services', doc='services', children=[option_6], properties=frozenset({'hidden'})) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_5]) diff --git a/tests/dictionaries/70container_pathaccess/tiramisu/base.py b/tests/dictionaries/70container_pathaccess/tiramisu/base.py index de330436..b9911800 100644 --- a/tests/dictionaries/70container_pathaccess/tiramisu/base.py +++ b/tests/dictionaries/70container_pathaccess/tiramisu/base.py @@ -15,7 +15,7 @@ from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='oui', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) option_4 = NetmaskOption(name='nut_monitor_netmask', doc='Masque de l\'IP du réseau de l\'esclave', properties=frozenset({'basic', 'mandatory'})) option_5 = NetworkOption(name='nut_monitor_host', doc='Adresse IP du réseau de l\'esclave', properties=frozenset({'basic', 'mandatory'})) -option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'basic'}), children=[option_3, option_4, option_5]) +option_2 = OptionDescription(name='general', doc='général', children=[option_3, option_4, option_5], properties=frozenset({'basic'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_10 = StrOption(name='interface', doc='interface', default='auto') option_11 = SymLinkOption(name='name', opt=option_5) @@ -25,5 +25,5 @@ option_9 = OptionDescription(name='nut_monitor_host', doc='nut_monitor_host', ch option_8 = OptionDescription(name='ips', doc='ips', children=[option_9]) option_7 = OptionDescription(name='nut', doc='nut', children=[option_8]) option_7.impl_set_information("manage", True) -option_6 = OptionDescription(name='services', doc='services', properties=frozenset({'hidden'}), children=[option_7]) +option_6 = OptionDescription(name='services', doc='services', children=[option_7], properties=frozenset({'hidden'})) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_6]) diff --git a/tests/dictionaries/70container_pathaccess_leadership/tiramisu/base.py b/tests/dictionaries/70container_pathaccess_leadership/tiramisu/base.py index 79fa9279..4335d7e1 100644 --- a/tests/dictionaries/70container_pathaccess_leadership/tiramisu/base.py +++ b/tests/dictionaries/70container_pathaccess_leadership/tiramisu/base.py @@ -15,8 +15,8 @@ from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='oui', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) option_5 = NetmaskOption(name='nut_monitor_netmask', doc='Masque de l\'IP du réseau de l\'esclave', multi=True, properties=frozenset({'mandatory'})) option_6 = NetworkOption(name='nut_monitor_host', doc='Adresse IP du réseau de l\'esclave', multi=True, properties=frozenset({'basic', 'mandatory'})) -option_4 = Leadership(name='nut_monitor_netmask', doc='Masque de l\'IP du réseau de l\'esclave', properties=frozenset({'basic'}), children=[option_5, option_6]) -option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'basic'}), children=[option_3, option_4]) +option_4 = Leadership(name='nut_monitor_netmask', doc='Masque de l\'IP du réseau de l\'esclave', children=[option_5, option_6], properties=frozenset({'basic'})) +option_2 = OptionDescription(name='general', doc='général', children=[option_3, option_4], properties=frozenset({'basic'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_11 = StrOption(name='interface', doc='interface', default='auto') option_12 = SymLinkOption(name='name', opt=option_6) @@ -26,5 +26,5 @@ option_10 = OptionDescription(name='nut_monitor_host', doc='nut_monitor_host', c option_9 = OptionDescription(name='ips', doc='ips', children=[option_10]) option_8 = OptionDescription(name='ntp', doc='ntp', children=[option_9]) option_8.impl_set_information("manage", True) -option_7 = OptionDescription(name='services', doc='services', properties=frozenset({'hidden'}), children=[option_8]) +option_7 = OptionDescription(name='services', doc='services', children=[option_8], properties=frozenset({'hidden'})) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_7]) diff --git a/tests/dictionaries/70container_save/tiramisu/base.py b/tests/dictionaries/70container_save/tiramisu/base.py index 321b9986..07445812 100644 --- a/tests/dictionaries/70container_save/tiramisu/base.py +++ b/tests/dictionaries/70container_save/tiramisu/base.py @@ -13,6 +13,6 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='oui', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3]) +option_2 = OptionDescription(name='general', doc='général', children=[option_3], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/70container_serviceaccess/tiramisu/base.py b/tests/dictionaries/70container_serviceaccess/tiramisu/base.py index e1cc3c2d..08e83586 100644 --- a/tests/dictionaries/70container_serviceaccess/tiramisu/base.py +++ b/tests/dictionaries/70container_serviceaccess/tiramisu/base.py @@ -13,14 +13,14 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='oui', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3]) +option_2 = OptionDescription(name='general', doc='général', children=[option_3], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) -option_8 = PortOption(allow_private=True, name='name', doc='name', default='123') +option_8 = PortOption(name='name', doc='name', default='123', allow_private=True) option_9 = StrOption(name='protocol', doc='protocol', default='udp') option_10 = BoolOption(name='activate', doc='activate', default=True) option_7 = OptionDescription(name='123', doc='123', children=[option_8, option_9, option_10]) option_6 = OptionDescription(name='ports', doc='ports', children=[option_7]) option_5 = OptionDescription(name='ntp', doc='ntp', children=[option_6]) option_5.impl_set_information("manage", True) -option_4 = OptionDescription(name='services', doc='services', properties=frozenset({'hidden'}), children=[option_5]) +option_4 = OptionDescription(name='services', doc='services', children=[option_5], properties=frozenset({'hidden'})) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_4]) diff --git a/tests/dictionaries/70container_servicerestriction/tiramisu/base.py b/tests/dictionaries/70container_servicerestriction/tiramisu/base.py index 8b6fe0a4..7520904d 100644 --- a/tests/dictionaries/70container_servicerestriction/tiramisu/base.py +++ b/tests/dictionaries/70container_servicerestriction/tiramisu/base.py @@ -13,7 +13,7 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='oui', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3]) +option_2 = OptionDescription(name='general', doc='général', children=[option_3], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_8 = StrOption(name='interface', doc='interface', default='eth0') option_9 = NetworkOption(name='name', doc='name', default='192.168.1.1') @@ -23,5 +23,5 @@ option_7 = OptionDescription(name='192_168_1_1', doc='192.168.1.1', children=[op option_6 = OptionDescription(name='ips', doc='ips', children=[option_7]) option_5 = OptionDescription(name='testsrv', doc='testsrv', children=[option_6]) option_5.impl_set_information("manage", True) -option_4 = OptionDescription(name='services', doc='services', properties=frozenset({'hidden'}), children=[option_5]) +option_4 = OptionDescription(name='services', doc='services', children=[option_5], properties=frozenset({'hidden'})) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_4]) diff --git a/tests/dictionaries/70container_services/tiramisu/base.py b/tests/dictionaries/70container_services/tiramisu/base.py index 899db519..73ff89d3 100644 --- a/tests/dictionaries/70container_services/tiramisu/base.py +++ b/tests/dictionaries/70container_services/tiramisu/base.py @@ -13,9 +13,9 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='oui', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3]) +option_2 = OptionDescription(name='general', doc='général', children=[option_3], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_5 = OptionDescription(name='testsrv', doc='testsrv', children=[]) option_5.impl_set_information("manage", True) -option_4 = OptionDescription(name='services', doc='services', properties=frozenset({'hidden'}), children=[option_5]) +option_4 = OptionDescription(name='services', doc='services', children=[option_5], properties=frozenset({'hidden'})) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_4]) diff --git a/tests/dictionaries/70services_unmanage/tiramisu/base.py b/tests/dictionaries/70services_unmanage/tiramisu/base.py index dccbe3e4..1f860a02 100644 --- a/tests/dictionaries/70services_unmanage/tiramisu/base.py +++ b/tests/dictionaries/70services_unmanage/tiramisu/base.py @@ -13,9 +13,9 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name='mode_conteneur_actif', doc='No change', default='oui', properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'})) -option_2 = OptionDescription(name='general', doc='général', properties=frozenset({'normal'}), children=[option_3]) +option_2 = OptionDescription(name='general', doc='général', children=[option_3], properties=frozenset({'normal'})) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_5 = OptionDescription(name='testsrv', doc='testsrv', children=[]) option_5.impl_set_information("manage", False) -option_4 = OptionDescription(name='services', doc='services', properties=frozenset({'hidden'}), children=[option_5]) +option_4 = OptionDescription(name='services', doc='services', children=[option_5], properties=frozenset({'hidden'})) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1, option_4])