mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00
Code Issues 32 Releases Wiki Activity

Removed unneeded GeoManagers in tests.

Browse Source
This commit is contained in:
Tim Graham
2016-03-11 12:53:12 -05:00
parent 1f035e6283
commit 9027fac841
9 changed files with 4 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/gis_tests/relatedapp/models.py
View File

@@ -33,8 +33,6 @@ class City(SimpleModel):
class AugmentedLocation(Location):
extra_text = models.TextField(blank=True)
objects = models.GeoManager()
class DirectoryEntry(SimpleModel):
listing_text = models.CharField(max_length=50)
@@ -55,7 +53,6 @@ class Parcel(SimpleModel):
return self.name
# These use the GeoManager but do not have any geographic fields.
class Author(SimpleModel):
name = models.CharField(max_length=100)
dob = models.DateField()

6
tests/gis_tests/relatedapp/tests.py
View File

@@ -250,7 +250,7 @@ class RelatedGeoModelTest(TestCase):
# ORA-22901: cannot compare nested table or VARRAY or LOB attributes of an object type
@no_oracle
def test12a_count(self):
"Testing `Count` aggregate use with the `GeoManager` on geo-fields."
"Testing `Count` aggregate on geo-fields."
# The City, 'Fort Worth' uses the same location as Dallas.
dallas = City.objects.get(name='Dallas')
@@ -259,7 +259,7 @@ class RelatedGeoModelTest(TestCase):
self.assertEqual(2, loc.num_cities)
def test12b_count(self):
"Testing `Count` aggregate use with the `GeoManager` on non geo-fields. See #11087."
"Testing `Count` aggregate on non geo-fields."
# Should only be one author (Trevor Paglen) returned by this query, and
# the annotation should have 3 for the number of books, see #11087.
# Also testing with a values(), see #11489.
@@ -284,7 +284,7 @@ class RelatedGeoModelTest(TestCase):
# TODO: The phantom model does appear on Oracle.
@no_oracle
def test13_select_related_null_fk(self):
"Testing `select_related` on a nullable ForeignKey via `GeoManager`. See #11381."
"Testing `select_related` on a nullable ForeignKey."
Book.objects.create(title='Without Author')
b = Book.objects.select_related('author').get(title='Without Author')
# Should be `None`, and not a 'dummy' model.