Used setupTestData in prefetch_related tests.
This commit is contained in:
Simon Charette
parent
7f6fbc906a
commit
c30086159d
|
|
@ -19,31 +19,28 @@ from .models import (
|
||||||
|
|
||||||
|
|
||||||
class PrefetchRelatedTests(TestCase):
|
class PrefetchRelatedTests(TestCase):
|
||||||
def setUp(self):
|
@classmethod
|
||||||
self.book1 = Book.objects.create(title="Poems")
|
def setUpTestData(cls):
|
||||||
self.book2 = Book.objects.create(title="Jane Eyre")
|
cls.book1 = Book.objects.create(title='Poems')
|
||||||
self.book3 = Book.objects.create(title="Wuthering Heights")
|
cls.book2 = Book.objects.create(title='Jane Eyre')
|
||||||
self.book4 = Book.objects.create(title="Sense and Sensibility")
|
cls.book3 = Book.objects.create(title='Wuthering Heights')
|
||||||
|
cls.book4 = Book.objects.create(title='Sense and Sensibility')
|
||||||
|
|
||||||
self.author1 = Author.objects.create(name="Charlotte",
|
cls.author1 = Author.objects.create(name='Charlotte', first_book=cls.book1)
|
||||||
first_book=self.book1)
|
cls.author2 = Author.objects.create(name='Anne', first_book=cls.book1)
|
||||||
self.author2 = Author.objects.create(name="Anne",
|
cls.author3 = Author.objects.create(name='Emily', first_book=cls.book1)
|
||||||
first_book=self.book1)
|
cls.author4 = Author.objects.create(name='Jane', first_book=cls.book4)
|
||||||
self.author3 = Author.objects.create(name="Emily",
|
|
||||||
first_book=self.book1)
|
|
||||||
self.author4 = Author.objects.create(name="Jane",
|
|
||||||
first_book=self.book4)
|
|
||||||
|
|
||||||
self.book1.authors.add(self.author1, self.author2, self.author3)
|
cls.book1.authors.add(cls.author1, cls.author2, cls.author3)
|
||||||
self.book2.authors.add(self.author1)
|
cls.book2.authors.add(cls.author1)
|
||||||
self.book3.authors.add(self.author3)
|
cls.book3.authors.add(cls.author3)
|
||||||
self.book4.authors.add(self.author4)
|
cls.book4.authors.add(cls.author4)
|
||||||
|
|
||||||
self.reader1 = Reader.objects.create(name="Amy")
|
cls.reader1 = Reader.objects.create(name='Amy')
|
||||||
self.reader2 = Reader.objects.create(name="Belinda")
|
cls.reader2 = Reader.objects.create(name='Belinda')
|
||||||
|
|
||||||
self.reader1.books_read.add(self.book1, self.book4)
|
cls.reader1.books_read.add(cls.book1, cls.book4)
|
||||||
self.reader2.books_read.add(self.book2, self.book4)
|
cls.reader2.books_read.add(cls.book2, cls.book4)
|
||||||
|
|
||||||
def test_m2m_forward(self):
|
def test_m2m_forward(self):
|
||||||
with self.assertNumQueries(2):
|
with self.assertNumQueries(2):
|
||||||
|
|
@ -300,44 +297,45 @@ class CustomPrefetchTests(TestCase):
|
||||||
ret_val.append((obj, rel_objs))
|
ret_val.append((obj, rel_objs))
|
||||||
return ret_val
|
return ret_val
|
||||||
|
|
||||||
def setUp(self):
|
@classmethod
|
||||||
self.person1 = Person.objects.create(name="Joe")
|
def setUpTestData(cls):
|
||||||
self.person2 = Person.objects.create(name="Mary")
|
cls.person1 = Person.objects.create(name='Joe')
|
||||||
|
cls.person2 = Person.objects.create(name='Mary')
|
||||||
|
|
||||||
# Set main_room for each house before creating the next one for
|
# Set main_room for each house before creating the next one for
|
||||||
# databases where supports_nullable_unique_constraints is False.
|
# databases where supports_nullable_unique_constraints is False.
|
||||||
|
|
||||||
self.house1 = House.objects.create(name='House 1', address="123 Main St", owner=self.person1)
|
cls.house1 = House.objects.create(name='House 1', address='123 Main St', owner=cls.person1)
|
||||||
self.room1_1 = Room.objects.create(name="Dining room", house=self.house1)
|
cls.room1_1 = Room.objects.create(name='Dining room', house=cls.house1)
|
||||||
self.room1_2 = Room.objects.create(name="Lounge", house=self.house1)
|
cls.room1_2 = Room.objects.create(name='Lounge', house=cls.house1)
|
||||||
self.room1_3 = Room.objects.create(name="Kitchen", house=self.house1)
|
cls.room1_3 = Room.objects.create(name='Kitchen', house=cls.house1)
|
||||||
self.house1.main_room = self.room1_1
|
cls.house1.main_room = cls.room1_1
|
||||||
self.house1.save()
|
cls.house1.save()
|
||||||
self.person1.houses.add(self.house1)
|
cls.person1.houses.add(cls.house1)
|
||||||
|
|
||||||
self.house2 = House.objects.create(name='House 2', address="45 Side St", owner=self.person1)
|
cls.house2 = House.objects.create(name='House 2', address='45 Side St', owner=cls.person1)
|
||||||
self.room2_1 = Room.objects.create(name="Dining room", house=self.house2)
|
cls.room2_1 = Room.objects.create(name='Dining room', house=cls.house2)
|
||||||
self.room2_2 = Room.objects.create(name="Lounge", house=self.house2)
|
cls.room2_2 = Room.objects.create(name='Lounge', house=cls.house2)
|
||||||
self.room2_3 = Room.objects.create(name="Kitchen", house=self.house2)
|
cls.room2_3 = Room.objects.create(name='Kitchen', house=cls.house2)
|
||||||
self.house2.main_room = self.room2_1
|
cls.house2.main_room = cls.room2_1
|
||||||
self.house2.save()
|
cls.house2.save()
|
||||||
self.person1.houses.add(self.house2)
|
cls.person1.houses.add(cls.house2)
|
||||||
|
|
||||||
self.house3 = House.objects.create(name='House 3', address="6 Downing St", owner=self.person2)
|
cls.house3 = House.objects.create(name='House 3', address='6 Downing St', owner=cls.person2)
|
||||||
self.room3_1 = Room.objects.create(name="Dining room", house=self.house3)
|
cls.room3_1 = Room.objects.create(name='Dining room', house=cls.house3)
|
||||||
self.room3_2 = Room.objects.create(name="Lounge", house=self.house3)
|
cls.room3_2 = Room.objects.create(name='Lounge', house=cls.house3)
|
||||||
self.room3_3 = Room.objects.create(name="Kitchen", house=self.house3)
|
cls.room3_3 = Room.objects.create(name='Kitchen', house=cls.house3)
|
||||||
self.house3.main_room = self.room3_1
|
cls.house3.main_room = cls.room3_1
|
||||||
self.house3.save()
|
cls.house3.save()
|
||||||
self.person2.houses.add(self.house3)
|
cls.person2.houses.add(cls.house3)
|
||||||
|
|
||||||
self.house4 = House.objects.create(name='house 4', address="7 Regents St", owner=self.person2)
|
cls.house4 = House.objects.create(name='house 4', address="7 Regents St", owner=cls.person2)
|
||||||
self.room4_1 = Room.objects.create(name="Dining room", house=self.house4)
|
cls.room4_1 = Room.objects.create(name='Dining room', house=cls.house4)
|
||||||
self.room4_2 = Room.objects.create(name="Lounge", house=self.house4)
|
cls.room4_2 = Room.objects.create(name='Lounge', house=cls.house4)
|
||||||
self.room4_3 = Room.objects.create(name="Kitchen", house=self.house4)
|
cls.room4_3 = Room.objects.create(name='Kitchen', house=cls.house4)
|
||||||
self.house4.main_room = self.room4_1
|
cls.house4.main_room = cls.room4_1
|
||||||
self.house4.save()
|
cls.house4.save()
|
||||||
self.person2.houses.add(self.house4)
|
cls.person2.houses.add(cls.house4)
|
||||||
|
|
||||||
def test_traverse_qs(self):
|
def test_traverse_qs(self):
|
||||||
qs = Person.objects.prefetch_related('houses')
|
qs = Person.objects.prefetch_related('houses')
|
||||||
|
|
@ -746,7 +744,8 @@ class DefaultManagerTests(TestCase):
|
||||||
|
|
||||||
class GenericRelationTests(TestCase):
|
class GenericRelationTests(TestCase):
|
||||||
|
|
||||||
def setUp(self):
|
@classmethod
|
||||||
|
def setUpTestData(cls):
|
||||||
book1 = Book.objects.create(title="Winnie the Pooh")
|
book1 = Book.objects.create(title="Winnie the Pooh")
|
||||||
book2 = Book.objects.create(title="Do you like green eggs and spam?")
|
book2 = Book.objects.create(title="Do you like green eggs and spam?")
|
||||||
book3 = Book.objects.create(title="Three Men In A Boat")
|
book3 = Book.objects.create(title="Three Men In A Boat")
|
||||||
|
|
@ -759,8 +758,8 @@ class GenericRelationTests(TestCase):
|
||||||
book2.read_by.add(reader2)
|
book2.read_by.add(reader2)
|
||||||
book3.read_by.add(reader3)
|
book3.read_by.add(reader3)
|
||||||
|
|
||||||
self.book1, self.book2, self.book3 = book1, book2, book3
|
cls.book1, cls.book2, cls.book3 = book1, book2, book3
|
||||||
self.reader1, self.reader2, self.reader3 = reader1, reader2, reader3
|
cls.reader1, cls.reader2, cls.reader3 = reader1, reader2, reader3
|
||||||
|
|
||||||
def test_prefetch_GFK(self):
|
def test_prefetch_GFK(self):
|
||||||
TaggedItem.objects.create(tag="awesome", content_object=self.book1)
|
TaggedItem.objects.create(tag="awesome", content_object=self.book1)
|
||||||
|
|
@ -840,31 +839,24 @@ class GenericRelationTests(TestCase):
|
||||||
|
|
||||||
class MultiTableInheritanceTest(TestCase):
|
class MultiTableInheritanceTest(TestCase):
|
||||||
|
|
||||||
def setUp(self):
|
@classmethod
|
||||||
self.book1 = BookWithYear.objects.create(
|
def setUpTestData(cls):
|
||||||
title="Poems", published_year=2010)
|
cls.book1 = BookWithYear.objects.create(title='Poems', published_year=2010)
|
||||||
self.book2 = BookWithYear.objects.create(
|
cls.book2 = BookWithYear.objects.create(title='More poems', published_year=2011)
|
||||||
title="More poems", published_year=2011)
|
cls.author1 = AuthorWithAge.objects.create(name='Jane', first_book=cls.book1, age=50)
|
||||||
self.author1 = AuthorWithAge.objects.create(
|
cls.author2 = AuthorWithAge.objects.create(name='Tom', first_book=cls.book1, age=49)
|
||||||
name='Jane', first_book=self.book1, age=50)
|
cls.author3 = AuthorWithAge.objects.create(name='Robert', first_book=cls.book2, age=48)
|
||||||
self.author2 = AuthorWithAge.objects.create(
|
cls.author_address = AuthorAddress.objects.create(author=cls.author1, address='SomeStreet 1')
|
||||||
name='Tom', first_book=self.book1, age=49)
|
cls.book2.aged_authors.add(cls.author2, cls.author3)
|
||||||
self.author3 = AuthorWithAge.objects.create(
|
cls.br1 = BookReview.objects.create(book=cls.book1, notes='review book1')
|
||||||
name='Robert', first_book=self.book2, age=48)
|
cls.br2 = BookReview.objects.create(book=cls.book2, notes='review book2')
|
||||||
self.authorAddress = AuthorAddress.objects.create(
|
|
||||||
author=self.author1, address='SomeStreet 1')
|
|
||||||
self.book2.aged_authors.add(self.author2, self.author3)
|
|
||||||
self.br1 = BookReview.objects.create(
|
|
||||||
book=self.book1, notes="review book1")
|
|
||||||
self.br2 = BookReview.objects.create(
|
|
||||||
book=self.book2, notes="review book2")
|
|
||||||
|
|
||||||
def test_foreignkey(self):
|
def test_foreignkey(self):
|
||||||
with self.assertNumQueries(2):
|
with self.assertNumQueries(2):
|
||||||
qs = AuthorWithAge.objects.prefetch_related('addresses')
|
qs = AuthorWithAge.objects.prefetch_related('addresses')
|
||||||
addresses = [[six.text_type(address) for address in obj.addresses.all()]
|
addresses = [[six.text_type(address) for address in obj.addresses.all()]
|
||||||
for obj in qs]
|
for obj in qs]
|
||||||
self.assertEqual(addresses, [[six.text_type(self.authorAddress)], [], []])
|
self.assertEqual(addresses, [[six.text_type(self.author_address)], [], []])
|
||||||
|
|
||||||
def test_foreignkey_to_inherited(self):
|
def test_foreignkey_to_inherited(self):
|
||||||
with self.assertNumQueries(2):
|
with self.assertNumQueries(2):
|
||||||
|
|
@ -911,27 +903,23 @@ class MultiTableInheritanceTest(TestCase):
|
||||||
|
|
||||||
class ForeignKeyToFieldTest(TestCase):
|
class ForeignKeyToFieldTest(TestCase):
|
||||||
|
|
||||||
def setUp(self):
|
@classmethod
|
||||||
self.book = Book.objects.create(title="Poems")
|
def setUpTestData(cls):
|
||||||
self.author1 = Author.objects.create(name='Jane', first_book=self.book)
|
cls.book = Book.objects.create(title='Poems')
|
||||||
self.author2 = Author.objects.create(name='Tom', first_book=self.book)
|
cls.author1 = Author.objects.create(name='Jane', first_book=cls.book)
|
||||||
self.author3 = Author.objects.create(name='Robert', first_book=self.book)
|
cls.author2 = Author.objects.create(name='Tom', first_book=cls.book)
|
||||||
self.authorAddress = AuthorAddress.objects.create(
|
cls.author3 = Author.objects.create(name='Robert', first_book=cls.book)
|
||||||
author=self.author1, address='SomeStreet 1'
|
cls.author_address = AuthorAddress.objects.create(author=cls.author1, address='SomeStreet 1')
|
||||||
)
|
FavoriteAuthors.objects.create(author=cls.author1, likes_author=cls.author2)
|
||||||
FavoriteAuthors.objects.create(author=self.author1,
|
FavoriteAuthors.objects.create(author=cls.author2, likes_author=cls.author3)
|
||||||
likes_author=self.author2)
|
FavoriteAuthors.objects.create(author=cls.author3, likes_author=cls.author1)
|
||||||
FavoriteAuthors.objects.create(author=self.author2,
|
|
||||||
likes_author=self.author3)
|
|
||||||
FavoriteAuthors.objects.create(author=self.author3,
|
|
||||||
likes_author=self.author1)
|
|
||||||
|
|
||||||
def test_foreignkey(self):
|
def test_foreignkey(self):
|
||||||
with self.assertNumQueries(2):
|
with self.assertNumQueries(2):
|
||||||
qs = Author.objects.prefetch_related('addresses')
|
qs = Author.objects.prefetch_related('addresses')
|
||||||
addresses = [[six.text_type(address) for address in obj.addresses.all()]
|
addresses = [[six.text_type(address) for address in obj.addresses.all()]
|
||||||
for obj in qs]
|
for obj in qs]
|
||||||
self.assertEqual(addresses, [[six.text_type(self.authorAddress)], [], []])
|
self.assertEqual(addresses, [[six.text_type(self.author_address)], [], []])
|
||||||
|
|
||||||
def test_m2m(self):
|
def test_m2m(self):
|
||||||
with self.assertNumQueries(3):
|
with self.assertNumQueries(3):
|
||||||
|
|
@ -1004,7 +992,8 @@ class LookupOrderingTest(TestCase):
|
||||||
|
|
||||||
class NullableTest(TestCase):
|
class NullableTest(TestCase):
|
||||||
|
|
||||||
def setUp(self):
|
@classmethod
|
||||||
|
def setUpTestData(cls):
|
||||||
boss = Employee.objects.create(name="Peter")
|
boss = Employee.objects.create(name="Peter")
|
||||||
Employee.objects.create(name="Joe", boss=boss)
|
Employee.objects.create(name="Joe", boss=boss)
|
||||||
Employee.objects.create(name="Angela", boss=boss)
|
Employee.objects.create(name="Angela", boss=boss)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue