summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorSergey Fedoseev <fedoseev.sergey@gmail.com>2016-12-16 01:00:08 +0600
committerTim Graham <timograham@gmail.com>2016-12-15 14:00:08 -0500
commit5a23cc00f535a045db6d9c04c3c14594ee23fbec (patch)
treec46bf08855a9d039ed316a21ae774661fbd49c54 /tests
parentd2a26c1a90e837777dabdf3d67ceec4d2a70fb86 (diff)
Fixed #27607 -- Added Oracle support for AsGML GIS function.
Diffstat (limited to 'tests')
-rw-r--r--tests/gis_tests/geoapp/test_functions.py15
1 files changed, 6 insertions, 9 deletions
diff --git a/tests/gis_tests/geoapp/test_functions.py b/tests/gis_tests/geoapp/test_functions.py
index 3ce72b9d21..7b6281a4b9 100644
--- a/tests/gis_tests/geoapp/test_functions.py
+++ b/tests/gis_tests/geoapp/test_functions.py
@@ -11,7 +11,7 @@ from django.db.models import Sum
from django.test import TestCase, skipUnlessDBFeature
from django.utils import six
-from ..utils import mysql, oracle, postgis, spatialite
+from ..utils import mysql, oracle, spatialite
from .models import City, Country, CountryWebMercator, State, Track
@@ -104,7 +104,7 @@ class GISFunctionsTests(TestCase):
if oracle:
# No precision parameter for Oracle :-/
gml_regex = re.compile(
- r'^<gml:Point srsName="SDO:4326" xmlns:gml="http://www.opengis.net/gml">'
+ r'^<gml:Point srsName="EPSG:4326" xmlns:gml="http://www.opengis.net/gml">'
r'<gml:coordinates decimal="\." cs="," ts=" ">-104.60925\d+,38.25500\d+ '
r'</gml:coordinates></gml:Point>'
)
@@ -113,14 +113,11 @@ class GISFunctionsTests(TestCase):
r'^<gml:Point srsName="EPSG:4326"><gml:coordinates>'
r'-104\.60925\d+,38\.255001</gml:coordinates></gml:Point>'
)
-
self.assertTrue(gml_regex.match(ptown.gml))
-
- if postgis:
- self.assertIn(
- '<gml:pos srsDimension="2">',
- City.objects.annotate(gml=functions.AsGML('point', version=3)).get(name='Pueblo').gml
- )
+ self.assertIn(
+ '<gml:pos srsDimension="2">',
+ City.objects.annotate(gml=functions.AsGML('point', version=3)).get(name='Pueblo').gml
+ )
@skipUnlessDBFeature("has_AsKML_function")
def test_askml(self):