Fixed regression introduced in r13755 that prevented the running of the…

Fixed regression introduced in r13755 that prevented the running of the GEOS/GDAL test suites without configuring Django settings; moved reference geometry data from Python module to compressed JSON fixture; put in workaround in tests for GDAL bug #3783.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14414 bcc190cf-cafb-0310-a4f2-bffc1f526a37

django/contrib/gis/gdal/tests/test_ds.py

 import os, os.path, unittest
-from django.contrib.gis.gdal import DataSource, Envelope, OGRGeometry, OGRException, OGRIndexError
+from django.contrib.gis.gdal import DataSource, Envelope, OGRGeometry, OGRException, OGRIndexError, GDAL_VERSION
 from django.contrib.gis.gdal.field import OFTReal, OFTInteger, OFTString
-from django.contrib import gis
-
-# Path for SHP files
-data_path = os.path.join(os.path.dirname(gis.__file__), 'tests' + os.sep + 'data')
-def get_ds_file(name, ext):
-    return os.sep.join([data_path, name, name + '.%s' % ext])
-
-# Test SHP data source object
-class TestDS:
-    def __init__(self, name, **kwargs):
-        ext = kwargs.pop('ext', 'shp')
-        self.ds = get_ds_file(name, ext)
-        for key, value in kwargs.items():
-            setattr(self, key, value)
+from django.contrib.gis.geometry.test_data import get_ds_file, TestDS
 
 # List of acceptable data sources.
 ds_list = (TestDS('test_point', nfeat=5, nfld=3, geom='POINT', gtype=1, driver='ESRI Shapefile',
@@ -28,7 +15,7 @@ ds_list = (TestDS('test_point', nfeat=5, nfld=3, geom='POINT', gtype=1, driver='
                   extent=(1.0, 2.0, 100.0, 523.5), # Min/Max from CSV
                   field_values={'POINT_X' : ['1.0', '5.0', '100.0'], 'POINT_Y' : ['2.0', '23.0', '523.5'], 'NUM' : ['5', '17', '23']},
                   fids=range(1,4)),
-           TestDS('test_poly', nfeat=3, nfld=3, geom='POLYGON', gtype=3, 
+           TestDS('test_poly', nfeat=3, nfld=3, geom='POLYGON', gtype=3,
                   driver='ESRI Shapefile',
                   fields={'float' : OFTReal, 'int' : OFTInteger, 'str' : OFTString,},
                   extent=(-1.01513,-0.558245,0.161876,0.839637), # Got extent from QGIS
@@ -63,7 +50,7 @@ class DataSourceTest(unittest.TestCase):
                 pass
             else:
                 self.fail('Expected an IndexError!')
-                        
+
     def test02_invalid_shp(self):
         "Testing invalid SHP files for the Data Source."
         for source in bad_ds:
@@ -76,7 +63,7 @@ class DataSourceTest(unittest.TestCase):
             ds = DataSource(source.ds)
 
             # Incrementing through each layer, this tests DataSource.__iter__
-            for layer in ds:                
+            for layer in ds:
                 # Making sure we get the number of features we expect
                 self.assertEqual(len(layer), source.nfeat)
 
@@ -85,16 +72,22 @@ class DataSourceTest(unittest.TestCase):
                 self.assertEqual(source.nfld, len(layer.fields))
 
                 # Testing the layer's extent (an Envelope), and it's properties
-                self.assertEqual(True, isinstance(layer.extent, Envelope))
-                self.assertAlmostEqual(source.extent[0], layer.extent.min_x, 5)
-                self.assertAlmostEqual(source.extent[1], layer.extent.min_y, 5)
-                self.assertAlmostEqual(source.extent[2], layer.extent.max_x, 5)
-                self.assertAlmostEqual(source.extent[3], layer.extent.max_y, 5)
+                if source.driver == 'VRT' and (GDAL_VERSION > (1, 7, 0) and GDAL_VERSION < (1, 7, 3)):
+                    # There's a known GDAL regression with retrieving the extent
+                    # of a VRT layer in versions 1.7.0-1.7.2:
+                    #  http://trac.osgeo.org/gdal/ticket/3783
+                    pass
+                else:
+                    self.assertEqual(True, isinstance(layer.extent, Envelope))
+                    self.assertAlmostEqual(source.extent[0], layer.extent.min_x, 5)
+                    self.assertAlmostEqual(source.extent[1], layer.extent.min_y, 5)
+                    self.assertAlmostEqual(source.extent[2], layer.extent.max_x, 5)
+                    self.assertAlmostEqual(source.extent[3], layer.extent.max_y, 5)
 
                 # Now checking the field names.
                 flds = layer.fields
                 for f in flds: self.assertEqual(True, f in source.fields)
-                
+
                 # Negative FIDs are not allowed.
                 self.assertRaises(OGRIndexError, layer.__getitem__, -1)
                 self.assertRaises(OGRIndexError, layer.__getitem__, 50000)
@@ -115,7 +108,7 @@ class DataSourceTest(unittest.TestCase):
                         for fld_name in fld_names:
                             self.assertEqual(source.field_values[fld_name][i], feat.get(fld_name))
         print "\nEND - expecting out of range feature id error; safe to ignore."
-                        
+
     def test03b_layer_slice(self):
         "Test indexing and slicing on Layers."
         # Using the first data-source because the same slice
@@ -146,7 +139,7 @@ class DataSourceTest(unittest.TestCase):
         # Making sure we can call OGR routines on the Layer returned.
         lyr = get_layer()
         self.assertEqual(source.nfeat, len(lyr))
-        self.assertEqual(source.gtype, lyr.geom_type.num)        
+        self.assertEqual(source.gtype, lyr.geom_type.num)
 
     def test04_features(self):
         "Testing Data Source Features."
@@ -170,7 +163,7 @@ class DataSourceTest(unittest.TestCase):
 
                     # Testing Feature.__iter__
                     for fld in feat: self.assertEqual(True, fld.name in source.fields.keys())
-                        
+
     def test05_geometries(self):
         "Testing Geometries from Data Source Features."
         for source in ds_list:
@@ -223,7 +216,7 @@ class DataSourceTest(unittest.TestCase):
         # should indicate that there are 3 features in the Layer.
         lyr.spatial_filter = None
         self.assertEqual(3, len(lyr))
-        
+
 def suite():
     s = unittest.TestSuite()
     s.addTest(unittest.makeSuite(DataSourceTest))

django/contrib/gis/geometry/test_data.py

+"""
+This module has the mock object definitions used to hold reference geometry
+for the GEOS and GDAL tests.
+"""
+import gzip
+import os
+
+from django.contrib import gis
+from django.utils import simplejson
+
+
+# This global used to store reference geometry data.
+GEOMETRIES = None
+
+# Path where reference test data is located.
+TEST_DATA = os.path.join(os.path.dirname(gis.__file__), 'tests', 'data')
+
+
+def tuplize(seq):
+    "Turn all nested sequences to tuples in given sequence."
+    if isinstance(seq, (list, tuple)):
+        return tuple([tuplize(i) for i in seq])
+    return seq
+
+
+def get_ds_file(name, ext):
+    return os.path.join(TEST_DATA,
+                        name,
+                        name + '.%s' % ext
+                        )
+
+
+class TestObj(object):
+    """
+    Base testing object, turns keyword args into attributes.
+    """
+    def __init__(self, **kwargs):
+        for key, value in kwargs.items():
+            setattr(self, key, value)
+
+
+class TestDS(TestObj):
+    """
+    Object for testing GDAL data sources.
+    """
+    def __init__(self, name, **kwargs):
+        # Shapefile is default extension, unless specified otherwise.
+        ext = kwargs.pop('ext', 'shp')
+        self.ds = get_ds_file(name, ext)
+        super(TestDS, self).__init__(**kwargs)
+
+
+class TestGeom(TestObj):
+    """
+    Testing object used for wrapping reference geometry data
+    in GEOS/GDAL tests.
+    """
+    def __init__(self, **kwargs):
+        # Converting lists to tuples of certain keyword args
+        # so coordinate test cases will match (JSON has no
+        # concept of tuple).
+        coords = kwargs.pop('coords', None)
+        if coords:
+            self.coords = tuplize(coords)
+
+        centroid = kwargs.pop('centroid', None)
+        if centroid:
+            self.centroid = tuple(centroid)
+
+        ext_ring_cs = kwargs.pop('ext_ring_cs', None)
+        if ext_ring_cs:
+            ext_ring_cs = tuplize(ext_ring_cs)
+        self.ext_ring_cs = ext_ring_cs
+
+        super(TestGeom, self).__init__(**kwargs)
+
+
+class TestGeomSet(object):
+    """
+    Each attribute of this object is a list of `TestGeom` instances.
+    """
+    def __init__(self, **kwargs):
+        for key, value in kwargs.items():
+            setattr(self, key, [TestGeom(**kwargs) for kwargs in value])
+
+
+class TestDataMixin(object):
+    """
+    Mixin used for GEOS/GDAL test cases that defines a `geometries`
+    property, which returns and/or loads the reference geometry data.
+    """
+    @property
+    def geometries(self):
+        global GEOMETRIES
+        if GEOMETRIES is None:
+            # Load up the test geometry data from fixture into global.
+            gzf = gzip.GzipFile(os.path.join(TEST_DATA, 'geometries.json.gz'))
+            geometries = simplejson.loads(gzf.read())
+            GEOMETRIES = TestGeomSet(**geometries)
+        return GEOMETRIES