mirror of
https://github.com/django/django.git
synced 2025-08-03 10:34:04 +00:00
Fixed #31235 -- Made assertQuerysetEqual() compare querysets directly.
This also replaces assertQuerysetEqual() to assertSequenceEqual()/assertCountEqual() where appropriate. Co-authored-by: Peter Inglesby <peter.inglesby@gmail.com> Co-authored-by: Mariusz Felisiak <felisiak.mariusz@gmail.com>
This commit is contained in:
parent
13b6fff117
commit
3f7b327562
39 changed files with 1447 additions and 1801 deletions
|
@ -134,33 +134,42 @@ class DateTimesTests(TestCase):
|
|||
for i, pub_date in enumerate(pub_dates):
|
||||
Article(pub_date=pub_date, title='title #{}'.format(i)).save()
|
||||
|
||||
self.assertQuerysetEqual(
|
||||
self.assertSequenceEqual(
|
||||
Article.objects.datetimes('pub_date', 'year'),
|
||||
["datetime.datetime(2005, 1, 1, 0, 0)"])
|
||||
self.assertQuerysetEqual(
|
||||
[datetime.datetime(2005, 1, 1, 0, 0)],
|
||||
)
|
||||
self.assertSequenceEqual(
|
||||
Article.objects.datetimes('pub_date', 'month'),
|
||||
["datetime.datetime(2005, 7, 1, 0, 0)"])
|
||||
self.assertQuerysetEqual(
|
||||
[datetime.datetime(2005, 7, 1, 0, 0)],
|
||||
)
|
||||
self.assertSequenceEqual(
|
||||
Article.objects.datetimes('pub_date', 'week'),
|
||||
["datetime.datetime(2005, 7, 25, 0, 0)"])
|
||||
self.assertQuerysetEqual(
|
||||
Article.objects.datetimes('pub_date', 'day'),
|
||||
["datetime.datetime(2005, 7, 28, 0, 0)",
|
||||
"datetime.datetime(2005, 7, 29, 0, 0)",
|
||||
"datetime.datetime(2005, 7, 30, 0, 0)",
|
||||
"datetime.datetime(2005, 7, 31, 0, 0)"])
|
||||
self.assertQuerysetEqual(
|
||||
[datetime.datetime(2005, 7, 25, 0, 0)],
|
||||
)
|
||||
self.assertSequenceEqual(Article.objects.datetimes('pub_date', 'day'), [
|
||||
datetime.datetime(2005, 7, 28, 0, 0),
|
||||
datetime.datetime(2005, 7, 29, 0, 0),
|
||||
datetime.datetime(2005, 7, 30, 0, 0),
|
||||
datetime.datetime(2005, 7, 31, 0, 0),
|
||||
])
|
||||
self.assertSequenceEqual(
|
||||
Article.objects.datetimes('pub_date', 'day', order='ASC'),
|
||||
["datetime.datetime(2005, 7, 28, 0, 0)",
|
||||
"datetime.datetime(2005, 7, 29, 0, 0)",
|
||||
"datetime.datetime(2005, 7, 30, 0, 0)",
|
||||
"datetime.datetime(2005, 7, 31, 0, 0)"])
|
||||
self.assertQuerysetEqual(
|
||||
[
|
||||
datetime.datetime(2005, 7, 28, 0, 0),
|
||||
datetime.datetime(2005, 7, 29, 0, 0),
|
||||
datetime.datetime(2005, 7, 30, 0, 0),
|
||||
datetime.datetime(2005, 7, 31, 0, 0),
|
||||
],
|
||||
)
|
||||
self.assertSequenceEqual(
|
||||
Article.objects.datetimes('pub_date', 'day', order='DESC'),
|
||||
["datetime.datetime(2005, 7, 31, 0, 0)",
|
||||
"datetime.datetime(2005, 7, 30, 0, 0)",
|
||||
"datetime.datetime(2005, 7, 29, 0, 0)",
|
||||
"datetime.datetime(2005, 7, 28, 0, 0)"])
|
||||
[
|
||||
datetime.datetime(2005, 7, 31, 0, 0),
|
||||
datetime.datetime(2005, 7, 30, 0, 0),
|
||||
datetime.datetime(2005, 7, 29, 0, 0),
|
||||
datetime.datetime(2005, 7, 28, 0, 0),
|
||||
],
|
||||
)
|
||||
|
||||
def test_datetimes_has_lazy_iterator(self):
|
||||
pub_dates = [
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue