diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/gis_tests/geo3d/tests.py | 8 | ||||
| -rw-r--r-- | tests/gis_tests/inspectapp/models.py | 8 | ||||
| -rw-r--r-- | tests/gis_tests/inspectapp/tests.py | 27 |
3 files changed, 39 insertions, 4 deletions
diff --git a/tests/gis_tests/geo3d/tests.py b/tests/gis_tests/geo3d/tests.py index 022a8063ab..b05201d0bf 100644 --- a/tests/gis_tests/geo3d/tests.py +++ b/tests/gis_tests/geo3d/tests.py @@ -74,7 +74,7 @@ bbox_data = ( @skipUnless(HAS_GDAL, "GDAL is required for Geo3DTest.") -@skipUnlessDBFeature("gis_enabled", "supports_3d_functions") +@skipUnlessDBFeature("gis_enabled", "supports_3d_storage") class Geo3DTest(TestCase): """ Only a subset of the PostGIS routines are 3D-enabled, and this TestCase @@ -189,6 +189,7 @@ class Geo3DTest(TestCase): ref_json_regex = re.compile(r'^{"type":"Point","coordinates":\[-95.363151,29.763374,18(\.0+)?\]}$') self.assertTrue(ref_json_regex.match(h.geojson)) + @skipUnlessDBFeature("supports_3d_functions") def test_union(self): """ Testing the Union aggregate of 3D models. @@ -207,6 +208,7 @@ class Geo3DTest(TestCase): # Ordering of points in the resulting geometry may vary between implementations self.assertSetEqual({p.ewkt for p in ref_union}, {p.ewkt for p in union}) + @skipUnlessDBFeature("supports_3d_functions") @ignore_warnings(category=RemovedInDjango20Warning) def test_extent(self): """ @@ -227,6 +229,7 @@ class Geo3DTest(TestCase): self.assertIsNone(City3D.objects.none().extent3d()) self.assertIsNone(City3D.objects.none().aggregate(Extent3D('point'))['point__extent3d']) + @skipUnlessDBFeature("supports_3d_functions") def test_perimeter(self): """ Testing GeoQuerySet.perimeter() on 3D fields. @@ -244,6 +247,7 @@ class Geo3DTest(TestCase): Polygon3D.objects.perimeter().get(name='3D BBox').perimeter.m, tol) + @skipUnlessDBFeature("supports_3d_functions") def test_length(self): """ Testing GeoQuerySet.length() on 3D fields. @@ -276,6 +280,7 @@ class Geo3DTest(TestCase): InterstateProj3D.objects.length().get(name='I-45').length.m, tol) + @skipUnlessDBFeature("supports_3d_functions") def test_scale(self): """ Testing GeoQuerySet.scale() on Z values. @@ -287,6 +292,7 @@ class Geo3DTest(TestCase): for city in City3D.objects.scale(1.0, 1.0, zscale): self.assertEqual(city_dict[city.name][2] * zscale, city.scale.z) + @skipUnlessDBFeature("supports_3d_functions") def test_translate(self): """ Testing GeoQuerySet.translate() on Z values. diff --git a/tests/gis_tests/inspectapp/models.py b/tests/gis_tests/inspectapp/models.py index a649605487..fd343b7803 100644 --- a/tests/gis_tests/inspectapp/models.py +++ b/tests/gis_tests/inspectapp/models.py @@ -14,3 +14,11 @@ class AllOGRFields(models.Model): point = models.PointField() objects = models.GeoManager() + + +class Fields3D(models.Model): + point = models.PointField(dim=3) + line = models.LineStringField(dim=3) + poly = models.PolygonField(dim=3) + + objects = models.GeoManager() diff --git a/tests/gis_tests/inspectapp/tests.py b/tests/gis_tests/inspectapp/tests.py index 19d5aa054c..c40ffaa7e8 100644 --- a/tests/gis_tests/inspectapp/tests.py +++ b/tests/gis_tests/inspectapp/tests.py @@ -27,9 +27,11 @@ class InspectDbTests(TestCase): Test the geo-enabled inspectdb command. """ out = StringIO() - call_command('inspectdb', - table_name_filter=lambda tn: tn.startswith('inspectapp_'), - stdout=out) + call_command( + 'inspectdb', + table_name_filter=lambda tn: tn == 'inspectapp_allogrfields', + stdout=out + ) output = out.getvalue() if connection.features.supports_geometry_field_introspection: self.assertIn('geom = models.PolygonField()', output) @@ -39,6 +41,25 @@ class InspectDbTests(TestCase): self.assertIn('point = models.GeometryField(', output) self.assertIn('objects = models.GeoManager()', output) + @skipUnlessDBFeature("supports_3d_storage") + def test_3d_columns(self): + out = StringIO() + call_command( + 'inspectdb', + table_name_filter=lambda tn: tn == 'inspectapp_fields3d', + stdout=out + ) + output = out.getvalue() + if connection.features.supports_geometry_field_introspection: + self.assertIn('point = models.PointField(dim=3)', output) + self.assertIn('line = models.LineStringField(dim=3)', output) + self.assertIn('poly = models.PolygonField(dim=3)', output) + else: + self.assertIn('point = models.GeometryField(', output) + self.assertIn('line = models.GeometryField(', output) + self.assertIn('poly = models.GeometryField(', output) + self.assertIn('objects = models.GeoManager()', output) + @skipUnless(HAS_GDAL, "OGRInspectTest needs GDAL support") @skipUnlessDBFeature("gis_enabled") |