diff options
| author | Hasan Ramezani <hasan.r67@gmail.com> | 2020-10-18 18:29:52 +0200 |
|---|---|---|
| committer | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2020-11-06 09:24:50 +0100 |
| commit | 3f7b3275627385f8f7531fca01cdda50d4ec6b6e (patch) | |
| tree | fb082d40e73f6c877911eab92229ac21cdfaa5bc /tests/datetimes | |
| parent | 13b6fff11703a694e155b84d41d02822bbc0aaa0 (diff) | |
| download | django-3f7b3275627385f8f7531fca01cdda50d4ec6b6e.tar.gz | |
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>
Diffstat (limited to 'tests/datetimes')
| -rw-r--r-- | tests/datetimes/tests.py | 53 |
1 files changed, 31 insertions, 22 deletions
diff --git a/tests/datetimes/tests.py b/tests/datetimes/tests.py index 857293acb6..f42936b557 100644 --- a/tests/datetimes/tests.py +++ b/tests/datetimes/tests.py @@ -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 = [ |