From c6cda5ce929bddda45b4d8e6b93283d6879d3c11 Mon Sep 17 00:00:00 2001 From: Emmanuel Garette Date: Sat, 30 Jan 2021 17:06:56 +0100 Subject: [PATCH] add todict to calc_value --- src/rougail/tiramisureflector.py | 4 +-- .../00load_autofreeze/tiramisu/base.py | 2 +- .../00load_autofreezeexpert/tiramisu/base.py | 2 +- .../tiramisu/__init__.py | 0 .../00load_comment/tiramisu/__init__.py | 0 .../00load_notype/tiramisu/__init__.py | 0 .../00load_save/tiramisu/__init__.py | 0 .../00load_subfolder/tiramisu/__init__.py | 0 .../01auto_autofreeze/tiramisu/base.py | 2 +- .../01auto_base/tiramisu/__init__.py | 0 .../01auto_withoutparam/tiramisu/__init__.py | 0 .../01base_file_include/tiramisu/__init__.py | 0 .../01base_file_patch/tiramisu/__init__.py | 0 .../01base_file_utfchar/tiramisu/__init__.py | 0 .../01base_float/tiramisu/__init__.py | 0 .../01base_help_quote/tiramisu/__init__.py | 0 .../01base_multi/tiramisu/__init__.py | 0 .../tiramisu/__init__.py | 0 .../tiramisu/__init__.py | 0 .../tiramisu/__init__.py | 0 .../tiramisu/__init__.py | 0 .../tiramisu/__init__.py | 0 .../tiramisu/__init__.py | 0 .../01base_value_quote/tiramisu/__init__.py | 0 .../tiramisu/__init__.py | 0 .../01family_description/tiramisu/__init__.py | 0 .../01fill_autofreeze/tiramisu/__init__.py | 0 .../01fill_autofreeze/tiramisu/base.py | 2 +- .../01fill_autosave/tiramisu/__init__.py | 0 .../01fill_base/tiramisu/__init__.py | 0 .../01fill_baseaccent/tiramisu/__init__.py | 0 .../01fill_mandatory/tiramisu/__init__.py | 0 .../01fill_number/tiramisu/__init__.py | 0 .../01fill_only_optional/tiramisu/__init__.py | 0 .../01fill_optional/tiramisu/__init__.py | 0 .../01fill_quote/tiramisu/__init__.py | 0 .../tiramisu/base.py | 2 +- .../dictionaries/01test/tiramisu/__init__.py | 0 .../01test_multi/tiramisu/__init__.py | 0 .../01test_multi_none/tiramisu/__init__.py | 0 .../01test_redefine/tiramisu/__init__.py | 0 .../tiramisu/__init__.py | 0 .../tiramisu/base.py | 2 +- .../10autosave_hidden/tiramisu/__init__.py | 0 .../10check_base/tiramisu/__init__.py | 0 .../10check_no_param/tiramisu/__init__.py | 0 .../10check_option/tiramisu/__init__.py | 0 .../10check_optional/tiramisu/__init__.py | 0 .../10check_valid_differ/tiramisu/__init__.py | 0 .../tiramisu/__init__.py | 0 .../tiramisu/__init__.py | 0 .../10fill_information/tiramisu/__init__.py | 0 .../00-base.xml | 29 ++++++++++++++++ .../__init__.py | 0 .../makedict/base.json | 1 + .../tiramisu/base.py | 22 +++++++++++++ .../10leadership_append/tiramisu/__init__.py | 0 .../tiramisu/__init__.py | 0 .../tiramisu/__init__.py | 0 .../10leadership_auto/tiramisu/__init__.py | 0 .../tiramisu/__init__.py | 0 .../tiramisu/__init__.py | 0 .../tiramisu/__init__.py | 0 .../tiramisu/__init__.py | 0 .../tiramisu/__init__.py | 0 .../tiramisu/__init__.py | 0 .../tiramisu/base.py | 8 ++--- .../tiramisu/__init__.py | 0 .../tiramisu/base.py | 8 ++--- .../tiramisu/__init__.py | 0 .../tiramisu/__init__.py | 0 .../tiramisu/__init__.py | 0 .../10leadership_multi/tiramisu/__init__.py | 0 .../tiramisu/__init__.py | 0 .../10load_disabled_if_in/tiramisu/base.py | 4 +-- .../tiramisu/__init__.py | 0 .../tiramisu/base.py | 6 ++-- .../tiramisu/__init__.py | 0 .../tiramisu/base.py | 4 +-- .../tiramisu/__init__.py | 0 .../tiramisu/base.py | 6 ++-- .../tiramisu/__init__.py | 0 .../tiramisu/base.py | 4 +-- .../tiramisu/__init__.py | 0 .../tiramisu/base.py | 6 ++-- .../tiramisu/__init__.py | 0 .../tiramisu/__init__.py | 0 .../tiramisu/__init__.py | 0 .../tiramisu/base.py | 2 +- .../tiramisu/__init__.py | 0 .../tiramisu/base.py | 4 +-- .../tiramisu/__init__.py | 0 .../tiramisu/base.py | 4 +-- .../10load_emptyvalue/tiramisu/__init__.py | 0 .../10load_frozenifin/tiramisu/__init__.py | 0 .../10load_frozenifin/tiramisu/base.py | 4 +-- .../tiramisu/__init__.py | 0 .../10load_frozenifin_auto/tiramisu/base.py | 4 +-- .../tiramisu/__init__.py | 0 .../tiramisu/base.py | 4 +-- .../tiramisu/__init__.py | 0 .../10load_frozenifin_variable/00-base.xml | 33 +++++++++++++++++++ .../__init__.py | 0 .../makedict/base.json | 1 + .../tiramisu/base.py | 20 +++++++++++ .../10load_frozenifnotin/tiramisu/__init__.py | 0 .../10load_frozenifnotin/tiramisu/base.py | 4 +-- .../tiramisu/__init__.py | 0 .../tiramisu/__init__.py | 0 .../tiramisu/base.py | 4 +-- .../tiramisu/__init__.py | 0 .../10load_hidden_if_family/tiramisu/base.py | 8 ++--- .../10load_leadership/tiramisu/__init__.py | 0 .../tiramisu/__init__.py | 0 .../tiramisu/__init__.py | 0 .../tiramisu/__init__.py | 0 .../tiramisu/__init__.py | 0 .../tiramisu/__init__.py | 0 .../tiramisu/__init__.py | 0 .../tiramisu/__init__.py | 0 .../10load_mandatoryifin/tiramisu/__init__.py | 0 .../10load_mandatoryifin/tiramisu/base.py | 4 +-- .../tiramisu/__init__.py | 0 .../10load_multivalue/tiramisu/__init__.py | 0 .../10valid_enum_accent/tiramisu/__init__.py | 0 .../10valid_enum_base/tiramisu/__init__.py | 0 .../tiramisu/__init__.py | 0 .../10valid_enum_leader/tiramisu/__init__.py | 0 .../tiramisu/__init__.py | 0 .../10valid_enum_multi/tiramisu/__init__.py | 0 .../10valid_enum_none/tiramisu/__init__.py | 0 .../10valid_enum_number/tiramisu/__init__.py | 0 .../tiramisu/__init__.py | 0 .../10valid_enum_quote/tiramisu/__init__.py | 0 .../10valid_enum_value/tiramisu/__init__.py | 0 .../tiramisu/__init__.py | 0 .../tiramisu/base.py | 6 ++-- .../tiramisu/__init__.py | 0 .../tiramisu/base.py | 6 ++-- .../tiramisu/__init__.py | 0 .../tiramisu/base.py | 8 ++--- .../tiramisu/__init__.py | 0 .../tiramisu/base.py | 2 +- .../tiramisu/__init__.py | 0 .../tiramisu/base.py | 2 +- .../tiramisu/__init__.py | 0 .../tiramisu/base.py | 2 +- .../tiramisu/__init__.py | 0 .../tiramisu/base.py | 2 +- .../tiramisu/__init__.py | 0 .../tiramisu/__init__.py | 0 .../20family_append/tiramisu/__init__.py | 0 .../tiramisu/__init__.py | 0 .../20family_appendaccent/tiramisu/base.py | 2 +- .../20family_dynamic/tiramisu/__init__.py | 0 .../tiramisu/__init__.py | 0 .../tiramisu/__init__.py | 0 .../20family_dynamic_calc2/tiramisu/base.py | 4 +-- .../tiramisu/__init__.py | 0 .../tiramisu/__init__.py | 0 .../tiramisu/__init__.py | 0 .../20family_empty/tiramisu/__init__.py | 0 .../20family_hidden/tiramisu/__init__.py | 0 .../20family_mode/tiramisu/__init__.py | 0 .../tiramisu/__init__.py | 0 .../20notemplating/tiramisu/__init__.py | 0 .../20override/tiramisu/__init__.py | 0 .../21family_empty/tiramisu/__init__.py | 0 .../tiramisu/__init__.py | 0 .../tiramisu/__init__.py | 0 .../tiramisu/__init__.py | 0 .../tiramisu/__init__.py | 0 .../40condition_base/tiramisu/__init__.py | 0 .../40condition_base/tiramisu/base.py | 4 +-- .../40condition_base_add/tiramisu/__init__.py | 0 .../40condition_base_add/tiramisu/base.py | 4 +-- .../40condition_fallback/tiramisu/__init__.py | 0 .../40condition_optional/tiramisu/__init__.py | 0 .../40condition_optional/tiramisu/base.py | 2 +- .../tiramisu/__init__.py | 0 .../tiramisu/__init__.py | 0 .../40ifin_leadership/tiramisu/__init__.py | 0 .../40ifin_leadership/tiramisu/base.py | 2 +- .../tiramisu/__init__.py | 0 .../40ifin_leadershipauto/tiramisu/base.py | 2 +- .../tiramisu/base.py | 2 +- .../40ifin_multi/tiramisu/__init__.py | 0 .../40ifin_multi/tiramisu/base.py | 2 +- .../40ifin_validenum/tiramisu/__init__.py | 0 .../50exists_exists/tiramisu/__init__.py | 0 .../tiramisu/__init__.py | 0 .../51exists_nonexists/tiramisu/__init__.py | 0 .../51exists_redefine/tiramisu/__init__.py | 0 .../51redefine_auto/tiramisu/__init__.py | 0 .../51redefine_autofill/tiramisu/__init__.py | 0 .../51redefine_family/tiramisu/__init__.py | 0 .../51redefine_family/tiramisu/base.py | 2 +- .../51redefine_fill/tiramisu/__init__.py | 0 .../51redefine_fillauto/tiramisu/__init__.py | 0 .../51redefine_help/tiramisu/__init__.py | 0 .../51redefine_hidden/tiramisu/__init__.py | 0 .../tiramisu/__init__.py | 0 .../tiramisu/__init__.py | 0 .../tiramisu/__init__.py | 0 .../tiramisu/base.py | 2 +- .../51redefine_validenum/tiramisu/__init__.py | 0 .../51redefine_value/tiramisu/__init__.py | 0 .../51remove_fill/tiramisu/__init__.py | 0 .../52exists_redefine/tiramisu/__init__.py | 0 .../60action_external/tiramisu/__init__.py | 0 .../tiramisu/__init__.py | 0 .../tiramisu/base.py | 4 +-- .../60extra_group/tiramisu/__init__.py | 0 .../60extra_help/tiramisu/__init__.py | 0 .../60extra_load/tiramisu/__init__.py | 0 .../60extra_mandatory/tiramisu/__init__.py | 0 .../60extra_name_family/tiramisu/__init__.py | 0 .../60extra_no_condition/tiramisu/base.py | 2 +- .../60extra_redefine/tiramisu/__init__.py | 0 .../60familyaction/tiramisu/__init__.py | 0 .../tiramisu/__init__.py | 0 .../tiramisu/__init__.py | 0 .../70container_files/tiramisu/__init__.py | 0 .../tiramisu/__init__.py | 0 .../tiramisu/__init__.py | 0 .../tiramisu/__init__.py | 0 .../tiramisu/__init__.py | 0 .../tiramisu/__init__.py | 0 .../tiramisu/__init__.py | 0 .../70container_new/tiramisu/__init__.py | 0 .../tiramisu/__init__.py | 0 .../tiramisu/__init__.py | 0 .../tiramisu/__init__.py | 0 .../tiramisu/__init__.py | 0 .../70container_save/tiramisu/__init__.py | 0 .../tiramisu/__init__.py | 0 .../tiramisu/__init__.py | 0 .../70container_services/tiramisu/__init__.py | 0 .../70services_unmanage/tiramisu/__init__.py | 0 .../80frozenifin_unknown/00-base.xml | 29 ++++++++++++++++ .../__init__.py | 0 .../errno_23} | 0 242 files changed, 218 insertions(+), 83 deletions(-) delete mode 100644 tests/dictionaries/00load_autosaveexpert/tiramisu/__init__.py delete mode 100644 tests/dictionaries/00load_comment/tiramisu/__init__.py delete mode 100644 tests/dictionaries/00load_notype/tiramisu/__init__.py delete mode 100644 tests/dictionaries/00load_save/tiramisu/__init__.py delete mode 100644 tests/dictionaries/00load_subfolder/tiramisu/__init__.py delete mode 100644 tests/dictionaries/01auto_base/tiramisu/__init__.py delete mode 100644 tests/dictionaries/01auto_withoutparam/tiramisu/__init__.py delete mode 100644 tests/dictionaries/01base_file_include/tiramisu/__init__.py delete mode 100644 tests/dictionaries/01base_file_patch/tiramisu/__init__.py delete mode 100644 tests/dictionaries/01base_file_utfchar/tiramisu/__init__.py delete mode 100644 tests/dictionaries/01base_float/tiramisu/__init__.py delete mode 100644 tests/dictionaries/01base_help_quote/tiramisu/__init__.py delete mode 100644 tests/dictionaries/01base_multi/tiramisu/__init__.py delete mode 100644 tests/dictionaries/01base_value_doublequote/tiramisu/__init__.py delete mode 100644 tests/dictionaries/01base_value_doublequote2/tiramisu/__init__.py delete mode 100644 tests/dictionaries/01base_value_doublequote3/tiramisu/__init__.py delete mode 100644 tests/dictionaries/01base_value_multi_doublequote/tiramisu/__init__.py delete mode 100644 tests/dictionaries/01base_value_multi_doublequote2/tiramisu/__init__.py delete mode 100644 tests/dictionaries/01base_value_multi_quote/tiramisu/__init__.py delete mode 100644 tests/dictionaries/01base_value_quote/tiramisu/__init__.py delete mode 100644 tests/dictionaries/01base_var_name_same_family/tiramisu/__init__.py delete mode 100644 tests/dictionaries/01family_description/tiramisu/__init__.py delete mode 100644 tests/dictionaries/01fill_autofreeze/tiramisu/__init__.py delete mode 100644 tests/dictionaries/01fill_autosave/tiramisu/__init__.py delete mode 100644 tests/dictionaries/01fill_base/tiramisu/__init__.py delete mode 100644 tests/dictionaries/01fill_baseaccent/tiramisu/__init__.py delete mode 100644 tests/dictionaries/01fill_mandatory/tiramisu/__init__.py delete mode 100644 tests/dictionaries/01fill_number/tiramisu/__init__.py delete mode 100644 tests/dictionaries/01fill_only_optional/tiramisu/__init__.py delete mode 100644 tests/dictionaries/01fill_optional/tiramisu/__init__.py delete mode 100644 tests/dictionaries/01fill_quote/tiramisu/__init__.py delete mode 100644 tests/dictionaries/01test/tiramisu/__init__.py delete mode 100644 tests/dictionaries/01test_multi/tiramisu/__init__.py delete mode 100644 tests/dictionaries/01test_multi_none/tiramisu/__init__.py delete mode 100644 tests/dictionaries/01test_redefine/tiramisu/__init__.py delete mode 100644 tests/dictionaries/01test_redefine_remove/tiramisu/__init__.py delete mode 100644 tests/dictionaries/10autosave_hidden/tiramisu/__init__.py delete mode 100644 tests/dictionaries/10check_base/tiramisu/__init__.py delete mode 100644 tests/dictionaries/10check_no_param/tiramisu/__init__.py delete mode 100644 tests/dictionaries/10check_option/tiramisu/__init__.py delete mode 100644 tests/dictionaries/10check_optional/tiramisu/__init__.py delete mode 100644 tests/dictionaries/10check_valid_differ/tiramisu/__init__.py delete mode 100644 tests/dictionaries/10check_valid_in_network/tiramisu/__init__.py delete mode 100644 tests/dictionaries/10check_valid_in_network_cidr/tiramisu/__init__.py delete mode 100644 tests/dictionaries/10fill_information/tiramisu/__init__.py create mode 100644 tests/dictionaries/10frozenifin_unknown_valid_enum_number/00-base.xml rename tests/dictionaries/{00empty/tiramisu => 10frozenifin_unknown_valid_enum_number}/__init__.py (100%) create mode 100644 tests/dictionaries/10frozenifin_unknown_valid_enum_number/makedict/base.json create mode 100644 tests/dictionaries/10frozenifin_unknown_valid_enum_number/tiramisu/base.py delete mode 100644 tests/dictionaries/10leadership_append/tiramisu/__init__.py delete mode 100644 tests/dictionaries/10leadership_append_hidden/tiramisu/__init__.py delete mode 100644 tests/dictionaries/10leadership_append_name/tiramisu/__init__.py delete mode 100644 tests/dictionaries/10leadership_auto/tiramisu/__init__.py delete mode 100644 tests/dictionaries/10leadership_autoleader/tiramisu/__init__.py delete mode 100644 tests/dictionaries/10leadership_autoleader_expert/tiramisu/__init__.py delete mode 100644 tests/dictionaries/10leadership_autosaveexpert/tiramisu/__init__.py delete mode 100644 tests/dictionaries/10leadership_familyaccent/tiramisu/__init__.py delete mode 100644 tests/dictionaries/10leadership_leader_hidden/tiramisu/__init__.py delete mode 100644 tests/dictionaries/10leadership_leader_hidden_if_in/tiramisu/__init__.py delete mode 100644 tests/dictionaries/10leadership_leader_hidden_if_in_name/tiramisu/__init__.py delete mode 100644 tests/dictionaries/10leadership_leadermandatory/tiramisu/__init__.py delete mode 100644 tests/dictionaries/10leadership_mandatory/tiramisu/__init__.py delete mode 100644 tests/dictionaries/10leadership_mandatoryfollower/tiramisu/__init__.py delete mode 100644 tests/dictionaries/10leadership_multi/tiramisu/__init__.py delete mode 100644 tests/dictionaries/10load_disabled_if_in/tiramisu/__init__.py delete mode 100644 tests/dictionaries/10load_disabled_if_in_multi_param/tiramisu/__init__.py delete mode 100644 tests/dictionaries/10load_disabled_if_in_multi_param2/tiramisu/__init__.py delete mode 100644 tests/dictionaries/10load_disabled_if_in_multi_param_disabled/tiramisu/__init__.py delete mode 100644 tests/dictionaries/10load_disabled_if_in_none/tiramisu/__init__.py delete mode 100644 tests/dictionaries/10load_disabled_if_inaccent_family/tiramisu/__init__.py delete mode 100644 tests/dictionaries/10load_disabled_if_not_in_fallback/tiramisu/__init__.py delete mode 100644 tests/dictionaries/10load_disabled_if_not_in_fallback_force/tiramisu/__init__.py delete mode 100644 tests/dictionaries/10load_disabledifin_fallback/tiramisu/__init__.py delete mode 100644 tests/dictionaries/10load_disabledifin_fallback_force/tiramisu/__init__.py delete mode 100644 tests/dictionaries/10load_disabledifin_whithouttype/tiramisu/__init__.py delete mode 100644 tests/dictionaries/10load_emptyvalue/tiramisu/__init__.py delete mode 100644 tests/dictionaries/10load_frozenifin/tiramisu/__init__.py delete mode 100644 tests/dictionaries/10load_frozenifin_auto/tiramisu/__init__.py delete mode 100644 tests/dictionaries/10load_frozenifin_multiparam/tiramisu/__init__.py delete mode 100644 tests/dictionaries/10load_frozenifin_noexist/tiramisu/__init__.py create mode 100644 tests/dictionaries/10load_frozenifin_variable/00-base.xml rename tests/dictionaries/{00load_autofreeze/tiramisu => 10load_frozenifin_variable}/__init__.py (100%) create mode 100644 tests/dictionaries/10load_frozenifin_variable/makedict/base.json create mode 100644 tests/dictionaries/10load_frozenifin_variable/tiramisu/base.py delete mode 100644 tests/dictionaries/10load_frozenifnotin/tiramisu/__init__.py delete mode 100644 tests/dictionaries/10load_frozenifnotin_noexist/tiramisu/__init__.py delete mode 100644 tests/dictionaries/10load_hidden_if_empty_family/tiramisu/__init__.py delete mode 100644 tests/dictionaries/10load_hidden_if_family/tiramisu/__init__.py delete mode 100644 tests/dictionaries/10load_leadership/tiramisu/__init__.py delete mode 100644 tests/dictionaries/10load_leadership_default_multi/tiramisu/__init__.py delete mode 100644 tests/dictionaries/10load_leadership_default_submulti/tiramisu/__init__.py delete mode 100644 tests/dictionaries/10load_leadership_defaultmulti_leader/tiramisu/__init__.py delete mode 100644 tests/dictionaries/10load_leadership_description/tiramisu/__init__.py delete mode 100644 tests/dictionaries/10load_leadership_name/tiramisu/__init__.py delete mode 100644 tests/dictionaries/10load_leadership_normalize_family/tiramisu/__init__.py delete mode 100644 tests/dictionaries/10load_leadership_submulti/tiramisu/__init__.py delete mode 100644 tests/dictionaries/10load_mandatoryifin/tiramisu/__init__.py delete mode 100644 tests/dictionaries/10load_mandatoryifnotin_noexist/tiramisu/__init__.py delete mode 100644 tests/dictionaries/10load_multivalue/tiramisu/__init__.py delete mode 100644 tests/dictionaries/10valid_enum_accent/tiramisu/__init__.py delete mode 100644 tests/dictionaries/10valid_enum_base/tiramisu/__init__.py delete mode 100644 tests/dictionaries/10valid_enum_base_redefine/tiramisu/__init__.py delete mode 100644 tests/dictionaries/10valid_enum_leader/tiramisu/__init__.py delete mode 100644 tests/dictionaries/10valid_enum_mandatory/tiramisu/__init__.py delete mode 100644 tests/dictionaries/10valid_enum_multi/tiramisu/__init__.py delete mode 100644 tests/dictionaries/10valid_enum_none/tiramisu/__init__.py delete mode 100644 tests/dictionaries/10valid_enum_number/tiramisu/__init__.py delete mode 100644 tests/dictionaries/10valid_enum_numberdefault/tiramisu/__init__.py delete mode 100644 tests/dictionaries/10valid_enum_quote/tiramisu/__init__.py delete mode 100644 tests/dictionaries/10valid_enum_value/tiramisu/__init__.py delete mode 100644 tests/dictionaries/11disabled_if_in_filelist/tiramisu/__init__.py delete mode 100644 tests/dictionaries/11disabled_if_in_filelist_disabled/tiramisu/__init__.py delete mode 100644 tests/dictionaries/11disabled_if_in_filelist_multi/tiramisu/__init__.py delete mode 100644 tests/dictionaries/11disabledifin_filelist_notexist/tiramisu/__init__.py delete mode 100644 tests/dictionaries/11disabledifnotin_filelist_notexist/tiramisu/__init__.py delete mode 100644 tests/dictionaries/11disabledifnotin_filelist_notexist_multi/tiramisu/__init__.py delete mode 100644 tests/dictionaries/11disabledifnotin_filelist_notexist_validenum/tiramisu/__init__.py delete mode 100644 tests/dictionaries/11multi_disabled_if_in_filelist/tiramisu/__init__.py delete mode 100644 tests/dictionaries/11valid_enum_variable/tiramisu/__init__.py delete mode 100644 tests/dictionaries/20family_append/tiramisu/__init__.py delete mode 100644 tests/dictionaries/20family_appendaccent/tiramisu/__init__.py delete mode 100644 tests/dictionaries/20family_dynamic/tiramisu/__init__.py delete mode 100644 tests/dictionaries/20family_dynamic_calc/tiramisu/__init__.py delete mode 100644 tests/dictionaries/20family_dynamic_calc2/tiramisu/__init__.py delete mode 100644 tests/dictionaries/20family_dynamic_calc_suffix/tiramisu/__init__.py delete mode 100644 tests/dictionaries/20family_dynamic_description/tiramisu/__init__.py delete mode 100644 tests/dictionaries/20family_dynamic_number/tiramisu/__init__.py delete mode 100644 tests/dictionaries/20family_empty/tiramisu/__init__.py delete mode 100644 tests/dictionaries/20family_hidden/tiramisu/__init__.py delete mode 100644 tests/dictionaries/20family_mode/tiramisu/__init__.py delete mode 100644 tests/dictionaries/20family_modeleadership/tiramisu/__init__.py delete mode 100644 tests/dictionaries/20notemplating/tiramisu/__init__.py delete mode 100644 tests/dictionaries/20override/tiramisu/__init__.py delete mode 100644 tests/dictionaries/21family_empty/tiramisu/__init__.py delete mode 100644 tests/dictionaries/30mandatory_withoutvalue/tiramisu/__init__.py delete mode 100644 tests/dictionaries/30mandatory_withoutvaluecalc/tiramisu/__init__.py delete mode 100644 tests/dictionaries/30mandatory_withvalue/tiramisu/__init__.py delete mode 100644 tests/dictionaries/30mandatory_withvaluecalc/tiramisu/__init__.py delete mode 100644 tests/dictionaries/40condition_base/tiramisu/__init__.py delete mode 100644 tests/dictionaries/40condition_base_add/tiramisu/__init__.py delete mode 100644 tests/dictionaries/40condition_fallback/tiramisu/__init__.py delete mode 100644 tests/dictionaries/40condition_optional/tiramisu/__init__.py delete mode 100644 tests/dictionaries/40condition_optional_empty/tiramisu/__init__.py delete mode 100644 tests/dictionaries/40hidden_if_in_group_fallback/tiramisu/__init__.py delete mode 100644 tests/dictionaries/40ifin_leadership/tiramisu/__init__.py delete mode 100644 tests/dictionaries/40ifin_leadershipauto/tiramisu/__init__.py delete mode 100644 tests/dictionaries/40ifin_multi/tiramisu/__init__.py delete mode 100644 tests/dictionaries/40ifin_validenum/tiramisu/__init__.py delete mode 100644 tests/dictionaries/50exists_exists/tiramisu/__init__.py delete mode 100644 tests/dictionaries/50redefine_description/tiramisu/__init__.py delete mode 100644 tests/dictionaries/51exists_nonexists/tiramisu/__init__.py delete mode 100644 tests/dictionaries/51exists_redefine/tiramisu/__init__.py delete mode 100644 tests/dictionaries/51redefine_auto/tiramisu/__init__.py delete mode 100644 tests/dictionaries/51redefine_autofill/tiramisu/__init__.py delete mode 100644 tests/dictionaries/51redefine_family/tiramisu/__init__.py delete mode 100644 tests/dictionaries/51redefine_fill/tiramisu/__init__.py delete mode 100644 tests/dictionaries/51redefine_fillauto/tiramisu/__init__.py delete mode 100644 tests/dictionaries/51redefine_help/tiramisu/__init__.py delete mode 100644 tests/dictionaries/51redefine_hidden/tiramisu/__init__.py delete mode 100644 tests/dictionaries/51redefine_remove_check/tiramisu/__init__.py delete mode 100644 tests/dictionaries/51redefine_remove_condition/tiramisu/__init__.py delete mode 100644 tests/dictionaries/51redefine_removecondition_nonautofreeze/tiramisu/__init__.py delete mode 100644 tests/dictionaries/51redefine_validenum/tiramisu/__init__.py delete mode 100644 tests/dictionaries/51redefine_value/tiramisu/__init__.py delete mode 100644 tests/dictionaries/51remove_fill/tiramisu/__init__.py delete mode 100644 tests/dictionaries/52exists_redefine/tiramisu/__init__.py delete mode 100644 tests/dictionaries/60action_external/tiramisu/__init__.py delete mode 100644 tests/dictionaries/60extra_externalspacecondition/tiramisu/__init__.py delete mode 100644 tests/dictionaries/60extra_group/tiramisu/__init__.py delete mode 100644 tests/dictionaries/60extra_help/tiramisu/__init__.py delete mode 100644 tests/dictionaries/60extra_load/tiramisu/__init__.py delete mode 100644 tests/dictionaries/60extra_mandatory/tiramisu/__init__.py delete mode 100644 tests/dictionaries/60extra_name_family/tiramisu/__init__.py delete mode 100644 tests/dictionaries/60extra_redefine/tiramisu/__init__.py delete mode 100644 tests/dictionaries/60familyaction/tiramisu/__init__.py delete mode 100644 tests/dictionaries/60familyaction_accent/tiramisu/__init__.py delete mode 100644 tests/dictionaries/60familyaction_mandatory/tiramisu/__init__.py delete mode 100644 tests/dictionaries/70container_files/tiramisu/__init__.py delete mode 100644 tests/dictionaries/70container_files_symlink_multi/tiramisu/__init__.py delete mode 100644 tests/dictionaries/70container_files_symlink_multi_variable/tiramisu/__init__.py delete mode 100644 tests/dictionaries/70container_files_symlink_variable/tiramisu/__init__.py delete mode 100644 tests/dictionaries/70container_files_twice/tiramisu/__init__.py delete mode 100644 tests/dictionaries/70container_filesmulti/tiramisu/__init__.py delete mode 100644 tests/dictionaries/70container_filesredefine/tiramisu/__init__.py delete mode 100644 tests/dictionaries/70container_new/tiramisu/__init__.py delete mode 100644 tests/dictionaries/70container_newnocont/tiramisu/__init__.py delete mode 100644 tests/dictionaries/70container_newwithip/tiramisu/__init__.py delete mode 100644 tests/dictionaries/70container_pathaccess/tiramisu/__init__.py delete mode 100644 tests/dictionaries/70container_pathaccess_leadership/tiramisu/__init__.py delete mode 100644 tests/dictionaries/70container_save/tiramisu/__init__.py delete mode 100644 tests/dictionaries/70container_serviceaccess/tiramisu/__init__.py delete mode 100644 tests/dictionaries/70container_servicerestriction/tiramisu/__init__.py delete mode 100644 tests/dictionaries/70container_services/tiramisu/__init__.py delete mode 100644 tests/dictionaries/70services_unmanage/tiramisu/__init__.py create mode 100644 tests/dictionaries/80frozenifin_unknown/00-base.xml rename tests/dictionaries/{00load_autofreezeexpert/tiramisu => 80frozenifin_unknown}/__init__.py (100%) rename tests/dictionaries/{00load_autosave/tiramisu/__init__.py => 80frozenifin_unknown/errno_23} (100%) diff --git a/src/rougail/tiramisureflector.py b/src/rougail/tiramisureflector.py index 7f3f9c8b..c9382907 100644 --- a/src/rougail/tiramisureflector.py +++ b/src/rougail/tiramisureflector.py @@ -32,7 +32,7 @@ from .annotator import CONVERT_OPTION from .objspace import RootRougailObject -FUNC_TO_DICT = [] +FUNC_TO_DICT = ['calc_value'] class Root(): # pylint: disable=R0903 @@ -220,7 +220,7 @@ class Common: f"'expected': ParamValue('{child.expected}')") if child.inverse: kwargs += ", 'reverse_condition': ParamValue(True)" - return f"Calculation(calc_value, Params(ParamValue('{child.name}'), kwargs={{{kwargs}}}))" + return f"Calculation(func.calc_value, Params(ParamValue('{child.name}'), kwargs={{{kwargs}}}))" def populate_informations(self): """Populate Tiramisu's informations diff --git a/tests/dictionaries/00load_autofreeze/tiramisu/base.py b/tests/dictionaries/00load_autofreeze/tiramisu/base.py index aee73a89..55f1880d 100644 --- a/tests/dictionaries/00load_autofreeze/tiramisu/base.py +++ b/tests/dictionaries/00load_autofreeze/tiramisu/base.py @@ -13,7 +13,7 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_4 = StrOption(name="module_instancie", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"auto_freeze", "basic", "force_store_value", "mandatory", Calculation(calc_value, Params(ParamValue('auto_frozen'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)}))})) +option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"auto_freeze", "basic", "force_store_value", "mandatory", Calculation(func.calc_value, Params(ParamValue('auto_frozen'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)}))})) option_2 = OptionDescription(name="general", doc="général", children=[option_3, option_4], properties=frozenset({"basic"})) option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1]) diff --git a/tests/dictionaries/00load_autofreezeexpert/tiramisu/base.py b/tests/dictionaries/00load_autofreezeexpert/tiramisu/base.py index e4c93591..02372658 100644 --- a/tests/dictionaries/00load_autofreezeexpert/tiramisu/base.py +++ b/tests/dictionaries/00load_autofreezeexpert/tiramisu/base.py @@ -13,7 +13,7 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_4 = StrOption(name="module_instancie", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"auto_freeze", "expert", "force_store_value", "mandatory", Calculation(calc_value, Params(ParamValue('auto_frozen'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)}))})) +option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"auto_freeze", "expert", "force_store_value", "mandatory", Calculation(func.calc_value, Params(ParamValue('auto_frozen'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)}))})) option_2 = OptionDescription(name="general", doc="général", children=[option_3, option_4], properties=frozenset({"normal"})) option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1]) diff --git a/tests/dictionaries/00load_autosaveexpert/tiramisu/__init__.py b/tests/dictionaries/00load_autosaveexpert/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/00load_comment/tiramisu/__init__.py b/tests/dictionaries/00load_comment/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/00load_notype/tiramisu/__init__.py b/tests/dictionaries/00load_notype/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/00load_save/tiramisu/__init__.py b/tests/dictionaries/00load_save/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/00load_subfolder/tiramisu/__init__.py b/tests/dictionaries/00load_subfolder/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/01auto_autofreeze/tiramisu/base.py b/tests/dictionaries/01auto_autofreeze/tiramisu/base.py index 816ad9d4..6ebbca2d 100644 --- a/tests/dictionaries/01auto_autofreeze/tiramisu/base.py +++ b/tests/dictionaries/01auto_autofreeze/tiramisu/base.py @@ -13,7 +13,7 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name="module_instancie", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.calc_val, Params((ParamValue("oui")))), properties=frozenset({"auto_freeze", "basic", "force_store_value", "frozen", "hidden", Calculation(calc_value, Params(ParamValue('auto_frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)}))})) +option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.calc_val, Params((ParamValue("oui")))), properties=frozenset({"auto_freeze", "basic", "force_store_value", "frozen", "hidden", Calculation(func.calc_value, Params(ParamValue('auto_frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)}))})) option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4], properties=frozenset({"basic"})) option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1]) diff --git a/tests/dictionaries/01auto_base/tiramisu/__init__.py b/tests/dictionaries/01auto_base/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/01auto_withoutparam/tiramisu/__init__.py b/tests/dictionaries/01auto_withoutparam/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/01base_file_include/tiramisu/__init__.py b/tests/dictionaries/01base_file_include/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/01base_file_patch/tiramisu/__init__.py b/tests/dictionaries/01base_file_patch/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/01base_file_utfchar/tiramisu/__init__.py b/tests/dictionaries/01base_file_utfchar/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/01base_float/tiramisu/__init__.py b/tests/dictionaries/01base_float/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/01base_help_quote/tiramisu/__init__.py b/tests/dictionaries/01base_help_quote/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/01base_multi/tiramisu/__init__.py b/tests/dictionaries/01base_multi/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/01base_value_doublequote/tiramisu/__init__.py b/tests/dictionaries/01base_value_doublequote/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/01base_value_doublequote2/tiramisu/__init__.py b/tests/dictionaries/01base_value_doublequote2/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/01base_value_doublequote3/tiramisu/__init__.py b/tests/dictionaries/01base_value_doublequote3/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/01base_value_multi_doublequote/tiramisu/__init__.py b/tests/dictionaries/01base_value_multi_doublequote/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/01base_value_multi_doublequote2/tiramisu/__init__.py b/tests/dictionaries/01base_value_multi_doublequote2/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/01base_value_multi_quote/tiramisu/__init__.py b/tests/dictionaries/01base_value_multi_quote/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/01base_value_quote/tiramisu/__init__.py b/tests/dictionaries/01base_value_quote/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/01base_var_name_same_family/tiramisu/__init__.py b/tests/dictionaries/01base_var_name_same_family/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/01family_description/tiramisu/__init__.py b/tests/dictionaries/01family_description/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/01fill_autofreeze/tiramisu/__init__.py b/tests/dictionaries/01fill_autofreeze/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/01fill_autofreeze/tiramisu/base.py b/tests/dictionaries/01fill_autofreeze/tiramisu/base.py index 9e518ee2..1604838a 100644 --- a/tests/dictionaries/01fill_autofreeze/tiramisu/base.py +++ b/tests/dictionaries/01fill_autofreeze/tiramisu/base.py @@ -14,7 +14,7 @@ except: from rougail.tiramisu import ConvertDynOptionDescription option_4 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) option_5 = StrOption(name="module_instancie", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.calc_val, Params((ParamOption(option_4)))), properties=frozenset({"auto_freeze", "basic", "force_store_value", Calculation(calc_value, Params(ParamValue('auto_frozen'), kwargs={'condition': ParamOption(option_5, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)}))})) +option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.calc_val, Params((ParamOption(option_4)))), properties=frozenset({"auto_freeze", "basic", "force_store_value", Calculation(func.calc_value, Params(ParamValue('auto_frozen'), kwargs={'condition': ParamOption(option_5, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)}))})) option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"basic"})) option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1]) diff --git a/tests/dictionaries/01fill_autosave/tiramisu/__init__.py b/tests/dictionaries/01fill_autosave/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/01fill_base/tiramisu/__init__.py b/tests/dictionaries/01fill_base/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/01fill_baseaccent/tiramisu/__init__.py b/tests/dictionaries/01fill_baseaccent/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/01fill_mandatory/tiramisu/__init__.py b/tests/dictionaries/01fill_mandatory/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/01fill_number/tiramisu/__init__.py b/tests/dictionaries/01fill_number/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/01fill_only_optional/tiramisu/__init__.py b/tests/dictionaries/01fill_only_optional/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/01fill_optional/tiramisu/__init__.py b/tests/dictionaries/01fill_optional/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/01fill_quote/tiramisu/__init__.py b/tests/dictionaries/01fill_quote/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/01hidden_if_in_autofreeze/tiramisu/base.py b/tests/dictionaries/01hidden_if_in_autofreeze/tiramisu/base.py index 26f51728..49bc4bc5 100644 --- a/tests/dictionaries/01hidden_if_in_autofreeze/tiramisu/base.py +++ b/tests/dictionaries/01hidden_if_in_autofreeze/tiramisu/base.py @@ -13,7 +13,7 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name="module_instancie", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.calc_val, Params((ParamValue("oui")))), properties=frozenset({"auto_freeze", "basic", "force_store_value", Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('auto_frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)}))})) +option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.calc_val, Params((ParamValue("oui")))), properties=frozenset({"auto_freeze", "basic", "force_store_value", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(func.calc_value, Params(ParamValue('auto_frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)}))})) option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4], properties=frozenset({"basic"})) option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1]) diff --git a/tests/dictionaries/01test/tiramisu/__init__.py b/tests/dictionaries/01test/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/01test_multi/tiramisu/__init__.py b/tests/dictionaries/01test_multi/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/01test_multi_none/tiramisu/__init__.py b/tests/dictionaries/01test_multi_none/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/01test_redefine/tiramisu/__init__.py b/tests/dictionaries/01test_redefine/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/01test_redefine_remove/tiramisu/__init__.py b/tests/dictionaries/01test_redefine_remove/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/02autosave_hidden_frozenifin/tiramisu/base.py b/tests/dictionaries/02autosave_hidden_frozenifin/tiramisu/base.py index 32a19e18..7fe23bdd 100644 --- a/tests/dictionaries/02autosave_hidden_frozenifin/tiramisu/base.py +++ b/tests/dictionaries/02autosave_hidden_frozenifin/tiramisu/base.py @@ -13,7 +13,7 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) -option_4 = StrOption(name="autosavevar", doc="autosave variable", default=Calculation(func.calc_val, Params((ParamValue("oui")))), properties=frozenset({"basic", "force_store_value", Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) +option_4 = StrOption(name="autosavevar", doc="autosave variable", default=Calculation(func.calc_val, Params((ParamValue("oui")))), properties=frozenset({"basic", "force_store_value", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) option_2 = OptionDescription(name="general", doc="général", children=[option_3, option_4], properties=frozenset({"basic"})) option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1]) diff --git a/tests/dictionaries/10autosave_hidden/tiramisu/__init__.py b/tests/dictionaries/10autosave_hidden/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/10check_base/tiramisu/__init__.py b/tests/dictionaries/10check_base/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/10check_no_param/tiramisu/__init__.py b/tests/dictionaries/10check_no_param/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/10check_option/tiramisu/__init__.py b/tests/dictionaries/10check_option/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/10check_optional/tiramisu/__init__.py b/tests/dictionaries/10check_optional/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/10check_valid_differ/tiramisu/__init__.py b/tests/dictionaries/10check_valid_differ/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/10check_valid_in_network/tiramisu/__init__.py b/tests/dictionaries/10check_valid_in_network/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/10check_valid_in_network_cidr/tiramisu/__init__.py b/tests/dictionaries/10check_valid_in_network_cidr/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/10fill_information/tiramisu/__init__.py b/tests/dictionaries/10fill_information/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/10frozenifin_unknown_valid_enum_number/00-base.xml b/tests/dictionaries/10frozenifin_unknown_valid_enum_number/00-base.xml new file mode 100644 index 00000000..95c633d4 --- /dev/null +++ b/tests/dictionaries/10frozenifin_unknown_valid_enum_number/00-base.xml @@ -0,0 +1,29 @@ + + + + + + non + + + + + + + + + + + 1 + 2 + 3 + + + 4 + test_variable + + + + + diff --git a/tests/dictionaries/00empty/tiramisu/__init__.py b/tests/dictionaries/10frozenifin_unknown_valid_enum_number/__init__.py similarity index 100% rename from tests/dictionaries/00empty/tiramisu/__init__.py rename to tests/dictionaries/10frozenifin_unknown_valid_enum_number/__init__.py diff --git a/tests/dictionaries/10frozenifin_unknown_valid_enum_number/makedict/base.json b/tests/dictionaries/10frozenifin_unknown_valid_enum_number/makedict/base.json new file mode 100644 index 00000000..b61138dc --- /dev/null +++ b/tests/dictionaries/10frozenifin_unknown_valid_enum_number/makedict/base.json @@ -0,0 +1 @@ +{"rougail.general.mode_conteneur_actif": "non", "rougail.enumfam.enumvar": 1, "rougail.enumfam.test_variable": null} diff --git a/tests/dictionaries/10frozenifin_unknown_valid_enum_number/tiramisu/base.py b/tests/dictionaries/10frozenifin_unknown_valid_enum_number/tiramisu/base.py new file mode 100644 index 00000000..811e1b2a --- /dev/null +++ b/tests/dictionaries/10frozenifin_unknown_valid_enum_number/tiramisu/base.py @@ -0,0 +1,22 @@ +from importlib.machinery import SourceFileLoader +from importlib.util import spec_from_loader, module_from_spec +loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py') +spec = spec_from_loader(loader.name, loader) +func = module_from_spec(spec) +loader.exec_module(func) +for key, value in dict(locals()).items(): + if key != ['SourceFileLoader', 'func']: + setattr(func, key, value) +try: + from tiramisu3 import * +except: + from tiramisu import * +from rougail.tiramisu import ConvertDynOptionDescription +option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"expert", "mandatory"})) +option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"expert"})) +option_5 = ChoiceOption(name="enumvar", doc="enumvar", values=(1, 2, 3), default=1, properties=frozenset({"expert", "mandatory"})) +option_5.impl_set_information('help', "bla bla bla") +option_6 = IntOption(name="test_variable", doc="test variable", properties=frozenset({"expert"})) +option_4 = OptionDescription(name="enumfam", doc="enumfam", children=[option_5, option_6], properties=frozenset({"expert"})) +option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_4]) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1]) diff --git a/tests/dictionaries/10leadership_append/tiramisu/__init__.py b/tests/dictionaries/10leadership_append/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/10leadership_append_hidden/tiramisu/__init__.py b/tests/dictionaries/10leadership_append_hidden/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/10leadership_append_name/tiramisu/__init__.py b/tests/dictionaries/10leadership_append_name/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/10leadership_auto/tiramisu/__init__.py b/tests/dictionaries/10leadership_auto/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/10leadership_autoleader/tiramisu/__init__.py b/tests/dictionaries/10leadership_autoleader/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/10leadership_autoleader_expert/tiramisu/__init__.py b/tests/dictionaries/10leadership_autoleader_expert/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/10leadership_autosaveexpert/tiramisu/__init__.py b/tests/dictionaries/10leadership_autosaveexpert/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/10leadership_familyaccent/tiramisu/__init__.py b/tests/dictionaries/10leadership_familyaccent/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/10leadership_leader_hidden/tiramisu/__init__.py b/tests/dictionaries/10leadership_leader_hidden/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/10leadership_leader_hidden_if_in/tiramisu/__init__.py b/tests/dictionaries/10leadership_leader_hidden_if_in/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/10leadership_leader_hidden_if_in/tiramisu/base.py b/tests/dictionaries/10leadership_leader_hidden_if_in/tiramisu/base.py index 71e96244..70c9ee95 100644 --- a/tests/dictionaries/10leadership_leader_hidden_if_in/tiramisu/base.py +++ b/tests/dictionaries/10leadership_leader_hidden_if_in/tiramisu/base.py @@ -14,10 +14,10 @@ except: from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"expert", "mandatory"})) option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"expert"})) -option_6 = StrOption(name="leader", doc="leader", multi=True, properties=frozenset({Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('non')})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('non')}))})) -option_7 = StrOption(name="follower1", doc="follower1", multi=True, properties=frozenset({"normal", Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('non')})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('non')}))})) -option_8 = StrOption(name="follower2", doc="follower2", multi=True, properties=frozenset({"normal", Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('non')})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('non')}))})) -option_5 = Leadership(name="leader", doc="leader", children=[option_6, option_7, option_8], properties=frozenset({"normal", Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('non')}))})) +option_6 = StrOption(name="leader", doc="leader", multi=True, properties=frozenset({Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('non')})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('non')}))})) +option_7 = StrOption(name="follower1", doc="follower1", multi=True, properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('non')})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('non')}))})) +option_8 = StrOption(name="follower2", doc="follower2", multi=True, properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('non')})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('non')}))})) +option_5 = Leadership(name="leader", doc="leader", children=[option_6, option_7, option_8], properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('non')}))})) option_4 = OptionDescription(name="leadermode", doc="leadermode", children=[option_5], properties=frozenset({"normal"})) option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_4]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1]) diff --git a/tests/dictionaries/10leadership_leader_hidden_if_in_name/tiramisu/__init__.py b/tests/dictionaries/10leadership_leader_hidden_if_in_name/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/10leadership_leader_hidden_if_in_name/tiramisu/base.py b/tests/dictionaries/10leadership_leader_hidden_if_in_name/tiramisu/base.py index 5a957c9f..b1dc1067 100644 --- a/tests/dictionaries/10leadership_leader_hidden_if_in_name/tiramisu/base.py +++ b/tests/dictionaries/10leadership_leader_hidden_if_in_name/tiramisu/base.py @@ -14,10 +14,10 @@ except: from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"expert", "mandatory"})) option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"expert"})) -option_6 = StrOption(name="leader", doc="leader", multi=True, properties=frozenset({Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('non')})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('non')}))})) -option_7 = StrOption(name="follower1", doc="follower1", multi=True, properties=frozenset({"normal", Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('non')})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('non')}))})) -option_8 = StrOption(name="follower2", doc="follower2", multi=True, properties=frozenset({"normal", Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('non')})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('non')}))})) -option_5 = Leadership(name="other", doc="other", children=[option_6, option_7, option_8], properties=frozenset({"normal", Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('non')}))})) +option_6 = StrOption(name="leader", doc="leader", multi=True, properties=frozenset({Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('non')})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('non')}))})) +option_7 = StrOption(name="follower1", doc="follower1", multi=True, properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('non')})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('non')}))})) +option_8 = StrOption(name="follower2", doc="follower2", multi=True, properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('non')})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('non')}))})) +option_5 = Leadership(name="other", doc="other", children=[option_6, option_7, option_8], properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('non')}))})) option_4 = OptionDescription(name="leadermode", doc="leadermode", children=[option_5], properties=frozenset({"normal"})) option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_4]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1]) diff --git a/tests/dictionaries/10leadership_leadermandatory/tiramisu/__init__.py b/tests/dictionaries/10leadership_leadermandatory/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/10leadership_mandatory/tiramisu/__init__.py b/tests/dictionaries/10leadership_mandatory/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/10leadership_mandatoryfollower/tiramisu/__init__.py b/tests/dictionaries/10leadership_mandatoryfollower/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/10leadership_multi/tiramisu/__init__.py b/tests/dictionaries/10leadership_multi/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/10load_disabled_if_in/tiramisu/__init__.py b/tests/dictionaries/10load_disabled_if_in/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/10load_disabled_if_in/tiramisu/base.py b/tests/dictionaries/10load_disabled_if_in/tiramisu/base.py index ab424a19..bf39826c 100644 --- a/tests/dictionaries/10load_disabled_if_in/tiramisu/base.py +++ b/tests/dictionaries/10load_disabled_if_in/tiramisu/base.py @@ -13,8 +13,8 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) -option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) +option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) +option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"})) option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1]) diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param/tiramisu/__init__.py b/tests/dictionaries/10load_disabled_if_in_multi_param/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param/tiramisu/base.py b/tests/dictionaries/10load_disabled_if_in_multi_param/tiramisu/base.py index ddfdcdf9..0e6a5dc7 100644 --- a/tests/dictionaries/10load_disabled_if_in_multi_param/tiramisu/base.py +++ b/tests/dictionaries/10load_disabled_if_in_multi_param/tiramisu/base.py @@ -13,8 +13,8 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('maybe')}))})) -option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('maybe')}))})) +option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('maybe')}))})) +option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('maybe')}))})) option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"})) option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2]) option_10 = StrOption(name="group", doc="group", default="root") @@ -23,7 +23,7 @@ option_12 = StrOption(name="name", doc="name", default="/tmp/file1") option_13 = StrOption(name="owner", doc="owner", default="root") option_14 = StrOption(name="source", doc="source", default="file1") option_15 = BoolOption(name="templating", doc="templating", default=True) -option_16 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3), 'expected_0': ParamValue("oui"), 'condition_1': ParamOption(option_3), 'expected_1': ParamValue("maybe"), 'condition_operator': ParamValue("OR")}))) +option_16 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3, todict=True), 'expected_0': ParamValue("oui"), 'condition_1': ParamOption(option_3, todict=True), 'expected_1': ParamValue("maybe"), 'condition_operator': ParamValue("OR")}))) option_9 = OptionDescription(name="file1", doc="file1", children=[option_10, option_11, option_12, option_13, option_14, option_15, option_16]) option_8 = OptionDescription(name="files", doc="files", children=[option_9]) option_7 = OptionDescription(name="test", doc="test", children=[option_8]) diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param2/tiramisu/__init__.py b/tests/dictionaries/10load_disabled_if_in_multi_param2/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param2/tiramisu/base.py b/tests/dictionaries/10load_disabled_if_in_multi_param2/tiramisu/base.py index 1eecd1de..ac861601 100644 --- a/tests/dictionaries/10load_disabled_if_in_multi_param2/tiramisu/base.py +++ b/tests/dictionaries/10load_disabled_if_in_multi_param2/tiramisu/base.py @@ -14,7 +14,7 @@ except: from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name="condition", doc="No change", default="no", properties=frozenset({"mandatory", "normal"})) option_4 = StrOption(name="condition2", doc="No change", default="no", properties=frozenset({"mandatory", "normal"})) -option_5 = StrOption(name="test_variable", doc="No change", default="no", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('yes')})), Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('maybe')})), Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue('yes')})), Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue('maybe')}))})) +option_5 = StrOption(name="test_variable", doc="No change", default="no", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('yes')})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('maybe')})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue('yes')})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue('maybe')}))})) option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"})) option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2]) option_10 = StrOption(name="group", doc="group", default="root") @@ -23,7 +23,7 @@ option_12 = StrOption(name="name", doc="name", default="/tmp/file1") option_13 = StrOption(name="owner", doc="owner", default="root") option_14 = StrOption(name="source", doc="source", default="file1") option_15 = BoolOption(name="templating", doc="templating", default=True) -option_16 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3), 'expected_0': ParamValue("yes"), 'condition_1': ParamOption(option_3), 'expected_1': ParamValue("maybe"), 'condition_operator': ParamValue("OR"), 'condition_2': ParamOption(option_4), 'expected_2': ParamValue("yes"), 'condition_3': ParamOption(option_4), 'expected_3': ParamValue("maybe")}))) +option_16 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3, todict=True), 'expected_0': ParamValue("yes"), 'condition_1': ParamOption(option_3, todict=True), 'expected_1': ParamValue("maybe"), 'condition_operator': ParamValue("OR"), 'condition_2': ParamOption(option_4, todict=True), 'expected_2': ParamValue("yes"), 'condition_3': ParamOption(option_4, todict=True), 'expected_3': ParamValue("maybe")}))) option_9 = OptionDescription(name="file1", doc="file1", children=[option_10, option_11, option_12, option_13, option_14, option_15, option_16]) option_8 = OptionDescription(name="files", doc="files", children=[option_9]) option_7 = OptionDescription(name="test", doc="test", children=[option_8]) diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param_disabled/tiramisu/__init__.py b/tests/dictionaries/10load_disabled_if_in_multi_param_disabled/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param_disabled/tiramisu/base.py b/tests/dictionaries/10load_disabled_if_in_multi_param_disabled/tiramisu/base.py index 72dd21fa..54dff254 100644 --- a/tests/dictionaries/10load_disabled_if_in_multi_param_disabled/tiramisu/base.py +++ b/tests/dictionaries/10load_disabled_if_in_multi_param_disabled/tiramisu/base.py @@ -13,8 +13,8 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name="condition", doc="No change", default="oui", properties=frozenset({"mandatory", "normal"})) -option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('maybe')}))})) -option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('maybe')}))})) +option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('maybe')}))})) +option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('maybe')}))})) option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"})) option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2]) option_10 = StrOption(name="group", doc="group", default="root") @@ -23,7 +23,7 @@ option_12 = StrOption(name="name", doc="name", default="/tmp/file1") option_13 = StrOption(name="owner", doc="owner", default="root") option_14 = StrOption(name="source", doc="source", default="file1") option_15 = BoolOption(name="templating", doc="templating", default=True) -option_16 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3), 'expected_0': ParamValue("oui"), 'condition_1': ParamOption(option_3), 'expected_1': ParamValue("maybe"), 'condition_operator': ParamValue("OR")}))) +option_16 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3, todict=True), 'expected_0': ParamValue("oui"), 'condition_1': ParamOption(option_3, todict=True), 'expected_1': ParamValue("maybe"), 'condition_operator': ParamValue("OR")}))) option_9 = OptionDescription(name="file1", doc="file1", children=[option_10, option_11, option_12, option_13, option_14, option_15, option_16]) option_8 = OptionDescription(name="files", doc="files", children=[option_9]) option_7 = OptionDescription(name="test", doc="test", children=[option_8]) diff --git a/tests/dictionaries/10load_disabled_if_in_none/tiramisu/__init__.py b/tests/dictionaries/10load_disabled_if_in_none/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/10load_disabled_if_in_none/tiramisu/base.py b/tests/dictionaries/10load_disabled_if_in_none/tiramisu/base.py index 628807d5..65410feb 100644 --- a/tests/dictionaries/10load_disabled_if_in_none/tiramisu/base.py +++ b/tests/dictionaries/10load_disabled_if_in_none/tiramisu/base.py @@ -13,8 +13,8 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('None')}))})) -option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('None')}))})) +option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('None')}))})) +option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('None')}))})) option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"})) option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1]) diff --git a/tests/dictionaries/10load_disabled_if_inaccent_family/tiramisu/__init__.py b/tests/dictionaries/10load_disabled_if_inaccent_family/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/10load_disabled_if_inaccent_family/tiramisu/base.py b/tests/dictionaries/10load_disabled_if_inaccent_family/tiramisu/base.py index c96b3aea..13ebd570 100644 --- a/tests/dictionaries/10load_disabled_if_inaccent_family/tiramisu/base.py +++ b/tests/dictionaries/10load_disabled_if_inaccent_family/tiramisu/base.py @@ -13,10 +13,10 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) -option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) +option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) +option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) option_2 = OptionDescription(name="general", doc="Général", children=[option_3, option_4, option_5], properties=frozenset({"normal"})) option_7 = StrOption(name="mode_conteneur_actif3", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) -option_6 = OptionDescription(name="general2", doc="Général2", children=[option_7], properties=frozenset({"normal", Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) +option_6 = OptionDescription(name="general2", doc="Général2", children=[option_7], properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_6]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1]) diff --git a/tests/dictionaries/10load_disabled_if_not_in_fallback/tiramisu/__init__.py b/tests/dictionaries/10load_disabled_if_not_in_fallback/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/10load_disabled_if_not_in_fallback_force/tiramisu/__init__.py b/tests/dictionaries/10load_disabled_if_not_in_fallback_force/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/10load_disabledifin_fallback/tiramisu/__init__.py b/tests/dictionaries/10load_disabledifin_fallback/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/10load_disabledifin_fallback/tiramisu/base.py b/tests/dictionaries/10load_disabledifin_fallback/tiramisu/base.py index 442a927f..06006abe 100644 --- a/tests/dictionaries/10load_disabledifin_fallback/tiramisu/base.py +++ b/tests/dictionaries/10load_disabledifin_fallback/tiramisu/base.py @@ -14,7 +14,7 @@ except: from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"disabled", "mandatory", "normal"})) -option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) +option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"})) option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1]) diff --git a/tests/dictionaries/10load_disabledifin_fallback_force/tiramisu/__init__.py b/tests/dictionaries/10load_disabledifin_fallback_force/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/10load_disabledifin_fallback_force/tiramisu/base.py b/tests/dictionaries/10load_disabledifin_fallback_force/tiramisu/base.py index 4fc6f907..39342d52 100644 --- a/tests/dictionaries/10load_disabledifin_fallback_force/tiramisu/base.py +++ b/tests/dictionaries/10load_disabledifin_fallback_force/tiramisu/base.py @@ -13,8 +13,8 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) -option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) +option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) +option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"})) option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1]) diff --git a/tests/dictionaries/10load_disabledifin_whithouttype/tiramisu/__init__.py b/tests/dictionaries/10load_disabledifin_whithouttype/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/10load_disabledifin_whithouttype/tiramisu/base.py b/tests/dictionaries/10load_disabledifin_whithouttype/tiramisu/base.py index 4fc6f907..39342d52 100644 --- a/tests/dictionaries/10load_disabledifin_whithouttype/tiramisu/base.py +++ b/tests/dictionaries/10load_disabledifin_whithouttype/tiramisu/base.py @@ -13,8 +13,8 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) -option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) +option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) +option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"})) option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1]) diff --git a/tests/dictionaries/10load_emptyvalue/tiramisu/__init__.py b/tests/dictionaries/10load_emptyvalue/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/10load_frozenifin/tiramisu/__init__.py b/tests/dictionaries/10load_frozenifin/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/10load_frozenifin/tiramisu/base.py b/tests/dictionaries/10load_frozenifin/tiramisu/base.py index 5f79971a..e59e0d50 100644 --- a/tests/dictionaries/10load_frozenifin/tiramisu/base.py +++ b/tests/dictionaries/10load_frozenifin/tiramisu/base.py @@ -13,8 +13,8 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) -option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) +option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) +option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"})) option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1]) diff --git a/tests/dictionaries/10load_frozenifin_auto/tiramisu/__init__.py b/tests/dictionaries/10load_frozenifin_auto/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/10load_frozenifin_auto/tiramisu/base.py b/tests/dictionaries/10load_frozenifin_auto/tiramisu/base.py index ed67a0b6..e6299a6e 100644 --- a/tests/dictionaries/10load_frozenifin_auto/tiramisu/base.py +++ b/tests/dictionaries/10load_frozenifin_auto/tiramisu/base.py @@ -13,8 +13,8 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.calc_val, Params((ParamValue("non")))), properties=frozenset({"normal", Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) -option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) +option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default=Calculation(func.calc_val, Params((ParamValue("non")))), properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) +option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"})) option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1]) diff --git a/tests/dictionaries/10load_frozenifin_multiparam/tiramisu/__init__.py b/tests/dictionaries/10load_frozenifin_multiparam/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/10load_frozenifin_multiparam/tiramisu/base.py b/tests/dictionaries/10load_frozenifin_multiparam/tiramisu/base.py index eb0b9026..1267d620 100644 --- a/tests/dictionaries/10load_frozenifin_multiparam/tiramisu/base.py +++ b/tests/dictionaries/10load_frozenifin_multiparam/tiramisu/base.py @@ -13,8 +13,8 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = ChoiceOption(name="condition", doc="No change", values=('tous', 'authentifié', 'aucun'), default="tous", properties=frozenset({"mandatory", "normal"})) -option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('tous')})), Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('tous')})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('tous')})), Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('authentifié')})), Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('authentifié')})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('authentifié')}))})) -option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('tous')})), Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('tous')})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('tous')})), Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('authentifié')})), Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('authentifié')})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('authentifié')}))})) +option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('tous')})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('tous')})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('tous')})), Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('authentifié')})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('authentifié')})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('authentifié')}))})) +option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('tous')})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('tous')})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('tous')})), Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('authentifié')})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('authentifié')})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('authentifié')}))})) option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"})) option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1]) diff --git a/tests/dictionaries/10load_frozenifin_noexist/tiramisu/__init__.py b/tests/dictionaries/10load_frozenifin_noexist/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/10load_frozenifin_variable/00-base.xml b/tests/dictionaries/10load_frozenifin_variable/00-base.xml new file mode 100644 index 00000000..cac5aee5 --- /dev/null +++ b/tests/dictionaries/10load_frozenifin_variable/00-base.xml @@ -0,0 +1,33 @@ + + + + + + + + tous + + + tous + + + non + + + + + + + tous + authentifié + aucun + + + mode_conteneur_actif + mode_conteneur_actif2 + + + + + diff --git a/tests/dictionaries/00load_autofreeze/tiramisu/__init__.py b/tests/dictionaries/10load_frozenifin_variable/__init__.py similarity index 100% rename from tests/dictionaries/00load_autofreeze/tiramisu/__init__.py rename to tests/dictionaries/10load_frozenifin_variable/__init__.py diff --git a/tests/dictionaries/10load_frozenifin_variable/makedict/base.json b/tests/dictionaries/10load_frozenifin_variable/makedict/base.json new file mode 100644 index 00000000..7aa1f222 --- /dev/null +++ b/tests/dictionaries/10load_frozenifin_variable/makedict/base.json @@ -0,0 +1 @@ +{"rougail.general.condition": "tous", "rougail.general.mode_conteneur_actif": "tous", "rougail.general.mode_conteneur_actif2": "non"} diff --git a/tests/dictionaries/10load_frozenifin_variable/tiramisu/base.py b/tests/dictionaries/10load_frozenifin_variable/tiramisu/base.py new file mode 100644 index 00000000..c3cac38d --- /dev/null +++ b/tests/dictionaries/10load_frozenifin_variable/tiramisu/base.py @@ -0,0 +1,20 @@ +from importlib.machinery import SourceFileLoader +from importlib.util import spec_from_loader, module_from_spec +loader = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py') +spec = spec_from_loader(loader.name, loader) +func = module_from_spec(spec) +loader.exec_module(func) +for key, value in dict(locals()).items(): + if key != ['SourceFileLoader', 'func']: + setattr(func, key, value) +try: + from tiramisu3 import * +except: + from tiramisu import * +from rougail.tiramisu import ConvertDynOptionDescription +option_3 = ChoiceOption(name="condition", doc="No change", values=('tous', 'authentifié', 'aucun'), default="tous", properties=frozenset({"mandatory", "normal"})) +option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="tous", properties=frozenset({"mandatory", "normal"})) +option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('mode_conteneur_actif')})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('mode_conteneur_actif')})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('mode_conteneur_actif')}))})) +option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"})) +option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2]) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1]) diff --git a/tests/dictionaries/10load_frozenifnotin/tiramisu/__init__.py b/tests/dictionaries/10load_frozenifnotin/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/10load_frozenifnotin/tiramisu/base.py b/tests/dictionaries/10load_frozenifnotin/tiramisu/base.py index 82a734ac..e76e90e8 100644 --- a/tests/dictionaries/10load_frozenifnotin/tiramisu/base.py +++ b/tests/dictionaries/10load_frozenifnotin/tiramisu/base.py @@ -13,8 +13,8 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)})), Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)}))})) -option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)})), Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)}))})) +option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)}))})) +option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)}))})) option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"})) option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1]) diff --git a/tests/dictionaries/10load_frozenifnotin_noexist/tiramisu/__init__.py b/tests/dictionaries/10load_frozenifnotin_noexist/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/10load_hidden_if_empty_family/tiramisu/__init__.py b/tests/dictionaries/10load_hidden_if_empty_family/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/10load_hidden_if_empty_family/tiramisu/base.py b/tests/dictionaries/10load_hidden_if_empty_family/tiramisu/base.py index 76c2af95..a0554aee 100644 --- a/tests/dictionaries/10load_hidden_if_empty_family/tiramisu/base.py +++ b/tests/dictionaries/10load_hidden_if_empty_family/tiramisu/base.py @@ -13,8 +13,8 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) -option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) +option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) +option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) option_2 = OptionDescription(name="general", doc="Général", children=[option_3, option_4, option_5], properties=frozenset({"normal"})) option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1]) diff --git a/tests/dictionaries/10load_hidden_if_family/tiramisu/__init__.py b/tests/dictionaries/10load_hidden_if_family/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/10load_hidden_if_family/tiramisu/base.py b/tests/dictionaries/10load_hidden_if_family/tiramisu/base.py index 2ae7c277..5e09a009 100644 --- a/tests/dictionaries/10load_hidden_if_family/tiramisu/base.py +++ b/tests/dictionaries/10load_hidden_if_family/tiramisu/base.py @@ -13,10 +13,10 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) -option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) +option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) +option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) option_2 = OptionDescription(name="general", doc="Général", children=[option_3, option_4, option_5], properties=frozenset({"normal"})) -option_7 = StrOption(name="mode_conteneur_actif3", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) -option_6 = OptionDescription(name="general2", doc="Général2", children=[option_7], properties=frozenset({"normal", Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) +option_7 = StrOption(name="mode_conteneur_actif3", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) +option_6 = OptionDescription(name="general2", doc="Général2", children=[option_7], properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_6]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1]) diff --git a/tests/dictionaries/10load_leadership/tiramisu/__init__.py b/tests/dictionaries/10load_leadership/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/10load_leadership_default_multi/tiramisu/__init__.py b/tests/dictionaries/10load_leadership_default_multi/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/10load_leadership_default_submulti/tiramisu/__init__.py b/tests/dictionaries/10load_leadership_default_submulti/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/10load_leadership_defaultmulti_leader/tiramisu/__init__.py b/tests/dictionaries/10load_leadership_defaultmulti_leader/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/10load_leadership_description/tiramisu/__init__.py b/tests/dictionaries/10load_leadership_description/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/10load_leadership_name/tiramisu/__init__.py b/tests/dictionaries/10load_leadership_name/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/10load_leadership_normalize_family/tiramisu/__init__.py b/tests/dictionaries/10load_leadership_normalize_family/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/10load_leadership_submulti/tiramisu/__init__.py b/tests/dictionaries/10load_leadership_submulti/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/10load_mandatoryifin/tiramisu/__init__.py b/tests/dictionaries/10load_mandatoryifin/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/10load_mandatoryifin/tiramisu/base.py b/tests/dictionaries/10load_mandatoryifin/tiramisu/base.py index bbb97f64..5972505d 100644 --- a/tests/dictionaries/10load_mandatoryifin/tiramisu/base.py +++ b/tests/dictionaries/10load_mandatoryifin/tiramisu/base.py @@ -13,8 +13,8 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(calc_value, Params(ParamValue('mandatory'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) -option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(calc_value, Params(ParamValue('mandatory'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) +option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('mandatory'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) +option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('mandatory'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"})) option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1]) diff --git a/tests/dictionaries/10load_mandatoryifnotin_noexist/tiramisu/__init__.py b/tests/dictionaries/10load_mandatoryifnotin_noexist/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/10load_multivalue/tiramisu/__init__.py b/tests/dictionaries/10load_multivalue/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/10valid_enum_accent/tiramisu/__init__.py b/tests/dictionaries/10valid_enum_accent/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/10valid_enum_base/tiramisu/__init__.py b/tests/dictionaries/10valid_enum_base/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/10valid_enum_base_redefine/tiramisu/__init__.py b/tests/dictionaries/10valid_enum_base_redefine/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/10valid_enum_leader/tiramisu/__init__.py b/tests/dictionaries/10valid_enum_leader/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/10valid_enum_mandatory/tiramisu/__init__.py b/tests/dictionaries/10valid_enum_mandatory/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/10valid_enum_multi/tiramisu/__init__.py b/tests/dictionaries/10valid_enum_multi/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/10valid_enum_none/tiramisu/__init__.py b/tests/dictionaries/10valid_enum_none/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/10valid_enum_number/tiramisu/__init__.py b/tests/dictionaries/10valid_enum_number/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/10valid_enum_numberdefault/tiramisu/__init__.py b/tests/dictionaries/10valid_enum_numberdefault/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/10valid_enum_quote/tiramisu/__init__.py b/tests/dictionaries/10valid_enum_quote/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/10valid_enum_value/tiramisu/__init__.py b/tests/dictionaries/10valid_enum_value/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/11disabled_if_in_filelist/tiramisu/__init__.py b/tests/dictionaries/11disabled_if_in_filelist/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/11disabled_if_in_filelist/tiramisu/base.py b/tests/dictionaries/11disabled_if_in_filelist/tiramisu/base.py index 58687320..8fd25cb5 100644 --- a/tests/dictionaries/11disabled_if_in_filelist/tiramisu/base.py +++ b/tests/dictionaries/11disabled_if_in_filelist/tiramisu/base.py @@ -13,8 +13,8 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) -option_5 = BoolOption(name="mode_conteneur_actif2", doc="No change", default=True, properties=frozenset({"mandatory", "normal", Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) +option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) +option_5 = BoolOption(name="mode_conteneur_actif2", doc="No change", default=True, properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"})) option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2]) option_10 = StrOption(name="group", doc="group", default="root") @@ -23,7 +23,7 @@ option_12 = StrOption(name="name", doc="name", default="/etc/file") option_13 = StrOption(name="owner", doc="owner", default="root") option_14 = StrOption(name="source", doc="source", default="file") option_15 = BoolOption(name="templating", doc="templating", default=True) -option_16 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3), 'expected_0': ParamValue("oui")}))) +option_16 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3, todict=True), 'expected_0': ParamValue("oui")}))) option_9 = OptionDescription(name="file", doc="file", children=[option_10, option_11, option_12, option_13, option_14, option_15, option_16]) option_8 = OptionDescription(name="files", doc="files", children=[option_9]) option_7 = OptionDescription(name="test", doc="test", children=[option_8]) diff --git a/tests/dictionaries/11disabled_if_in_filelist_disabled/tiramisu/__init__.py b/tests/dictionaries/11disabled_if_in_filelist_disabled/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/11disabled_if_in_filelist_disabled/tiramisu/base.py b/tests/dictionaries/11disabled_if_in_filelist_disabled/tiramisu/base.py index b06ffeba..9fd5468c 100644 --- a/tests/dictionaries/11disabled_if_in_filelist_disabled/tiramisu/base.py +++ b/tests/dictionaries/11disabled_if_in_filelist_disabled/tiramisu/base.py @@ -13,8 +13,8 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name="condition", doc="No change", default="oui", properties=frozenset({"mandatory", "normal"})) -option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) -option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) +option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) +option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"})) option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2]) option_10 = StrOption(name="group", doc="group", default="root") @@ -23,7 +23,7 @@ option_12 = StrOption(name="name", doc="name", default="/etc/file") option_13 = StrOption(name="owner", doc="owner", default="root") option_14 = StrOption(name="source", doc="source", default="file") option_15 = BoolOption(name="templating", doc="templating", default=True) -option_16 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3), 'expected_0': ParamValue("oui")}))) +option_16 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3, todict=True), 'expected_0': ParamValue("oui")}))) option_9 = OptionDescription(name="file", doc="file", children=[option_10, option_11, option_12, option_13, option_14, option_15, option_16]) option_8 = OptionDescription(name="files", doc="files", children=[option_9]) option_7 = OptionDescription(name="test", doc="test", children=[option_8]) diff --git a/tests/dictionaries/11disabled_if_in_filelist_multi/tiramisu/__init__.py b/tests/dictionaries/11disabled_if_in_filelist_multi/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/11disabled_if_in_filelist_multi/tiramisu/base.py b/tests/dictionaries/11disabled_if_in_filelist_multi/tiramisu/base.py index 4f98b084..b6d862ed 100644 --- a/tests/dictionaries/11disabled_if_in_filelist_multi/tiramisu/base.py +++ b/tests/dictionaries/11disabled_if_in_filelist_multi/tiramisu/base.py @@ -13,8 +13,8 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) -option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) +option_4 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) +option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"})) option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2]) option_10 = StrOption(name="group", doc="group", default="root") @@ -23,7 +23,7 @@ option_12 = StrOption(name="name", doc="name", default="/tmp/file1") option_13 = StrOption(name="owner", doc="owner", default="root") option_14 = StrOption(name="source", doc="source", default="file1") option_15 = BoolOption(name="templating", doc="templating", default=True) -option_16 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3), 'expected_0': ParamValue("oui")}))) +option_16 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3, todict=True), 'expected_0': ParamValue("oui")}))) option_9 = OptionDescription(name="file1", doc="file1", children=[option_10, option_11, option_12, option_13, option_14, option_15, option_16]) option_18 = StrOption(name="group", doc="group", default="root") option_19 = StrOption(name="mode", doc="mode", default="0644") @@ -31,7 +31,7 @@ option_20 = StrOption(name="name", doc="name", default="/tmp/file2") option_21 = StrOption(name="owner", doc="owner", default="root") option_22 = StrOption(name="source", doc="source", default="file2") option_23 = BoolOption(name="templating", doc="templating", default=True) -option_24 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3), 'expected_0': ParamValue("oui")}))) +option_24 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(False)), kwargs={'default': ParamValue(True), 'condition_0': ParamOption(option_3, todict=True), 'expected_0': ParamValue("oui")}))) option_17 = OptionDescription(name="file2", doc="file2", children=[option_18, option_19, option_20, option_21, option_22, option_23, option_24]) option_8 = OptionDescription(name="files", doc="files", children=[option_9, option_17]) option_7 = OptionDescription(name="test", doc="test", children=[option_8]) diff --git a/tests/dictionaries/11disabledifin_filelist_notexist/tiramisu/__init__.py b/tests/dictionaries/11disabledifin_filelist_notexist/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/11disabledifin_filelist_notexist/tiramisu/base.py b/tests/dictionaries/11disabledifin_filelist_notexist/tiramisu/base.py index d69923f4..0a2bd873 100644 --- a/tests/dictionaries/11disabledifin_filelist_notexist/tiramisu/base.py +++ b/tests/dictionaries/11disabledifin_filelist_notexist/tiramisu/base.py @@ -23,7 +23,7 @@ option_12 = StrOption(name="name", doc="name", default="/tmp/file") option_13 = StrOption(name="owner", doc="owner", default="root") option_14 = StrOption(name="source", doc="source", default="file") option_15 = BoolOption(name="templating", doc="templating", default=True) -option_16 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(True)), kwargs={'default': ParamValue(False), 'condition_0': ParamOption(option_3), 'expected_0': ParamValue("unpossible")}))) +option_16 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(True)), kwargs={'default': ParamValue(False), 'condition_0': ParamOption(option_3, todict=True), 'expected_0': ParamValue("unpossible")}))) option_9 = OptionDescription(name="file", doc="file", children=[option_10, option_11, option_12, option_13, option_14, option_15, option_16]) option_8 = OptionDescription(name="files", doc="files", children=[option_9]) option_7 = OptionDescription(name="test", doc="test", children=[option_8]) diff --git a/tests/dictionaries/11disabledifnotin_filelist_notexist/tiramisu/__init__.py b/tests/dictionaries/11disabledifnotin_filelist_notexist/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/11disabledifnotin_filelist_notexist/tiramisu/base.py b/tests/dictionaries/11disabledifnotin_filelist_notexist/tiramisu/base.py index d69923f4..0a2bd873 100644 --- a/tests/dictionaries/11disabledifnotin_filelist_notexist/tiramisu/base.py +++ b/tests/dictionaries/11disabledifnotin_filelist_notexist/tiramisu/base.py @@ -23,7 +23,7 @@ option_12 = StrOption(name="name", doc="name", default="/tmp/file") option_13 = StrOption(name="owner", doc="owner", default="root") option_14 = StrOption(name="source", doc="source", default="file") option_15 = BoolOption(name="templating", doc="templating", default=True) -option_16 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(True)), kwargs={'default': ParamValue(False), 'condition_0': ParamOption(option_3), 'expected_0': ParamValue("unpossible")}))) +option_16 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(True)), kwargs={'default': ParamValue(False), 'condition_0': ParamOption(option_3, todict=True), 'expected_0': ParamValue("unpossible")}))) option_9 = OptionDescription(name="file", doc="file", children=[option_10, option_11, option_12, option_13, option_14, option_15, option_16]) option_8 = OptionDescription(name="files", doc="files", children=[option_9]) option_7 = OptionDescription(name="test", doc="test", children=[option_8]) diff --git a/tests/dictionaries/11disabledifnotin_filelist_notexist_multi/tiramisu/__init__.py b/tests/dictionaries/11disabledifnotin_filelist_notexist_multi/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/11disabledifnotin_filelist_notexist_multi/tiramisu/base.py b/tests/dictionaries/11disabledifnotin_filelist_notexist_multi/tiramisu/base.py index 4fa49b3d..7ad94100 100644 --- a/tests/dictionaries/11disabledifnotin_filelist_notexist_multi/tiramisu/base.py +++ b/tests/dictionaries/11disabledifnotin_filelist_notexist_multi/tiramisu/base.py @@ -23,7 +23,7 @@ option_12 = StrOption(name="name", doc="name", default="/tmp/file") option_13 = StrOption(name="owner", doc="owner", default="root") option_14 = StrOption(name="source", doc="source", default="file") option_15 = BoolOption(name="templating", doc="templating", default=True) -option_16 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(True)), kwargs={'default': ParamValue(False), 'condition_0': ParamOption(option_3), 'expected_0': ParamValue("unpossible"), 'condition_1': ParamOption(option_5), 'expected_1': ParamValue("oui"), 'condition_operator': ParamValue("OR")}))) +option_16 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(True)), kwargs={'default': ParamValue(False), 'condition_0': ParamOption(option_3, todict=True), 'expected_0': ParamValue("unpossible"), 'condition_1': ParamOption(option_5, todict=True), 'expected_1': ParamValue("oui"), 'condition_operator': ParamValue("OR")}))) option_9 = OptionDescription(name="file", doc="file", children=[option_10, option_11, option_12, option_13, option_14, option_15, option_16]) option_8 = OptionDescription(name="files", doc="files", children=[option_9]) option_7 = OptionDescription(name="test", doc="test", children=[option_8]) diff --git a/tests/dictionaries/11disabledifnotin_filelist_notexist_validenum/tiramisu/__init__.py b/tests/dictionaries/11disabledifnotin_filelist_notexist_validenum/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/11disabledifnotin_filelist_notexist_validenum/tiramisu/base.py b/tests/dictionaries/11disabledifnotin_filelist_notexist_validenum/tiramisu/base.py index 0da6aab5..cd215381 100644 --- a/tests/dictionaries/11disabledifnotin_filelist_notexist_validenum/tiramisu/base.py +++ b/tests/dictionaries/11disabledifnotin_filelist_notexist_validenum/tiramisu/base.py @@ -23,7 +23,7 @@ option_12 = StrOption(name="name", doc="name", default="/tmp/file") option_13 = StrOption(name="owner", doc="owner", default="root") option_14 = StrOption(name="source", doc="source", default="file") option_15 = BoolOption(name="templating", doc="templating", default=True) -option_16 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(True)), kwargs={'default': ParamValue(False), 'condition_0': ParamOption(option_3), 'expected_0': ParamValue("statique")}))) +option_16 = BoolOption(name="activate", doc="activate", default=Calculation(func.calc_value, Params((ParamValue(True)), kwargs={'default': ParamValue(False), 'condition_0': ParamOption(option_3, todict=True), 'expected_0': ParamValue("statique")}))) option_9 = OptionDescription(name="file", doc="file", children=[option_10, option_11, option_12, option_13, option_14, option_15, option_16]) option_8 = OptionDescription(name="files", doc="files", children=[option_9]) option_7 = OptionDescription(name="test", doc="test", children=[option_8]) diff --git a/tests/dictionaries/11multi_disabled_if_in_filelist/tiramisu/__init__.py b/tests/dictionaries/11multi_disabled_if_in_filelist/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/11valid_enum_variable/tiramisu/__init__.py b/tests/dictionaries/11valid_enum_variable/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/20family_append/tiramisu/__init__.py b/tests/dictionaries/20family_append/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/20family_appendaccent/tiramisu/__init__.py b/tests/dictionaries/20family_appendaccent/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/20family_appendaccent/tiramisu/base.py b/tests/dictionaries/20family_appendaccent/tiramisu/base.py index b30722a4..826dc53a 100644 --- a/tests/dictionaries/20family_appendaccent/tiramisu/base.py +++ b/tests/dictionaries/20family_appendaccent/tiramisu/base.py @@ -13,7 +13,7 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_7 = StrOption(name="mode_conteneur_actif3", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) -option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_7, todict=True), 'expected': ParamValue('non')}))})) +option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_7, todict=True), 'expected': ParamValue('non')}))})) option_4 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) option_2 = OptionDescription(name="general", doc="Général", children=[option_3, option_4, option_5], properties=frozenset({"normal"})) diff --git a/tests/dictionaries/20family_dynamic/tiramisu/__init__.py b/tests/dictionaries/20family_dynamic/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/20family_dynamic_calc/tiramisu/__init__.py b/tests/dictionaries/20family_dynamic_calc/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/20family_dynamic_calc2/tiramisu/__init__.py b/tests/dictionaries/20family_dynamic_calc2/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/20family_dynamic_calc2/tiramisu/base.py b/tests/dictionaries/20family_dynamic_calc2/tiramisu/base.py index fc6dc55e..8646eaaa 100644 --- a/tests/dictionaries/20family_dynamic_calc2/tiramisu/base.py +++ b/tests/dictionaries/20family_dynamic_calc2/tiramisu/base.py @@ -15,8 +15,8 @@ from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name="varname", doc="No change", multi=True, default=['val1', 'val2'], default_multi="val2", properties=frozenset({"mandatory", "normal"})) option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"})) option_7 = StrOption(name="newvar", doc="No change", properties=frozenset({"normal"})) -option_5 = StrOption(name="vardyn", doc="No change", default="val", properties=frozenset({"mandatory", "normal", Calculation(calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_7, todict=True), 'expected': ParamValue('non')})), Calculation(calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_7, todict=True), 'expected': ParamValue('non')}))})) -option_4 = ConvertDynOptionDescription(name="dyn", doc="dyn", suffixes=Calculation(func.calc_value, Params((ParamOption(option_3)))), children=[option_5], properties=frozenset({"normal", Calculation(calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_7, todict=True), 'expected': ParamValue('non')}))})) +option_5 = StrOption(name="vardyn", doc="No change", default="val", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('frozen'), kwargs={'condition': ParamOption(option_7, todict=True), 'expected': ParamValue('non')})), Calculation(func.calc_value, Params(ParamValue('force_default_on_freeze'), kwargs={'condition': ParamOption(option_7, todict=True), 'expected': ParamValue('non')}))})) +option_4 = ConvertDynOptionDescription(name="dyn", doc="dyn", suffixes=Calculation(func.calc_value, Params((ParamOption(option_3)))), children=[option_5], properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('hidden'), kwargs={'condition': ParamOption(option_7, todict=True), 'expected': ParamValue('non')}))})) option_6 = OptionDescription(name="new", doc="new", children=[option_7], properties=frozenset({"normal"})) option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_4, option_6]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1]) diff --git a/tests/dictionaries/20family_dynamic_calc_suffix/tiramisu/__init__.py b/tests/dictionaries/20family_dynamic_calc_suffix/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/20family_dynamic_description/tiramisu/__init__.py b/tests/dictionaries/20family_dynamic_description/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/20family_dynamic_number/tiramisu/__init__.py b/tests/dictionaries/20family_dynamic_number/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/20family_empty/tiramisu/__init__.py b/tests/dictionaries/20family_empty/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/20family_hidden/tiramisu/__init__.py b/tests/dictionaries/20family_hidden/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/20family_mode/tiramisu/__init__.py b/tests/dictionaries/20family_mode/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/20family_modeleadership/tiramisu/__init__.py b/tests/dictionaries/20family_modeleadership/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/20notemplating/tiramisu/__init__.py b/tests/dictionaries/20notemplating/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/20override/tiramisu/__init__.py b/tests/dictionaries/20override/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/21family_empty/tiramisu/__init__.py b/tests/dictionaries/21family_empty/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/30mandatory_withoutvalue/tiramisu/__init__.py b/tests/dictionaries/30mandatory_withoutvalue/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/30mandatory_withoutvaluecalc/tiramisu/__init__.py b/tests/dictionaries/30mandatory_withoutvaluecalc/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/30mandatory_withvalue/tiramisu/__init__.py b/tests/dictionaries/30mandatory_withvalue/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/30mandatory_withvaluecalc/tiramisu/__init__.py b/tests/dictionaries/30mandatory_withvaluecalc/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/40condition_base/tiramisu/__init__.py b/tests/dictionaries/40condition_base/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/40condition_base/tiramisu/base.py b/tests/dictionaries/40condition_base/tiramisu/base.py index 47723183..da6cce64 100644 --- a/tests/dictionaries/40condition_base/tiramisu/base.py +++ b/tests/dictionaries/40condition_base/tiramisu/base.py @@ -14,8 +14,8 @@ except: from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) option_4 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_5 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue('oui')}))})) -option_6 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue('oui')}))})) +option_5 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue('oui')}))})) +option_6 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue('oui')}))})) option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5, option_6], properties=frozenset({"normal"})) option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1]) diff --git a/tests/dictionaries/40condition_base_add/tiramisu/__init__.py b/tests/dictionaries/40condition_base_add/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/40condition_base_add/tiramisu/base.py b/tests/dictionaries/40condition_base_add/tiramisu/base.py index 47723183..da6cce64 100644 --- a/tests/dictionaries/40condition_base_add/tiramisu/base.py +++ b/tests/dictionaries/40condition_base_add/tiramisu/base.py @@ -14,8 +14,8 @@ except: from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) option_4 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_5 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue('oui')}))})) -option_6 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue('oui')}))})) +option_5 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue('oui')}))})) +option_6 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue('oui')}))})) option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5, option_6], properties=frozenset({"normal"})) option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1]) diff --git a/tests/dictionaries/40condition_fallback/tiramisu/__init__.py b/tests/dictionaries/40condition_fallback/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/40condition_optional/tiramisu/__init__.py b/tests/dictionaries/40condition_optional/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/40condition_optional/tiramisu/base.py b/tests/dictionaries/40condition_optional/tiramisu/base.py index 3cb69519..0aba831c 100644 --- a/tests/dictionaries/40condition_optional/tiramisu/base.py +++ b/tests/dictionaries/40condition_optional/tiramisu/base.py @@ -14,7 +14,7 @@ except: from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) option_4 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) -option_5 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue('oui')}))})) +option_5 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue('oui')}))})) option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"})) option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1]) diff --git a/tests/dictionaries/40condition_optional_empty/tiramisu/__init__.py b/tests/dictionaries/40condition_optional_empty/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/40hidden_if_in_group_fallback/tiramisu/__init__.py b/tests/dictionaries/40hidden_if_in_group_fallback/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/40ifin_leadership/tiramisu/__init__.py b/tests/dictionaries/40ifin_leadership/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/40ifin_leadership/tiramisu/base.py b/tests/dictionaries/40ifin_leadership/tiramisu/base.py index ea33fadc..3cde0a55 100644 --- a/tests/dictionaries/40ifin_leadership/tiramisu/base.py +++ b/tests/dictionaries/40ifin_leadership/tiramisu/base.py @@ -15,7 +15,7 @@ from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) option_4 = StrOption(name="condition", doc="condition", default="oui", properties=frozenset({"mandatory", "normal"})) option_6 = StrOption(name="leader", doc="leader", multi=True) -option_7 = StrOption(name="follower1", doc="follower1", multi=True, properties=frozenset({"normal", Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue('oui')}))})) +option_7 = StrOption(name="follower1", doc="follower1", multi=True, properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue('oui')}))})) option_8 = StrOption(name="follower2", doc="follower2", multi=True, properties=frozenset({"normal"})) option_5 = Leadership(name="leader", doc="leader", children=[option_6, option_7, option_8], properties=frozenset({"normal"})) option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"})) diff --git a/tests/dictionaries/40ifin_leadershipauto/tiramisu/__init__.py b/tests/dictionaries/40ifin_leadershipauto/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/40ifin_leadershipauto/tiramisu/base.py b/tests/dictionaries/40ifin_leadershipauto/tiramisu/base.py index 2d620d0f..ba89cd83 100644 --- a/tests/dictionaries/40ifin_leadershipauto/tiramisu/base.py +++ b/tests/dictionaries/40ifin_leadershipauto/tiramisu/base.py @@ -15,7 +15,7 @@ from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) option_4 = StrOption(name="condition", doc="condition", default="oui", properties=frozenset({"mandatory", "normal"})) option_6 = StrOption(name="leader", doc="leader", multi=True, default=['a'], properties=frozenset({"mandatory"})) -option_7 = StrOption(name="follower1", doc="follower1", multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "normal", Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue('oui')}))})) +option_7 = StrOption(name="follower1", doc="follower1", multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_4, todict=True), 'expected': ParamValue('oui')}))})) option_8 = StrOption(name="follower2", doc="follower2", multi=True, properties=frozenset({"normal"})) option_5 = Leadership(name="leader", doc="leader", children=[option_6, option_7, option_8], properties=frozenset({"normal"})) option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"})) diff --git a/tests/dictionaries/40ifin_leadershipauto_follower/tiramisu/base.py b/tests/dictionaries/40ifin_leadershipauto_follower/tiramisu/base.py index 0250a949..c48b5326 100644 --- a/tests/dictionaries/40ifin_leadershipauto_follower/tiramisu/base.py +++ b/tests/dictionaries/40ifin_leadershipauto_follower/tiramisu/base.py @@ -15,7 +15,7 @@ from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) option_4 = StrOption(name="condition", doc="condition", default="oui", properties=frozenset({"mandatory", "normal"})) option_6 = StrOption(name="leader", doc="leader", multi=True, default=['a', 'b'], properties=frozenset({"mandatory"})) -option_7 = StrOption(name="follower1", doc="follower1", multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({"normal", Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, todict=True), 'expected': ParamValue('a')}))})) +option_7 = StrOption(name="follower1", doc="follower1", multi=True, default=Calculation(func.calc_val, Params((), kwargs={'valeur': ParamValue("valfill")})), properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_6, todict=True), 'expected': ParamValue('a')}))})) option_8 = StrOption(name="follower2", doc="follower2", multi=True, properties=frozenset({"normal"})) option_5 = Leadership(name="leader", doc="leader", children=[option_6, option_7, option_8], properties=frozenset({"normal"})) option_2 = OptionDescription(name="general", doc="general", children=[option_3, option_4, option_5], properties=frozenset({"normal"})) diff --git a/tests/dictionaries/40ifin_multi/tiramisu/__init__.py b/tests/dictionaries/40ifin_multi/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/40ifin_multi/tiramisu/base.py b/tests/dictionaries/40ifin_multi/tiramisu/base.py index 82fc36fd..6ef07e5c 100644 --- a/tests/dictionaries/40ifin_multi/tiramisu/base.py +++ b/tests/dictionaries/40ifin_multi/tiramisu/base.py @@ -15,7 +15,7 @@ from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"})) option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) -option_6 = StrOption(name="mode_conteneur_actif3", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_5, todict=True), 'expected': ParamValue('oui')}))})) +option_6 = StrOption(name="mode_conteneur_actif3", doc="No change", default="non", properties=frozenset({"mandatory", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')})), Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_5, todict=True), 'expected': ParamValue('oui')}))})) option_4 = OptionDescription(name="general2", doc="general2", children=[option_5, option_6], properties=frozenset({"hidden", "normal"})) option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_4]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1]) diff --git a/tests/dictionaries/40ifin_validenum/tiramisu/__init__.py b/tests/dictionaries/40ifin_validenum/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/50exists_exists/tiramisu/__init__.py b/tests/dictionaries/50exists_exists/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/50redefine_description/tiramisu/__init__.py b/tests/dictionaries/50redefine_description/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/51exists_nonexists/tiramisu/__init__.py b/tests/dictionaries/51exists_nonexists/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/51exists_redefine/tiramisu/__init__.py b/tests/dictionaries/51exists_redefine/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/51redefine_auto/tiramisu/__init__.py b/tests/dictionaries/51redefine_auto/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/51redefine_autofill/tiramisu/__init__.py b/tests/dictionaries/51redefine_autofill/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/51redefine_family/tiramisu/__init__.py b/tests/dictionaries/51redefine_family/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/51redefine_family/tiramisu/base.py b/tests/dictionaries/51redefine_family/tiramisu/base.py index 77c2f580..ab362993 100644 --- a/tests/dictionaries/51redefine_family/tiramisu/base.py +++ b/tests/dictionaries/51redefine_family/tiramisu/base.py @@ -15,6 +15,6 @@ from rougail.tiramisu import ConvertDynOptionDescription option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) option_2 = OptionDescription(name="general", doc="general", children=[option_3], properties=frozenset({"normal"})) option_5 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) -option_4 = OptionDescription(name="general2", doc="general2", children=[option_5], properties=frozenset({"hidden", "normal", Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) +option_4 = OptionDescription(name="general2", doc="general2", children=[option_5], properties=frozenset({"hidden", "normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_3, todict=True), 'expected': ParamValue('oui')}))})) option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2, option_4]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1]) diff --git a/tests/dictionaries/51redefine_fill/tiramisu/__init__.py b/tests/dictionaries/51redefine_fill/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/51redefine_fillauto/tiramisu/__init__.py b/tests/dictionaries/51redefine_fillauto/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/51redefine_help/tiramisu/__init__.py b/tests/dictionaries/51redefine_help/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/51redefine_hidden/tiramisu/__init__.py b/tests/dictionaries/51redefine_hidden/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/51redefine_remove_check/tiramisu/__init__.py b/tests/dictionaries/51redefine_remove_check/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/51redefine_remove_condition/tiramisu/__init__.py b/tests/dictionaries/51redefine_remove_condition/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/51redefine_removecondition_nonautofreeze/tiramisu/__init__.py b/tests/dictionaries/51redefine_removecondition_nonautofreeze/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/51redefine_removecondition_nonautofreeze/tiramisu/base.py b/tests/dictionaries/51redefine_removecondition_nonautofreeze/tiramisu/base.py index d1d8ff97..61ce69ef 100644 --- a/tests/dictionaries/51redefine_removecondition_nonautofreeze/tiramisu/base.py +++ b/tests/dictionaries/51redefine_removecondition_nonautofreeze/tiramisu/base.py @@ -13,7 +13,7 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_7 = StrOption(name="module_instancie", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) -option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"auto_freeze", "basic", "force_store_value", "mandatory", Calculation(calc_value, Params(ParamValue('auto_frozen'), kwargs={'condition': ParamOption(option_7, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)}))})) +option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"auto_freeze", "basic", "force_store_value", "mandatory", Calculation(func.calc_value, Params(ParamValue('auto_frozen'), kwargs={'condition': ParamOption(option_7, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)}))})) option_4 = StrOption(name="condition", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) option_5 = StrOption(name="mode_conteneur_actif1", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) option_6 = StrOption(name="mode_conteneur_actif2", doc="No change", default="non", properties=frozenset({"mandatory", "normal"})) diff --git a/tests/dictionaries/51redefine_validenum/tiramisu/__init__.py b/tests/dictionaries/51redefine_validenum/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/51redefine_value/tiramisu/__init__.py b/tests/dictionaries/51redefine_value/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/51remove_fill/tiramisu/__init__.py b/tests/dictionaries/51remove_fill/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/52exists_redefine/tiramisu/__init__.py b/tests/dictionaries/52exists_redefine/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/60action_external/tiramisu/__init__.py b/tests/dictionaries/60action_external/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/60extra_externalspacecondition/tiramisu/__init__.py b/tests/dictionaries/60extra_externalspacecondition/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/60extra_externalspacecondition/tiramisu/base.py b/tests/dictionaries/60extra_externalspacecondition/tiramisu/base.py index bc64518e..2ee00311 100644 --- a/tests/dictionaries/60extra_externalspacecondition/tiramisu/base.py +++ b/tests/dictionaries/60extra_externalspacecondition/tiramisu/base.py @@ -13,7 +13,7 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_5 = StrOption(name="module_instancie", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) -option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"auto_freeze", "basic", "force_store_value", "mandatory", Calculation(calc_value, Params(ParamValue('auto_frozen'), kwargs={'condition': ParamOption(option_5, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)}))})) +option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"auto_freeze", "basic", "force_store_value", "mandatory", Calculation(func.calc_value, Params(ParamValue('auto_frozen'), kwargs={'condition': ParamOption(option_5, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)}))})) option_4 = StrOption(name="activer_ejabberd", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) option_2 = OptionDescription(name="general", doc="général", children=[option_3, option_4, option_5], properties=frozenset({"basic"})) option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2]) @@ -23,6 +23,6 @@ option_10 = ChoiceOption(name="mode", doc="mode", values=('pre', 'post'), defaul option_7 = OptionDescription(name="ejabberd", doc="ejabberd", children=[option_8, option_9, option_10], properties=frozenset({"normal"})) option_6 = OptionDescription(name="extra", doc="extra", children=[option_7]) option_13 = StrOption(name="description", doc="description", default="test", properties=frozenset({"mandatory", "normal"})) -option_12 = OptionDescription(name="external", doc="external", children=[option_13], properties=frozenset({"normal", Calculation(calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_8, todict=True), 'expected': ParamValue('non')}))})) +option_12 = OptionDescription(name="external", doc="external", children=[option_13], properties=frozenset({"normal", Calculation(func.calc_value, Params(ParamValue('disabled'), kwargs={'condition': ParamOption(option_8, todict=True), 'expected': ParamValue('non')}))})) option_11 = OptionDescription(name="extra1", doc="extra1", children=[option_12]) option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[option_1, option_6, option_11]) diff --git a/tests/dictionaries/60extra_group/tiramisu/__init__.py b/tests/dictionaries/60extra_group/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/60extra_help/tiramisu/__init__.py b/tests/dictionaries/60extra_help/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/60extra_load/tiramisu/__init__.py b/tests/dictionaries/60extra_load/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/60extra_mandatory/tiramisu/__init__.py b/tests/dictionaries/60extra_mandatory/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/60extra_name_family/tiramisu/__init__.py b/tests/dictionaries/60extra_name_family/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/60extra_no_condition/tiramisu/base.py b/tests/dictionaries/60extra_no_condition/tiramisu/base.py index dba51e18..3ca1790f 100644 --- a/tests/dictionaries/60extra_no_condition/tiramisu/base.py +++ b/tests/dictionaries/60extra_no_condition/tiramisu/base.py @@ -13,7 +13,7 @@ except: from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription option_5 = StrOption(name="module_instancie", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) -option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"auto_freeze", "basic", "force_store_value", "mandatory", Calculation(calc_value, Params(ParamValue('auto_frozen'), kwargs={'condition': ParamOption(option_5, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)}))})) +option_3 = StrOption(name="mode_conteneur_actif", doc="No change", default="non", properties=frozenset({"auto_freeze", "basic", "force_store_value", "mandatory", Calculation(func.calc_value, Params(ParamValue('auto_frozen'), kwargs={'condition': ParamOption(option_5, todict=True), 'expected': ParamValue('oui'), 'reverse_condition': ParamValue(True)}))})) option_4 = StrOption(name="activer_ejabberd", doc="No change", default="non", properties=frozenset({"force_default_on_freeze", "frozen", "hidden", "mandatory", "normal"})) option_2 = OptionDescription(name="general", doc="général", children=[option_3, option_4, option_5], properties=frozenset({"basic"})) option_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2]) diff --git a/tests/dictionaries/60extra_redefine/tiramisu/__init__.py b/tests/dictionaries/60extra_redefine/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/60familyaction/tiramisu/__init__.py b/tests/dictionaries/60familyaction/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/60familyaction_accent/tiramisu/__init__.py b/tests/dictionaries/60familyaction_accent/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/60familyaction_mandatory/tiramisu/__init__.py b/tests/dictionaries/60familyaction_mandatory/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/70container_files/tiramisu/__init__.py b/tests/dictionaries/70container_files/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/70container_files_symlink_multi/tiramisu/__init__.py b/tests/dictionaries/70container_files_symlink_multi/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/70container_files_symlink_multi_variable/tiramisu/__init__.py b/tests/dictionaries/70container_files_symlink_multi_variable/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/70container_files_symlink_variable/tiramisu/__init__.py b/tests/dictionaries/70container_files_symlink_variable/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/70container_files_twice/tiramisu/__init__.py b/tests/dictionaries/70container_files_twice/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/70container_filesmulti/tiramisu/__init__.py b/tests/dictionaries/70container_filesmulti/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/70container_filesredefine/tiramisu/__init__.py b/tests/dictionaries/70container_filesredefine/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/70container_new/tiramisu/__init__.py b/tests/dictionaries/70container_new/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/70container_newnocont/tiramisu/__init__.py b/tests/dictionaries/70container_newnocont/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/70container_newwithip/tiramisu/__init__.py b/tests/dictionaries/70container_newwithip/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/70container_pathaccess/tiramisu/__init__.py b/tests/dictionaries/70container_pathaccess/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/70container_pathaccess_leadership/tiramisu/__init__.py b/tests/dictionaries/70container_pathaccess_leadership/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/70container_save/tiramisu/__init__.py b/tests/dictionaries/70container_save/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/70container_serviceaccess/tiramisu/__init__.py b/tests/dictionaries/70container_serviceaccess/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/70container_servicerestriction/tiramisu/__init__.py b/tests/dictionaries/70container_servicerestriction/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/70container_services/tiramisu/__init__.py b/tests/dictionaries/70container_services/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/70services_unmanage/tiramisu/__init__.py b/tests/dictionaries/70services_unmanage/tiramisu/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/80frozenifin_unknown/00-base.xml b/tests/dictionaries/80frozenifin_unknown/00-base.xml new file mode 100644 index 00000000..483361f6 --- /dev/null +++ b/tests/dictionaries/80frozenifin_unknown/00-base.xml @@ -0,0 +1,29 @@ + + + + + + non + + + + + + + + + + + 1 + 2 + 3 + + + 4 + test_variable + + + + + diff --git a/tests/dictionaries/00load_autofreezeexpert/tiramisu/__init__.py b/tests/dictionaries/80frozenifin_unknown/__init__.py similarity index 100% rename from tests/dictionaries/00load_autofreezeexpert/tiramisu/__init__.py rename to tests/dictionaries/80frozenifin_unknown/__init__.py diff --git a/tests/dictionaries/00load_autosave/tiramisu/__init__.py b/tests/dictionaries/80frozenifin_unknown/errno_23 similarity index 100% rename from tests/dictionaries/00load_autosave/tiramisu/__init__.py rename to tests/dictionaries/80frozenifin_unknown/errno_23