diff options
author | Collin Anderson <cmawebsite@gmail.com> | 2017-04-10 08:59:29 -0400 |
---|---|---|
committer | Tim Graham <timograham@gmail.com> | 2017-04-10 08:59:29 -0400 |
commit | a19b373d89d9839c1b3a05768370ce5abd94e03c (patch) | |
tree | 662ace987ef06d5a015d66e6dade7022c7333b47 /tests/null_queries | |
parent | eb9a3bd63a2eac2805ce8a23640ba4d7bc31699c (diff) | |
download | django-a19b373d89d9839c1b3a05768370ce5abd94e03c.tar.gz |
Changed assertQuerysetEqual()s that use default Model.__str__() to assertSequenceEqual().
Diffstat (limited to 'tests/null_queries')
-rw-r--r-- | tests/null_queries/tests.py | 41 |
1 files changed, 10 insertions, 31 deletions
diff --git a/tests/null_queries/tests.py b/tests/null_queries/tests.py index 547b586e00..221bd05946 100644 --- a/tests/null_queries/tests.py +++ b/tests/null_queries/tests.py @@ -23,19 +23,13 @@ class NullQueriesTests(TestCase): # Exact query with value None returns nothing ("is NULL" in sql, # but every 'id' field has a value). - self.assertQuerysetEqual(Choice.objects.filter(choice__exact=None), []) + self.assertSequenceEqual(Choice.objects.filter(choice__exact=None), []) # The same behavior for iexact query. - self.assertQuerysetEqual(Choice.objects.filter(choice__iexact=None), []) + self.assertSequenceEqual(Choice.objects.filter(choice__iexact=None), []) # Excluding the previous result returns everything. - self.assertQuerysetEqual( - Choice.objects.exclude(choice=None).order_by('id'), - [ - '<Choice: Choice: Because. in poll Q: Why? >', - '<Choice: Choice: Why Not? in poll Q: Why? >' - ] - ) + self.assertSequenceEqual(Choice.objects.exclude(choice=None).order_by('id'), [c1, c2]) # Valid query, but fails because foo isn't a keyword with self.assertRaises(FieldError): @@ -55,30 +49,15 @@ class NullQueriesTests(TestCase): insert outer joins correctly so as not to exclude results. """ obj = OuterA.objects.create() - self.assertQuerysetEqual( - OuterA.objects.filter(inner__third=None), - ['<OuterA: OuterA object>'] - ) - self.assertQuerysetEqual( - OuterA.objects.filter(inner__third__data=None), - ['<OuterA: OuterA object>'] - ) + self.assertSequenceEqual(OuterA.objects.filter(inner__third=None), [obj]) + self.assertSequenceEqual(OuterA.objects.filter(inner__third__data=None), [obj]) - Inner.objects.create(first=obj) - self.assertQuerysetEqual( - Inner.objects.filter(first__inner__third=None), - ['<Inner: Inner object>'] - ) + inner = Inner.objects.create(first=obj) + self.assertSequenceEqual(Inner.objects.filter(first__inner__third=None), [inner]) # Ticket #13815: check if <reverse>_isnull=False does not produce # faulty empty lists - OuterB.objects.create(data="reverse") - self.assertQuerysetEqual( - OuterB.objects.filter(inner__isnull=False), - [] - ) + outerb = OuterB.objects.create(data='reverse') + self.assertSequenceEqual(OuterB.objects.filter(inner__isnull=False), []) Inner.objects.create(first=obj) - self.assertQuerysetEqual( - OuterB.objects.exclude(inner__isnull=False), - ['<OuterB: OuterB object>'] - ) + self.assertSequenceEqual(OuterB.objects.exclude(inner__isnull=False), [outerb]) |