0002-misc-add-custom-lazy-field-for-map-variables-for-str.patch

Frédéric Péters, 06 décembre 2018 12:41

Voir les différences: en ligne côte à côte

Subject: [PATCH 2/2] misc: add custom lazy field for map variables, for string
 compat (#28193)

 tests/test_formdata.py | 21 +++++++++++++++------
 wcs/variables.py       |  9 +++++++++
 2 files changed, 24 insertions(+), 6 deletions(-)

     def test_lazy_map_variable(pub, variable_test_data):
         formdef = FormDef.select()[0]
         formdata = formdef.data_class().select()[0]
         pub.substitutions.reset()
         pub.substitutions.feed(formdef)
         pub.substitutions.feed(formdata)
         for mode in (None, 'lazy'):
             assert WorkflowStatusItem.compute('=form_var_map') == '2;4'
             assert WorkflowStatusItem.compute('=form_var_map.split(";")[0]') == '2'
             pub.substitutions.reset()
             pub.substitutions.feed(formdef)
             with pub.substitutions.temporary_feed(formdata, force_mode=mode):
                 assert WorkflowStatusItem.compute('=form_var_map', raises=True) == '2;4'
                 assert WorkflowStatusItem.compute('{{ form_var_map }}', raises=True) == '2;4'
                 assert WorkflowStatusItem.compute('=form_var_map.split(";")[0]', raises=True) == '2'
                 assert WorkflowStatusItem.compute('{{ form_var_map|split:";"|first }}', raises=True) == '2'
                 assert WorkflowStatusItem.compute('=form_var_map_lat', raises=True) == 2
                 assert WorkflowStatusItem.compute('{{ form_var_map_lat }}', raises=True) == '2.0'
                 assert WorkflowStatusItem.compute('=form_var_map_lon', raises=True) == 4
                 assert WorkflowStatusItem.compute('{{ form_var_map_lon }}', raises=True) == '4.0'
         formdata.data['7'] = None
         formdata.store()
-...
         pub.substitutions.feed(formdef)
         pub.substitutions.feed(formdata)
         for mode in (None, 'lazy'):
             assert WorkflowStatusItem.compute('=form_var_map') is None
             pub.substitutions.reset()
             pub.substitutions.feed(formdef)
             with pub.substitutions.temporary_feed(formdata, force_mode=mode):
                 assert WorkflowStatusItem.compute('=form_var_map', raises=True) is None
     def test_lazy_conditions(pub, variable_test_data):
         condition = Condition({'type': 'django', 'value': 'form_var_foo_foo == "bar"'})

             if field.key == 'date':
                 return LazyFieldVarDate(self.data, field, self.formdata)
             if field.key == 'map':
                 return LazyFieldVarMap(self.data, field, self.formdata)
             return LazyFieldVar(self.data, field, self.formdata)
-...
             return self.get_raw().tm_yday
     class LazyFieldVarMap(LazyFieldVar):
         def split(self, *args, **kwargs):
             # Compatibility with usage of map variable as a string. It is
             # recommended to use lat/lon properties instead.
             return self.data.get(self.field.id).split(*args, **kwargs)
     class LazyUser(object):
         def __init__(self, user):
             self.user = user
+    -

Projet

Général

Profil

Produits Entr'ouvert » w.c.s.

0002-misc-add-custom-lazy-field-for-map-variables-for-str.patch