mirror of
https://github.com/django/django.git
synced 2025-10-24 06:06:09 +00:00
Replaced assertQuerysetEqual() to assertSequenceEqual()/assertCountEqual() where appropriate.
Follow up to 3f7b327562.
This commit is contained in:
@@ -25,39 +25,13 @@ class BasicCustomPKTests(TestCase):
|
||||
"""
|
||||
Both pk and custom attribute_name can be used in filter and friends
|
||||
"""
|
||||
self.assertQuerysetEqual(
|
||||
Employee.objects.filter(pk=123),
|
||||
[
|
||||
"Dan Jones",
|
||||
],
|
||||
str,
|
||||
)
|
||||
|
||||
self.assertQuerysetEqual(
|
||||
Employee.objects.filter(employee_code=123),
|
||||
[
|
||||
"Dan Jones",
|
||||
],
|
||||
str,
|
||||
)
|
||||
|
||||
self.assertQuerysetEqual(
|
||||
self.assertSequenceEqual(Employee.objects.filter(pk=123), [self.dan])
|
||||
self.assertSequenceEqual(Employee.objects.filter(employee_code=123), [self.dan])
|
||||
self.assertSequenceEqual(
|
||||
Employee.objects.filter(pk__in=[123, 456]),
|
||||
[
|
||||
"Fran Bones",
|
||||
"Dan Jones",
|
||||
],
|
||||
str,
|
||||
)
|
||||
|
||||
self.assertQuerysetEqual(
|
||||
Employee.objects.all(),
|
||||
[
|
||||
"Fran Bones",
|
||||
"Dan Jones",
|
||||
],
|
||||
str,
|
||||
[self.fran, self.dan],
|
||||
)
|
||||
self.assertSequenceEqual(Employee.objects.all(), [self.fran, self.dan])
|
||||
|
||||
self.assertQuerysetEqual(
|
||||
Business.objects.filter(name="Sears"), ["Sears"], lambda b: b.name
|
||||
@@ -74,13 +48,9 @@ class BasicCustomPKTests(TestCase):
|
||||
"""
|
||||
Custom pk doesn't affect related_name based lookups
|
||||
"""
|
||||
self.assertQuerysetEqual(
|
||||
self.assertSequenceEqual(
|
||||
self.business.employees.all(),
|
||||
[
|
||||
"Fran Bones",
|
||||
"Dan Jones",
|
||||
],
|
||||
str,
|
||||
[self.fran, self.dan],
|
||||
)
|
||||
self.assertQuerysetEqual(
|
||||
self.fran.business_set.all(),
|
||||
@@ -94,21 +64,13 @@ class BasicCustomPKTests(TestCase):
|
||||
"""
|
||||
Queries across tables, involving primary key
|
||||
"""
|
||||
self.assertQuerysetEqual(
|
||||
self.assertSequenceEqual(
|
||||
Employee.objects.filter(business__name="Sears"),
|
||||
[
|
||||
"Fran Bones",
|
||||
"Dan Jones",
|
||||
],
|
||||
str,
|
||||
[self.fran, self.dan],
|
||||
)
|
||||
self.assertQuerysetEqual(
|
||||
self.assertSequenceEqual(
|
||||
Employee.objects.filter(business__pk="Sears"),
|
||||
[
|
||||
"Fran Bones",
|
||||
"Dan Jones",
|
||||
],
|
||||
str,
|
||||
[self.fran, self.dan],
|
||||
)
|
||||
|
||||
self.assertQuerysetEqual(
|
||||
@@ -186,13 +148,9 @@ class BasicCustomPKTests(TestCase):
|
||||
fran.last_name = "Jones"
|
||||
fran.save()
|
||||
|
||||
self.assertQuerysetEqual(
|
||||
self.assertSequenceEqual(
|
||||
Employee.objects.filter(last_name="Jones"),
|
||||
[
|
||||
"Dan Jones",
|
||||
"Fran Jones",
|
||||
],
|
||||
str,
|
||||
[self.dan, fran],
|
||||
)
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user