innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

[1.6.x] Fixed gis test to run on non gis-enabled settings 

Refs #20998.
Backport of 973502c0 from master.
This commit is contained in:
Claude Paroz 2013-09-02 14:15:04 +02:00
parent 4e3794dd1f
commit 0c57868908
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
django/contrib/gis/tests/test_geoforms.py
View File

@ -245,25 +245,26 @@ class SpecializedFieldTest(SimpleTestCase):
@skipUnless(HAS_GDAL and HAS_SPATIALREFSYS, @skipUnless(HAS_GDAL and HAS_SPATIALREFSYS,
"CustomGeometryWidgetTest needs gdal support and a spatial database") "CustomGeometryWidgetTest needs gdal support and a spatial database")
class CustomGeometryWidgetTest(SimpleTestCase): class CustomGeometryWidgetTest(SimpleTestCase):
class CustomGeometryWidget(forms.BaseGeometryWidget):
template_name = 'gis/openlayers.html'
deserialize_called = 0
def serialize(self, value):
return value.json if value else ''
def deserialize(self, value):
self.deserialize_called += 1
return GEOSGeometry(value)
def test_custom_serialization_widget(self): def test_custom_serialization_widget(self):
class CustomGeometryWidget(forms.BaseGeometryWidget):
template_name = 'gis/openlayers.html'
deserialize_called = 0
def serialize(self, value):
return value.json if value else ''
def deserialize(self, value):
self.deserialize_called += 1
return GEOSGeometry(value)
class PointForm(forms.Form): class PointForm(forms.Form):
p = forms.PointField(widget=self.CustomGeometryWidget) p = forms.PointField(widget=CustomGeometryWidget)
point = GEOSGeometry("SRID=4326;POINT(9.052734375 42.451171875)") point = GEOSGeometry("SRID=4326;POINT(9.052734375 42.451171875)")
form = PointForm(data={'p': point}) form = PointForm(data={'p': point})
self.assertIn(escape(point.json), form.as_p()) self.assertIn(escape(point.json), form.as_p())
self.CustomGeometryWidget.called = 0 CustomGeometryWidget.called = 0
widget = form.fields['p'].widget widget = form.fields['p'].widget
# Force deserialize use due to a string value # Force deserialize use due to a string value
self.assertIn(escape(point.json), widget.render('p', point.json)) self.assertIn(escape(point.json), widget.render('p', point.json))