diff --git a/src/rougail/annotator.py b/src/rougail/annotator.py
index a3f6ff1a..d374d4e6 100644
--- a/src/rougail/annotator.py
+++ b/src/rougail/annotator.py
@@ -39,7 +39,7 @@ modes = mode_factory()
# that shall not be present in the exported (flatened) XML
ERASED_ATTRIBUTES = ('redefine', 'exists', 'fallback', 'optional', 'remove_check', 'namespace',
'remove_condition', 'path', 'instance_mode', 'index', 'is_in_leadership',
- 'level', 'submulti') # , '_real_container')
+ 'level') # , '_real_container')
ERASED_CONTAINER_ATTRIBUTES = ('id', 'container', 'group_id', 'group', 'container_group')
FORCE_CHOICE = {'oui/non': ['oui', 'non'],
@@ -405,9 +405,6 @@ class SpaceAnnotator(object):
if leader_is_hidden:
variable.frozen = True
variable.force_default_on_freeze = True
- # followers are multi
- if not variable.multi:
- raise CreoleDictConsistencyError(_('the variable {} in a group must be multi or submulti').format(variable.name))
leader_space.variable.append(variable) # pylint: disable=E1101
self.paths.set_leader(namespace,
leader_family_name,
@@ -534,8 +531,6 @@ class SpaceAnnotator(object):
variable.type = 'string'
if variable.type != 'symlink' and not hasattr(variable, 'description'):
variable.description = variable.name
- if variable.submulti:
- variable.multi = 'submulti'
def convert_auto_freeze(self): # pylint: disable=C0111
if hasattr(self.space, 'variables'):
@@ -732,21 +727,21 @@ class SpaceAnnotator(object):
del self.space.constraints.fill
def filter_separators(self): # pylint: disable=C0111,R0201
- # FIXME devrait etre dans la variable
if not hasattr(self.space, 'variables'):
return
for family in self.space.variables.values():
- if (hasattr(family, 'separators') and hasattr(family.separators, 'separator')):
- space = family.separators.separator
- names = []
- for idx, separator in enumerate(space):
- namespace = self.paths.get_variable_namespace(separator.name)
- subpath = self.paths.get_variable_path(separator.name, namespace)
- separator.name = subpath
- if separator.name in names:
- raise CreoleDictConsistencyError(_('{} already has a separator').format(separator.name))
- names.append(separator.name)
-
+ if not hasattr(family, 'separators'):
+ continue
+ if hasattr(family.separators, 'separator'):
+ for idx, separator in enumerate(family.separators.separator):
+ option = self.paths.get_variable_obj(separator.name)
+ if hasattr(option, 'separator'):
+ subpath = self.paths.get_variable_path(separator.name,
+ separator.namespace,
+ )
+ raise CreoleDictConsistencyError(_('{} already has a separator').format(subpath))
+ option.separator = separator.text
+ del family.separators
def load_params_in_validenum(self, param):
if param.type in ['string', 'python', 'number']:
diff --git a/src/rougail/data/rougail.dtd b/src/rougail/data/rougail.dtd
index f82d452f..ee609232 100644
--- a/src/rougail/data/rougail.dtd
+++ b/src/rougail/data/rougail.dtd
@@ -101,7 +101,6 @@
-
diff --git a/src/rougail/loader.py b/src/rougail/loader.py
index bff28aeb..50ffe570 100644
--- a/src/rougail/loader.py
+++ b/src/rougail/loader.py
@@ -20,7 +20,6 @@ from .error import CreoleLoaderError
FUNC_TO_DICT = ['valid_not_equal']
-KNOWN_TAGS = ['family', 'variable', 'separators', 'leader', 'property']
class ConvertDynOptionDescription(DynOptionDescription):
@@ -31,22 +30,22 @@ class ConvertDynOptionDescription(DynOptionDescription):
check_name=False)
-def convert_tiramisu_value(value, obj):
+def convert_boolean(value):
+ prop = {'True': True,
+ 'False': False,
+ 'None': None}
+ if value not in prop:
+ raise Exception('unknown value {} while trying to cast {} to boolean'.format(value, obj))
+ return prop[value]
+
+
+def convert_tiramisu_value(value, type_):
"""
convertit les variables dans le bon type si nécessaire
"""
- def _convert_boolean(value):
- prop = {'True': True,
- 'False': False,
- 'None': None}
- if value not in prop:
- raise Exception('unknown value {} while trying to cast {} to boolean'.format(value, obj))
- return prop[value]
-
if value is None:
return value
- func = {IntOption: int,
- BoolOption: _convert_boolean}.get(obj, None)
+ func = CONVERT_OPTION[type_].get('func', None)
if func is None:
return value
if isinstance(value, list):
@@ -55,12 +54,12 @@ def convert_tiramisu_value(value, obj):
return func(value)
-CONVERT_OPTION = {'number': dict(opttype=IntOption),
+CONVERT_OPTION = {'number': dict(opttype=IntOption, func=int),
'choice': dict(opttype=ChoiceOption),
'string': dict(opttype=StrOption),
'password': dict(opttype=PasswordOption),
'mail': dict(opttype=EmailOption),
- 'boolean': dict(opttype=BoolOption, initkwargs={'default': True}),
+ 'boolean': dict(opttype=BoolOption, initkwargs={'default': True}, func=convert_boolean),
'symlink': dict(opttype=SymLinkOption),
'filename': dict(opttype=FilenameOption),
'date': dict(opttype=DateOption),
@@ -83,11 +82,37 @@ CONVERT_OPTION = {'number': dict(opttype=IntOption),
}
-class Elt:
+class BaseElt:
def __init__(self, attrib):
self.attrib = attrib
+class Common:
+ def populate_properties(self, child):
+ if child.get('type') == 'calculation':
+ kwargs = {'condition': child.attrib['source'],
+ 'expected': ParamValue(child.attrib.get('expected'))}
+ if child.attrib['inverse'] == 'True':
+ kwargs['reverse_condition'] = ParamValue(True)
+ self.attrib['properties'].append((ParamValue(child.text), kwargs))
+ else:
+ self.attrib['properties'].append(child.text)
+
+ def build_properties(self):
+ for index, prop in enumerate(self.attrib['properties']):
+ if isinstance(prop, tuple):
+ action, kwargs = prop
+ kwargs['condition'] = ParamOption(self.storage.get(kwargs['condition']).get(), todict=True)
+ prop = Calculation(calc_value,
+ Params(action,
+ kwargs=kwargs))
+ self.attrib['properties'][index] = prop
+ if self.attrib['properties']:
+ self.attrib['properties'] = tuple(self.attrib['properties'])
+ else:
+ del self.attrib['properties']
+
+
class PopulateTiramisuObjects:
def __init__(self):
self.storage = ElementStorage()
@@ -110,9 +135,19 @@ class PopulateTiramisuObjects:
if set(attr.itervalues()) == set(['True', 'False']):
self.booleans.append(attr.name)
+ def make_tiramisu_objects(self, xmlroot, eosfunc):
+ self.eosfunc = imp.load_source('eosfunc', eosfunc)
+
+ family = self.get_root_family()
+ for xmlelt in self.reorder_family(xmlroot):
+ self.iter_family(xmlelt,
+ family,
+ None,
+ )
+
def get_root_family(self):
- family = Family(Elt({'name': 'baseoption',
- 'doc': 'baseoption'}),
+ family = Family(BaseElt({'name': 'baseoption',
+ 'doc': 'baseoption'}),
self.booleans,
self.storage,
self.eosfunc,
@@ -131,36 +166,24 @@ class PopulateTiramisuObjects:
xmlelts.append(xmlelt)
return xmlelts
- def make_tiramisu_objects(self, xmlroot, eosfunc):
- self.eosfunc = imp.load_source('eosfunc', eosfunc)
-
- family = self.get_root_family()
- for xmlelt in self.reorder_family(xmlroot):
- self.iter_family(xmlelt,
- family,
- None,
- )
-
def iter_family(self,
child,
family,
subpath,
):
- if child.tag not in KNOWN_TAGS:
- raise CreoleLoaderError(_('unknown tag {}').format(child.tag))
if child.tag in ['family', 'leader']:
- self.populate_family(family,
- child,
- subpath,
- )
- elif child.tag == 'separators':
- self.parse_separators(child)
+ function = self.populate_family
elif child.tag == 'variable':
- self.populate_variable(child, subpath, family)
+ function = self.populate_variable
elif child.tag == 'property':
- self.parse_properties(family, child)
+ # property already imported with family
+ return
else:
raise Exception('unknown tag {}'.format(child.tag))
+ function(family,
+ child,
+ subpath,
+ )
def populate_family(self,
parent_family,
@@ -174,10 +197,9 @@ class PopulateTiramisuObjects:
self.booleans,
self.storage,
self.eosfunc,
+ elt.tag == 'leader',
)
self.storage.add(path, family)
- if elt.tag == 'leader':
- family.set_leader()
parent_family.add(family)
if len(elt) != 0:
for child in elt:
@@ -186,14 +208,11 @@ class PopulateTiramisuObjects:
path,
)
- def parse_separators(self,
- separators,
- ):
- for separator in separators:
- elt = self.storage.get(separator.attrib['name'])
- elt.add_information('separator', separator.text)
-
- def populate_variable(self, elt, subpath, family):
+ def populate_variable(self,
+ family,
+ elt,
+ subpath,
+ ):
is_follower = False
is_leader = False
if family.is_leader:
@@ -214,16 +233,6 @@ class PopulateTiramisuObjects:
self.storage.add(path, variable)
family.add(variable)
- def parse_properties(self, family, child):
- if child.get('type') == 'calculation':
- kwargs = {'condition': child.attrib['source'],
- 'expected': ParamValue(child.attrib.get('expected'))}
- if child.attrib['inverse'] == 'True':
- kwargs['reverse_condition'] = ParamValue(True)
- family.attrib['properties'].append((ParamValue(child.text), kwargs))
- else:
- family.attrib['properties'].append(child.text)
-
def build_path(self,
subpath,
elt,
@@ -248,22 +257,6 @@ class ElementStorage:
return self.paths[path]
-class Common:
- def build_properties(self):
- for index, prop in enumerate(self.attrib['properties']):
- if isinstance(prop, tuple):
- action, kwargs = prop
- kwargs['condition'] = ParamOption(self.storage.get(kwargs['condition']).get(), todict=True)
- prop = Calculation(calc_value,
- Params(action,
- kwargs=kwargs))
- self.attrib['properties'][index] = prop
- if self.attrib['properties']:
- self.attrib['properties'] = tuple(self.attrib['properties'])
- else:
- del self.attrib['properties']
-
-
class Variable(Common):
def __init__(self, elt, booleans, storage, is_follower, is_leader, eosfunc):
self.option = None
@@ -282,185 +275,183 @@ class Variable(Common):
self.is_follower = is_follower
self.is_leader = is_leader
self.object_type = convert_option['opttype']
- self.populate_choice(elt)
- for child in elt:
- self.populate_property(child)
- self.populate_value(child)
- self.populate_check(child)
+ if 'multi' in self.attrib and self.attrib['multi']:
+ self.attrib['default'] = []
+ if self.is_follower:
+ self.attrib['default_multi'] = []
+ self.parse_children(elt)
+ if self.is_follower:
+ if self.attrib['multi'] is True:
+ self.attrib['multi'] = submulti
+ else:
+ self.attrib['multi'] = True
if elt.attrib['type'] == 'symlink':
self.attrib['opt'] = storage.get(self.attrib['opt'])
+ def parse_children(self,
+ elt,
+ ):
+ if elt.attrib['type'] == 'choice':
+ values = []
+ for child in elt:
+ if child.tag == 'property':
+ self.populate_properties(child)
+ elif child.tag == 'value':
+ if child.attrib.get('type') == 'calculation':
+ self.calc_value(child)
+ else:
+ self.populate_value(child, elt)
+ elif child.tag == 'check':
+ self.populate_check(child)
+ elif child.tag == 'choice':
+ value = child.text
+ if child.attrib['type'] == 'number':
+ value = int(value)
+ values.append(value)
+ if elt.attrib['type'] == 'choice':
+ self.attrib['values'] = tuple(values)
+
def populate_attrib(self,
elt,
):
for key, value in elt.attrib.items():
if key == 'multi' and elt.attrib['type'] == 'symlink':
continue
- if key == 'multi' and value == 'submulti':
- value = submulti
- elif key in self.booleans:
+ if key in self.booleans:
if value == 'True':
value = True
elif value == 'False':
value = False
else:
raise CreoleLoaderError(_('unknown value {} for {}').format(value, key))
- if key in ['help', 'test']:
+ if key in ['help', 'test', 'separator']:
self.add_information(key, value)
elif key != 'type':
self.attrib[key] = value
- def populate_choice(self,
- elt,
- ):
- if elt.attrib['type'] == 'choice':
- values = []
- for child in elt:
- if child.tag == 'choice':
- value = child.text
- if child.attrib['type'] == 'number':
- value = int(value)
- values.append(value)
- self.attrib['values'] = tuple(values)
+ def calc_value(self, child):
+ args = []
+ kwargs = {}
+ if child.text is not None and child.text.strip():
+ function = child.text.strip()
+ else:
+ function = child.attrib['name']
+ for param in child:
+ self.parse_param(args,
+ kwargs,
+ param,
+ )
+ self.attrib['default'] = {'function': getattr(self.eosfunc, function),
+ 'args': args,
+ 'kwargs': kwargs,
+ 'warnings_only': False}
- def populate_property(self, child):
- if child.tag == 'property':
- if child.get('type') == 'calculation':
- kwargs = {'condition': child.attrib['source'],
- 'expected': ParamValue(child.attrib.get('expected'))}
- if child.attrib['inverse'] == 'True':
- kwargs['reverse_condition'] = ParamValue(True)
- self.attrib['properties'].append((ParamValue(child.text), kwargs))
+ def populate_value(self, child, elt):
+ if "type" in child.attrib:
+ type_ = child.attrib['type']
+ else:
+ type_ = elt.attrib['type']
+ value = convert_tiramisu_value(child.text, type_)
+ if self.is_follower:
+ if self.attrib['multi'] is True:
+ self.attrib['default_multi'].append(value)
else:
- self.attrib['properties'].append(child.text)
-
- def populate_value(self, child):
- if child.tag == 'value':
- if child.attrib.get('type') == 'calculation':
- if child.text is not None and child.text.strip():
- self.attrib['default'] = (child.text.strip(),)
- else:
- params = []
- for param in child:
- params.append(self.parse_param(param))
- self.attrib['default'] = (child.attrib['name'], params, False)
- else:
- if "type" in child.attrib:
- type_ = CONVERT_OPTION[child.attrib['type']]['opttype']
- else:
- type_ = self.object_type
- if self.attrib['multi'] is True and not self.is_follower:
- if 'default' not in self.attrib:
- self.attrib['default'] = []
- value = convert_tiramisu_value(child.text, type_)
- self.attrib['default'].append(value)
- if 'default_multi' not in self.attrib and not self.is_leader:
- self.attrib['default_multi'] = value
- elif self.attrib['multi'] == submulti:
- if 'default' not in self.attrib:
- self.attrib['default'] = []
- value = convert_tiramisu_value(child.text, type_)
- if not self.is_follower:
- if not isinstance(value, list):
- dvalue = [value]
- else:
- dvalue = value
- self.attrib['default'].append(dvalue)
- if value and 'default_multi' not in self.attrib and not self.is_leader:
- self.attrib['default_multi'] = []
- if not self.is_leader:
- self.attrib['default_multi'].append(value)
- else:
- value = convert_tiramisu_value(child.text, type_)
- if self.is_follower:
- self.attrib['default_multi'] = value
- else:
- self.attrib['default'] = value
+ self.attrib['default_multi'] = value
+ elif self.attrib['multi'] is True:
+ self.attrib['default'].append(value)
+ if not self.is_leader:
+ self.attrib['default_multi'] = value
+ else:
+ self.attrib['default'] = value
def populate_check(self, child):
- if child.tag == 'check':
- params = []
- for param in child:
- params.append(self.parse_param(param))
- #check.params = params
- self.attrib['validators'].append((child.attrib['name'], params, child.attrib['warnings_only']))
+ args = [ParamSelfOption()]
+ kwargs = {}
+ for param in child:
+ self.parse_param(args,
+ kwargs,
+ param,
+ )
+ self.attrib['validators'].append({'function': getattr(self.eosfunc, child.attrib['name']),
+ 'args': args,
+ 'kwargs': kwargs,
+ 'warnings_only': convert_boolean(child.attrib['warnings_only'])})
- def parse_param(self, param):
- name = param.attrib.get('name', '')
+ def parse_param(self,
+ args,
+ kwargs,
+ param,
+ ):
if param.attrib['type'] == 'string':
- value = param.text
- elif param.attrib['type'] == 'variable':
- transitive = param.attrib.get('transitive', 'False')
- if transitive == 'True':
- transitive = True
- elif transitive == 'False':
- transitive = False
- else:
- raise CreoleLoaderError(_('unknown transitive boolean {}').format(transitive))
- value = [param.text, transitive, param.attrib.get('suffix')]
+ value = ParamValue(param.text)
elif param.attrib['type'] == 'number':
- value = int(param.text)
+ value = ParamValue(int(param.text))
+ elif param.attrib['type'] == 'variable':
+ transitive = convert_boolean(param.attrib.get('transitive', 'False'))
+ value = {'option': param.text,
+ 'notraisepropertyerror': transitive,
+ 'todict': param.text in FUNC_TO_DICT,
+ }
+ if 'suffix' in param.attrib:
+ value['suffix'] = param.attrib['suffix']
else:
raise CreoleLoaderError(_('unknown param type {}').format(param.attrib['type']))
- return(name, value)
+ if 'name' not in param.attrib:
+ args.append(value)
+ else:
+ kwargs[param.attrib['name']] = value
+
+ def build_calculator(self, key):
+ def build_param(param):
+ option = self.storage.get(param['option']).get()
+ if 'suffix' in param:
+ family = '.'.join(param['option'].split('.')[:-1])
+ return ParamDynOption(option,
+ param['suffix'],
+ self.storage.get(family).get(),
+ notraisepropertyerror=param['notraisepropertyerror'],
+ todict=param['todict'],
+ )
+ return ParamOption(option,
+ notraisepropertyerror=param['notraisepropertyerror'],
+ todict=param['todict'],
+ )
+ return param
+ def build_calculation(value):
+ args = []
+ kwargs = {}
+ for param in value['args']:
+ if isinstance(param, dict):
+ param = build_param(param)
+ args.append(param)
+ for key, param in value['kwargs'].items():
+ if isinstance(param, dict):
+ param = build_param(param)
+ kwargs[key] = param
+ return Calculation(value['function'],
+ Params(tuple(args),
+ kwargs=kwargs,
+ ),
+ warnings_only=value['warnings_only'],
+ )
+ if key in self.attrib:
+ values = self.attrib[key]
+ if isinstance(values, list):
+ self.attrib[key] = []
+ for value in values:
+ if isinstance(value, dict):
+ value = build_calculation(value)
+ self.attrib[key].append(value)
+ else:
+ if isinstance(values, dict):
+ values = build_calculation(values)
+ self.attrib[key] = values
def add_information(self, key, value):
if key in self.informations:
raise CreoleLoaderError(_('key already exists in information {}').format(key))
self.informations[key] = value
- def build_calculator(self, key):
- if key in self.attrib:
- values = self.attrib[key]
- if isinstance(values, list):
- is_list = True
- else:
- is_list = False
- values = [values]
- ret = []
- for value in values:
- if isinstance(value, tuple):
- if key == 'validators':
- args = [ParamSelfOption()]
- else:
- args = []
- kwargs = {}
- if len(value) == 3:
- for param in value[1]:
- if isinstance(param[1], list):
- option = self.storage.get(param[1][0]).get()
- param_kwargs = {'notraisepropertyerror': param[1][1]}
- if value[0] in FUNC_TO_DICT:
- param_kwargs['todict'] = True
- if not param[1][2]:
- param_value = ParamOption(option,
- **param_kwargs,
- )
- else:
- family = '.'.join(param[1][0].split('.', 3)[:2])
- param_value = ParamDynOption(option,
- param[1][2],
- self.storage.get(family).get(),
- **param_kwargs,
- )
- else:
- param_value = ParamValue(param[1])
- if not param[0]:
- args.append(param_value)
- else:
- kwargs[param[0]] = param_value
-
- ret.append(Calculation(getattr(self.eosfunc, value[0]),
- Params(tuple(args),
- kwargs=kwargs)))
- else:
- ret.append(value)
- if not is_list:
- self.attrib[key] = ret[0]
- else:
- self.attrib[key] = ret
-
-
def get(self):
if self.option is None:
if self.object_type is SymLinkOption:
@@ -490,6 +481,7 @@ class Family(Common):
booleans,
storage,
eosfunc,
+ is_leader=False,
):
self.option = None
self.attrib = {}
@@ -504,6 +496,11 @@ class Family(Common):
self.add_information(key, value)
else:
self.attrib[key] = value
+ if not isinstance(elt, BaseElt) and len(elt) != 0:
+ for child in elt:
+ if child.tag == 'property':
+ self.populate_properties(child)
+ self.is_leader = is_leader
def add(self, child):
self.children.append(child)
@@ -513,9 +510,6 @@ class Family(Common):
raise CreoleLoaderError(_('key already exists in information {}').format(key))
self.informations[key] = value
- def set_leader(self):
- self.is_leader = True
-
def get(self):
if self.option is None:
self.attrib['children'] = []
diff --git a/src/rougail/objspace.py b/src/rougail/objspace.py
index 553e664f..eaacb9ea 100644
--- a/src/rougail/objspace.py
+++ b/src/rougail/objspace.py
@@ -38,7 +38,7 @@ FORCE_REDEFINABLES = ('family', 'follower', 'service', 'disknod', 'variables')
# CreoleObjSpace's elements that shall be forced to the UnRedefinable type
FORCE_UNREDEFINABLES = ('value',)
# CreoleObjSpace's elements that shall be set to the UnRedefinable type
-UNREDEFINABLE = ('submulti', 'multi', 'type')
+UNREDEFINABLE = ('multi', 'type')
PROPERTIES = ('hidden', 'frozen', 'auto_freeze', 'auto_save', 'force_default_on_freeze',
'force_store_value', 'disabled', 'mandatory')
@@ -46,17 +46,14 @@ CONVERT_PROPERTIES = {'auto_save': ['force_store_value'], 'auto_freeze': ['force
RENAME_ATTIBUTES = {'description': 'doc'}
-INCOMPATIBLE_ATTRIBUTES = [['multi', 'submulti']]
FORCED_TEXT_ELTS_AS_NAME = ('choice', 'property', 'value', 'target')
CONVERT_EXPORT = {'Leadership': 'leader',
- 'Separators': 'separators',
'Variable': 'variable',
'Value': 'value',
'Property': 'property',
'Choice': 'choice',
'Param': 'param',
- 'Separator': 'separator',
'Check': 'check',
}
@@ -461,13 +458,6 @@ class CreoleObjSpace:
if not (attr == 'name' and getattr(variableobj, 'name', None) != None):
setattr(variableobj, attr, val)
keys = list(vars(variableobj).keys())
- for incompatible in INCOMPATIBLE_ATTRIBUTES:
- found = False
- for inc in incompatible:
- if inc in keys:
- if found:
- raise CreoleDictConsistencyError(_('those attributes are incompatible {}').format(incompatible))
- found = True
def variableobj_tree_visitor(self,
child,
diff --git a/tests/flattener_dicos/00load_autofreeze/result/00-base.xml b/tests/flattener_dicos/00load_autofreeze/result/00-base.xml
index d1b67266..1e95a527 100644
--- a/tests/flattener_dicos/00load_autofreeze/result/00-base.xml
+++ b/tests/flattener_dicos/00load_autofreeze/result/00-base.xml
@@ -21,6 +21,5 @@
non
-
diff --git a/tests/flattener_dicos/00load_autofreezeexpert/result/00-base.xml b/tests/flattener_dicos/00load_autofreezeexpert/result/00-base.xml
index 519f4a26..91f77baf 100644
--- a/tests/flattener_dicos/00load_autofreezeexpert/result/00-base.xml
+++ b/tests/flattener_dicos/00load_autofreezeexpert/result/00-base.xml
@@ -21,6 +21,5 @@
non
-
diff --git a/tests/flattener_dicos/00load_autosave/result/00-base.xml b/tests/flattener_dicos/00load_autosave/result/00-base.xml
index 7fe1d9d3..5c51a31c 100644
--- a/tests/flattener_dicos/00load_autosave/result/00-base.xml
+++ b/tests/flattener_dicos/00load_autosave/result/00-base.xml
@@ -12,6 +12,5 @@
non
-
diff --git a/tests/flattener_dicos/00load_autosaveexpert/result/00-base.xml b/tests/flattener_dicos/00load_autosaveexpert/result/00-base.xml
index 37e2ae13..bb0c51ce 100644
--- a/tests/flattener_dicos/00load_autosaveexpert/result/00-base.xml
+++ b/tests/flattener_dicos/00load_autosaveexpert/result/00-base.xml
@@ -12,6 +12,5 @@
non
-
diff --git a/tests/flattener_dicos/00load_comment/result/00-base.xml b/tests/flattener_dicos/00load_comment/result/00-base.xml
index 3edfdc1b..3a7315b1 100644
--- a/tests/flattener_dicos/00load_comment/result/00-base.xml
+++ b/tests/flattener_dicos/00load_comment/result/00-base.xml
@@ -14,6 +14,5 @@
non
-
diff --git a/tests/flattener_dicos/00load_notype/result/00-base.xml b/tests/flattener_dicos/00load_notype/result/00-base.xml
index 2d6a3dfe..795fecab 100644
--- a/tests/flattener_dicos/00load_notype/result/00-base.xml
+++ b/tests/flattener_dicos/00load_notype/result/00-base.xml
@@ -19,6 +19,5 @@
non
-
diff --git a/tests/flattener_dicos/00load_save/result/00-base.xml b/tests/flattener_dicos/00load_save/result/00-base.xml
index 3edfdc1b..3a7315b1 100644
--- a/tests/flattener_dicos/00load_save/result/00-base.xml
+++ b/tests/flattener_dicos/00load_save/result/00-base.xml
@@ -14,6 +14,5 @@
non
-
diff --git a/tests/flattener_dicos/00load_subfolder/result/00-base.xml b/tests/flattener_dicos/00load_subfolder/result/00-base.xml
index 884404d2..8b6bb1fa 100644
--- a/tests/flattener_dicos/00load_subfolder/result/00-base.xml
+++ b/tests/flattener_dicos/00load_subfolder/result/00-base.xml
@@ -24,6 +24,5 @@
non
-
diff --git a/tests/flattener_dicos/01auto_base/result/00-base.xml b/tests/flattener_dicos/01auto_base/result/00-base.xml
index b3c10f27..67ef68fc 100644
--- a/tests/flattener_dicos/01auto_base/result/00-base.xml
+++ b/tests/flattener_dicos/01auto_base/result/00-base.xml
@@ -23,6 +23,5 @@
non
-
diff --git a/tests/flattener_dicos/01auto_withoutparam/result/00-base.xml b/tests/flattener_dicos/01auto_withoutparam/result/00-base.xml
index 28597e3b..99648c2d 100644
--- a/tests/flattener_dicos/01auto_withoutparam/result/00-base.xml
+++ b/tests/flattener_dicos/01auto_withoutparam/result/00-base.xml
@@ -21,6 +21,5 @@
non
-
diff --git a/tests/flattener_dicos/01base_multi/result/00-base.xml b/tests/flattener_dicos/01base_multi/result/00-base.xml
index 10e2c3e8..1568579b 100644
--- a/tests/flattener_dicos/01base_multi/result/00-base.xml
+++ b/tests/flattener_dicos/01base_multi/result/00-base.xml
@@ -14,6 +14,5 @@
non
-
diff --git a/tests/flattener_dicos/01base_submulti/makedict/base.json b/tests/flattener_dicos/01base_submulti/makedict/base.json
deleted file mode 100644
index 62e28070..00000000
--- a/tests/flattener_dicos/01base_submulti/makedict/base.json
+++ /dev/null
@@ -1 +0,0 @@
-{"rougail.general.mode_conteneur_actif": [["non"]]}
diff --git a/tests/flattener_dicos/01base_submulti/result/00-base.xml b/tests/flattener_dicos/01base_submulti/result/00-base.xml
deleted file mode 100644
index fb143afe..00000000
--- a/tests/flattener_dicos/01base_submulti/result/00-base.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
- normal
-
- oui
- non
- force_default_on_freeze
- frozen
- hidden
- mandatory
- normal
- non
-
-
-
-
-
diff --git a/tests/flattener_dicos/01fill_autofreeze/result/00-base.xml b/tests/flattener_dicos/01fill_autofreeze/result/00-base.xml
index 952d6c0b..296660a5 100644
--- a/tests/flattener_dicos/01fill_autofreeze/result/00-base.xml
+++ b/tests/flattener_dicos/01fill_autofreeze/result/00-base.xml
@@ -30,6 +30,5 @@
non
-
diff --git a/tests/flattener_dicos/01fill_autosave/result/00-base.xml b/tests/flattener_dicos/01fill_autosave/result/00-base.xml
index 15d3dae7..6b0ddc3e 100644
--- a/tests/flattener_dicos/01fill_autosave/result/00-base.xml
+++ b/tests/flattener_dicos/01fill_autosave/result/00-base.xml
@@ -21,6 +21,5 @@
non
-
diff --git a/tests/flattener_dicos/01fill_base/result/00-base.xml b/tests/flattener_dicos/01fill_base/result/00-base.xml
index b3c10f27..67ef68fc 100644
--- a/tests/flattener_dicos/01fill_base/result/00-base.xml
+++ b/tests/flattener_dicos/01fill_base/result/00-base.xml
@@ -23,6 +23,5 @@
non
-
diff --git a/tests/flattener_dicos/01fill_baseaccent/result/00-base.xml b/tests/flattener_dicos/01fill_baseaccent/result/00-base.xml
index 29705f43..d6eb03d7 100644
--- a/tests/flattener_dicos/01fill_baseaccent/result/00-base.xml
+++ b/tests/flattener_dicos/01fill_baseaccent/result/00-base.xml
@@ -23,6 +23,5 @@
non
-
diff --git a/tests/flattener_dicos/01fill_mandatory/result/00-base.xml b/tests/flattener_dicos/01fill_mandatory/result/00-base.xml
index 5cfedcb0..f6ac60e7 100644
--- a/tests/flattener_dicos/01fill_mandatory/result/00-base.xml
+++ b/tests/flattener_dicos/01fill_mandatory/result/00-base.xml
@@ -18,6 +18,5 @@
non
-
diff --git a/tests/flattener_dicos/01fill_number/result/00-base.xml b/tests/flattener_dicos/01fill_number/result/00-base.xml
index 40d21e31..e4a5a533 100644
--- a/tests/flattener_dicos/01fill_number/result/00-base.xml
+++ b/tests/flattener_dicos/01fill_number/result/00-base.xml
@@ -21,6 +21,5 @@
non
-
diff --git a/tests/flattener_dicos/01fill_optional/result/00-base.xml b/tests/flattener_dicos/01fill_optional/result/00-base.xml
index b3c10f27..67ef68fc 100644
--- a/tests/flattener_dicos/01fill_optional/result/00-base.xml
+++ b/tests/flattener_dicos/01fill_optional/result/00-base.xml
@@ -23,6 +23,5 @@
non
-
diff --git a/tests/flattener_dicos/01separator_base/result/00-base.xml b/tests/flattener_dicos/01separator_base/result/00-base.xml
index 87cfeb7a..82679057 100644
--- a/tests/flattener_dicos/01separator_base/result/00-base.xml
+++ b/tests/flattener_dicos/01separator_base/result/00-base.xml
@@ -3,7 +3,7 @@
normal
-
+
oui
non
force_default_on_freeze
@@ -14,8 +14,5 @@
non
-
- Établissement
-
diff --git a/tests/flattener_dicos/01separator_neverhidden/result/00-base.xml b/tests/flattener_dicos/01separator_neverhidden/result/00-base.xml
index 87cfeb7a..82679057 100644
--- a/tests/flattener_dicos/01separator_neverhidden/result/00-base.xml
+++ b/tests/flattener_dicos/01separator_neverhidden/result/00-base.xml
@@ -3,7 +3,7 @@
normal
-
+
oui
non
force_default_on_freeze
@@ -14,8 +14,5 @@
non
-
- Établissement
-
diff --git a/tests/flattener_dicos/10autosave_hidden/result/00-base.xml b/tests/flattener_dicos/10autosave_hidden/result/00-base.xml
index ed9c9aed..f7cc2bbe 100644
--- a/tests/flattener_dicos/10autosave_hidden/result/00-base.xml
+++ b/tests/flattener_dicos/10autosave_hidden/result/00-base.xml
@@ -24,6 +24,5 @@
-
diff --git a/tests/flattener_dicos/10autosave_hidden_frozenifin/result/00-base.xml b/tests/flattener_dicos/10autosave_hidden_frozenifin/result/00-base.xml
index 6c311da8..da350932 100644
--- a/tests/flattener_dicos/10autosave_hidden_frozenifin/result/00-base.xml
+++ b/tests/flattener_dicos/10autosave_hidden_frozenifin/result/00-base.xml
@@ -25,6 +25,5 @@
-
diff --git a/tests/flattener_dicos/10check_base/result/00-base.xml b/tests/flattener_dicos/10check_base/result/00-base.xml
index f26bd8b5..b0fdf191 100644
--- a/tests/flattener_dicos/10check_base/result/00-base.xml
+++ b/tests/flattener_dicos/10check_base/result/00-base.xml
@@ -16,6 +16,5 @@
normal
-
diff --git a/tests/flattener_dicos/10check_option/result/00-base.xml b/tests/flattener_dicos/10check_option/result/00-base.xml
index cbf1f6d5..587553e3 100644
--- a/tests/flattener_dicos/10check_option/result/00-base.xml
+++ b/tests/flattener_dicos/10check_option/result/00-base.xml
@@ -21,6 +21,5 @@
normal
-
diff --git a/tests/flattener_dicos/10check_optional/result/00-base.xml b/tests/flattener_dicos/10check_optional/result/00-base.xml
index 6ada4219..5f4612f0 100644
--- a/tests/flattener_dicos/10check_optional/result/00-base.xml
+++ b/tests/flattener_dicos/10check_optional/result/00-base.xml
@@ -18,6 +18,5 @@
normal
-
diff --git a/tests/flattener_dicos/10check_valid_differ/result/00-base.xml b/tests/flattener_dicos/10check_valid_differ/result/00-base.xml
index ed822306..5753b99b 100644
--- a/tests/flattener_dicos/10check_valid_differ/result/00-base.xml
+++ b/tests/flattener_dicos/10check_valid_differ/result/00-base.xml
@@ -21,6 +21,5 @@
non
-
diff --git a/tests/flattener_dicos/10check_valid_differ_add/result/00-base.xml b/tests/flattener_dicos/10check_valid_differ_add/result/00-base.xml
index 0b4374d4..21976c51 100644
--- a/tests/flattener_dicos/10check_valid_differ_add/result/00-base.xml
+++ b/tests/flattener_dicos/10check_valid_differ_add/result/00-base.xml
@@ -36,6 +36,5 @@
oui
-
diff --git a/tests/flattener_dicos/10check_valid_differ_removecheck/result/00-base.xml b/tests/flattener_dicos/10check_valid_differ_removecheck/result/00-base.xml
index 0b4374d4..21976c51 100644
--- a/tests/flattener_dicos/10check_valid_differ_removecheck/result/00-base.xml
+++ b/tests/flattener_dicos/10check_valid_differ_removecheck/result/00-base.xml
@@ -36,6 +36,5 @@
oui
-
diff --git a/tests/flattener_dicos/10check_valid_ipnetmask/result/00-base.xml b/tests/flattener_dicos/10check_valid_ipnetmask/result/00-base.xml
index 835a5304..bf3f1187 100644
--- a/tests/flattener_dicos/10check_valid_ipnetmask/result/00-base.xml
+++ b/tests/flattener_dicos/10check_valid_ipnetmask/result/00-base.xml
@@ -22,6 +22,5 @@
basic
-
diff --git a/tests/flattener_dicos/10leadership_append/00-base.xml b/tests/flattener_dicos/10leadership_append/00-base.xml
index f9a78f67..f24dc653 100644
--- a/tests/flattener_dicos/10leadership_append/00-base.xml
+++ b/tests/flattener_dicos/10leadership_append/00-base.xml
@@ -11,8 +11,8 @@
-
-
+
+
diff --git a/tests/flattener_dicos/10leadership_append/01-base.xml b/tests/flattener_dicos/10leadership_append/01-base.xml
index d0fab650..6a86d00f 100644
--- a/tests/flattener_dicos/10leadership_append/01-base.xml
+++ b/tests/flattener_dicos/10leadership_append/01-base.xml
@@ -5,7 +5,7 @@
-
+
diff --git a/tests/flattener_dicos/10leadership_append/result/00-base.xml b/tests/flattener_dicos/10leadership_append/result/00-base.xml
index 860d7d5c..964a6b6e 100644
--- a/tests/flattener_dicos/10leadership_append/result/00-base.xml
+++ b/tests/flattener_dicos/10leadership_append/result/00-base.xml
@@ -16,21 +16,21 @@
normal
-
+
mandatory
normal
valfill
-
+
mandatory
normal
rougail.general1.leader.follower1
-
+
normal
diff --git a/tests/flattener_dicos/10leadership_auto/00-base.xml b/tests/flattener_dicos/10leadership_auto/00-base.xml
index fd7d172c..329c04a4 100644
--- a/tests/flattener_dicos/10leadership_auto/00-base.xml
+++ b/tests/flattener_dicos/10leadership_auto/00-base.xml
@@ -9,9 +9,9 @@
non
-
-
-
+
+
+
diff --git a/tests/flattener_dicos/10leadership_auto/result/00-base.xml b/tests/flattener_dicos/10leadership_auto/result/00-base.xml
index c042013c..9dc94d36 100644
--- a/tests/flattener_dicos/10leadership_auto/result/00-base.xml
+++ b/tests/flattener_dicos/10leadership_auto/result/00-base.xml
@@ -13,7 +13,7 @@
normal
-
+
force_default_on_freeze
frozen
hidden
@@ -23,7 +23,7 @@
valfill
-
+
force_default_on_freeze
frozen
hidden
@@ -33,7 +33,7 @@
rougail.general.leader.follower1
-
+
force_default_on_freeze
frozen
hidden
diff --git a/tests/flattener_dicos/10leadership_autoleader/00-base.xml b/tests/flattener_dicos/10leadership_autoleader/00-base.xml
index 5bf26bcd..04132f05 100644
--- a/tests/flattener_dicos/10leadership_autoleader/00-base.xml
+++ b/tests/flattener_dicos/10leadership_autoleader/00-base.xml
@@ -9,8 +9,8 @@
non
-
-
+
+
diff --git a/tests/flattener_dicos/10leadership_autoleader/result/00-base.xml b/tests/flattener_dicos/10leadership_autoleader/result/00-base.xml
index 0701bc06..d6145d3f 100644
--- a/tests/flattener_dicos/10leadership_autoleader/result/00-base.xml
+++ b/tests/flattener_dicos/10leadership_autoleader/result/00-base.xml
@@ -13,7 +13,7 @@
normal
-
+
force_default_on_freeze
frozen
hidden
@@ -23,7 +23,7 @@
valfill
-
+
force_default_on_freeze
frozen
hidden
diff --git a/tests/flattener_dicos/10leadership_autoleader_expert/00-base.xml b/tests/flattener_dicos/10leadership_autoleader_expert/00-base.xml
index b644d2c7..9bbcdbd6 100644
--- a/tests/flattener_dicos/10leadership_autoleader_expert/00-base.xml
+++ b/tests/flattener_dicos/10leadership_autoleader_expert/00-base.xml
@@ -11,8 +11,8 @@
-
-
+
+
diff --git a/tests/flattener_dicos/10leadership_autoleader_expert/result/00-base.xml b/tests/flattener_dicos/10leadership_autoleader_expert/result/00-base.xml
index c6955873..79acf584 100644
--- a/tests/flattener_dicos/10leadership_autoleader_expert/result/00-base.xml
+++ b/tests/flattener_dicos/10leadership_autoleader_expert/result/00-base.xml
@@ -24,12 +24,12 @@
valfill
-
+
force_default_on_freeze
frozen
expert
-
+
force_default_on_freeze
frozen
expert
diff --git a/tests/flattener_dicos/10leadership_autosaveexpert/00-base.xml b/tests/flattener_dicos/10leadership_autosaveexpert/00-base.xml
index fbbd2e80..35355328 100644
--- a/tests/flattener_dicos/10leadership_autosaveexpert/00-base.xml
+++ b/tests/flattener_dicos/10leadership_autosaveexpert/00-base.xml
@@ -9,8 +9,8 @@
non
-
-
+
+
diff --git a/tests/flattener_dicos/10leadership_autosaveexpert/result/00-base.xml b/tests/flattener_dicos/10leadership_autosaveexpert/result/00-base.xml
index 7e9ced48..23ff7f09 100644
--- a/tests/flattener_dicos/10leadership_autosaveexpert/result/00-base.xml
+++ b/tests/flattener_dicos/10leadership_autosaveexpert/result/00-base.xml
@@ -13,14 +13,14 @@
normal
-
+
mandatory
normal
valfill
-
+
mandatory
expert
diff --git a/tests/flattener_dicos/10leadership_familyaccent/00-base.xml b/tests/flattener_dicos/10leadership_familyaccent/00-base.xml
index b746e57e..b272a405 100644
--- a/tests/flattener_dicos/10leadership_familyaccent/00-base.xml
+++ b/tests/flattener_dicos/10leadership_familyaccent/00-base.xml
@@ -9,8 +9,8 @@
non
-
-
+
+
diff --git a/tests/flattener_dicos/10leadership_familyaccent/result/00-base.xml b/tests/flattener_dicos/10leadership_familyaccent/result/00-base.xml
index 2fb903bc..ff159277 100644
--- a/tests/flattener_dicos/10leadership_familyaccent/result/00-base.xml
+++ b/tests/flattener_dicos/10leadership_familyaccent/result/00-base.xml
@@ -13,14 +13,14 @@
normal
-
+
mandatory
normal
valfill
-
+
mandatory
normal
diff --git a/tests/flattener_dicos/10leadership_leadermandatory/00-base.xml b/tests/flattener_dicos/10leadership_leadermandatory/00-base.xml
index 3ecc195c..e3c02788 100644
--- a/tests/flattener_dicos/10leadership_leadermandatory/00-base.xml
+++ b/tests/flattener_dicos/10leadership_leadermandatory/00-base.xml
@@ -9,8 +9,8 @@
non
-
-
+
+
diff --git a/tests/flattener_dicos/10leadership_leadermandatory/result/00-base.xml b/tests/flattener_dicos/10leadership_leadermandatory/result/00-base.xml
index e53d60ac..bfe4f8d0 100644
--- a/tests/flattener_dicos/10leadership_leadermandatory/result/00-base.xml
+++ b/tests/flattener_dicos/10leadership_leadermandatory/result/00-base.xml
@@ -15,14 +15,14 @@
mandatory
-
+
mandatory
normal
valfill
-
+
mandatory
normal
diff --git a/tests/flattener_dicos/10leadership_mandatory/00-base.xml b/tests/flattener_dicos/10leadership_mandatory/00-base.xml
index 3305c720..c09871f7 100644
--- a/tests/flattener_dicos/10leadership_mandatory/00-base.xml
+++ b/tests/flattener_dicos/10leadership_mandatory/00-base.xml
@@ -9,8 +9,8 @@
non
-
-
+
+
diff --git a/tests/flattener_dicos/10leadership_mandatory/result/00-base.xml b/tests/flattener_dicos/10leadership_mandatory/result/00-base.xml
index e4d185fc..98b255f8 100644
--- a/tests/flattener_dicos/10leadership_mandatory/result/00-base.xml
+++ b/tests/flattener_dicos/10leadership_mandatory/result/00-base.xml
@@ -13,14 +13,14 @@
normal
-
+
mandatory
normal
valfill
-
+
mandatory
normal
diff --git a/tests/flattener_dicos/10leadership_mandatoryfollower/00-base.xml b/tests/flattener_dicos/10leadership_mandatoryfollower/00-base.xml
index dd4e26ff..74fda799 100644
--- a/tests/flattener_dicos/10leadership_mandatoryfollower/00-base.xml
+++ b/tests/flattener_dicos/10leadership_mandatoryfollower/00-base.xml
@@ -7,7 +7,7 @@
oui
-
+
diff --git a/tests/flattener_dicos/10leadership_mandatoryfollower/result/00-base.xml b/tests/flattener_dicos/10leadership_mandatoryfollower/result/00-base.xml
index d37f859e..608276ef 100644
--- a/tests/flattener_dicos/10leadership_mandatoryfollower/result/00-base.xml
+++ b/tests/flattener_dicos/10leadership_mandatoryfollower/result/00-base.xml
@@ -16,12 +16,11 @@
normal
-
+
mandatory
normal
-
diff --git a/tests/flattener_dicos/10leadership_multi/00-base.xml b/tests/flattener_dicos/10leadership_multi/00-base.xml
index ff926ac6..4c00818e 100644
--- a/tests/flattener_dicos/10leadership_multi/00-base.xml
+++ b/tests/flattener_dicos/10leadership_multi/00-base.xml
@@ -11,11 +11,11 @@
-
-
+
+
-
-
+
+
diff --git a/tests/flattener_dicos/10leadership_multi/result/00-base.xml b/tests/flattener_dicos/10leadership_multi/result/00-base.xml
index 314496cb..a0f9b2ce 100644
--- a/tests/flattener_dicos/10leadership_multi/result/00-base.xml
+++ b/tests/flattener_dicos/10leadership_multi/result/00-base.xml
@@ -16,14 +16,14 @@
normal
-
+
mandatory
normal
valfill
-
+
mandatory
normal
@@ -34,10 +34,10 @@
normal
-
+
normal
-
+
normal
diff --git a/tests/flattener_dicos/10load_disabled_if_in/result/00-base.xml b/tests/flattener_dicos/10load_disabled_if_in/result/00-base.xml
index 8774f654..52cd615c 100644
--- a/tests/flattener_dicos/10load_disabled_if_in/result/00-base.xml
+++ b/tests/flattener_dicos/10load_disabled_if_in/result/00-base.xml
@@ -33,6 +33,5 @@
non
-
diff --git a/tests/flattener_dicos/10load_disabled_if_in_none/result/00-base.xml b/tests/flattener_dicos/10load_disabled_if_in_none/result/00-base.xml
index e9fc00dc..2eb987ca 100644
--- a/tests/flattener_dicos/10load_disabled_if_in_none/result/00-base.xml
+++ b/tests/flattener_dicos/10load_disabled_if_in_none/result/00-base.xml
@@ -31,6 +31,5 @@
non
-
diff --git a/tests/flattener_dicos/10load_disabled_if_inaccent/result/00-base.xml b/tests/flattener_dicos/10load_disabled_if_inaccent/result/00-base.xml
index c089ee67..4d8eace3 100644
--- a/tests/flattener_dicos/10load_disabled_if_inaccent/result/00-base.xml
+++ b/tests/flattener_dicos/10load_disabled_if_inaccent/result/00-base.xml
@@ -41,6 +41,5 @@
non
-
diff --git a/tests/flattener_dicos/10load_disabledifin_fallback/result/00-base.xml b/tests/flattener_dicos/10load_disabledifin_fallback/result/00-base.xml
index 598b0fb0..7e677872 100644
--- a/tests/flattener_dicos/10load_disabledifin_fallback/result/00-base.xml
+++ b/tests/flattener_dicos/10load_disabledifin_fallback/result/00-base.xml
@@ -28,6 +28,5 @@
non
-
diff --git a/tests/flattener_dicos/10load_disabledifin_whithouttype/result/00-base.xml b/tests/flattener_dicos/10load_disabledifin_whithouttype/result/00-base.xml
index 330cda91..db109e18 100644
--- a/tests/flattener_dicos/10load_disabledifin_whithouttype/result/00-base.xml
+++ b/tests/flattener_dicos/10load_disabledifin_whithouttype/result/00-base.xml
@@ -27,6 +27,5 @@
non
-
diff --git a/tests/flattener_dicos/10load_emptyvalue/result/00-base.xml b/tests/flattener_dicos/10load_emptyvalue/result/00-base.xml
index 4cd3f823..bba5398b 100644
--- a/tests/flattener_dicos/10load_emptyvalue/result/00-base.xml
+++ b/tests/flattener_dicos/10load_emptyvalue/result/00-base.xml
@@ -10,6 +10,5 @@
normal
-
diff --git a/tests/flattener_dicos/10load_frozenifin/result/00-base.xml b/tests/flattener_dicos/10load_frozenifin/result/00-base.xml
index f1d10196..663bb7ea 100644
--- a/tests/flattener_dicos/10load_frozenifin/result/00-base.xml
+++ b/tests/flattener_dicos/10load_frozenifin/result/00-base.xml
@@ -31,6 +31,5 @@
non
-
diff --git a/tests/flattener_dicos/10load_frozenifin_auto/result/00-base.xml b/tests/flattener_dicos/10load_frozenifin_auto/result/00-base.xml
index fa35c438..565615f5 100644
--- a/tests/flattener_dicos/10load_frozenifin_auto/result/00-base.xml
+++ b/tests/flattener_dicos/10load_frozenifin_auto/result/00-base.xml
@@ -33,6 +33,5 @@
non
-
diff --git a/tests/flattener_dicos/10load_frozenifin_multiparam/result/00-base.xml b/tests/flattener_dicos/10load_frozenifin_multiparam/result/00-base.xml
index c2ab17dd..8cdfd2fe 100644
--- a/tests/flattener_dicos/10load_frozenifin_multiparam/result/00-base.xml
+++ b/tests/flattener_dicos/10load_frozenifin_multiparam/result/00-base.xml
@@ -38,6 +38,5 @@
non
-
diff --git a/tests/flattener_dicos/10load_frozenifin_noexist/result/00-base.xml b/tests/flattener_dicos/10load_frozenifin_noexist/result/00-base.xml
index 86067c37..4b1a1e2e 100644
--- a/tests/flattener_dicos/10load_frozenifin_noexist/result/00-base.xml
+++ b/tests/flattener_dicos/10load_frozenifin_noexist/result/00-base.xml
@@ -32,6 +32,5 @@
non
-
diff --git a/tests/flattener_dicos/10load_leadership/00-base.xml b/tests/flattener_dicos/10load_leadership/00-base.xml
index f9a78f67..f24dc653 100644
--- a/tests/flattener_dicos/10load_leadership/00-base.xml
+++ b/tests/flattener_dicos/10load_leadership/00-base.xml
@@ -11,8 +11,8 @@
-
-
+
+
diff --git a/tests/flattener_dicos/10load_leadership/result/00-base.xml b/tests/flattener_dicos/10load_leadership/result/00-base.xml
index 0c3d2fe9..c06c854f 100644
--- a/tests/flattener_dicos/10load_leadership/result/00-base.xml
+++ b/tests/flattener_dicos/10load_leadership/result/00-base.xml
@@ -16,14 +16,14 @@
normal
-
+
mandatory
normal
valfill
-
+
mandatory
normal
diff --git a/tests/flattener_dicos/10load_leadership_default_multi/00-base.xml b/tests/flattener_dicos/10load_leadership_default_multi/00-base.xml
index e57a95af..f08a2d8e 100644
--- a/tests/flattener_dicos/10load_leadership_default_multi/00-base.xml
+++ b/tests/flattener_dicos/10load_leadership_default_multi/00-base.xml
@@ -9,10 +9,10 @@
non
-
+
value
-
+
diff --git a/tests/flattener_dicos/10load_leadership_default_multi/result/00-base.xml b/tests/flattener_dicos/10load_leadership_default_multi/result/00-base.xml
index 71d71383..4ca21273 100644
--- a/tests/flattener_dicos/10load_leadership_default_multi/result/00-base.xml
+++ b/tests/flattener_dicos/10load_leadership_default_multi/result/00-base.xml
@@ -13,12 +13,12 @@
normal
-
+
mandatory
normal
value
-
+
normal
diff --git a/tests/flattener_dicos/10load_leadership_default_submulti/00-base.xml b/tests/flattener_dicos/10load_leadership_default_submulti/00-base.xml
index e161f0de..37966c0d 100644
--- a/tests/flattener_dicos/10load_leadership_default_submulti/00-base.xml
+++ b/tests/flattener_dicos/10load_leadership_default_submulti/00-base.xml
@@ -11,10 +11,10 @@
leader
-
+
value
-
+
value1
value2
diff --git a/tests/flattener_dicos/10load_leadership_default_submulti/result/00-base.xml b/tests/flattener_dicos/10load_leadership_default_submulti/result/00-base.xml
index a8cdde56..d6bf8cf7 100644
--- a/tests/flattener_dicos/10load_leadership_default_submulti/result/00-base.xml
+++ b/tests/flattener_dicos/10load_leadership_default_submulti/result/00-base.xml
@@ -16,12 +16,12 @@
mandatory
leader
-
+
mandatory
normal
value
-
+
mandatory
normal
value1
diff --git a/tests/flattener_dicos/10load_leadership_defaultmulti_leader/00-base.xml b/tests/flattener_dicos/10load_leadership_defaultmulti_leader/00-base.xml
index 8f25b8c7..687f8e83 100644
--- a/tests/flattener_dicos/10load_leadership_defaultmulti_leader/00-base.xml
+++ b/tests/flattener_dicos/10load_leadership_defaultmulti_leader/00-base.xml
@@ -11,8 +11,8 @@
value
-
-
+
+
diff --git a/tests/flattener_dicos/10load_leadership_defaultmulti_leader/result/00-base.xml b/tests/flattener_dicos/10load_leadership_defaultmulti_leader/result/00-base.xml
index fd2d428d..e19e6f5a 100644
--- a/tests/flattener_dicos/10load_leadership_defaultmulti_leader/result/00-base.xml
+++ b/tests/flattener_dicos/10load_leadership_defaultmulti_leader/result/00-base.xml
@@ -16,10 +16,10 @@
mandatory
value
-
+
normal
-
+
normal
diff --git a/tests/flattener_dicos/10load_leadership_description/00-base.xml b/tests/flattener_dicos/10load_leadership_description/00-base.xml
index f75f067c..32d62c57 100644
--- a/tests/flattener_dicos/10load_leadership_description/00-base.xml
+++ b/tests/flattener_dicos/10load_leadership_description/00-base.xml
@@ -8,8 +8,8 @@
-
-
+
+
diff --git a/tests/flattener_dicos/10load_leadership_description/result/00-base.xml b/tests/flattener_dicos/10load_leadership_description/result/00-base.xml
index c416667f..9a59841b 100644
--- a/tests/flattener_dicos/10load_leadership_description/result/00-base.xml
+++ b/tests/flattener_dicos/10load_leadership_description/result/00-base.xml
@@ -16,14 +16,14 @@
normal
-
+
mandatory
normal
valfill
-
+
mandatory
normal
diff --git a/tests/flattener_dicos/10load_leadership_normalize_family/00-base.xml b/tests/flattener_dicos/10load_leadership_normalize_family/00-base.xml
index 98041c11..c68db10e 100644
--- a/tests/flattener_dicos/10load_leadership_normalize_family/00-base.xml
+++ b/tests/flattener_dicos/10load_leadership_normalize_family/00-base.xml
@@ -11,8 +11,8 @@
-
-
+
+
diff --git a/tests/flattener_dicos/10load_leadership_normalize_family/result/00-base.xml b/tests/flattener_dicos/10load_leadership_normalize_family/result/00-base.xml
index a1bb16b8..b4b77cd3 100644
--- a/tests/flattener_dicos/10load_leadership_normalize_family/result/00-base.xml
+++ b/tests/flattener_dicos/10load_leadership_normalize_family/result/00-base.xml
@@ -18,10 +18,10 @@
mandatory
-
+
normal
-
+
normal
diff --git a/tests/flattener_dicos/10load_leadership_submulti/00-base.xml b/tests/flattener_dicos/10load_leadership_submulti/00-base.xml
index 3d4b93ed..48377ba3 100644
--- a/tests/flattener_dicos/10load_leadership_submulti/00-base.xml
+++ b/tests/flattener_dicos/10load_leadership_submulti/00-base.xml
@@ -11,8 +11,8 @@
-
-
+
+
diff --git a/tests/flattener_dicos/10load_leadership_submulti/result/00-base.xml b/tests/flattener_dicos/10load_leadership_submulti/result/00-base.xml
index b0b9dd9f..ee134b75 100644
--- a/tests/flattener_dicos/10load_leadership_submulti/result/00-base.xml
+++ b/tests/flattener_dicos/10load_leadership_submulti/result/00-base.xml
@@ -16,14 +16,14 @@
normal
-
+
mandatory
normal
valfill
-
+
mandatory
normal
diff --git a/tests/flattener_dicos/10load_mandatoryifin/result/00-base.xml b/tests/flattener_dicos/10load_mandatoryifin/result/00-base.xml
index 461a3692..8cf93593 100644
--- a/tests/flattener_dicos/10load_mandatoryifin/result/00-base.xml
+++ b/tests/flattener_dicos/10load_mandatoryifin/result/00-base.xml
@@ -27,6 +27,5 @@
non
-
diff --git a/tests/flattener_dicos/10load_multivalue/result/00-base.xml b/tests/flattener_dicos/10load_multivalue/result/00-base.xml
index 809e4016..886fe307 100644
--- a/tests/flattener_dicos/10load_multivalue/result/00-base.xml
+++ b/tests/flattener_dicos/10load_multivalue/result/00-base.xml
@@ -15,6 +15,5 @@
oui
-
diff --git a/tests/flattener_dicos/10load_submulti_two_value/00-base.xml b/tests/flattener_dicos/10load_submulti_two_value/00-base.xml
deleted file mode 100644
index 49c2fe25..00000000
--- a/tests/flattener_dicos/10load_submulti_two_value/00-base.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
-
-
-
- non
- oui
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/flattener_dicos/10load_submulti_two_value/makedict/base.json b/tests/flattener_dicos/10load_submulti_two_value/makedict/base.json
deleted file mode 100644
index 9ddb1476..00000000
--- a/tests/flattener_dicos/10load_submulti_two_value/makedict/base.json
+++ /dev/null
@@ -1 +0,0 @@
-{"rougail.general.mode_conteneur_actif": [["non"], ["oui"]]}
diff --git a/tests/flattener_dicos/10load_submulti_two_value/result/00-base.xml b/tests/flattener_dicos/10load_submulti_two_value/result/00-base.xml
deleted file mode 100644
index 21c23f0d..00000000
--- a/tests/flattener_dicos/10load_submulti_two_value/result/00-base.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
- normal
-
- oui
- non
- mandatory
- normal
- non
- oui
-
-
-
-
-
diff --git a/tests/flattener_dicos/10valid_enum_accent/result/00-base.xml b/tests/flattener_dicos/10valid_enum_accent/result/00-base.xml
index 97502511..67af100b 100644
--- a/tests/flattener_dicos/10valid_enum_accent/result/00-base.xml
+++ b/tests/flattener_dicos/10valid_enum_accent/result/00-base.xml
@@ -23,6 +23,5 @@
c
-
diff --git a/tests/flattener_dicos/10valid_enum_base/result/00-base.xml b/tests/flattener_dicos/10valid_enum_base/result/00-base.xml
index 5ca0ffee..b1abab2d 100644
--- a/tests/flattener_dicos/10valid_enum_base/result/00-base.xml
+++ b/tests/flattener_dicos/10valid_enum_base/result/00-base.xml
@@ -22,6 +22,5 @@
c
-
diff --git a/tests/flattener_dicos/10valid_enum_base_redefine/result/00-base.xml b/tests/flattener_dicos/10valid_enum_base_redefine/result/00-base.xml
index 0060d6d2..af8bd2f3 100644
--- a/tests/flattener_dicos/10valid_enum_base_redefine/result/00-base.xml
+++ b/tests/flattener_dicos/10valid_enum_base_redefine/result/00-base.xml
@@ -29,6 +29,5 @@
c
-
diff --git a/tests/flattener_dicos/10valid_enum_checkval_true/result/00-base.xml b/tests/flattener_dicos/10valid_enum_checkval_true/result/00-base.xml
index 59953b0c..9590c026 100644
--- a/tests/flattener_dicos/10valid_enum_checkval_true/result/00-base.xml
+++ b/tests/flattener_dicos/10valid_enum_checkval_true/result/00-base.xml
@@ -12,6 +12,5 @@
a
-
diff --git a/tests/flattener_dicos/10valid_enum_eosfunc/result/00-base.xml b/tests/flattener_dicos/10valid_enum_eosfunc/result/00-base.xml
index 23644283..bb0d6255 100644
--- a/tests/flattener_dicos/10valid_enum_eosfunc/result/00-base.xml
+++ b/tests/flattener_dicos/10valid_enum_eosfunc/result/00-base.xml
@@ -11,6 +11,5 @@
non
-
diff --git a/tests/flattener_dicos/10valid_enum_leader/00-base.xml b/tests/flattener_dicos/10valid_enum_leader/00-base.xml
index b605f770..85b61810 100644
--- a/tests/flattener_dicos/10valid_enum_leader/00-base.xml
+++ b/tests/flattener_dicos/10valid_enum_leader/00-base.xml
@@ -9,8 +9,8 @@
non
-
-
+
+
diff --git a/tests/flattener_dicos/10valid_enum_leader/result/00-base.xml b/tests/flattener_dicos/10valid_enum_leader/result/00-base.xml
index a6ba906d..ec398916 100644
--- a/tests/flattener_dicos/10valid_enum_leader/result/00-base.xml
+++ b/tests/flattener_dicos/10valid_enum_leader/result/00-base.xml
@@ -13,7 +13,7 @@
normal
-
+
a
b
c
@@ -21,11 +21,10 @@
normal
a
-
+
normal
-
diff --git a/tests/flattener_dicos/10valid_enum_mandatory/result/00-base.xml b/tests/flattener_dicos/10valid_enum_mandatory/result/00-base.xml
index 62985e16..e17f94c3 100644
--- a/tests/flattener_dicos/10valid_enum_mandatory/result/00-base.xml
+++ b/tests/flattener_dicos/10valid_enum_mandatory/result/00-base.xml
@@ -22,6 +22,5 @@
a
-
diff --git a/tests/flattener_dicos/10valid_enum_multi/result/00-base.xml b/tests/flattener_dicos/10valid_enum_multi/result/00-base.xml
index 9be1903b..01f19feb 100644
--- a/tests/flattener_dicos/10valid_enum_multi/result/00-base.xml
+++ b/tests/flattener_dicos/10valid_enum_multi/result/00-base.xml
@@ -19,6 +19,5 @@
a
-
diff --git a/tests/flattener_dicos/10valid_enum_none/result/00-base.xml b/tests/flattener_dicos/10valid_enum_none/result/00-base.xml
index e5369c82..7f798eb1 100644
--- a/tests/flattener_dicos/10valid_enum_none/result/00-base.xml
+++ b/tests/flattener_dicos/10valid_enum_none/result/00-base.xml
@@ -22,6 +22,5 @@
b
-
diff --git a/tests/flattener_dicos/10valid_enum_number/result/00-base.xml b/tests/flattener_dicos/10valid_enum_number/result/00-base.xml
index fe2d16d9..37e77284 100644
--- a/tests/flattener_dicos/10valid_enum_number/result/00-base.xml
+++ b/tests/flattener_dicos/10valid_enum_number/result/00-base.xml
@@ -22,6 +22,5 @@
1
-
diff --git a/tests/flattener_dicos/10valid_enum_numberdefault/result/00-base.xml b/tests/flattener_dicos/10valid_enum_numberdefault/result/00-base.xml
index 66d9af12..0732e2e6 100644
--- a/tests/flattener_dicos/10valid_enum_numberdefault/result/00-base.xml
+++ b/tests/flattener_dicos/10valid_enum_numberdefault/result/00-base.xml
@@ -22,6 +22,5 @@
3
-
diff --git a/tests/flattener_dicos/10valid_enum_python/result/00-base.xml b/tests/flattener_dicos/10valid_enum_python/result/00-base.xml
index af473e92..122138dd 100644
--- a/tests/flattener_dicos/10valid_enum_python/result/00-base.xml
+++ b/tests/flattener_dicos/10valid_enum_python/result/00-base.xml
@@ -20,6 +20,5 @@
test
-
diff --git a/tests/flattener_dicos/10valid_enum_value/result/00-base.xml b/tests/flattener_dicos/10valid_enum_value/result/00-base.xml
index 5eaec710..d17c381c 100644
--- a/tests/flattener_dicos/10valid_enum_value/result/00-base.xml
+++ b/tests/flattener_dicos/10valid_enum_value/result/00-base.xml
@@ -12,6 +12,5 @@
b
-
diff --git a/tests/flattener_dicos/11disabled_if_in_filelist/result/00-base.xml b/tests/flattener_dicos/11disabled_if_in_filelist/result/00-base.xml
index 5f845478..bd771116 100644
--- a/tests/flattener_dicos/11disabled_if_in_filelist/result/00-base.xml
+++ b/tests/flattener_dicos/11disabled_if_in_filelist/result/00-base.xml
@@ -54,6 +54,5 @@
disabled
-
diff --git a/tests/flattener_dicos/11disabled_if_in_filelist_disabled/result/00-base.xml b/tests/flattener_dicos/11disabled_if_in_filelist_disabled/result/00-base.xml
index 095e8340..f4c96f6b 100644
--- a/tests/flattener_dicos/11disabled_if_in_filelist_disabled/result/00-base.xml
+++ b/tests/flattener_dicos/11disabled_if_in_filelist_disabled/result/00-base.xml
@@ -58,6 +58,5 @@
non
-
diff --git a/tests/flattener_dicos/11disabled_if_in_filelist_multi/result/00-base.xml b/tests/flattener_dicos/11disabled_if_in_filelist_multi/result/00-base.xml
index 57fee78f..6cc80b32 100644
--- a/tests/flattener_dicos/11disabled_if_in_filelist_multi/result/00-base.xml
+++ b/tests/flattener_dicos/11disabled_if_in_filelist_multi/result/00-base.xml
@@ -82,6 +82,5 @@
non
-
diff --git a/tests/flattener_dicos/11disabledifin_filelist_notexist/result/00-base.xml b/tests/flattener_dicos/11disabledifin_filelist_notexist/result/00-base.xml
index 9bc7934c..5eada970 100644
--- a/tests/flattener_dicos/11disabledifin_filelist_notexist/result/00-base.xml
+++ b/tests/flattener_dicos/11disabledifin_filelist_notexist/result/00-base.xml
@@ -62,6 +62,5 @@
non
-
diff --git a/tests/flattener_dicos/11disabledifnotin_filelist_notexist/result/00-base.xml b/tests/flattener_dicos/11disabledifnotin_filelist_notexist/result/00-base.xml
index 9bc7934c..5eada970 100644
--- a/tests/flattener_dicos/11disabledifnotin_filelist_notexist/result/00-base.xml
+++ b/tests/flattener_dicos/11disabledifnotin_filelist_notexist/result/00-base.xml
@@ -62,6 +62,5 @@
non
-
diff --git a/tests/flattener_dicos/11disabledifnotin_filelist_notexist_multi/result/00-base.xml b/tests/flattener_dicos/11disabledifnotin_filelist_notexist_multi/result/00-base.xml
index d9bb80b3..e896df29 100644
--- a/tests/flattener_dicos/11disabledifnotin_filelist_notexist_multi/result/00-base.xml
+++ b/tests/flattener_dicos/11disabledifnotin_filelist_notexist_multi/result/00-base.xml
@@ -63,6 +63,5 @@
non
-
diff --git a/tests/flattener_dicos/11disabledifnotin_filelist_notexist_validenum/result/00-base.xml b/tests/flattener_dicos/11disabledifnotin_filelist_notexist_validenum/result/00-base.xml
index ed34c73d..163f681c 100644
--- a/tests/flattener_dicos/11disabledifnotin_filelist_notexist_validenum/result/00-base.xml
+++ b/tests/flattener_dicos/11disabledifnotin_filelist_notexist_validenum/result/00-base.xml
@@ -62,6 +62,5 @@
non
-
diff --git a/tests/flattener_dicos/11multi_disabled_if_in_filelist/result/00-base.xml b/tests/flattener_dicos/11multi_disabled_if_in_filelist/result/00-base.xml
index d088d52d..9f0f0859 100644
--- a/tests/flattener_dicos/11multi_disabled_if_in_filelist/result/00-base.xml
+++ b/tests/flattener_dicos/11multi_disabled_if_in_filelist/result/00-base.xml
@@ -51,6 +51,5 @@
non
-
diff --git a/tests/flattener_dicos/20family_append/result/00-base.xml b/tests/flattener_dicos/20family_append/result/00-base.xml
index f2cc7d1c..1cf88360 100644
--- a/tests/flattener_dicos/20family_append/result/00-base.xml
+++ b/tests/flattener_dicos/20family_append/result/00-base.xml
@@ -24,6 +24,5 @@
non
-
diff --git a/tests/flattener_dicos/20family_appendaccent/result/00-base.xml b/tests/flattener_dicos/20family_appendaccent/result/00-base.xml
index 8d695edf..bce5f53f 100644
--- a/tests/flattener_dicos/20family_appendaccent/result/00-base.xml
+++ b/tests/flattener_dicos/20family_appendaccent/result/00-base.xml
@@ -45,6 +45,5 @@
non
-
diff --git a/tests/flattener_dicos/20family_empty/result/00-base.xml b/tests/flattener_dicos/20family_empty/result/00-base.xml
index 3325eac4..385b948a 100644
--- a/tests/flattener_dicos/20family_empty/result/00-base.xml
+++ b/tests/flattener_dicos/20family_empty/result/00-base.xml
@@ -11,6 +11,5 @@
non
-
diff --git a/tests/flattener_dicos/20family_hidden/result/00-base.xml b/tests/flattener_dicos/20family_hidden/result/00-base.xml
index 848dda49..467b6b40 100644
--- a/tests/flattener_dicos/20family_hidden/result/00-base.xml
+++ b/tests/flattener_dicos/20family_hidden/result/00-base.xml
@@ -15,6 +15,5 @@
non
-
diff --git a/tests/flattener_dicos/20family_mode/result/00-base.xml b/tests/flattener_dicos/20family_mode/result/00-base.xml
index 3325eac4..385b948a 100644
--- a/tests/flattener_dicos/20family_mode/result/00-base.xml
+++ b/tests/flattener_dicos/20family_mode/result/00-base.xml
@@ -11,6 +11,5 @@
non
-
diff --git a/tests/flattener_dicos/20family_modeleadership/00-base.xml b/tests/flattener_dicos/20family_modeleadership/00-base.xml
index 4a6ac513..a52b1256 100644
--- a/tests/flattener_dicos/20family_modeleadership/00-base.xml
+++ b/tests/flattener_dicos/20family_modeleadership/00-base.xml
@@ -9,8 +9,8 @@
non
-
-
+
+
diff --git a/tests/flattener_dicos/20family_modeleadership/result/00-base.xml b/tests/flattener_dicos/20family_modeleadership/result/00-base.xml
index 17fd85db..c238ab0a 100644
--- a/tests/flattener_dicos/20family_modeleadership/result/00-base.xml
+++ b/tests/flattener_dicos/20family_modeleadership/result/00-base.xml
@@ -13,14 +13,13 @@
normal
-
+
normal
-
+
normal
-
diff --git a/tests/flattener_dicos/20notemplating/result/00-base.xml b/tests/flattener_dicos/20notemplating/result/00-base.xml
index e0d7ddae..83d4d01d 100644
--- a/tests/flattener_dicos/20notemplating/result/00-base.xml
+++ b/tests/flattener_dicos/20notemplating/result/00-base.xml
@@ -41,6 +41,5 @@
non
-
diff --git a/tests/flattener_dicos/20override/result/00-base.xml b/tests/flattener_dicos/20override/result/00-base.xml
index 37d114f3..11d18451 100644
--- a/tests/flattener_dicos/20override/result/00-base.xml
+++ b/tests/flattener_dicos/20override/result/00-base.xml
@@ -41,6 +41,5 @@
non
-
diff --git a/tests/flattener_dicos/21family_change/result/00-base.xml b/tests/flattener_dicos/21family_change/result/00-base.xml
index 721580db..ebc2a361 100644
--- a/tests/flattener_dicos/21family_change/result/00-base.xml
+++ b/tests/flattener_dicos/21family_change/result/00-base.xml
@@ -27,6 +27,5 @@
non
-
diff --git a/tests/flattener_dicos/21family_changeaccent/result/00-base.xml b/tests/flattener_dicos/21family_changeaccent/result/00-base.xml
index 2a1e823a..e1feb312 100644
--- a/tests/flattener_dicos/21family_changeaccent/result/00-base.xml
+++ b/tests/flattener_dicos/21family_changeaccent/result/00-base.xml
@@ -27,6 +27,5 @@
non
-
diff --git a/tests/flattener_dicos/21family_empty/result/00-base.xml b/tests/flattener_dicos/21family_empty/result/00-base.xml
index 23644283..bb0d6255 100644
--- a/tests/flattener_dicos/21family_empty/result/00-base.xml
+++ b/tests/flattener_dicos/21family_empty/result/00-base.xml
@@ -11,6 +11,5 @@
non
-
diff --git a/tests/flattener_dicos/30mandatory_withoutvalue/result/00-base.xml b/tests/flattener_dicos/30mandatory_withoutvalue/result/00-base.xml
index 9fa3200a..26513c26 100644
--- a/tests/flattener_dicos/30mandatory_withoutvalue/result/00-base.xml
+++ b/tests/flattener_dicos/30mandatory_withoutvalue/result/00-base.xml
@@ -8,6 +8,5 @@
basic
-
diff --git a/tests/flattener_dicos/30mandatory_withoutvaluecalc/result/00-base.xml b/tests/flattener_dicos/30mandatory_withoutvaluecalc/result/00-base.xml
index 1ab19f68..d6ad10e5 100644
--- a/tests/flattener_dicos/30mandatory_withoutvaluecalc/result/00-base.xml
+++ b/tests/flattener_dicos/30mandatory_withoutvaluecalc/result/00-base.xml
@@ -14,6 +14,5 @@
-
diff --git a/tests/flattener_dicos/30mandatory_withvalue/result/00-base.xml b/tests/flattener_dicos/30mandatory_withvalue/result/00-base.xml
index 3f43c49a..fec2a314 100644
--- a/tests/flattener_dicos/30mandatory_withvalue/result/00-base.xml
+++ b/tests/flattener_dicos/30mandatory_withvalue/result/00-base.xml
@@ -9,6 +9,5 @@
value
-
diff --git a/tests/flattener_dicos/30mandatory_withvaluecalc/result/00-base.xml b/tests/flattener_dicos/30mandatory_withvaluecalc/result/00-base.xml
index 4c33fd27..54df87a2 100644
--- a/tests/flattener_dicos/30mandatory_withvaluecalc/result/00-base.xml
+++ b/tests/flattener_dicos/30mandatory_withvaluecalc/result/00-base.xml
@@ -11,6 +11,5 @@
-
diff --git a/tests/flattener_dicos/40condition_base/result/00-base.xml b/tests/flattener_dicos/40condition_base/result/00-base.xml
index f0d3d0f9..61e6bb41 100644
--- a/tests/flattener_dicos/40condition_base/result/00-base.xml
+++ b/tests/flattener_dicos/40condition_base/result/00-base.xml
@@ -34,6 +34,5 @@
non
-
diff --git a/tests/flattener_dicos/40condition_fallback/result/00-base.xml b/tests/flattener_dicos/40condition_fallback/result/00-base.xml
index a534570e..11191a20 100644
--- a/tests/flattener_dicos/40condition_fallback/result/00-base.xml
+++ b/tests/flattener_dicos/40condition_fallback/result/00-base.xml
@@ -27,6 +27,5 @@
non
-
diff --git a/tests/flattener_dicos/40condition_optional/result/00-base.xml b/tests/flattener_dicos/40condition_optional/result/00-base.xml
index 2be2200e..1cbf3a59 100644
--- a/tests/flattener_dicos/40condition_optional/result/00-base.xml
+++ b/tests/flattener_dicos/40condition_optional/result/00-base.xml
@@ -26,6 +26,5 @@
non
-
diff --git a/tests/flattener_dicos/40ifin_leadership/00-base.xml b/tests/flattener_dicos/40ifin_leadership/00-base.xml
index 58919ad4..9eb54040 100644
--- a/tests/flattener_dicos/40ifin_leadership/00-base.xml
+++ b/tests/flattener_dicos/40ifin_leadership/00-base.xml
@@ -10,8 +10,8 @@
-
-
+
+
diff --git a/tests/flattener_dicos/40ifin_leadership/result/00-base.xml b/tests/flattener_dicos/40ifin_leadership/result/00-base.xml
index f3de62f2..0a2cf9c8 100644
--- a/tests/flattener_dicos/40ifin_leadership/result/00-base.xml
+++ b/tests/flattener_dicos/40ifin_leadership/result/00-base.xml
@@ -20,11 +20,11 @@
normal
-
+
normal
disabled
-
+
normal
diff --git a/tests/flattener_dicos/40ifin_leadershipauto/00-base.xml b/tests/flattener_dicos/40ifin_leadershipauto/00-base.xml
index b26a358e..0d14016f 100644
--- a/tests/flattener_dicos/40ifin_leadershipauto/00-base.xml
+++ b/tests/flattener_dicos/40ifin_leadershipauto/00-base.xml
@@ -10,8 +10,8 @@
-
-
+
+
diff --git a/tests/flattener_dicos/40ifin_leadershipauto/result/00-base.xml b/tests/flattener_dicos/40ifin_leadershipauto/result/00-base.xml
index 61f77135..73303560 100644
--- a/tests/flattener_dicos/40ifin_leadershipauto/result/00-base.xml
+++ b/tests/flattener_dicos/40ifin_leadershipauto/result/00-base.xml
@@ -20,7 +20,7 @@
normal
-
+
force_default_on_freeze
frozen
hidden
@@ -31,7 +31,7 @@
valfill
-
+
normal
diff --git a/tests/flattener_dicos/40ifin_multi/result/00-base.xml b/tests/flattener_dicos/40ifin_multi/result/00-base.xml
index 489e2037..936dc18b 100644
--- a/tests/flattener_dicos/40ifin_multi/result/00-base.xml
+++ b/tests/flattener_dicos/40ifin_multi/result/00-base.xml
@@ -37,6 +37,5 @@
non
-
diff --git a/tests/flattener_dicos/40ifin_validenum/result/00-base.xml b/tests/flattener_dicos/40ifin_validenum/result/00-base.xml
index 4b7758cd..2dc7093e 100644
--- a/tests/flattener_dicos/40ifin_validenum/result/00-base.xml
+++ b/tests/flattener_dicos/40ifin_validenum/result/00-base.xml
@@ -31,6 +31,5 @@
a
-
diff --git a/tests/flattener_dicos/50exists_exists/result/00-base.xml b/tests/flattener_dicos/50exists_exists/result/00-base.xml
index 9854f551..1dff008f 100644
--- a/tests/flattener_dicos/50exists_exists/result/00-base.xml
+++ b/tests/flattener_dicos/50exists_exists/result/00-base.xml
@@ -14,6 +14,5 @@
non
-
diff --git a/tests/flattener_dicos/50redefine_description/result/00-base.xml b/tests/flattener_dicos/50redefine_description/result/00-base.xml
index ec53a716..71209a9c 100644
--- a/tests/flattener_dicos/50redefine_description/result/00-base.xml
+++ b/tests/flattener_dicos/50redefine_description/result/00-base.xml
@@ -14,6 +14,5 @@
non
-
diff --git a/tests/flattener_dicos/51exists_nonexists/result/00-base.xml b/tests/flattener_dicos/51exists_nonexists/result/00-base.xml
index 3d9ac6bb..87d31324 100644
--- a/tests/flattener_dicos/51exists_nonexists/result/00-base.xml
+++ b/tests/flattener_dicos/51exists_nonexists/result/00-base.xml
@@ -28,6 +28,5 @@
oui
-
diff --git a/tests/flattener_dicos/51redefine_auto/result/00-base.xml b/tests/flattener_dicos/51redefine_auto/result/00-base.xml
index a7f346b4..3ac687bf 100644
--- a/tests/flattener_dicos/51redefine_auto/result/00-base.xml
+++ b/tests/flattener_dicos/51redefine_auto/result/00-base.xml
@@ -16,6 +16,5 @@
-
diff --git a/tests/flattener_dicos/51redefine_autofill/result/00-base.xml b/tests/flattener_dicos/51redefine_autofill/result/00-base.xml
index e129b340..8689c1a8 100644
--- a/tests/flattener_dicos/51redefine_autofill/result/00-base.xml
+++ b/tests/flattener_dicos/51redefine_autofill/result/00-base.xml
@@ -13,6 +13,5 @@
-
diff --git a/tests/flattener_dicos/51redefine_family/result/00-base.xml b/tests/flattener_dicos/51redefine_family/result/00-base.xml
index 1f3fffb5..159a896f 100644
--- a/tests/flattener_dicos/51redefine_family/result/00-base.xml
+++ b/tests/flattener_dicos/51redefine_family/result/00-base.xml
@@ -29,6 +29,5 @@
non
-
diff --git a/tests/flattener_dicos/51redefine_fill/result/00-base.xml b/tests/flattener_dicos/51redefine_fill/result/00-base.xml
index a7f346b4..3ac687bf 100644
--- a/tests/flattener_dicos/51redefine_fill/result/00-base.xml
+++ b/tests/flattener_dicos/51redefine_fill/result/00-base.xml
@@ -16,6 +16,5 @@
-
diff --git a/tests/flattener_dicos/51redefine_fillauto/result/00-base.xml b/tests/flattener_dicos/51redefine_fillauto/result/00-base.xml
index a7f346b4..3ac687bf 100644
--- a/tests/flattener_dicos/51redefine_fillauto/result/00-base.xml
+++ b/tests/flattener_dicos/51redefine_fillauto/result/00-base.xml
@@ -16,6 +16,5 @@
-
diff --git a/tests/flattener_dicos/51redefine_help/result/00-base.xml b/tests/flattener_dicos/51redefine_help/result/00-base.xml
index cb891fd9..edd935ee 100644
--- a/tests/flattener_dicos/51redefine_help/result/00-base.xml
+++ b/tests/flattener_dicos/51redefine_help/result/00-base.xml
@@ -14,6 +14,5 @@
non
-
diff --git a/tests/flattener_dicos/51redefine_hidden/result/00-base.xml b/tests/flattener_dicos/51redefine_hidden/result/00-base.xml
index 746206af..acac5640 100644
--- a/tests/flattener_dicos/51redefine_hidden/result/00-base.xml
+++ b/tests/flattener_dicos/51redefine_hidden/result/00-base.xml
@@ -14,6 +14,5 @@
non
-
diff --git a/tests/flattener_dicos/51redefine_multi_submulti/00-base.xml b/tests/flattener_dicos/51redefine_multi_submulti/00-base.xml
deleted file mode 100644
index b842e0ca..00000000
--- a/tests/flattener_dicos/51redefine_multi_submulti/00-base.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
-
-
-
-
- non
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/flattener_dicos/51redefine_multi_submulti/01-redefine.xml b/tests/flattener_dicos/51redefine_multi_submulti/01-redefine.xml
deleted file mode 100644
index f63b7888..00000000
--- a/tests/flattener_dicos/51redefine_multi_submulti/01-redefine.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/flattener_dicos/51redefine_remove_check/result/00-base.xml b/tests/flattener_dicos/51redefine_remove_check/result/00-base.xml
index 520ec49d..f4d21bae 100644
--- a/tests/flattener_dicos/51redefine_remove_check/result/00-base.xml
+++ b/tests/flattener_dicos/51redefine_remove_check/result/00-base.xml
@@ -12,6 +12,5 @@
non
-
diff --git a/tests/flattener_dicos/51redefine_remove_condition/result/00-base.xml b/tests/flattener_dicos/51redefine_remove_condition/result/00-base.xml
index 9a0cae1e..af486b60 100644
--- a/tests/flattener_dicos/51redefine_remove_condition/result/00-base.xml
+++ b/tests/flattener_dicos/51redefine_remove_condition/result/00-base.xml
@@ -36,6 +36,5 @@
non
-
diff --git a/tests/flattener_dicos/51redefine_removecondition_alltarget/result/00-base.xml b/tests/flattener_dicos/51redefine_removecondition_alltarget/result/00-base.xml
index 370f6a94..70ccf29d 100644
--- a/tests/flattener_dicos/51redefine_removecondition_alltarget/result/00-base.xml
+++ b/tests/flattener_dicos/51redefine_removecondition_alltarget/result/00-base.xml
@@ -38,6 +38,5 @@
non
-
diff --git a/tests/flattener_dicos/51redefine_removecondition_nonautofreeze/result/00-base.xml b/tests/flattener_dicos/51redefine_removecondition_nonautofreeze/result/00-base.xml
index ec6c7d68..091808d4 100644
--- a/tests/flattener_dicos/51redefine_removecondition_nonautofreeze/result/00-base.xml
+++ b/tests/flattener_dicos/51redefine_removecondition_nonautofreeze/result/00-base.xml
@@ -49,6 +49,5 @@
non
-
diff --git a/tests/flattener_dicos/51redefine_submulti/00-base.xml b/tests/flattener_dicos/51redefine_submulti/00-base.xml
deleted file mode 100644
index c973121f..00000000
--- a/tests/flattener_dicos/51redefine_submulti/00-base.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
-
-
-
-
- non
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/flattener_dicos/51redefine_submulti/01-redefine.xml b/tests/flattener_dicos/51redefine_submulti/01-redefine.xml
deleted file mode 100644
index 2c93ebe0..00000000
--- a/tests/flattener_dicos/51redefine_submulti/01-redefine.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/flattener_dicos/51redefine_submulti_multi/00-base.xml b/tests/flattener_dicos/51redefine_submulti_multi/00-base.xml
deleted file mode 100644
index 6f4953be..00000000
--- a/tests/flattener_dicos/51redefine_submulti_multi/00-base.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
-
-
-
-
- non
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/flattener_dicos/51redefine_submulti_multi/01-redefine.xml b/tests/flattener_dicos/51redefine_submulti_multi/01-redefine.xml
deleted file mode 100644
index ef35e190..00000000
--- a/tests/flattener_dicos/51redefine_submulti_multi/01-redefine.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/flattener_dicos/51redefine_validenum/result/00-base.xml b/tests/flattener_dicos/51redefine_validenum/result/00-base.xml
index b55f3ca9..fa27497c 100644
--- a/tests/flattener_dicos/51redefine_validenum/result/00-base.xml
+++ b/tests/flattener_dicos/51redefine_validenum/result/00-base.xml
@@ -14,6 +14,5 @@
a
-
diff --git a/tests/flattener_dicos/51redefine_value/result/00-base.xml b/tests/flattener_dicos/51redefine_value/result/00-base.xml
index 45d7c713..b592fa70 100644
--- a/tests/flattener_dicos/51redefine_value/result/00-base.xml
+++ b/tests/flattener_dicos/51redefine_value/result/00-base.xml
@@ -21,6 +21,5 @@
oui
-
diff --git a/tests/flattener_dicos/52exists_redefine/result/00-base.xml b/tests/flattener_dicos/52exists_redefine/result/00-base.xml
index c92f50fb..bf0120be 100644
--- a/tests/flattener_dicos/52exists_redefine/result/00-base.xml
+++ b/tests/flattener_dicos/52exists_redefine/result/00-base.xml
@@ -14,6 +14,5 @@
non
-
diff --git a/tests/flattener_dicos/60action_external/result/00-base.xml b/tests/flattener_dicos/60action_external/result/00-base.xml
index ab4908fe..f4b7b9c7 100644
--- a/tests/flattener_dicos/60action_external/result/00-base.xml
+++ b/tests/flattener_dicos/60action_external/result/00-base.xml
@@ -14,7 +14,6 @@
non
-
diff --git a/tests/flattener_dicos/60extra_externalspacecondition/result/00-base.xml b/tests/flattener_dicos/60extra_externalspacecondition/result/00-base.xml
index 8bc79cea..5ff2d623 100644
--- a/tests/flattener_dicos/60extra_externalspacecondition/result/00-base.xml
+++ b/tests/flattener_dicos/60extra_externalspacecondition/result/00-base.xml
@@ -34,7 +34,6 @@
non
-
diff --git a/tests/flattener_dicos/60extra_group/extra_dirs/extra/00-base.xml b/tests/flattener_dicos/60extra_group/extra_dirs/extra/00-base.xml
index ebbabd26..62ad4b4d 100644
--- a/tests/flattener_dicos/60extra_group/extra_dirs/extra/00-base.xml
+++ b/tests/flattener_dicos/60extra_group/extra_dirs/extra/00-base.xml
@@ -6,7 +6,7 @@
test
-
+
pre
diff --git a/tests/flattener_dicos/60extra_group/result/00-base.xml b/tests/flattener_dicos/60extra_group/result/00-base.xml
index 3836ff9f..2d645b1d 100644
--- a/tests/flattener_dicos/60extra_group/result/00-base.xml
+++ b/tests/flattener_dicos/60extra_group/result/00-base.xml
@@ -54,7 +54,6 @@
non
-
@@ -65,7 +64,7 @@
mandatory
test
-
+
mandatory
normal
pre
diff --git a/tests/flattener_dicos/60extra_help/result/00-base.xml b/tests/flattener_dicos/60extra_help/result/00-base.xml
index d1925b7b..2731f873 100644
--- a/tests/flattener_dicos/60extra_help/result/00-base.xml
+++ b/tests/flattener_dicos/60extra_help/result/00-base.xml
@@ -54,7 +54,6 @@
non
-
diff --git a/tests/flattener_dicos/60extra_load/result/00-base.xml b/tests/flattener_dicos/60extra_load/result/00-base.xml
index 770ed570..756c4421 100644
--- a/tests/flattener_dicos/60extra_load/result/00-base.xml
+++ b/tests/flattener_dicos/60extra_load/result/00-base.xml
@@ -24,7 +24,6 @@
non
-
diff --git a/tests/flattener_dicos/60extra_mandatory/result/00-base.xml b/tests/flattener_dicos/60extra_mandatory/result/00-base.xml
index 5036e6d1..e886aa84 100644
--- a/tests/flattener_dicos/60extra_mandatory/result/00-base.xml
+++ b/tests/flattener_dicos/60extra_mandatory/result/00-base.xml
@@ -24,7 +24,6 @@
non
-
diff --git a/tests/flattener_dicos/60extra_redefine/result/00-base.xml b/tests/flattener_dicos/60extra_redefine/result/00-base.xml
index a3de1e34..5e591783 100644
--- a/tests/flattener_dicos/60extra_redefine/result/00-base.xml
+++ b/tests/flattener_dicos/60extra_redefine/result/00-base.xml
@@ -24,7 +24,6 @@
non
-
diff --git a/tests/flattener_dicos/01base_submulti/00-base.xml b/tests/flattener_dicos/60extra_separators/00-base.xml
similarity index 60%
rename from tests/flattener_dicos/01base_submulti/00-base.xml
rename to tests/flattener_dicos/60extra_separators/00-base.xml
index 6f4953be..2e4fec44 100644
--- a/tests/flattener_dicos/01base_submulti/00-base.xml
+++ b/tests/flattener_dicos/60extra_separators/00-base.xml
@@ -4,8 +4,11 @@
-
-
+
+
+ non
+
+
non
diff --git a/tests/flattener_dicos/60extra_separators/extra_dirs/extra/00-base.xml b/tests/flattener_dicos/60extra_separators/extra_dirs/extra/00-base.xml
new file mode 100644
index 00000000..b6247865
--- /dev/null
+++ b/tests/flattener_dicos/60extra_separators/extra_dirs/extra/00-base.xml
@@ -0,0 +1,26 @@
+
+
+
+
+
+
+ Exportation de la base de ejabberd
+
+
+
+ pre
+
+
+
+ Séparateur
+
+
+
+
+ non
+ activer_ejabberd
+ none
+ daily
+
+
+
diff --git a/tests/flattener_dicos/60extra_separators/makedict/base.json b/tests/flattener_dicos/60extra_separators/makedict/base.json
new file mode 100644
index 00000000..816c41bd
--- /dev/null
+++ b/tests/flattener_dicos/60extra_separators/makedict/base.json
@@ -0,0 +1 @@
+{"rougail.general.mode_conteneur_actif": "non", "rougail.general.activer_ejabberd": "non", "extra.ejabberd.description": "Exportation de la base de ejabberd", "extra.ejabberd.day": null, "extra.ejabberd.mode": "pre"}
diff --git a/tests/flattener_dicos/60extra_separators/result/00-base.xml b/tests/flattener_dicos/60extra_separators/result/00-base.xml
new file mode 100644
index 00000000..0147ea94
--- /dev/null
+++ b/tests/flattener_dicos/60extra_separators/result/00-base.xml
@@ -0,0 +1,59 @@
+
+
+
+
+ normal
+
+ oui
+ non
+ force_default_on_freeze
+ frozen
+ hidden
+ mandatory
+ normal
+ non
+
+
+ oui
+ non
+ force_default_on_freeze
+ frozen
+ hidden
+ mandatory
+ normal
+ non
+
+
+
+
+
+ normal
+
+ mandatory
+ normal
+ Exportation de la base de ejabberd
+
+
+ none
+ daily
+ weekly
+ monthly
+ mandatory
+ normal
+
+ non
+ rougail.general.activer_ejabberd
+ none
+ daily
+
+
+
+ pre
+ post
+ mandatory
+ normal
+ pre
+
+
+
+
diff --git a/tests/flattener_dicos/60familyaction/result/00-base.xml b/tests/flattener_dicos/60familyaction/result/00-base.xml
index 59c5face..2136b58e 100644
--- a/tests/flattener_dicos/60familyaction/result/00-base.xml
+++ b/tests/flattener_dicos/60familyaction/result/00-base.xml
@@ -14,7 +14,6 @@
non
-
diff --git a/tests/flattener_dicos/60familyaction_accent/result/00-base.xml b/tests/flattener_dicos/60familyaction_accent/result/00-base.xml
index 59c5face..2136b58e 100644
--- a/tests/flattener_dicos/60familyaction_accent/result/00-base.xml
+++ b/tests/flattener_dicos/60familyaction_accent/result/00-base.xml
@@ -14,7 +14,6 @@
non
-
diff --git a/tests/flattener_dicos/60familyaction_mandatory/result/00-base.xml b/tests/flattener_dicos/60familyaction_mandatory/result/00-base.xml
index c6d62439..9e63517e 100644
--- a/tests/flattener_dicos/60familyaction_mandatory/result/00-base.xml
+++ b/tests/flattener_dicos/60familyaction_mandatory/result/00-base.xml
@@ -14,7 +14,6 @@
non
-
diff --git a/tests/flattener_dicos/70container_files/result/00-base.xml b/tests/flattener_dicos/70container_files/result/00-base.xml
index 0a228f65..811f7b2a 100644
--- a/tests/flattener_dicos/70container_files/result/00-base.xml
+++ b/tests/flattener_dicos/70container_files/result/00-base.xml
@@ -67,6 +67,5 @@
oui
-
diff --git a/tests/flattener_dicos/70container_files_symlink_multi/result/00-base.xml b/tests/flattener_dicos/70container_files_symlink_multi/result/00-base.xml
index c82d6037..f2eff7ec 100644
--- a/tests/flattener_dicos/70container_files_symlink_multi/result/00-base.xml
+++ b/tests/flattener_dicos/70container_files_symlink_multi/result/00-base.xml
@@ -48,6 +48,5 @@
/etc/mailname2
-
diff --git a/tests/flattener_dicos/70container_files_symlink_multi_variable/result/00-base.xml b/tests/flattener_dicos/70container_files_symlink_multi_variable/result/00-base.xml
index b799fa27..b3f0634e 100644
--- a/tests/flattener_dicos/70container_files_symlink_multi_variable/result/00-base.xml
+++ b/tests/flattener_dicos/70container_files_symlink_multi_variable/result/00-base.xml
@@ -55,6 +55,5 @@
mailname2
-
diff --git a/tests/flattener_dicos/70container_filesmulti/result/00-base.xml b/tests/flattener_dicos/70container_filesmulti/result/00-base.xml
index 0d8b1c76..5469a501 100644
--- a/tests/flattener_dicos/70container_filesmulti/result/00-base.xml
+++ b/tests/flattener_dicos/70container_filesmulti/result/00-base.xml
@@ -67,6 +67,5 @@
oui
-
diff --git a/tests/flattener_dicos/70container_filesredefine/result/00-base.xml b/tests/flattener_dicos/70container_filesredefine/result/00-base.xml
index a4ef3d05..b98857b1 100644
--- a/tests/flattener_dicos/70container_filesredefine/result/00-base.xml
+++ b/tests/flattener_dicos/70container_filesredefine/result/00-base.xml
@@ -44,6 +44,5 @@
oui
-
diff --git a/tests/flattener_dicos/70container_new/result/00-base.xml b/tests/flattener_dicos/70container_new/result/00-base.xml
index 7eed4c6c..0c336ee6 100644
--- a/tests/flattener_dicos/70container_new/result/00-base.xml
+++ b/tests/flattener_dicos/70container_new/result/00-base.xml
@@ -18,6 +18,5 @@
oui
-
diff --git a/tests/flattener_dicos/70container_newnocont/result/00-base.xml b/tests/flattener_dicos/70container_newnocont/result/00-base.xml
index 03c8a433..40fb96e8 100644
--- a/tests/flattener_dicos/70container_newnocont/result/00-base.xml
+++ b/tests/flattener_dicos/70container_newnocont/result/00-base.xml
@@ -18,6 +18,5 @@
non
-
diff --git a/tests/flattener_dicos/70container_newwithip/result/00-base.xml b/tests/flattener_dicos/70container_newwithip/result/00-base.xml
index 074977db..60748605 100644
--- a/tests/flattener_dicos/70container_newwithip/result/00-base.xml
+++ b/tests/flattener_dicos/70container_newwithip/result/00-base.xml
@@ -21,6 +21,5 @@
normal
-
diff --git a/tests/flattener_dicos/70container_pathaccess/result/00-base.xml b/tests/flattener_dicos/70container_pathaccess/result/00-base.xml
index 9ebc88b0..8dcff25a 100644
--- a/tests/flattener_dicos/70container_pathaccess/result/00-base.xml
+++ b/tests/flattener_dicos/70container_pathaccess/result/00-base.xml
@@ -39,6 +39,5 @@
basic
-
diff --git a/tests/flattener_dicos/70container_pathaccess_leadership/00-base.xml b/tests/flattener_dicos/70container_pathaccess_leadership/00-base.xml
index 1ab25a5d..e70da268 100644
--- a/tests/flattener_dicos/70container_pathaccess_leadership/00-base.xml
+++ b/tests/flattener_dicos/70container_pathaccess_leadership/00-base.xml
@@ -14,7 +14,7 @@
oui
-
+
diff --git a/tests/flattener_dicos/70container_pathaccess_leadership/result/00-base.xml b/tests/flattener_dicos/70container_pathaccess_leadership/result/00-base.xml
index 122b558a..5f35dabc 100644
--- a/tests/flattener_dicos/70container_pathaccess_leadership/result/00-base.xml
+++ b/tests/flattener_dicos/70container_pathaccess_leadership/result/00-base.xml
@@ -35,12 +35,11 @@
mandatory
-
+
mandatory
basic
-
diff --git a/tests/flattener_dicos/70container_save/result/00-base.xml b/tests/flattener_dicos/70container_save/result/00-base.xml
index ad3d4bf8..4110d3e1 100644
--- a/tests/flattener_dicos/70container_save/result/00-base.xml
+++ b/tests/flattener_dicos/70container_save/result/00-base.xml
@@ -14,6 +14,5 @@
oui
-
diff --git a/tests/flattener_dicos/70container_serviceaccess/result/00-base.xml b/tests/flattener_dicos/70container_serviceaccess/result/00-base.xml
index 151796bd..c603bc1d 100644
--- a/tests/flattener_dicos/70container_serviceaccess/result/00-base.xml
+++ b/tests/flattener_dicos/70container_serviceaccess/result/00-base.xml
@@ -32,6 +32,5 @@
oui
-
diff --git a/tests/flattener_dicos/70container_servicerestriction/result/00-base.xml b/tests/flattener_dicos/70container_servicerestriction/result/00-base.xml
index acaef8e0..e6709841 100644
--- a/tests/flattener_dicos/70container_servicerestriction/result/00-base.xml
+++ b/tests/flattener_dicos/70container_servicerestriction/result/00-base.xml
@@ -35,6 +35,5 @@
oui
-
diff --git a/tests/flattener_dicos/70container_services/result/00-base.xml b/tests/flattener_dicos/70container_services/result/00-base.xml
index c33f50fe..5a5918e3 100644
--- a/tests/flattener_dicos/70container_services/result/00-base.xml
+++ b/tests/flattener_dicos/70container_services/result/00-base.xml
@@ -18,6 +18,5 @@
oui
-
diff --git a/tests/flattener_dicos/80leadership_auto_save/00-base.xml b/tests/flattener_dicos/80leadership_auto_save/00-base.xml
index 2a817fe9..bd5f003c 100644
--- a/tests/flattener_dicos/80leadership_auto_save/00-base.xml
+++ b/tests/flattener_dicos/80leadership_auto_save/00-base.xml
@@ -9,8 +9,8 @@
non
-
-
+
+
diff --git a/tests/flattener_dicos/80leadership_none_follower_between_follower/00-base.xml b/tests/flattener_dicos/80leadership_none_follower_between_follower/00-base.xml
index 3157fc88..12a0e074 100644
--- a/tests/flattener_dicos/80leadership_none_follower_between_follower/00-base.xml
+++ b/tests/flattener_dicos/80leadership_none_follower_between_follower/00-base.xml
@@ -9,8 +9,8 @@
non
-
-
+
+
diff --git a/tests/flattener_dicos/80leadership_not_ordered/00-base.xml b/tests/flattener_dicos/80leadership_not_ordered/00-base.xml
index 742dfe13..2801924f 100644
--- a/tests/flattener_dicos/80leadership_not_ordered/00-base.xml
+++ b/tests/flattener_dicos/80leadership_not_ordered/00-base.xml
@@ -11,8 +11,8 @@
-
-
+
+
diff --git a/tests/flattener_dicos/80leadership_not_same_family/00-base.xml b/tests/flattener_dicos/80leadership_not_same_family/00-base.xml
index c2753816..b5dff8b7 100644
--- a/tests/flattener_dicos/80leadership_not_same_family/00-base.xml
+++ b/tests/flattener_dicos/80leadership_not_same_family/00-base.xml
@@ -11,10 +11,10 @@
-
+
-
+
diff --git a/tests/flattener_dicos/80leadership_notexists/00-base.xml b/tests/flattener_dicos/80leadership_notexists/00-base.xml
index ce53a30a..57d9b8c0 100644
--- a/tests/flattener_dicos/80leadership_notexists/00-base.xml
+++ b/tests/flattener_dicos/80leadership_notexists/00-base.xml
@@ -9,8 +9,8 @@
non
-
-
+
+
diff --git a/tests/flattener_dicos/80leadership_notmulti/00-base.xml b/tests/flattener_dicos/80leadership_notmulti/00-base.xml
deleted file mode 100644
index 7226ba04..00000000
--- a/tests/flattener_dicos/80leadership_notmulti/00-base.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- valfill
-
-
- follower1
-
-
- follower1
- follower2
-
-
-
-
-
-
diff --git a/tests/flattener_dicos/80leadership_notmulti2/00-base.xml b/tests/flattener_dicos/80leadership_notmulti2/00-base.xml
deleted file mode 100644
index 48377ba3..00000000
--- a/tests/flattener_dicos/80leadership_notmulti2/00-base.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-
-
-
-
-
- non
-
-
-
-
-
-
-
-
-
-
-
- valfill
-
-
- follower1
-
-
- follower1
- follower2
-
-
-
-
-
-
diff --git a/tests/flattener_dicos/80multi_submulti/00-base.xml b/tests/flattener_dicos/80multi_submulti/00-base.xml
deleted file mode 100644
index af94bf3d..00000000
--- a/tests/flattener_dicos/80multi_submulti/00-base.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
-
-
-
-
- non
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/test_makedict.py b/tests/test_makedict.py
index 390ba599..5b4e370d 100644
--- a/tests/test_makedict.py
+++ b/tests/test_makedict.py
@@ -24,7 +24,7 @@ for test in listdir(dico_dirs):
excludes = set([])
#excludes = set(['70container_services'])
test_ok -= excludes
-#test_ok = ['10valid_enum_none']
+#test_ok = ['10check_valid_ipnetmask']
test_ok = list(test_ok)