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

[1.8.x] Complemented test about non-supported aggregation exception 

Backport of d69ecf922d from master.
This commit is contained in:
Claude Paroz 2015-01-17 10:01:17 +01:00
parent eb6a07e069
commit dec5157a72
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
django/contrib/gis/tests/geoapp/tests.py
View File

@ -630,14 +630,21 @@ class GeoQuerySetTest(TestCase):
for ptown in [ptown1, ptown2]: for ptown in [ptown1, ptown2]:
self.assertEqual('<Point><coordinates>-104.609252,38.255001</coordinates></Point>', ptown.kml) self.assertEqual('<Point><coordinates>-104.609252,38.255001</coordinates></Point>', ptown.kml)
# Only PostGIS has support for the MakeLine aggregate.
@skipUnlessDBFeature("supports_make_line_aggr")
@ignore_warnings(category=RemovedInDjango20Warning) @ignore_warnings(category=RemovedInDjango20Warning)
def test_make_line(self): def test_make_line(self):
""" """
Testing the (deprecated) `make_line` GeoQuerySet method and the MakeLine Testing the (deprecated) `make_line` GeoQuerySet method and the MakeLine
aggregate. aggregate.
""" """
if not connection.features.supports_make_line_aggr:
# Only PostGIS has support for the MakeLine aggregate. For other
# backends, test that NotImplementedError is raised
self.assertRaises(
NotImplementedError,
City.objects.all().aggregate, MakeLine('point')
)
return
# Ensuring that a `TypeError` is raised on models without PointFields. # Ensuring that a `TypeError` is raised on models without PointFields.
self.assertRaises(TypeError, State.objects.make_line) self.assertRaises(TypeError, State.objects.make_line)
self.assertRaises(TypeError, Country.objects.make_line) self.assertRaises(TypeError, Country.objects.make_line)