From 43e67981dae265b93e30fe433592ba3741196251 Mon Sep 17 00:00:00 2001
From: Noelle Leigh <5957867+noelleleigh@users.noreply.github.com>
Date: Thu, 7 Sep 2023 11:25:36 -0400
Subject: [PATCH] Add TransactionTestCase.assertQuerySetEqual

Adds the [`TransactionTestCase.assertQuerySetEqual` method][0], which is
the non-deprecated version of `TransactionTestCase.assertQuerysetEqual`,
which was deprecated in Django 4.2 and is set to be removed in Django
5.1.

I don't know of a way with type annotations to copy the signature of one
method to another, so I just copy-pasted them, while also making some
improvements with generic types.

[0]: https://docs.djangoproject.com/en/4.2/topics/testing/tools/#django.test.TransactionTestCase.assertQuerySetEqual
---
 django-stubs/test/testcases.pyi | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/django-stubs/test/testcases.pyi b/django-stubs/test/testcases.pyi
index 55326d0a2..ffa679d6f 100644
--- a/django-stubs/test/testcases.pyi
+++ b/django-stubs/test/testcases.pyi
@@ -1,13 +1,14 @@
 import threading
 import unittest
 from collections.abc import Callable, Iterable
-from typing import Any, ClassVar, overload
+from typing import Any, ClassVar, TypeVar, overload
 
 from django.core.exceptions import ImproperlyConfigured
 from django.core.handlers.wsgi import WSGIHandler
 from django.core.servers.basehttp import ThreadedWSGIServer, WSGIRequestHandler
 from django.db import connections as connections  # noqa: F401
 from django.db.backends.sqlite3.base import DatabaseWrapper
+from django.db.models import Model
 from django.db.models.query import _BaseQuerySet
 from django.forms.fields import EmailField
 from django.http.response import HttpResponse, HttpResponseBase
@@ -162,17 +163,29 @@ class SimpleTestCase(unittest.TestCase):
         self, xml1: str, xml2: str, msg: str | None = ...
     ) -> None: ...
 
+_T = TypeVar("_T")
+_M = TypeVar("_M", bound=Model)
+
 class TransactionTestCase(SimpleTestCase):
     reset_sequences: bool = ...
     available_apps: Any = ...
     fixtures: Any = ...
     multi_db: bool = ...
     serialized_rollback: bool = ...
+    def assertQuerySetEqual(
+        self,
+        qs: _BaseQuerySet[_M],
+        values: Iterable[_T],
+        transform: Callable[[_M], _T] = ...,
+        ordered: bool = ...,
+        msg: str | None = ...,
+    ) -> None: ...
+    # Deprecated alias to assertQuerySetEqual
     def assertQuerysetEqual(
         self,
-        qs: _BaseQuerySet[Any],
-        values: Iterable[Any],
-        transform: Callable[..., Any] | type[str] = ...,
+        qs: _BaseQuerySet[_M],
+        values: Iterable[_T],
+        transform: Callable[[_M], _T] = ...,
         ordered: bool = ...,
         msg: str | None = ...,
     ) -> None: ...