From 39a7eed1bbf12020a077e4bec3d82e08f171a021 Mon Sep 17 00:00:00 2001 From: Josh Smeaton Date: Mon, 23 Feb 2015 11:53:57 +1100 Subject: Converted test fixtures to setUpTestData methods --- tests/annotations/fixtures/annotations.json | 243 ---------------------------- tests/annotations/tests.py | 95 ++++++++++- 2 files changed, 89 insertions(+), 249 deletions(-) delete mode 100644 tests/annotations/fixtures/annotations.json (limited to 'tests/annotations') diff --git a/tests/annotations/fixtures/annotations.json b/tests/annotations/fixtures/annotations.json deleted file mode 100644 index 09c9b8346b..0000000000 --- a/tests/annotations/fixtures/annotations.json +++ /dev/null @@ -1,243 +0,0 @@ -[ - { - "pk": 1, - "model": "annotations.publisher", - "fields": { - "name": "Apress", - "num_awards": 3 - } - }, - { - "pk": 2, - "model": "annotations.publisher", - "fields": { - "name": "Sams", - "num_awards": 1 - } - }, - { - "pk": 3, - "model": "annotations.publisher", - "fields": { - "name": "Prentice Hall", - "num_awards": 7 - } - }, - { - "pk": 4, - "model": "annotations.publisher", - "fields": { - "name": "Morgan Kaufmann", - "num_awards": 9 - } - }, - { - "pk": 5, - "model": "annotations.publisher", - "fields": { - "name": "Jonno's House of Books", - "num_awards": 0 - } - }, - { - "pk": 1, - "model": "annotations.book", - "fields": { - "publisher": 1, - "isbn": "159059725", - "name": "The Definitive Guide to Django: Web Development Done Right", - "price": "30.00", - "rating": 4.5, - "authors": [1, 2], - "contact": 1, - "pages": 447, - "pubdate": "2007-12-6" - } - }, - { - "pk": 2, - "model": "annotations.book", - "fields": { - "publisher": 2, - "isbn": "067232959", - "name": "Sams Teach Yourself Django in 24 Hours", - "price": "23.09", - "rating": 3.0, - "authors": [3], - "contact": 3, - "pages": 528, - "pubdate": "2008-3-3" - } - }, - { - "pk": 3, - "model": "annotations.book", - "fields": { - "publisher": 1, - "isbn": "159059996", - "name": "Practical Django Projects", - "price": "29.69", - "rating": 4.0, - "authors": [4], - "contact": 4, - "pages": 300, - "pubdate": "2008-6-23" - } - }, - { - "pk": 4, - "model": "annotations.book", - "fields": { - "publisher": 3, - "isbn": "013235613", - "name": "Python Web Development with Django", - "price": "29.69", - "rating": 4.0, - "authors": [5, 6, 7], - "contact": 5, - "pages": 350, - "pubdate": "2008-11-3" - } - }, - { - "pk": 5, - "model": "annotations.book", - "fields": { - "publisher": 3, - "isbn": "013790395", - "name": "Artificial Intelligence: A Modern Approach", - "price": "82.80", - "rating": 4.0, - "authors": [8, 9], - "contact": 8, - "pages": 1132, - "pubdate": "1995-1-15" - } - }, - { - "pk": 6, - "model": "annotations.book", - "fields": { - "publisher": 4, - "isbn": "155860191", - "name": "Paradigms of Artificial Intelligence Programming: Case Studies in Common Lisp", - "price": "75.00", - "rating": 5.0, - "authors": [8], - "contact": 8, - "pages": 946, - "pubdate": "1991-10-15" - } - }, - { - "pk": 1, - "model": "annotations.store", - "fields": { - "books": [1, 2, 3, 4, 5, 6], - "name": "Amazon.com", - "original_opening": "1994-4-23 9:17:42", - "friday_night_closing": "23:59:59" - } - }, - { - "pk": 2, - "model": "annotations.store", - "fields": { - "books": [1, 3, 5, 6], - "name": "Books.com", - "original_opening": "2001-3-15 11:23:37", - "friday_night_closing": "23:59:59" - } - }, - { - "pk": 3, - "model": "annotations.store", - "fields": { - "books": [3, 4, 6], - "name": "Mamma and Pappa's Books", - "original_opening": "1945-4-25 16:24:14", - "friday_night_closing": "21:30:00" - } - }, - { - "pk": 1, - "model": "annotations.author", - "fields": { - "age": 34, - "friends": [2, 4], - "name": "Adrian Holovaty" - } - }, - { - "pk": 2, - "model": "annotations.author", - "fields": { - "age": 35, - "friends": [1, 7], - "name": "Jacob Kaplan-Moss" - } - }, - { - "pk": 3, - "model": "annotations.author", - "fields": { - "age": 45, - "friends": [], - "name": "Brad Dayley" - } - }, - { - "pk": 4, - "model": "annotations.author", - "fields": { - "age": 29, - "friends": [1], - "name": "James Bennett" - } - }, - { - "pk": 5, - "model": "annotations.author", - "fields": { - "age": 37, - "friends": [6, 7], - "name": "Jeffrey Forcier" - } - }, - { - "pk": 6, - "model": "annotations.author", - "fields": { - "age": 29, - "friends": [5, 7], - "name": "Paul Bissex" - } - }, - { - "pk": 7, - "model": "annotations.author", - "fields": { - "age": 25, - "friends": [2, 5, 6], - "name": "Wesley J. Chun" - } - }, - { - "pk": 8, - "model": "annotations.author", - "fields": { - "age": 57, - "friends": [9], - "name": "Peter Norvig" - } - }, - { - "pk": 9, - "model": "annotations.author", - "fields": { - "age": 46, - "friends": [8], - "name": "Stuart Russell" - } - } -] diff --git a/tests/annotations/tests.py b/tests/annotations/tests.py index 2bf441716b..2fc42147eb 100644 --- a/tests/annotations/tests.py +++ b/tests/annotations/tests.py @@ -10,7 +10,9 @@ from django.db.models import ( from django.test import TestCase from django.utils import six -from .models import Author, Book, Company, DepartmentStore, Employee, Store +from .models import ( + Author, Book, Company, DepartmentStore, Employee, Publisher, Store, +) def cxOracle_513_py3_bug(func): @@ -33,7 +35,88 @@ def cxOracle_513_py3_bug(func): class NonAggregateAnnotationTestCase(TestCase): - fixtures = ["annotations.json"] + + @classmethod + def setUpTestData(cls): + cls.a1 = Author.objects.create(name='Adrian Holovaty', age=34) + cls.a2 = Author.objects.create(name='Jacob Kaplan-Moss', age=35) + cls.a3 = Author.objects.create(name='Brad Dayley', age=45) + cls.a4 = Author.objects.create(name='James Bennett', age=29) + cls.a5 = Author.objects.create(name='Jeffrey Forcier', age=37) + cls.a6 = Author.objects.create(name='Paul Bissex', age=29) + cls.a7 = Author.objects.create(name='Wesley J. Chun', age=25) + cls.a8 = Author.objects.create(name='Peter Norvig', age=57) + cls.a9 = Author.objects.create(name='Stuart Russell', age=46) + cls.a1.friends.add(cls.a2, cls.a4) + cls.a2.friends.add(cls.a1, cls.a7) + cls.a4.friends.add(cls.a1) + cls.a5.friends.add(cls.a6, cls.a7) + cls.a6.friends.add(cls.a5, cls.a7) + cls.a7.friends.add(cls.a2, cls.a5, cls.a6) + cls.a8.friends.add(cls.a9) + cls.a9.friends.add(cls.a8) + + cls.p1 = Publisher.objects.create(name='Apress', num_awards=3) + cls.p2 = Publisher.objects.create(name='Sams', num_awards=1) + cls.p3 = Publisher.objects.create(name='Prentice Hall', num_awards=7) + cls.p4 = Publisher.objects.create(name='Morgan Kaufmann', num_awards=9) + cls.p5 = Publisher.objects.create(name="Jonno's House of Books", num_awards=0) + + cls.b1 = Book.objects.create( + isbn='159059725', name='The Definitive Guide to Django: Web Development Done Right', + pages=447, rating=4.5, price=Decimal('30.00'), contact=cls.a1, publisher=cls.p1, + pubdate=datetime.date(2007, 12, 6) + ) + cls.b2 = Book.objects.create( + isbn='067232959', name='Sams Teach Yourself Django in 24 Hours', + pages=528, rating=3.0, price=Decimal('23.09'), contact=cls.a3, publisher=cls.p2, + pubdate=datetime.date(2008, 3, 3) + ) + cls.b3 = Book.objects.create( + isbn='159059996', name='Practical Django Projects', + pages=300, rating=4.0, price=Decimal('29.69'), contact=cls.a4, publisher=cls.p1, + pubdate=datetime.date(2008, 6, 23) + ) + cls.b4 = Book.objects.create( + isbn='013235613', name='Python Web Development with Django', + pages=350, rating=4.0, price=Decimal('29.69'), contact=cls.a5, publisher=cls.p3, + pubdate=datetime.date(2008, 11, 3) + ) + cls.b5 = Book.objects.create( + isbn='013790395', name='Artificial Intelligence: A Modern Approach', + pages=1132, rating=4.0, price=Decimal('82.80'), contact=cls.a8, publisher=cls.p3, + pubdate=datetime.date(1995, 1, 15) + ) + cls.b6 = Book.objects.create( + isbn='155860191', name='Paradigms of Artificial Intelligence Programming: Case Studies in Common Lisp', + pages=946, rating=5.0, price=Decimal('75.00'), contact=cls.a8, publisher=cls.p4, + pubdate=datetime.date(1991, 10, 15) + ) + cls.b1.authors.add(cls.a1, cls.a2) + cls.b2.authors.add(cls.a3) + cls.b3.authors.add(cls.a4) + cls.b4.authors.add(cls.a5, cls.a6, cls.a7) + cls.b5.authors.add(cls.a8, cls.a9) + cls.b6.authors.add(cls.a8) + + s1 = Store.objects.create( + name='Amazon.com', + original_opening=datetime.datetime(1994, 4, 23, 9, 17, 42), + friday_night_closing=datetime.time(23, 59, 59) + ) + s2 = Store.objects.create( + name='Books.com', + original_opening=datetime.datetime(2001, 3, 15, 11, 23, 37), + friday_night_closing=datetime.time(23, 59, 59) + ) + s3 = Store.objects.create( + name="Mamma and Pappa's Books", + original_opening=datetime.datetime(1945, 4, 25, 16, 24, 14), + friday_night_closing=datetime.time(21, 30) + ) + s1.books.add(cls.b1, cls.b2, cls.b3, cls.b4, cls.b5, cls.b6) + s2.books.add(cls.b1, cls.b3, cls.b5, cls.b6) + s3.books.add(cls.b3, cls.b4, cls.b6) def test_basic_annotation(self): books = Book.objects.annotate( @@ -100,13 +183,13 @@ class NonAggregateAnnotationTestCase(TestCase): ).filter(sum_rating=F('nope'))) def test_update_with_annotation(self): - book_preupdate = Book.objects.get(pk=2) + book_preupdate = Book.objects.get(pk=self.b2.pk) Book.objects.annotate(other_rating=F('rating') - 1).update(rating=F('other_rating')) - book_postupdate = Book.objects.get(pk=2) + book_postupdate = Book.objects.get(pk=self.b2.pk) self.assertEqual(book_preupdate.rating - 1, book_postupdate.rating) def test_annotation_with_m2m(self): - books = Book.objects.annotate(author_age=F('authors__age')).filter(pk=1).order_by('author_age') + books = Book.objects.annotate(author_age=F('authors__age')).filter(pk=self.b1.pk).order_by('author_age') self.assertEqual(books[0].author_age, 34) self.assertEqual(books[1].author_age, 35) @@ -132,7 +215,7 @@ class NonAggregateAnnotationTestCase(TestCase): """ # annotate references a field in values() qs = Book.objects.values('rating').annotate(other_rating=F('rating') - 1) - book = qs.get(pk=1) + book = qs.get(pk=self.b1.pk) self.assertEqual(book['rating'] - 1, book['other_rating']) # filter refs the annotated value -- cgit v1.3