mirror of
https://github.com/django/django.git
synced 2025-10-24 06:06:09 +00:00
Refs #33990 -- Renamed TransactionTestCase.assertQuerysetEqual() to assertQuerySetEqual().
Co-Authored-By: Michael Howitz <mh@gocept.com>
This commit is contained in:
Gregor Gärtner
committed by
Mariusz Felisiak
Mariusz Felisiak
parent
d795259ea9
commit
f0c06f8ab7
@@ -277,21 +277,21 @@ class DateFunctionTests(TestCase):
|
||||
):
|
||||
list(DTModel.objects.annotate(extracted=Extract("start_date", "second")))
|
||||
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
DTModel.objects.annotate(
|
||||
extracted=Extract("start_datetime", "year")
|
||||
).order_by("start_datetime"),
|
||||
[(start_datetime, start_datetime.year), (end_datetime, end_datetime.year)],
|
||||
lambda m: (m.start_datetime, m.extracted),
|
||||
)
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
DTModel.objects.annotate(
|
||||
extracted=Extract("start_datetime", "quarter")
|
||||
).order_by("start_datetime"),
|
||||
[(start_datetime, 2), (end_datetime, 2)],
|
||||
lambda m: (m.start_datetime, m.extracted),
|
||||
)
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
DTModel.objects.annotate(
|
||||
extracted=Extract("start_datetime", "month")
|
||||
).order_by("start_datetime"),
|
||||
@@ -301,21 +301,21 @@ class DateFunctionTests(TestCase):
|
||||
],
|
||||
lambda m: (m.start_datetime, m.extracted),
|
||||
)
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
DTModel.objects.annotate(
|
||||
extracted=Extract("start_datetime", "day")
|
||||
).order_by("start_datetime"),
|
||||
[(start_datetime, start_datetime.day), (end_datetime, end_datetime.day)],
|
||||
lambda m: (m.start_datetime, m.extracted),
|
||||
)
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
DTModel.objects.annotate(
|
||||
extracted=Extract("start_datetime", "week")
|
||||
).order_by("start_datetime"),
|
||||
[(start_datetime, 25), (end_datetime, 24)],
|
||||
lambda m: (m.start_datetime, m.extracted),
|
||||
)
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
DTModel.objects.annotate(
|
||||
extracted=Extract("start_datetime", "week_day")
|
||||
).order_by("start_datetime"),
|
||||
@@ -325,7 +325,7 @@ class DateFunctionTests(TestCase):
|
||||
],
|
||||
lambda m: (m.start_datetime, m.extracted),
|
||||
)
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
DTModel.objects.annotate(
|
||||
extracted=Extract("start_datetime", "iso_week_day"),
|
||||
).order_by("start_datetime"),
|
||||
@@ -335,14 +335,14 @@ class DateFunctionTests(TestCase):
|
||||
],
|
||||
lambda m: (m.start_datetime, m.extracted),
|
||||
)
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
DTModel.objects.annotate(
|
||||
extracted=Extract("start_datetime", "hour")
|
||||
).order_by("start_datetime"),
|
||||
[(start_datetime, start_datetime.hour), (end_datetime, end_datetime.hour)],
|
||||
lambda m: (m.start_datetime, m.extracted),
|
||||
)
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
DTModel.objects.annotate(
|
||||
extracted=Extract("start_datetime", "minute")
|
||||
).order_by("start_datetime"),
|
||||
@@ -352,7 +352,7 @@ class DateFunctionTests(TestCase):
|
||||
],
|
||||
lambda m: (m.start_datetime, m.extracted),
|
||||
)
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
DTModel.objects.annotate(
|
||||
extracted=Extract("start_datetime", "second")
|
||||
).order_by("start_datetime"),
|
||||
@@ -417,7 +417,7 @@ class DateFunctionTests(TestCase):
|
||||
end_datetime = timezone.make_aware(end_datetime)
|
||||
self.create_model(start_datetime, end_datetime)
|
||||
self.create_model(end_datetime, start_datetime)
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
DTModel.objects.annotate(extracted=Extract("duration", "second")).order_by(
|
||||
"start_datetime"
|
||||
),
|
||||
@@ -465,14 +465,14 @@ class DateFunctionTests(TestCase):
|
||||
end_datetime = timezone.make_aware(end_datetime)
|
||||
self.create_model(start_datetime, end_datetime)
|
||||
self.create_model(end_datetime, start_datetime)
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
DTModel.objects.annotate(extracted=ExtractYear("start_datetime")).order_by(
|
||||
"start_datetime"
|
||||
),
|
||||
[(start_datetime, start_datetime.year), (end_datetime, end_datetime.year)],
|
||||
lambda m: (m.start_datetime, m.extracted),
|
||||
)
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
DTModel.objects.annotate(extracted=ExtractYear("start_date")).order_by(
|
||||
"start_datetime"
|
||||
),
|
||||
@@ -494,14 +494,14 @@ class DateFunctionTests(TestCase):
|
||||
end_datetime = timezone.make_aware(end_datetime)
|
||||
self.create_model(start_datetime, end_datetime)
|
||||
self.create_model(end_datetime, start_datetime)
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
DTModel.objects.annotate(
|
||||
extracted=ExtractIsoYear("start_datetime")
|
||||
).order_by("start_datetime"),
|
||||
[(start_datetime, start_datetime.year), (end_datetime, end_datetime.year)],
|
||||
lambda m: (m.start_datetime, m.extracted),
|
||||
)
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
DTModel.objects.annotate(extracted=ExtractIsoYear("start_date")).order_by(
|
||||
"start_datetime"
|
||||
),
|
||||
@@ -538,7 +538,7 @@ class DateFunctionTests(TestCase):
|
||||
)
|
||||
.order_by("start_datetime")
|
||||
)
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
qs,
|
||||
[
|
||||
(week_52_day_2014, 2014),
|
||||
@@ -569,7 +569,7 @@ class DateFunctionTests(TestCase):
|
||||
end_datetime = timezone.make_aware(end_datetime)
|
||||
self.create_model(start_datetime, end_datetime)
|
||||
self.create_model(end_datetime, start_datetime)
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
DTModel.objects.annotate(extracted=ExtractMonth("start_datetime")).order_by(
|
||||
"start_datetime"
|
||||
),
|
||||
@@ -579,7 +579,7 @@ class DateFunctionTests(TestCase):
|
||||
],
|
||||
lambda m: (m.start_datetime, m.extracted),
|
||||
)
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
DTModel.objects.annotate(extracted=ExtractMonth("start_date")).order_by(
|
||||
"start_datetime"
|
||||
),
|
||||
@@ -604,14 +604,14 @@ class DateFunctionTests(TestCase):
|
||||
end_datetime = timezone.make_aware(end_datetime)
|
||||
self.create_model(start_datetime, end_datetime)
|
||||
self.create_model(end_datetime, start_datetime)
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
DTModel.objects.annotate(extracted=ExtractDay("start_datetime")).order_by(
|
||||
"start_datetime"
|
||||
),
|
||||
[(start_datetime, start_datetime.day), (end_datetime, end_datetime.day)],
|
||||
lambda m: (m.start_datetime, m.extracted),
|
||||
)
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
DTModel.objects.annotate(extracted=ExtractDay("start_date")).order_by(
|
||||
"start_datetime"
|
||||
),
|
||||
@@ -633,14 +633,14 @@ class DateFunctionTests(TestCase):
|
||||
end_datetime = timezone.make_aware(end_datetime)
|
||||
self.create_model(start_datetime, end_datetime)
|
||||
self.create_model(end_datetime, start_datetime)
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
DTModel.objects.annotate(extracted=ExtractWeek("start_datetime")).order_by(
|
||||
"start_datetime"
|
||||
),
|
||||
[(start_datetime, 25), (end_datetime, 24)],
|
||||
lambda m: (m.start_datetime, m.extracted),
|
||||
)
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
DTModel.objects.annotate(extracted=ExtractWeek("start_date")).order_by(
|
||||
"start_datetime"
|
||||
),
|
||||
@@ -663,14 +663,14 @@ class DateFunctionTests(TestCase):
|
||||
end_datetime = timezone.make_aware(end_datetime)
|
||||
self.create_model(start_datetime, end_datetime)
|
||||
self.create_model(end_datetime, start_datetime)
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
DTModel.objects.annotate(
|
||||
extracted=ExtractQuarter("start_datetime")
|
||||
).order_by("start_datetime"),
|
||||
[(start_datetime, 2), (end_datetime, 3)],
|
||||
lambda m: (m.start_datetime, m.extracted),
|
||||
)
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
DTModel.objects.annotate(extracted=ExtractQuarter("start_date")).order_by(
|
||||
"start_datetime"
|
||||
),
|
||||
@@ -704,7 +704,7 @@ class DateFunctionTests(TestCase):
|
||||
)
|
||||
.order_by("start_datetime")
|
||||
)
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
qs,
|
||||
[
|
||||
(last_quarter_2014, 4),
|
||||
@@ -737,7 +737,7 @@ class DateFunctionTests(TestCase):
|
||||
)
|
||||
.order_by("start_datetime")
|
||||
)
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
qs,
|
||||
[
|
||||
(week_52_day_2014, 52),
|
||||
@@ -755,7 +755,7 @@ class DateFunctionTests(TestCase):
|
||||
end_datetime = timezone.make_aware(end_datetime)
|
||||
self.create_model(start_datetime, end_datetime)
|
||||
self.create_model(end_datetime, start_datetime)
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
DTModel.objects.annotate(
|
||||
extracted=ExtractWeekDay("start_datetime")
|
||||
).order_by("start_datetime"),
|
||||
@@ -765,7 +765,7 @@ class DateFunctionTests(TestCase):
|
||||
],
|
||||
lambda m: (m.start_datetime, m.extracted),
|
||||
)
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
DTModel.objects.annotate(extracted=ExtractWeekDay("start_date")).order_by(
|
||||
"start_datetime"
|
||||
),
|
||||
@@ -790,7 +790,7 @@ class DateFunctionTests(TestCase):
|
||||
end_datetime = timezone.make_aware(end_datetime)
|
||||
self.create_model(start_datetime, end_datetime)
|
||||
self.create_model(end_datetime, start_datetime)
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
DTModel.objects.annotate(
|
||||
extracted=ExtractIsoWeekDay("start_datetime"),
|
||||
).order_by("start_datetime"),
|
||||
@@ -800,7 +800,7 @@ class DateFunctionTests(TestCase):
|
||||
],
|
||||
lambda m: (m.start_datetime, m.extracted),
|
||||
)
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
DTModel.objects.annotate(
|
||||
extracted=ExtractIsoWeekDay("start_date"),
|
||||
).order_by("start_datetime"),
|
||||
@@ -825,14 +825,14 @@ class DateFunctionTests(TestCase):
|
||||
end_datetime = timezone.make_aware(end_datetime)
|
||||
self.create_model(start_datetime, end_datetime)
|
||||
self.create_model(end_datetime, start_datetime)
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
DTModel.objects.annotate(extracted=ExtractHour("start_datetime")).order_by(
|
||||
"start_datetime"
|
||||
),
|
||||
[(start_datetime, start_datetime.hour), (end_datetime, end_datetime.hour)],
|
||||
lambda m: (m.start_datetime, m.extracted),
|
||||
)
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
DTModel.objects.annotate(extracted=ExtractHour("start_time")).order_by(
|
||||
"start_datetime"
|
||||
),
|
||||
@@ -854,7 +854,7 @@ class DateFunctionTests(TestCase):
|
||||
end_datetime = timezone.make_aware(end_datetime)
|
||||
self.create_model(start_datetime, end_datetime)
|
||||
self.create_model(end_datetime, start_datetime)
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
DTModel.objects.annotate(
|
||||
extracted=ExtractMinute("start_datetime")
|
||||
).order_by("start_datetime"),
|
||||
@@ -864,7 +864,7 @@ class DateFunctionTests(TestCase):
|
||||
],
|
||||
lambda m: (m.start_datetime, m.extracted),
|
||||
)
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
DTModel.objects.annotate(extracted=ExtractMinute("start_time")).order_by(
|
||||
"start_datetime"
|
||||
),
|
||||
@@ -889,7 +889,7 @@ class DateFunctionTests(TestCase):
|
||||
end_datetime = timezone.make_aware(end_datetime)
|
||||
self.create_model(start_datetime, end_datetime)
|
||||
self.create_model(end_datetime, start_datetime)
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
DTModel.objects.annotate(
|
||||
extracted=ExtractSecond("start_datetime")
|
||||
).order_by("start_datetime"),
|
||||
@@ -899,7 +899,7 @@ class DateFunctionTests(TestCase):
|
||||
],
|
||||
lambda m: (m.start_datetime, m.extracted),
|
||||
)
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
DTModel.objects.annotate(extracted=ExtractSecond("start_time")).order_by(
|
||||
"start_datetime"
|
||||
),
|
||||
@@ -963,7 +963,7 @@ class DateFunctionTests(TestCase):
|
||||
self.create_model(end_datetime, start_datetime)
|
||||
|
||||
def test_datetime_kind(kind):
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
DTModel.objects.annotate(
|
||||
truncated=Trunc(
|
||||
"start_datetime", kind, output_field=DateTimeField()
|
||||
@@ -977,7 +977,7 @@ class DateFunctionTests(TestCase):
|
||||
)
|
||||
|
||||
def test_date_kind(kind):
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
DTModel.objects.annotate(
|
||||
truncated=Trunc("start_date", kind, output_field=DateField())
|
||||
).order_by("start_datetime"),
|
||||
@@ -989,7 +989,7 @@ class DateFunctionTests(TestCase):
|
||||
)
|
||||
|
||||
def test_time_kind(kind):
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
DTModel.objects.annotate(
|
||||
truncated=Trunc("start_time", kind, output_field=TimeField())
|
||||
).order_by("start_datetime"),
|
||||
@@ -1001,7 +1001,7 @@ class DateFunctionTests(TestCase):
|
||||
)
|
||||
|
||||
def test_datetime_to_time_kind(kind):
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
DTModel.objects.annotate(
|
||||
truncated=Trunc("start_datetime", kind, output_field=TimeField()),
|
||||
).order_by("start_datetime"),
|
||||
@@ -1044,7 +1044,7 @@ class DateFunctionTests(TestCase):
|
||||
self.create_model(start_datetime, end_datetime)
|
||||
self.create_model(end_datetime, start_datetime)
|
||||
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
DTModel.objects.annotate(
|
||||
truncated=Trunc("start_datetime", "week", output_field=DateTimeField())
|
||||
).order_by("start_datetime"),
|
||||
@@ -1054,7 +1054,7 @@ class DateFunctionTests(TestCase):
|
||||
],
|
||||
lambda m: (m.start_datetime, m.truncated),
|
||||
)
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
DTModel.objects.annotate(
|
||||
truncated=Trunc("start_date", "week", output_field=DateField())
|
||||
).order_by("start_datetime"),
|
||||
@@ -1137,7 +1137,7 @@ class DateFunctionTests(TestCase):
|
||||
end_datetime = timezone.make_aware(end_datetime)
|
||||
self.create_model(start_datetime, end_datetime)
|
||||
self.create_model(end_datetime, start_datetime)
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
DTModel.objects.annotate(extracted=TruncYear("start_datetime")).order_by(
|
||||
"start_datetime"
|
||||
),
|
||||
@@ -1147,7 +1147,7 @@ class DateFunctionTests(TestCase):
|
||||
],
|
||||
lambda m: (m.start_datetime, m.extracted),
|
||||
)
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
DTModel.objects.annotate(extracted=TruncYear("start_date")).order_by(
|
||||
"start_datetime"
|
||||
),
|
||||
@@ -1194,7 +1194,7 @@ class DateFunctionTests(TestCase):
|
||||
self.create_model(start_datetime=end_datetime, end_datetime=start_datetime)
|
||||
self.create_model(start_datetime=last_quarter_2015, end_datetime=end_datetime)
|
||||
self.create_model(start_datetime=first_quarter_2016, end_datetime=end_datetime)
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
DTModel.objects.annotate(extracted=TruncQuarter("start_date")).order_by(
|
||||
"start_datetime"
|
||||
),
|
||||
@@ -1206,7 +1206,7 @@ class DateFunctionTests(TestCase):
|
||||
],
|
||||
lambda m: (m.start_datetime, m.extracted),
|
||||
)
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
DTModel.objects.annotate(extracted=TruncQuarter("start_datetime")).order_by(
|
||||
"start_datetime"
|
||||
),
|
||||
@@ -1241,7 +1241,7 @@ class DateFunctionTests(TestCase):
|
||||
end_datetime = timezone.make_aware(end_datetime)
|
||||
self.create_model(start_datetime, end_datetime)
|
||||
self.create_model(end_datetime, start_datetime)
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
DTModel.objects.annotate(extracted=TruncMonth("start_datetime")).order_by(
|
||||
"start_datetime"
|
||||
),
|
||||
@@ -1251,7 +1251,7 @@ class DateFunctionTests(TestCase):
|
||||
],
|
||||
lambda m: (m.start_datetime, m.extracted),
|
||||
)
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
DTModel.objects.annotate(extracted=TruncMonth("start_date")).order_by(
|
||||
"start_datetime"
|
||||
),
|
||||
@@ -1288,7 +1288,7 @@ class DateFunctionTests(TestCase):
|
||||
end_datetime = timezone.make_aware(end_datetime)
|
||||
self.create_model(start_datetime, end_datetime)
|
||||
self.create_model(end_datetime, start_datetime)
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
DTModel.objects.annotate(extracted=TruncWeek("start_datetime")).order_by(
|
||||
"start_datetime"
|
||||
),
|
||||
@@ -1325,7 +1325,7 @@ class DateFunctionTests(TestCase):
|
||||
end_datetime = timezone.make_aware(end_datetime)
|
||||
self.create_model(start_datetime, end_datetime)
|
||||
self.create_model(end_datetime, start_datetime)
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
DTModel.objects.annotate(extracted=TruncDate("start_datetime")).order_by(
|
||||
"start_datetime"
|
||||
),
|
||||
@@ -1372,7 +1372,7 @@ class DateFunctionTests(TestCase):
|
||||
end_datetime = timezone.make_aware(end_datetime)
|
||||
self.create_model(start_datetime, end_datetime)
|
||||
self.create_model(end_datetime, start_datetime)
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
DTModel.objects.annotate(extracted=TruncTime("start_datetime")).order_by(
|
||||
"start_datetime"
|
||||
),
|
||||
@@ -1446,7 +1446,7 @@ class DateFunctionTests(TestCase):
|
||||
end_datetime = timezone.make_aware(end_datetime)
|
||||
self.create_model(start_datetime, end_datetime)
|
||||
self.create_model(end_datetime, start_datetime)
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
DTModel.objects.annotate(extracted=TruncDay("start_datetime")).order_by(
|
||||
"start_datetime"
|
||||
),
|
||||
@@ -1482,7 +1482,7 @@ class DateFunctionTests(TestCase):
|
||||
end_datetime = timezone.make_aware(end_datetime)
|
||||
self.create_model(start_datetime, end_datetime)
|
||||
self.create_model(end_datetime, start_datetime)
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
DTModel.objects.annotate(extracted=TruncHour("start_datetime")).order_by(
|
||||
"start_datetime"
|
||||
),
|
||||
@@ -1492,7 +1492,7 @@ class DateFunctionTests(TestCase):
|
||||
],
|
||||
lambda m: (m.start_datetime, m.extracted),
|
||||
)
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
DTModel.objects.annotate(extracted=TruncHour("start_time")).order_by(
|
||||
"start_datetime"
|
||||
),
|
||||
@@ -1529,7 +1529,7 @@ class DateFunctionTests(TestCase):
|
||||
end_datetime = timezone.make_aware(end_datetime)
|
||||
self.create_model(start_datetime, end_datetime)
|
||||
self.create_model(end_datetime, start_datetime)
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
DTModel.objects.annotate(extracted=TruncMinute("start_datetime")).order_by(
|
||||
"start_datetime"
|
||||
),
|
||||
@@ -1539,7 +1539,7 @@ class DateFunctionTests(TestCase):
|
||||
],
|
||||
lambda m: (m.start_datetime, m.extracted),
|
||||
)
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
DTModel.objects.annotate(extracted=TruncMinute("start_time")).order_by(
|
||||
"start_datetime"
|
||||
),
|
||||
@@ -1578,7 +1578,7 @@ class DateFunctionTests(TestCase):
|
||||
end_datetime = timezone.make_aware(end_datetime)
|
||||
self.create_model(start_datetime, end_datetime)
|
||||
self.create_model(end_datetime, start_datetime)
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
DTModel.objects.annotate(extracted=TruncSecond("start_datetime")).order_by(
|
||||
"start_datetime"
|
||||
),
|
||||
@@ -1588,7 +1588,7 @@ class DateFunctionTests(TestCase):
|
||||
],
|
||||
lambda m: (m.start_datetime, m.extracted),
|
||||
)
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
DTModel.objects.annotate(extracted=TruncSecond("start_time")).order_by(
|
||||
"start_datetime"
|
||||
),
|
||||
@@ -1909,7 +1909,7 @@ class DateFunctionWithTimeZoneTests(DateFunctionTests):
|
||||
with self.subTest(repr(melb)):
|
||||
|
||||
def test_datetime_kind(kind):
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
DTModel.objects.annotate(
|
||||
truncated=Trunc(
|
||||
"start_datetime",
|
||||
@@ -1934,7 +1934,7 @@ class DateFunctionWithTimeZoneTests(DateFunctionTests):
|
||||
)
|
||||
|
||||
def test_datetime_to_date_kind(kind):
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
DTModel.objects.annotate(
|
||||
truncated=Trunc(
|
||||
"start_datetime",
|
||||
@@ -1959,7 +1959,7 @@ class DateFunctionWithTimeZoneTests(DateFunctionTests):
|
||||
)
|
||||
|
||||
def test_datetime_to_time_kind(kind):
|
||||
self.assertQuerysetEqual(
|
||||
self.assertQuerySetEqual(
|
||||
DTModel.objects.annotate(
|
||||
truncated=Trunc(
|
||||
"start_datetime",
|
||||
|
||||
Reference in New Issue
Block a user