diff options
author | Mads Jensen <mje@inducks.org> | 2016-09-10 11:36:27 +0200 |
---|---|---|
committer | Tim Graham <timograham@gmail.com> | 2016-09-13 10:07:37 -0400 |
commit | 0c1f71635f8a3f32195e1573fe929c7d88a78511 (patch) | |
tree | 4d8127fde3634dfd3d4ad8451cee140d34070821 /tests/generic_relations_regress/tests.py | |
parent | 8b050cf9dcad3db39cc9ef44906bfc39f5aa3d25 (diff) | |
download | django-0c1f71635f8a3f32195e1573fe929c7d88a78511.tar.gz |
Fixed #27203 -- Replaced assertQuerysetEqual(..., lambda o: o) with assertSequenceEqual().
Diffstat (limited to 'tests/generic_relations_regress/tests.py')
-rw-r--r-- | tests/generic_relations_regress/tests.py | 50 |
1 files changed, 11 insertions, 39 deletions
diff --git a/tests/generic_relations_regress/tests.py b/tests/generic_relations_regress/tests.py index 2c5b13dd23..8eaf1150a7 100644 --- a/tests/generic_relations_regress/tests.py +++ b/tests/generic_relations_regress/tests.py @@ -149,18 +149,10 @@ class GenericRelationTests(TestCase): hs4 = HasLinkThing.objects.create() l1 = Link.objects.create(content_object=hs3) l2 = Link.objects.create(content_object=hs4) - self.assertQuerysetEqual( - HasLinkThing.objects.filter(links=l1), - [hs3], lambda x: x) - self.assertQuerysetEqual( - HasLinkThing.objects.filter(links=l2), - [hs4], lambda x: x) - self.assertQuerysetEqual( - HasLinkThing.objects.exclude(links=l2), - [hs1, hs2, hs3], lambda x: x, ordered=False) - self.assertQuerysetEqual( - HasLinkThing.objects.exclude(links=l1), - [hs1, hs2, hs4], lambda x: x, ordered=False) + self.assertSequenceEqual(HasLinkThing.objects.filter(links=l1), [hs3]) + self.assertSequenceEqual(HasLinkThing.objects.filter(links=l2), [hs4]) + self.assertSequenceEqual(HasLinkThing.objects.exclude(links=l2), [hs1, hs2, hs3]) + self.assertSequenceEqual(HasLinkThing.objects.exclude(links=l1), [hs1, hs2, hs4]) def test_ticket_20564(self): b1 = B.objects.create() @@ -171,14 +163,8 @@ class GenericRelationTests(TestCase): c3 = C.objects.create(b=b3) A.objects.create(flag=None, content_object=b1) A.objects.create(flag=True, content_object=b2) - self.assertQuerysetEqual( - C.objects.filter(b__a__flag=None), - [c1, c3], lambda x: x - ) - self.assertQuerysetEqual( - C.objects.exclude(b__a__flag=None), - [c2], lambda x: x - ) + self.assertSequenceEqual(C.objects.filter(b__a__flag=None), [c1, c3]) + self.assertSequenceEqual(C.objects.exclude(b__a__flag=None), [c2]) def test_ticket_20564_nullable_fk(self): b1 = B.objects.create() @@ -191,22 +177,10 @@ class GenericRelationTests(TestCase): A.objects.create(flag=None, content_object=b1) A.objects.create(flag=True, content_object=b1) A.objects.create(flag=True, content_object=b2) - self.assertQuerysetEqual( - D.objects.exclude(b__a__flag=None), - [d2], lambda x: x - ) - self.assertQuerysetEqual( - D.objects.filter(b__a__flag=None), - [d1, d3, d4], lambda x: x - ) - self.assertQuerysetEqual( - B.objects.filter(a__flag=None), - [b1, b3], lambda x: x - ) - self.assertQuerysetEqual( - B.objects.exclude(a__flag=None), - [b2], lambda x: x - ) + self.assertSequenceEqual(D.objects.exclude(b__a__flag=None), [d2]) + self.assertSequenceEqual(D.objects.filter(b__a__flag=None), [d1, d3, d4]) + self.assertSequenceEqual(B.objects.filter(a__flag=None), [b1, b3]) + self.assertSequenceEqual(B.objects.exclude(a__flag=None), [b2]) def test_extra_join_condition(self): # A crude check that content_type_id is taken in account in the @@ -249,9 +223,7 @@ class GenericRelationTests(TestCase): hs2 = HasLinkThing.objects.create() l = Link.objects.create(content_object=hs2) self.assertNotEqual(l.object_id, l.pk) - self.assertQuerysetEqual( - HasLinkThing.objects.filter(links=l.pk), - [hs2], lambda x: x) + self.assertSequenceEqual(HasLinkThing.objects.filter(links=l.pk), [hs2]) def test_editable_generic_rel(self): GenericRelationForm = modelform_factory(HasLinkThing, fields='__all__') |