initial gis test structure

django/contrib/gis/db/models/sql/matching.py

@@ -0,0 +1,32 @@
+match_functions = {'bbcontains': None,
+    'bboverlaps': None,
+    'contained': None,
+    'contains': None,
+    'contains_properly': None,
+    'coveredby': None,
+    'covers': None,
+    'crosses': None,
+    'disjoint': None,
+    'distance_gt': None,
+    'distance_gte': None,
+    'distance_lt': None,
+    'distance_lte': None,
+    'dwithin': None,
+    'equals': None,
+    'exact': None,
+    'intersects': None,
+    'overlaps': None,
+    'relate': None,
+    'same_as': None,
+    'touches': None,
+    'within': None,
+    'left': None,
+    'right': None,
+    'overlaps_left': None,
+    'overlaps_right': None,
+    'overlaps_above': None,
+    'overlaps_below': None,
+    'strictly_above': None,
+    'strictly_below': None}
+
+

django/contrib/gis/tests/__init__.py

@@ -17,7 +17,7 @@ def geo_apps(namespace=True, runtests=False):
     from django.contrib.gis.geos import GEOS_PREPARE
     from django.contrib.gis.gdal import HAS_GDAL
 
-    apps = ['geoapp', 'relatedapp']
+    apps = ['geoapp', 'relatedapp', 'geo_q_predicate']
 
     # No distance queries on MySQL.
     if not connection.ops.mysql:

django/contrib/gis/tests/geo_q_predicate/models.py

@@ -0,0 +1,56 @@
+from django.contrib.gis.db import models
+from django.contrib.gis.tests.utils import mysql, spatialite
+from django.utils.encoding import python_2_unicode_compatible
+
+# MySQL spatial indices can't handle NULL geometries.
+null_flag = not mysql
+
+@python_2_unicode_compatible
+class Country(models.Model):
+    name = models.CharField(max_length=30)
+    mpoly = models.MultiPolygonField() # SRID, by default, is 4326
+    objects = models.GeoManager()
+    def __str__(self): return self.name
+
+@python_2_unicode_compatible
+class City(models.Model):
+    name = models.CharField(max_length=30)
+    point = models.PointField()
+    objects = models.GeoManager()
+    def __str__(self): return self.name
+
+# This is an inherited model from City
+class PennsylvaniaCity(City):
+    county = models.CharField(max_length=30)
+    founded = models.DateTimeField(null=True)
+    objects = models.GeoManager() # TODO: This should be implicitly inherited.
+
+@python_2_unicode_compatible
+class State(models.Model):
+    name = models.CharField(max_length=30)
+    poly = models.PolygonField(null=null_flag) # Allowing NULL geometries here.
+    objects = models.GeoManager()
+    def __str__(self): return self.name
+
+@python_2_unicode_compatible
+class Track(models.Model):
+    name = models.CharField(max_length=30)
+    line = models.LineStringField()
+    objects = models.GeoManager()
+    def __str__(self): return self.name
+
+class Truth(models.Model):
+    val = models.BooleanField()
+    objects = models.GeoManager()
+
+if not spatialite:
+    @python_2_unicode_compatible
+    class Feature(models.Model):
+        name = models.CharField(max_length=20)
+        geom = models.GeometryField()
+        objects = models.GeoManager()
+        def __str__(self): return self.name
+
+    class MinusOneSRID(models.Model):
+        geom = models.PointField(srid=-1) # Minus one SRID.
+        objects = models.GeoManager()

django/contrib/gis/tests/geo_q_predicate/tests.py

@@ -0,0 +1,6 @@
+from django.test import TestCase
+
+class GeoPredicateTest(TestCase):
+
+    def test_simple(self):
+        self.asserEqual(1,1)