Infra/rougail
9
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

refactor

Browse Source
This commit is contained in:
Emmanuel Garette
2020-07-16 09:50:01 +02:00
parent 7191bbbcb3
commit 05ca7ed578
194 changed files with 427 additions and 760 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tests/flattener_dicos/00load_autofreeze/result/00-base.xml
View File

@ -21,6 +21,5 @@
<value type="string">non</value>
</variable>
</family>
<separators/>
</family>
</rougail>

1
tests/flattener_dicos/00load_autofreezeexpert/result/00-base.xml
View File

@ -21,6 +21,5 @@
<value type="string">non</value>
</variable>
</family>
<separators/>
</family>
</rougail>

1
tests/flattener_dicos/00load_autosave/result/00-base.xml
View File

@ -12,6 +12,5 @@
<value type="string">non</value>
</variable>
</family>
<separators/>
</family>
</rougail>

1
tests/flattener_dicos/00load_autosaveexpert/result/00-base.xml
View File

@ -12,6 +12,5 @@
<value type="string">non</value>
</variable>
</family>
<separators/>
</family>
</rougail>

1
tests/flattener_dicos/00load_comment/result/00-base.xml
View File

@ -14,6 +14,5 @@
<value type="string">non</value>
</variable>
</family>
<separators/>
</family>
</rougail>

1
tests/flattener_dicos/00load_notype/result/00-base.xml
View File

@ -19,6 +19,5 @@
<value>non</value>
</variable>
</family>
<separators/>
</family>
</rougail>

1
tests/flattener_dicos/00load_save/result/00-base.xml
View File

@ -14,6 +14,5 @@
<value type="string">non</value>
</variable>
</family>
<separators/>
</family>
</rougail>

1
tests/flattener_dicos/00load_subfolder/result/00-base.xml
View File

@ -24,6 +24,5 @@
<value type="string">non</value>
</variable>
</family>
<separators/>
</family>
</rougail>

1
tests/flattener_dicos/01auto_base/result/00-base.xml
View File

@ -23,6 +23,5 @@
<value type="string">non</value>
</variable>
</family>
<separators/>
</family>
</rougail>

1
tests/flattener_dicos/01auto_withoutparam/result/00-base.xml
View File

@ -21,6 +21,5 @@
<value type="string">non</value>
</variable>
</family>
<separators/>
</family>
</rougail>

1
tests/flattener_dicos/01base_multi/result/00-base.xml
View File

@ -14,6 +14,5 @@
<value type="string">non</value>
</variable>
</family>
<separators/>
</family>
</rougail>

1
tests/flattener_dicos/01base_submulti/makedict/base.json
View File

@ -1 +0,0 @@
{"rougail.general.mode_conteneur_actif": [["non"]]}

19
tests/flattener_dicos/01base_submulti/result/00-base.xml
View File

@ -1,19 +0,0 @@
<?xml version='1.0' encoding='UTF-8'?>
<rougail>
<family doc="rougail" name="rougail">
<family doc="general" name="general">
<property>normal</property>
<variable doc="Redefine description" multi="submulti" name="mode_conteneur_actif" type="choice">
<choice type="string">oui</choice>
<choice type="string">non</choice>
<property>force_default_on_freeze</property>
<property>frozen</property>
<property>hidden</property>
<property>mandatory</property>
<property>normal</property>
<value type="string">non</value>
</variable>
</family>
<separators/>
</family>
</rougail>

1
tests/flattener_dicos/01fill_autofreeze/result/00-base.xml
View File

@ -30,6 +30,5 @@
<value type="string">non</value>
</variable>
</family>
<separators/>
</family>
</rougail>

1
tests/flattener_dicos/01fill_autosave/result/00-base.xml
View File

@ -21,6 +21,5 @@
<value type="string">non</value>
</variable>
</family>
<separators/>
</family>
</rougail>

1
tests/flattener_dicos/01fill_base/result/00-base.xml
View File

@ -23,6 +23,5 @@
<value type="string">non</value>
</variable>
</family>
<separators/>
</family>
</rougail>

1
tests/flattener_dicos/01fill_baseaccent/result/00-base.xml
View File

@ -23,6 +23,5 @@
<value type="string">non</value>
</variable>
</family>
<separators/>
</family>
</rougail>

1
tests/flattener_dicos/01fill_mandatory/result/00-base.xml
View File

@ -18,6 +18,5 @@
<value type="string">non</value>
</variable>
</family>
<separators/>
</family>
</rougail>

1
tests/flattener_dicos/01fill_number/result/00-base.xml
View File

@ -21,6 +21,5 @@
<value type="string">non</value>
</variable>
</family>
<separators/>
</family>
</rougail>

1
tests/flattener_dicos/01fill_optional/result/00-base.xml
View File

@ -23,6 +23,5 @@
<value type="string">non</value>
</variable>
</family>
<separators/>
</family>
</rougail>

5
tests/flattener_dicos/01separator_base/result/00-base.xml
View File

@ -3,7 +3,7 @@
<family doc="rougail" name="rougail">
<family doc="general" name="general">
<property>normal</property>
<variable doc="No change" multi="False" name="mode_conteneur_actif" type="choice">
<variable doc="No change" multi="False" name="mode_conteneur_actif" separator="Établissement" type="choice">
<choice type="string">oui</choice>
<choice type="string">non</choice>
<property>force_default_on_freeze</property>
@ -14,8 +14,5 @@
<value type="string">non</value>
</variable>
</family>
<separators>
<separator name="rougail.general.mode_conteneur_actif">Établissement</separator>
</separators>
</family>
</rougail>

5
tests/flattener_dicos/01separator_neverhidden/result/00-base.xml
View File

@ -3,7 +3,7 @@
<family doc="rougail" name="rougail">
<family doc="general" name="general">
<property>normal</property>
<variable doc="No change" multi="False" name="mode_conteneur_actif" type="choice">
<variable doc="No change" multi="False" name="mode_conteneur_actif" separator="Établissement" type="choice">
<choice type="string">oui</choice>
<choice type="string">non</choice>
<property>force_default_on_freeze</property>
@ -14,8 +14,5 @@
<value type="string">non</value>
</variable>
</family>
<separators>
<separator name="rougail.general.mode_conteneur_actif">Établissement</separator>
</separators>
</family>
</rougail>

1
tests/flattener_dicos/10autosave_hidden/result/00-base.xml
View File

@ -24,6 +24,5 @@
</value>
</variable>
</family>
<separators/>
</family>
</rougail>

1
tests/flattener_dicos/10autosave_hidden_frozenifin/result/00-base.xml
View File

@ -25,6 +25,5 @@
</value>
</variable>
</family>
<separators/>
</family>
</rougail>

1
tests/flattener_dicos/10check_base/result/00-base.xml
View File

@ -16,6 +16,5 @@
<property>normal</property>
</variable>
</family>
<separators/>
</family>
</rougail>

1
tests/flattener_dicos/10check_option/result/00-base.xml
View File

@ -21,6 +21,5 @@
<property>normal</property>
</variable>
</family>
<separators/>
</family>
</rougail>

1
tests/flattener_dicos/10check_optional/result/00-base.xml
View File

@ -18,6 +18,5 @@
<property>normal</property>
</variable>
</family>
<separators/>
</family>
</rougail>

1
tests/flattener_dicos/10check_valid_differ/result/00-base.xml
View File

@ -21,6 +21,5 @@
<value type="string">non</value>
</variable>
</family>
<separators/>
</family>
</rougail>

1
tests/flattener_dicos/10check_valid_differ_add/result/00-base.xml
View File

@ -36,6 +36,5 @@
<value>oui</value>
</variable>
</family>
<separators/>
</family>
</rougail>

1
tests/flattener_dicos/10check_valid_differ_removecheck/result/00-base.xml
View File

@ -36,6 +36,5 @@
<value>oui</value>
</variable>
</family>
<separators/>
</family>
</rougail>

1
tests/flattener_dicos/10check_valid_ipnetmask/result/00-base.xml
View File

@ -22,6 +22,5 @@
<property>basic</property>
</variable>
</family>
<separators/>
</family>
</rougail>

4
tests/flattener_dicos/10leadership_append/00-base.xml
View File

@ -11,8 +11,8 @@
</family>
<family name="general1">
<variable name="leader" type="string" description="leader" multi="True"/>
<variable name="follower1" type="string" description="follower1" multi="True"/>
<variable name="follower2" type="string" description="follower2" multi="True"/>
<variable name="follower1" type="string" description="follower1"/>
<variable name="follower2" type="string" description="follower2"/>
</family>
</variables>

2
tests/flattener_dicos/10leadership_append/01-base.xml
View File

@ -5,7 +5,7 @@
<variables>
<family name="general1">
<variable name="follower3" type="string" description="follower3" multi="True"/>
<variable name="follower3" type="string" description="follower3"/>
</family>
</variables>

6
tests/flattener_dicos/10leadership_append/result/00-base.xml
View File

@ -16,21 +16,21 @@
<leader doc="leader" name="leader">
<property>normal</property>
<variable doc="leader" multi="True" name="leader" type="string"/>
<variable doc="follower1" multi="True" name="follower1" type="string">
<variable doc="follower1" multi="False" name="follower1" type="string">
<property>mandatory</property>
<property>normal</property>
<value name="calc_val" type="calculation">
<param name="valeur" transitive="False" type="string">valfill</param>
</value>
</variable>
<variable doc="follower2" multi="True" name="follower2" type="string">
<variable doc="follower2" multi="False" name="follower2" type="string">
<property>mandatory</property>
<property>normal</property>
<value name="calc_val" type="calculation">
<param transitive="False" type="variable">rougail.general1.leader.follower1</param>
</value>
</variable>
<variable doc="follower3" multi="True" name="follower3" type="string">
<variable doc="follower3" multi="False" name="follower3" type="string">
<property>normal</property>
</variable>
</leader>

6
tests/flattener_dicos/10leadership_auto/00-base.xml
View File

@ -9,9 +9,9 @@
<value>non</value>
</variable>
<variable name="leader" type="string" description="leader" multi="True"/>
<variable name="follower1" type="string" description="follower1" multi="True" hidden="True"/>
<variable name="follower2" type="string" description="follower2" multi="True" hidden="True"/>
<variable name="follower3" type="string" description="follower3" multi="True" hidden="True"/>
<variable name="follower1" type="string" description="follower1" hidden="True"/>
<variable name="follower2" type="string" description="follower2" hidden="True"/>
<variable name="follower3" type="string" description="follower3" hidden="True"/>
</family>
</variables>

6
tests/flattener_dicos/10leadership_auto/result/00-base.xml
View File

@ -13,7 +13,7 @@
<leader doc="leader" name="leader">
<property>normal</property>
<variable doc="leader" multi="True" name="leader" type="string"/>
<variable doc="follower1" multi="True" name="follower1" type="string">
<variable doc="follower1" multi="False" name="follower1" type="string">
<property>force_default_on_freeze</property>
<property>frozen</property>
<property>hidden</property>
@ -23,7 +23,7 @@
<param name="valeur" transitive="False" type="string">valfill</param>
</value>
</variable>
<variable doc="follower2" multi="True" name="follower2" type="string">
<variable doc="follower2" multi="False" name="follower2" type="string">
<property>force_default_on_freeze</property>
<property>frozen</property>
<property>hidden</property>
@ -33,7 +33,7 @@
<param transitive="False" type="variable">rougail.general.leader.follower1</param>
</value>
</variable>
<variable doc="follower3" multi="True" name="follower3" type="string">
<variable doc="follower3" multi="False" name="follower3" type="string">
<property>force_default_on_freeze</property>
<property>frozen</property>
<property>hidden</property>

4
tests/flattener_dicos/10leadership_autoleader/00-base.xml
View File

@ -9,8 +9,8 @@
<value>non</value>
</variable>
<variable name="leader" type="string" description="leader" multi="True"/>
<variable name="follower1" type="string" description="follower1" multi="True" hidden="True"/>
<variable name="follower2" type="string" description="follower2" multi="True" hidden="True"/>
<variable name="follower1" type="string" description="follower1" hidden="True"/>
<variable name="follower2" type="string" description="follower2" hidden="True"/>
</family>
</variables>

4
tests/flattener_dicos/10leadership_autoleader/result/00-base.xml
View File

@ -13,7 +13,7 @@
<leader doc="leader" name="leader">
<property>normal</property>
<variable doc="leader" multi="True" name="leader" type="string"/>
<variable doc="follower1" multi="True" name="follower1" type="string">
<variable doc="follower1" multi="False" name="follower1" type="string">
<property>force_default_on_freeze</property>
<property>frozen</property>
<property>hidden</property>
@ -23,7 +23,7 @@
<param name="valeur" transitive="False" type="string">valfill</param>
</value>
</variable>
<variable doc="follower2" multi="True" name="follower2" type="string">
<variable doc="follower2" multi="False" name="follower2" type="string">
<property>force_default_on_freeze</property>
<property>frozen</property>
<property>hidden</property>

4
tests/flattener_dicos/10leadership_autoleader_expert/00-base.xml
View File

@ -11,8 +11,8 @@
</family>
<family name="leadermode" mode="expert">
<variable name="leader" type="string" description="leader" multi="True" hidden="True"/>
<variable name="follower1" type="string" description="follower1" multi="True"/>
<variable name="follower2" type="string" description="follower2" multi="True"/>
<variable name="follower1" type="string" description="follower1"/>
<variable name="follower2" type="string" description="follower2"/>
</family>
</variables>

4
tests/flattener_dicos/10leadership_autoleader_expert/result/00-base.xml
View File

@ -24,12 +24,12 @@
<param name="valeur" transitive="False" type="string">valfill</param>
</value>
</variable>
<variable doc="follower1" multi="True" name="follower1" type="string">
<variable doc="follower1" multi="False" name="follower1" type="string">
<property>force_default_on_freeze</property>
<property>frozen</property>
<property>expert</property>
</variable>
<variable doc="follower2" multi="True" name="follower2" type="string">
<variable doc="follower2" multi="False" name="follower2" type="string">
<property>force_default_on_freeze</property>
<property>frozen</property>
<property>expert</property>

4
tests/flattener_dicos/10leadership_autosaveexpert/00-base.xml
View File

@ -9,8 +9,8 @@
<value>non</value>
</variable>
<variable name="leader" type="string" description="leader" multi="True"/>
<variable name="follower1" type="string" description="follower1" multi="True"/>
<variable name="follower2" type="string" description="follower2" multi="True" mode="expert"/>
<variable name="follower1" type="string" description="follower1"/>
<variable name="follower2" type="string" description="follower2" mode="expert"/>
</family>
</variables>

4
tests/flattener_dicos/10leadership_autosaveexpert/result/00-base.xml
View File

@ -13,14 +13,14 @@
<leader doc="leader" name="leader">
<property>normal</property>
<variable doc="leader" multi="True" name="leader" type="string"/>
<variable doc="follower1" multi="True" name="follower1" type="string">
<variable doc="follower1" multi="False" name="follower1" type="string">
<property>mandatory</property>
<property>normal</property>
<value name="calc_val" type="calculation">
<param name="valeur" transitive="False" type="string">valfill</param>
</value>
</variable>
<variable doc="follower2" multi="True" name="follower2" type="string">
<variable doc="follower2" multi="False" name="follower2" type="string">
<property>mandatory</property>
<property>expert</property>
<value name="calc_val" type="calculation">

4
tests/flattener_dicos/10leadership_familyaccent/00-base.xml
View File

@ -9,8 +9,8 @@
<value>non</value>
</variable>
<variable name="leader" type="string" description="leader" multi="True"/>
<variable name="follower1" type="string" description="follower1" multi="True"/>
<variable name="follower2" type="string" description="follower2" multi="True"/>
<variable name="follower1" type="string" description="follower1"/>
<variable name="follower2" type="string" description="follower2"/>
</family>
</variables>

4
tests/flattener_dicos/10leadership_familyaccent/result/00-base.xml
View File

@ -13,14 +13,14 @@
<leader doc="leader" name="leader">
<property>normal</property>
<variable doc="leader" multi="True" name="leader" type="string"/>
<variable doc="follower1" multi="True" name="follower1" type="string">
<variable doc="follower1" multi="False" name="follower1" type="string">
<property>mandatory</property>
<property>normal</property>
<value name="calc_val" type="calculation">
<param name="valeur" transitive="False" type="string">valfill</param>
</value>
</variable>
<variable doc="follower2" multi="True" name="follower2" type="string">
<variable doc="follower2" multi="False" name="follower2" type="string">
<property>mandatory</property>
<property>normal</property>
<value name="calc_val" type="calculation">

4
tests/flattener_dicos/10leadership_leadermandatory/00-base.xml
View File

@ -9,8 +9,8 @@
<value>non</value>
</variable>
<variable name="leader" type="string" description="leader" multi="True" mandatory="True"/>
<variable name="follower1" type="string" description="follower1" multi="True"/>
<variable name="follower2" type="string" description="follower2" multi="True"/>
<variable name="follower1" type="string" description="follower1"/>
<variable name="follower2" type="string" description="follower2"/>
</family>
</variables>

4
tests/flattener_dicos/10leadership_leadermandatory/result/00-base.xml
View File

@ -15,14 +15,14 @@
<variable doc="leader" multi="True" name="leader" type="string">
<property>mandatory</property>
</variable>
<variable doc="follower1" multi="True" name="follower1" type="string">
<variable doc="follower1" multi="False" name="follower1" type="string">
<property>mandatory</property>
<property>normal</property>
<value name="calc_val" type="calculation">
<param name="valeur" transitive="False" type="string">valfill</param>
</value>
</variable>
<variable doc="follower2" multi="True" name="follower2" type="string">
<variable doc="follower2" multi="False" name="follower2" type="string">
<property>mandatory</property>
<property>normal</property>
<value name="calc_val" type="calculation">

4
tests/flattener_dicos/10leadership_mandatory/00-base.xml
View File

@ -9,8 +9,8 @@
<value>non</value>
</variable>
<variable name="leader" type="string" description="leader" multi="True"/>
<variable name="follower1" type="string" description="follower1" multi="True" mandatory="True"/>
<variable name="follower2" type="string" description="follower2" multi="True"/>
<variable name="follower1" type="string" description="follower1" mandatory="True"/>
<variable name="follower2" type="string" description="follower2"/>
</family>
</variables>

4
tests/flattener_dicos/10leadership_mandatory/result/00-base.xml
View File

@ -13,14 +13,14 @@
<leader doc="leader" name="leader">
<property>normal</property>
<variable doc="leader" multi="True" name="leader" type="string"/>
<variable doc="follower1" multi="True" name="follower1" type="string">
<variable doc="follower1" multi="False" name="follower1" type="string">
<property>mandatory</property>
<property>normal</property>
<value name="calc_val" type="calculation">
<param name="valeur" transitive="False" type="string">valfill</param>
</value>
</variable>
<variable doc="follower2" multi="True" name="follower2" type="string">
<variable doc="follower2" multi="False" name="follower2" type="string">
<property>mandatory</property>
<property>normal</property>
<value name="calc_val" type="calculation">

2
tests/flattener_dicos/10leadership_mandatoryfollower/00-base.xml
View File

@ -7,7 +7,7 @@
<value>oui</value>
</variable>
<variable name="nut_monitor_netmask" type="netmask" description="Masque de l'IP du réseau de l'esclave" multi="True"/>
<variable name="nut_monitor_host" type="network" description="Adresse IP du réseau de l'esclave" mandatory="True" multi="True"/>
<variable name="nut_monitor_host" type="network" description="Adresse IP du réseau de l'esclave" mandatory="True"/>
</family>
<separators/>
</variables>

3
tests/flattener_dicos/10leadership_mandatoryfollower/result/00-base.xml
View File

@ -16,12 +16,11 @@
<leader doc="Masque de l'IP du réseau de l'esclave" name="nut_monitor_netmask">
<property>normal</property>
<variable doc="Masque de l'IP du réseau de l'esclave" multi="True" name="nut_monitor_netmask" type="netmask"/>
<variable doc="Adresse IP du réseau de l'esclave" multi="True" name="nut_monitor_host" type="network">
<variable doc="Adresse IP du réseau de l'esclave" multi="False" name="nut_monitor_host" type="network">
<property>mandatory</property>
<property>normal</property>
</variable>
</leader>
</family>
<separators/>
</family>
</rougail>

8
tests/flattener_dicos/10leadership_multi/00-base.xml
View File

@ -11,11 +11,11 @@
</family>
<family name="general1">
<variable name="leader" type="string" description="leader" multi="True"/>
<variable name="follower1" type="string" description="follower1" multi="True"/>
<variable name="follower2" type="string" description="follower2" multi="True"/>
<variable name="follower1" type="string" description="follower1"/>
<variable name="follower2" type="string" description="follower2"/>
<variable name="leader1" type="string" description="leader" multi="True"/>
<variable name="follower11" type="string" description="follower1" multi="True"/>
<variable name="follower21" type="string" description="follower2" multi="True"/>
<variable name="follower11" type="string" description="follower1"/>
<variable name="follower21" type="string" description="follower2"/>
</family>
</variables>

8
tests/flattener_dicos/10leadership_multi/result/00-base.xml
View File

@ -16,14 +16,14 @@
<leader doc="leader" name="leader">
<property>normal</property>
<variable doc="leader" multi="True" name="leader" type="string"/>
<variable doc="follower1" multi="True" name="follower1" type="string">
<variable doc="follower1" multi="False" name="follower1" type="string">
<property>mandatory</property>
<property>normal</property>
<value name="calc_val" type="calculation">
<param name="valeur" transitive="False" type="string">valfill</param>
</value>
</variable>
<variable doc="follower2" multi="True" name="follower2" type="string">
<variable doc="follower2" multi="False" name="follower2" type="string">
<property>mandatory</property>
<property>normal</property>
<value name="calc_val" type="calculation">
@ -34,10 +34,10 @@
<leader doc="leader" name="leader1">
<property>normal</property>
<variable doc="leader" multi="True" name="leader1" type="string"/>
<variable doc="follower1" multi="True" name="follower11" type="string">
<variable doc="follower1" multi="False" name="follower11" type="string">
<property>normal</property>
</variable>
<variable doc="follower2" multi="True" name="follower21" type="string">
<variable doc="follower2" multi="False" name="follower21" type="string">
<property>normal</property>
</variable>
</leader>

1
tests/flattener_dicos/10load_disabled_if_in/result/00-base.xml
View File

@ -33,6 +33,5 @@
<value type="string">non</value>
</variable>
</family>
<separators/>
</family>
</rougail>

1
tests/flattener_dicos/10load_disabled_if_in_none/result/00-base.xml
View File

@ -31,6 +31,5 @@
<value type="string">non</value>
</variable>
</family>
<separators/>
</family>
</rougail>

1
tests/flattener_dicos/10load_disabled_if_inaccent/result/00-base.xml
View File

@ -41,6 +41,5 @@
<value type="string">non</value>
</variable>
</family>
<separators/>
</family>
</rougail>

1
tests/flattener_dicos/10load_disabledifin_fallback/result/00-base.xml
View File

@ -28,6 +28,5 @@
<value type="string">non</value>
</variable>
</family>
<separators/>
</family>
</rougail>

1
tests/flattener_dicos/10load_disabledifin_whithouttype/result/00-base.xml
View File

@ -27,6 +27,5 @@
<value type="string">non</value>
</variable>
</family>
<separators/>
</family>
</rougail>

1
tests/flattener_dicos/10load_emptyvalue/result/00-base.xml
View File

@ -10,6 +10,5 @@
<property>normal</property>
</variable>
</family>
<separators/>
</family>
</rougail>

1
tests/flattener_dicos/10load_frozenifin/result/00-base.xml
View File

@ -31,6 +31,5 @@
<value type="string">non</value>
</variable>
</family>
<separators/>
</family>
</rougail>

1
tests/flattener_dicos/10load_frozenifin_auto/result/00-base.xml
View File

@ -33,6 +33,5 @@
<value type="string">non</value>
</variable>
</family>
<separators/>
</family>
</rougail>

1
tests/flattener_dicos/10load_frozenifin_multiparam/result/00-base.xml
View File

@ -38,6 +38,5 @@
<value type="string">non</value>
</variable>
</family>
<separators/>
</family>
</rougail>

1
tests/flattener_dicos/10load_frozenifin_noexist/result/00-base.xml
View File

@ -32,6 +32,5 @@
<value type="string">non</value>
</variable>
</family>
<separators/>
</family>
</rougail>

4
tests/flattener_dicos/10load_leadership/00-base.xml
View File

@ -11,8 +11,8 @@
</family>
<family name="general1">
<variable name="leader" type="string" description="leader" multi="True"/>
<variable name="follower1" type="string" description="follower1" multi="True"/>
<variable name="follower2" type="string" description="follower2" multi="True"/>
<variable name="follower1" type="string" description="follower1"/>
<variable name="follower2" type="string" description="follower2"/>
</family>
</variables>

4
tests/flattener_dicos/10load_leadership/result/00-base.xml
View File

@ -16,14 +16,14 @@
<leader doc="leader" name="leader">
<property>normal</property>
<variable doc="leader" multi="True" name="leader" type="string"/>
<variable doc="follower1" multi="True" name="follower1" type="string">
<variable doc="follower1" multi="False" name="follower1" type="string">
<property>mandatory</property>
<property>normal</property>
<value name="calc_val" type="calculation">
<param name="valeur" transitive="False" type="string">valfill</param>
</value>
</variable>
<variable doc="follower2" multi="True" name="follower2" type="string">
<variable doc="follower2" multi="False" name="follower2" type="string">
<property>mandatory</property>
<property>normal</property>
<value name="calc_val" type="calculation">

4
tests/flattener_dicos/10load_leadership_default_multi/00-base.xml
View File

@ -9,10 +9,10 @@
<value>non</value>
</variable>
<variable name="leader" type="string" description="leader" multi="True"/>
<variable name="follower1" type="string" description="follower1" multi="True">
<variable name="follower1" type="string" description="follower1">
<value>value</value>
</variable>
<variable name="follower2" type="string" description="follower2" multi="True"/>
<variable name="follower2" type="string" description="follower2"/>
</family>
</variables>

4
tests/flattener_dicos/10load_leadership_default_multi/result/00-base.xml
View File

@ -13,12 +13,12 @@
<leader doc="leader" name="leader">
<property>normal</property>
<variable doc="leader" multi="True" name="leader" type="string"/>
<variable doc="follower1" multi="True" name="follower1" type="string">
<variable doc="follower1" multi="False" name="follower1" type="string">
<property>mandatory</property>
<property>normal</property>
<value>value</value>
</variable>
<variable doc="follower2" multi="True" name="follower2" type="string">
<variable doc="follower2" multi="False" name="follower2" type="string">
<property>normal</property>
</variable>
</leader>

4
tests/flattener_dicos/10load_leadership_default_submulti/00-base.xml
View File

@ -11,10 +11,10 @@
<variable name="leader" type="string" description="leader" multi="True">
<value>leader</value>
</variable>
<variable name="follower1" type="string" description="follower1" submulti="True">
<variable name="follower1" type="string" description="follower1" multi="True">
<value>value</value>
</variable>
<variable name="follower2" type="string" description="follower2" submulti="True">
<variable name="follower2" type="string" description="follower2" multi="True">
<value>value1</value>
<value>value2</value>
</variable>

4
tests/flattener_dicos/10load_leadership_default_submulti/result/00-base.xml
View File

@ -16,12 +16,12 @@
<property>mandatory</property>
<value>leader</value>
</variable>
<variable doc="follower1" multi="submulti" name="follower1" type="string">
<variable doc="follower1" multi="True" name="follower1" type="string">
<property>mandatory</property>
<property>normal</property>
<value>value</value>
</variable>
<variable doc="follower2" multi="submulti" name="follower2" type="string">
<variable doc="follower2" multi="True" name="follower2" type="string">
<property>mandatory</property>
<property>normal</property>
<value>value1</value>

4
tests/flattener_dicos/10load_leadership_defaultmulti_leader/00-base.xml
View File

@ -11,8 +11,8 @@
<variable name="leader" type="string" description="leader" multi="True">
<value>value</value>
</variable>
<variable name="follower1" type="string" description="follower1" multi="True"/>
<variable name="follower2" type="string" description="follower2" multi="True"/>
<variable name="follower1" type="string" description="follower1"/>
<variable name="follower2" type="string" description="follower2"/>
</family>
</variables>

4
tests/flattener_dicos/10load_leadership_defaultmulti_leader/result/00-base.xml
View File

@ -16,10 +16,10 @@
<property>mandatory</property>
<value>value</value>
</variable>
<variable doc="follower1" multi="True" name="follower1" type="string">
<variable doc="follower1" multi="False" name="follower1" type="string">
<property>normal</property>
</variable>
<variable doc="follower2" multi="True" name="follower2" type="string">
<variable doc="follower2" multi="False" name="follower2" type="string">
<property>normal</property>
</variable>
</leader>

4
tests/flattener_dicos/10load_leadership_description/00-base.xml
View File

@ -8,8 +8,8 @@
</family>
<family name='general1'>
<variable name='leader' type='string' description="leader" multi="True"/>
<variable name='follower1' type='string' description="follower1" multi="True"/>
<variable name='follower2' type='string' description="follower2" multi="True"/>
<variable name='follower1' type='string' description="follower1"/>
<variable name='follower2' type='string' description="follower2"/>
</family>
</variables>
<constraints>

4
tests/flattener_dicos/10load_leadership_description/result/00-base.xml
View File

@ -16,14 +16,14 @@
<leader doc="other description" name="leader">
<property>normal</property>
<variable doc="leader" multi="True" name="leader" type="string"/>
<variable doc="follower1" multi="True" name="follower1" type="string">
<variable doc="follower1" multi="False" name="follower1" type="string">
<property>mandatory</property>
<property>normal</property>
<value name="calc_val" type="calculation">
<param name="valeur" transitive="False" type="string">valfill</param>
</value>
</variable>
<variable doc="follower2" multi="True" name="follower2" type="string">
<variable doc="follower2" multi="False" name="follower2" type="string">
<property>mandatory</property>
<property>normal</property>
<value name="calc_val" type="calculation">

4
tests/flattener_dicos/10load_leadership_normalize_family/00-base.xml
View File

@ -11,8 +11,8 @@
</family>
<family name="general-1">
<variable name="leader" type="string" description="leader" multi="True"/>
<variable name="follower1" type="string" description="follower1" multi="True"/>
<variable name="follower2" type="string" description="follower2" multi="True"/>
<variable name="follower1" type="string" description="follower1"/>
<variable name="follower2" type="string" description="follower2"/>
</family>
</variables>

4
tests/flattener_dicos/10load_leadership_normalize_family/result/00-base.xml
View File

@ -18,10 +18,10 @@
<variable doc="leader" multi="True" name="leader" type="string">
<property>mandatory</property>
</variable>
<variable doc="follower1" multi="True" name="follower1" type="string">
<variable doc="follower1" multi="False" name="follower1" type="string">
<property>normal</property>
</variable>
<variable doc="follower2" multi="True" name="follower2" type="string">
<variable doc="follower2" multi="False" name="follower2" type="string">
<property>normal</property>
</variable>
</leader>

4
tests/flattener_dicos/10load_leadership_submulti/00-base.xml
View File

@ -11,8 +11,8 @@
</family>
<family name="general1">
<variable name="leader" type="string" description="leader" multi="True"/>
<variable name="follower1" type="string" description="follower1" multi="True"/>
<variable name="follower2" type="string" description="follower2" submulti="True"/>
<variable name="follower1" type="string" description="follower1"/>
<variable name="follower2" type="string" description="follower2" multi="True"/>
</family>
</variables>

4
tests/flattener_dicos/10load_leadership_submulti/result/00-base.xml
View File

@ -16,14 +16,14 @@
<leader doc="leader" name="leader">
<property>normal</property>
<variable doc="leader" multi="True" name="leader" type="string"/>
<variable doc="follower1" multi="True" name="follower1" type="string">
<variable doc="follower1" multi="False" name="follower1" type="string">
<property>mandatory</property>
<property>normal</property>
<value name="calc_val" type="calculation">
<param name="valeur" transitive="False" type="string">valfill</param>
</value>
</variable>
<variable doc="follower2" multi="submulti" name="follower2" type="string">
<variable doc="follower2" multi="True" name="follower2" type="string">
<property>mandatory</property>
<property>normal</property>
<value name="calc_val" type="calculation">

1
tests/flattener_dicos/10load_mandatoryifin/result/00-base.xml
View File

@ -27,6 +27,5 @@
<value type="string">non</value>
</variable>
</family>
<separators/>
</family>
</rougail>

1
tests/flattener_dicos/10load_multivalue/result/00-base.xml
View File

@ -15,6 +15,5 @@
<value type="string">oui</value>
</variable>
</family>
<separators/>
</family>
</rougail>

23
tests/flattener_dicos/10load_submulti_two_value/00-base.xml
View File

@ -1,23 +0,0 @@
<?xml version='1.0' encoding='UTF-8'?>
<rougail>
<services/>
<variables>
<family name="general">
<variable name="mode_conteneur_actif" type="oui/non" description="Description" submulti="True">
<value>non</value>
<value>oui</value>
</variable>
</family>
<separators/>
</variables>
<constraints>
</constraints>
<help/>
</rougail>
<!-- vim: ts=4 sw=4 expandtab
-->

1
tests/flattener_dicos/10load_submulti_two_value/makedict/base.json
View File

@ -1 +0,0 @@
{"rougail.general.mode_conteneur_actif": [["non"], ["oui"]]}

17
tests/flattener_dicos/10load_submulti_two_value/result/00-base.xml
View File

@ -1,17 +0,0 @@
<?xml version='1.0' encoding='UTF-8'?>
<rougail>
<family doc="rougail" name="rougail">
<family doc="general" name="general">
<property>normal</property>
<variable doc="Description" multi="submulti" name="mode_conteneur_actif" type="choice">
<choice type="string">oui</choice>
<choice type="string">non</choice>
<property>mandatory</property>
<property>normal</property>
<value type="string">non</value>
<value type="string">oui</value>
</variable>
</family>
<separators/>
</family>
</rougail>

1
tests/flattener_dicos/10valid_enum_accent/result/00-base.xml
View File

@ -23,6 +23,5 @@
<value type="string">c</value>
</variable>
</family>
<separators/>
</family>
</rougail>

1
tests/flattener_dicos/10valid_enum_base/result/00-base.xml
View File

@ -22,6 +22,5 @@
<value type="string">c</value>
</variable>
</family>
<separators/>
</family>
</rougail>

1
tests/flattener_dicos/10valid_enum_base_redefine/result/00-base.xml
View File

@ -29,6 +29,5 @@
<value type="string">c</value>
</variable>
</family>
<separators/>
</family>
</rougail>

1
tests/flattener_dicos/10valid_enum_checkval_true/result/00-base.xml
View File

@ -12,6 +12,5 @@
<value type="string">a</value>
</variable>
</family>
<separators/>
</family>
</rougail>

1
tests/flattener_dicos/10valid_enum_eosfunc/result/00-base.xml
View File

@ -11,6 +11,5 @@
<value type="string">non</value>
</variable>
</family>
<separators/>
</family>
</rougail>

4
tests/flattener_dicos/10valid_enum_leader/00-base.xml
View File

@ -9,8 +9,8 @@
<value>non</value>
</variable>
<variable name="leader" type="string" description="leader" multi="True"/>
<variable name="follower1" type="string" description="follower1" multi="True"/>
<variable name="follower2" type="string" description="follower2" multi="True"/>
<variable name="follower1" type="string" description="follower1"/>
<variable name="follower2" type="string" description="follower2"/>
</family>
<separators/>
</variables>

5
tests/flattener_dicos/10valid_enum_leader/result/00-base.xml
View File

@ -13,7 +13,7 @@
<leader doc="leader" name="leader">
<property>normal</property>
<variable doc="leader" multi="True" name="leader" type="string"/>
<variable doc="follower1" multi="True" name="follower1" type="choice">
<variable doc="follower1" multi="False" name="follower1" type="choice">
<choice type="string">a</choice>
<choice type="string">b</choice>
<choice type="string">c</choice>
@ -21,11 +21,10 @@
<property>normal</property>
<value type="string">a</value>
</variable>
<variable doc="follower2" multi="True" name="follower2" type="string">
<variable doc="follower2" multi="False" name="follower2" type="string">
<property>normal</property>
</variable>
</leader>
</family>
<separators/>
</family>
</rougail>

1
tests/flattener_dicos/10valid_enum_mandatory/result/00-base.xml
View File

@ -22,6 +22,5 @@
<value type="string">a</value>
</variable>
</family>
<separators/>
</family>
</rougail>

1
tests/flattener_dicos/10valid_enum_multi/result/00-base.xml
View File

@ -19,6 +19,5 @@
<value type="string">a</value>
</variable>
</family>
<separators/>
</family>
</rougail>

1
tests/flattener_dicos/10valid_enum_none/result/00-base.xml
View File

@ -22,6 +22,5 @@
<value type="string">b</value>
</variable>
</family>
<separators/>
</family>
</rougail>

1
tests/flattener_dicos/10valid_enum_number/result/00-base.xml
View File

@ -22,6 +22,5 @@
<value type="number">1</value>
</variable>
</family>
<separators/>
</family>
</rougail>

1
tests/flattener_dicos/10valid_enum_numberdefault/result/00-base.xml
View File

@ -22,6 +22,5 @@
<value type="number">3</value>
</variable>
</family>
<separators/>
</family>
</rougail>

1
tests/flattener_dicos/10valid_enum_python/result/00-base.xml
View File

@ -20,6 +20,5 @@
<value type="string">test</value>
</variable>
</family>
<separators/>
</family>
</rougail>

1
tests/flattener_dicos/10valid_enum_value/result/00-base.xml
View File

@ -12,6 +12,5 @@
<value type="string">b</value>
</variable>
</family>
<separators/>
</family>
</rougail>

1
tests/flattener_dicos/11disabled_if_in_filelist/result/00-base.xml
View File

@ -54,6 +54,5 @@
<property expected="oui" inverse="False" source="rougail.general.condition" type="calculation">disabled</property>
</variable>
</family>
<separators/>
</family>
</rougail>

1
tests/flattener_dicos/11disabled_if_in_filelist_disabled/result/00-base.xml
View File

@ -58,6 +58,5 @@
<value type="string">non</value>
</variable>
</family>
<separators/>
</family>
</rougail>

1
tests/flattener_dicos/11disabled_if_in_filelist_multi/result/00-base.xml
View File

@ -82,6 +82,5 @@
<value type="string">non</value>
</variable>
</family>
<separators/>
</family>
</rougail>

1
tests/flattener_dicos/11disabledifin_filelist_notexist/result/00-base.xml
View File

@ -62,6 +62,5 @@
<value type="string">non</value>
</variable>
</family>
<separators/>
</family>
</rougail>

1
tests/flattener_dicos/11disabledifnotin_filelist_notexist/result/00-base.xml
View File

@ -62,6 +62,5 @@
<value type="string">non</value>
</variable>
</family>
<separators/>
</family>
</rougail>

Some files were not shown because too many files have changed in this diff Show More