Infra/tiramisu
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

corrections in dict and todict

Browse Source
This commit is contained in:
Emmanuel Garette
2019-12-25 20:44:56 +01:00
parent 503d4b2cca
commit 52ddd76b1a
39 changed files with 402 additions and 332 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tests/dict/data/choice1_requires.py
View File

@ -1,12 +1,14 @@
from tiramisu.option import ChoiceOption, StrOption, OptionDescription
from tiramisu import ChoiceOption, StrOption, OptionDescription, Calculation, ParamValue, ParamOption, Params, calc_value
def get_description():
"""generate description for this test
"""
option1 = ChoiceOption('choice', "Choice description", ("hide", "show"), default='hide', properties=('mandatory',))
option2 = StrOption('unicode2', "Unicode 2", requires=[{'option': option1,
'expected': 'hide',
'action': 'hidden'}])
hidden_property = Calculation(calc_value,
Params(ParamValue('hidden'),
kwargs={'condition': ParamOption(option1, todict=True),
'expected': ParamValue('hide')}))
option2 = StrOption('unicode2', "Unicode 2", properties=(hidden_property,))
descr1 = OptionDescription("options", "Common configuration", [option1, option2])
descr = OptionDescription("choice1_requires", "Choice with requirement", [descr1])
return descr

5
tests/dict/data/unicode1_leadership_requires.json
View File

@ -35,7 +35,10 @@
},
"model": {
"options.unicode.unicode": {
"required": true
"required": true,
"properties": [
"unique"
]
}
},
"global": {

15
tests/dict/data/unicode1_leadership_requires.py
View File

@ -1,6 +1,4 @@
from tiramisu.option import StrOption, OptionDescription
from tiramisu import Leadership
from tiramisu import StrOption, OptionDescription, Leadership, Calculation, ParamValue, ParamOption, Params, calc_value
def get_description():
"""generate description for this test
@ -8,11 +6,12 @@ def get_description():
option = StrOption('unicode', "Unicode leader", multi=True)
option1 = StrOption('unicode1', "Unicode follower 1", multi=True)
option2 = StrOption('unicode2', "Values 'test' must show 'Unicode follower 3'", multi=True)
option3 = StrOption('unicode3', "Unicode follower 3", requires=[{'option': option2,
'expected': u'test',
'action': 'hidden',
'inverse': True}],
multi=True)
hidden_property = Calculation(calc_value,
Params(ParamValue('hidden'),
kwargs={'condition': ParamOption(option2, todict=True),
'expected': ParamValue('test'),
'reverse_condition': ParamValue(True)}))
option3 = StrOption('unicode3', "Unicode follower 3", properties=(hidden_property,), multi=True)
descr1 = Leadership("unicode", "Common configuration 1",
[option, option1, option2, option3])
descr = OptionDescription("options", "Common configuration 2", [descr1])

4
tests/dict/data/unicode1_leadership_requires_all.json
View File

@ -34,13 +34,15 @@
},
"model": {
"options.unicode1": {
"display": false,
"properties": [
"hidden"
]
},
"options.unicode1.unicode1": {
"required": true,
"properties": [
"unique"
],
"hidden": true,
"display": false
}

13
tests/dict/data/unicode1_leadership_requires_all.py
View File

@ -1,5 +1,4 @@
from tiramisu.option import StrOption, OptionDescription
from tiramisu import Leadership
from tiramisu import StrOption, OptionDescription, Leadership, Calculation, ParamValue, ParamOption, Params, calc_value
def get_description():
@ -9,11 +8,13 @@ def get_description():
option1 = StrOption('unicode1', "Unicode leader", multi=True)
option2 = StrOption('unicode2', "Unicode follower 1", multi=True)
option3 = StrOption('unicode3', "Unicode follower 2", multi=True)
hidden_property = Calculation(calc_value,
Params(ParamValue('hidden'),
kwargs={'condition': ParamOption(option, todict=True),
'expected': ParamValue('test'),
'reverse_condition': ParamValue(True)}))
descr1 = Leadership("unicode1", "Common configuration",
[option1, option2, option3], requires=[{'option': option,
'expected': u'test',
'action': 'hidden',
'inverse': True}])
[option1, option2, option3], properties=(hidden_property,))
descr = OptionDescription("options", "Common configuration", [option, descr1])
descr = OptionDescription("unicode1_leadership_requires_all", "Leader follower with requirement", [descr])
return descr

79
tests/dict/data/unicode1_leadership_requires_leader.json → tests/dict/data/unicode1_leadership_requires_disabled_value.json
View File

@ -3,46 +3,75 @@
"options": {
"properties": {
"options.unicode": {
"type": "string",
"title": "Value 'test' must show leader"
},
"options.unicode1": {
"properties": {
"options.unicode1.unicode1": {
"options.unicode.unicode": {
"type": "string",
"isMulti": true,
"title": "Unicode leader"
"title": "Values 'test' must show 'Unicode follower 3'"
},
"options.unicode1.unicode2": {
"options.unicode.unicode1": {
"type": "string",
"isMulti": true,
"title": "Unicode follower 1"
},
"options.unicode1.unicode3": {
"options.unicode.unicode2": {
"type": "string",
"isMulti": true,
"title": "Unicode follower 2"
},
"options.unicode.unicode3": {
"type": "string",
"isMulti": true,
"title": "Unicode follower 3"
}
},
"type": "array",
"title": "Common configuration"
"title": "Common configuration 1"
}
},
"type": "object",
"title": "Common configuration"
"title": "Common configuration 2"
}
},
"model": {
"options.unicode1": {
"display": false,
"properties": [
"hidden"
]
},
"options.unicode1.unicode1": {
"options.unicode.unicode": {
"required": true,
"hidden": true,
"display": false
"properties": [
"unique"
],
"value": [
"test",
"val2"
],
"owner": "user"
},
"options.unicode.unicode1": {
"0": {
"value": "super1",
"owner": "user"
},
"1": {
"value": "super2",
"owner": "user"
}
},
"options.unicode.unicode2": {
"0": {
"value": "pas test",
"owner": "user"
},
"1": {
"value": "test",
"owner": "user"
}
},
"options.unicode.unicode3": {
"1": {
"hidden": true,
"display": false,
"value": "super",
"owner": "user"
}
}
},
"global": {
@ -62,33 +91,33 @@
]
},
"form": {
"options.unicode": {
"options.unicode.unicode": {
"clearable": true,
"type": "input",
"dependencies": {
"default": {
"hide": [
"options.unicode1"
"options.unicode.unicode3"
]
},
"expected": {
"test": {
"show": [
"options.unicode1"
"options.unicode.unicode3"
]
}
}
}
},
"options.unicode1.unicode1": {
"options.unicode.unicode1": {
"clearable": true,
"type": "input"
},
"options.unicode1.unicode2": {
"options.unicode.unicode2": {
"clearable": true,
"type": "input"
},
"options.unicode1.unicode3": {
"options.unicode.unicode3": {
"clearable": true,
"type": "input"
},

33
tests/dict/data/unicode1_leadership_requires_disabled_value.py Normal file
View File

@ -0,0 +1,33 @@
from tiramisu import StrOption, OptionDescription, Leadership, Calculation, ParamValue, ParamOption, Params, calc_value
def get_description():
"""generate description for this test
"""
option = StrOption('unicode', "Values 'test' must show 'Unicode follower 3'", multi=True)
option1 = StrOption('unicode1', "Unicode follower 1", multi=True)
option2 = StrOption('unicode2', "Unicode follower 2", multi=True)
disabled_property = Calculation(calc_value,
Params(ParamValue('disabled'),
kwargs={'condition': ParamOption(option, todict=True),
'expected': ParamValue('test'),
'reverse_condition': ParamValue(True)}))
option3 = StrOption('unicode3', "Unicode follower 3", properties=(disabled_property,), multi=True)
descr1 = Leadership("unicode", "Common configuration 1",
[option, option1, option2, option3])
descr = OptionDescription("options", "Common configuration 2", [descr1])
descr = OptionDescription("unicode1_leadership_requires_disabled_value", "Leader followers with Unicode follower 3 disabled when Unicode follower 2 is test and modified value", [descr])
return descr
async def get_values(api, allpath=False):
if allpath:
root = 'unicode1_leadership_requires_disabled_value.'
else:
root = ''
await api.option(root + 'options.unicode.unicode').value.set([u'test', u'val2'])
await api.option(root + 'options.unicode.unicode1', 0).value.set(u'super1')
await api.option(root + 'options.unicode.unicode1', 1).value.set(u'super2')
await api.option(root + 'options.unicode.unicode2', 0).value.set(u'pas test')
await api.option(root + 'options.unicode.unicode2', 1).value.set(u'test')
await api.option(root + 'options.unicode.unicode3', 1).value.set(u'super')

5
tests/dict/data/unicode1_leadership_requires_follower.json
View File

@ -30,7 +30,10 @@
},
"model": {
"options.unicode1.unicode1": {
"required": true
"required": true,
"properties": [
"unique"
]
}
},
"global": {

14
tests/dict/data/unicode1_leadership_requires_follower.py
View File

@ -1,5 +1,4 @@
from tiramisu.option import StrOption, OptionDescription
from tiramisu import Leadership
from tiramisu import StrOption, OptionDescription, Leadership, Calculation, ParamValue, ParamOption, Params, calc_value
def get_description():
@ -7,11 +6,12 @@ def get_description():
"""
option1 = StrOption('unicode1', "Values 'test' must show 'Unicode follower 2'", multi=True)
option2 = StrOption('unicode2', "Unicode follower 1", multi=True)
option3 = StrOption('unicode3', "Unicode follower 2", multi=True,
requires=[{'option': option1,
'expected': u'test',
'action': 'hidden',
'inverse': True}])
hidden_property = Calculation(calc_value,
Params(ParamValue('hidden'),
kwargs={'condition': ParamOption(option1, todict=True),
'expected': ParamValue('test'),
'reverse_condition': ParamValue(True)}))
option3 = StrOption('unicode3', "Unicode follower 2", multi=True, properties=(hidden_property,))
descr1 = Leadership("unicode1", "Common configuration",
[option1, option2, option3])
descr = OptionDescription("options", "Common configuration", [descr1])

7
tests/dict/data/unicode1_leadership_requires_follower_value.json
View File

@ -31,6 +31,9 @@
"model": {
"options.unicode1.unicode1": {
"required": true,
"properties": [
"unique"
],
"value": [
"test",
"pas test"
@ -49,8 +52,8 @@
"owner": "user"
},
"1": {
"display": false,
"hidden": true
"hidden": true,
"display": false
}
}
},

16
tests/dict/data/unicode1_leadership_requires_follower_value.py
View File

@ -1,5 +1,4 @@
from tiramisu.option import StrOption, OptionDescription
from tiramisu import Leadership
from tiramisu import StrOption, OptionDescription, Leadership, Calculation, ParamValue, ParamOption, Params, calc_value
def get_description():
@ -7,15 +6,16 @@ def get_description():
"""
option1 = StrOption('unicode1', "Values 'test' must show 'Unicode follower 2'", multi=True)
option2 = StrOption('unicode2', "Unicode follower 1", multi=True)
option3 = StrOption('unicode3', "Unicode follower 2", multi=True,
requires=[{'option': option1,
'expected': u'test',
'action': 'hidden',
'inverse': True}])
hidden_property = Calculation(calc_value,
Params(ParamValue('hidden'),
kwargs={'condition': ParamOption(option1, todict=True),
'expected': ParamValue('test'),
'reverse_condition': ParamValue(True)}))
option3 = StrOption('unicode3', "Unicode follower 2", multi=True, properties=(hidden_property,))
descr1 = Leadership("unicode1", "Common configuration",
[option1, option2, option3])
descr = OptionDescription("options", "Common configuration", [descr1])
descr = OptionDescription("unicode1_leadership_requires_follower_value", "Leader follower requires follower with leader value", [descr])
descr = OptionDescription("unicode1_leadership_requires_follower_value", "Leader follower requires follower with leader", [descr])
return descr

5
tests/dict/data/unicode1_leadership_requires_followers.json
View File

@ -30,7 +30,10 @@
},
"model": {
"options.unicode1.unicode1": {
"required": true
"required": true,
"properties": [
"unique"
]
}
},
"global": {

14
tests/dict/data/unicode1_leadership_requires_followers.py
View File

@ -1,5 +1,4 @@
from tiramisu.option import StrOption, OptionDescription
from tiramisu import Leadership
from tiramisu import StrOption, OptionDescription, Leadership, Calculation, ParamValue, ParamOption, Params, calc_value
def get_description():
@ -7,11 +6,12 @@ def get_description():
"""
option1 = StrOption('unicode1', "Unicode leader", multi=True)
option2 = StrOption('unicode2', "Values 'test' must show 'Unicode follower 2'", multi=True)
option3 = StrOption('unicode3', "Unicode follower 2", multi=True,
requires=[{'option': option2,
'expected': u'test',
'action': 'hidden',
'inverse': True}])
hidden_property = Calculation(calc_value,
Params(ParamValue('hidden'),
kwargs={'condition': ParamOption(option2, todict=True),
'expected': ParamValue('test'),
'reverse_condition': ParamValue(True)}))
option3 = StrOption('unicode3', "Unicode follower 2", multi=True, properties=(hidden_property,))
descr1 = Leadership("unicode1", "Common configuration",
[option1, option2, option3])
descr = OptionDescription("options", "Common configuration", [descr1])

19
tests/dict/data/unicode1_leadership_requires_leader.py
View File

@ -1,19 +0,0 @@
from tiramisu.option import StrOption, OptionDescription
from tiramisu import Leadership
def get_description():
"""generate description for this test
"""
option = StrOption('unicode', "Value 'test' must show leader")
option1 = StrOption('unicode1', "Unicode leader", multi=True, requires=[{'option': option,
'expected': u'test',
'action': 'hidden',
'inverse': True}])
option2 = StrOption('unicode2', "Unicode follower 1", multi=True)
option3 = StrOption('unicode3', "Unicode follower 2", multi=True)
descr1 = Leadership("unicode1", "Common configuration",
[option1, option2, option3])
descr = OptionDescription("options", "Common configuration", [option, descr1])
descr = OptionDescription("unicode1_leadership_requires_leader", "Leader follower with requirement on leader", [descr])
return descr

5
tests/dict/data/unicode1_leadership_requires_value.json
View File

@ -36,6 +36,9 @@
"model": {
"options.unicode.unicode": {
"required": true,
"properties": [
"unique"
],
"value": [
"test",
"val2"
@ -64,8 +67,8 @@
},
"options.unicode.unicode3": {
"1": {
"display": false,
"hidden": true,
"display": false,
"value": "super",
"owner": "user"
}

14
tests/dict/data/unicode1_leadership_requires_value.py
View File

@ -1,5 +1,4 @@
from tiramisu.option import StrOption, OptionDescription
from tiramisu import Leadership
from tiramisu import StrOption, OptionDescription, Leadership, Calculation, ParamValue, ParamOption, Params, calc_value
def get_description():
@ -8,11 +7,12 @@ def get_description():
option = StrOption('unicode', "Values 'test' must show 'Unicode follower 3'", multi=True)
option1 = StrOption('unicode1', "Unicode follower 1", multi=True)
option2 = StrOption('unicode2', "Unicode follower 2", multi=True)
option3 = StrOption('unicode3', "Unicode follower 3", requires=[{'option': option,
'expected': u'test',
'action': 'hidden',
'inverse': True}],
multi=True)
hidden_property = Calculation(calc_value,
Params(ParamValue('hidden'),
kwargs={'condition': ParamOption(option, todict=True),
'expected': ParamValue('test'),
'reverse_condition': ParamValue(True)}))
option3 = StrOption('unicode3', "Unicode follower 3", properties=(hidden_property,), multi=True)
descr1 = Leadership("unicode", "Common configuration 1",
[option, option1, option2, option3])
descr = OptionDescription("options", "Common configuration 2", [descr1])

7
tests/dict/data/unicode1_multi_requires.json
View File

@ -19,8 +19,11 @@
"model": {
"options.unicode2": {
"required": true,
"display": false,
"hidden": true
"properties": [
"unique"
],
"hidden": true,
"display": false
}
},
"global": {

13
tests/dict/data/unicode1_multi_requires.py
View File

@ -1,15 +1,16 @@
from tiramisu.option import StrOption, OptionDescription
from tiramisu import StrOption, OptionDescription, Calculation, ParamValue, ParamOption, Params, calc_value
def get_description():
"""generate description for this test
"""
option1 = StrOption('unicode1', "Value 'test' must show Unicode 2")
option2 = StrOption('unicode2', "Unicode 2", requires=[{'option': option1,
'expected': u'test',
'action': 'hidden',
'inverse': True}],
multi=True)
hidden_property = Calculation(calc_value,
Params(ParamValue('hidden'),
kwargs={'condition': ParamOption(option1, todict=True),
'expected': ParamValue('test'),
'reverse_condition': ParamValue(True)}))
option2 = StrOption('unicode2', "Unicode 2", properties=(hidden_property,), multi=True)
descr1 = OptionDescription("options", "Common configuration", [option1, option2])
descr = OptionDescription("unicode1_multi_requires", "Unicode multi with requirement", [descr1])
return descr

1
tests/dict/data/unicode1_optiondescription_requires.json
View File

@ -27,7 +27,6 @@
},
"model": {
"unicode1": {
"display": false,
"properties": [
"hidden"
]

13
tests/dict/data/unicode1_optiondescription_requires.py
View File

@ -1,4 +1,4 @@
from tiramisu.option import StrOption, OptionDescription
from tiramisu import StrOption, OptionDescription, Calculation, ParamValue, ParamOption, Params, calc_value
def get_description():
@ -8,10 +8,11 @@ def get_description():
descr1 = OptionDescription("options", "Common configuration", [option1])
option2 = StrOption('unicode2', "Unicode 2")
option3 = StrOption('unicode3', "Unicode 3")
descr2 = OptionDescription("unicode1", "OptionDescription with 2 options",
[option2, option3], requires=[{'option': option1,
'expected': u'test',
'action': 'hidden',
'inverse': True}])
hidden_property = Calculation(calc_value,
Params(ParamValue('hidden'),
kwargs={'condition': ParamOption(option1, todict=True),
'expected': ParamValue('test'),
'reverse_condition': ParamValue(True)}))
descr2 = OptionDescription("unicode1", "OptionDescription with 2 options", [option2, option3], properties=(hidden_property,))
descr = OptionDescription("unicode1_optiondescription_requires", "OptionDesciption with requirement", [descr1, descr2])
return descr

12
tests/dict/data/unicode1_requires.py
View File

@ -1,14 +1,16 @@
from tiramisu.option import StrOption, OptionDescription
from tiramisu import StrOption, OptionDescription, Calculation, ParamValue, ParamOption, Params, calc_value
def get_description():
"""generate description for this test
"""
option1 = StrOption('unicode1', "Value 'test' must show Unicode 2")
option2 = StrOption('unicode2', "Unicode 2", requires=[{'option': option1,
'expected': u'test',
'action': 'hidden',
'inverse': True}])
hidden_property = Calculation(calc_value,
Params(ParamValue('hidden'),
kwargs={'condition': ParamOption(option1, todict=True),
'expected': ParamValue('test'),
'reverse_condition': ParamValue(True)}))
option2 = StrOption('unicode2', "Unicode 2", properties=(hidden_property,))
descr1 = OptionDescription("options", "Common configuration", [option1, option2])
descr = OptionDescription("unicode1_requires", "Unicode with requirement", [descr1])
return descr

2
tests/dict/test_json.py
View File

@ -31,7 +31,7 @@ def list_data(ext='.py'):
ret = []
for filename in filenames:
# if filename.endswith(ext) and not filename.startswith('__'):
if filename.endswith(ext) and not filename.startswith('__') and not 'require' in filename and not 'not_equal' in filename and not 'callback' in filename and not filename == 'unicode2_copy.py' and not filename == 'unicode2_multi_copy.py':
if filename.endswith(ext) and not filename.startswith('__') and not 'not_equal' in filename and not 'callback' in filename and not filename == 'unicode2_copy.py' and not filename == 'unicode2_multi_copy.py':
ret.append(filename)
return ret