Skip to content

Commit 63d291f

Browse files
akxakx
committed
Modernize spelling for assertQuerySetEqual
1 parent 4d4a08a commit 63d291f

File tree

5 files changed

+35
-29
lines changed

5 files changed

+35
-29
lines changed

‎polymorphic/tests/__init__.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
import django
2+
3+
if django.VERSION < (4, 2): # TODO: remove when dropping support for Django < 4.2
4+
from django.test.testcases import TransactionTestCase
5+
6+
TransactionTestCase.assertQuerySetEqual = TransactionTestCase.assertQuerysetEqual

‎polymorphic/tests/test_multidb.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ def test_save_to_non_default_database(self):
2626
Model2B.objects.create(field1="B1", field2="B2")
2727
Model2D(field1="D1", field2="D2", field3="D3", field4="D4").save()
2828

29-
self.assertQuerysetEqual(
29+
self.assertQuerySetEqual(
3030
Model2A.objects.order_by("id"),
3131
[Model2B, Model2D],
3232
transform=lambda o: o.__class__,
3333
)
3434

35-
self.assertQuerysetEqual(
35+
self.assertQuerySetEqual(
3636
Model2A.objects.db_manager("secondary").order_by("id"),
3737
[Model2A, Model2C],
3838
transform=lambda o: o.__class__,
@@ -44,26 +44,26 @@ def test_instance_of_filter_on_non_default_database(self):
4444
ModelY.objects.db_manager("secondary").create(field_b="Y", field_y="Y")
4545

4646
objects = Base.objects.db_manager("secondary").filter(instance_of=Base)
47-
self.assertQuerysetEqual(
47+
self.assertQuerySetEqual(
4848
objects,
4949
[Base, ModelX, ModelY],
5050
transform=lambda o: o.__class__,
5151
ordered=False,
5252
)
5353

54-
self.assertQuerysetEqual(
54+
self.assertQuerySetEqual(
5555
Base.objects.db_manager("secondary").filter(instance_of=ModelX),
5656
[ModelX],
5757
transform=lambda o: o.__class__,
5858
)
5959

60-
self.assertQuerysetEqual(
60+
self.assertQuerySetEqual(
6161
Base.objects.db_manager("secondary").filter(instance_of=ModelY),
6262
[ModelY],
6363
transform=lambda o: o.__class__,
6464
)
6565

66-
self.assertQuerysetEqual(
66+
self.assertQuerySetEqual(
6767
Base.objects.db_manager("secondary").filter(
6868
Q(instance_of=ModelX) | Q(instance_of=ModelY)
6969
),

‎polymorphic/tests/test_orm.py

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ def test_simple_inheritance(self):
222222
self.create_model2abcd()
223223

224224
objects = Model2A.objects.all()
225-
self.assertQuerysetEqual(
225+
self.assertQuerySetEqual(
226226
objects,
227227
[Model2A, Model2B, Model2C, Model2D],
228228
transform=lambda o: o.__class__,
@@ -324,7 +324,7 @@ def test_non_polymorphic(self):
324324
self.create_model2abcd()
325325

326326
objects = list(Model2A.objects.all().non_polymorphic())
327-
self.assertQuerysetEqual(
327+
self.assertQuerySetEqual(
328328
objects,
329329
[Model2A, Model2A, Model2A, Model2A],
330330
transform=lambda o: o.__class__,
@@ -336,23 +336,23 @@ def test_get_real_instances(self):
336336

337337
# from queryset
338338
objects = qs.get_real_instances()
339-
self.assertQuerysetEqual(
339+
self.assertQuerySetEqual(
340340
objects,
341341
[Model2A, Model2B, Model2C, Model2D],
342342
transform=lambda o: o.__class__,
343343
)
344344

345345
# from a manual list
346346
objects = Model2A.objects.get_real_instances(list(qs))
347-
self.assertQuerysetEqual(
347+
self.assertQuerySetEqual(
348348
objects,
349349
[Model2A, Model2B, Model2C, Model2D],
350350
transform=lambda o: o.__class__,
351351
)
352352

353353
# from empty list
354354
objects = Model2A.objects.get_real_instances([])
355-
self.assertQuerysetEqual(objects, [], transform=lambda o: o.__class__)
355+
self.assertQuerySetEqual(objects, [], transform=lambda o: o.__class__)
356356

357357
def test_queryset_missing_derived(self):
358358
a = Model2A.objects.create(field1="A1")
@@ -389,7 +389,7 @@ def test_translate_polymorphic_q_object(self):
389389

390390
q = Model2A.translate_polymorphic_Q_object(Q(instance_of=Model2C))
391391
objects = Model2A.objects.filter(q)
392-
self.assertQuerysetEqual(
392+
self.assertQuerySetEqual(
393393
objects, [Model2C, Model2D], transform=lambda o: o.__class__, ordered=False
394394
)
395395

@@ -505,7 +505,7 @@ def test_manytomany_field(self):
505505
# no pretty printing
506506
ModelShow1_plain.objects.create(field1="abc")
507507
ModelShow2_plain.objects.create(field1="abc", field2="def")
508-
self.assertQuerysetEqual(
508+
self.assertQuerySetEqual(
509509
ModelShow1_plain.objects.all(),
510510
[ModelShow1_plain, ModelShow2_plain],
511511
transform=lambda o: o.__class__,
@@ -516,7 +516,7 @@ def test_extra_method(self):
516516
a, b, c, d = self.create_model2abcd()
517517

518518
objects = Model2A.objects.extra(where=[f"id IN ({b.id}, {c.id})"])
519-
self.assertQuerysetEqual(
519+
self.assertQuerySetEqual(
520520
objects, [Model2B, Model2C], transform=lambda o: o.__class__, ordered=False
521521
)
522522

@@ -525,7 +525,7 @@ def test_extra_method(self):
525525
where=["field1 = 'A1' OR field1 = 'B1'"],
526526
order_by=["-id"],
527527
)
528-
self.assertQuerysetEqual(objects, [Model2B, Model2A], transform=lambda o: o.__class__)
528+
self.assertQuerySetEqual(objects, [Model2B, Model2A], transform=lambda o: o.__class__)
529529

530530
ModelExtraA.objects.create(field1="A1")
531531
ModelExtraB.objects.create(field1="B1", field2="B2")
@@ -556,39 +556,39 @@ def test_instance_of_filter(self):
556556
self.create_model2abcd()
557557

558558
objects = Model2A.objects.instance_of(Model2B)
559-
self.assertQuerysetEqual(
559+
self.assertQuerySetEqual(
560560
objects,
561561
[Model2B, Model2C, Model2D],
562562
transform=lambda o: o.__class__,
563563
ordered=False,
564564
)
565565

566566
objects = Model2A.objects.filter(instance_of=Model2B)
567-
self.assertQuerysetEqual(
567+
self.assertQuerySetEqual(
568568
objects,
569569
[Model2B, Model2C, Model2D],
570570
transform=lambda o: o.__class__,
571571
ordered=False,
572572
)
573573

574574
objects = Model2A.objects.filter(Q(instance_of=Model2B))
575-
self.assertQuerysetEqual(
575+
self.assertQuerySetEqual(
576576
objects,
577577
[Model2B, Model2C, Model2D],
578578
transform=lambda o: o.__class__,
579579
ordered=False,
580580
)
581581

582582
objects = Model2A.objects.not_instance_of(Model2B)
583-
self.assertQuerysetEqual(
583+
self.assertQuerySetEqual(
584584
objects, [Model2A], transform=lambda o: o.__class__, ordered=False
585585
)
586586

587587
def test_polymorphic___filter(self):
588588
self.create_model2abcd()
589589

590590
objects = Model2A.objects.filter(Q(Model2B___field2="B2") | Q(Model2C___field3="C3"))
591-
self.assertQuerysetEqual(
591+
self.assertQuerySetEqual(
592592
objects, [Model2B, Model2C], transform=lambda o: o.__class__, ordered=False
593593
)
594594

@@ -599,7 +599,7 @@ def test_polymorphic_applabel___filter(self):
599599
objects = Model2A.objects.filter(
600600
Q(tests__Model2B___field2="B2") | Q(tests__Model2C___field3="C3")
601601
)
602-
self.assertQuerysetEqual(
602+
self.assertQuerySetEqual(
603603
objects, [Model2B, Model2C], transform=lambda o: o.__class__, ordered=False
604604
)
605605

@@ -645,7 +645,7 @@ def test_delete(self):
645645

646646
oa.delete()
647647
objects = Model2A.objects.all()
648-
self.assertQuerysetEqual(
648+
self.assertQuerySetEqual(
649649
objects,
650650
[Model2A, Model2C, Model2D],
651651
transform=lambda o: o.__class__,
@@ -748,7 +748,7 @@ def test_user_defined_manager(self):
748748

749749
# MyManager should reverse the sorting of field1
750750
objects = ModelWithMyManager.objects.all()
751-
self.assertQuerysetEqual(
751+
self.assertQuerySetEqual(
752752
objects,
753753
[(ModelWithMyManager, "D1b", "D4b"), (ModelWithMyManager, "D1a", "D4a")],
754754
transform=lambda o: (o.__class__, o.field1, o.field4),
@@ -764,7 +764,7 @@ def test_user_defined_manager_as_secondary(self):
764764

765765
# MyManager should reverse the sorting of field1
766766
objects = ModelWithMyManagerNoDefault.my_objects.all()
767-
self.assertQuerysetEqual(
767+
self.assertQuerySetEqual(
768768
objects,
769769
[
770770
(ModelWithMyManagerNoDefault, "D1b", "D4b"),
@@ -792,7 +792,7 @@ def test_user_defined_queryset_as_manager(self):
792792
ModelWithMyManager2.objects.create(field1="D1b", field4="D4b")
793793

794794
objects = ModelWithMyManager2.objects.all()
795-
self.assertQuerysetEqual(
795+
self.assertQuerySetEqual(
796796
objects,
797797
[(ModelWithMyManager2, "D1a", "D4a"), (ModelWithMyManager2, "D1b", "D4b")],
798798
transform=lambda o: (o.__class__, o.field1, o.field4),

‎polymorphic/tests/test_regression.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,16 @@ def test_for_query_result_incomplete_with_inheritance(self):
1818
bottom.save()
1919

2020
expected_queryset = [top, middle, bottom]
21-
self.assertQuerysetEqual(
21+
self.assertQuerySetEqual(
2222
Top.objects.order_by("pk"), [repr(r) for r in expected_queryset], **transform_arg
2323
)
2424

2525
expected_queryset = [middle, bottom]
26-
self.assertQuerysetEqual(
26+
self.assertQuerySetEqual(
2727
Middle.objects.order_by("pk"), [repr(r) for r in expected_queryset], **transform_arg
2828
)
2929

3030
expected_queryset = [bottom]
31-
self.assertQuerysetEqual(
31+
self.assertQuerySetEqual(
3232
Bottom.objects.order_by("pk"), [repr(r) for r in expected_queryset], **transform_arg
3333
)

‎polymorphic/tests/test_utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ def test_reset_polymorphic_ctype(self):
3838

3939
reset_polymorphic_ctype(Model2D, Model2B, Model2D, Model2A, Model2C)
4040

41-
self.assertQuerysetEqual(
41+
self.assertQuerySetEqual(
4242
Model2A.objects.order_by("pk"),
4343
[Model2A, Model2D, Model2B, Model2B],
4444
transform=lambda o: o.__class__,

0 commit comments

Comments
 (0)