Address review

Author: NoahStapp

django_mongodb_backend/gis/lookups.py

@@ -5,6 +5,8 @@
 
 
 def gis_lookup(self, compiler, connection, as_expr=False):
+    if as_expr:
+        raise NotSupportedError("MongoDB does not support GIS lookups as expressions.")
     lhs_mql = process_lhs(self, compiler, connection, as_expr=as_expr)
     rhs_mql = process_rhs(self, compiler, connection, as_expr=as_expr)
     try:

tests/gis_tests_/models.py

@@ -5,6 +5,9 @@ class City(models.Model):
     name = models.CharField(max_length=30)
     point = models.PointField()
 
+    def __str__(self):
+        return self.name
+
 
 class Zipcode(models.Model):
     code = models.CharField(max_length=10)

tests/gis_tests_/tests.py

@@ -18,8 +18,7 @@ def test_unsupported(self):
     def test_contains(self):
         houston = City.objects.get(name="Houston")
         qs = City.objects.filter(point__contains=Point(-95.363151, 29.763374))
-        self.assertEqual(qs.count(), 1)
-        self.assertEqual(houston, qs.first())
+        self.assertCountEqual(qs, [houston])
 
     def test_disjoint(self):
         houston = City.objects.get(name="Houston")
@@ -43,25 +42,21 @@ def test_distance_gte(self):
     def test_distance_lt(self):
         houston = City.objects.get(name="Houston")
         qs = City.objects.filter(point__distance_lt=(houston.point, 362825))
-        self.assertEqual(qs.count(), 1)
-        self.assertEqual(houston, qs.first())
+        self.assertCountEqual(qs, [houston])
 
     def test_distance_lte(self):
         houston = City.objects.get(name="Houston")
         dallas = City.objects.get(name="Dallas")  # Roughly ~363 km from Houston
         qs = City.objects.filter(point__distance_lte=(houston.point, 362826))
-        self.assertEqual(qs.count(), 2)
-        self.assertEqual([houston, dallas], list(qs))
+        self.assertCountEqual(list(qs), [houston, dallas])
 
     def test_distance_units(self):
         chicago = City.objects.get(name="Chicago")
         lawrence = City.objects.get(name="Lawrence")
         qs = City.objects.filter(point__distance_lt=(chicago.point, Distance(km=720)))
-        self.assertEqual(qs.count(), 2)
-        self.assertEqual([lawrence, chicago], list(qs))
+        self.assertCountEqual(list(qs), [lawrence, chicago])
         qs = City.objects.filter(point__distance_lt=(chicago.point, Distance(mi=447)))
-        self.assertEqual(qs.count(), 2)
-        self.assertEqual([lawrence, chicago], list(qs))
+        self.assertCountEqual(list(qs), [lawrence, chicago])
 
     def test_dwithin(self):
         houston = City.objects.get(name="Houston")
@@ -70,10 +65,8 @@ def test_dwithin(self):
 
     def test_dwithin_unsupported_units(self):
         qs = City.objects.filter(point__dwithin=(Point(40.7670, -73.9820), Distance(km=1)))
-        with self.assertRaisesMessage(
-            ValueError,
-            "Only numeric values of radian units are allowed on geodetic distance queries.",
-        ):
+        message = "Only numeric values of radian units are allowed on geodetic distance queries."
+        with self.assertRaisesMessage(ValueError, message):
             qs.first()
 
     def test_intersects(self):
@@ -85,4 +78,4 @@ def test_intersects(self):
     def test_within(self):
         zipcode = Zipcode.objects.get(code="77002")
         qs = City.objects.filter(point__within=zipcode.poly).values_list("name", flat=True)
-        self.assertEqual(["Houston"], list(qs))
+        self.assertEqual(list(qs), ["Houston"])