edits

Author: WaVEV

tests/model_fields_/test_embedded_model.py

@@ -8,7 +8,6 @@
     F,
     Max,
     OuterRef,
-    Subquery,
     Sum,
 )
 from django.test import SimpleTestCase, TestCase
@@ -189,60 +188,54 @@ class MyModel(models.Model):
             "Embedded models must be a subclass of django_mongodb_backend.models.EmbeddedModel.",
         )
 
-class SubqueryExistsTest(TestCase):
-    def setUp(self):
+class SubqueryExistsTests(TestCase):
+    def setUpTestData(self):
         # Create test data
-        address1 = Address.objects.create(city="New York", state="NY", zip_code=10001)
-        address2 = Address.objects.create(city="Boston", state="MA", zip_code=20002)
-        author1 = Author.objects.create(name="Alice", age=30, address=address1)
-        author2 = Author.objects.create(name="Bob", age=40, address=address2)
-        book1 = Book.objects.create(name="Book A", author=author1)
-        book2 = Book.objects.create(name="Book B", author=author2)
-        Book.objects.create(name="Book C", author=author2)
-        Book.objects.create(name="Book D", author=author2)
-        Book.objects.create(name="Book E", author=author1)
-
+        address1 = Address(city="New York", state="NY", zip_code=10001)
+        address2 = Address(city="Boston", state="MA", zip_code=20002)
+        author1 = Author(name="Alice", age=30, address=address1)
+        author2 = Author(name="Bob", age=40, address=address2)
+        book1 = Book.objects.create(name="Book 1", author=author1)
+        book2 = Book.objects.create(name="Book 2", author=author2)
+        Book.objects.create(name="Book 3", author=author2)
+        Book.objects.create(name="Book 4", author=author2)
+        Book.objects.create(name="Book 5", author=author1)
         library1 = Library.objects.create(
-            name="Central Library", location="Downtown", best_seller="Book A"
+            name="Central Library", location="Downtown", best_seller="Book 1"
         )
         library2 = Library.objects.create(
-            name="Community Library", location="Suburbs", best_seller="Book A"
+            name="Community Library", location="Suburbs", best_seller="Book 1"
         )
-
         # Add books to libraries
         library1.books.add(book1, book2)
         library2.books.add(book2)
 
     def test_exists_subquery(self):
         subquery = Book.objects.filter(
-            author__name=OuterRef("name"), author__address__city="Boston"
+            author__name=OuterRef("author__name"), author__address__city="Boston"
         )
-        queryset = Author.objects.filter(Exists(subquery))
-
-        self.assertEqual(queryset.count(), 1)
+        queryset = Book.objects.filter(Exists(subquery)).order_by("name")
+        self.assertEqual(queryset.count(), 3)
+        self.assertQuerySetEqual(queryset, ["Book 2", "Book 3", "Book 4"], lambda book: book.name)
 
     def test_in_subquery(self):
-        subquery = Author.objects.filter(age__gt=35).values("name")
-        queryset = Book.objects.filter(author__name__in=Subquery(subquery)).order_by("name")
-
+        subquery = Book.objects.filter(author__age__gt=35).values("author__name")
+        queryset = Book.objects.filter(author__name__in=subquery).order_by("name")
         self.assertEqual(queryset.count(), 3)
-        self.assertQuerySetEqual(queryset, ["Book B", "Book C", "Book D"], lambda book: book.name)
+        self.assertQuerySetEqual(queryset, ["Book 2", "Book 3", "Book 4"], lambda book: book.name)
 
     def test_range_query(self):
-        queryset = Author.objects.filter(age__range=(25, 45)).order_by("name")
-
+        queryset = Book.objects.filter(author__age__range=(25, 30)).order_by("author__name")
         self.assertEqual(queryset.count(), 2)
-        self.assertQuerySetEqual(queryset, ["Alice", "Bob"], lambda author: author.name)
+        self.assertQuerySetEqual(queryset, ["Alice", "Alice"], lambda book: book.author.name)
 
     def test_exists_with_foreign_object(self):
         subquery = Library.objects.filter(best_seller=OuterRef("name"))
         queryset = Book.objects.filter(Exists(subquery))
-
         self.assertEqual(queryset.count(), 1)
-        self.assertEqual(queryset.first().name, "Book A")
+        self.assertEqual(queryset.first().name, "Book 1")
 
     def test_foreign_field_with_ranges(self):
         queryset = Library.objects.filter(books__author__age__range=(25, 35))
-
         self.assertEqual(queryset.count(), 1)
         self.assertEqual(queryset.first().name, "Central Library")