Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Discovered some geodjango tests with standard mechanism

No need to special case tests discovery for regular first-level
gis tests.
  • Loading branch information...
commit 88601bad84ef0efa2da58c8a46ed4a5726cfe291 1 parent 4d46106
@claudep claudep authored
View
12 django/contrib/gis/tests/__init__.py
@@ -2,6 +2,10 @@
from django.test.simple import build_suite, DjangoTestSuiteRunner
from django.utils import unittest
+from .test_geoforms import GeometryFieldTest
+from .test_measure import DistanceTest, AreaTest
+from .test_spatialrefsys import SpatialRefSysTest
+
def geo_apps(namespace=True, runtests=False):
"""
@@ -54,20 +58,12 @@ def geodjango_suite(apps=True):
from django.contrib.gis.geos import tests as geos_tests
suite.addTest(geos_tests.suite())
- # Adding the measurment tests.
- from django.contrib.gis.tests import test_measure
- suite.addTest(test_measure.suite())
-
# Adding GDAL tests, and any test suite that depends on GDAL, to the
# suite if GDAL is available.
from django.contrib.gis.gdal import HAS_GDAL
if HAS_GDAL:
from django.contrib.gis.gdal import tests as gdal_tests
suite.addTest(gdal_tests.suite())
-
- from django.contrib.gis.tests import test_spatialrefsys, test_geoforms
- suite.addTest(test_spatialrefsys.suite())
- suite.addTest(test_geoforms.suite())
else:
sys.stderr.write('GDAL not available - no tests requiring GDAL will be run.\n')
View
2  django/contrib/gis/tests/test_geoforms.py
@@ -1,9 +1,11 @@
from django.forms import ValidationError
from django.contrib.gis import forms
+from django.contrib.gis.gdal import HAS_GDAL
from django.contrib.gis.geos import GEOSGeometry
from django.utils import unittest
+@unittest.skipUnless(HAS_GDAL, "GeometryFieldTest needs gdal support")
class GeometryFieldTest(unittest.TestCase):
def test00_init(self):
View
4 django/contrib/gis/tests/test_spatialrefsys.py
@@ -1,5 +1,5 @@
from django.db import connection
-from django.contrib.gis.gdal import GDAL_VERSION
+from django.contrib.gis.gdal import HAS_GDAL
from django.contrib.gis.tests.utils import no_mysql, oracle, postgis, spatialite
from django.utils import unittest
@@ -35,6 +35,7 @@
elif spatialite:
from django.contrib.gis.db.backends.spatialite.models import SpatialRefSys
+@unittest.skipUnless(HAS_GDAL, "SpatialRefSysTest needs gdal support")
class SpatialRefSysTest(unittest.TestCase):
@no_mysql
@@ -65,6 +66,7 @@ def test01_retrieve(self):
@no_mysql
def test02_osr(self):
"Testing getting OSR objects from SpatialRefSys model objects."
+ from django.contrib.gis.gdal import GDAL_VERSION
for sd in test_srs:
sr = SpatialRefSys.objects.get(srid=sd['srid'])
self.assertEqual(True, sr.spheroid.startswith(sd['spheroid']))
Please sign in to comment.
Something went wrong with that request. Please try again.