From 3040a11de93296fea17b442f442d0fdaaf32d3ab Mon Sep 17 00:00:00 2001 From: Emmanuel Garette Date: Sun, 4 Oct 2020 17:33:30 +0200 Subject: [PATCH] cherry-pick --- tests/dictionaries/01fill_base/tiramisu/base.py | 2 +- tests/dictionaries/01fill_number/tiramisu/base.py | 12 ++++++++++++ tests/dictionaries/01fill_optional/tiramisu/base.py | 2 +- .../10valid_enum_eosfunc/tiramisu/base.py | 8 ++++++++ .../10valid_enum_python/tiramisu/base.py | 8 ++++++++ .../tiramisu/base.py | 8 ++++++++ .../20family_dynamic_calc/tiramisu/base.py | 8 ++++++++ .../30mandatory_withoutvaluecalc/tiramisu/base.py | 8 ++++++++ .../makedict/base.json | 0 .../30mandatory_withvaluecalc/makedict/base.json | 2 +- .../30mandatory_withvaluecalc/tiramisu/base.py | 8 ++++++++ tests/dictionaries/40ifin_validenum/tiramisu/base.py | 8 ++++++++ .../51redefine_validenum/tiramisu/base.py | 8 ++++++++ .../dictionaries/80empty_typeeole_python/__init__.py | 0 tests/dictionaries/80empty_validenum/__init__.py | 0 tests/dictionaries/80unknown_validenum/__init__.py | 0 tests/dictionaries/80validenum_ouinon/__init__.py | 0 .../80validenum_python_not_list/__init__.py | 0 .../80validenum_python_unknown/__init__.py | 0 .../80validenum_python_unknownvalue/__init__.py | 0 20 files changed, 79 insertions(+), 3 deletions(-) create mode 100644 tests/dictionaries/01fill_number/tiramisu/base.py create mode 100644 tests/dictionaries/10valid_enum_eosfunc/tiramisu/base.py create mode 100644 tests/dictionaries/10valid_enum_python/tiramisu/base.py create mode 100644 tests/dictionaries/11disabledifnotin_filelist_notexist_validenum/tiramisu/base.py create mode 100644 tests/dictionaries/20family_dynamic_calc/tiramisu/base.py create mode 100644 tests/dictionaries/30mandatory_withoutvaluecalc/tiramisu/base.py rename tests/dictionaries/{30mandatory_withoutvaluecalc => 30mandatory_withvalue}/makedict/base.json (100%) create mode 100644 tests/dictionaries/30mandatory_withvaluecalc/tiramisu/base.py create mode 100644 tests/dictionaries/40ifin_validenum/tiramisu/base.py create mode 100644 tests/dictionaries/51redefine_validenum/tiramisu/base.py delete mode 100644 tests/dictionaries/80empty_typeeole_python/__init__.py delete mode 100644 tests/dictionaries/80empty_validenum/__init__.py delete mode 100644 tests/dictionaries/80unknown_validenum/__init__.py delete mode 100644 tests/dictionaries/80validenum_ouinon/__init__.py delete mode 100644 tests/dictionaries/80validenum_python_not_list/__init__.py delete mode 100644 tests/dictionaries/80validenum_python_unknown/__init__.py delete mode 100644 tests/dictionaries/80validenum_python_unknownvalue/__init__.py diff --git a/tests/dictionaries/01fill_base/tiramisu/base.py b/tests/dictionaries/01fill_base/tiramisu/base.py index f5e62662..50c11863 100644 --- a/tests/dictionaries/01fill_base/tiramisu/base.py +++ b/tests/dictionaries/01fill_base/tiramisu/base.py @@ -6,7 +6,7 @@ from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_4 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif1', doc='No change', multi=False, default='non', values=('oui', 'non')) -option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default=Calculation(func.calc_val, Params((ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={})), values=('oui', 'non')) +option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default=Calculation(func.calc_val, Params((ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={})), values=('oui', 'non')) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/01fill_number/tiramisu/base.py b/tests/dictionaries/01fill_number/tiramisu/base.py new file mode 100644 index 00000000..93c790c4 --- /dev/null +++ b/tests/dictionaries/01fill_number/tiramisu/base.py @@ -0,0 +1,12 @@ +try: + from tiramisu3 import * +except: + from tiramisu import * +from rougail.tiramisu import ConvertDynOptionDescription +import imp +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') +option_3 = IntOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default=Calculation(func.calc_val, Params((ParamValue(3)), kwargs={}))) +option_4 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif1', doc='No change', multi=False, default='non', values=('oui', 'non')) +option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4]) +option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) +option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/01fill_optional/tiramisu/base.py b/tests/dictionaries/01fill_optional/tiramisu/base.py index 50c11863..f5e62662 100644 --- a/tests/dictionaries/01fill_optional/tiramisu/base.py +++ b/tests/dictionaries/01fill_optional/tiramisu/base.py @@ -6,7 +6,7 @@ from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') option_4 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif1', doc='No change', multi=False, default='non', values=('oui', 'non')) -option_3 = ChoiceOption(properties=frozenset({'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default=Calculation(func.calc_val, Params((ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={})), values=('oui', 'non')) +option_3 = ChoiceOption(properties=frozenset({'force_default_on_freeze', 'frozen', 'hidden', 'mandatory', 'normal'}), name='mode_conteneur_actif', doc='No change', multi=False, default=Calculation(func.calc_val, Params((ParamOption(option_4, notraisepropertyerror=False, todict=False)), kwargs={})), values=('oui', 'non')) option_2 = OptionDescription(name='general', doc='general', properties=frozenset({'normal'}), children=[option_3, option_4]) option_1 = OptionDescription(name='rougail', doc='rougail', children=[option_2]) option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[option_1]) diff --git a/tests/dictionaries/10valid_enum_eosfunc/tiramisu/base.py b/tests/dictionaries/10valid_enum_eosfunc/tiramisu/base.py new file mode 100644 index 00000000..bc32a4b3 --- /dev/null +++ b/tests/dictionaries/10valid_enum_eosfunc/tiramisu/base.py @@ -0,0 +1,8 @@ +try: + from tiramisu3 import * +except: + from tiramisu import * +from rougail.tiramisu import ConvertDynOptionDescription +import imp +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') +option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[]) diff --git a/tests/dictionaries/10valid_enum_python/tiramisu/base.py b/tests/dictionaries/10valid_enum_python/tiramisu/base.py new file mode 100644 index 00000000..bc32a4b3 --- /dev/null +++ b/tests/dictionaries/10valid_enum_python/tiramisu/base.py @@ -0,0 +1,8 @@ +try: + from tiramisu3 import * +except: + from tiramisu import * +from rougail.tiramisu import ConvertDynOptionDescription +import imp +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') +option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[]) diff --git a/tests/dictionaries/11disabledifnotin_filelist_notexist_validenum/tiramisu/base.py b/tests/dictionaries/11disabledifnotin_filelist_notexist_validenum/tiramisu/base.py new file mode 100644 index 00000000..bc32a4b3 --- /dev/null +++ b/tests/dictionaries/11disabledifnotin_filelist_notexist_validenum/tiramisu/base.py @@ -0,0 +1,8 @@ +try: + from tiramisu3 import * +except: + from tiramisu import * +from rougail.tiramisu import ConvertDynOptionDescription +import imp +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') +option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[]) diff --git a/tests/dictionaries/20family_dynamic_calc/tiramisu/base.py b/tests/dictionaries/20family_dynamic_calc/tiramisu/base.py new file mode 100644 index 00000000..bc32a4b3 --- /dev/null +++ b/tests/dictionaries/20family_dynamic_calc/tiramisu/base.py @@ -0,0 +1,8 @@ +try: + from tiramisu3 import * +except: + from tiramisu import * +from rougail.tiramisu import ConvertDynOptionDescription +import imp +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') +option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[]) diff --git a/tests/dictionaries/30mandatory_withoutvaluecalc/tiramisu/base.py b/tests/dictionaries/30mandatory_withoutvaluecalc/tiramisu/base.py new file mode 100644 index 00000000..bc32a4b3 --- /dev/null +++ b/tests/dictionaries/30mandatory_withoutvaluecalc/tiramisu/base.py @@ -0,0 +1,8 @@ +try: + from tiramisu3 import * +except: + from tiramisu import * +from rougail.tiramisu import ConvertDynOptionDescription +import imp +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') +option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[]) diff --git a/tests/dictionaries/30mandatory_withoutvaluecalc/makedict/base.json b/tests/dictionaries/30mandatory_withvalue/makedict/base.json similarity index 100% rename from tests/dictionaries/30mandatory_withoutvaluecalc/makedict/base.json rename to tests/dictionaries/30mandatory_withvalue/makedict/base.json diff --git a/tests/dictionaries/30mandatory_withvaluecalc/makedict/base.json b/tests/dictionaries/30mandatory_withvaluecalc/makedict/base.json index 5f62f349..0967ef42 100644 --- a/tests/dictionaries/30mandatory_withvaluecalc/makedict/base.json +++ b/tests/dictionaries/30mandatory_withvaluecalc/makedict/base.json @@ -1 +1 @@ -{"rougail.general.mode_conteneur_actif": "value"} +{} diff --git a/tests/dictionaries/30mandatory_withvaluecalc/tiramisu/base.py b/tests/dictionaries/30mandatory_withvaluecalc/tiramisu/base.py new file mode 100644 index 00000000..bc32a4b3 --- /dev/null +++ b/tests/dictionaries/30mandatory_withvaluecalc/tiramisu/base.py @@ -0,0 +1,8 @@ +try: + from tiramisu3 import * +except: + from tiramisu import * +from rougail.tiramisu import ConvertDynOptionDescription +import imp +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') +option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[]) diff --git a/tests/dictionaries/40ifin_validenum/tiramisu/base.py b/tests/dictionaries/40ifin_validenum/tiramisu/base.py new file mode 100644 index 00000000..bc32a4b3 --- /dev/null +++ b/tests/dictionaries/40ifin_validenum/tiramisu/base.py @@ -0,0 +1,8 @@ +try: + from tiramisu3 import * +except: + from tiramisu import * +from rougail.tiramisu import ConvertDynOptionDescription +import imp +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') +option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[]) diff --git a/tests/dictionaries/51redefine_validenum/tiramisu/base.py b/tests/dictionaries/51redefine_validenum/tiramisu/base.py new file mode 100644 index 00000000..bc32a4b3 --- /dev/null +++ b/tests/dictionaries/51redefine_validenum/tiramisu/base.py @@ -0,0 +1,8 @@ +try: + from tiramisu3 import * +except: + from tiramisu import * +from rougail.tiramisu import ConvertDynOptionDescription +import imp +func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') +option_0 = OptionDescription(name='baseoption', doc='baseoption', children=[]) diff --git a/tests/dictionaries/80empty_typeeole_python/__init__.py b/tests/dictionaries/80empty_typeeole_python/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/80empty_validenum/__init__.py b/tests/dictionaries/80empty_validenum/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/80unknown_validenum/__init__.py b/tests/dictionaries/80unknown_validenum/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/80validenum_ouinon/__init__.py b/tests/dictionaries/80validenum_ouinon/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/80validenum_python_not_list/__init__.py b/tests/dictionaries/80validenum_python_not_list/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/80validenum_python_unknown/__init__.py b/tests/dictionaries/80validenum_python_unknown/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/dictionaries/80validenum_python_unknownvalue/__init__.py b/tests/dictionaries/80validenum_python_unknownvalue/__init__.py deleted file mode 100644 index e69de29b..00000000